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

 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.auth.VonageAgentRepository;
 import com.spice.profitmandi.dao.repository.dtr.LeadCallRepository;
 import com.spice.profitmandi.dao.repository.dtr.LeadDndRepository;
 import com.spice.profitmandi.dao.repository.dtr.LeadRepository;
-import com.spice.profitmandi.dao.enumuration.dtr.LeadCallProvider;
-import com.spice.profitmandi.dao.enumuration.dtr.LeadCallStatus;
 import com.spice.profitmandi.service.integrations.vonage.VonageVoiceService;
-import com.spice.profitmandi.service.integrations.vonage.vbc.VbcDialerProvider;
+import com.spice.profitmandi.service.lms.LmsCallService;
-import com.spice.profitmandi.service.integrations.vonage.vbc.VbcTelephonyService;
+import com.spice.profitmandi.service.lms.LmsOutcome;
 import com.spice.profitmandi.service.lms.LmsDialerProvider;
 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;
     @Autowired
     private LmsDialerProvider dialerProvider;
     /**
-     * Optional: only present when VBC is the active provider. Injected by type rather than through
+     * Placing, tracking and ending a call — shared with the field app's endpoints in
-     * the interface because placing a call needs the agent's extension, which is VBC-specific.
+     * profitmandi-web, which differ from these only in how they identify the agent.
      */
-    @Autowired(required = false)
-    private VbcDialerProvider vbcDialerProvider;
-    @Autowired(required = false)
+    @Autowired
-    private VbcTelephonyService vbcTelephonyService;
+    private LmsCallService lmsCallService;
     @Autowired
     private AuthRepository authRepository;
     @Autowired
      * {@code PinelabsWebhookController}. Set it in every environment that faces the internet.
      */
     @Value("${vonage.webhook.signature.secret:}")
     private String webhookSignatureSecret;
-    /** TRAI restricts commercial calling to 09:00–21:00. Configurable, but not by accident. */
-    @Value("${lms.dialer.calling.hours.start:9}")
-    private int callingHoursStart;
-    @Value("${lms.dialer.calling.hours.end:21}")
-    private int callingHoursEnd;
-    @Value("${lms.dialer.enforce.calling.hours:true}")
-    private boolean enforceCallingHours;
     // ---- Browser-facing -----------------------------------------------------------------------
     /**
      * Mint this agent's dialer credential. Short-lived by design — the page asks again rather than
      * holding a long-lived token in memory.
      */
