change import path of profiles and sync tasks to a global property configuration path.

Author: slubwama

api/src/main/java/org/openmrs/module/ugandaemrsync/UgandaEMRSyncActivator.java

@@ -11,6 +11,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.openmrs.Concept;
+import org.openmrs.api.context.Context;
 import org.openmrs.module.BaseModuleActivator;
 import org.openmrs.module.ugandaemrsync.io.impl.FhirProfileImportServiceImpl;
 import org.openmrs.module.ugandaemrsync.server.SyncGlobalProperties;
@@ -56,6 +58,7 @@ public void started() {
 	 */
 	private void importConfigurationsOnStartup() {
 		try {
+			String path = Context.getAdministrationService().getGlobalProperty(UgandaEMRSyncConfig.GP_CONFIGURATION_DIRECTORY);
 			// Try to import from classpath resources first (bundled with module)
 			FhirProfileImportServiceImpl importService = new FhirProfileImportServiceImpl();
 			boolean importedFromClasspath = importService.importConfigurationsFromClasspath();

api/src/main/java/org/openmrs/module/ugandaemrsync/UgandaEMRSyncConfig.java

@@ -103,5 +103,8 @@ public class UgandaEMRSyncConfig {
 	public static final String PATIENT_ID_TYPE_CROSS_BORDER_NAME = "Patient Unique  ID Code (UIC)";
 	public static final String FSHR_SYNC_FHIR_PROFILE_UUID = "f2190cf4-2236-11ee-be56-0242ac120002";
 
+	public static final String GP_CONFIGURATION_DIRECTORY = "ugandaemrsync.configuration.directory";
+	public static final String GP_HIE_SETTINGS_IMPORT_DIRECTORY = "ugandaemrsync.hieSettingsImport.directory";
+
 
 }

api/src/main/java/org/openmrs/module/ugandaemrsync/io/impl/FhirProfileImportServiceImpl.java

@@ -292,19 +292,27 @@ public ValidationResult validateProfile(String jsonConfig) {
      * Import profiles from configuration directory on startup
      *
      * @param configPath Base configuration directory path (e.g., /path/to/configuration)
-     *                   Expected subdirectories: hie/syncprofile/ and hie/synctasktype/
+     *                   Expected subdirectories: syncprofile/ and synctasktype/
+     *                   If null, reads from global property ugandaemrsync.configuration.directory
      */
     public void importConfigurationsFromDirectory(String configPath) {
-        Path configDir = Paths.get(configPath, "hie");
-        if (!Files.exists(configDir)) {
-            log.info("Configuration directory not found: " + configDir);
+        // If no path provided, use global property default
+        if (configPath == null) {
+            configPath = getConfigDirectoryPath();
+        }
+
+        // Import from syncprofile and synctasktype subdirectories directly
+        // (not under hie/ - the global property can point to the exact location)
+        Path baseConfigDir = Paths.get(configPath);
+        if (!Files.exists(baseConfigDir)) {
+            log.info("Configuration directory not found: " + baseConfigDir);
             return;
         }
 
-        log.info("Importing configurations from: " + configDir);
+        log.info("Importing configurations from: " + baseConfigDir);
 
         // Import profiles
-        Path profileDir = configDir.resolve("syncprofile");
+        Path profileDir = baseConfigDir.resolve("syncprofile");
         List<SyncFhirProfile> importedProfiles = new ArrayList<>();
         if (Files.exists(profileDir)) {
             try {
@@ -329,7 +337,7 @@ public void importConfigurationsFromDirectory(String configPath) {
         }
 
         // Import task types
-        Path taskTypeDir = configDir.resolve("synctasktype");
+        Path taskTypeDir = baseConfigDir.resolve("synctasktype");
         if (Files.exists(taskTypeDir)) {
             try {
                 Files.list(taskTypeDir).filter(p -> p.toString().endsWith(".json")).forEach(p -> {
@@ -346,6 +354,33 @@ public void importConfigurationsFromDirectory(String configPath) {
         }
     }
 
+    /**
+     * Get the configuration directory path from global property.
+     * First checks if the global property is set to an absolute path.
+     * If not, resolves relative to OpenMRS application data directory.
+     * Falls back to default "configuration/hie" if property is not set.
+     *
+     * @return Resolved configuration directory path
+     */
+    private String getConfigDirectoryPath() {
+        org.openmrs.api.AdministrationService adminService = Context.getService(org.openmrs.api.AdministrationService.class);
+        String configDir = adminService.getGlobalProperty("ugandaemrsync.configuration.directory");
+
+        if (configDir == null || configDir.trim().isEmpty()) {
+            configDir = "configuration/hie"; // Default
+        }
+
+        // Check if it's an absolute path
+        Path path = Paths.get(configDir);
+        if (path.isAbsolute()) {
+            return configDir;
+        }
+
+        // Relative path - resolve against OpenMRS application data directory
+        String openmrsDataDir = org.openmrs.util.OpenmrsUtil.getApplicationDataDirectory();
+        return Paths.get(openmrsDataDir, configDir).toString();
+    }
+
     /**
      * Import configurations from classpath resources (bundled with module)
      *

api/src/main/resources/configuration/hie/syncprofile/profile-prison-patient-data-exchange.json

@@ -567,7 +567,18 @@
             The allowable test order to be referred and their data requirements.
         </description>
     </globalProperty>
-    
+
+    <!-- FHIR Profile Configuration Import -->
+    <globalProperty>
+        <property>ugandaemrsync.configuration.directory</property>
+        <defaultValue>configuration/hie</defaultValue>
+        <description>
+            Directory path (relative to OpenMRS application data directory or module classpath) from which to import FHIR profile configurations.
+            This can be an absolute path, a path relative to the OpenMRS application data directory, or a classpath-relative path.
+            Default is 'configuration/hie' which looks for profiles in {OPENMRS_DATA_DIR}/configuration/hie/ and classpath:configuration/hie/
+        </description>
+    </globalProperty>
+
     <!-- Internationalization -->
     <!-- All message codes should start with ugandaemrsync.* -->
     <messages>