Merge pull request #422 from phuonghuynh/master

Update changes
chrisshayan · Sep 30, 2015 · 9e76afd · 9e76afd
2 parents 65a09ac + 0d76f47
commit 9e76afd
Show file tree

Hide file tree

Showing 57 changed files with 20,991 additions and 640 deletions.
diff --git a/src/main/java/com/techlooper/config/CoreConfiguration.java b/src/main/java/com/techlooper/config/CoreConfiguration.java
@@ -451,6 +451,18 @@ public Template onBoardingMailTemplateVi(freemarker.template.Configuration freem
         return template;
     }
 
+    @Bean
+    public Template dailyChallengeSummaryMailTemplateEn(freemarker.template.Configuration freemakerConfig) throws IOException {
+        Template template = freemakerConfig.getTemplate("challengeDailySummary.en.ftl");
+        return template;
+    }
+
+    @Bean
+    public Template dailyChallengeSummaryMailTemplateVi(freemarker.template.Configuration freemakerConfig) throws IOException {
+        Template template = freemakerConfig.getTemplate("challengeDailySummary.vi.ftl");
+        return template;
+    }
+
     @Bean
     public JsonNode vietnamworksConfiguration() throws IOException {
         return new ObjectMapper().readTree(vnwConfigRes.getInputStream());

diff --git a/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java b/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java
@@ -9,6 +9,7 @@
 import org.dozer.Mapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -28,26 +29,31 @@ public class ChallengeTimelineNotifier {
     @Resource
     private Mapper dozerMapper;
 
+    @Value("${jobAlert.enable}")
+    private Boolean enableJobAlert;
+
     @Scheduled(cron = "${scheduled.cron.notifyChallengeTimeline}")
     public void notifyRegistrantAboutChallengeTimeline() throws Exception {
-        List<ChallengePhaseEnum> challengePhases = Arrays.asList(ChallengePhaseEnum.REGISTRATION, ChallengePhaseEnum.IN_PROGRESS);
-
-        for (ChallengePhaseEnum challengePhase : challengePhases) {
-            List<ChallengeEntity> challengeEntities = challengeService.listChallengesByPhase(challengePhase);
-
-            for (ChallengeEntity challengeEntity : challengeEntities) {
-                Set<ChallengeRegistrantDto> challengeRegistrants = challengeService.findRegistrantsByOwner(
-                        challengeEntity.getAuthorEmail(), challengeEntity.getChallengeId());
-
-                for (ChallengeRegistrantDto challengeRegistrant : challengeRegistrants) {
-                    ChallengeRegistrantEntity challengeRegistrantEntity = dozerMapper.map(challengeRegistrant, ChallengeRegistrantEntity.class);
-                    try {
-                        if (StringUtils.isNotEmpty(challengeRegistrantEntity.getRegistrantEmail())) {
-                            challengeService.sendEmailNotifyRegistrantAboutChallengeTimeline(
-                                    challengeEntity, challengeRegistrantEntity, challengePhase);
+        if (enableJobAlert) {
+            List<ChallengePhaseEnum> challengePhases = Arrays.asList(ChallengePhaseEnum.REGISTRATION, ChallengePhaseEnum.IN_PROGRESS);
+
+            for (ChallengePhaseEnum challengePhase : challengePhases) {
+                List<ChallengeEntity> challengeEntities = challengeService.listChallengesByPhase(challengePhase);
+
+                for (ChallengeEntity challengeEntity : challengeEntities) {
+                    Set<ChallengeRegistrantDto> challengeRegistrants = challengeService.findRegistrantsByOwner(
+                            challengeEntity.getAuthorEmail(), challengeEntity.getChallengeId());
+
+                    for (ChallengeRegistrantDto challengeRegistrant : challengeRegistrants) {
+                        ChallengeRegistrantEntity challengeRegistrantEntity = dozerMapper.map(challengeRegistrant, ChallengeRegistrantEntity.class);
+                        try {
+                            if (StringUtils.isNotEmpty(challengeRegistrantEntity.getRegistrantEmail())) {
+                                challengeService.sendEmailNotifyRegistrantAboutChallengeTimeline(
+                                        challengeEntity, challengeRegistrantEntity, challengePhase);
+                            }
+                        } catch (Exception ex) {
+                            LOGGER.error(ex.getMessage(), ex);
                         }
-                    } catch (Exception ex) {
-                        LOGGER.error(ex.getMessage(), ex);
                     }
                 }
             }

diff --git a/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java b/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java
@@ -0,0 +1,45 @@
+package com.techlooper.cron;
+
+import com.techlooper.entity.ChallengeEntity;
+import com.techlooper.model.ChallengePhaseEnum;
+import com.techlooper.service.ChallengeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class DailyChallengeSummaryEmailSender {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(DailyChallengeSummaryEmailSender.class);
+
+    @Resource
+    private ChallengeService challengeService;
+
+    @Value("${jobAlert.enable}")
+    private Boolean enableJobAlert;
+
+    @Scheduled(cron = "${scheduled.cron.dailyChallengeSummary}")
+    public void notifyRegistrantAboutChallengeTimeline() throws Exception {
+        if (enableJobAlert) {
+            List<ChallengePhaseEnum> challengePhases = Arrays.asList(ChallengePhaseEnum.REGISTRATION, ChallengePhaseEnum.IN_PROGRESS);
+
+            for (ChallengePhaseEnum challengePhase : challengePhases) {
+                List<ChallengeEntity> challengeEntities = challengeService.listChallengesByPhase(challengePhase);
+
+                for (ChallengeEntity challengeEntity : challengeEntities) {
+                    try {
+                        challengeService.sendDailySummaryEmailToChallengeOwner(challengeEntity);
+                    } catch (Exception ex) {
+                        LOGGER.error(ex.getMessage(), ex);
+                    }
+                }
+            }
+        }
+    }
+}