BAH-2962 | Addition of recurring Appointments events publisher

.gitignore

@@ -10,7 +10,6 @@ target
 *.war
 *.ear
 .idea
-api/
 .DS_Store
 
 target/

api/pom.xml

@@ -122,7 +122,18 @@
 			<artifactId>webservices.rest-omod-2.0</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>org.bahmni.module</groupId>
+			<artifactId>appointments-ipd-api</artifactId>
+			<version>1.8.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.bahmni.module</groupId>
+			<artifactId>appointments-ipd-omod</artifactId>
+			<version>1.8.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jms</artifactId>

api/src/main/java/org/bahmni/module/events/api/configuration/JMSEventPublisherConfiguration.java

@@ -1,7 +1,6 @@
 package org.bahmni.module.events.api.configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.bahmni.module.events.api.publisher.BahmniEventPublisher;
 import org.bahmni.module.events.api.publisher.JMSEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;

api/src/main/java/org/bahmni/module/events/api/listener/AppointmentAdvice.java

@@ -0,0 +1,65 @@
+package org.bahmni.module.events.api.listener;
+
+import com.google.common.collect.Sets;
+import org.bahmni.module.events.api.model.BahmniEventType;
+import org.bahmni.module.events.api.model.Event;
+import org.bahmni.module.events.api.publisher.BahmniEventPublisher;
+import org.openmrs.api.context.Context;
+import org.openmrs.module.appointments.model.Appointment;
+import org.openmrs.module.appointments.web.mapper.AppointmentMapper;
+import org.springframework.aop.AfterReturningAdvice;
+import org.springframework.aop.MethodBeforeAdvice;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import static org.bahmni.module.events.api.model.BahmniEventType.BAHMNI_APPOINTMENT_CREATED;
+import static org.bahmni.module.events.api.model.BahmniEventType.BAHMNI_APPOINTMENT_UPDATED;
+
+public class AppointmentAdvice implements AfterReturningAdvice, MethodBeforeAdvice {
+
+	private final BahmniEventPublisher eventPublisher;
+	private final ThreadLocal<Map<String,Integer>> threadLocal = new ThreadLocal<>();
+	private final String APPOINTMENT_ID_KEY = "appointmentId";
+	private final AppointmentMapper appointmentMapper;
+	private final Set<String> adviceMethodNames = Sets.newHashSet("validateAndSave");
+
+	public AppointmentAdvice() {
+		this.eventPublisher = Context.getRegisteredComponent("bahmniEventPublisher", BahmniEventPublisher.class);
+		this.appointmentMapper = Context.getRegisteredComponent("appointmentMapper", AppointmentMapper.class);
+	}
+
+	public AppointmentAdvice(BahmniEventPublisher bahmniEventPublisher, AppointmentMapper appointmentMapper) {
+		this.eventPublisher = bahmniEventPublisher;
+		this.appointmentMapper = appointmentMapper;
+	}
+
+	@Override
+	public void afterReturning(Object returnValue, Method method, Object[] arguments, Object target) {
+		if (adviceMethodNames.contains(method.getName())) {
+			Map<String, Integer> appointmentInfo = threadLocal.get();
+			// TODO: This is a workaround to avoid publishing duplicate events because currently the event is getting called twice. Need to find out the reason and resolve it.
+			if (appointmentInfo != null) {
+				BahmniEventType eventType = appointmentInfo.get(APPOINTMENT_ID_KEY) == null ? BAHMNI_APPOINTMENT_CREATED : BAHMNI_APPOINTMENT_UPDATED;
+				threadLocal.remove();
+				Appointment appointment = (Appointment) returnValue;
+				Object representation = appointmentMapper.constructResponse(appointment);
+				Event event = new Event(eventType, representation, appointment.getUuid());
+				eventPublisher.publishEvent(event);
+			}
+		}
+	}
+
+	@Override
+	public void before(Method method, Object[] objects, Object o) {
+		if (adviceMethodNames.contains(method.getName())) {
+			Appointment appointment = ((Supplier<Appointment>) objects[0]).get();
+			Map<String, Integer> appointmentInfo = new HashMap<>(1);
+			appointmentInfo.put(APPOINTMENT_ID_KEY, appointment.getId());
+			threadLocal.set(appointmentInfo);
+		}
+	}
+}