-    /**
-     * How long a placed call may stay unseen in VBC's active-call list before it is written off.
-     * Generous enough to cover the gap between "VBC returned an id" and "the extension starts
-     * ringing", short enough that an agent is not left watching a dead progress bar.
-     */
-    @Value("${vonage.vbc.initiate.grace.seconds:25}")
-    private int initiateGraceSeconds;
     @RequestMapping(value = "/lms/dialer/token", method = RequestMethod.GET)
     @ResponseBody
     public ResponseEntity<?> token(HttpServletRequest request) {
         AuthUser me = currentUser(request);
         LmsDialerProvider.Handshake handshake = dialerProvider.prepare(me);
         out.put("applicationId", handshake.applicationId);
         return responseSender.ok(out);
+    }
     /**
-     * Gate a dial before it happens: DND and calling hours. Runs server-side because a check that
+     * Gate a dial before it happens: DND and calling hours.
+     *
+     * <p>A refusal is a 200 carrying {@code {ok:false, code, reason}} — "this retailer is on the
+     * DND register" is a normal answer to "may I dial?", not a client error, and the browser needs
-     * only lives in the browser is not a check.
+     * the code to decide what to show.
      */
     @RequestMapping(value = "/lms/dialer/precheck", method = RequestMethod.POST)
     @ResponseBody
     public ResponseEntity<?> precheck(HttpServletRequest request,
                                       @RequestParam(name = "leadId") int leadId) {
-        Map<String, Object> out = new HashMap<>();
-        Lead lead = leadRepository.selectById(leadId);
+        LmsOutcome outcome = lmsCallService.precheck(leadId);
-        if (lead == null) {
-            return responseSender.notFound("Lead not found");
-        }
-        LeadDnd blocked = leadDndRepository.selectByMobile(lead.getLeadMobile());
-        if (blocked != null) {
-            out.put("ok", false);
-            out.put("code", "DND");
-            out.put("reason", "This retailer is on the do-not-call register");
-            return responseSender.ok(out);
-        }
-        if (enforceCallingHours && !withinCallingHours()) {
+        if (outcome.status == LmsOutcome.Status.REFUSED) {
-            out.put("ok", false);
-            out.put("code", "OUTSIDE_HOURS");
-            out.put("reason", "Commercial calling is only permitted between "
-                    + callingHoursStart + ":00 and " + callingHoursEnd + ":00");
-            return responseSender.ok(out);
-        }
-        if (vonageVoiceService.toE164(lead.getLeadMobile()) == null) {
-            out.put("ok", false);
-            out.put("code", "NO_NUMBER");
-            out.put("reason", "This lead has no usable contact number");
-            return responseSender.ok(out);
+            return responseSender.ok(outcome.asRefusalBody());
+        }
-        out.put("ok", true);
-        out.put("leadId", leadId);
-        return responseSender.ok(out);
+        return render(outcome);
+    }
     /**
      * The call row for a lead, so the browser can learn its {@code leadCallId} after the answer
      * webhook has created it. The browser cannot know this id itself — see {@code VonageVoiceService}.
         out.put("durationSeconds", call.getDurationSeconds());
         out.put("hasRecording", call.getRecordingDocumentId() != null);
         return responseSender.ok(out);
+    }
-    /**
-     * Place a call server-side (click2dial). The agent's own VBC device rings first, then VBC dials
+    /** Place a call server-side (click2dial). */
-     * the retailer.
-     *
-     * <p>Unlike the WebRTC path there is no answer webhook, so the {@code lead_call} row is created
-     * here — the server knows the lead, the agent and the call id in one place, which makes
-     * correlation trivial rather than something to reconstruct afterwards.
-     */
     @RequestMapping(value = "/lms/dialer/dial", method = RequestMethod.POST)
     @ResponseBody
     public ResponseEntity<?> dial(HttpServletRequest request,
                                   @RequestParam(name = "leadId") int leadId) {
-        AuthUser me = currentUser(request);
+        return render(lmsCallService.dial(currentUser(request), leadId));
-        if (me == null) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
-        }
-        if (vbcDialerProvider == null || vbcTelephonyService == null) {
-            return responseSender.badRequest("Server-placed calling is not available on this environment.");
-        }
-        Lead lead = leadRepository.selectById(leadId);
-        if (lead == null) {
-            return responseSender.notFound("Lead not found");
-        }
-        // Re-checked here rather than trusting that the pre-check ran, or that nothing changed since.
-        if (leadDndRepository.selectByMobile(lead.getLeadMobile()) != null) {
-            return responseSender.badRequest("This retailer is on the do-not-call register.");
-        }
-        if (enforceCallingHours && !withinCallingHours()) {
-            return responseSender.badRequest("Commercial calling is only permitted between "
-                    + callingHoursStart + ":00 and " + callingHoursEnd + ":00.");
-        }
-        String extension = vbcDialerProvider.endpointFor(me);
-        if (extension == null || extension.trim().isEmpty()) {
-            return responseSender.badRequest(
-                    "No VBC " + vbcTelephonyService.fromType() + " is set for your account.");
-        }
-        try {
-            String callId = vbcDialerProvider.placeCall(me, extension, lead.getLeadMobile());
-            LeadCall call = new LeadCall();
-            call.setLeadId(leadId);
-            call.setAuthId(me.getId());
-            call.setProvider(LeadCallProvider.VONAGE);
-            call.setProviderCallUuid(callId);
-            call.setDirection("OUTBOUND");
-            call.setFromNumber(extension.trim());
-            call.setToNumber(vbcTelephonyService.toE164(lead.getLeadMobile()));
-            call.setStatus(LeadCallStatus.INITIATED);
-            call.setStartedAt(LocalDateTime.now());
-            call.setCreatedTimestamp(LocalDateTime.now());
-            leadCallRepository.persist(call);
-            Map<String, Object> out = new HashMap<>();
-            out.put("ok", true);
-            out.put("leadCallId", call.getId());
-            out.put("extension", extension.trim());
-            LOGGER.info("VBC click2dial for lead {} by auth {} -> call row {} (vendor {})",
-                    leadId, me.getId(), call.getId(), callId);
-            return responseSender.ok(out);
-        } catch (Exception e) {
-            LOGGER.error("Could not place a VBC call for lead {}", leadId, e);
-            return responseSender.badRequest(e.getMessage() == null
-                    ? "Could not place the call." : e.getMessage());
-        }
+    }
-    /**
-     * Poll one call's live state. Needed because click2dial has no event webhook — the browser has
+    /** Poll one call's live state — click2dial has no event webhook, so the browser has to ask. */
-     * to ask. Also advances the stored row so the trail and reports see the outcome.
-     */
     @RequestMapping(value = "/lms/dialer/state", method = RequestMethod.GET)
     @ResponseBody
     public ResponseEntity<?> state(HttpServletRequest request,
                                    @RequestParam(name = "leadCallId") int leadCallId) {
-        LeadCall call = leadCallRepository.selectById(leadCallId);
+        return render(lmsCallService.state(currentUser(request), leadCallId));
-        if (call == null) {
-            return responseSender.notFound("Call not found");
-        }
-        if (!ownsCall(request, call)) {
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
-        }
-        Map<String, Object> out = new HashMap<>();
-        if (vbcTelephonyService != null && call.getProviderCallUuid() != null
-                && call.getStatus() != null && !call.getStatus().isTerminal()) {
-            try {
-                com.fasterxml.jackson.databind.JsonNode live =
-                        vbcTelephonyService.fetchCallState(call.getProviderCallUuid());
-                if (live != null) {
-                    // Derived from the call's legs — a click2dial call has no top-level status.
-                    LeadCallStatus mapped = vbcTelephonyService.deriveStatus(live);
-                    if (mapped != null && mapped.advancesFrom(call.getStatus())) {
-                        if (mapped == LeadCallStatus.ANSWERED && call.getAnsweredAt() == null) {
-                            // Prefer VBC's own answer time: polling runs every 3s, so "now" could
-                            // overstate the answer by almost that much on every call.
-                            LocalDateTime answeredAt = vbcTelephonyService.retailerAnsweredAt(live);
-                            call.setAnsweredAt(answeredAt == null ? LocalDateTime.now() : answeredAt);
-                        }
-                        call.setStatus(mapped);
-                        leadCallRepository.persist(call);
-                    }
-                } else if (call.getStatus() != LeadCallStatus.INITIATED) {
-                    // We have seen this call live before, so VBC dropping it means it ended.
-                    closeCall(call, LeadCallStatus.COMPLETED);
-                } else if (call.getStartedAt() != null
-                        && call.getStartedAt().plusSeconds(initiateGraceSeconds).isBefore(LocalDateTime.now())) {
-                    // Never seen live, and too old to still be appearing: the call was accepted by
-                    // VBC (it returned an id) but never reached the agent's extension.
-                    //
-                    // This branch is load-bearing. /calls only lists calls that are IN PROGRESS —
-                    // it is not history — so a call that never connects is absent from the moment
-                    // it is placed. Without a deadline it would sit at INITIATED forever and the
-                    // browser would poll every 3s for the rest of the session.
-                    LOGGER.warn("VBC call {} (vendor {}) never appeared as live within {}s — "
-                                    + "marking failed; usually the extension has no reachable device",
-                            leadCallId, call.getProviderCallUuid(), initiateGraceSeconds);
-                    closeCall(call, LeadCallStatus.FAILED);
-                }
-            } catch (Exception e) {
-                LOGGER.warn("Could not refresh VBC state for call {}", leadCallId, e);
-            }
-        }
-        out.put("leadCallId", call.getId());
-        out.put("status", call.getStatus() == null ? null : call.getStatus().name());
-        out.put("terminal", call.getStatus() != null && call.getStatus().isTerminal());
-        out.put("answered", call.getAnsweredAt() != null);
-        return responseSender.ok(out);
+    }
     /** Hang up a server-placed call. */
     @RequestMapping(value = "/lms/dialer/hangup", method = RequestMethod.POST)
     @ResponseBody
     public ResponseEntity<?> hangup(HttpServletRequest request,
                                     @RequestParam(name = "leadCallId") int leadCallId) {
-        LeadCall call = leadCallRepository.selectById(leadCallId);
+        return render(lmsCallService.hangup(currentUser(request), leadCallId));
-        if (call == null) {
-            return responseSender.notFound("Call not found");
-        }
-        if (!ownsCall(request, call)) {
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
-        }
-        if (vbcTelephonyService != null) {
-            vbcTelephonyService.endCall(call.getProviderCallUuid());
-        }
-        if (call.getStatus() != null && !call.getStatus().isTerminal()) {
-            closeCall(call, LeadCallStatus.COMPLETED);
-        }
-        Map<String, Object> out = new HashMap<>();
-        out.put("ok", true);
-        return responseSender.ok(out);
+    }
+    /** Map a service outcome onto this module's response envelope. */
-    private boolean withinCallingHours() {
+    private ResponseEntity<?> render(LmsOutcome outcome) {
-        int hour = LocalTime.now().getHour();
+        switch (outcome.status) {
+            case OK:
+                return responseSender.ok(outcome.data);
+            case NOT_FOUND:
+                return responseSender.notFound(outcome.message);
+            case UNAUTHORIZED:
+                return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+            case FORBIDDEN:
-        return hour >= callingHoursStart && hour < callingHoursEnd;
+                return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
+            default:
+                return responseSender.badRequest(outcome.message);
+        }
+    }
     // ---- Vonage callbacks ---------------------------------------------------------------------
     /**
             LOGGER.warn("No vonage_agent mapping for Vonage user '{}'", vonageUserName);
+        }
         return agent;
+    }
-    /**
-     * Put a call into a terminal state: status, end time and duration together.
-     *
-     * <p>Duration is measured from {@code answered_at}, not {@code started_at} — it is meant to be
-     * how long the two people spoke, and a click2dial call spends several seconds ringing the
-     * agent's own device before the retailer is even dialled. A call that was never answered has a
-     * duration of zero rather than null, so reporting can distinguish "no conversation" from "not
-     * recorded yet".
-     *
-     * <p>Exists because the three places a call can end were each stamping status and end time by
-     * hand and none of them set duration at all — {@code setDurationSeconds} was only ever called on
-     * the WebRTC webhook path, so every click2dial call had a null duration.
-     */
-    private void closeCall(LeadCall call, LeadCallStatus status) {
-        LocalDateTime endedAt = LocalDateTime.now();
-        call.setStatus(status);
-        call.setEndedAt(endedAt);
-        long seconds = call.getAnsweredAt() == null ? 0L
-                : java.time.Duration.between(call.getAnsweredAt(), endedAt).getSeconds();
-        call.setDurationSeconds((int) Math.max(0L, seconds));
-        leadCallRepository.persist(call);
-    }
-    /**
-     * Whether the caller placed this call.
-     *
-     * <p>{@code leadCallId} arrives from the browser, so without this any signed-in user could poll
-     * another agent's live call or hang it up mid-conversation by guessing a sequential id. Deliberately
-     * an exact owner check rather than a role check: a supervisor has no reason to drive someone
-     * else's call from this endpoint, and reporting reads the call rows directly.
-     */
-    private boolean ownsCall(HttpServletRequest request, LeadCall call) {
-        AuthUser me = currentUser(request);
-        if (me == null || call.getAuthId() != me.getId()) {
-            LOGGER.warn("Auth {} tried to act on call {} owned by auth {}",
-                    me == null ? null : me.getId(), call.getId(), call.getAuthId());
-            return false;
-        }
-        return true;
-    }
     private AuthUser currentUser(HttpServletRequest request) {
         try {
             LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
             if (loginDetails != null && loginDetails.getEmailId() != null) {

Subversion Repositories SmartDukaan

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