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

 				* Math.sin(dLng / 2) * Math.sin(dLng / 2);
 		double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
 		return R * c;
+	}
+    // Mirrors the JS recalcDay() formula. Used by schedule/repeat endpoints
+    // which create fresh BeatSchedule rows — they need to fill totals from the
+    // existing beat_route table, not from anything the client posted.
+    // Returns {totalKm, totalMins}.
+    private double[] computeDayTotals(int beatId, int dayNumber, String endAction) {
+        Beat beat = beatRepository.selectById(beatId);
+        if (beat == null) return new double[]{0d, 0d};
+        List<BeatRoute> dayRoutes = beatRouteRepository.selectByBeatId(beatId).stream()
+                .filter(r -> r.getDayNumber() == dayNumber)
+                .sorted(java.util.Comparator.comparingInt(BeatRoute::getSequenceOrder))
+                .collect(Collectors.toList());
+        if (dayRoutes.isEmpty()) return new double[]{0d, 0d};
+        List<Integer> fofoIds = dayRoutes.stream().map(BeatRoute::getFofoId).distinct().collect(Collectors.toList());
+        Map<Integer, FofoStore> storeMap = new HashMap<>();
+        try {
+            for (FofoStore fs : fofoStoreRepository.selectByRetailerIds(fofoIds)) {
+                storeMap.put(fs.getId(), fs);
+            }
+        } catch (Exception ignored) { /* fall through with empty map */ }
+        double ROAD_FACTOR = 1.3;
+        double AVG_SPEED = 30.0; // km/h
+        int VISIT_MINS = 30;
+        Double prevLat = parseDoubleOrNull(beat.getStartLatitude());
+        Double prevLng = parseDoubleOrNull(beat.getStartLongitude());
+        double totalKm = 0d;
+        for (BeatRoute r : dayRoutes) {
+            FofoStore fs = storeMap.get(r.getFofoId());
+            if (fs == null) continue;
+            Double curLat = parseDoubleOrNull(fs.getLatitude());
+            Double curLng = parseDoubleOrNull(fs.getLongitude());
+            if (prevLat != null && prevLng != null && curLat != null && curLng != null) {
+                totalKm += haversineKm(prevLat, prevLng, curLat, curLng) * ROAD_FACTOR;
+            }
+            if (curLat != null && curLng != null) {
+                prevLat = curLat;
+                prevLng = curLng;
+            }
+        }
+        // Return-home leg only when end_action='HOME'
+        if ("HOME".equalsIgnoreCase(endAction)) {
+            Double homeLat = parseDoubleOrNull(beat.getStartLatitude());
+            Double homeLng = parseDoubleOrNull(beat.getStartLongitude());
+            if (prevLat != null && prevLng != null && homeLat != null && homeLng != null) {
+                totalKm += haversineKm(prevLat, prevLng, homeLat, homeLng) * ROAD_FACTOR;
+            }
+        }
+        double totalMins = (totalKm / AVG_SPEED) * 60.0 + dayRoutes.size() * VISIT_MINS;
+        return new double[]{Math.round(totalKm * 1000d) / 1000d, Math.round(totalMins)};
+    }
 	// ====================== ASSIGN VISIT ======================
 	// Day View "Assign Visit" — lets an admin pick parties (stores) for a specific
 	// auth user on a specific date and pushes them as visit tasks to the v2
 	// /profitmandi-web/v2/beat-tracking/batch endpoint.
 							+ "Please create a new beat for additional days.");
+		}
 		beat.setTotalDays(newTotalDays);
 		// Replace routes (partner stops). Schedules stay intact (except for
-		// dayNumber > newTotalDays cleanup below if the beat shrank).
+        // dayNumber > newTotalDays cleanup + total km/min refresh below).
 		beatRouteRepository.deleteByBeatId(beatId);
 		// Collect lead IDs the user kept on the plan
 		Set<Integer> keptLeadIds = new HashSet<>();
 		for (int d = 0; d < days.size(); d++) {
 			Map<String, Object> day = days.get(d);
 				route.setBeatId(beatId);
 				route.setFofoId(((Number) v.get("id")).intValue());
 				route.setSequenceOrder(partnerSeq++);
 				route.setDayNumber(dayNumber);
 				route.setActive(true);
+                if (v.get("distanceFromPrevKm") != null)
+                    route.setDistanceFromPrevKm(((Number) v.get("distanceFromPrevKm")).doubleValue());
+                if (v.get("timeFromPrevMins") != null)
+                    route.setTimeFromPrevMins(((Number) v.get("timeFromPrevMins")).intValue());
 				beatRouteRepository.persist(route);
+			}
+		}
 		// If the beat shrank, drop schedule rows for day numbers that no longer exist
 			for (BeatSchedule s : currentSchedules) {
 				if (s.getDayNumber() > newTotalDays) beatScheduleRepository.delete(s);
+			}
+		}
+        // Refresh the day-level totals on every remaining schedule row so they
+        // reflect the post-edit route. Previously updateBeat left these stale
+        // (or NULL, for beats created before this fix), which is what the user
+        // reported. Keyed by dayNumber so multi-instance beats all get updated.
+        Map<Integer, Map<String, Object>> dayByNumber = new HashMap<>();
+        for (int d = 0; d < days.size(); d++) {
+            dayByNumber.put(d + 1, days.get(d));
+        }
+        List<BeatSchedule> allSchedules = beatScheduleRepository.selectByBeatId(beatId);
+        for (BeatSchedule s : allSchedules) {
+            Map<String, Object> day = dayByNumber.get(s.getDayNumber());
+            if (day == null) continue;
+            if (day.get("totalDistanceKm") != null)
+                s.setTotalDistanceKm(((Number) day.get("totalDistanceKm")).doubleValue());
+            if (day.get("totalTimeMins") != null)
+                s.setTotalTimeMins(((Number) day.get("totalTimeMins")).intValue());
+        }
 		// Process per-lead actions sent from the editor's removed-leads popup.
 		// Each entry: {leadId, action: "cancel"|"reschedule", toDate?: "yyyy-MM-dd"}.
 		// - cancel: mark the lead's current APPROVED row for this beat as CANCELLED.
 		// - reschedule: cancel here, then create a fresh APPROVED LeadRoute on
 		//   whichever beat this user has scheduled on toDate. If no beat exists
 			if (day.get("totalTimeMins") != null)
 				schedule.setTotalTimeMins(((Number) day.get("totalTimeMins")).intValue());
 			schedule.setCreatedTimestamp(LocalDateTime.now());
 			beatScheduleRepository.persist(schedule);
