mahdahar/clqms-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: wrap test group members under testdefgrp

Browse Source 
Align CALC/GROUP request and response payloads to use the testdefgrp.members structure in controller handling, feature tests, and OpenAPI schemas/examples for a consistent API contract.
This commit is contained in:
mahdahar 2026-04-02 09:06:42 +07:00
parent eeaed768c9
commit 694c5a6211
5 changed files with 235 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/Test/TestsController.php
View File

@ -92,9 +92,13 @@ class TestsController extends BaseController
if ($typeCode === 'CALC') {
$row['testdefcal'] = $this->modelCal->getByTestSiteID($id);
$row['members'] = $this->modelGrp->getGroupMembers($id);
$row['testdefgrp'] = [
'members' => $this->modelGrp->getGroupMembers($id),
];
} elseif ($typeCode === 'GROUP') {
$row['members'] = $this->modelGrp->getGroupMembers($id);
$row['testdefgrp'] = [
'members' => $this->modelGrp->getGroupMembers($id),
];
} elseif ($typeCode !== 'TITLE') {
$refType = $row['RefType'] ?? '';
$resultType = $row['ResultType'] ?? '';
@ -511,7 +515,7 @@ class TestsController extends BaseController
{
$memberIDs = [];
$rawMembers = $input['members'] ?? [];
$rawMembers = $input['testdefgrp']['members'] ?? [];
if (is_array($rawMembers)) {
foreach ($rawMembers as $member) {
if (is_array($member)) {

21
public/api-docs.bundled.yaml
View File

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

10
public/components/schemas/tests.yaml
View File

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

11
public/paths/tests.yaml
View File

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

18
tests/feature/Test/TestCreateVariantsTest.php
View File

@ -364,11 +364,12 @@ class TestCreateVariantsTest extends CIUnitTestCase
$show->assertStatus(200);
$showData = json_decode($show->getJSON(), true)['data'];
$this->assertArrayHasKey('members', $showData);
$this->assertArrayNotHasKey('testdefgrp', $showData);
$this->assertArrayHasKey('testdefgrp', $showData);
$this->assertArrayHasKey('members', $showData['testdefgrp']);
$this->assertArrayNotHasKey('members', $showData);
if ($members !== []) {
$this->assertCount(count($members), $showData['members']);
$this->assertCount(count($members), $showData['testdefgrp']['members']);
}
}
@ -435,9 +436,10 @@ class TestCreateVariantsTest extends CIUnitTestCase
$show->assertStatus(200);
$showData = json_decode($show->getJSON(), true)['data'];
$this->assertArrayHasKey('members', $showData);
$this->assertArrayNotHasKey('testdefgrp', $showData);
$this->assertCount(count($members), $showData['members']);
$this->assertArrayHasKey('testdefgrp', $showData);
$this->assertArrayHasKey('members', $showData['testdefgrp']);
$this->assertArrayNotHasKey('members', $showData);
$this->assertCount(count($members), $showData['testdefgrp']['members']);
}
private function buildTechnicalPayload(string $testType, array $details = []): array
@ -471,7 +473,9 @@ class TestCreateVariantsTest extends CIUnitTestCase
'isVisibleScr' => 1,
'isVisibleRpt' => 1,
'isCountStat' => 0,
'testdefgrp' => [
'members' => array_map(fn ($id) => ['TestSiteID' => $id], $members),
],
'details' => [
'DisciplineID' => 2,
'DepartmentID' => 2,
@ -494,7 +498,9 @@ class TestCreateVariantsTest extends CIUnitTestCase
'isVisibleScr' => 1,
'isVisibleRpt' => 1,
'isCountStat' => 1,
'testdefgrp' => [
'members' => array_map(fn ($id) => ['TestSiteID' => $id], $members),
],
'testmap' => $testmap,
];
}