Merge pull request #147 from wri/feat/TM-741-workdays-be

[TM-741] Turns Workdays into a BE concern
wri · Apr 17, 2024 · 1c39e14 · 1c39e14
2 parents be521e9 + 8292b99
commit 1c39e14
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 548 deletions.
diff --git a/app/Http/Controllers/V2/Workdays/DeleteWorkdayController.php b/app/Http/Controllers/V2/Workdays/DeleteWorkdayController.php
diff --git a/app/Http/Controllers/V2/Workdays/StoreWorkdayController.php b/app/Http/Controllers/V2/Workdays/StoreWorkdayController.php
diff --git a/app/Http/Controllers/V2/Workdays/UpdateWorkdayController.php b/app/Http/Controllers/V2/Workdays/UpdateWorkdayController.php
diff --git a/app/Models/Traits/UsesLinkedFields.php b/app/Models/Traits/UsesLinkedFields.php
@@ -77,7 +77,8 @@ public function updateFromForm(array $formData): void
                     } else {
                         $property = data_get($relationsConfig, "$question->linked_field_key.property");
                         if (! empty($property)) {
-                            $this->syncRelation($property, collect(data_get($formData, $question->uuid)));
+                            $inputType = data_get($relationsConfig, "$question->linked_field_key.input_type");
+                            $this->syncRelation($property, $inputType, collect(data_get($formData, $question->uuid)));
                         }
                     }
 
@@ -242,10 +243,10 @@ private function updateLinkedFieldValue(array $linkedFieldInfo, $answer): void
         }
     }
 
-    private function syncRelation(string $property, $data): void
+    private function syncRelation(string $property, string $inputType, $data): void
     {
         // This will expand as we complete more tickets in TM-747, until eventually we support all form relations.
-        if ($property != 'treeSpecies') {
+        if (! in_array($inputType, ['treeSpecies', 'workdays'])) {
             return;
         }
 

diff --git a/openapi-src/V2/definitions/V2WorkdayCreate.yml b/openapi-src/V2/definitions/V2WorkdayCreate.yml
diff --git a/openapi-src/V2/definitions/V2WorkdayUpdate.yml b/openapi-src/V2/definitions/V2WorkdayUpdate.yml
diff --git a/openapi-src/V2/definitions/_index.yml b/openapi-src/V2/definitions/_index.yml
@@ -152,10 +152,6 @@ V2SeedingPaginated:
   $ref: './V2SeedingPaginated.yml'
 V2WorkdayRead:
   $ref: './V2WorkdayRead.yml'
-V2WorkdayCreate:
-  $ref: './V2WorkdayCreate.yml'
-V2WorkdayUpdate:
-  $ref: './V2WorkdayUpdate.yml'
 V2WorkdaysPaginated:
   $ref: './V2WorkdaysPaginated.yml'
 V2DisturbanceRead:

diff --git a/openapi-src/V2/paths/Workdays/delete-v2-workday-uuid.yml b/openapi-src/V2/paths/Workdays/delete-v2-workday-uuid.yml
diff --git a/openapi-src/V2/paths/Workdays/patch-v2-workday-uuid.yml b/openapi-src/V2/paths/Workdays/patch-v2-workday-uuid.yml
diff --git a/openapi-src/V2/paths/Workdays/post-v2-workday.yml b/openapi-src/V2/paths/Workdays/post-v2-workday.yml
diff --git a/openapi-src/V2/paths/_index.yml b/openapi-src/V2/paths/_index.yml
@@ -104,14 +104,6 @@
 /v2/update-requests/{ENTITY}/{UUID}:
   get:
     $ref: './UpdateRequests/get-v2-update-requests-entity-uuid.yml'
-/v2/workdays:
-  post:
-    $ref: './Workdays/post-v2-workday.yml'
-/v2/workdays/{UUID}:
-  patch:
-    $ref: './Workdays/patch-v2-workday-uuid.yml'
-  delete:
-    $ref: './Workdays/delete-v2-workday-uuid.yml'
 /v2/workdays/{ENTITY}/{UUID}:
   get:
     $ref: './Workdays/get-v2-workdays-entity-uuid.yml'