WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

     // Dependencies - Core
     @Autowired
     private Gson gson;
     @Autowired
+    private OfferService offerServiceProxy; // self-injection for Spring cache proxy
+    @Autowired
-    private CacheManager oneDayCacheManager;
+    private CacheManager redisCacheManager;
+    @Autowired
+    private CacheManager redisShortCacheManager;
     // Dependencies - Repositories
     @Autowired
     private GenericRepository genericRepository;
     @Autowired
     private WalletService walletService;
     @Override
+    public void evictOfferCaches(int offerId) {
+        Offer offer = offerRepository.selectById(offerId);
+        YearMonth ym = YearMonth.from(offer.getStartDate());
+        redisCacheManager.getCache("offer.definition").evict(offerId);
+        redisCacheManager.getCache("allOffers").evict(ym);
+        redisCacheManager.getCache("catalog.published_yearmonth").evict(ym);
+        redisCacheManager.getCache("offer.slabpayout").evict(offerId);
+        redisCacheManager.getCache("offer.achievement").clear();
+        redisShortCacheManager.getCache("todayOffers").clear();
+    }
+    @Override
     public void addOfferService(CreateOfferRequest createOfferRequest) throws ProfitMandiBusinessException {
         LOGGER.info("createOfferRequest  -- {}", createOfferRequest);
         this.createOffer(createOfferRequest);
         this.createTargetSlabs(createOfferRequest);
+    }
         offerRepository.persist(offer);
         createOfferRequest.setId(offer.getId());
+    }
     @Override
-    @Cacheable(value = "publishedOffersWithAchievement", cacheManager = "oneDayCacheManager")
     public List<CreateOfferRequest> getPublishedOffers(int fofoId, YearMonth yearMonth) throws ProfitMandiBusinessException {
+        // Past months (>1 month ago): achievement is frozen, cache the full result
+        if (yearMonth.isBefore(YearMonth.now().minusMonths(1))) {
+            return offerServiceProxy.getPublishedOffersCached(fofoId, yearMonth);
+        }
+        // Current/recent month: assemble live from cached building blocks
+        return assemblePublishedOffers(fofoId, yearMonth);
+    }
+    @Cacheable(value = "publishedOffersWithAchievement.past", cacheManager = "redisCacheManager")
+    public List<CreateOfferRequest> getPublishedOffersCached(int fofoId, YearMonth yearMonth) throws ProfitMandiBusinessException {
+        return assemblePublishedOffers(fofoId, yearMonth);
+    }
+    private List<CreateOfferRequest> assemblePublishedOffers(int fofoId, YearMonth yearMonth) throws ProfitMandiBusinessException {
         Map<Integer, List<Offer>> publishedMapByPartner = offerRepository.selectAllPublishedMapByPartner(yearMonth);
         List<Offer> publishedOffers = publishedMapByPartner != null ? publishedMapByPartner.get(fofoId) : null;
         List<CreateOfferRequest> createOfferRequests = new ArrayList<>();
         if (publishedOffers != null) {
             for (Offer offer : publishedOffers) {
-                CreateOfferRequest createOfferRequest = this.getCreateOfferRequest(offer);
+                CreateOfferRequest copy = deepCopy(this.getCreateOfferRequest(offer));
-                createOfferRequests.add(createOfferRequest);
+                setCriteriaPayoutAchieved(fofoId, copy);
-                setCriteriaPayoutAchieved(fofoId, createOfferRequest);
+                createOfferRequests.add(copy);
+            }
+        }
         return createOfferRequests;
+    }
     private void setCriteriaPayoutAchieved(int fofoId, CreateOfferRequest createOfferRequest) {
-        Map<Integer, Long> criteriaTransactionMap = null;
+        Map<Integer, Long> criteriaTransactionMap;
         if (createOfferRequest.getSchemeType().equals(OfferSchemeType.SELLIN)) {
-            Map<Integer, Map<Integer, Long>> partnerWiseMap = offerRepository.getPartnerWisePurchaseSum(createOfferRequest);
+            criteriaTransactionMap = offerRepository.getPurchaseSumForPartner(
-            criteriaTransactionMap = partnerWiseMap != null ? partnerWiseMap.get(fofoId) : null;
+                    createOfferRequest.getId(), fofoId, createOfferRequest);
         } else {
-            Map<Integer, Map<Integer, Long>> partnerWiseMap = offerRepository.getPartnerWiseSalesSum(createOfferRequest);
+            criteriaTransactionMap = offerRepository.getSalesSumForPartner(
-            criteriaTransactionMap = partnerWiseMap != null ? partnerWiseMap.get(fofoId) : null;
+                    createOfferRequest.getId(), fofoId, createOfferRequest);
+        }
-        LOGGER.info("I am here ------- {}", createOfferRequest.getId());
         List<com.spice.profitmandi.dao.model.ItemCriteriaPayout> itemCriteriaPayouts = createOfferRequest
                 .getTargetSlabs().get(0).getItemCriteriaPayouts();
         for (com.spice.profitmandi.dao.model.ItemCriteriaPayout itemCriteriaPayout : itemCriteriaPayouts) {
             itemCriteriaPayout.setNextSlab(null);
-            LOGGER.info("I am here --- {}", itemCriteriaPayout.getPayoutSlabs());
             long saleAmount = 0;
             if (criteriaTransactionMap != null
                     && criteriaTransactionMap.containsKey(itemCriteriaPayout.getItemCriteria().getId())) {
                 saleAmount = criteriaTransactionMap.containsKey(0) ? criteriaTransactionMap.get(0) : criteriaTransactionMap.get(itemCriteriaPayout.getItemCriteria().getId());
+            }
                     endSlab = payoutSlabs.get(i + 1);
+                }
                 if (beginSlab.getOnwardsAmount() > saleAmount) {
                     itemCriteriaPayout.setShortValue(beginSlab.getOnwardsAmount() - saleAmount);
                     itemCriteriaPayout.setNextSlab(beginSlab);
-                    LOGGER.info("I am here");
                     break;
+                }
                 if (endSlab != null) {
                     if (beginSlab.getOnwardsAmount() <= saleAmount && endSlab.getOnwardsAmount() > saleAmount) {
                         itemCriteriaPayout.setCurrentSlab(beginSlab);
                         beginSlab.setSelected(true);
                         itemCriteriaPayout.setNextSlab(endSlab);
                         itemCriteriaPayout.setShortValue(endSlab.getOnwardsAmount() - saleAmount);
-                        LOGGER.info("I am here");
                         break;
+                    }
-                    // Last loop
                 } else {
                     beginSlab.setSelected(true);
                     itemCriteriaPayout.setCurrentSlab(beginSlab);
-                    LOGGER.info("I am here");
+                }
+            }
-            LOGGER.info("I am here --- {}", itemCriteriaPayout);
+        }
+    }
     @Override
