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

 	@GetMapping(value = "/beatPlan/migrateStoreLatLng")
 	public ResponseEntity<?> migrateStoreLatLng(
 			@RequestParam(required = false, defaultValue = "false") boolean apply,
 			@RequestParam(required = false, defaultValue = "5") double thresholdKm,
 			@RequestParam(required = false, defaultValue = "0") int limit,
+			@RequestParam(required = false, defaultValue = "0") int offset,
-			@RequestParam(required = false, defaultValue = "0") int offset) throws ProfitMandiBusinessException {
+			@RequestParam(required = false, defaultValue = "40") int maxSeconds) throws ProfitMandiBusinessException {
 		List<FofoStore> all = fofoStoreRepository.selectActiveStores();
 		int totalAvailable = all.size();
-		// offset + limit so this can be run in batches against large datasets
 		int from = Math.max(0, Math.min(offset, totalAvailable));
-		int to = limit > 0 ? Math.min(from + limit, totalAvailable) : totalAvailable;
-		List<FofoStore> stores = all.subList(from, to);
+		// Hard cap (if limit given), else go to the end of the list.
+		int hardTo = limit > 0 ? Math.min(from + limit, totalAvailable) : totalAvailable;
+		// Time budget: stop processing once we approach the gateway timeout and
+		// return nextOffset so the caller can resume. Geocoding is the slow part
+		// (network/cache), so a fixed batch size could still time out on a cache-miss
+		// run — a wall-clock budget is safer. maxSeconds defaults to 40 (< typical 60s gateway).
+		long deadlineMs = System.currentTimeMillis() + Math.max(5, maxSeconds) * 1000L;
+		List<FofoStore> stores = all.subList(from, hardTo);
 		List<Integer> ids = stores.stream().map(FofoStore::getId).collect(Collectors.toList());
 		Map<Integer, CustomRetailer> retailerMap = retailerService.getFofoRetailers(ids);
-		int total = stores.size();
+		int total = 0;            // stores actually processed this call
 		int updated = 0, kept = 0, noAddress = 0, noGeocode = 0, errored = 0;
+		boolean stoppedOnTime = false;
+		int nextIndex = from;     // absolute index of next unprocessed store
 		List<Map<String, Object>> changes = new ArrayList<>();
 		for (FofoStore store : stores) {
+			// Stop before doing more slow geocoding work if we've spent our budget.
+			if (System.currentTimeMillis() >= deadlineMs) {
+				stoppedOnTime = true;
+				break;
+			}
+			total++;
+			nextIndex++;
 			try {
 				CustomRetailer retailer = retailerMap.get(store.getId());
 				if (retailer == null || retailer.getAddress() == null) {
 					noAddress++;
 					continue;
 				if (shouldUpdate) {
 					if (apply) {
 						store.setLatitude(String.valueOf(coords[0]));
 						store.setLongitude(String.valueOf(coords[1]));
+						store.setLatLngUpdatedTimestamp(LocalDateTime.now());
 						fofoStoreRepository.persist(store);
+					}
 					updated++;
 					Map<String, Object> ch = new HashMap<>();
 					ch.put("storeId", store.getId());
 					ch.put("newLng", coords[1]);
 					ch.put("distKm", distKm >= 0 ? Math.round(distKm * 10.0) / 10.0 : null);
 					ch.put("reason", reason);
 					changes.add(ch);
 				} else {
+					// Verified-kept: lat/lng was already within threshold. Still stamp it
+					// so "processed vs pending" can be told from lat_lng_updated_timestamp.
+					if (apply) {
+						store.setLatLngUpdatedTimestamp(LocalDateTime.now());
+						fofoStoreRepository.persist(store);
+					}
 					kept++;
+				}
 			} catch (Exception e) {
 				errored++;
 				LOGGER.warn("Geocode/migrate failed for fofoId={}: {}", store.getId(), e.getMessage());
+		}
 		Map<String, Object> result = new HashMap<>();
 		result.put("mode", apply ? "APPLIED" : "DRY RUN — pass &apply=true to actually update");
 		result.put("thresholdKm", thresholdKm);
-		result.put("totalAvailable", totalAvailable);  // total active stores in DB
+		result.put("totalAvailable", totalAvailable);   // total active stores in DB
 		result.put("offset", from);
-		result.put("processed", total);                 // stores processed this run
+		result.put("processed", total);                  // stores processed this call
-		result.put("nextOffset", to);                   // next offset to resume (or = totalAvailable when done)
+		result.put("nextOffset", nextIndex);             // resume here next call
-		result.put("done", to >= totalAvailable);
+		result.put("done", nextIndex >= totalAvailable); // true when nothing left
+		result.put("stoppedOnTimeBudget", stoppedOnTime);// true if we paused for time, not because we finished
 		result.put("updated", updated);
 		result.put("kept", kept);
 		result.put("noAddress", noAddress);
 		result.put("noGeocode", noGeocode);
 		result.put("errored", errored);

Subversion Repositories SmartDukaan

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