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

 	private CookiesProcessor cookiesProcessor;
 	@Autowired
 	private ResponseSender responseSender;
 	@Autowired
 	private FofoStoreRepository fofoStoreRepository;
+	@Autowired
+	private com.spice.profitmandi.dao.repository.logistics.CompanyOfficeRepository companyOfficeRepository;
 	@GetMapping(value = "/beatPlan")
 	public String beatPlan(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
 		model.addAttribute("escalationTypes", visibleLevelsFor(request));
 		return "beat-plan";
 		List<Map<String, Object>> out = new ArrayList<>();
 		for (BeatDeferredVisit r : rows) {
 			AuthUser u = userMap.get(r.getAuthUserId());
 			boolean isLead = "lead".equalsIgnoreCase(r.getTaskType());
+			boolean isOffice = "office-visit".equalsIgnoreCase(r.getTaskType());
 			Map<String, Object> row = new HashMap<>();
 			row.put("id", r.getId());
 			row.put("authUserId", r.getAuthUserId());
 			row.put("userName", u != null ? (u.getFirstName() + " " + u.getLastName()) : ("User #" + r.getAuthUserId()));
 			row.put("fofoStoreId", r.getFofoId());
 			row.put("name", r.getDisplayName() != null ? r.getDisplayName() : ("#" + r.getFofoId()));
-			row.put("type", isLead ? "Lead" : "Visit");
+			row.put("type", isLead ? "Lead" : (isOffice ? "Office" : "Visit"));
 			row.put("deferredDate", r.getDeferredDate() != null ? r.getDeferredDate().toString() : null);
 			row.put("reason", r.getReason());
 			row.put("status", r.getStatus());
 			LocalDate next = nextByRowId.get(r.getId());
 			row.put("nextScheduledDate", next != null ? next.toString() : null);
 		// leads, looking up fofo_store would be the wrong id space). For visits we
 		// still try to pull lat/lng for the visit location.
 		Integer dtrId = resolveDtrId(d.getAuthUserId(), new HashMap<>());
 		if (dtrId == null) return responseSender.badRequest("No dtr.users record for this sales person");
 		boolean isLead = "lead".equalsIgnoreCase(d.getTaskType());
+		boolean isOffice = "office-visit".equalsIgnoreCase(d.getTaskType());
 		String visitLocation = "0.0000,0.0000";
+		if (isOffice) {
+			// Office stops resolve lat/lng from logistics.company_office.
+			try {
+				com.spice.profitmandi.dao.entity.logistics.CompanyOffice o = companyOfficeRepository.selectById(d.getFofoId());
+				if (o != null) visitLocation = o.getLat() + "," + o.getLng();
+			} catch (Exception ignored) {
+			}
-		if (!isLead) {
+		} else if (!isLead) {
 			try {
 				List<FofoStore> ss = fofoStoreRepository.selectByRetailerIds(java.util.Collections.singletonList(d.getFofoId()));
 				if (!ss.isEmpty()) {
 					FofoStore fs = ss.get(0);
 					if (fs.getLatitude() != null && fs.getLongitude() != null
 						.filter(r -> r.getDayNumber() == sched.getDayNumber())
 						.mapToInt(BeatRoute::getSequenceOrder).max().orElse(-1) + 1;
 				BeatRoute br = new BeatRoute();
 				br.setBeatId(beatId);
 				br.setFofoId(d.getFofoId());
+				br.setVisitType(com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.PARTNER);
 				br.setDayNumber(sched.getDayNumber());
 				br.setSequenceOrder(nextSeq);
 				br.setActive(true);
 				beatRouteRepository.persist(br);
+			}
 					continue; // leads live in lead_route, handled below
+				}
 				BeatRoute route = new BeatRoute();
 				route.setBeatId(beatId);
 				route.setFofoId(((Number) v.get("id")).intValue());
+				route.setVisitType("office".equals(v.get("type"))
+						? com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.OFFICE
+						: com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.PARTNER);
 				route.setSequenceOrder(partnerSeq++);
 				route.setDayNumber(dayNumber);
 				route.setActive(true);
                 if (v.get("distanceFromPrevKm") != null)
                     route.setDistanceFromPrevKm(((Number) v.get("distanceFromPrevKm")).doubleValue());
+		}
 		List<BeatRoute> routes = beatRouteRepository.selectByBeatId(beatId);
 		List<Map<String, Object>> result = new ArrayList<>();
+		// Stops — partner OR office, dispatched by visit_type. Partners are
-		// Partner stops — always (they belong to the beat template)
+		// enriched on the client from the partner map (already in scope);
+		// offices are enriched here because the client has no office map.
 		for (BeatRoute r : routes) {
 			Map<String, Object> map = new HashMap<>();
 			map.put("fofoId", r.getFofoId());
 			map.put("dayNumber", r.getDayNumber());
 			map.put("sequenceOrder", r.getSequenceOrder());
+			if (r.getVisitType() == com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.OFFICE) {
+				map.put("visitType", "office");
+				try {
+					com.spice.profitmandi.dao.entity.logistics.CompanyOffice o =
+							companyOfficeRepository.selectById(r.getFofoId());
+					if (o != null) {
+						map.put("code", o.getCode());
+						map.put("name", o.getName());
+						map.put("latitude", String.valueOf(o.getLat()));
+						map.put("longitude", String.valueOf(o.getLng()));
+					}
+				} catch (Exception ignored) {
+				}
+			} else {
-			map.put("visitType", "partner");
+				map.put("visitType", "partner");
+			}
 			result.add(map);
+		}
 		// Lead stops — only for the requested run date
 		if (planDate != null && !planDate.isEmpty()) {
 				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.setVisitType("office".equals(visit.get("type"))
+							? com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.OFFICE
+							: com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.PARTNER);
 					route.setSequenceOrder(i);
 					route.setDayNumber(dayNumber);
 					route.setActive(true);
                     if (visit.get("distanceFromPrevKm") != null)
                         route.setDistanceFromPrevKm(((Number) visit.get("distanceFromPrevKm")).doubleValue());
+			}
 			g.addPartner(day, seq, code.trim(), r + 1);
+		}
 		workbook.close();
+		// Partner-code lookup (legacy).
 		List<FofoStore> allStores = fofoStoreRepository.selectAll();
 		Map<String, Integer> codeToId = new HashMap<>();
 		for (FofoStore store : allStores) codeToId.put(store.getCode(), store.getId());
+		// Office-code lookup — office stops share the same `partner_code` column in the bulk
+		// sheet; resolution dispatches by which catalogue the code belongs to. A code present
+		// in BOTH catalogues is treated as an error so the planner fixes the collision.
+		Map<String, Integer> officeCodeToId = new HashMap<>();
+		for (com.spice.profitmandi.dao.entity.logistics.CompanyOffice o : companyOfficeRepository.selectAll()) {
+			if (o.getCode() != null && !o.getCode().isEmpty()) officeCodeToId.put(o.getCode(), o.getId());
+		}
 		LocalDate holidayStart = LocalDate.now();
 		List<PublicHolidays> holidays = publicHolidaysRepository.selectAllBetweenDates(holidayStart, holidayStart.plusMonths(6));
 		Set<LocalDate> holidayDates = holidays.stream().map(PublicHolidays::getDate).collect(Collectors.toSet());
 		// =====================================================================
 			if (bulkConflict != null) {
 				errorMessages.add("Beat '" + beatName + "': " + scheduleConflictMessage(bulkConflict));
 				continue;
+			}
-			// Validate partner codes upfront so we don't half-persist.
+			// Validate codes upfront so we don't half-persist. A code may belong to
+			// fofo_store (PARTNER) or company_office (OFFICE) but not both.
 			List<String> badCodes = new ArrayList<>();
+			List<String> ambiguousCodes = new ArrayList<>();
 			for (List<BulkPartner> ps : g.dayToPartners.values()) {
 				for (BulkPartner p : ps) {
-					if (!codeToId.containsKey(p.code)) {
+					boolean inPartner = codeToId.containsKey(p.code);
+					boolean inOffice = officeCodeToId.containsKey(p.code);
+					if (inPartner && inOffice) {
+						ambiguousCodes.add(p.code + " (row " + p.rowNum + ")");
+					} else if (!inPartner && !inOffice) {
 						badCodes.add(p.code + " (row " + p.rowNum + ")");
+					}
+				}
+			}
 			if (!badCodes.isEmpty()) {
-				errorMessages.add("Beat '" + beatName + "': unknown partner code(s) — " + String.join(", ", badCodes) + ".");
+				errorMessages.add("Beat '" + beatName + "': unknown code(s) — " + String.join(", ", badCodes) + ".");
+				continue;
+			}
+			if (!ambiguousCodes.isEmpty()) {
+				errorMessages.add("Beat '" + beatName + "': code(s) exist in both partner and office catalogues — " + String.join(", ", ambiguousCodes) + ".");
 				continue;
+			}
 			ready.add(new ValidatedBulkBeat(g, authUserId, sortedDays, scheduleDates));
+		}
 					return Integer.compare(a.rowNum, b.rowNum);
 				});
 				int autoSeq = 0;
 				for (BulkPartner p : partners) {
-					Integer fofoId = codeToId.get(p.code);
+					Integer partnerId = codeToId.get(p.code);
+					Integer officeId = officeCodeToId.get(p.code);
 					// Codes were validated in Phase 1, this is just a safety net.
-					if (fofoId == null) continue;
+					if (partnerId == null && officeId == null) continue;
 					BeatRoute route = new BeatRoute();
 					route.setBeatId(beat.getId());
+					if (partnerId != null) {
+						route.setFofoId(partnerId);
+						route.setVisitType(com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.PARTNER);
+					} else {
-					route.setFofoId(fofoId);
+						route.setFofoId(officeId);
+						route.setVisitType(com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.OFFICE);
+					}
 					route.setSequenceOrder(p.seq >= 0 ? p.seq : autoSeq);
 					route.setDayNumber(dayNumber);
 					route.setActive(true);
 					beatRouteRepository.persist(route);
 					autoSeq++;

Subversion Repositories SmartDukaan

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