From 1093bf17e92c75043e6c7c1b5fe2726c07b00a3e Mon Sep 17 00:00:00 2001
From: Fred Deniger <fdeniger@icrc.org>
Date: Wed, 1 May 2024 17:47:36 +0200
Subject: [PATCH] remove attribute for appointments.

---
 backend/distro.properties                     |  8 ++---
 backend/log4j2.xml                            |  1 +
 backend/module-create-users/api/pom.xml       |  7 +++++
 .../createusers/CreateUsersActivator.java     | 16 ++++++++--
 .../create-clerk-community-outreach.xml       |  0
 .../src/main/resources/create-clerk-many.xml  |  0
 .../resources/create-clerk-mobile-clinic.xml  |  0
 .../create-clerk-outpatient-clinic.xml        |  0
 .../create-doctor-community-outreach.xml      |  0
 .../src/main/resources/create-doctor-many.xml |  2 +-
 .../resources/create-doctor-mobile-clinic.xml |  0
 .../create-doctor-outpatient-clinic.xml       |  0
 .../create-nurse-community-outreach.xml       |  0
 .../src/main/resources/create-nurse-many.xml  |  0
 .../resources/create-nurse-mobile-clinic.xml  |  0
 .../create-nurse-outpatient-clinic.xml        |  0
 .../liquibase-add-default-users.xml}          |  2 +-
 .../omod/src/main/resources/config.xml        | 21 ++++++++------
 .../omod/src/main/resources/create-roles.xml  | 29 -------------------
 backend/module-create-users/pom.xml           |  7 ++++-
 backend/startup-oauth2.sh                     |  1 -
 21 files changed, 45 insertions(+), 49 deletions(-)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-clerk-community-outreach.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-clerk-many.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-clerk-mobile-clinic.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-clerk-outpatient-clinic.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-doctor-community-outreach.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-doctor-many.xml (99%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-doctor-mobile-clinic.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-doctor-outpatient-clinic.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-nurse-community-outreach.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-nurse-many.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-nurse-mobile-clinic.xml (100%)
 rename backend/module-create-users/{omod => api}/src/main/resources/create-nurse-outpatient-clinic.xml (100%)
 rename backend/module-create-users/{omod/src/main/resources/liquibase.xml => api/src/main/resources/liquibase-add-default-users.xml} (96%)
 delete mode 100644 backend/module-create-users/omod/src/main/resources/create-roles.xml

diff --git a/backend/distro.properties b/backend/distro.properties
index c1f0cf5..9bc25ec 100644
--- a/backend/distro.properties
+++ b/backend/distro.properties
@@ -1,8 +1,6 @@
 name=Ref 3.x distro
 version=${project.version}
 war.openmrs=${openmrs.version}
-# create users using datafilter on locations
-omod.create-users=${create-users.version}
 omod.initializer=${initializer.version}
 omod.fhir2=${fhir2.version}
 omod.webservices.rest=${webservices.rest.version}
@@ -16,8 +14,8 @@ omod.owa=${owa.version}
 omod.referencedemodata=${referencedemodata.version}
 omod.attachments=${attachments.version}
 omod.queue=${queue.version}
-omod.appointments=${appointments.version}
-omod.appointments.groupId=org.bahmni.module
+#omod.appointments=${appointments.version}
+#omod.appointments.groupId=org.bahmni.module
 #omod.teleconsultation=${teleconsultation.version}
 #omod.teleconsultation.groupId=org.bahmni.module
 omod.cohort=${cohort.version}
@@ -33,6 +31,8 @@ omod.o3forms=${o3forms.version}
 # ICRC Demo customization
 omod.datafilter=${datafilter.version}
 omod.oauth2login=${oauth2login.version}
+# create users using datafilter on locations
+omod.create-users=${create-users.version}
 # To Remove error: java.lang.NoClassDefFoundError: org/ict4h/atomfeed/transaction/AFTransactionWork
 #omod.openmrs-atomfeed=${openmrsAtomfeed.version}
 #omod.openmrs-atomfeed.groupId=org.ict4h.openmrs
diff --git a/backend/log4j2.xml b/backend/log4j2.xml
index 1931465..2b950b7 100644
--- a/backend/log4j2.xml
+++ b/backend/log4j2.xml
@@ -34,6 +34,7 @@
         <Logger name="org.springframework" level="WARN" />
         <Logger name="org.openmrs" level="WARN" />
         <Logger name="org.openmrs.module.initializer" level="INFO" />
+        <Logger name="org.openmrs.module.referencedemodata" level="INFO" />
         <Logger name="org.openmrs.module.initializer.api.OrderedFile" level="ERROR" />
         <Logger name="liquibase" level="INFO" />
         <!--
diff --git a/backend/module-create-users/api/pom.xml b/backend/module-create-users/api/pom.xml
index e27563b..a45ee6b 100644
--- a/backend/module-create-users/api/pom.xml
+++ b/backend/module-create-users/api/pom.xml
@@ -11,4 +11,11 @@
 	<packaging>jar</packaging>
 	<name>create-users API</name>
 	<description>API project for create-users</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.openmrs.api</groupId>
+			<artifactId>openmrs-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/backend/module-create-users/api/src/main/java/org/openmrs/module/createusers/CreateUsersActivator.java b/backend/module-create-users/api/src/main/java/org/openmrs/module/createusers/CreateUsersActivator.java
index dfec624..01abe71 100644
--- a/backend/module-create-users/api/src/main/java/org/openmrs/module/createusers/CreateUsersActivator.java
+++ b/backend/module-create-users/api/src/main/java/org/openmrs/module/createusers/CreateUsersActivator.java
@@ -9,9 +9,13 @@
  */
 package org.openmrs.module.createusers;
 
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.module.BaseModuleActivator;
+import org.openmrs.util.DatabaseUpdateException;
+import org.openmrs.util.DatabaseUpdater;
+import org.openmrs.util.InputRequiredException;
 
 /**
  * This class contains the logic that is run every time this module is either started or shutdown
@@ -24,14 +28,20 @@ public class CreateUsersActivator extends BaseModuleActivator {
 	 * @see #started()
 	 */
 	public void started() {
-		log.info("Started Create.users");
-	}
+		log.warn("Started Create.users");
+		log.warn("Normally oauth2 module should manage datafilter inputs as well: To be improved.");
+		try {
+			DatabaseUpdater.executeChangelog("liquibase-add-default-users.xml", MapUtils.EMPTY_MAP);
+		} catch (DatabaseUpdateException | InputRequiredException e) {
+			log.error(e);
+		}
+  }
 	
 	/**
 	 * @see #shutdown()
 	 */
 	public void shutdown() {
-		log.info("Shutdown Create.users");
+		log.warn("Shutdown Create.users");
 	}
 	
 }
