minor refactor

Author: cjmamo

iol/README.md

@@ -39,7 +39,7 @@
               path: dataElements
               arrayName: dataElements
               filter: "{{dhis2.loincCodesAttribute.id}}:!null"
-              fields: "*"
+              fields: code,attributeValues
               client: "#dhis2Client"
         - transform:
             groovy: |

iol/src/main/resources/camel/get-de-code-dict.camel.yaml

@@ -39,7 +39,7 @@
               path: options
               arrayName: options
               filter: "{{dhis2.loincCodesAttribute.id}}:!null"
-              fields: "*"
+              fields: code,attributeValues
               client: "#dhis2Client"
         - transform:
             groovy: |

iol/src/main/resources/camel/get-opt-code-dict.camel.yaml

@@ -43,7 +43,8 @@
         - split:
             expression:
               groovy: |
-                variables.events.findAll {it.programStage.get() == '{{dhis2.program.labRequestProgramStage.id}}'
-                  && it.status.equals(org.hisp.dhis.api.model.v42_4.EventsRefRef.EventStatus.COMPLETED)}
+                variables.events.findAll {
+                    it.programStage.get() == '{{dhis2.program.labRequestProgramStage.id}}' && it.status.equals(org.hisp.dhis.api.model.v42_4.EventsRefRef.EventStatus.COMPLETED)
+                }
             steps:
               - to: direct:processLabRequest

iol/src/main/resources/camel/process-enrollment.camel.yaml

@@ -36,13 +36,17 @@
         - setVariable:
             name: specimenId
             groovy: |
-              body.dataValues.get().find {it.dataElement.get() == '{{dhis2.program.specimenDataElement.id}}'}?.value?.get()
+              body.dataValues.get().find {
+                  it.dataElement.get() == '{{dhis2.program.specimenDataElement.id}}'
+              }?.value?.get()
         - filter:
             groovy: |
-              variables.specimenId != null
-              && variables.events.find {it.programStage.get() == '{{dhis2.program.labResultProgramStage.id}}' 
-                && (it.dataValues.get().find {it.dataElement.get() == '{{dhis2.program.specimenDataElement.id}}' 
-                    && it.value.get() == variables.specimenId} != null)} == null
+              variables.specimenId != null && variables.events.find {
+                  it.programStage.get() == '{{dhis2.program.labResultProgramStage.id}}' && (it.dataValues.get().find {
+                      it.dataElement.get() == '{{dhis2.program.specimenDataElement.id}}' && it.value.get() 
+                          == variables.specimenId
+                  } != null)
+              } == null
         - setVariable:
             name: labRequestEvent
             groovy: body