Validate StructureMap

efsity/README.md

@@ -172,6 +172,24 @@ $ fct validateFileStructure -i ~/Workspace/fhir-resources/<project> -s ~/path/to
 If the file structure matches the schema then a positive result is printed to the terminal, otherwise an error 
 is thrown showing the issue.
 
+### Validating StructureMap 
+The tool supports validation of a single structureMap and questionnaire **(single mode)** and validation of all the project files for the questionnaires and structureMaps **(project mode)**. The tool maps the different questionnaires to the specified structureMaps and then generates the questionnaireResponses. Once the questionnaireResponses have been generated, the bundle is then generated with the respective resources ie.(= Patient, Condition). To do this run the following command:
+
+**Options**
+```
+-i or --input - path to project folder which needs to be validated
+ -v or --validate : (Optional) whether to validate FHIR resources before publishing or not. Optional boolean - default is `false`
+-sm or --structure-map - file path to the path to the folder containing the structure maps. These can be nested
+```
+
+```console (single-mode)
+$  fct validateStructureMap -i ~/Workspace/fhir-resources/<project>/questionnaire/resource.json -sm ~/Workspace/fhir-resources/coda/structure_map/coda-child-structure-map.txt
+```
+
+```console (project-mode)
+$  fct validateStructureMap -i ~/Workspace/fhir-resources/<project>/questionnaire/ -sm ~/Workspace/fhir-resources/coda/structure_map/`
+```
+
 ### Localization
 Tool that supports localization by the use of the translation extension
 

efsity/src/main/java/org/smartregister/Main.java

@@ -21,7 +21,8 @@
       TranslateCommand.class,
       QuestionnaireResponseGeneratorCommand.class,
       ValidateFileStructureCommand.class,
-      PublishFhirResourcesCommand.class
+      PublishFhirResourcesCommand.class,
+      ValidateStructureMapCommand.class,
     })
 public class Main implements Runnable {
   public static void main(String[] args) {

efsity/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java

@@ -91,7 +91,15 @@ public void run() {
     validateOptions();
     if (inputFilePath != null) {
       try {
-        generateResponse(inputFilePath, mode, extrasPath, fhir_base_url, apiKey);
+        generateResponse(
+            inputFilePath,
+            mode,
+            outputFilePath,
+            extrasPath,
+            fhir_base_url,
+            apiKey,
+            aiModel,
+            maxTokens);
       } catch (IOException e) {
         throw new RuntimeException(e);
       }
@@ -111,8 +119,15 @@ private void validateOptions() {
     }
   }
 
-  private void generateResponse(
-      String inputFilePath, String mode, String extrasPath, String fhir_base_url, String apiKey)
+  public static void generateResponse(
+      String inputFilePath,
+      String mode,
+      String outputFilePath,
+      String extrasPath,
+      String fhir_base_url,
+      String apiKey,
+      String aiModel,
+      String maxTokens)
       throws IOException {
     long start = System.currentTimeMillis();
 
@@ -127,17 +142,17 @@ private void generateResponse(
     String questionnaireResponseString =
         (Objects.equals(mode, "populate"))
             ? populateMode(questionnaireData, fhir_base_url, extrasPath)
-            : aiMode(questionnaireData, apiKey);
+            : aiMode(questionnaireData, apiKey, aiModel, maxTokens);
 
     // Write response to file
     FctUtils.printInfo("Writing response to file");
     String output =
-        Files.isDirectory(Paths.get(this.outputFilePath))
-            ? this.outputFilePath
+        Files.isDirectory(Paths.get(outputFilePath))
+            ? outputFilePath
                 + File.separator
                 + inputFile.getNameWithoutExtension()
                 + Constants.QUESTIONNAIRE_RESPONSE_SUFFIX
-            : this.outputFilePath;
+            : outputFilePath;
 
     FctUtils.writeJsonFile(output, questionnaireResponseString);
     FctUtils.printInfo(
@@ -148,7 +163,7 @@ private void generateResponse(
     FctUtils.printCompletedInDuration(start);
   }
 
-  Boolean checkResource(
+  static Boolean checkResource(
       String questionnaire_id, String resourceType, JSONObject resource, String fhir_base_url)
       throws IOException {
     JSONObject request = new JSONObject();
@@ -305,7 +320,7 @@ static JSONObject generateAnswer(
     }
   }
 
-  JSONArray getAnswers(JSONArray questions, JSONArray responses, JSONObject extras) {
+  static JSONArray getAnswers(JSONArray questions, JSONArray responses, JSONObject extras) {
     for (int i = 0; i < questions.length(); i++) {
       JSONObject current_question = questions.getJSONObject(i);
       String question_type = current_question.getString("type");
@@ -327,7 +342,7 @@ JSONArray getAnswers(JSONArray questions, JSONArray responses, JSONObject extras
     return responses;
   }
 
-  String populateMode(String questionnaireData, String fhir_base_url, String extrasPath)
+  static String populateMode(String questionnaireData, String fhir_base_url, String extrasPath)
       throws IOException {
     JSONObject resource = new JSONObject(questionnaireData);
     String questionnaire_id = resource.getString("id");
@@ -369,7 +384,8 @@ String populateMode(String questionnaireData, String fhir_base_url, String extra
     return String.valueOf(questionnaire_response);
   }
 
-  String aiMode(String questionnaireData, String apiKey) throws IOException {
+  static String aiMode(String questionnaireData, String apiKey, String aiModel, String maxTokens)
+      throws IOException {
     if (true) {
       throw new IllegalStateException("Sorry, the AI mode is temporarily unsupported");
     }
@@ -383,7 +399,7 @@ String aiMode(String questionnaireData, String apiKey) throws IOException {
 
     // Generate response
     String generatedResponseString =
-        aiGenerated(questionnaireJsonString, apiKey, this.aiModel, this.maxTokens);
+        aiGenerated(questionnaireJsonString, apiKey, aiModel, maxTokens);
     JSONObject obj = new JSONObject(generatedResponseString);
     JSONArray choices = obj.getJSONArray("choices");
     String questionnaireResponseString = "";

efsity/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java

@@ -42,19 +42,22 @@ public class StructureMapExtractResourcesCommand implements Runnable {
   public void run() {
 
     try {
-      extractResource(qr, sm);
+      extractResource(qr, sm, output);
 
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }
 
-  private void extractResource(String qrFilePath, String structureMapFilePath) throws IOException {
+  static void extractResource(String qrFilePath, String structureMapFilePath, String output)
+      throws IOException {
 
     long start = System.currentTimeMillis();
 
-    FctUtils.printInfo(String.format("Questionnaire Response file path \u001b[35m%s\u001b[0m", qr));
-    FctUtils.printInfo(String.format("Structure Map file path \u001b[35m%s\u001b[0m", sm));
+    FctUtils.printInfo(
+        String.format("Questionnaire Response file path \u001b[35m%s\u001b[0m", qrFilePath));
+    FctUtils.printInfo(
+        String.format("Structure Map file path \u001b[35m%s\u001b[0m", structureMapFilePath));
 
     FctFile questionnaireResponse = FctUtils.readFile(qrFilePath);