diff --git a/backend/module-create-users/omod/src/main/resources/create-clerk-community-outreach.xml b/backend/module-create-users/api/src/main/resources/create-clerk-community-outreach.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-clerk-community-outreach.xml
rename to backend/module-create-users/api/src/main/resources/create-clerk-community-outreach.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-clerk-many.xml b/backend/module-create-users/api/src/main/resources/create-clerk-many.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-clerk-many.xml
rename to backend/module-create-users/api/src/main/resources/create-clerk-many.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-clerk-mobile-clinic.xml b/backend/module-create-users/api/src/main/resources/create-clerk-mobile-clinic.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-clerk-mobile-clinic.xml
rename to backend/module-create-users/api/src/main/resources/create-clerk-mobile-clinic.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-clerk-outpatient-clinic.xml b/backend/module-create-users/api/src/main/resources/create-clerk-outpatient-clinic.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-clerk-outpatient-clinic.xml
rename to backend/module-create-users/api/src/main/resources/create-clerk-outpatient-clinic.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-doctor-community-outreach.xml b/backend/module-create-users/api/src/main/resources/create-doctor-community-outreach.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-doctor-community-outreach.xml
rename to backend/module-create-users/api/src/main/resources/create-doctor-community-outreach.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-doctor-many.xml b/backend/module-create-users/api/src/main/resources/create-doctor-many.xml
similarity index 99%
rename from backend/module-create-users/omod/src/main/resources/create-doctor-many.xml
rename to backend/module-create-users/api/src/main/resources/create-doctor-many.xml
index 81a7702..a5d7221 100644
--- a/backend/module-create-users/omod/src/main/resources/create-doctor-many.xml
+++ b/backend/module-create-users/api/src/main/resources/create-doctor-many.xml
@@ -8,7 +8,7 @@
       SELECT @PERSON_FIRST_NAME := 'Doctor';
       SELECT @PERSON_FAMILIY_NAME := 'Many';
       SELECT @PERSON_GENDER := 'M';
