WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java

 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.velocity.app.VelocityEngine;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.CacheManager;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
-import java.time.Instant;
+import java.time.*;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.YearMonth;
 import java.util.List;
 import java.util.*;
 import java.util.stream.Collectors;
 @Controller
     @RequestMapping(value = "/createOffer", method = RequestMethod.POST)
     public String createOffer(HttpServletRequest request, @RequestBody CreateOfferRequest createOfferRequest,
                               Model model) throws Exception {
         LOGGER.info("createOfferRequest [{}]", createOfferRequest);
         offerService.addOfferService(createOfferRequest);
-        thirtyMinsTimeOutCacheManager.getCache("allOffers").evict(YearMonth.now());
+        oneDayCacheManager.getCache("allOffers").evict(YearMonth.from(createOfferRequest.getStartDate()));
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
         offerService.getPublishedOffers(fofoId, YearMonth.from(LocalDateTime.now()));
         return "scheme_offer/published";
+    }
+    @Value("${prod}")
+    private boolean isProd;
     @RequestMapping(value = "/offer/active/{offerId}", method = RequestMethod.GET)
     public String activateOffer(HttpServletRequest request, @PathVariable(name = "offerId") String offerIdsString,
                                 Model model, @RequestParam(defaultValue = "true") boolean active)
             throws ProfitMandiBusinessException, Exception {
         List<Integer> offerIds = Arrays.stream(offerIdsString.split(",")).map(x -> Integer.parseInt(x))
                 .collect(Collectors.toList());
         List<Offer> offers = offerRepository.selectAllByIds(offerIds);
+        //Consider only offers that have opposite status
+        offers = offers.stream().filter(x -> x.isActive() != active).collect(Collectors.toList());
-        boolean shouldEvict = false;
+        Set<YearMonth> yearMonthsToEvict = new HashSet<>();
         for (Offer offer : offers) {
-            offer.setAlreadyActive(offer.isActive());
-            if (offer.isActive() != active) {
-                offer.setActive(active);
+            offer.setActive(active);
-                shouldEvict = true;
+            yearMonthsToEvict.add(YearMonth.from(offer.getStartDate()));
-            }
+        }
-        if (shouldEvict) {
+        //Evict caches
+        for (YearMonth ymToEvict : yearMonthsToEvict) {
-            oneDayCacheManager.getCache("catalog.published_yearmonth").evict(YearMonth.now());
+            oneDayCacheManager.getCache("catalog.published_yearmonth").evict(ymToEvict);
+            oneDayCacheManager.getCache("allOffers").evict(ymToEvict);
+        }
-        for (Offer offer : offers) {
+        if (active) {
-            if (active && !offer.isAlreadyActive()) {
+            for (Offer offer : offers) {
                 this.sendNotification(offer);
+            }
+        }
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
-        // CreateOfferRequest createOfferRequest =
-        // offerService.getCreateOfferRequest(offer);
-        // model.addAttribute("offer", createOfferRequest);
-        // return "offer_margin_detail_partner2";
+    }
     @RequestMapping(value = "/offer/testimage/{offerId}", method = RequestMethod.GET)
     public String testOffer(HttpServletRequest request, @PathVariable int offerId, Model model,
                             @RequestParam(defaultValue = "true") boolean active) throws ProfitMandiBusinessException, Exception {
         String htmlContent = this.getContentFromTemplate("offer_margin_detail_notify", model1);
         model.addAttribute("response1", htmlContent);
         return "response";
+    }
-    @RequestMapping(value = "/offer/active/fofo/{fofoId}", method = RequestMethod.GET)
-    public String sendOfferNotification(HttpServletRequest request, @PathVariable int fofoId, Model model,
-                                        @RequestParam(defaultValue = "true") boolean active) throws ProfitMandiBusinessException, Exception {
-        List<Offer> offers = offerRepository.selectAllPublishedMapByPartner(YearMonth.now()).get(fofoId);
-        for (Offer offer : offers) {
-            this.sendNotification(offer);
-        }
-        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-        return "response";
-    }
     private void sendNotification(Offer offer) throws Exception {
         if (!YearMonth.from(offer.getStartDate()).equals(YearMonth.now())) {
             return;
+        }
         String fileName = "offer-" + offer.getId() + ".png";
-        String htmlFileName = fileName.replace("png", "html");
+        //String htmlFileName = fileName.replace("png", "html");
         CreateOfferRequest createOfferRequest = offerService.getCreateOfferRequest(offer);
         SendNotificationModel sendNotificationModel = new SendNotificationModel();
         sendNotificationModel.setCampaignName("SchemeOffer");
         sendNotificationModel.setTitle(offer.getName());
         sendNotificationModel.setMessage(createOfferRequest.getSchemeType().name() + " of select models, "
         LOGGER.info("this.getContentFromTemplate {}", htmlContent);
         fileStreamsMap.put(fileName, this.getImageBuffer(htmlContent));
         // fileStreamsMap.put(htmlFileName, new
         // ByteArrayInputStream(htmlContent.getBytes()));
         List<Integer> fofoIds = null;
+        if (isProd) {
-        this.uploadFile(fileStreamsMap);
+            this.uploadFile(fileStreamsMap);
+        }
         if (createOfferRequest.getPartnerCriteria().getRegionIds().size() > 0
                 || createOfferRequest.getPartnerCriteria().getFofoIds().size() > 0
-                || createOfferRequest.getPartnerCriteria().getRegionIds().size() > 0 ||
+                || createOfferRequest.getPartnerCriteria().getPartnerTypes().size() > 0
-                createOfferRequest.getPartnerCriteria().getExcludeFofoIds().size() > 0) {
+                || createOfferRequest.getPartnerCriteria().getExcludeFofoIds().size() > 0) {
             fofoIds = offersMap.entrySet().stream().filter(x -> x.getValue().contains(offer))
                     .map(x -> x.getKey()).collect(Collectors.toList());
             List<Integer> userIds = userAccountRepository.selectUserIdsByRetailerIds(fofoIds);
             sendNotificationModel.setUserIds(userIds);
             notificationService.sendNotification(sendNotificationModel);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java – Rev 32855 → 32868