-    @Cacheable(value = "allOffers", cacheManager = "oneDayCacheManager")
+    @Cacheable(value = "allOffers", cacheManager = "redisCacheManager")
     public Map<Integer, CreateOfferRequest> getAllOffers(YearMonth yearMonth) throws ProfitMandiBusinessException {
         List<Offer> allOffers = offerRepository.selectAll(yearMonth, false);
         List<CreateOfferRequest> createOfferRequests = new ArrayList<>();
         for (Offer offer : allOffers) {
             CreateOfferRequest createOfferRequest = this.getCreateOfferRequest(offer);
             createOfferRequests.add(createOfferRequest);
+        }
         return createOfferRequests.stream().collect(Collectors.toMap(CreateOfferRequest::getId, x -> x));
+    }
+    private CreateOfferRequest deepCopy(CreateOfferRequest source) {
+        return gson.fromJson(gson.toJson(source), CreateOfferRequest.class);
+    }
     @Override
-    @Cacheable(value = "partnerOffers", cacheManager = "thirtyMinsTimeOutCacheManager")
+    @Cacheable(value = "offer.definition", cacheManager = "redisCacheManager", key = "#offerId")
-    public CreateOfferRequest getOffer(int fofoId, int offerId) throws ProfitMandiBusinessException {
+    public CreateOfferRequest getOfferDefinition(int offerId) throws ProfitMandiBusinessException {
         Offer offer = offerRepository.selectById(offerId);
+        return this.getCreateOfferRequest(offer);
+    }
+    @Override
+    public CreateOfferRequest getOffer(int fofoId, int offerId) throws ProfitMandiBusinessException {
-        CreateOfferRequest createOfferRequest = this.getCreateOfferRequest(offer);
+        CreateOfferRequest definition = offerServiceProxy.getOfferDefinition(offerId);
         if (fofoId > 0) {
+            CreateOfferRequest copy = deepCopy(definition);
-            createOfferRequest.setCriteriaQtyAmountModel(this.getCriteriaQtyAmounModelMap(createOfferRequest, fofoId));
+            copy.setCriteriaQtyAmountModel(this.getCriteriaQtyAmounModelMap(copy, fofoId));
+            return copy;
+        }
-        return createOfferRequest;
+        return definition;
+    }
     @Override
     public CreateOfferRequest getCreateOfferRequest(Offer fromOffer) throws ProfitMandiBusinessException {
         CreateOfferRequest createOfferRequest = new CreateOfferRequest();
                 this.addOfferService(createOfferRequest);
+            }
             ymListToEvict.add(YearMonth.from(createOfferRequest.getStartDate()));
+        }
         for (YearMonth ymToEvict : ymListToEvict) {
-            oneDayCacheManager.getCache("allOffers").evict(ymToEvict);
+            redisCacheManager.getCache("allOffers").evict(ymToEvict);
+        }
+    }
     private Map<CreateOfferRequest, List<PartnerTargetModel>> parseFromExcel(InputStream inputStream)
             throws ProfitMandiBusinessException {
+        }
         return catalogSlabPayoutMap;
+    }
     @Override
-    @Cacheable(value = "slabPayoutMap", cacheManager = "oneDayCacheManager")
+    @Cacheable(value = "offer.slabpayout", cacheManager = "redisCacheManager", key = "#createOfferRequest.id")
     public Map<Integer, Map<Integer, AmountModel>> getSlabPayoutMapNew(CreateOfferRequest createOfferRequest) {
         Map<Integer, Map<Integer, AmountModel>> catalogSlabPayoutMap = new HashMap<>();
         com.spice.profitmandi.dao.model.TargetSlab targetSlab = createOfferRequest.getTargetSlabs().get(0);
         List<ItemCriteriaPayout> payouts = targetSlab.getItemCriteriaPayouts();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java – Rev 35924 → 36049