fix: align test members payload with top-level API contract

app/Controllers/Test/TestsController.php

@@ -92,9 +92,9 @@ class TestsController extends BaseController
 
         if ($typeCode === 'CALC') {
             $row['testdefcal'] = $this->modelCal->getByTestSiteID($id);
-            $row['testdefgrp'] = $this->modelGrp->getGroupMembers($id);
+            $row['members'] = $this->modelGrp->getGroupMembers($id);
         } elseif ($typeCode === 'GROUP') {
-            $row['testdefgrp'] = $this->modelGrp->getGroupMembers($id);
+            $row['members'] = $this->modelGrp->getGroupMembers($id);
         } elseif ($typeCode !== 'TITLE') {
             $refType = $row['RefType'] ?? '';
             $resultType = $row['ResultType'] ?? '';
@@ -491,7 +491,7 @@ class TestsController extends BaseController
             $this->modelGrp->disableByTestSiteID($testSiteID);
         }
 
-        $memberIDs = $this->resolveCalcMemberIDs($data, $input);
+        $memberIDs = $this->resolveMemberIDs($input);
 
         // Validate member IDs before insertion
         $validation = $this->validateMemberIDs($memberIDs);
@@ -507,15 +507,14 @@ class TestsController extends BaseController
         }
     }
 
