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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.interceptor.SimpleKey;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockHttpServletRequest;
     private NotificationService notificationService;
     @Autowired
     private CookiesProcessor cookiesProcessor;
     @Autowired
     private OfferService offerService;
-    @Autowired
-    private CacheManager oneDayCacheManager;
-    @Autowired
-    private CacheManager redisCacheManager;
-    @Autowired
-    private CacheManager redisShortCacheManager;
-    @Autowired
-    private CacheManager thirtyMinsTimeOutCacheManager;
     @Autowired
     private Gson gson;
     @Autowired
     @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);
-        oneDayCacheManager.getCache("allOffers").evict(YearMonth.from(createOfferRequest.getStartDate()));
+        offerService.evictOfferCaches(createOfferRequest.getId());
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
         List<Offer> offers = offerRepository.selectAllByIds(offerIds);
         //Consider only offers that have opposite status
         offers = offers.stream().filter(x -> x.isActive() != active).collect(Collectors.toList());
-        Set<YearMonth> yearMonthsToEvict = new HashSet<>();
         for (Offer offer : offers) {
             offer.setActive(active);
-            yearMonthsToEvict.add(YearMonth.from(offer.getStartDate()));
+            offerService.evictOfferCaches(offer.getId());
+        }
-        // Evict partner-to-offer mapping (which partners see which offers)
-        for (YearMonth ymToEvict : yearMonthsToEvict) {
-            redisCacheManager.getCache("catalog.published_yearmonth").evict(ymToEvict);
-            oneDayCacheManager.getCache("allOffers").evict(ymToEvict);
-        }
-        // Evict partner's published offer list with achievement data
-        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
-        redisShortCacheManager.getCache("todayOffers").clear();
-        // Evict all partner offer caches (price circular)
-        thirtyMinsTimeOutCacheManager.getCache("partnerOffers").clear();
         if (active) {
             for (Offer offer : offers) {
                 this.sendNotification(offer);
+            }
+        }
     @RequestMapping(value = "/offers/publishAll", method = RequestMethod.POST)
     public ResponseEntity<?> publishAllUnpublished(@RequestParam YearMonth yearMonth)
             throws ProfitMandiBusinessException, Exception {
         List<Offer> published = offerService.publishAllUnpublished(yearMonth);
         if (!published.isEmpty()) {
-            // Evict partner-to-offer mapping and offer listing
-            redisCacheManager.getCache("catalog.published_yearmonth").evict(yearMonth);
-            oneDayCacheManager.getCache("allOffers").evict(yearMonth);
-            oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
-        redisShortCacheManager.getCache("todayOffers").clear();
-            // Evict all partner offer caches (price circular)
-            thirtyMinsTimeOutCacheManager.getCache("partnerOffers").clear();
             for (Offer offer : published) {
+                offerService.evictOfferCaches(offer.getId());
                 this.sendNotification(offer);
+            }
+        }
         return responseSender.ok(published.size() + " offers published");
+    }
             message = "Partner(s) removed from Offer #" + offerId + ". New Offer #" + newOfferId + " created (Unpublished).";
         } else {
             message = "Partner(s) removed from Offer #" + offerId + ".";
+        }
-        // Evict partner-to-offer mapping (removed partners no longer see this offer)
-        oneDayCacheManager.getCache("allOffers").evict(ym);
-        redisCacheManager.getCache("catalog.published_yearmonth").evict(ym);
-        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
-        redisShortCacheManager.getCache("todayOffers").clear();
+        offerService.evictOfferCaches(offerId);
-        thirtyMinsTimeOutCacheManager.getCache("partnerOffers").clear();
         Map<String, Object> response = new HashMap<>();
         response.put("message", message);
         response.put("newOfferId", newOfferId);
         response.put("yearMonth", ym.toString());
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         if (!roleManager.isAdmin(loginDetails.getRoleIds())) {
             throw new ProfitMandiBusinessException("Unauthorized", "Unauthorized", "");
+        }
         offerService.addPartnersToOffer(offerId, fofoIds);
+        offerService.evictOfferCaches(offerId);
         Offer offer = offerRepository.selectById(offerId);
         YearMonth ym = YearMonth.from(offer.getStartDate());
-        // Evict partner-to-offer mapping (added partners now see this offer)
-        oneDayCacheManager.getCache("allOffers").evict(ym);
-        redisCacheManager.getCache("catalog.published_yearmonth").evict(ym);
-        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
-        redisShortCacheManager.getCache("todayOffers").clear();
-        thirtyMinsTimeOutCacheManager.getCache("partnerOffers").clear();
         Map<String, Object> response = new HashMap<>();
         response.put("message", "Partner(s) added to Offer #" + offerId + ".");
         response.put("yearMonth", ym.toString());
         return responseSender.ok(response);
+    }
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         if (!roleManager.isAdmin(loginDetails.getRoleIds())) {
             throw new ProfitMandiBusinessException("Unauthorized", "Unauthorized", "");
+        }
         offerService.updateOfferTargets(offerId, targets);
-        evictOfferCaches(offerId);
+        offerService.evictOfferCaches(offerId);
         return responseSender.ok("Targets updated for Offer #" + offerId);
+    }
     @RequestMapping(value = "/offer/updateSlabs", method = RequestMethod.POST, consumes = "application/json")
     public ResponseEntity<?> updateOfferSlabs(HttpServletRequest request,
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         if (!roleManager.isAdmin(loginDetails.getRoleIds())) {
             throw new ProfitMandiBusinessException("Unauthorized", "Unauthorized", "");
+        }
         offerService.updateOfferSlabs(updateRequest);
-        evictOfferCaches(updateRequest.getOfferId());
+        offerService.evictOfferCaches(updateRequest.getOfferId());
         return responseSender.ok("Slabs updated for Offer #" + updateRequest.getOfferId());
+    }
-    private void evictOfferCaches(int offerId) {
-        Offer offer = offerRepository.selectById(offerId);
-        YearMonth ym = YearMonth.from(offer.getStartDate());
-        oneDayCacheManager.getCache("allOffers").evict(ym);
-        redisCacheManager.getCache("catalog.published_yearmonth").evict(ym);
-        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
-        redisShortCacheManager.getCache("todayOffers").clear();
-        thirtyMinsTimeOutCacheManager.getCache("partnerOffers").clear();
-    }
+}

Subversion Repositories SmartDukaan

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