WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

 import java.io.*;
 import java.math.BigDecimal;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
+import java.time.DayOfWeek;
 import java.util.*;
 import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toList;
+    }
     public void sendRbmFeedbackSummaryEmail() throws MessagingException, ProfitMandiBusinessException, IOException {
+        // Weekly date range: Previous Monday to Sunday
+        LocalDate today = LocalDate.now();
+        LocalDate previousMonday = today.with(TemporalAdjusters.previous(DayOfWeek.MONDAY));
+        LocalDate previousSunday = previousMonday.plusDays(6);
-        LocalDateTime startOfMonth = LocalDate.now().withDayOfMonth(1).atStartOfDay();
+        LocalDateTime startOfWeek = previousMonday.atStartOfDay();
-        LocalDateTime endOfMonth = LocalDateTime.now();
+        LocalDateTime endOfWeek = previousSunday.atTime(23, 59, 59);
         String[] bcc = {"tarun.verma@smartdukaan.com"};
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd-MMM-yyyy");
         // Get all RBM users
         List<AuthUser> authUsers = csService.getAuthUserIds(
                 ProfitMandiConstants.TICKET_CATEGORY_RBM,
                 Arrays.asList(EscalationType.L1)
             return;
+        }
         List<Integer> rbmIds = authUsers.stream().map(AuthUser::getId).collect(Collectors.toList());
-        // Fetch ratings for all RBMs for current month
+        // Fetch ratings for all RBMs for the week
-        List<RbmRating> feedbackList = rbmRatingRepository.selectByRbmIdsAndDateRange(rbmIds, startOfMonth, endOfMonth);
+        List<RbmRating> feedbackList = rbmRatingRepository.selectByRbmIdsAndDateRange(rbmIds, startOfWeek, endOfWeek);
         if (feedbackList.isEmpty()) {
-            LOGGER.info("No feedback entries found for RBMs.");
+            LOGGER.info("No feedback entries found for RBMs for the week.");
             return;
+        }
         // Sort feedback by createTimeStamp DESC
         feedbackList.sort((a, b) -> b.getCreateTimeStamp().compareTo(a.getCreateTimeStamp()));
         // Map RBM ID to name for quick lookup
         Map<Integer, String> rbmNameMap = authUsers.stream()
                 .collect(Collectors.toMap(AuthUser::getId, AuthUser::getFullName));
+        // Calculate RBM statistics: average rating and unique partner count
+        Map<Integer, List<RbmRating>> feedbackByRbm = feedbackList.stream()
+                .collect(Collectors.groupingBy(RbmRating::getRbmId));
+        List<RbmWeeklyStats> rbmStatsList = new ArrayList<>();
+        for (Map.Entry<Integer, List<RbmRating>> entry : feedbackByRbm.entrySet()) {
+            int rbmId = entry.getKey();
+            List<RbmRating> ratings = entry.getValue();
+            double avgRating = ratings.stream()
+                    .mapToInt(RbmRating::getRating)
+                    .average()
+                    .orElse(0.0);
+            long uniquePartnerCount = ratings.stream()
+                    .map(RbmRating::getFofoId)
+                    .distinct()
+                    .count();
+            String rbmName = rbmNameMap.getOrDefault(rbmId, "Unknown RBM");
+            rbmStatsList.add(new RbmWeeklyStats(rbmId, rbmName, avgRating, (int) uniquePartnerCount));
+        }
+        // Find max partner count for normalization
+        int maxPartnerCount = rbmStatsList.stream()
+                .mapToInt(RbmWeeklyStats::getPartnerCount)
+                .max()
+                .orElse(1);
+        // Calculate combined score: 65% partner count + 35% rating
+        // Score = (0.65 × partnerCount/maxPartnerCount) + (0.35 × avgRating/5)
+        for (RbmWeeklyStats stats : rbmStatsList) {
+            double partnerScore = (double) stats.getPartnerCount() / maxPartnerCount;
+            double ratingScore = stats.getAvgRating() / 5.0;
+            double combinedScore = (0.65 * partnerScore) + (0.35 * ratingScore);
+            stats.setCombinedScore(combinedScore);
+        }
+        // Sort by combined score DESC and assign rank
+        rbmStatsList.sort((a, b) -> Double.compare(b.getCombinedScore(), a.getCombinedScore()));
+        for (int i = 0; i < rbmStatsList.size(); i++) {
+            rbmStatsList.get(i).setRank(i + 1);
+        }
+        // Create map for quick lookup of stats by RBM ID
+        Map<Integer, RbmWeeklyStats> rbmStatsMap = rbmStatsList.stream()
+                .collect(Collectors.toMap(RbmWeeklyStats::getRbmId, s -> s));
         // Generate HTML content
         StringBuilder emailContent = new StringBuilder();
         emailContent.append("<html><body>");
         emailContent.append("<p>Dear Team,</p>");
-        emailContent.append("<p>Here is the <b>latest RBM Rating and Feedback Summary</b> for ")
+        emailContent.append("<p>Here is the <b>Weekly RBM Rating and Feedback Summary</b> for the week: <b>")
+                .append(previousMonday.format(dateFormatter))
+                .append(" to ")
+                .append(previousSunday.format(dateFormatter))
+                .append("</b></p>");
+        // RBM Ranking Summary Table
+        emailContent.append("<h3>RBM Weekly Rankings</h3>");
+        emailContent.append("<p style='font-size: 12px; color: #666;'>Rank = 65% Partner Count + 35% Avg Rating</p>");
+        emailContent.append("<table border='1' cellspacing='0' cellpadding='5' style='border-collapse: collapse;'>");
+        emailContent.append("<tr style='background-color: #4CAF50; color: white;'>")
+                .append("<th>Rank</th>")
+                .append("<th>RBM Name</th>")
+                .append("<th>Partner Count</th>")
+                .append("<th>Avg Rating</th>")
+                .append("<th>Score</th>")
+                .append("</tr>");
+        // Already sorted by rank (combined score DESC)
+        for (RbmWeeklyStats stats : rbmStatsList) {
+            emailContent.append("<tr>")
+                    .append("<td style='text-align: center; font-weight: bold;'>").append(stats.getRank()).append("</td>")
-                .append(LocalDate.now().getMonth()).append(":</p>");
+                    .append("<td>").append(stats.getRbmName()).append("</td>")
+                    .append("<td style='text-align: center;'>").append(stats.getPartnerCount()).append("</td>")
+                    .append("<td style='text-align: center;'>").append(String.format("%.2f", stats.getAvgRating())).append("</td>")
+                    .append("<td style='text-align: center;'>").append(String.format("%.2f", stats.getCombinedScore())).append("</td>")
+                    .append("</tr>");
+        }
+        emailContent.append("</table>");
+        // Detailed Feedback Table
+        emailContent.append("<br><h3>Detailed Feedback</h3>");
-        emailContent.append("<table border='1' cellspacing='0' cellpadding='5'>");
+        emailContent.append("<table border='1' cellspacing='0' cellpadding='5' style='border-collapse: collapse;'>");
-        emailContent.append("<tr>")
+        emailContent.append("<tr style='background-color: #2196F3; color: white;'>")
                 .append("<th>RBM Name</th>")
+                .append("<th>Rank</th>")
                 .append("<th>Partner Name</th>")
                 .append("<th>Rating</th>")
                 .append("<th>Comment</th>")
                 .append("<th>Date</th>")
                 .append("</tr>");
         for (RbmRating rating : feedbackList) {
+            int rbmId = rating.getRbmId();
-            String rbmName = rbmNameMap.getOrDefault(rating.getRbmId(), "Unknown RBM");
+            String rbmName = rbmNameMap.getOrDefault(rbmId, "Unknown RBM");
             String partnerName = fofoNameMap.getOrDefault(rating.getFofoId(), "Unknown Partner");
+            RbmWeeklyStats stats = rbmStatsMap.get(rbmId);
             emailContent.append("<tr>")
                     .append("<td>").append(rbmName).append("</td>")
+                    .append("<td style='text-align: center; font-weight: bold;'>").append(stats != null ? stats.getRank() : "-").append("</td>")
                     .append("<td>").append(partnerName).append("</td>")
-                    .append("<td>").append(rating.getRating()).append("</td>")
+                    .append("<td style='text-align: center;'>").append(rating.getRating()).append("</td>")
                     .append("<td>").append(rating.getComment() != null ? rating.getComment() : "-").append("</td>")
                     .append("<td>").append(rating.getCreateTimeStamp().toLocalDate()).append("</td>")
                     .append("</tr>");
+        }
         emailContent.append("</table>");
         emailContent.append("<br><p>Regards,<br>Smart Dukaan Team</p>");
         emailContent.append("</body></html>");
-        String subject = "Monthly RBM Feedback Summary - " + LocalDate.now().getMonth();
+        String subject = "Weekly RBM Feedback Summary - " + previousMonday.format(dateFormatter) + " to " + previousSunday.format(dateFormatter);
         List<String> sendTo = new ArrayList<>();
-        sendTo.add("sm@smartdukaan.com"); //
+        sendTo.add("sm@smartdukaan.com");
-        sendTo.add("chiranjib.sarkar@smartdukaan.com"); //
+        sendTo.add("chiranjib.sarkar@smartdukaan.com");
-        sendTo.add("kamini.sharma@smartdukaan.com"); //
+        sendTo.add("kamini.sharma@smartdukaan.com");
         String[] emailRecipients = sendTo.toArray(new String[0]);
         this.sendMailHtmlFormat(emailRecipients, emailContent.toString(), null, bcc, subject);
-        LOGGER.info("Consolidated RBM feedback summary email sent.");
+        LOGGER.info("Weekly RBM feedback summary email sent for week: {} to {}", previousMonday, previousSunday);
+    }
+    // Inner class to hold RBM weekly statistics
+    private static class RbmWeeklyStats {
+        private final int rbmId;
+        private final String rbmName;
+        private final double avgRating;
+        private final int partnerCount;
+        private double combinedScore;
+        private int rank;
+        public RbmWeeklyStats(int rbmId, String rbmName, double avgRating, int partnerCount) {
+            this.rbmId = rbmId;
+            this.rbmName = rbmName;
+            this.avgRating = avgRating;
+            this.partnerCount = partnerCount;
+        }
+        public int getRbmId() { return rbmId; }
+        public String getRbmName() { return rbmName; }
+        public double getAvgRating() { return avgRating; }
+        public int getPartnerCount() { return partnerCount; }
+        public double getCombinedScore() { return combinedScore; }
+        public void setCombinedScore(double combinedScore) { this.combinedScore = combinedScore; }
+        public int getRank() { return rank; }
+        public void setRank(int rank) { this.rank = rank; }
+    }
     public void sendSalesFeedbackSummaryEmail() throws MessagingException, ProfitMandiBusinessException, IOException {
+        // Weekly date range: Previous Monday to Sunday
+        LocalDate today = LocalDate.now();
+        LocalDate previousMonday = today.with(TemporalAdjusters.previous(DayOfWeek.MONDAY));
+        LocalDate previousSunday = previousMonday.plusDays(6);
-        LocalDateTime startOfMonth = LocalDate.now().withDayOfMonth(1).atStartOfDay();
+        LocalDateTime startOfWeek = previousMonday.atStartOfDay();
-        LocalDateTime endOfMonth = LocalDateTime.now();
+        LocalDateTime endOfWeek = previousSunday.atTime(23, 59, 59);
         String[] bcc = {"tarun.verma@smartdukaan.com"};
-//        String[] bcc = {"tejus.lohani@smartdukaan.com"};
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd-MMM-yyyy");
         // Get all Sales users
         List<AuthUser> authUsers = csService.getAuthUserIds(
                 ProfitMandiConstants.TICKET_CATEGORY_SALES,
                 Arrays.asList(EscalationType.L1)
             return;
+        }
         List<Integer> salesL1Ids = authUsers.stream().map(AuthUser::getId).collect(Collectors.toList());
-        // Fetch ratings for all RBMs for current month
+        // Fetch ratings for all Sales L1 for the week
-        List<SalesRating> feedbackList = salesRatingRepository.selectBySalesL1IdsAndDateRange(salesL1Ids, startOfMonth, endOfMonth);
+        List<SalesRating> feedbackList = salesRatingRepository.selectBySalesL1IdsAndDateRange(salesL1Ids, startOfWeek, endOfWeek);
         if (feedbackList.isEmpty()) {
-            LOGGER.info("No feedback entries found for Sales.");
+            LOGGER.info("No feedback entries found for Sales for the week.");
             return;
+        }
         // Sort feedback by createTimeStamp DESC
         feedbackList.sort((a, b) -> b.getCreateTimeStamp().compareTo(a.getCreateTimeStamp()));
                 String displayName = partnerName + " (" + storeCode + ")";
                 fofoNameMap.put(fofoId, displayName);
+            }
+        }
-        // Map RBM ID to name for quick lookup
+        // Map Sales L1 ID to name for quick lookup
         Map<Integer, String> salesL1NameMap = authUsers.stream()
                 .collect(Collectors.toMap(AuthUser::getId, AuthUser::getFullName));
