Skip to content

Commit 6c361ab

Browse files
committed
#599 - Update UI profile model to allow support of multiple value sets
- update AttributeDefinition to contain a List of referencedValueSets instead of just one - updated ontology missing as of now
1 parent 2ffe88c commit 6c361ab

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

src/main/java/de/numcodex/feasibility_gui_backend/terminology/api/AttributeDefinition.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ public record AttributeDefinition(
2323
@JsonProperty(value = "min") Double min,
2424
@JsonProperty(value = "max") Double max,
2525
@JsonProperty("referencedCriteriaSet") String referencedCriteriaSet,
26-
@JsonProperty("referencedValueSet") String referencedValueSet
26+
@JsonProperty("referencedValueSet") List<String> referencedValueSets
2727
) {
2828
public AttributeDefinition {
2929
selectableConcepts = (selectableConcepts == null) ? List.of() : selectableConcepts;
3030
allowedUnits = (allowedUnits == null) ? List.of() : allowedUnits;
31+
referencedValueSets = (referencedValueSets == null) ? List.of() : referencedValueSets;
3132
}
3233
}

src/main/resources/static/v3/api-docs/swagger.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,10 +1445,12 @@ components:
14451445
type: string
14461446
examples:
14471447
- http://fdpg.mii.cds/CriteriaSet/Diagnose/icd-10-gm
1448-
referencedValueSet:
1449-
type: string
1450-
examples:
1451-
- http://hl7.org/fhir/sid/icd-o-3
1448+
referencedValueSets:
1449+
type: array
1450+
items:
1451+
type: string
1452+
examples:
1453+
- http://hl7.org/fhir/sid/icd-o-3
14521454
type:
14531455
type: string
14541456
examples:

src/test/java/de/numcodex/feasibility_gui_backend/terminology/api/AttributeDefinitionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void testConstructorWithValues() {
2424
.min(0.0)
2525
.max(0.0)
2626
.referencedCriteriaSet(null)
27-
.referencedValueSet(null)
27+
.referencedValueSets(null)
2828
.build();
2929

3030
assertNotNull(attributeDefinition);
@@ -48,7 +48,7 @@ public void testConstructorWithNull() {
4848
.min(0.0)
4949
.max(0.0)
5050
.referencedCriteriaSet(null)
51-
.referencedValueSet(null)
51+
.referencedValueSets(null)
5252
.build();
5353

5454
assertNotNull(attributeDefinition);

src/test/java/de/numcodex/feasibility_gui_backend/terminology/v5/TerminologyRestControllerIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private AttributeDefinition createAttributeDefinition() {
238238
.type(ValueDefinitonType.CONCEPT)
239239
.optional(false)
240240
.referencedCriteriaSet("http://my.reference.criteria/set")
241-
.referencedValueSet("http://my.reference.value/set")
241+
.referencedValueSets(List.of("http://my.reference.value/set"))
242242
.comparator(Comparator.EQUAL)
243243
.precision(1.0)
244244
.selectableConcepts(List.of(createTermCode()))

0 commit comments

Comments
 (0)