diff --git a/api/v3/TwingleEvent/Getsingle.php b/api/v3/TwingleEvent/Getsingle.php index f6d2f08..c12edcd 100644 --- a/api/v3/TwingleEvent/Getsingle.php +++ b/api/v3/TwingleEvent/Getsingle.php @@ -102,9 +102,11 @@ function civicrm_api3_twingle_event_Getsingle(array $params): array { _civicrm_api3_twingle_event_Getsingle_spec($allowed_params); $params = array_intersect_key($params, $allowed_params); + // Get TwingleEvent by provided parameters $returnValues = civicrm_api3('TwingleEvent', 'get', $params); $count = $returnValues['count']; + // Check whether only a single TwingleEvent is found if ($count != 1) { return civicrm_api3_create_error("Expected one TwingleEvent but found $count"); } diff --git a/api/v3/TwingleProject/Getsingle.php b/api/v3/TwingleProject/Getsingle.php index b703103..1eab22d 100644 --- a/api/v3/TwingleProject/Getsingle.php +++ b/api/v3/TwingleProject/Getsingle.php @@ -92,7 +92,7 @@ function _civicrm_api3_twingle_project_Getsingle_spec(array &$spec) { } /** - * TwingleProject.Getsingle API + * # TwingleProject.Getsingle API * * @param array $params * @@ -109,9 +109,11 @@ function civicrm_api3_twingle_project_Getsingle(array $params): array { _civicrm_api3_twingle_project_Getsingle_spec($allowed_params); $params = array_intersect_key($params, $allowed_params); + // Get TwingleProject by provided parameters $returnValues = civicrm_api3('TwingleProject', 'get', $params); $count = $returnValues['count']; + // Check whether only a single TwingleProject is found if ($count != 1) { return civicrm_api3_create_error( "Expected one TwingleProject but found $count" diff --git a/api/v3/TwingleProject/Sync.php b/api/v3/TwingleProject/Sync.php index c44eed4..5c1e579 100644 --- a/api/v3/TwingleProject/Sync.php +++ b/api/v3/TwingleProject/Sync.php @@ -174,7 +174,7 @@ function civicrm_api3_twingle_project_Sync(array $params): array { } // Push missing projects to Twingle - $result_values = []; + $returnValues = []; foreach ($projects_from_civicrm['values'] as $project_from_civicrm) { if (!in_array($project_from_civicrm['project_id'], array_column($projects_from_twingle, 'id'))) { @@ -187,11 +187,11 @@ function civicrm_api3_twingle_project_Sync(array $params): array { $result = _pushProjectToTwingle($project, $twingleApi, $params); if ($result['is_error'] != 0) { $errors_occurred++; - $result_values[$project->getId()] = + $returnValues[$project->getId()] = $project->getResponse($result['error_message']); } else { - $result_values[$project->getId()] = $result['values']; + $returnValues[$project->getId()] = $result['values']; } } } @@ -210,12 +210,12 @@ function civicrm_api3_twingle_project_Sync(array $params): array { // If this is a test, do not make db changes if ($params['is_test']) { - $result_values[$project->getId()] = + $returnValues[$project->getId()] = $project->getResponse('Ready to create TwingleProject'); } $project->create(TRUE); - $result_values[$project->getId()] = + $returnValues[$project->getId()] = $project->getResponse('TwingleProject created'); } catch (Exception $e) { $errors_occurred++; @@ -225,7 +225,7 @@ function civicrm_api3_twingle_project_Sync(array $params): array { $e->getMessage(), $project->getResponse() ); - $result_values[$project->getId()] = $project->getResponse( + $returnValues[$project->getId()] = $project->getResponse( "TwingleProject could not get created: " . $e->getMessage() ); } @@ -248,11 +248,11 @@ function civicrm_api3_twingle_project_Sync(array $params): array { $result = _projectSync($project, $project_from_twingle, $twingleApi, $params); if ($result['is_error'] != 0) { $errors_occurred++; - $result_values[$project->getId()] = + $returnValues[$project->getId()] = $project->getResponse($result['error_message']); } else { - $result_values[$project->getId()] = $result['values']; + $returnValues[$project->getId()] = $result['values']; } break; } @@ -266,12 +266,12 @@ function civicrm_api3_twingle_project_Sync(array $params): array { : "1 synchronisation process resulted with an error"; return civicrm_api3_create_error( $errorMessage, - $result_values + $returnValues ); } else { return civicrm_api3_create_success( - $result_values, + $returnValues, $params, 'TwingleProject', 'Sync'