+        // Calculate Sales L1 statistics: average rating and unique partner count
+        Map<Integer, List<SalesRating>> feedbackBySales = feedbackList.stream()
+                .collect(Collectors.groupingBy(SalesRating::getSalesL1Id));
+        List<SalesWeeklyStats> salesStatsList = new ArrayList<>();
+        for (Map.Entry<Integer, List<SalesRating>> entry : feedbackBySales.entrySet()) {
+            int salesL1Id = entry.getKey();
+            List<SalesRating> ratings = entry.getValue();
+            double avgRating = ratings.stream()
+                    .mapToInt(SalesRating::getRating)
+                    .average()
+                    .orElse(0.0);
+            long uniquePartnerCount = ratings.stream()
+                    .map(SalesRating::getFofoId)
+                    .distinct()
+                    .count();
+            String salesL1Name = salesL1NameMap.getOrDefault(salesL1Id, "Unknown Sales Person");
+            salesStatsList.add(new SalesWeeklyStats(salesL1Id, salesL1Name, avgRating, (int) uniquePartnerCount));
+        }
+        // Find max partner count for normalization
+        int maxPartnerCount = salesStatsList.stream()
+                .mapToInt(SalesWeeklyStats::getPartnerCount)
+                .max()
+                .orElse(1);
+        // Calculate combined score: 65% partner count + 35% rating
+        // Score = (0.65 × partnerCount/maxPartnerCount) + (0.35 × avgRating/5)
+        for (SalesWeeklyStats stats : salesStatsList) {
+            double partnerScore = (double) stats.getPartnerCount() / maxPartnerCount;
+            double ratingScore = stats.getAvgRating() / 5.0;
+            double combinedScore = (0.65 * partnerScore) + (0.35 * ratingScore);
+            stats.setCombinedScore(combinedScore);
+        }
+        // Sort by combined score DESC and assign rank
+        salesStatsList.sort((a, b) -> Double.compare(b.getCombinedScore(), a.getCombinedScore()));
+        for (int i = 0; i < salesStatsList.size(); i++) {
+            salesStatsList.get(i).setRank(i + 1);
+        }
+        // Create map for quick lookup of stats by Sales L1 ID
+        Map<Integer, SalesWeeklyStats> salesStatsMap = salesStatsList.stream()
+                .collect(Collectors.toMap(SalesWeeklyStats::getSalesL1Id, s -> s));
         // Generate HTML content
         StringBuilder emailContent = new StringBuilder();
         emailContent.append("<html><body>");
         emailContent.append("<p>Dear Team,</p>");
