Merge branch 'main' into hotfix-qr-generation

onaio · Nov 26, 2024 · 444795e · 444795e
2 parents a21135b + 75d75bf
commit 444795e
Show file tree

Hide file tree

Showing 50 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: Run Unit Tests and Generate Coverage Report
         run: ./gradlew test jacocoTestReport
-        working-directory: efsity
+        working-directory: efsity-cli
 
   run-spotless-check:
     runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
 
       - name: Run spotless check
         run: ./gradlew spotlessCheck
-        working-directory: efsity
+        working-directory: efsity-cli
 
   run-importer-unit-tests:
     runs-on: ubuntu-latest

diff --git a/efsity/.gitignore → efisty-cli/.gitignore b/efsity/.gitignore → efisty-cli/.gitignore
diff --git a/efsity/README.md → efisty-cli/README.md b/efsity/README.md → efisty-cli/README.md
diff --git a/efsity/build.gradle.kts → efisty-cli/build.gradle.kts b/efsity/build.gradle.kts → efisty-cli/build.gradle.kts
diff --git a/...ty/docs/QuestionnaireResponseGenerator.md → ...li/docs/QuestionnaireResponseGenerator.md b/...ty/docs/QuestionnaireResponseGenerator.md → ...li/docs/QuestionnaireResponseGenerator.md
diff --git a/efsity/gradle.properties → efisty-cli/gradle.properties b/efsity/gradle.properties → efisty-cli/gradle.properties
diff --git a/efsity/gradle/wrapper/gradle-wrapper.jar → efisty-cli/gradle/wrapper/gradle-wrapper.jar b/efsity/gradle/wrapper/gradle-wrapper.jar → efisty-cli/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/efsity/gradlew → efisty-cli/gradlew b/efsity/gradlew → efisty-cli/gradlew
diff --git a/efsity/gradlew.bat → efisty-cli/gradlew.bat b/efsity/gradlew.bat → efisty-cli/gradlew.bat
diff --git a/efsity/libs.versions.toml → efisty-cli/libs.versions.toml b/efsity/libs.versions.toml → efisty-cli/libs.versions.toml
diff --git a/efsity/settings.gradle.kts → efisty-cli/settings.gradle.kts b/efsity/settings.gradle.kts → efisty-cli/settings.gradle.kts
diff --git a/...src/main/java/org/smartregister/Main.java → ...src/main/java/org/smartregister/Main.java b/...src/main/java/org/smartregister/Main.java → ...src/main/java/org/smartregister/Main.java
diff --git a/...ter/command/CarePlanGeneratorCommand.java → ...ter/command/CarePlanGeneratorCommand.java b/...ter/command/CarePlanGeneratorCommand.java → ...ter/command/CarePlanGeneratorCommand.java
diff --git a/...smartregister/command/ConvertCommand.java → ...smartregister/command/ConvertCommand.java b/...smartregister/command/ConvertCommand.java → ...smartregister/command/ConvertCommand.java
diff --git a/.../command/PublishFhirResourcesCommand.java → .../command/PublishFhirResourcesCommand.java b/.../command/PublishFhirResourcesCommand.java → .../command/PublishFhirResourcesCommand.java
diff --git a/...uestionnaireResponseGeneratorCommand.java → ...uestionnaireResponseGeneratorCommand.java b/...uestionnaireResponseGeneratorCommand.java → ...uestionnaireResponseGeneratorCommand.java
diff --git a/.../StructureMapExtractResourcesCommand.java → .../StructureMapExtractResourcesCommand.java b/.../StructureMapExtractResourcesCommand.java → .../StructureMapExtractResourcesCommand.java
diff --git a/...artregister/command/TranslateCommand.java → ...artregister/command/TranslateCommand.java b/...artregister/command/TranslateCommand.java → ...artregister/command/TranslateCommand.java
diff --git a/...martregister/command/ValidateCommand.java → ...martregister/command/ValidateCommand.java b/...martregister/command/ValidateCommand.java → ...martregister/command/ValidateCommand.java
diff --git a/...command/ValidateFhirResourcesCommand.java → ...command/ValidateFhirResourcesCommand.java b/...command/ValidateFhirResourcesCommand.java → ...command/ValidateFhirResourcesCommand.java
diff --git a/...command/ValidateFileStructureCommand.java → ...command/ValidateFileStructureCommand.java b/...command/ValidateFileStructureCommand.java → ...command/ValidateFileStructureCommand.java
diff --git a/.../command/ValidateStructureMapCommand.java → .../command/ValidateStructureMapCommand.java b/.../command/ValidateStructureMapCommand.java → .../command/ValidateStructureMapCommand.java
diff --git a/...ava/org/smartregister/domain/FctFile.java → ...ava/org/smartregister/domain/FctFile.java b/...ava/org/smartregister/domain/FctFile.java → ...ava/org/smartregister/domain/FctFile.java
diff --git a/...ter/processor/FctValidationProcessor.java → ...ter/processor/FctValidationProcessor.java b/...ter/processor/FctValidationProcessor.java → ...ter/processor/FctValidationProcessor.java
diff --git a/...ter/processor/QuestionnaireProcessor.java → ...ter/processor/QuestionnaireProcessor.java b/...ter/processor/QuestionnaireProcessor.java → ...ter/processor/QuestionnaireProcessor.java
diff --git a/...ster/processor/StructureMapProcessor.java → ...ster/processor/StructureMapProcessor.java b/...ster/processor/StructureMapProcessor.java → ...ster/processor/StructureMapProcessor.java
diff --git a/.../org/smartregister/util/FCTConstants.java → .../org/smartregister/util/FCTConstants.java b/.../org/smartregister/util/FCTConstants.java → .../org/smartregister/util/FCTConstants.java
diff --git a/...gister/util/FctStructureMapUtilities.java → ...gister/util/FctStructureMapUtilities.java b/...gister/util/FctStructureMapUtilities.java → ...gister/util/FctStructureMapUtilities.java
diff --git a/...java/org/smartregister/util/FctUtils.java → ...java/org/smartregister/util/FctUtils.java b/...java/org/smartregister/util/FctUtils.java → ...java/org/smartregister/util/FctUtils.java
diff --git a/...va/org/smartregister/util/HttpClient.java → ...va/org/smartregister/util/HttpClient.java b/...va/org/smartregister/util/HttpClient.java → ...va/org/smartregister/util/HttpClient.java
diff --git a/...l/authentication/OAuthAuthentication.java → ...l/authentication/OAuthAuthentication.java b/...l/authentication/OAuthAuthentication.java → ...l/authentication/OAuthAuthentication.java
diff --git a/...r/external/CqlToLibraryConvertServices.kt → ...r/external/CqlToLibraryConvertServices.kt b/...r/external/CqlToLibraryConvertServices.kt → ...r/external/CqlToLibraryConvertServices.kt
diff --git a/...ter/external/FhirCarePlanGeneratorLite.kt → ...ter/external/FhirCarePlanGeneratorLite.kt b/...ter/external/FhirCarePlanGeneratorLite.kt → ...ter/external/FhirCarePlanGeneratorLite.kt
diff --git a/...er/external/FhirPathEngineHostServices.kt → ...er/external/FhirPathEngineHostServices.kt b/...er/external/FhirPathEngineHostServices.kt → ...er/external/FhirPathEngineHostServices.kt
diff --git a/...ster/external/TransformSupportServices.kt → ...ster/external/TransformSupportServices.kt b/...ster/external/TransformSupportServices.kt → ...ster/external/TransformSupportServices.kt
diff --git a/...mand/PublishFhirResourcesCommandTest.java → ...mand/PublishFhirResourcesCommandTest.java b/...mand/PublishFhirResourcesCommandTest.java → ...mand/PublishFhirResourcesCommandTest.java
diff --git a/...ionnaireResponseGeneratorCommandTest.java → ...ionnaireResponseGeneratorCommandTest.java b/...ionnaireResponseGeneratorCommandTest.java → ...ionnaireResponseGeneratorCommandTest.java
diff --git a/...egister/command/TranslateCommandTest.java → ...egister/command/TranslateCommandTest.java b/...egister/command/TranslateCommandTest.java → ...egister/command/TranslateCommandTest.java
diff --git a/...and/ValidateFhirResourcesCommandTest.java → ...and/ValidateFhirResourcesCommandTest.java b/...and/ValidateFhirResourcesCommandTest.java → ...and/ValidateFhirResourcesCommandTest.java
diff --git a/...and/ValidateFileStructureCommandTest.java → ...and/ValidateFileStructureCommandTest.java b/...and/ValidateFileStructureCommandTest.java → ...and/ValidateFileStructureCommandTest.java
diff --git a/...mand/ValidateStructureMapCommandTest.java → ...mand/ValidateStructureMapCommandTest.java b/...mand/ValidateStructureMapCommandTest.java → ...mand/ValidateStructureMapCommandTest.java
diff --git a/.../clean_configs_folder/profile_config.json → .../clean_configs_folder/profile_config.json b/.../clean_configs_folder/profile_config.json → .../clean_configs_folder/profile_config.json
diff --git a/.../dirty_configs_folder/profile_config.json → .../dirty_configs_folder/profile_config.json b/.../dirty_configs_folder/profile_config.json → .../dirty_configs_folder/profile_config.json
diff --git a/...test/resources/fhirConfigsJsonSchema.json → ...test/resources/fhirConfigsJsonSchema.json b/...test/resources/fhirConfigsJsonSchema.json → ...test/resources/fhirConfigsJsonSchema.json
diff --git a/.../test/resources/merged_questionnaire.json → .../test/resources/merged_questionnaire.json b/.../test/resources/merged_questionnaire.json → .../test/resources/merged_questionnaire.json
diff --git a/...ty/src/test/resources/profile_config.json → ...li/src/test/resources/profile_config.json b/...ty/src/test/resources/profile_config.json → ...li/src/test/resources/profile_config.json
diff --git a/...src/test/resources/raw_questionnaire.json → ...src/test/resources/raw_questionnaire.json b/...src/test/resources/raw_questionnaire.json → ...src/test/resources/raw_questionnaire.json
diff --git a/...test/resources/strings_default.properties → ...test/resources/strings_default.properties b/...test/resources/strings_default.properties → ...test/resources/strings_default.properties
diff --git a/.../src/test/resources/strings_fr.properties → .../src/test/resources/strings_fr.properties b/.../src/test/resources/strings_fr.properties → .../src/test/resources/strings_fr.properties