-      SELECT @USERNAME := 'doctor.all';
+      SELECT @USERNAME := 'doctor.many';
       SELECT @ROLE := 'Organizational: Doctor';
       SELECT @LOCATION := 'Community Outreach';
       SELECT @LOCATION_1 := 'Outpatient Clinic';
diff --git a/backend/module-create-users/omod/src/main/resources/create-doctor-mobile-clinic.xml b/backend/module-create-users/api/src/main/resources/create-doctor-mobile-clinic.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-doctor-mobile-clinic.xml
rename to backend/module-create-users/api/src/main/resources/create-doctor-mobile-clinic.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-doctor-outpatient-clinic.xml b/backend/module-create-users/api/src/main/resources/create-doctor-outpatient-clinic.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-doctor-outpatient-clinic.xml
rename to backend/module-create-users/api/src/main/resources/create-doctor-outpatient-clinic.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-nurse-community-outreach.xml b/backend/module-create-users/api/src/main/resources/create-nurse-community-outreach.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-nurse-community-outreach.xml
rename to backend/module-create-users/api/src/main/resources/create-nurse-community-outreach.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-nurse-many.xml b/backend/module-create-users/api/src/main/resources/create-nurse-many.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-nurse-many.xml
rename to backend/module-create-users/api/src/main/resources/create-nurse-many.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-nurse-mobile-clinic.xml b/backend/module-create-users/api/src/main/resources/create-nurse-mobile-clinic.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-nurse-mobile-clinic.xml
rename to backend/module-create-users/api/src/main/resources/create-nurse-mobile-clinic.xml
diff --git a/backend/module-create-users/omod/src/main/resources/create-nurse-outpatient-clinic.xml b/backend/module-create-users/api/src/main/resources/create-nurse-outpatient-clinic.xml
similarity index 100%
rename from backend/module-create-users/omod/src/main/resources/create-nurse-outpatient-clinic.xml
rename to backend/module-create-users/api/src/main/resources/create-nurse-outpatient-clinic.xml
diff --git a/backend/module-create-users/omod/src/main/resources/liquibase.xml b/backend/module-create-users/api/src/main/resources/liquibase-add-default-users.xml
similarity index 96%
rename from backend/module-create-users/omod/src/main/resources/liquibase.xml
rename to backend/module-create-users/api/src/main/resources/liquibase-add-default-users.xml
index 71e674c..8a60835 100644
--- a/backend/module-create-users/omod/src/main/resources/liquibase.xml
+++ b/backend/module-create-users/api/src/main/resources/liquibase-add-default-users.xml
@@ -5,7 +5,7 @@
 
 <!--  to be avoid as roles are created by liquibase also-->
 <!--  but issue while loading: if this module is started before iniz, roles won't be available-->
-  <include file="create-roles.xml" relativeToChangelogFile="true"/>
+<!--  <include file="create-roles.xml" relativeToChangelogFile="true"/>-->
   <!--doctor.outpatient Doctor with access to Outpatient Clinic-->
   <include file="create-doctor-outpatient-clinic.xml" relativeToChangelogFile="true"/>
   <!--nurse.outpatient Doctor with access to Outpatient Clinic-->
diff --git a/backend/module-create-users/omod/src/main/resources/config.xml b/backend/module-create-users/omod/src/main/resources/config.xml
index 40f26b7..edfbd99 100644
--- a/backend/module-create-users/omod/src/main/resources/config.xml
+++ b/backend/module-create-users/omod/src/main/resources/config.xml
@@ -2,14 +2,17 @@
 
 <module configVersion="1.2">
 