-    private function resolveCalcMemberIDs(array $data, array $input): array
+    private function resolveMemberIDs(array $input): array
     {
         $memberIDs = [];
 
-        $rawMembers = $data['members'] ?? ($input['members'] ?? []);
+        $rawMembers = $input['members'] ?? [];
         if (is_array($rawMembers)) {
             foreach ($rawMembers as $member) {
                 if (is_array($member)) {
-                    // Only accept TestSiteID, not Member (which might be SeqScr)
                     $rawID = $member['TestSiteID'] ?? null;
                 } else {
                     $rawID = is_numeric($member) ? $member : null;
@@ -563,20 +562,7 @@ class TestsController extends BaseController
             $this->modelGrp->disableByTestSiteID($testSiteID);
         }
 
-        $members = $data['members'] ?? ($input['Members'] ?? []);
+        $memberIDs = $this->resolveMemberIDs($input);
-        $memberIDs = [];
-
-        if (is_array($members)) {
-            foreach ($members as $m) {
-                // Only accept TestSiteID, not Member (which might be SeqScr)
-                $memberID = is_array($m) ? ($m['TestSiteID'] ?? null) : $m;
-                if ($memberID && is_numeric($memberID)) {
-                    $memberIDs[] = (int) $memberID;
-                }
-            }
-        }
-
-        $memberIDs = array_values(array_unique(array_filter($memberIDs)));
 
         // Validate member IDs before insertion
         $validation = $this->validateMemberIDs($memberIDs);

public/api-docs.bundled.yaml

@@ -4671,10 +4671,6 @@ paths:
                     FormulaCode:
                       type: string
                       description: Formula expression for calculated tests (e.g., "{TBIL} - {DBIL}")
-                testdefgrp:
-                  type: object
-                  description: Group member payload stored in the `testdefgrp` table.
-                  properties:
                 members:
                   type: array
                   description: Array of member TestSiteIDs for CALC/GROUP definitions.
@@ -5100,7 +5096,6 @@ paths:
                   DepartmentID: 2
                   testdefcal:
                     FormulaCode: CKD_EPI(CREA,AGE,GENDER)
-                  testdefgrp:
                   members:
                     - TestSiteID: 21
                     - TestSiteID: 22
@@ -5142,7 +5137,6 @@ paths:
                   DepartmentID: 2
                   testdefcal:
                     FormulaCode: CKD_EPI(CREA,AGE,GENDER)
-                  testdefgrp:
                   members:
                     - TestSiteID: 21
                     - TestSiteID: 22
@@ -5169,7 +5163,6 @@ paths:
                           ConDefID: 1
                           ClientTestCode: LIPID_C
                           ClientTestName: Lipid Client
-                  testdefgrp:
                   members:
                     - TestSiteID: 169
                     - TestSiteID: 170
@@ -5334,10 +5327,6 @@ paths:
                     FormulaCode:
                       type: string
                       description: Formula expression for calculated tests (e.g., "{TBIL} - {DBIL}")
-                testdefgrp:
-                  type: object
-                  description: Group member payload stored in the `testdefgrp` table.
-                  properties:
                 members:
                   type: array
                   description: Array of member TestSiteIDs for CALC/GROUP definitions.
@@ -7061,12 +7050,12 @@ components:
           description: Calculated test details (only for CALC type)
           items:
             type: object
-        testdefgrp:
+        members:
           type: array
           description: |
             Group members (for GROUP and CALC types).
-            When creating or updating, provide members in details.members array with TestSiteID field.
+            When creating or updating, provide members in members array with TestSiteID field.
-            Do NOT use Member or SeqScr fields when creating/updating.
+            Do NOT use Member, SeqScr, or Members fields when creating/updating.
           items:
             type: object
             properties:
@@ -7080,7 +7069,7 @@ components:
                 type: integer
                 description: |
                   Member TestSiteID (foreign key to testdefsite).
-                  **Note**: This field is in the response. When creating/updating, use TestSiteID in details.members array instead.
+                  **Note**: This field is in the response. When creating/updating, use TestSiteID in members array instead.
               TestSiteCode:
                 type: string
                 description: Member test code
@@ -7349,7 +7338,7 @@ components:
                 FormulaCode: CKD_EPI(CREA,AGE,GENDER)
                 Unit1: mL/min/1.73m2
                 Decimal: 0
-            testdefgrp:
+            members:
               - TestSiteID: 21
                 TestSiteCode: CREA
                 TestSiteName: Creatinine
@@ -7391,7 +7380,7 @@ components:
             isVisibleScr: 1
             isVisibleRpt: 1
             isCountStat: 1
-            testdefgrp:
+            members:
               - TestGrpID: 1
                 TestSiteID: 6
                 Member: 100

public/components/schemas/tests.yaml

@@ -183,12 +183,12 @@ TestDefinition:
       description: Calculated test details (only for CALC type)
       items:
         type: object
-    testdefgrp:
+    members:
       type: array
       description: |
         Group members (for GROUP and CALC types).
-        When creating or updating, provide members in details.members array with TestSiteID field.
+        When creating or updating, provide members in members array with TestSiteID field.
-        Do NOT use Member or SeqScr fields when creating/updating.
+        Do NOT use Member, SeqScr, or Members fields when creating/updating.
       items:
         type: object
         properties:
@@ -202,7 +202,7 @@ TestDefinition:
             type: integer
             description: |
               Member TestSiteID (foreign key to testdefsite).
-              **Note**: This field is in the response. When creating/updating, use TestSiteID in details.members array instead.
+              **Note**: This field is in the response. When creating/updating, use TestSiteID in members array instead.
           TestSiteCode:
             type: string
             description: Member test code
@@ -467,7 +467,7 @@ TestDefinition:
             FormulaCode: CKD_EPI(CREA,AGE,GENDER)
             Unit1: mL/min/1.73m2
             Decimal: 0
-        testdefgrp:
+        members:
           - TestSiteID: 21
             TestSiteCode: CREA
             TestSiteName: Creatinine
@@ -509,7 +509,7 @@ TestDefinition:
         isVisibleScr: 1
         isVisibleRpt: 1
         isCountStat: 1
-        testdefgrp:
+        members:
           - TestGrpID: 1
             TestSiteID: 6
             Member: 100

public/paths/tests.yaml

@@ -185,10 +185,6 @@
                   FormulaCode:
                     type: string
                     description: Formula expression for calculated tests (e.g., "{TBIL} - {DBIL}")
-              testdefgrp:
-                type: object
-                description: Group member payload stored in the `testdefgrp` table.
-                properties:
               members:
                 type: array
                 description: Array of member TestSiteIDs for CALC/GROUP definitions.
@@ -614,7 +610,6 @@
                 DepartmentID: 2
                 testdefcal:
                   FormulaCode: CKD_EPI(CREA,AGE,GENDER)
-                testdefgrp:
                 members:
                   - TestSiteID: 21
                   - TestSiteID: 22
@@ -656,7 +651,6 @@
                 DepartmentID: 2
                 testdefcal:
                   FormulaCode: CKD_EPI(CREA,AGE,GENDER)
-                testdefgrp:
                 members:
                   - TestSiteID: 21
                   - TestSiteID: 22
@@ -683,7 +677,6 @@
                         ConDefID: 1
                         ClientTestCode: LIPID_C
                         ClientTestName: Lipid Client
-                testdefgrp:
                 members:
                   - TestSiteID: 169
                   - TestSiteID: 170
@@ -834,10 +827,6 @@
                   FormulaCode:
                     type: string
                     description: Formula expression for calculated tests (e.g., "{TBIL} - {DBIL}")
-              testdefgrp:
-                type: object
-                description: Group member payload stored in the `testdefgrp` table.
-                properties:
               members:
                 type: array
                 description: Array of member TestSiteIDs for CALC/GROUP definitions.

tests/feature/Test/TestCreateVariantsTest.php

@@ -359,6 +359,17 @@ class TestCreateVariantsTest extends CIUnitTestCase
         $this->assertArrayHasKey('data', $json);
         $this->assertArrayHasKey('TestSiteId', $json['data']);
         $this->assertIsInt($json['data']['TestSiteId']);
+
+        $show = $this->call('get', $this->endpoint . '/' . $json['data']['TestSiteId']);
+        $show->assertStatus(200);
+
+        $showData = json_decode($show->getJSON(), true)['data'];
+        $this->assertArrayHasKey('members', $showData);
+        $this->assertArrayNotHasKey('testdefgrp', $showData);
+
+        if ($members !== []) {
+            $this->assertCount(count($members), $showData['members']);
+        }
     }
 
     private function assertTechnicalCreated(
@@ -390,6 +401,7 @@ class TestCreateVariantsTest extends CIUnitTestCase
         $this->assertArrayHasKey('data', $json);
         $this->assertArrayHasKey('TestSiteId', $json['data']);
         $this->assertIsInt($json['data']['TestSiteId']);
+
     }
 
     private function assertCalculatedCreated(
@@ -418,6 +430,14 @@ class TestCreateVariantsTest extends CIUnitTestCase
         $this->assertArrayHasKey('data', $json);
         $this->assertArrayHasKey('TestSiteId', $json['data']);
         $this->assertIsInt($json['data']['TestSiteId']);
+
+        $show = $this->call('get', $this->endpoint . '/' . $json['data']['TestSiteId']);
+        $show->assertStatus(200);
+
+        $showData = json_decode($show->getJSON(), true)['data'];
+        $this->assertArrayHasKey('members', $showData);
+        $this->assertArrayNotHasKey('testdefgrp', $showData);
+        $this->assertCount(count($members), $showData['members']);
     }
 
     private function buildTechnicalPayload(string $testType, array $details = []): array
@@ -451,11 +471,11 @@ class TestCreateVariantsTest extends CIUnitTestCase
             'isVisibleScr' => 1,
             'isVisibleRpt' => 1,
             'isCountStat' => 0,
+            'members' => array_map(fn ($id) => ['TestSiteID' => $id], $members),
             'details' => [
                 'DisciplineID' => 2,
                 'DepartmentID' => 2,
                 'FormulaCode' => '{GLU} + {CREA}',
-                'members' => array_map(fn ($id) => ['TestSiteID' => $id], $members),
             ],
         ];
 
@@ -474,9 +494,7 @@ class TestCreateVariantsTest extends CIUnitTestCase
             'isVisibleScr' => 1,
             'isVisibleRpt' => 1,
             'isCountStat' => 1,
-            'details' => [
             'members' => array_map(fn ($id) => ['TestSiteID' => $id], $members),
-            ],
             'testmap' => $testmap,
         ];
     }
@@ -491,7 +509,7 @@ class TestCreateVariantsTest extends CIUnitTestCase
             'Decimal' => array_key_exists('Decimal', $details) ? $details['Decimal'] : 0,
         ];
 
-        foreach (['ResultType', 'RefType', 'FormulaCode', 'members', 'ExpectedTAT', 'Factor', 'ReqQty', 'ReqQtyUnit', 'Unit2', 'VSet', 'CollReq'] as $key) {
+        foreach (['ResultType', 'RefType', 'FormulaCode', 'ExpectedTAT', 'Factor', 'ReqQty', 'ReqQtyUnit', 'Unit2', 'VSet', 'CollReq'] as $key) {
             if (array_key_exists($key, $details)) {
                 $normalized[$key] = $details[$key];
             }