api/src/main/java/org/bahmni/module/events/api/listener/EncounterAdvice.java

@@ -0,0 +1,72 @@
+package org.bahmni.module.events.api.listener;
+
+import com.google.common.collect.Sets;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bahmni.module.events.api.model.BahmniEventType;
+import org.bahmni.module.events.api.model.Event;
+import org.bahmni.module.events.api.publisher.BahmniEventPublisher;
+import org.openmrs.Encounter;
+import org.openmrs.api.context.Context;
+import org.openmrs.module.appointments.web.mapper.AppointmentMapper;
+import org.openmrs.module.webservices.rest.web.ConversionUtil;
+import org.openmrs.module.webservices.rest.web.representation.Representation;
+import org.springframework.aop.AfterReturningAdvice;
+import org.springframework.aop.MethodBeforeAdvice;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
+import org.springframework.lang.NonNull;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static org.bahmni.module.events.api.model.BahmniEventType.*;
+
+public class EncounterAdvice implements AfterReturningAdvice, MethodBeforeAdvice {
+
+	private final Logger log = LogManager.getLogger(EncounterAdvice.class);
+
+	private final BahmniEventPublisher eventPublisher;
+	private final ThreadLocal<Map<String,Integer>> threadLocal = new ThreadLocal<>();
+	private final String ENCOUNTER_ID_KEY = "encounterId";
+	private final Set<String> adviceMethodNames = Sets.newHashSet("saveEncounter");
+
+	public EncounterAdvice() {
+		this.eventPublisher = Context.getRegisteredComponent("bahmniEventPublisher", BahmniEventPublisher.class);
+	}
+
+	public EncounterAdvice(BahmniEventPublisher bahmniEventPublisher) {
+		this.eventPublisher = bahmniEventPublisher;
+	}
+
+	@Override
+	public void afterReturning(Object returnValue, Method method, Object[] arguments, Object target) {
+		if (adviceMethodNames.contains(method.getName())) {
+			Map<String, Integer> encounterInfo = threadLocal.get();
+			// TODO: This is a workaround to avoid publishing duplicate events because currently the event is getting called twice. Need to find out the reason and resolve it.
+			if (encounterInfo != null) {
+				BahmniEventType eventType = encounterInfo.get(ENCOUNTER_ID_KEY) == null ? BAHMNI_ENCOUNTER_CREATED : BAHMNI_ENCOUNTER_UPDATED;
+				threadLocal.remove();
+				Encounter encounter = (Encounter) returnValue;
+
+				Object representation = ConversionUtil.convertToRepresentation(encounter, Representation.FULL);
+				Event event = new Event(eventType, representation, encounter.getUuid());
+				eventPublisher.publishEvent(event);
+
+				log.info("Successfully published event with uuid : " + encounter.getUuid());
+			}
+		}
+	}
+
+	@Override
+	public void before(Method method, Object[] objects, Object o) {
+		if (adviceMethodNames.contains(method.getName())) {
+			Encounter encounter = (Encounter) objects[0];
+			Map<String, Integer> encounterInfo = new HashMap<>(1);
+			encounterInfo.put(ENCOUNTER_ID_KEY, encounter.getId());
+			threadLocal.set(encounterInfo);
+		}
+	}
+}

api/src/main/java/org/bahmni/module/events/api/listener/PatientAdvice.java

