Fixed the controllers due to the Core changes.

monarc-project · Aug 22, 2023 · 1325a85 · 1325a85
1 parent ce0c4ba
commit 1325a85
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/src/Controller/ApiAmvsController.php b/src/Controller/ApiAmvsController.php
@@ -57,16 +57,13 @@ public function get($id)
     public function create($data)
     {
         if ($this->isBatchData($data)) {
-            return $this->getSuccessfulJsonResponse([
-                'id' => current($this->amvService->createAmvItems($data))
-            ]);
+            $result = $this->amvService->createAmvItems($data);
+        } else {
+            $this->validatePostParams($this->postAmvDataInputValidator, $data);
+            $result = $this->amvService->create($data)->getUuid();
         }
 
-        $this->validatePostParams($this->postAmvDataInputValidator, $data);
-
-        return $this->getSuccessfulJsonResponse([
-            'id' => $this->amvService->create($data),
-        ]);
+        return $this->getSuccessfulJsonResponse(['id' => $result]);
     }
 
     /**
@@ -96,6 +93,9 @@ public function patchList($data)
         return $this->getSuccessfulJsonResponse();
     }
 
+    /**
+     * @param string $id
+     */
     public function delete($id)
     {
         $this->amvService->delete($id);

diff --git a/src/Controller/ApiAnrInstancesMetadataFieldsController.php b/src/Controller/ApiAnrInstancesMetadataFieldsController.php
@@ -9,6 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
+use Monarc\Core\Exception\Exception;
 use Monarc\Core\Model\Entity\Anr;
 use Monarc\Core\Service\AnrInstanceMetadataFieldService;
 
@@ -54,7 +55,7 @@ public function create($data)
         $anr = $this->getRequest()->getAttribute('anr');
 
         return $this->getSuccessfulJsonResponse([
-            'id' => $this->anrInstanceMetadataFieldService->create($anr, $data),
+            'id' => $this->anrInstanceMetadataFieldService->create($anr, $data)->getId(),
         ]);
     }
 

diff --git a/src/Controller/ApiOperationalRisksScalesController.php b/src/Controller/ApiOperationalRisksScalesController.php
@@ -44,29 +44,19 @@ public function create($data)
         $anr = $this->getRequest()->getAttribute('anr');
 
         return $this->getSuccessfulJsonResponse([
-            'id' => $this->operationalRiskScaleService->createOperationalRiskScaleType($anr, $data),
+            'id' => $this->operationalRiskScaleService->createOperationalRiskScaleType($anr, $data)->getId(),
         ]);
     }
 
     /**
      * @param array $data
      */
-    public function deleteList($data)
+    public function update($id, $data)
     {
         /** @var Anr $anr */
         $anr = $this->getRequest()->getAttribute('anr');
 
-        $this->operationalRiskScaleService->deleteOperationalRiskScaleTypes($anr, $data);
-
-        return $this->getSuccessfulJsonResponse();
-    }
-
-    /**
-     * @param array $data
-     */
-    public function update($id, $data)
-    {
-        $this->operationalRiskScaleService->update((int)$id, $data);
+        $this->operationalRiskScaleService->updateScaleType($anr, (int)$id, $data);
 
         return $this->getSuccessfulJsonResponse();
     }
@@ -108,4 +98,17 @@ public function patchList($data)
 
         return $this->getSuccessfulJsonResponse();
     }
+
+    /**
+     * @param array $data
+     */
+    public function deleteList($data)
+    {
+        /** @var Anr $anr */
+        $anr = $this->getRequest()->getAttribute('anr');
+
+        $this->operationalRiskScaleService->deleteOperationalRiskScaleTypes($anr, $data);
+
+        return $this->getSuccessfulJsonResponse();
+    }
 }
diff --git a/src/Controller/ApiSoaScaleCommentController.php b/src/Controller/ApiSoaScaleCommentController.php
@@ -39,7 +39,10 @@ public function getList()
      */
     public function update($id, $data)
     {
-        $this->soaScaleCommentService->update((int)$id, $data);
+        /** @var Anr $anr */
+        $anr = $this->getRequest()->getAttribute('anr');
+
+        $this->soaScaleCommentService->update($anr, (int)$id, $data);
 
         return $this->getSuccessfulJsonResponse();
     }
@@ -50,7 +53,7 @@ public function patchList($data)
         $anr = $this->getRequest()->getAttribute('anr');
         $language = $this->params()->fromQuery("language");
 
-        $this->soaScaleCommentService->createOrHideSoaScaleComment($anr, $data);
+        $this->soaScaleCommentService->createOrHideSoaScaleComments($anr, $data);
 
         return $this->getSuccessfulJsonResponse([
             'data' => $this->soaScaleCommentService->getSoaScaleComments($anr, $language),