Added an event listener

bahmnicore-api/pom.xml

@@ -211,6 +211,11 @@
             <version>4.5.14</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>bahmni-events-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/config/AsyncConfig.java

@@ -1,19 +1,19 @@
-package org.bahmni.module.bahmnicore.config;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Executor;
-@Configuration
-@EnableAsync
-public class AsyncConfig {
-
-    @Bean(name = "bahmniCoreAsync")
-    public Executor threadPoolTaskExecutor() {
-        ThreadPoolTaskExecutor threadPoolTaskExecutor = new ThreadPoolTaskExecutor();
-        return threadPoolTaskExecutor;
-    }
-}
+//package org.bahmni.module.bahmnicore.config;
+//
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableAsync;
+//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+//
+//import java.util.concurrent.Executor;
+//@Configuration
+//@EnableAsync
+//public class AsyncConfig {
+//
+//    @Bean(name = "bahmniCoreAsync")
+//    public Executor threadPoolTaskExecutor() {
+//        ThreadPoolTaskExecutor threadPoolTaskExecutor = new ThreadPoolTaskExecutor();
+//        return threadPoolTaskExecutor;
+//    }
+//}

bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/eventListener/SMSEventListenerBahmniCore.java

@@ -0,0 +1,50 @@
+package org.bahmni.module.bahmnicore.eventListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bahmni.module.events.api.model.BahmniEventType;
+import org.openmrs.Person;
+import org.openmrs.api.context.Context;
+import org.openmrs.api.context.UserContext;
+import org.openmrs.module.webservices.rest.SimpleObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.bahmni.module.events.api.model.Event;
+
+import java.util.Locale;
+
+@Component
+public class SMSEventListenerBahmniCore {
+
+
+    private final Log log = LogFactory.getLog(this.getClass());
+
+
+    @EventListener
+    public void onApplicationEvent(Event event) {
+        System.out.println("inside event listner bahmni core");
+        if (event.eventType == BahmniEventType.BAHMNI_PATIENT_CREATED) {
+            Boolean isregistrationSmsEnabled = Boolean.valueOf(Context.getAdministrationService().getGlobalProperty("sms.enableRegistrationSMSAlert"));
+            if (isregistrationSmsEnabled) {
+                System.out.println("hi");
+                Object person = ((SimpleObject) event.payload).get("person");
+//            String phoneNumber = person.get("phoneNumebr");
+//            if (null == phoneNumber) {
+//                log.info("Since no mobile number found for the patient. SMS not sent.");
+//                return;
+//            }
+//            if (savePatientEvent.isRegistrationSmsEnabled()) {
+//            UserContext userContext = savePatientEvent.getUserContext();
+//            Context.openSession();
+//            Context.setUserContext(userContext);
+
+//            Location location = Context.getLocationService().getLocationByUuid(locationUuid);
+//            String message = smsService.getRegistrationMessage(new Locale("en"), person, location);
+//            smsService.sendSMS(phoneNumber, message);
+//            }
+            }
+        }
+    }
+}

bahmnicore-omod/pom.xml

@@ -251,6 +251,11 @@
             <groupId>org.bahmni.module</groupId>
             <artifactId>bahmni-mapping</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>bahmni-events-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>uiframework-api</artifactId>

bahmnicore-omod/src/main/java/org/bahmni/module/bahmnicore/web/v1_0/controller/BahmniPatientProfileResource.java

@@ -6,7 +6,6 @@
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.bahmni.module.bahmnicore.service.RegistrationSmsService;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.hibernate.NonUniqueObjectException;
 import org.hibernate.exception.DataException;
@@ -55,20 +54,16 @@ public class BahmniPatientProfileResource extends DelegatingCrudResource<Patient
 
     private EmrPatientProfileService emrPatientProfileService;
     private IdentifierSourceServiceWrapper identifierSourceServiceWrapper;
-    private RegistrationSmsService registrationSmsService;
 
     @Autowired
-    public BahmniPatientProfileResource(EmrPatientProfileService emrPatientProfileService, IdentifierSourceServiceWrapper identifierSourceServiceWrapper, RegistrationSmsService registrationSmsService) {
+    public BahmniPatientProfileResource(EmrPatientProfileService emrPatientProfileService, IdentifierSourceServiceWrapper identifierSourceServiceWrapper) {
         this.emrPatientProfileService = emrPatientProfileService;
         this.identifierSourceServiceWrapper = identifierSourceServiceWrapper;
-        this.registrationSmsService =registrationSmsService;
     }
 
     @RequestMapping(method = RequestMethod.POST)
     @ResponseBody
-    public ResponseEntity<Object> create(@CookieValue(value="bahmni.user.location", required=true) String loginCookie,
-                                         @RequestHeader(value = "Jump-Accepted", required = false) boolean jumpAccepted,
-                                         @RequestBody SimpleObject propertiesToCreate) throws Exception {
+    public ResponseEntity<Object> create(@RequestHeader(value = "Jump-Accepted", required = false) boolean jumpAccepted,@RequestBody SimpleObject propertiesToCreate) throws Exception {
         List identifiers = ((ArrayList) ((LinkedHashMap) propertiesToCreate.get("patient")).get("identifiers"));
         List<Object> jumpSizes = new ArrayList<>();
 
@@ -119,12 +114,6 @@ public ResponseEntity<Object> create(@CookieValue(value="bahmni.user.location",
         setConvertedProperties(delegate, propertiesToCreate, getCreatableProperties(), true);
         try {
             delegate = emrPatientProfileService.save(delegate);
-            Boolean isregistrationSmsEnabled=Boolean.valueOf(Context.getAdministrationService().getGlobalProperty("sms.enableRegistrationSMSAlert"));
-            if (isregistrationSmsEnabled){
-            JsonParser jsonParser = new JsonParser();
-            JsonObject jsonObject = (JsonObject) jsonParser.parse(loginCookie);
-            String loginlocation =  jsonObject.get("uuid").getAsString();
-            registrationSmsService.sendRegistrationSMS(delegate,loginlocation,Context.getUserContext());}
             setRelationships(delegate);
             return new ResponseEntity<>(ConversionUtil.convertToRepresentation(delegate, Representation.FULL), HttpStatus.OK);
         } catch (ContextAuthenticationException e) {