-			// Routes (stops)
+            // Routes (stops) — also persist per-leg distance/time supplied by the
+            // client so reports/dashboards don't have to recompute from lat/lng.
 			List<Map<String, Object>> visits = (List<Map<String, Object>>) day.get("visits");
 			if (visits != null) {
 				for (int i = 0; i < visits.size(); i++) {
 					Map<String, Object> visit = visits.get(i);
 					BeatRoute route = new BeatRoute();
 					route.setBeatId(beat.getId());
 					route.setFofoId(((Number) visit.get("id")).intValue());
 					route.setSequenceOrder(i);
 					route.setDayNumber(dayNumber);
 					route.setActive(true);
+                    if (visit.get("distanceFromPrevKm") != null)
+                        route.setDistanceFromPrevKm(((Number) visit.get("distanceFromPrevKm")).doubleValue());
+                    if (visit.get("timeFromPrevMins") != null)
+                        route.setTimeFromPrevMins(((Number) visit.get("timeFromPrevMins")).intValue());
 					beatRouteRepository.persist(route);
+				}
+			}
+		}
 				dayInfo.put("dayNumber", s.getDayNumber());
 				boolean isUnscheduled = s.getStartDate().getYear() == 9999;
 				dayInfo.put("planDate", isUnscheduled ? null : s.getStartDate().toString());
 				dayInfo.put("totalKm", s.getTotalDistanceKm());
 				dayInfo.put("totalMins", s.getTotalTimeMins());
+                // endAction tells the planner whether to draw the return-to-home line
+                // for this day (HOME) or end at the last stop (DAYBREAK).
+                dayInfo.put("endAction", s.getEndAction());
 				long visitCount = routes.stream().filter(r -> r.getDayNumber() == s.getDayNumber()).count();
 				dayInfo.put("visitCount", (int) visitCount);
 				dayInfoList.add(dayInfo);
+			}
 			if (schedules.isEmpty()) {
 		// Delete old schedules and create new
 		beatScheduleRepository.deleteByBeatId(beatId);
 		LocalDate schEndDate = dateList.isEmpty() ? null : LocalDate.parse(dateList.get(dateList.size() - 1));
 		for (int i = 0; i < dateList.size() && i < beat.getTotalDays(); i++) {
+            int dayNumber = i + 1;
+            String endAction = (i == dateList.size() - 1) ? "HOME" : "DAYBREAK";
 			BeatSchedule schedule = new BeatSchedule();
 			schedule.setBeatId(beatId);
 			schedule.setStartDate(LocalDate.parse(dateList.get(i)));
 			schedule.setEndDate(schEndDate);
-			schedule.setDayNumber(i + 1);
+            schedule.setDayNumber(dayNumber);
+            schedule.setEndAction(endAction);
+            // Fill total_distance_km / total_time_mins from beat_route so the new
-			schedule.setEndAction(i == dateList.size() - 1 ? "HOME" : "DAYBREAK");
+            // schedule row isn't NULL (this was the bug — these were left unset).
+            double[] totals = computeDayTotals(beatId, dayNumber, endAction);
+            schedule.setTotalDistanceKm(totals[0]);
+            schedule.setTotalTimeMins((int) totals[1]);
 			schedule.setCreatedTimestamp(LocalDateTime.now());
 			beatScheduleRepository.persist(schedule);
+		}
 		Map<String, Object> response = new HashMap<>();
 			if (s.getStartDate() != null && s.getStartDate().getYear() == 9999) {
 				beatScheduleRepository.delete(s);
+			}
+		}
-		// Add new real-date schedule rows for the existing beat
+        // Add new real-date schedule rows for the existing beat — fill totals
+        // from beat_route so total_distance_km / total_time_mins aren't NULL.
 		LocalDate repeatEndDate = dateList.isEmpty() ? null : LocalDate.parse(dateList.get(dateList.size() - 1));
 		for (int i = 0; i < dateList.size(); i++) {
+            int dayNumber = i + 1;
+            String endAction = (i == dateList.size() - 1) ? "HOME" : "DAYBREAK";
 			BeatSchedule schedule = new BeatSchedule();
 			schedule.setBeatId(beatId);
 			schedule.setStartDate(LocalDate.parse(dateList.get(i)));
 			schedule.setEndDate(repeatEndDate);
-			schedule.setDayNumber(i + 1);
+            schedule.setDayNumber(dayNumber);
+            schedule.setEndAction(endAction);
-			schedule.setEndAction(i == dateList.size() - 1 ? "HOME" : "DAYBREAK");
+            double[] totals = computeDayTotals(beatId, dayNumber, endAction);
+            schedule.setTotalDistanceKm(totals[0]);
+            schedule.setTotalTimeMins((int) totals[1]);
 			schedule.setCreatedTimestamp(LocalDateTime.now());
 			beatScheduleRepository.persist(schedule);
+		}
 		Map<String, Object> response = new HashMap<>();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java – Rev 36698 → 36711