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

 	// ====================== 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.
-	// List of parties (stores) assigned to this auth user + their dtr.users.id
+	// List of parties (stores) assigned to this auth user + their dtr.users.id.
+	// When date+beatId are passed, each party is also tagged with:
+	//   inBeat        = is this store part of the scheduled beat's route on that date
+	//   existingAgendas[] = agendas already saved for this store on that date (so the
+	//                       modal can pre-fill them and let the user refill rather than re-assign)
 	@GetMapping(value = "/beatPlan/assignVisit/parties")
-	public ResponseEntity<?> assignVisitParties(@RequestParam int authUserId) throws Exception {
+	public ResponseEntity<?> assignVisitParties(
+			@RequestParam int authUserId,
+			@RequestParam(required = false) String date,
+			@RequestParam(required = false) Integer beatId) throws Exception {
 		AuthUser au = authRepository.selectById(authUserId);
 		if (au == null) return responseSender.badRequest("Auth user not found");
 		// Map auth_user → dtr.users via email
 		Integer dtrUserId = null;
 					userRepositoryAuto.selectByEmailId(au.getEmailId());
 			if (dtrUser != null) dtrUserId = dtrUser.getId();
 		} catch (Exception ignored) {
+		}
+		// Parse optional date
+		LocalDate parsedDate = null;
+		if (date != null && !date.isEmpty()) {
+			try {
+				parsedDate = LocalDate.parse(date);
+			} catch (Exception ignored) {
+			}
+		}
+		// Build (fofoId → dayNumber) of partners already in the beat's scheduled route for this date
+		Set<Integer> inBeatFofoIds = new HashSet<>();
+		if (beatId != null && parsedDate != null) {
+			final LocalDate dateF = parsedDate; // capture for lambda (parsedDate is reassigned earlier so not effectively final)
+			List<BeatSchedule> schedules = beatScheduleRepository.selectByBeatId(beatId);
+			BeatSchedule match = schedules.stream()
+					.filter(s -> s.getStartDate() != null && s.getStartDate().equals(dateF))
+					.findFirst().orElse(null);
+			if (match != null) {
+				List<BeatRoute> routes = beatRouteRepository.selectByBeatId(beatId);
+				routes.stream()
+						.filter(r -> r.getDayNumber() == match.getDayNumber() && r.isActive())
+						.forEach(r -> inBeatFofoIds.add(r.getFofoId()));
+			}
+		}
+		// Build (fofoId → existingAgendas) and (fofoId → existingDescription) from
+		// any already-saved location_tracking rows for this user on this date.
+		// Agenda is stored as task_name = "agenda1, agenda2 | OutletName"
+		// so we split on " | " to peel the outlet suffix off, then split agendas by ", ".
+		// Description is stored on task_description (free text).
+		Map<Integer, List<String>> existingAgendaByFofo = new HashMap<>();
+		Map<Integer, String> existingDescByFofo = new HashMap<>();
+		Map<Integer, Integer> existingTrackingIdByFofo = new HashMap<>();
+		if (dtrUserId != null && parsedDate != null) {
+			List<com.spice.profitmandi.dao.entity.auth.LocationTracking> existing =
+					locationTrackingRepositoryAuto.findByUserAndDate(dtrUserId, parsedDate);
+			for (com.spice.profitmandi.dao.entity.auth.LocationTracking lt : existing) {
+				if (!"franchisee-visit".equals(lt.getTaskType())) continue;
+				if (existingAgendaByFofo.containsKey(lt.getTaskId())) continue; // first wins
+				String taskName = lt.getTaskName() == null ? "" : lt.getTaskName();
+				String agendaPart = taskName;
+				int pipeIdx = taskName.lastIndexOf(" | ");
+				if (pipeIdx > 0) agendaPart = taskName.substring(0, pipeIdx);
+				List<String> agendas = new ArrayList<>();
+				for (String a : agendaPart.split(",")) {
+					String trimmed = a.trim();
+					if (!trimmed.isEmpty()) agendas.add(trimmed);
+				}
+				existingAgendaByFofo.put(lt.getTaskId(), agendas);
+				existingDescByFofo.put(lt.getTaskId(), lt.getTaskDescription() != null ? lt.getTaskDescription() : "");
+				existingTrackingIdByFofo.put(lt.getTaskId(), lt.getId());
+			}
+		}
 		Map<Integer, List<Integer>> mapping = csService.getAuthUserIdPartnerIdMapping();
 		List<Integer> fofoIds = mapping.get(authUserId);
 		List<Map<String, Object>> parties = new ArrayList<>();
 		if (fofoIds != null && !fofoIds.isEmpty()) {
 				p.put("outletName", store.getOutletName() != null ? store.getOutletName()
 						: (retailer != null ? retailer.getBusinessName() : "Store #" + store.getId()));
 				p.put("latitude", store.getLatitude());
 				p.put("longitude", store.getLongitude());
 				p.put("city", retailer != null && retailer.getAddress() != null ? retailer.getAddress().getCity() : null);
+				p.put("inBeat", inBeatFofoIds.contains(store.getId()));
+				p.put("existingAgendas", existingAgendaByFofo.getOrDefault(store.getId(), new ArrayList<>()));
+				p.put("existingDescription", existingDescByFofo.getOrDefault(store.getId(), ""));
+				p.put("existingTrackingId", existingTrackingIdByFofo.get(store.getId()));
 				parties.add(p);
+			}
-			// Sort by code for stable display
+			// In-beat first, then by code
+			parties.sort((a, b) -> {
+				boolean ai = Boolean.TRUE.equals(a.get("inBeat"));
+				boolean bi = Boolean.TRUE.equals(b.get("inBeat"));
+				if (ai != bi) return ai ? -1 : 1;
-			parties.sort((a, b) -> String.valueOf(a.get("code")).compareToIgnoreCase(String.valueOf(b.get("code"))));
+				return String.valueOf(a.get("code")).compareToIgnoreCase(String.valueOf(b.get("code")));
+			});
+		}
 		Map<String, Object> result = new HashMap<>();
 		result.put("dtrUserId", dtrUserId);
 		result.put("authUserId", authUserId);
 		result.put("userName", au.getFirstName() + " " + au.getLastName());
 		result.put("parties", parties);
