Pulled changes of cron expression configuration from newfeature/enhancements

src/main/java/com/nisum/myteam/schedular/LeaveNotificationScheduler.java

@@ -52,15 +52,7 @@ public class LeaveNotificationScheduler {
     private IFunctionalGroupService functionalGroupService;
 
 
-//    private final String SHIFT1_CRON_EXP=environment.getProperty("email.leave.notification.shift1.cron");
-//    private final String SHIFT2_CRON_EXP=environment.getProperty("email.leave.notification.shift2.cron");
-//    private final String SHIFT3_CRON_EXP=environment.getProperty("email.leave.notification.shift3.cron");
-//    private final String SHIFT4_CRON_EXP=environment.getProperty("email.leave.notification.shift4.cron");
-//    private final String SHIFT5_CRON_EXP=environment.getProperty("email.leave.notification.shift5.cron");
-
-
-   // @Scheduled(cron = "0 * * * * ?")
-    @Scheduled(cron = "00 00 16 * * 1-5")
+    @Scheduled(cron = "${email.leave.notification.shift1.cron}")
     public void scheduleLeaveMailForShift1Empls() throws IOException, MessagingException, MyTeamException {
         //Shift 1(9:00 AM - 6:00 PM)
         logger.info(Shifts.SHIFT1.getShiftType() + " :: Execution Time - {}", dateTimeFormatter.format(LocalDateTime.now()));
@@ -68,7 +60,7 @@ public class LeaveNotificationScheduler {
 
     }
 
-    @Scheduled(cron = "00 00 18 * * 1-5")
+    @Scheduled(cron = "${email.leave.notification.shift2.cron}")
     public void scheduleLeaveMailForShift2Empls() throws IOException, MessagingException, MyTeamException {
         //Shift-2(2:00 PM - 11:00 PM)--General Shift
         logger.info(Shifts.SHIFT2.getShiftType() + " :: Execution Time - {}", dateTimeFormatter.format(LocalDateTime.now()));
@@ -76,7 +68,7 @@ public class LeaveNotificationScheduler {
 
     }
 
-    @Scheduled(cron = "00 00 02 * * 2-6")
+    @Scheduled(cron = "${email.leave.notification.shift3.cron}")
     public void scheduleLeaveMailForShift3Empls() throws IOException, MessagingException, MyTeamException {
         //Shift 3(10:00 PM - 6:00 AM)
         logger.info(Shifts.SHIFT3.getShiftType() + " :: Execution Time - {}", dateTimeFormatter.format(LocalDateTime.now()));
@@ -84,7 +76,7 @@ public class LeaveNotificationScheduler {
     }
 
 
-    @Scheduled(cron = "00 30 11 * * 1-5")
+    @Scheduled(cron = "${email.leave.notification.shift4.cron}")
     public void scheduleLeaveMailForShift4Empls() throws IOException, MessagingException, MyTeamException {
         //Shift 4(7:30 AM - 3:30 PM)
         logger.info(Shifts.SHIFT4.getShiftType() + " :: Execution Time - {}", dateTimeFormatter.format(LocalDateTime.now()));
@@ -92,7 +84,7 @@ public class LeaveNotificationScheduler {
 
     }
 
-    @Scheduled(cron = "00 30 15 * * 1-5")
+    @Scheduled(cron = "${email.leave.notification.shift5.cron}")
     public void scheduleLeaveMailForShift5Empls() throws IOException, MessagingException, MyTeamException {
         //Shift 5(11:30 AM - 7:30 PM)
         logger.info(Shifts.SHIFT5.getShiftType() + " :: Execution Time - {}", dateTimeFormatter.format(LocalDateTime.now()));

src/main/java/com/nisum/myteam/schedular/ProjectEndDateScheduler.java

@@ -40,7 +40,7 @@ public class ProjectEndDateScheduler {
     private Environment environment;
 
 
-    @Scheduled(cron = "00 00 15 * * 1-5")
+    @Scheduled(cron = "${email.project.notification.cron}")
     //@Scheduled(cron = "0 * * * * ?")
     private void sendMailToDls() throws IOException, MessagingException {
 
@@ -66,7 +66,7 @@ public class ProjectEndDateScheduler {
                         List<String> dlIds = activeProject.getDeliveryLeadIds();
                         for (String dlId : dlIds) {
                             Employee employee = empService.getEmployeeById(dlId);
-                             mail.setEmpName(employee.getEmployeeName());
+                            mail.setEmpName(employee.getEmployeeName());
                             mail.setTo(employee.getEmailId());
 
                             //mail.setEmpName("Vijay");

src/main/resources/application.properties

@@ -2,16 +2,16 @@ server.port=8080
 server.context-path=/myTeam/
 
 #Production configuration
-spring.data.mongodb.host=10.3.45.11
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=mytimedb
-spring.data.mongodb.username=mytime
-spring.data.mongodb.password=nisum@123
+#spring.data.mongodb.host=10.3.45.11
+#spring.data.mongodb.port=27017
+#spring.data.mongodb.database=mytimedb
+#spring.data.mongodb.username=mytime
+#spring.data.mongodb.password=nisum@123
 
 #Local Database configuration
-#spring.data.mongodb.host=localhost
-#spring.data.mongodb.port=27017
-#spring.data.mongodb.database=myTeamDB
+spring.data.mongodb.host=localhost
+spring.data.mongodb.port=27017
+spring.data.mongodb.database=myTeamDB
 
 quartz.enabled=true
 cron.expression=0 45 10/3 1/1 * ? *
@@ -49,11 +49,13 @@ email.leave.notification.template.file.path=email/absentMailTemplate.html
 email.leave.notification.from=mytime.nisum@gmail.com
 email.leave.notification.subject=Employee Leave Email Notification
 
-#email.leave.notification.shift1.cron=00 00 15 * * 1-5
-#email.leave.notification.shift2.cron=00 00 18 * * 1-5
-#email.leave.notification.shift3.cron=00 00 02 * * 2-6
-#email.leave.notification.shift4.cron=00 30 11 * * 1-5
-#email.leave.notification.shift5.cron=00 30 15 * * 1-5
+
+#0 * * * * ?===>for every minute
+email.leave.notification.shift1.cron=00 00 16 * * 1-5
+email.leave.notification.shift2.cron=00 00 18 * * 1-5
+email.leave.notification.shift3.cron=00 00 02 * * 2-6
+email.leave.notification.shift4.cron=00 30 11 * * 1-5
+email.leave.notification.shift5.cron=00 30 15 * * 1-5
 
 
 #spring.thymeleaf.suffix=/WEB-INF/thymeleaf/templates/
@@ -65,3 +67,4 @@ spring.thymeleaf.view-names:thymeleaf/*
 email.project.notification.template.file.path=email/projectMailTemplate.html
 email.project.notification.from=mytime.nisum@gmail.com
 email.project.notification.subject=Project EndDate Email Notification
+email.project.notification.cron=00 00 15 * * 1-5
\ No newline at end of file