-        emailContent.append("<p>Here is the <b>latest Sales L1 Rating and Feedback Summary</b> for ")
+        emailContent.append("<p>Here is the <b>Weekly Sales L1 Rating and Feedback Summary</b> for the week: <b>")
+                .append(previousMonday.format(dateFormatter))
+                .append(" to ")
+                .append(previousSunday.format(dateFormatter))
+                .append("</b></p>");
+        // Sales L1 Ranking Summary Table
+        emailContent.append("<h3>Sales L1 Weekly Rankings</h3>");
+        emailContent.append("<p style='font-size: 12px; color: #666;'>Rank = 65% Partner Count + 35% Avg Rating</p>");
+        emailContent.append("<table border='1' cellspacing='0' cellpadding='5' style='border-collapse: collapse;'>");
+        emailContent.append("<tr style='background-color: #4CAF50; color: white;'>")
+                .append("<th>Rank</th>")
+                .append("<th>Sales L1 Name</th>")
+                .append("<th>Partner Count</th>")
+                .append("<th>Avg Rating</th>")
+                .append("<th>Score</th>")
+                .append("</tr>");
+        // Already sorted by rank (combined score DESC)
+        for (SalesWeeklyStats stats : salesStatsList) {
+            emailContent.append("<tr>")
+                    .append("<td style='text-align: center; font-weight: bold;'>").append(stats.getRank()).append("</td>")
-                .append(LocalDate.now().getMonth()).append(":</p>");
+                    .append("<td>").append(stats.getSalesL1Name()).append("</td>")
+                    .append("<td style='text-align: center;'>").append(stats.getPartnerCount()).append("</td>")
+                    .append("<td style='text-align: center;'>").append(String.format("%.2f", stats.getAvgRating())).append("</td>")
+                    .append("<td style='text-align: center;'>").append(String.format("%.2f", stats.getCombinedScore())).append("</td>")
+                    .append("</tr>");
+        }
+        emailContent.append("</table>");
+        // Detailed Feedback Table
+        emailContent.append("<br><h3>Detailed Feedback</h3>");
-        emailContent.append("<table border='1' cellspacing='0' cellpadding='5'>");
+        emailContent.append("<table border='1' cellspacing='0' cellpadding='5' style='border-collapse: collapse;'>");
-        emailContent.append("<tr>")
+        emailContent.append("<tr style='background-color: #2196F3; color: white;'>")
                 .append("<th>Sales L1 Name</th>")