+		result.put("agendaOptions", com.spice.profitmandi.dao.enumuration.dtr.VisitAgenda.labels());
 		return responseSender.ok(result);
+	}
 	// Submit assignment — accepts a JSON body, builds the v2 payload, posts it
 	@PostMapping(value = "/beatPlan/assignVisit/submit")
 			taskDate = LocalDate.parse(planDate);
 		} catch (Exception e) {
 			return responseSender.badRequest("Invalid planDate (expected yyyy-MM-dd): " + planDate);
+		}
+		// Existing rows for this user on this date — keyed by fofoStoreId.
+		// If a row already exists for a party, we UPDATE its agenda instead of
+		// creating a duplicate (this is the "refill agenda" path for already-
+		// assigned parties).
+		Map<Integer, com.spice.profitmandi.dao.entity.auth.LocationTracking> existingByFofo = new HashMap<>();
+		for (com.spice.profitmandi.dao.entity.auth.LocationTracking lt :
+				locationTrackingRepositoryAuto.findByUserAndDate(dtrUserId, taskDate)) {
+			if (!"franchisee-visit".equals(lt.getTaskType())) continue;
+			existingByFofo.putIfAbsent(lt.getTaskId(), lt);
+		}
+		// Defence-in-depth: Assign Visit is only valid for today's run. Hiding the
+		// button on the UI isn't enough — block at the API too.
+		if (!taskDate.equals(LocalDate.now())) {
+			return responseSender.badRequest("Visits can only be assigned for today's date (" + LocalDate.now() + ")");
+		}
 		LocalDateTime now = LocalDateTime.now();
