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

 import com.spice.profitmandi.dao.repository.cs.RegionRepository;
 import com.spice.profitmandi.dao.entity.user.LeadCallAnswer;
 import com.spice.profitmandi.dao.entity.user.LeadCallQuestion;
 import com.spice.profitmandi.dao.repository.dtr.LeadCallChecklistRepository;
 import com.spice.profitmandi.dao.repository.dtr.LeadRepository;
+import com.spice.profitmandi.dao.model.lms.LeadDispositionRequest;
 import com.spice.profitmandi.service.LmsAssignmentService;
+import com.spice.profitmandi.service.lms.LmsDispositionService;
+import com.spice.profitmandi.service.lms.LmsOutcome;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
     private LeadRepository leadRepository;
     @Autowired
     private LeadActivityRepository leadActivityRepository;
+    /**
+     * The disposition write — shared with the field app's post-call sheet in profitmandi-web. It is
+     * the most consequential write in the LMS (SLA stamp, stage, trail, DND), so it lives in one
+     * place rather than once per front end.
+     */
+    @Autowired
+    private LmsDispositionService lmsDispositionService;
     @Autowired
     private LeadLiveLocationRepository leadLiveLocationRepository;
     @Autowired
     private LeadCallRepository leadCallRepository;
      */
     @RequestMapping(value = "/lms/disposition", method = RequestMethod.POST,
             consumes = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public ResponseEntity<?> disposition(HttpServletRequest request,
-                                         @RequestBody DispositionRequest body) {
+                                         @RequestBody LeadDispositionRequest body) {
-        if (body == null || body.disposition == null || body.disposition.trim().isEmpty()) {
+        LmsOutcome outcome = lmsDispositionService.apply(currentUser(request), body);
-            return responseSender.badRequest("A disposition is required");
-        }
-        Lead lead = leadRepository.selectById(body.leadId);
-        if (lead == null) {
+        switch (outcome.status) {
-            return responseSender.notFound("Lead not found");
-        }
-        LeadDisposition disposition;
-        try {
+            case OK:
-            disposition = LeadDisposition.valueOf(body.disposition);
-        } catch (IllegalArgumentException e) {
-            return responseSender.badRequest("Unknown disposition: " + body.disposition);
+                return responseSender.ok(stateOf((Lead) outcome.data.get("lead")));
-        }
-        if (disposition == LeadDisposition.INTERESTED && (body.value == null || body.value <= 0)) {
-            return responseSender.badRequest("Business value is required on an INTERESTED disposition");
-        }
-        AuthUser actor = currentUser(request);
-        LeadStage before = lead.getEffectiveStage();
-        LeadCall call = resolveCall(body, lead, actor);
-        String subReason = latin1Safe(trimToNull(body.subReason));
-        if (subReason != null && subReason.length() > 64) {
-            return responseSender.badRequest("Sub-reason is too long - keep it to 64 characters");
-        }
-        lead.setDisposition(disposition);
-        lead.setDispositionSubReason(subReason);
-        // Interim manual path — drops out when the dialer starts filling recordings from the webhook.
-        if (body.recordingUrl != null && !body.recordingUrl.trim().isEmpty()) {
-            lead.setRecordingUrl(body.recordingUrl.trim());
-        }
-        // Reaching the retailer IS the first contact — stamp once, never move it. NOT_REACHABLE (nobody
-        // answered) and WRONG_NUMBER (not the retailer) are not contact: they must not satisfy the SLA,
-        // and they must not disturb a stamp an earlier real contact already set.
-        if (lead.getFirstContactedAt() == null && countsAsContact(disposition)) {
-            // Prefer the moment the retailer actually picked up over "now" — the agent may sit on the
-            // disposition modal for minutes, and that gap would silently eat into the 5-hr SLA.
-            LocalDateTime contactedAt = (call != null && call.getAnsweredAt() != null)
-                    ? call.getAnsweredAt() : LocalDateTime.now();
-            lead.setFirstContactedAt(contactedAt);
-        }
-        LocalDateTime scheduled = parseLocal(body.callbackAt != null ? body.callbackAt : body.followUpAt);
-        applyDispositionStage(lead, disposition, body);
-        leadRepository.persist(lead);
-        CommunicationType type = "MEETING".equalsIgnoreCase(body.followUpType)
-                ? CommunicationType.VISIT : CommunicationType.TELEPHONIC;
-        LeadActivity activity = appendTrail(body.leadId, actor,
-                latin1Safe(dispositionRemark(disposition, before, lead, body)), type, scheduled,
-                call != null ? call.getId() : null);
-        // Bind both ways: the trail entry knows its call (for duration + a recording link), and the
-        // call knows the disposition it produced (so an unactioned call is findable).
-        if (call != null) {
+            case NOT_FOUND:
-            call.setLeadActivityId(activity.getId());
-            leadCallRepository.persist(call);
-        }
-        if (disposition == LeadDisposition.DO_NOT_CALL) {
-            blockFurtherCalls(lead, actor, body);
-        }
-        LOGGER.info("LMS disposition {} on lead {} ({} -> {}) by {}, call {}", disposition, body.leadId, before,
-                lead.getEffectiveStage(), actor != null ? actor.getId() : 0, call != null ? call.getId() : null);
-        return responseSender.ok(stateOf(lead));
+                return responseSender.notFound(outcome.message);
-    }
-    /**
-     * Which call this disposition is about. The browser normally passes {@code leadCallId} straight
-     * from the dialer; when it cannot (agent dialled from their own handset, or the page reloaded
-     * mid-call) we fall back to this agent's most recent call on this lead that no disposition has
-     * claimed yet. Deliberately narrow — binding the wrong call is worse than binding none, because
-     * it would attach someone else's recording to this lead's trail.
-     */
-    private LeadCall resolveCall(DispositionRequest body, Lead lead, AuthUser actor) {
-        if (body.leadCallId != null && body.leadCallId > 0) {
-            LeadCall call = leadCallRepository.selectById(body.leadCallId);
-            if (call != null && call.getLeadId() == lead.getId()) {
-                return call;
-            }
+            default:
-            LOGGER.warn("Ignoring leadCallId {} on lead {} — missing or belongs to another lead",
-                    body.leadCallId, lead.getId());
+                return responseSender.badRequest(outcome.message);
-            return null;
-        }
-        if (actor == null) {
-            return null;
-        }
-        LeadCall latest = leadCallRepository.selectLatestByLeadIdAndAuthId(lead.getId(), actor.getId());
-        if (latest == null || latest.getLeadActivityId() != null) {
-            return null;
-        }
-        LocalDateTime startedAt = latest.getStartedAt() != null ? latest.getStartedAt() : latest.getCreatedTimestamp();
-        if (startedAt == null || startedAt.isBefore(LocalDateTime.now().minusMinutes(CALL_BIND_WINDOW_MINUTES))) {
-            return null;
+        }
-        return latest;
-    }
-    /**
-     * DO_NOT_CALL means never ring this retailer again (SOP §17). Blocks the number, not the lead —
-     * the same person recurs as several leads and a per-lead block would not hold. Before this the
-     * disposition only moved the stage, and nothing stopped a re-dial.
-     */
-    private void blockFurtherCalls(Lead lead, AuthUser actor, DispositionRequest body) {
-        LeadDnd dnd = new LeadDnd();
-        dnd.setMobile(lead.getLeadMobile());
-        dnd.setLeadId(lead.getId());
-        dnd.setAuthId(actor != null ? actor.getId() : null);
-        dnd.setSource("DISPOSITION");
-        dnd.setReason(latin1Safe(trimToNull(body.note) != null
-                ? trimToNull(body.note) : "Retailer asked not to be contacted"));
-        leadDndRepository.block(dnd);
-        LOGGER.info("LMS DND block on lead {} by {}", lead.getId(), actor != null ? actor.getId() : 0);
+    }
     /**
      * Correct the record's own fields (SOP §6).
+     *
         return responseSender.ok(out);
+    }
     // ---- Stage rules ------------------------------------------------------------------------
-    /**
-     * Stage effect of each disposition (SOP §12.2). Only INTERESTED moves the lead forward; the
-     * negative outcomes are terminal, and NOT_REACHABLE drops the lead once the retry budget is
-     * spent. Anything else just records that contact happened.
-     */
-    private void applyDispositionStage(Lead lead, LeadDisposition disposition, DispositionRequest body) {
-        switch (disposition) {
-            case INTERESTED:
-                if (body.value != null && body.value > 0) {
-                    lead.setPotential(body.value);
-                }
-                advanceIfForward(lead, LeadStage.QUALIFIED);
-                break;
-            case NOT_INTERESTED:
-            case DO_NOT_CALL:
-                applyStage(lead, LeadStage.NOT_INTERESTED);
-                break;
-            case WRONG_NUMBER:
-                // A corrected number keeps the lead alive at its current stage — the retailer still
-                // has not been spoken to, so nothing advances. A blank one closes the lead.
-                String corrected = digitsOnly(body.correctedNumber);
-                if (corrected != null && corrected.length() == 10) {
-                    lead.setLeadMobile(corrected);
-                    lead.setUpdatedTimestamp(LocalDateTime.now());
-                } else {
-                    applyStage(lead, LeadStage.DROPPED);
-                }
-                break;
-            case NOT_REACHABLE:
-                int tries = (lead.getUnreachableCount() == null ? 0 : lead.getUnreachableCount()) + 1;
-                lead.setUnreachableCount(tries);
-                if (tries >= LmsAssignmentService.MAX_UNREACHABLE) {
-                    applyStage(lead, LeadStage.DROPPED);
-                }
-                break;
-            case CALLBACK:
-            case FOLLOW_UP:
-            default:
-                advanceIfForward(lead, LeadStage.CONTACTED);
-                break;
-        }
-    }
-    /** Did the retailer actually get spoken to? Only those outcomes may close the first-contact SLA. */
-    private boolean countsAsContact(LeadDisposition disposition) {
-        return disposition != LeadDisposition.NOT_REACHABLE && disposition != LeadDisposition.WRONG_NUMBER;
-    }
     /** Set stage + keep the legacy status column in lockstep. Every stage write goes through here. */
     private void applyStage(Lead lead, LeadStage stage) {
         lead.setStage(stage);
         lead.setStatus(stage.toLegacyStatus());
         lead.setUpdatedTimestamp(LocalDateTime.now());
         activity.setCreatedTimestamp(LocalDateTime.now());
         leadActivityRepository.persist(activity);
         return activity;
+    }
-    /** Human-readable trail line for a disposition, including the stage move it caused. */
-    private String dispositionRemark(LeadDisposition disposition, LeadStage before, Lead lead,
-                                     DispositionRequest body) {
-        StringBuilder sb = new StringBuilder(pretty(disposition.name()));
-        if (body.subReason != null && !body.subReason.trim().isEmpty()) {
-            sb.append(" · ").append(body.subReason.trim());
-        }
-        if (disposition == LeadDisposition.NOT_REACHABLE) {
-            sb.append(" · attempt ").append(lead.getUnreachableCount());
-            if (body.retrySchedule != null && !body.retrySchedule.trim().isEmpty()) {
-                sb.append(", retry ").append(body.retrySchedule.trim());
-            }
-        }
-        LeadStage after = lead.getEffectiveStage();
-        if (after != before) {
-            sb.append(" · stage ").append(pretty(before)).append(" -> ").append(pretty(after));
-        }
-        if (body.note != null && !body.note.trim().isEmpty()) {
-            sb.append(" - ").append(body.note.trim());
-        }
-        return sb.toString();
-    }
     /** What the caller needs to refresh its row without re-reading the whole record. */
     private Map<String, Object> stateOf(Lead lead) {
         LeadStage stage = lead.getEffectiveStage();
         Map<String, Object> out = new HashMap<>();
         out.put("leadId", lead.getId());
     private String trimToNull(String s) {
         return (s == null || s.trim().isEmpty()) ? null : s.trim();
+    }
+    private static boolean positive(Integer n) {
+        return n != null && n > 0;
+    }
     private String digitsOnly(String s) {
         return s == null ? null : s.replaceAll("\\D", "");
+    }
     /** Accepts the {@code datetime-local} value the modal posts ({@code 2026-08-27T14:30}); null-safe. */
             LOGGER.warn("Ignoring unparseable LMS schedule timestamp: {}", s);
             return null;
+        }
+    }
-    /** JSON body of the disposition modal — one flat shape, sub-fields set per disposition. */
-    public static class DispositionRequest {
-        public int leadId;
-        public String disposition;
-        public String note;
-        /** The {@code user.lead_call} row this outcome belongs to, supplied by the dialer. */
-        public Integer leadCallId;
-        /**
-         * Interim: the free-text recording URL agents paste today. Superseded by {@code leadCallId}
-         * once the dialer captures recordings automatically — kept until then so removing the box
-         * does not leave leads with no recording path at all.
-         */
-        public String recordingUrl;
-        public Double value;          // INTERESTED
-        public String callbackAt;     // CALLBACK
-        public String retrySchedule;  // NOT_REACHABLE
-        public String correctedNumber;// WRONG_NUMBER
-        public String followUpType;   // FOLLOW_UP — CALL | MEETING
-        public String followUpAt;     // FOLLOW_UP
-        public String subReason;      // NOT_INTERESTED
-    }
     /**
      * Create a lead from the LMS dashboard.
+     *
      * <p><b>Deliberately not {@code /createLead}.</b> That endpoint is shared with the legacy Leads
      * screen and must keep behaving exactly as it does. It also silently ignores the {@code regionId}
+        }
         mobile = mobile.substring(mobile.length() - 10);
         if (body.regionId == null || body.regionId <= 0) {
             return responseSender.badRequest("Pick a region — it drives auto-assignment");
+        }
+        // Narrow columns + STRICT_TRANS_TABLES: name the field instead of failing at flush.
+        String tooLong = firstTooLong(
+                "Address", body.address, 128,
+                "City", body.city, 30,
+                "State", body.state, 30);
+        if (tooLong != null) {
+            return responseSender.badRequest(tooLong);
+        }
         // Same rule the dialer uses: a number on the do-not-call register never becomes a lead.
         if (leadDndRepository.selectByMobile(mobile) != null) {
             return responseSender.badRequest("This number is on the do-not-call register.");
+        }
         // Split on the last space so "Jitu Katara" keeps a surname; user.lead.last_name is NOT NULL.
         int space = name.lastIndexOf(' ');
         lead.setFirstName(space > 0 ? name.substring(0, space) : name);
         lead.setLastName(space > 0 ? name.substring(space + 1) : "");
         lead.setLeadMobile(mobile);
-        // address / city / state are NOT NULL but are no longer asked for: the geo link supplies the
+        // address / city / state are NOT NULL. They are optional on this form (the geo link supplies
-        // real location. Coalesced rather than left to fail the insert.
+        // the real location), so whatever was typed is kept and blanks are coalesced rather than
-        lead.setAddress("");
+        // left to fail the insert.
+        lead.setAddress(latin1Safe(body.address == null ? "" : body.address.trim()));
-        lead.setCity("");
+        lead.setCity(latin1Safe(body.city == null ? "" : body.city.trim()));
-        lead.setState("");
+        lead.setState(latin1Safe(body.state == null ? "" : body.state.trim()));
+        // Legacy "conversion probability": the Leads screen colours a High lead Green, else Yellow.
+        lead.setColor(Boolean.TRUE.equals(body.conversionHigh) ? "Green" : "Yellow");
         lead.setSource(latin1Safe(body.source == null || body.source.trim().isEmpty()
                 ? "LMS Dashboard" : body.source.trim()));
         lead.setCreatedTimestamp(LocalDateTime.now());
         lead.setUpdatedTimestamp(LocalDateTime.now());
         lead.setCreatedBy(me.getFirstName() + " " + me.getLastName());
         // lms_code needs the generated id, so it can only be stamped after the insert.
         lead.setLmsCode(lmsAssignmentService.generateLmsCode(lead));
         leadRepository.persist(lead);
         boolean hasBrands = body.leadBrands != null && !body.leadBrands.isEmpty();
+        boolean hasPhotos = positive(body.frontp) || positive(body.frontWithMarket) || positive(body.internalLongShot)
+                || positive(body.internalLeftWall) || positive(body.internalRightWall);
+        boolean hasCounter = positive(body.counterSize);
-        if ((body.outletName != null && !body.outletName.trim().isEmpty()) || hasBrands) {
+        if ((body.outletName != null && !body.outletName.trim().isEmpty()) || hasBrands || hasPhotos || hasCounter) {
             try {
                 LeadDetailModel detail = new LeadDetailModel();
                 detail.setLeadId(lead.getId());
                 detail.setOutletName(body.outletName == null ? "" : body.outletName.trim());
+                if (hasCounter) {
+                    detail.setCounterSize(body.counterSize);
+                }
+                // Whatever photos came with the form; none are required here (see persistLeadDetail's
+                // lenient overload) because this lead is usually created on a call, before a visit.
+                if (positive(body.frontp)) detail.setFrontp(body.frontp);
+                if (positive(body.frontWithMarket)) detail.setFrontWithMarket(body.frontWithMarket);
+                if (positive(body.internalLongShot)) detail.setInternalLongShot(body.internalLongShot);
+                if (positive(body.internalLeftWall)) detail.setInternalLeftWall(body.internalLeftWall);
+                if (positive(body.internalRightWall)) detail.setInternalRightWall(body.internalRightWall);
                 if (hasBrands) {
                     List<LeadBrandModel> brands = new ArrayList<>();
                     for (BrandValue bv : body.leadBrands) {
                         if (bv == null || bv.brand == null || bv.brand.trim().isEmpty() || bv.value == null
                                 || bv.value <= 0) {
                         brand.setValue(bv.value.intValue());
                         brands.add(brand);
+                    }
                     detail.setLeadBrands(brands);
+                }
-                leadRepository.persistLeadDetail(detail, me);
+                leadRepository.persistLeadDetail(detail, me, false);
             } catch (Exception e) {
                 // Shop name and brand split are not worth losing an otherwise-good lead over.
                 LOGGER.warn("Could not save the lead detail for lead {}", lead.getId(), e);
+            }
+        }
+                }
                 created.append(bv.brand.trim()).append(' ').append(bv.value.longValue());
                 first = false;
+            }
+        }
+        if (hasPhotos) {
+            created.append(" · store photos attached");
+        }
+        String remark = body.remark == null ? "" : body.remark.trim();
+        if (!remark.isEmpty()) {
+            created.append(" · remark: ").append(remark.length() > 500 ? remark.substring(0, 500) : remark);
+        }
         trail(lead.getId(), me.getId(), latin1Safe(created.toString()
                 + (assignment != null && "HOLD".equals(assignment.assignmentStatus)
                    ? " - region has no active BM/RSM, parked in the HOLD queue" : "")));
         // Auto-generate the geo capture link so the agent can send it during the same call.
         public Integer regionId;      // drives auto-assignment
         public String creationPath;   // A = BGC outbound, B = field encounter
         public Double potential;      // monthly business value — the sum of leadBrands
         /** Per-brand monthly business. What a BM actually needs to size the counter. */
         public List<BrandValue> leadBrands;
+        // Shop details the legacy Leads screen also captures. All optional here.
+        public String address;
+        public String city;
+        public String state;
+        public String remark;         // becomes the first trail entry's note
+        public Boolean conversionHigh; // legacy "conversion probability": High -> Green, else Yellow
+        public Integer counterSize;   // user.lead_detail.counter_size
+        // Store photos as document ids from /document-upload (user.lead_detail columns).
+        public Integer frontp;
+        public Integer frontWithMarket;
+        public Integer internalLongShot;
+        public Integer internalLeftWall;
+        public Integer internalRightWall;
+    }
     /** One brand's monthly business value. */
     public static class BrandValue {
         public String brand;

Subversion Repositories SmartDukaan

(root)//trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LmsLeadController.java – Rev 37737 → 37749