Fix issues with extensions fields in generated resource records

Related issue: wso2-enterprise/open-healthcare#1672
ballerina-platform · Dec 6, 2024 · ec6a9e4 · ec6a9e4
1 parent cd13e9d
commit ec6a9e4
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 3 deletions.
diff --git a/...org/wso2/healthcare/fhir/ballerina/packagegen/tool/modelgen/DatatypeContextGenerator.java b/...org/wso2/healthcare/fhir/ballerina/packagegen/tool/modelgen/DatatypeContextGenerator.java
@@ -86,7 +86,9 @@ private void populateDatatypeContext() {
                 if (elementDefinition.getPath().contains(".")) {
                     String elementName = elementDefinition.getPath().substring(
                             elementDefinition.getPath().lastIndexOf(".") + 1);
-                    if ("id".equals(elementName) || "extension".equals(elementName)) {
+                    if ("id".equals(elementName) || "extension".equals(elementName)
+                            || elementDefinition.getPath().contains(".extension.")) {
+                        //skipping for generating datatype extensions
                         continue;
                     }
                     Element element = new Element();
@@ -135,8 +137,7 @@ private void populateExtendedElementsMap(Element element, DatatypeTemplateContex
             if (elementDataType.equals("code") && element.hasChildElements()) {
                 extendedElement = GeneratorUtils.getInstance().populateExtendedElement(element, BallerinaDataType.Enum, elementDataType,
                         context.getName());
-                context.getExtendedElements().putIfAbsent(extendedElement.getTypeName(), extendedElement);
-                element.setName(extendedElement.getTypeName());
+                context.getExtendedElements().putIfAbsent(element.getName(), extendedElement);
                 element.setExtended(true);
             }
         }

diff --git a/...org/wso2/healthcare/fhir/ballerina/packagegen/tool/modelgen/ResourceContextGenerator.java b/...org/wso2/healthcare/fhir/ballerina/packagegen/tool/modelgen/ResourceContextGenerator.java
@@ -212,6 +212,10 @@ public int compare(ElementDefinition e1, ElementDefinition e2) {
                                         elementName = tempElement + CommonUtil.toCamelCase(type.getCode());
 
                                     Element childElement = populateElement(rootElementName, elementName, type, isSlice, elementDefinition);
+                                    if (ToolConstants.DATA_TYPE_EXTENSION.equals(childElement.getDataType()) &&
+                                            !elementName.equals("extension") && !elementName.equals("modifierExtension")) {
+                                        continue;
+                                    }
                                     if (rootElement.getChildElements() != null) {
                                         if (!rootElement.getChildElements().containsKey(elementName)) {
                                             rootElement.getChildElements().put(elementName, childElement);
@@ -480,6 +484,9 @@ private void putExtendedElementIfAbsent(Element element, ExtendedElement extende
 
     private void populateResourceSliceElementsMap(Element element) {
         LOG.debug("Started: Resource Slice Element Map population");
+        if (ToolConstants.DATA_TYPE_EXTENSION.equals(element.getDataType()) && element.isSlice()) {
+            return;
+        }
         if (element.hasChildElements()) {
             for (Map.Entry<String, Element> childEntry : element.getChildElements().entrySet()) {
                 populateResourceSliceElementsMap(childEntry.getValue());

diff --git a/...rc/main/java/org/wso2/healthcare/fhir/ballerina/packagegen/tool/utils/GeneratorUtils.java b/...rc/main/java/org/wso2/healthcare/fhir/ballerina/packagegen/tool/utils/GeneratorUtils.java
@@ -108,6 +108,49 @@ public class GeneratorUtils {
             put("'type", "AddressType");
             put("use", "AddressUse");
         }});
+        put("ContactPoint", new HashMap<>() {{
+            put("system", "ContactPointSystem");
+            put("use", "ContactPointUse");
+        }});
+        put("Contributor", new HashMap<>() {{
+            put("type", "ContributorType");
+        }});
+        put("ElementBinding", new HashMap<>() {{
+            put("strength", "StrengthCode");
+        }});
+        put("ElementDiscriminator", new HashMap<>() {{
+            put("type", "ElementDiscriminatorType");
+        }});
+        put("ElementRepeat", new HashMap<>() {{
+            put("durationUnit", "Timecode");
+            put("periodUnit", "Timecode");
+            put("dayOfWeek", "Daycode");
+        }});
+        put("ElementSlicing", new HashMap<>() {{
+            put("rules", "ElementSlicingRules");
+        }});
+        put("ElementSort", new HashMap<>() {{
+            put("direction", "DirectionCode");
+        }});
+        put("ElementType", new HashMap<>() {{
+            put("aggregation", "TypeAggregation");
+            put("versioning", "TypeVersioning");
+        }});
+        put("HumanName", new HashMap<>() {{
+            put("use", "HumanNameUse");
+        }});
+        put("Identifier", new HashMap<>() {{
+            put("use", "IdentifierUse");
+        }});
+        put("Narrative", new HashMap<>() {{
+            put("status", "StatusCode");
+        }});
+        put("ParameterDefinition", new HashMap<>() {{
+            put("use", "ParameterDefinitionUse");
+        }});
+        put("Quantity", new HashMap<>() {{
+            put("comparator", "QuantityComparatorCode");
+        }});
     }};
 
     private static final GeneratorUtils instance = new GeneratorUtils();