-		List<com.spice.profitmandi.dao.entity.auth.LocationTracking> created = new ArrayList<>();
+		int createdCount = 0, updatedCount = 0;
 		for (Map<String, Object> p : selected) {
 			Integer fofoStoreId = ((Number) p.get("fofoStoreId")).intValue();
 			String outletName = (String) p.get("outletName");
 			String lat = (String) p.get("latitude");
 			String lng = (String) p.get("longitude");
+			String description = (String) p.get("description");
+			if (description != null) description = description.trim();
+			if (description == null) description = "";
+			// Multi-agenda: accept agendas[] (new format) or fall back to agenda (legacy single)
+			List<String> agendas = new ArrayList<>();
+			Object rawAgendas = p.get("agendas");
+			if (rawAgendas instanceof List) {
+				for (Object o : (List<?>) rawAgendas) {
+					if (o != null) {
+						String s = String.valueOf(o).trim();
+						if (!s.isEmpty()) agendas.add(s);
+					}
+				}
+			}
+			if (agendas.isEmpty()) {
-			String agenda = (String) p.get("agenda");
+				String single = (String) p.get("agenda");
-			if (agenda != null) agenda = agenda.trim();
+				if (single != null && !single.trim().isEmpty()) agendas.add(single.trim());
+			}
-			if (agenda == null || agenda.isEmpty()) agenda = "Visit";
+			if (agendas.isEmpty()) agendas.add("Visit");
+			String agendaJoined = String.join(", ", agendas);
 			String visitLocation = (lat != null && lng != null && !lat.isEmpty() && !lng.isEmpty())
 					? (lat + "," + lng) : "0.0000,0.0000";
 			String displayName = (outletName != null && !outletName.isEmpty()) ? outletName : ("Store #" + fofoStoreId);
+			String newTaskName = agendaJoined + " | " + displayName;
+			com.spice.profitmandi.dao.entity.auth.LocationTracking existing = existingByFofo.get(fofoStoreId);
+			if (existing != null) {
+				// Refill — agenda (task_name), description, and visit location change
+				existing.setTaskName(newTaskName);
+				existing.setTaskDescription(description);
+				existing.setVisitLocation(visitLocation);
+				existing.setUpdatedTimestamp(now);
+				locationTrackingRepositoryAuto.persist(existing);
+				updatedCount++;
+				continue;
+			}
 			com.spice.profitmandi.dao.entity.auth.LocationTracking row =
 					new com.spice.profitmandi.dao.entity.auth.LocationTracking();
 			row.setUserId(dtrUserId);
 			row.setDeviceId("0");
 			row.setTaskId(fofoStoreId);
 			row.setTaskDate(taskDate);
-			row.setTaskName(agenda + " | " + displayName);
+			row.setTaskName(newTaskName);
+			row.setTaskDescription(description);
 			row.setTaskType("franchisee-visit");
 			row.setMarkType("PENDING");
 			row.setAddress("");
 			row.setVisitLocation(visitLocation);
 			row.setCheckInLatLng("0.0000,0.0000");
 			row.setCreatedTimestamp(now);
 			row.setUpdatedTimestamp(now);
 			// Do NOT try/catch this — if persist throws, let it propagate so
 			// @Transactional(rollbackFor = Throwable.class) rolls back cleanly.
-			// Catching here lets Hibernate try to commit a broken session, which
-			// then surfaces the misleading "null id in entry" flush error and hides
-			// the real root cause (constraint violation, bad value, etc.).
 			locationTrackingRepositoryAuto.persist(row);
-			created.add(row);
+			createdCount++;
+		}
-		LOGGER.info("assignVisit persisted {} location_tracking rows for dtrUserId={}", created.size(), dtrUserId);
+		LOGGER.info("assignVisit dtrUserId={} created={} updated={}", dtrUserId, createdCount, updatedCount);
 		Map<String, Object> result = new HashMap<>();
 		result.put("status", true);
-		result.put("assignedCount", created.size());
+		result.put("createdCount", createdCount);
+		result.put("updatedCount", updatedCount);
 		result.put("dtrUserId", dtrUserId);
+		StringBuilder msg = new StringBuilder();
+		if (createdCount > 0)
+			msg.append(createdCount).append(" new visit").append(createdCount == 1 ? "" : "s").append(" assigned");
+		if (updatedCount > 0) {
+			if (msg.length() > 0) msg.append(", ");
+			msg.append(updatedCount).append(" existing agenda").append(updatedCount == 1 ? "" : "s").append(" refilled");
+		}
-		result.put("message", created.size() + " visit tasks assigned to " + au.getFirstName() + " " + au.getLastName());
+		msg.append(" for ").append(au.getFirstName()).append(" ").append(au.getLastName());
+		result.put("message", msg.toString());
 		return responseSender.ok(result);
+	}
 	@GetMapping(value = "/beatPlanWindow")
 	public String beatPlanWindow(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {

Subversion Repositories SmartDukaan

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