Merge pull request #54 from appirio-tech/feature/jira-plat-130

jira plat 130

Author: sachin-maheshwari

src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java

@@ -1905,6 +1905,12 @@ protected void publishEvent(String topic, Object payload) {
              	logger.debug(String.format("Publishing an event to '%s'.", topic));
              }
             //throw new IllegalStateException("eventProducer must be configured.");
+
+            try {
+                this.fireEvent(payload);
+            } catch (Exception e) {
+                logger.error(String.format("Failed to fire an event to event bus. topic: %s", topic), e);
+            }
             return;
         }
         if(this.objectMapper==null)
@@ -1913,17 +1919,15 @@ protected void publishEvent(String topic, Object payload) {
         try {
             logger.debug(String.format("Publishing an event to '%s'.", topic));
             String strPayload = this.objectMapper.writeValueAsString(payload);
+
+          /* JIRA-Plat-130  
             try {
                 this.eventProducer.publish(topic, strPayload);
             } catch (Exception e) {
                 logger.error(String.format("Failed to publish an event. topic: %s, payload: %s", topic, strPayload), e);
             }
+           */
 
-            try {
-                this.fireEvent(payload);
-            } catch (Exception e) {
-                logger.error(String.format("Failed to fire an event to event bus. topic: %s, payload: %s", topic, strPayload), e);
-            }
 
         } catch (Exception e) {
             logger.error(String.format("Failed to convert the payload - %s", payload), e);

src/test/java/com/appirio/tech/core/service/identity/resource/UserResourceTest.java

@@ -746,10 +746,13 @@ public void testCreateObject_WithUser(User userdata) throws Exception {
                 user.isReferralProgramCampaign() ? times(1) : never()
                 ).validateReferral(user.getUtmSource());
 
+        /* 
+        //jira-plat-130 
         verify(eventProducer).publish("event.user.created", "payload");
         verify(eventProducer,
                 isUserActive? never() : times(1)).
                 publish("event.notification.send", "payload");
+       */
         verify(objectMapper).writeValueAsString(user);
     }
 
@@ -1847,9 +1850,12 @@ public void testActivateUser() throws Exception {
         // verify
         verify(userDao).findUserById(userId);
         verify(userDao).activate(user);
-        verify(eventProducer).publish("event.user.activated", "payload");
-        verify(eventProducer).publish("event.notification.send", "payload"); // welcome mail
-        verify(objectMapper).writeValueAsString(user);
+        /* 
+       	//jira-plat-130 
+        	verify(eventProducer).publish("event.user.activated", "payload");
+        	verify(eventProducer).publish("event.notification.send", "payload"); // welcome mail
+       */ 
+       verify(objectMapper).writeValueAsString(user);
     }
 
     @Test
@@ -1937,7 +1943,7 @@ public void testSendActivationCode() throws Exception {
         verify(cacheService).put(cacheKey, user.getCredential().getActivationCode(), testee.getResendActivationCodeExpirySeconds());
 
         verify(param).getOptionString(optionKey);
-        verify(eventProducer).publish("event.notification.send", "payload");
+        // jira-plat-130  verify(eventProducer).publish("event.notification.send", "payload");
     }
 
     @Test
@@ -2247,7 +2253,7 @@ public void testUpdateHandle() throws Exception {
         // verify
         verify(userDao).findUserById(userId);
         verify(userDao).updateHandle(user);
-        verify(eventProducer).publish("event.user.updated", "payload");
+        // jira-plat-130 verify(eventProducer).publish("event.user.updated", "payload");
         verify(objectMapper).writeValueAsString(user);
         verify(authUser, atLeastOnce()).getUserId();
         verify(param, atLeastOnce()).getParam();
@@ -2517,7 +2523,7 @@ public void testUpdatePrimaryEmail() throws Exception {
         // verify
         verify(userDao).findUserById(userId);
         verify(userDao).updatePrimaryEmail(user);
-        verify(eventProducer).publish("event.user.updated", "payload");
+        // jira-plat-130 verify(eventProducer).publish("event.user.updated", "payload");
         verify(objectMapper).writeValueAsString(user);
         verify(authUser, atLeastOnce()).getUserId();
         verify(param, atLeastOnce()).getParam();
@@ -3026,13 +3032,13 @@ public void testUpdateStatus(String newStatus, String comment, User user) throws
             topic = "event.user.activated";
         else
             topic = "event.user.deactivated";
-        verify(eventProducer).publish(topic, "payload");
+        // jira-plat-130 verify(eventProducer).publish(topic, "payload");
 
         if(MemberStatus.UNVERIFIED == MemberStatus.getByValue(oldStatus) &&
                 MemberStatus.ACTIVE == MemberStatus.getByValue(newStatus) ) {
-            verify(eventProducer).publish("event.notification.send", "payload");
+           // jira-plat-130 verify(eventProducer).publish("event.notification.send", "payload");
         } else {
-            verify(eventProducer, never()).publish(eq("event.notification.send"), anyString());
+            // jira-plat-130 verify(eventProducer, never()).publish(eq("event.notification.send"), anyString());
         }
 
         verify(objectMapper).writeValueAsString(user);