+                .append("<th>Rank</th>")
                 .append("<th>Partner Name</th>")
                 .append("<th>Partner Category</th>")
                 .append("<th>Rating</th>")
                 .append("<th>Comment</th>")
                 .append("<th>Date</th>")
                 .append("</tr>");
         for (SalesRating rating : feedbackList) {
+            int salesL1Id = rating.getSalesL1Id();
-            String salesL1 = salesL1NameMap.getOrDefault(rating.getSalesL1Id(), "Unknown Sales Person");
+            String salesL1Name = salesL1NameMap.getOrDefault(salesL1Id, "Unknown Sales Person");
             String partnerName = fofoNameMap.getOrDefault(rating.getFofoId(), "Unknown Partner");
-            LOGGER.info("partnerName11- {}",partnerName);
+            SalesWeeklyStats stats = salesStatsMap.get(salesL1Id);
             PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(rating.getFofoId(), LocalDate.now());
             emailContent.append("<tr>")
-                    .append("<td>").append(salesL1).append("</td>")
+                    .append("<td>").append(salesL1Name).append("</td>")
+                    .append("<td style='text-align: center; font-weight: bold;'>").append(stats != null ? stats.getRank() : "-").append("</td>")
                     .append("<td>").append(partnerName).append("</td>")
                     .append("<td>").append(partnerType).append("</td>")
-                    .append("<td>").append(rating.getRating()).append("</td>")
+                    .append("<td style='text-align: center;'>").append(rating.getRating()).append("</td>")
                     .append("<td>").append(rating.getComment() != null ? rating.getComment() : "-").append("</td>")
                     .append("<td>").append(rating.getCreateTimeStamp().toLocalDate()).append("</td>")
                     .append("</tr>");
+        }
         emailContent.append("</table>");