-	<id>${project.parent.artifactId}</id>
-	<name>${project.parent.name}</name>
-	<version>${project.parent.version}</version>
-	<package>${project.parent.groupId}.${project.parent.artifactId}</package>
-	<author>${project.parent.organization.name}</author>
-	<description>${project.parent.description}</description>
-	<require_version>${openmrsPlatformVersion}</require_version>
+  <id>${project.parent.artifactId}</id>
+  <name>${project.parent.name}</name>
+  <version>${project.parent.version}</version>
+  <package>${project.parent.groupId}.${project.parent.artifactId}</package>
+  <author>${project.parent.organization.name}</author>
+  <description>${project.parent.description}</description>
+  <require_version>${openmrsPlatformVersion}</require_version>
 
-	<activator>org.openmrs.module.createusers.CreateUsersActivator</activator>
-	<require_module>org.openmrs.module.initializer</require_module>
+  <activator>org.openmrs.module.createusers.CreateUsersActivator</activator>
+  <require_modules>
+    <require_module version="${initializer.version}">org.openmrs.module.initializer</require_module>
+    <require_module version="${datafilter.version}">org.openmrs.module.datafilter</require_module>
+  </require_modules>
 </module>
diff --git a/backend/module-create-users/omod/src/main/resources/create-roles.xml b/backend/module-create-users/omod/src/main/resources/create-roles.xml
deleted file mode 100644
index 2442bcc..0000000
--- a/backend/module-create-users/omod/src/main/resources/create-roles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
-
-<!--
-initializer
-
-,Organizational: Doctor,Doctor,Application: Records Allergies; Application: Writes Clinical Notes; Application: Enters ADT Events; Application: Uses Patient Summary,,
-,,Nurse,Application: Records Allergies; Application: Enters ADT Events; Application: Uses Patient Summary; Application: Enters Vitals,
-,,Registration Clerk,Application: Registers Patients;,,
-
-
--->
-  <changeSet id="pre-create-roles" author="fdeniger" failOnError="false" onFail='MARK_RAN'>
-    <insert tableName="role">
-      <column name="role" value="Organizational: Registration Clerk" />
-      <column name="uuid" value="fab43ac4-79bc-4f3d-805b-bd3a82ce41e9" />
-    </insert>
-    <insert tableName="role">
-      <column name="role" value="Organizational: Nurse" />
-      <column name="uuid" value="2749cd1b-251a-4d8b-bc35-0165f2b1af3e" />
-    </insert>
-    <insert tableName="role">
-      <column name="role" value="Organizational: Doctor" />
-      <column name="uuid" value="4ef1f0f9-fee6-414b-910d-28e17df345c2" />
-    </insert>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/backend/module-create-users/pom.xml b/backend/module-create-users/pom.xml
index f4048a3..4f32d16 100644
--- a/backend/module-create-users/pom.xml
+++ b/backend/module-create-users/pom.xml
@@ -46,6 +46,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.openmrs.api</groupId>
+        <artifactId>openmrs-api</artifactId>
+        <version>2.3.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -53,7 +58,7 @@
     <repository>
       <id>openmrs-repo</id>
       <name>OpenMRS Nexus Repository</name>
-      <url>https://mavenrepo.openmrs.org/public</url>
+      <url>https://openmrs.jfrog.io/artifactory/public/</url>
     </repository>
     <repository>
       <id>central</id>
diff --git a/backend/startup-oauth2.sh b/backend/startup-oauth2.sh
index ca6fd5f..dabefb0 100644
--- a/backend/startup-oauth2.sh
+++ b/backend/startup-oauth2.sh
@@ -14,7 +14,6 @@ openmrs.mapping.user.username=preferred_username
 openmrs.mapping.user.username.serviceAccount=email
 openmrs.mapping.person.givenName=given_name
 openmrs.mapping.person.familyName=family_name
-openmrs.mapping.user.systemId=sub
 EOF
 
 cat > "$OMRS_HOME"/data/openmrs-runtime.properties << EOF