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

         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
-        redisShortCacheManager.getCache("publishedOffersWithAchievement").clear();
+        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
+        redisShortCacheManager.getCache("todayOffers").clear();
         // Evict offer detail (price circular) for each involved partner; key=(fofoId, offerId), 0=admin
         for (Offer offer : offers) {
             PartnerCriteria partnerCriteria = gson.fromJson(offer.getPartnerCriteria(), PartnerCriteria.class);
             if (partnerCriteria != null && partnerCriteria.getFofoIds() != null) {
                 for (Integer fofoId : partnerCriteria.getFofoIds()) {
         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);
-            redisShortCacheManager.getCache("publishedOffersWithAchievement").clear();
+            oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
+        redisShortCacheManager.getCache("todayOffers").clear();
             // Evict offer detail (price circular) for each involved partner; key=(fofoId, offerId), 0=admin
             for (Offer offer : published) {
                 PartnerCriteria pc = gson.fromJson(offer.getPartnerCriteria(), PartnerCriteria.class);
                 if (pc != null && pc.getFofoIds() != null) {
                     for (Integer fofoId : pc.getFofoIds()) {
+        }
         // Evict partner-to-offer mapping (removed partners no longer see this offer)
         oneDayCacheManager.getCache("allOffers").evict(ym);
         redisCacheManager.getCache("catalog.published_yearmonth").evict(ym);
-        redisShortCacheManager.getCache("publishedOffersWithAchievement").clear();
+        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
+        redisShortCacheManager.getCache("todayOffers").clear();
         // Evict offer detail (price circular) for removed partners; key=(fofoId, offerId), 0=admin
         for (Integer fofoId : fofoIds) {
             thirtyMinsTimeOutCacheManager.getCache("partnerOffers").evict(new SimpleKey(fofoId, offerId));
+        }
         thirtyMinsTimeOutCacheManager.getCache("partnerOffers").evict(new SimpleKey(0, 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);
-        redisShortCacheManager.getCache("publishedOffersWithAchievement").clear();
+        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
+        redisShortCacheManager.getCache("todayOffers").clear();
         // Evict offer detail (price circular) for added partners; key=(fofoId, offerId), 0=admin
         for (Integer fofoId : fofoIds) {
             thirtyMinsTimeOutCacheManager.getCache("partnerOffers").evict(new SimpleKey(fofoId, offerId));
+        }
         thirtyMinsTimeOutCacheManager.getCache("partnerOffers").evict(new SimpleKey(0, offerId));
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         if (!roleManager.isAdmin(loginDetails.getRoleIds())) {
             throw new ProfitMandiBusinessException("Unauthorized", "Unauthorized", "");
+        }
         offerService.updateOfferTargets(offerId, targets);
+        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,
+            @RequestBody com.spice.profitmandi.dao.model.UpdateOfferSlabsRequest updateRequest) throws Exception {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        if (!roleManager.isAdmin(loginDetails.getRoleIds())) {
+            throw new ProfitMandiBusinessException("Unauthorized", "Unauthorized", "");
+        }
+        offerService.updateOfferSlabs(updateRequest);
+        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());
-        // Evict offer listing and partner-to-offer mapping (targets changed for published offer)
         oneDayCacheManager.getCache("allOffers").evict(ym);
         redisCacheManager.getCache("catalog.published_yearmonth").evict(ym);
-        redisShortCacheManager.getCache("publishedOffersWithAchievement").clear();
+        oneDayCacheManager.getCache("publishedOffersWithAchievement").clear();
-        // Evict offer detail (price circular) for all partners of this offer; key=(fofoId, offerId), 0=admin
+        redisShortCacheManager.getCache("todayOffers").clear();
         PartnerCriteria partnerCriteria = gson.fromJson(offer.getPartnerCriteria(), PartnerCriteria.class);
         if (partnerCriteria != null && partnerCriteria.getFofoIds() != null) {
             for (Integer fofoId : partnerCriteria.getFofoIds()) {
                 thirtyMinsTimeOutCacheManager.getCache("partnerOffers").evict(new SimpleKey(fofoId, offerId));
+            }
+        }
         thirtyMinsTimeOutCacheManager.getCache("partnerOffers").evict(new SimpleKey(0, offerId));
-        return responseSender.ok("Targets updated for Offer #" + offerId);
+    }
+}

Subversion Repositories SmartDukaan

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