-        emailContent.append("<br><p>Regards,<br>Smartdukaan Team</p>");
+        emailContent.append("<br><p>Regards,<br>Smart Dukaan Team</p>");
         emailContent.append("</body></html>");
-        String subject = "Monthly Sales L1 Feedback Summary Test test - " + LocalDate.now().getMonth();
+        String subject = "Weekly Sales L1 Feedback Summary - " + previousMonday.format(dateFormatter) + " to " + previousSunday.format(dateFormatter);
         List<String> sendTo = new ArrayList<>();
-         sendTo.add("sm@smartdukaan.com"); //
+        sendTo.add("sm@smartdukaan.com");
-         sendTo.add("chiranjib.sarkar@smartdukaan.com"); //
+        sendTo.add("chiranjib.sarkar@smartdukaan.com");
-         sendTo.add("kamini.sharma@smartdukaan.com"); //
+        sendTo.add("kamini.sharma@smartdukaan.com");
         String[] emailRecipients = sendTo.toArray(new String[0]);
         this.sendMailHtmlFormat(emailRecipients, emailContent.toString(), null, bcc, subject);
-        LOGGER.info("Consolidated Sales L1 feedback summary email sent.");
+        LOGGER.info("Weekly Sales L1 feedback summary email sent for week: {} to {}", previousMonday, previousSunday);
+    }
+    // Inner class to hold Sales L1 weekly statistics
+    private static class SalesWeeklyStats {
+        private final int salesL1Id;
+        private final String salesL1Name;
+        private final double avgRating;
+        private final int partnerCount;
+        private double combinedScore;
+        private int rank;
+        public SalesWeeklyStats(int salesL1Id, String salesL1Name, double avgRating, int partnerCount) {
+            this.salesL1Id = salesL1Id;
+            this.salesL1Name = salesL1Name;
+            this.avgRating = avgRating;
+            this.partnerCount = partnerCount;
+        }
+        public int getSalesL1Id() { return salesL1Id; }
+        public String getSalesL1Name() { return salesL1Name; }
+        public double getAvgRating() { return avgRating; }
+        public int getPartnerCount() { return partnerCount; }
+        public double getCombinedScore() { return combinedScore; }
+        public void setCombinedScore(double combinedScore) { this.combinedScore = combinedScore; }
+        public int getRank() { return rank; }
+        public void setRank(int rank) { this.rank = rank; }
+    }
     public Map<String, Set<Integer>> generateBiReportHierarchyWise() throws Exception{
         List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,ProfitMandiConstants.TICKET_CATEGORY_ABM,ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
         Map<String, Set<Integer>> storeGuyEntry = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java – Rev 36028 → 36113