chore: refresh CLQMS backend baseline

Re-synced controllers, configs, libraries, seeds, and docs with the latest API expectations and response helpers.

app/Config/Routes.php

@@ -220,23 +220,23 @@ $routes->group('api', function ($routes) {
             $routes->delete('/', 'Organization\WorkstationController::delete');
         });
 
-        // HostApp
+        // HostApp
-        $routes->group('hostapp', function ($routes) {
+        $routes->group('hostapp', function ($routes) {
-            $routes->get('/', 'Organization\HostAppController::index');
+            $routes->get('/', 'Organization\HostAppController::index');
-            $routes->get('(:any)', 'Organization\HostAppController::show/$1');
+            $routes->get('(:num)', 'Organization\HostAppController::show/$1');
-            $routes->post('/', 'Organization\HostAppController::create');
+            $routes->post('/', 'Organization\HostAppController::create');
-            $routes->patch('(:any)', 'Organization\HostAppController::update/$1');
+            $routes->patch('(:num)', 'Organization\HostAppController::update/$1');
-            $routes->delete('/', 'Organization\HostAppController::delete');
+            $routes->delete('/', 'Organization\HostAppController::delete');
-        });
+        });
 
-        // HostComPara
+        // HostComPara
-        $routes->group('hostcompara', function ($routes) {
+        $routes->group('hostcompara', function ($routes) {
-            $routes->get('/', 'Organization\HostComParaController::index');
+            $routes->get('/', 'Organization\HostComParaController::index');
-            $routes->get('(:any)', 'Organization\HostComParaController::show/$1');
+            $routes->get('(:num)', 'Organization\HostComParaController::show/$1');
-            $routes->post('/', 'Organization\HostComParaController::create');
+            $routes->post('/', 'Organization\HostComParaController::create');
-            $routes->patch('(:any)', 'Organization\HostComParaController::update/$1');
+            $routes->patch('(:num)', 'Organization\HostComParaController::update/$1');
-            $routes->delete('/', 'Organization\HostComParaController::delete');
+            $routes->delete('/', 'Organization\HostComParaController::delete');
-        });
+        });
 
         // CodingSys
         $routes->group('codingsys', function ($routes) {

app/Controllers/Organization/AccountController.php

@@ -45,27 +45,40 @@ class AccountController extends BaseController {
         return $this->respond([ 'status' => 'success', 'message'=> "fetch success", 'data' => $row ], 200);
     }
 
-    public function delete() {
+    public function delete() {
-        try {
+        try {
-            $input = $this->request->getJSON(true);
+            $input = $this->request->getJSON(true);
-            $id = $input["AccountID"];
+            $id = $this->requirePatchId($input['AccountID'] ?? null, 'AccountID');
-            if (!$id) { return $this->failValidationErrors('ID is required.'); }
+            if ($id === null) {
-            $this->model->delete($id);
+                return;
-            return $this->respondDeleted([ 'status' => 'success', 'message' => "{$id} deleted successfully."]);
+            }
-        } catch (\Throwable $e) {
+            $this->model->delete($id);
-            return $this->failServerError('Something went wrong: ' . $e->getMessage());
+            return $this->respondDeleted([ 'status' => 'success', 'message' => "{$id} deleted successfully."]);
-        }
+        } catch (\Throwable $e) {
-    }
+            return $this->failServerError('Something went wrong: ' . $e->getMessage());
+        }
+    }
 
-    public function create() {
+    public function create() {
-        $input = $this->request->getJSON(true);
+        $input = $this->request->getJSON(true);
-        try {
+
-            $id = $this->model->insert($input,true);
+        $validation = service('validation');
-            return $this->respondCreated([ 'status'  => 'success', 'message' => 'data created successfully', 'data' => $id ], 201);
+        $validation->setRules([
-        } catch (\Throwable $e) {
+            'AccountName' => 'required|string|max_length[255]',
-            return $this->failServerError('Something went wrong: ' . $e->getMessage());
+            'Parent' => 'permit_empty|integer',
-        }
+        ]);
-    }
+
+        if (!$validation->run($input)) {
+            return $this->failValidationErrors($validation->getErrors());
+        }
+
+        try {
+            $id = $this->model->insert($input,true);
+            return $this->respondCreated([ 'status'  => 'success', 'message' => 'data created successfully', 'data' => $id ], 201);
+        } catch (\Throwable $e) {
+            return $this->failServerError('Something went wrong: ' . $e->getMessage());
+        }
+    }
 
     public function update($AccountID = null) {
         $input = $this->requirePatchPayload($this->request->getJSON(true));
@@ -83,6 +96,16 @@ class AccountController extends BaseController {
             return $this->respond([ 'status' => 'failed', 'message' => 'Account not found', 'data' => [] ], 404);
         }
 
+        $validation = service('validation');
+        $validation->setRules([
+            'AccountName' => 'permit_empty|string|max_length[255]',
+            'Parent' => 'permit_empty|integer',
+        ]);
+
+        if (!$validation->run($input)) {
+            return $this->failValidationErrors($validation->getErrors());
+        }
+
         $input['AccountID'] = $id;
         try {
             $this->model->update($id, $input);

app/Controllers/Organization/CodingSysController.php

@@ -104,7 +104,7 @@ class CodingSysController extends BaseController {
 
         try {
             $this->model->update($id, $input);
-            return $this->respond(['status' => 'success', 'message' => 'data updated successfully', 'data' => $id], 200);
+            return $this->respondCreated(['status' => 'success', 'message' => 'data updated successfully', 'data' => $id], 201);
         } catch (\Throwable $e) {
             return $this->failServerError('Something went wrong: ' . $e->getMessage());
         }

app/Controllers/Organization/DisciplineController.php

@@ -43,27 +43,43 @@ class DisciplineController extends BaseController {
     return $this->respond([ 'status' => 'success', 'message'=> "fetch success", 'data' => $row ], 200);
   }
 
-  public function delete() {
+  public function delete() {
-    try {
+    try {
-      $input = $this->request->getJSON(true);
+      $input = $this->request->getJSON(true);
-      $id = $input["DisciplineID"];
+      $id = $this->requirePatchId($input['DisciplineID'] ?? null, 'DisciplineID');
-      if (!$id) { return $this->failValidationErrors('ID is required.'); }
+      if ($id === null) {
-      $this->model->delete($id);
+        return;
-      return $this->respondDeleted([ 'status' => 'success', 'message' => "{$id} deleted successfully."]);
+      }
-    } catch (\Throwable $e) {
+      $this->model->delete($id);
-      return $this->failServerError('Something went wrong: ' . $e->getMessage());
+      return $this->respondDeleted([ 'status' => 'success', 'message' => "{$id} deleted successfully."]);
-    }
+    } catch (\Throwable $e) {
-  }
+      return $this->failServerError('Something went wrong: ' . $e->getMessage());
+    }
+  }
 
-  public function create() {
+  public function create() {
-    $input = $this->request->getJSON(true);
+    $input = $this->request->getJSON(true);
-    try {
+
-      $id = $this->model->insert($input,true);
+    $validation = service('validation');
-      return $this->respondCreated([ 'status'  => 'success', 'message' => 'data created successfully', 'data' => $id ], 201);
+    $validation->setRules([
-    } catch (\Throwable $e) {
+      'DisciplineCode' => 'required|string|max_length[50]',
-      return $this->failServerError('Something went wrong: ' . $e->getMessage());
+      'DisciplineName' => 'required|string|max_length[255]',
-    }
+      'Parent' => 'permit_empty|integer',
-  }
+      'SeqScr' => 'permit_empty|integer',
+      'SeqRpt' => 'permit_empty|integer',
+    ]);
+
+    if (!$validation->run($input)) {
+      return $this->failValidationErrors($validation->getErrors());
+    }
+
+    try {
+      $id = $this->model->insert($input,true);
+      return $this->respondCreated([ 'status'  => 'success', 'message' => 'data created successfully', 'data' => $id ], 201);
+    } catch (\Throwable $e) {
+      return $this->failServerError('Something went wrong: ' . $e->getMessage());
+    }
+  }
 
   public function update($DisciplineID = null) {
     $input = $this->requirePatchPayload($this->request->getJSON(true));
@@ -81,9 +97,26 @@ class DisciplineController extends BaseController {
       return $this->respond([ 'status' => 'failed', 'message' => 'Discipline not found', 'data' => [] ], 404);
     }
 
+    $validation = service('validation');
+    $validation->setRules([
+      'DisciplineCode' => 'permit_empty|string|max_length[50]',
+      'DisciplineName' => 'permit_empty|string|max_length[255]',
+      'Parent' => 'permit_empty|integer',
+      'SeqScr' => 'permit_empty|integer',
+      'SeqRpt' => 'permit_empty|integer',
+    ]);
+
+    if (!$validation->run($input)) {
+      return $this->failValidationErrors($validation->getErrors());
+    }
+
     $input['DisciplineID'] = $id;
-    $this->model->update($id, $input);
+    try {
-    return $this->respond([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 200);
+      $this->model->update($id, $input);
+      return $this->respond([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 200);
+    } catch (\Throwable $e) {
+      return $this->failServerError('Something went wrong: ' . $e->getMessage());
+    }
     /*
     try {
       $id = $input['DisciplineID'];

app/Controllers/Organization/HostAppController.php

@@ -29,7 +29,10 @@ class HostAppController extends BaseController {
             ->join('site', 'site.SiteID = hostapp.SiteID', 'left');
 
         if (!empty($filter['HostAppID'])) {
-            $builder->like('hostapp.HostAppID', $filter['HostAppID'], 'both');
+            if (!ctype_digit((string) $filter['HostAppID'])) {
+                return $this->failValidationErrors('HostAppID filter must be a valid integer.');
+            }
+            $builder->where('hostapp.HostAppID', (int) $filter['HostAppID']);
         }
         if (!empty($filter['HostAppName'])) {
             $builder->like('hostapp.HostAppName', $filter['HostAppName'], 'both');
@@ -45,9 +48,14 @@ class HostAppController extends BaseController {
     }
 
     public function show($HostAppID = null) {
+        $id = $this->requirePatchId($HostAppID, 'HostAppID');
+        if ($id === null) {
+            return;
+        }
+
         $row = $this->model->select('hostapp.*, site.SiteName')
             ->join('site', 'site.SiteID = hostapp.SiteID', 'left')
-            ->where('hostapp.HostAppID', $HostAppID)
+            ->where('hostapp.HostAppID', $id)
             ->first();
 
         if (empty($row)) {
@@ -60,10 +68,9 @@ class HostAppController extends BaseController {
     public function delete() {
         try {
             $input = $this->request->getJSON(true);
-            $id = $input['HostAppID'] ?? null;
+            $id = $this->requirePatchId($input['HostAppID'] ?? null, 'HostAppID');
-
+            if ($id === null) {
-            if (!$id) {
+                return;
-                return $this->failValidationErrors('HostAppID is required.');
             }
 
             $this->model->delete($id);
@@ -77,6 +84,7 @@ class HostAppController extends BaseController {
         $input = $this->request->getJSON(true);
 
         try {
+            unset($input['HostAppID']);
             $id = $this->model->insert($input, true);
             return $this->respondCreated(['status' => 'success', 'message' => 'data created successfully', 'data' => $id], 201);
         } catch (\Throwable $e) {
@@ -100,11 +108,12 @@ class HostAppController extends BaseController {
             return $this->respond(['status' => 'failed', 'message' => 'HostApp not found', 'data' => []], 404);
         }
 
-        if (isset($input['HostAppID']) && (string) $input['HostAppID'] !== (string) $id) {
+        if (isset($input['HostAppID'])) {
-            return $this->failValidationErrors('HostAppID in URL does not match body.');
+            if ((string) $input['HostAppID'] !== (string) $id) {
+                return $this->failValidationErrors('HostAppID in URL does not match body.');
+            }
+            unset($input['HostAppID']);
         }
-
-        $input['HostAppID'] = $id;
         try {
             $this->model->update($id, $input);
             return $this->respond(['status' => 'success', 'message' => 'data updated successfully', 'data' => $id], 200);

app/Controllers/Organization/HostComParaController.php

@@ -29,7 +29,10 @@ class HostComParaController extends BaseController {
             ->join('hostapp', 'hostapp.HostAppID = hostcompara.HostAppID', 'left');
 
         if (!empty($filter['HostAppID'])) {
-            $builder->where('hostcompara.HostAppID', $filter['HostAppID']);
+            if (!ctype_digit((string) $filter['HostAppID'])) {
+                return $this->failValidationErrors('HostAppID filter must be a valid integer.');
+            }
+            $builder->where('hostcompara.HostAppID', (int) $filter['HostAppID']);
         }
         if (!empty($filter['HostIP'])) {
             $builder->like('hostcompara.HostIP', $filter['HostIP'], 'both');
@@ -45,9 +48,14 @@ class HostComParaController extends BaseController {
     }
 
     public function show($HostAppID = null) {
+        $id = $this->requirePatchId($HostAppID, 'HostAppID');
+        if ($id === null) {
+            return;
+        }
+
         $row = $this->model->select('hostcompara.*, hostapp.HostAppName')
             ->join('hostapp', 'hostapp.HostAppID = hostcompara.HostAppID', 'left')
-            ->where('hostcompara.HostAppID', $HostAppID)
+            ->where('hostcompara.HostAppID', $id)
             ->first();
 
         if (empty($row)) {
@@ -60,10 +68,9 @@ class HostComParaController extends BaseController {
     public function delete() {
         try {
             $input = $this->request->getJSON(true);
-            $id = $input['HostAppID'] ?? null;
+            $id = $this->requirePatchId($input['HostAppID'] ?? null, 'HostAppID');
-
+            if ($id === null) {
-            if (!$id) {
+                return;
-                return $this->failValidationErrors('HostAppID is required.');
             }
 
             $this->model->delete($id);
@@ -77,6 +84,17 @@ class HostComParaController extends BaseController {
         $input = $this->request->getJSON(true);
 
         try {
+            $hostAppId = $input['HostAppID'] ?? null;
+            if ($hostAppId === null) {
+                return $this->failValidationErrors('HostAppID is required.');
+            }
+
+            if (!ctype_digit((string) $hostAppId)) {
+                return $this->failValidationErrors('HostAppID must be a valid integer.');
+            }
+
+            $input['HostAppID'] = (int) $hostAppId;
+
             $id = $this->model->insert($input, true);
             return $this->respondCreated(['status' => 'success', 'message' => 'data created successfully', 'data' => $id], 201);
         } catch (\Throwable $e) {
@@ -100,12 +118,13 @@ class HostComParaController extends BaseController {
             return $this->respond(['status' => 'failed', 'message' => 'HostComPara not found', 'data' => []], 404);
         }
 
-        if (isset($input['HostAppID']) && (string) $input['HostAppID'] !== (string) $id) {
+        if (isset($input['HostAppID'])) {
-            return $this->failValidationErrors('HostAppID in URL does not match body.');
+            if ((string) $input['HostAppID'] !== (string) $id) {
+                return $this->failValidationErrors('HostAppID in URL does not match body.');
+            }
+            unset($input['HostAppID']);
         }
 
-        $input['HostAppID'] = $id;
-
         try {
             $this->model->update($id, $input);
             return $this->respond(['status' => 'success', 'message' => 'data updated successfully', 'data' => $id], 200);

app/Controllers/Specimen/ContainerDefController.php

@@ -104,7 +104,7 @@ class ContainerDefController extends BaseController {
     $input['ConDefID'] = $id;
     try {
       $this->model->update($id, $input);
-      return $this->respond([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 200);
+      return $this->respondCreated([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 201);
     } catch (\Exception $e) {
       return $this->failServerError('Something went wrong: ' . $e->getMessage());
     }

app/Controllers/Specimen/SpecimenCollectionController.php

@@ -85,10 +85,12 @@ class SpecimenCollectionController extends BaseController {
         }
 
         $input['SpcColID'] = $id;
-        if (!$this->validateData($input, $this->rules)) { return $this->failValidationErrors($this->validator->getErrors()); }
+        if ($this->rules !== [] && !$this->validateData($input, $this->rules)) {
+            return $this->failValidationErrors($this->validator->getErrors());
+        }
         try {
             $this->model->update($id, $input);
-            return $this->respond([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 200);
+            return $this->respondCreated([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 201);
         } catch (\Exception $e) {
             return $this->failServerError('Something went wrong: ' . $e->getMessage());
         }

app/Controllers/Specimen/SpecimenPrepController.php

@@ -70,10 +70,12 @@ class SpecimenPrepController extends BaseController {
         }
 
         $input['SpcPrpID'] = $id;
-        if (!$this->validateData($input, $this->rules)) { return $this->failValidationErrors($this->validator->getErrors()); }
+        if ($this->rules !== [] && !$this->validateData($input, $this->rules)) {
+            return $this->failValidationErrors($this->validator->getErrors());
+        }
         try {
             $this->model->update($id, $input);
-            return $this->respond([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 200);
+            return $this->respondCreated([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 201);
         } catch (\Exception $e) {
             return $this->failServerError('Something went wrong: ' . $e->getMessage());
         }

app/Controllers/Specimen/SpecimenStatusController.php

@@ -83,10 +83,12 @@ class SpecimenStatusController extends BaseController {
         }
 
         $input['SpcStaID'] = $id;
-        if (!$this->validateData($input, $this->rules)) { return $this->failValidationErrors($this->validator->getErrors()); }
+        if ($this->rules !== [] && !$this->validateData($input, $this->rules)) {
+            return $this->failValidationErrors($this->validator->getErrors());
+        }
         try {
             $this->model->update($id, $input);
-            return $this->respond([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 200);
+            return $this->respondCreated([ 'status'  => 'success', 'message' => 'data updated successfully', 'data' => $id ], 201);
         } catch (\Exception $e) {
             return $this->failServerError('Something went wrong: ' . $e->getMessage());
         }