@@ -41,19 +41,20 @@ public PatientAdvice(BahmniEventPublisher bahmniEventPublisher) {
 	public void afterReturning(Object returnValue, Method method, Object[] arguments, Object target) {
 		if (adviceMethodNames.contains(method.getName())) {
 			Map<String, Integer> patientInfo = threadLocal.get();
-			BahmniEventType eventType = patientInfo != null && patientInfo.get(PATIENT_ID_KEY) == null ? BAHMNI_PATIENT_CREATED : BAHMNI_PATIENT_UPDATED;
-			threadLocal.remove();
+			if (patientInfo != null) {
+				BahmniEventType eventType = patientInfo.get(PATIENT_ID_KEY) == null ? BAHMNI_PATIENT_CREATED : BAHMNI_PATIENT_UPDATED;
+				threadLocal.remove();
 
-			Patient patient = (Patient) returnValue;
+				Patient patient = (Patient) returnValue;
 
-			Object representation = ConversionUtil.convertToRepresentation(patient, Representation.FULL);
-			Event event = new Event(eventType, representation, patient.getUuid());
-			eventPublisher.publishEvent(event);
+				Object representation = ConversionUtil.convertToRepresentation(patient, Representation.FULL);
+				Event event = new Event(eventType, representation, patient.getUuid());
+				eventPublisher.publishEvent(event);
 
-			log.info("Successfully published event with uuid : " + patient.getUuid());
+				log.info("Successfully published event with uuid : " + patient.getUuid());
+			}
 		}
 	}
-
 	@Override
 	public void before(Method method, Object[] objects, Object o) {
 		if (adviceMethodNames.contains(method.getName())) {

api/src/main/java/org/bahmni/module/events/api/listener/RecurringAppointmentAdvice.java

@@ -0,0 +1,67 @@
+package org.bahmni.module.events.api.listener;
+
+import com.google.common.collect.Sets;
+import org.bahmni.module.events.api.model.BahmniEventType;
+import org.bahmni.module.events.api.model.Event;
+import org.bahmni.module.events.api.publisher.BahmniEventPublisher;
+import org.openmrs.api.context.Context;
+import org.openmrs.module.appointments.model.Appointment;
+import org.openmrs.module.appointments.model.AppointmentRecurringPattern;
+import org.openmrs.module.appointments.web.mapper.AppointmentMapper;
+import org.springframework.aop.AfterReturningAdvice;
+import org.springframework.aop.MethodBeforeAdvice;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import static org.bahmni.module.events.api.model.BahmniEventType.BAHMNI_RECURRING_APPOINTMENT_CREATED;
+import static org.bahmni.module.events.api.model.BahmniEventType.BAHMNI_RECURRING_APPOINTMENT_UPDATED;
+
+public class RecurringAppointmentAdvice implements AfterReturningAdvice, MethodBeforeAdvice {
+
+	private final BahmniEventPublisher eventPublisher;
+	private final ThreadLocal<Map<String,Integer>> threadLocal = new ThreadLocal<>();
+	private final String RECURRING_APPOINTMENT_ID_KEY = "recurringAppointmentId";
+	private final AppointmentMapper appointmentMapper;
+	private final Set<String> adviceMethodNames = Sets.newHashSet("validateAndSave");
+
+	public RecurringAppointmentAdvice() {
+		this.eventPublisher = Context.getRegisteredComponent("bahmniEventPublisher", BahmniEventPublisher.class);
+		this.appointmentMapper = Context.getRegisteredComponent("appointmentMapper", AppointmentMapper.class);
+	}
+
+	public RecurringAppointmentAdvice(BahmniEventPublisher bahmniEventPublisher, AppointmentMapper appointmentMapper) {
+		this.eventPublisher = bahmniEventPublisher;
+		this.appointmentMapper = appointmentMapper;
+	}
+
+	@Override
+	public void afterReturning(Object returnValue, Method method, Object[] arguments, Object target) {
+		if (adviceMethodNames.contains(method.getName())) {
+			Map<String, Integer> appointmentInfo = threadLocal.get();
+			// TODO: This is a workaround to avoid publishing duplicate events because currently the event is getting called twice. Need to find out the reason and resolve it.
+			if (appointmentInfo != null) {
+				BahmniEventType eventType = appointmentInfo.get(RECURRING_APPOINTMENT_ID_KEY) == null ? BAHMNI_RECURRING_APPOINTMENT_CREATED : BAHMNI_RECURRING_APPOINTMENT_UPDATED;
+				threadLocal.remove();
+				AppointmentRecurringPattern appointmentRecurringPattern = (AppointmentRecurringPattern) returnValue;
+				Appointment appointment=appointmentRecurringPattern.getAppointments().iterator().next();
+				Object representation = appointmentMapper.constructResponse(appointment);
+				Event event = new Event(eventType, representation,appointment.getUuid());
+				eventPublisher.publishEvent(event);
+			}
+		}
+	}
+
+	@Override
+	public void before(Method method, Object[] objects, Object o) {
+		if (adviceMethodNames.contains(method.getName())) {
+			AppointmentRecurringPattern appointmentRecurringPattern = (AppointmentRecurringPattern)objects[0];
+			Map<String, Integer> appointmentInfo = new HashMap<>(1);
+			appointmentInfo.put(RECURRING_APPOINTMENT_ID_KEY, appointmentRecurringPattern.getId());
+			threadLocal.set(appointmentInfo);
+		}
+	}
+}

api/src/main/java/org/bahmni/module/events/api/model/BahmniEventType.java

@@ -2,7 +2,14 @@
 
 public enum BahmniEventType {
     BAHMNI_PATIENT_CREATED("bahmni-patient"),
-    BAHMNI_PATIENT_UPDATED("bahmni-patient");
+    BAHMNI_PATIENT_UPDATED("bahmni-patient"),
+    BAHMNI_APPOINTMENT_CREATED("bahmni-appointment"),
+    BAHMNI_APPOINTMENT_UPDATED("bahmni-appointment"),
+    BAHMNI_RECURRING_APPOINTMENT_CREATED("bahmni-recurring-appointment"),
+    BAHMNI_RECURRING_APPOINTMENT_UPDATED("bahmni-recurring-appointment"),
+    BAHMNI_ENCOUNTER_CREATED("bahmni-encounter"),
+    BAHMNI_ENCOUNTER_UPDATED("bahmni-encounter");
+
     private final String topic;
     BahmniEventType(String topic) {
         this.topic = topic;

api/src/main/java/org/bahmni/module/events/api/model/Event.java

@@ -1,5 +1,8 @@
 package org.bahmni.module.events.api.model;
 
+import org.openmrs.api.context.Context;
+import org.openmrs.api.context.UserContext;
+
 import java.time.LocalDateTime;
 import java.util.UUID;
 
@@ -11,12 +14,13 @@ public class Event {
 	public final String payloadId;
 	public final Object payload;
 	public final LocalDateTime publishedDateTime;
-
+	public final UserContext userContext;
 	public Event(BahmniEventType eventType, Object payload, String payloadId) {
 		this.eventType = eventType;
 		this.payload = payload;
 		this.eventId = UUID.randomUUID().toString();
 		this.payloadId = payloadId;
 		this.publishedDateTime = LocalDateTime.now();
+		this.userContext= Context.getUserContext();
 	}
 }

api/src/main/java/org/bahmni/module/events/api/publisher/EventPublisher.java

@@ -0,0 +1,28 @@
+package org.bahmni.module.events.api.publisher;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bahmni.module.events.api.model.Event;
+import org.springframework.context.event.EventListener;
+import org.springframework.jms.core.JmsTemplate;
+
+public class EventPublisher {
+
+	private static final Logger log = LogManager.getLogger(EventPublisher.class);
+
+	private final JmsTemplate jmsTemplate;
+
+	private final ObjectMapper objectMapper;
+
+	public EventPublisher(JmsTemplate jmsTemplate, ObjectMapper objectMapper) {
+		this.jmsTemplate = jmsTemplate;
+		this.objectMapper = objectMapper;
+	}
+
+	@EventListener
+	public void onApplicationEvent(Event event) {
+		jmsTemplate.send(event.eventType.topic(), new JMSMessageCreator(objectMapper, event));
+		log.info("Published Message with id : " + event.payloadId);
+	}
+}