Added default sender and subject values for email notification. (#429)

* Added default sender and subject values for email notification.

Author: navya108

src/functionaltests/java/com/ericsson/ei/notifications/trigger/SubscriptionNotificationSteps.java

@@ -17,6 +17,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.junit.Ignore;
+import org.mockito.InjectMocks;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.integration.ClientAndServer;
 import org.mockserver.model.Format;
@@ -34,6 +35,7 @@
 import com.dumbster.smtp.SmtpMessage;
 import com.ericsson.ei.mongo.MongoCondition;
 import com.ericsson.ei.mongo.MongoDBHandler;
+import com.ericsson.ei.notifications.EmailSender;
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.ericsson.ei.utils.HttpRequest;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -70,6 +72,9 @@ public class SubscriptionNotificationSteps extends FunctionalTestBase {
     @Value("${email.sender}")
     private String sender;
 
+    @Value("${email.subject}")
+    private String subject;
+
     @Value("${aggregations.collection.name}")
     private String aggregatedCollectionName;
 
@@ -88,6 +93,9 @@ public class SubscriptionNotificationSteps extends FunctionalTestBase {
     @Autowired
     private MongoDBHandler mongoDBHandler;
 
+    @InjectMocks
+    private EmailSender emailSender;
+
     private SimpleSmtpServer smtpServer;
     private ClientAndServer restServer;
     private MockServerClient mockClient;
@@ -187,6 +195,12 @@ public void send_one_previous_event() throws Throwable {
         eventManager.sendEiffelEvents(EIFFEL_EVENTS_JSON_PATH, eventNamesToSend);
     }
 
+    @Then("^Then Notification email contains ('(.*?)') and ('(.*?)') values")
+    public void notification_email_contains_expected_values(String sender, String subject) {
+        assertEquals(sender, emailSender.getSender());
+        assertEquals(subject, emailSender.getSubject());
+    }
+
     @Then("^Mail subscriptions were triggered$")
     public void mail_subscriptions_were_triggered() {
         LOGGER.debug("Verifying received emails.");
@@ -196,6 +210,8 @@ public void mail_subscriptions_were_triggered() {
         for (SmtpMessage email : emails) {
             // assert correct sender.
             assertEquals("Assert correct email sender: ", email.getHeaderValue("From"), sender);
+            // assert correct subject.
+            assertEquals("Assert correct email subject: ", email.getHeaderValue("Subject"), subject);
             // assert given test case exist in body.
             assert (email.getBody().contains("TC5"));
         }

src/functionaltests/resources/features/subscriptionNotification.feature

@@ -8,6 +8,7 @@ Feature: Test Subscription Trigger
     And Subscriptions are created
     When I send Eiffel events
     And Wait for EI to aggregate objects
+    Then Notification email contains <our expected> values
     Then Mail subscriptions were triggered
     And Rest subscriptions were triggered
     When I send one previous event again
@@ -22,3 +23,14 @@ Feature: Test Subscription Trigger
     When I send one previous event again
     And Wait for EI to aggregate objects
     And Failed notification db should contain 2 objects
+
+  @AddedDefaultValuesSenderAndSubject
+  Scenario: Test default values mail notification
+    Given The REST API is up and running
+    And Mail server is up
+    And Subscriptions are created
+    When I send Eiffel events
+    And Wait for EI to aggregate objects
+    Then Notification email contains 'noreply@domain.com' and 'Email Subscription Notification' values
+    Then Mail subscriptions were triggered
+    And Rest subscriptions were triggered

src/main/java/com/ericsson/ei/notifications/EmailSender.java

@@ -22,6 +22,7 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,17 +49,17 @@ public class EmailSender {
     private static final Logger LOGGER = LoggerFactory.getLogger(EmailSender.class);
 
     @Getter
-    @Value("${email.sender}")
+    @Value("${email.sender:noreply@domain.com}")
     private String sender;
 
     @Getter
-    @Value("${email.subject}")
+    @Value("${email.subject:Email Subscription Notification}")
     private String subject;
 
     @Autowired
     private JavaMailSender emailSender;
 
-    /**
+/**
      * This method sends an email.
      *
      * @param message   The email message to send
@@ -90,6 +91,19 @@ public MimeMessage prepareEmailMessage(String recipients, String mapNotification
         return message;
     }
 
+    /*
+     * This method assigns the default values for sender and subject of email notification if values
+     * at application.proporties are empty.
+     * */
+    private void setDefaultValuesEmailSenderSubject() {
+       if (StringUtils.isEmpty(subject)) {
+            subject = "Email Subscription Notification";
+        }
+       if (StringUtils.isEmpty(sender)) {
+            sender = "noreply@domain.com";
+        }
+    }
+
     /**
      * This method creates a MimeMessageHelper and prepares the email to send
      *
@@ -99,6 +113,7 @@ public MimeMessage prepareEmailMessage(String recipients, String mapNotification
      */
     private MimeMessage prepareEmail(String mapNotificationMessage, String emailSubject,
             String[] recipients) {
+        setDefaultValuesEmailSenderSubject();
         MimeMessage message = emailSender.createMimeMessage();
         try {
             MimeMessageHelper helper = new MimeMessageHelper(message, true);

src/test/java/com/ericsson/ei/notifications/EmailSenderTest.java

@@ -53,4 +53,5 @@ public void sendEmailThrowsException() throws Exception {
      * prepareEmail is not possible to test due too much hidden Spring mumbo jumbo doing things in
      * background.
      */
+
 }