Merge pull request #489 from City-of-Helsinki/fix-additional-applican…

…t-method-naming Fix getApplicant method naming
City-of-Helsinki · Nov 16, 2023 · 0c1db68 · 0c1db68
2 parents bbebf9c + 311c67e
commit 0c1db68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/public/modules/custom/asu_api/src/Api/BackendApi/Request/CreateApplicationRequest.php b/public/modules/custom/asu_api/src/Api/BackendApi/Request/CreateApplicationRequest.php
@@ -53,7 +53,7 @@ public function toArray(): array {
       'application_type' => $this->application->bundle(),
       'ssn_suffix' => $this->application->main_applicant[0]->personal_id,
       'has_children' => $this->application->getHasChildren(),
-      'additional_applicant' => $this->getApplicant(),
+      'additional_applicant' => $this->getAdditionalApplicant(),
       'right_of_residence' => NULL,
       'project_id' => $this->projectUuid,
       'apartments' => $this->getApartments(),
@@ -105,11 +105,11 @@ protected function getApartments(): array {
    * @return object
    *   Applicant information.
    */
-  protected function getApplicant(): ?object {
+  protected function getAdditionalApplicant(): ?object {
     if (!$this->application->hasAdditionalApplicant()) {
       return NULL;
     }
-    $applicant = $this->application->getApplicant()[0];
+    $applicant = $this->application->getAdditionalApplicants()[0];
     return (object) [
       'first_name' => $applicant['first_name'],
       'last_name' => $applicant['last_name'],

diff --git a/public/modules/custom/asu_api/src/Api/BackendApi/Request/SalesCreateApplicationRequest.php b/public/modules/custom/asu_api/src/Api/BackendApi/Request/SalesCreateApplicationRequest.php
@@ -61,7 +61,7 @@ public function toArray(): array {
       'application_type' => $this->application->bundle(),
       'ssn_suffix' => $this->application->main_applicant[0]->personal_id,
       'has_children' => $this->application->getHasChildren(),
-      'additional_applicant' => $this->getApplicant(),
+      'additional_applicant' => $this->getAdditionalApplicant(),
       'right_of_residence' => NULL,
       'is_new_permit_number' => NULL,
       'project_id' => $this->projectUuid,
@@ -115,11 +115,11 @@ private function getApartments() {
    * @return array
    *   Applicant information.
    */
-  private function getApplicant() {
+  private function getAdditionalApplicant() {
     if (!$this->application->hasAdditionalApplicant()) {
       return NULL;
     }
-    $applicant = $this->application->getApplicants()[0];
+    $applicant = $this->application->getAdditionalApplicants()[0];
     return [
       'first_name' => $applicant['first_name'],
       'last_name' => $applicant['last_name'],

diff --git a/public/modules/custom/asu_application/src/Entity/Application.php b/public/modules/custom/asu_application/src/Entity/Application.php
@@ -144,7 +144,7 @@ public function getMainApplicant(): ?array {
    * @return array
    *   Array of applicants.
    */
-  public function getApplicant(): array {
+  public function getAdditionalApplicants(): array {
     return $this->applicant->getValue() ?? [];
   }