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

 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
             paymentOptionIdPaymentOptionMap.put(paymentOption.getId(), paymentOption);
+        }
         return paymentOptionIdPaymentOptionMap;
+    }
-    private Map<Integer, PaymentOption> paymentOptionIdPaymentOptionMapUsingPaymentOptions(
-            List<Integer> fofoPartnerPaymentOptions) throws ProfitMandiBusinessException {
-        List<PaymentOption> paymentOptions = paymentOptionRepository
-                .selectByIds(new HashSet<>(fofoPartnerPaymentOptions));
-        Map<Integer, PaymentOption> paymentOptionIdPaymentOptionMap = new HashMap<>();
-        for (PaymentOption paymentOption : paymentOptions) {
-            paymentOptionIdPaymentOptionMap.put(paymentOption.getId(), paymentOption);
-        }
-        return paymentOptionIdPaymentOptionMap;
-    }
     private Map<Integer, PaymentOptionTransaction> paymentOptionIdPaymentOptionTransactionMap(
             List<PaymentOptionTransaction> paymentOptionTransactions) {
         Map<Integer, PaymentOptionTransaction> paymentOptionIdPaymentOptionTransactionMap = new HashMap<>();
         for (PaymentOptionTransaction paymentOptionTransaction : paymentOptionTransactions) {
             paymentOptionIdPaymentOptionTransactionMap.put(paymentOptionTransaction.getPaymentOptionId(),
         //jaihind
         return responseSender.ok("Success");
+    }
-    @RequestMapping(value = "/generateInvoice")
-    public ResponseEntity<?> generateInvoice(HttpServletRequest request, HttpServletResponse response,
-                                             @RequestParam(name = ProfitMandiConstants.ORDER_ID) int orderId) throws ProfitMandiBusinessException {
-        LOGGER.info("Request received at url {} with params [{}={}] ", request.getRequestURI(),
+    /** Provider whose policy certificates we hold on disk and can staple to the invoice. */
-                ProfitMandiConstants.ORDER_ID, orderId);
+    private static final int CERTIFICATE_PROVIDER_ID = 6;
-        LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
-        InvoicePdfModel pdfModel = null;
-        if (roleManager.isAdmin(fofoDetails.getRoleIds())) {
-            pdfModel = orderService.getInvoicePdfModel(orderId);
-        } else {
-            pdfModel = orderService.getInvoicePdfModel(fofoDetails.getFofoId(), orderId);
-        }
-        FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(orderId);
-        List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectByRetailerIdInvoiceNumber(fofoOrder.getInvoiceNumber());
-        // Step 1: Generate invoice PDF
-        ByteArrayOutputStream invoiceOutput = new ByteArrayOutputStream();
-        PdfUtils.generateAndWrite(Arrays.asList(pdfModel), invoiceOutput);
-        byte[] invoicePdf = invoiceOutput.toByteArray();
-        // Step 2: Load all policy certificate PDFs
+    /** How many of the matching sale-history invoices one download will render. */
-        List<byte[]> pdfFiles = new ArrayList<>();
+    private static final int SALE_HISTORY_DOWNLOAD_LIMIT = 100;
-        pdfFiles.add(invoicePdf); // first add invoice
+    /**
-        for (InsurancePolicy insurancePolicy : insurancePolicies) {
+     * Single entry point for downloading partner sale invoices.
+     *
+     * <p>The three ways an operator picks the orders — one order, a partner's date range, or a
-            if (insurancePolicy.getProviderId() == 6) {
+     * sale-history search — differ only in how the order ids are resolved and who is allowed to
-                String policyNumber = insurancePolicy.getPolicyNumber();
+     * ask. Everything after that (build the models, render, staple the policy certificates,
-                String safePolicyNo = policyNumber.replace("/", "-");
+     * respond) is identical, so it lives here once. Keeping them apart is what let them drift:
-                String filePath = "/uploads/policy-certificate-" + safePolicyNo + ".pdf";
+     * only the single-order download used to attach the certificates, so the same invoice pulled
-                File file = new File(filePath);
+     * from sale history silently came out without them.
+     *
-                if (file.exists()) {
+     * <p>Selector, in precedence order: {@code orderId} → one invoice; {@code partnerId} with
+     * {@code startDate}/{@code endDate} → that partner's range, admin only; otherwise the caller's
-                    try {
+     * own sale-history search.
+     */
+    @RequestMapping(value = "/invoice/download")
+    public ResponseEntity<?> downloadInvoice(HttpServletRequest request,
+                                             @RequestParam(name = ProfitMandiConstants.ORDER_ID, required = false) Integer orderId,
-                        byte[] policyPdf = Files.readAllBytes(file.toPath());
+                                             @RequestParam(required = false) Integer partnerId,
-                        pdfFiles.add(policyPdf);
+                                             @RequestParam(required = false) LocalDateTime startDate,
-                    } catch (IOException e) {
+                                             @RequestParam(required = false) LocalDateTime endDate,
+                                             @RequestParam(name = "searchValue", defaultValue = "") String searchValue,
+                                             @RequestParam(name = "searchType", defaultValue = "") SearchType searchType,
-                        LOGGER.error("Failed to read policy PDF: {}", filePath, e);
+                                             @RequestParam(required = false) LocalDateTime startTime,
-                    }
+                                             @RequestParam(required = false) LocalDateTime endTime,
-                } else {
+                                             @RequestParam(name = "offset", defaultValue = "0") int offset,
-                    LOGGER.warn("Policy PDF not found: {}", filePath);
+                                             @RequestParam(name = "withPolicies", defaultValue = "true") boolean withPolicies)
-                }
+            throws ProfitMandiBusinessException {
+        LOGGER.info("Request received at url {} with query [{}]", request.getRequestURI(), request.getQueryString());
-            }
+        LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
-        }
-        // Step 3: Merge all PDFs
+        if (orderId != null) {
+            List<InvoicePdfModel> pdfModels = this.modelsForOrder(fofoDetails, orderId);
-        byte[] mergedPdf;
+            return this.invoicePdfResponse(pdfModels,
+                    "invoice-" + pdfModels.get(0).getInvoiceNumber() + ".pdf", withPolicies);
-        try {
+        }
+        if (partnerId != null) {
+            return this.invoicePdfResponse(this.modelsForPartner(fofoDetails, partnerId, startDate, endDate),
-            mergedPdf = PdfUtils.mergePdfFiles(pdfFiles);
+                    "invoice-" + partnerId + ".pdf", withPolicies);
-        } catch (Exception e) {
+        }
-            LOGGER.error("Error merging PDFs", e);
+        return this.invoicePdfResponse(
-            throw new ProfitMandiBusinessException("Failed to generate merged PDF", "", "");
+                this.modelsForSearch(fofoDetails, searchType, searchValue, startTime, endTime, offset),
+                "invoices.pdf", withPolicies);
-        }
+    }
+    /** One invoice. An admin can pull any partner's; a partner is pinned to their own store. */
-        // Step 4: Return merged PDF as response
+    private List<InvoicePdfModel> modelsForOrder(LoginDetails fofoDetails, int orderId)
-        HttpHeaders headers = new HttpHeaders();
+            throws ProfitMandiBusinessException {
-        headers.setContentType(MediaType.APPLICATION_PDF);
+        return Arrays.asList(roleManager.isAdmin(fofoDetails.getRoleIds())
-        headers.setContentDispositionFormData("inline", "invoice-with-policies-" + pdfModel.getInvoiceNumber() + ".pdf");
+                ? orderService.getInvoicePdfModel(orderId)
-        headers.setContentLength(mergedPdf.length);
+                : orderService.getInvoicePdfModel(fofoDetails.getFofoId(), orderId));
+    }
+    /** Every invoice one partner raised in a window. Admin-only, since it reads across stores. */
+    private List<InvoicePdfModel> modelsForPartner(LoginDetails fofoDetails, int partnerId,
-        InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(mergedPdf));
+                                                   LocalDateTime startDate, LocalDateTime endDate)
+            throws ProfitMandiBusinessException {
-        return new ResponseEntity<>(resource, headers, HttpStatus.OK);
+        if (!roleManager.isAdmin(fofoDetails.getRoleIds())) {
+            throw new ProfitMandiBusinessException("Auth", fofoDetails.getEmailId(), "Unauthorised access");
+        }
+        return this.toPdfModels(fofoOrderRepository.selectByFofoId(partnerId, startDate, endDate, 0, 0));
+    }
-   /* @RequestMapping(value = "/generateInvoice")
+    /** The caller's own sale history, re-running the search the listing screen was showing. */
-    public ResponseEntity<?> generateInvoice(HttpServletRequest request, HttpServletResponse response,
+    private List<InvoicePdfModel> modelsForSearch(LoginDetails fofoDetails, SearchType searchType, String searchValue,
-                                             @RequestParam(name = ProfitMandiConstants.ORDER_ID) int orderId, @RequestParam(required = false) PrinterType printerType) throws ProfitMandiBusinessException {
+                                                  LocalDateTime startTime, LocalDateTime endTime, int offset)
-        LOGGER.info("Request received at url {} with params [{}={}] ", request.getRequestURI(),
-                ProfitMandiConstants.ORDER_ID, orderId);
+            throws ProfitMandiBusinessException {
-        LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        Map<String, Object> map = orderService.getSaleHistory(fofoDetails.getFofoId(), searchType, searchValue,
-        InvoicePdfModel pdfModel = null;
-        int fofoId;
-        if (roleManager.isAdmin(fofoDetails.getRoleIds())) {
+                startTime, endTime, offset, SALE_HISTORY_DOWNLOAD_LIMIT);
-            pdfModel = orderService.getInvoicePdfModel(orderId);
+        List<FofoOrder> fofoOrders = (List<FofoOrder>) map.get("saleHistories");
-            fofoId = pdfModel.getCustomer().getCustomerId();
+        if (fofoOrders == null || fofoOrders.isEmpty()) {
-        } else {
-            pdfModel = orderService.getInvoicePdfModel(fofoDetails.getFofoId(), orderId);
+            throw new ProfitMandiBusinessException("Search criteria", "", "No orders found for criteria");
-            fofoId = fofoDetails.getFofoId();
+        }
+        return this.toPdfModels(fofoOrders);
+    }
+    /**
+     * Builds one model per order, skipping any that fail. A single unbillable order should not cost
+     * the operator the whole batch, so the failure is logged and the rest still download.
+     */
+    private List<InvoicePdfModel> toPdfModels(List<FofoOrder> fofoOrders) {
+        List<InvoicePdfModel> pdfModels = new ArrayList<>();
+        for (FofoOrder fofoOrder : fofoOrders) {
+            try {
+                pdfModels.add(orderService.getInvoicePdfModel(fofoOrder.getId()));
-        if (printerType == null) {
+            } catch (Exception e) {
-            FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
+                LOGGER.info("could not create invoice for {}, invoice number {}", fofoOrder.getId(),
-            //printerType = fs.getPrinterType();
+                        fofoOrder.getInvoiceNumber());
+            }
+        }
+        return pdfModels;
+    }
+    /** Renders the invoices, optionally staples the policy certificates, and sends the PDF inline. */
+    private ResponseEntity<?> invoicePdfResponse(List<InvoicePdfModel> pdfModels, String fileName,
+                                                 boolean withPolicies) throws ProfitMandiBusinessException {
+        ByteArrayOutputStream invoiceOutput = new ByteArrayOutputStream();
+        PdfUtils.generateAndWrite(pdfModels, invoiceOutput);
+        byte[] pdf = invoiceOutput.toByteArray();
+        if (withPolicies) {
-        FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(orderId);
+            pdf = this.appendPolicyCertificates(pdf, pdfModels);
+        }
-        List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectByRetailerIdInvoiceNumber(fofoOrder.getInvoiceNumber());
+        LOGGER.info("Pdf stream length {} for {} invoice(s)", pdf.length, pdfModels.size());
-        // Step 1: Generate invoice PDF
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_PDF);
-        ByteArrayOutputStream invoiceOutput = new ByteArrayOutputStream();
+        headers.set("Content-disposition", "inline; filename=" + fileName);
+        headers.setContentLength(pdf.length);
+        return new ResponseEntity<>(new InputStreamResource(new ByteArrayInputStream(pdf)), headers, HttpStatus.OK);
+    }
+    /**
+     * Staples the policy certificates for these invoices onto the end of the rendered PDF. Only one
-        PdfUtils.generateAndWrite(Arrays.asList(pdfModel), printerType, invoiceOutput);
+     * provider's certificates are held on disk, so the lookup filters on it in a single query; a
+     * missing or unreadable file is logged and skipped rather than failing the download, since the
+     * invoice itself is still the document being asked for.
+     */
+    private byte[] appendPolicyCertificates(byte[] invoicePdf, List<InvoicePdfModel> pdfModels)
+            throws ProfitMandiBusinessException {
-        byte[] invoicePdf = invoiceOutput.toByteArray();
+        List<String> invoiceNumbers = new ArrayList<>();
+        for (InvoicePdfModel pdfModel : pdfModels) {
+            invoiceNumbers.add(pdfModel.getInvoiceNumber());
+        }
-        // Step 2: Load all policy certificate PDFs
         List<byte[]> pdfFiles = new ArrayList<>();
-        pdfFiles.add(invoicePdf); // first add invoice
+        pdfFiles.add(invoicePdf);
-        for (InsurancePolicy insurancePolicy : insurancePolicies) {
+        for (InsurancePolicy insurancePolicy : insurancePolicyRepository
-            if (insurancePolicy.getProviderId() == 6) {
+                .selectByInvoiceNumbersAndProviderId(invoiceNumbers, CERTIFICATE_PROVIDER_ID)) {
-                String policyNumber = insurancePolicy.getPolicyNumber();
+            Path certificate = iciciLombardService.policyCertificatePath(insurancePolicy.getPolicyNumber());
-                String safePolicyNo = policyNumber.replace("/", "-");
+            if (!Files.exists(certificate)) {
-                String filePath = "/uploads/policy-certificate-" + safePolicyNo + ".pdf";
+                LOGGER.warn("Policy PDF not found: {}", certificate);
-                File file = new File(filePath);
+                continue;
-                if (file.exists()) {
+            }
-                    try {
+            try {
-                        byte[] policyPdf = Files.readAllBytes(file.toPath());
+                pdfFiles.add(Files.readAllBytes(certificate));
-                        pdfFiles.add(policyPdf);
-                    } catch (IOException e) {
+            } catch (IOException e) {
-                        LOGGER.error("Failed to read policy PDF: {}", filePath, e);
+                LOGGER.error("Failed to read policy PDF: {}", certificate, e);
-                    }
-                } else {
-                    LOGGER.warn("Policy PDF not found: {}", filePath);
-                }
+            }
+        }
-        // Step 3: Merge all PDFs
+        if (pdfFiles.size() == 1) {
-        byte[] mergedPdf;
+            return invoicePdf;
+        }
         try {
-            mergedPdf = PdfUtils.mergePdfFiles(pdfFiles);
+            return PdfUtils.mergePdfFiles(pdfFiles);
         } catch (Exception e) {
             LOGGER.error("Error merging PDFs", e);
             throw new ProfitMandiBusinessException("Failed to generate merged PDF", "", "");
+        }
+    }
-        // Step 4: Return merged PDF as response
+    /** @deprecated superseded by {@link #downloadInvoice}; kept so older pages keep working. */
+    @Deprecated
-        HttpHeaders headers = new HttpHeaders();
+    @RequestMapping(value = "/generateInvoice")
-        headers.setContentType(MediaType.APPLICATION_PDF);
+    public ResponseEntity<?> generateInvoice(HttpServletRequest request, HttpServletResponse response,
-        headers.setContentDispositionFormData("inline", "invoice-with-policies-" + pdfModel.getInvoiceNumber() + ".pdf");
+                                             @RequestParam(name = ProfitMandiConstants.ORDER_ID) int orderId) throws ProfitMandiBusinessException {
-        headers.setContentLength(mergedPdf.length);
+        return this.downloadInvoice(request, orderId, null, null, null, "", null, null, null, 0, true);
+    }
-        InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(mergedPdf));
-        return new ResponseEntity<>(resource, headers, HttpStatus.OK);
-    }*/
+    /** @deprecated superseded by {@link #downloadInvoice}; kept so older pages keep working. */
+    @Deprecated
     @RequestMapping(value = "/generateInvoices")
     public ResponseEntity<?> generateInvoice(HttpServletRequest request, HttpServletResponse response,
                                              @RequestParam LocalDateTime startDate, @RequestParam LocalDateTime endDate, @RequestParam int partnerId)
             throws ProfitMandiBusinessException {
-        LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
-        List<InvoicePdfModel> pdfModels = new ArrayList<>();
-        if (roleManager.isAdmin(fofoDetails.getRoleIds())) {
-            List<Integer> orderIds = fofoOrderRepository.selectByFofoId(partnerId, startDate, endDate, 0, 0).stream()
+        return this.downloadInvoice(request, null, partnerId, startDate, endDate, "", null, null, null, 0, true);
-                    .map(x -> x.getId()).collect(Collectors.toList());
-            for (int orderId : orderIds) {
-                pdfModels.add(orderService.getInvoicePdfModel(orderId));
-            }
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            PdfUtils.generateAndWrite(pdfModels, byteArrayOutputStream);
-            LOGGER.info("Pdf Stream length {}", byteArrayOutputStream.toByteArray().length);
-            final HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_PDF);
-            headers.set("Content-disposition", "inline; filename=invoice-" + partnerId + ".pdf");
-            headers.setContentLength(byteArrayOutputStream.toByteArray().length);
-            final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-            final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
-            return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
-        } else {
-            throw new ProfitMandiBusinessException("Auth", fofoDetails.getEmailId(), "Unauthorised access");
-        }
+    }
     @RequestMapping(value = "/saleHistory")
     public String saleHistory(HttpServletRequest request,
                               @RequestParam(name = "searchValue", defaultValue = "") String searchValue,
                 startTime, endTime, offset, limit);
         model.addAllAttributes(map);
         return "sale-history";
+    }
+    /** @deprecated superseded by {@link #downloadInvoice}; kept so older pages keep working. */
+    @Deprecated
     @RequestMapping(value = "/downloadInvoices")
     public ResponseEntity<?> downloadInvoices(HttpServletRequest request,
                                               @RequestParam(name = "searchValue", defaultValue = "") String searchValue,
                                               @RequestParam(name = "searchType", defaultValue = "") SearchType searchType,
                                               @RequestParam(required = false) LocalDateTime startTime,
                                               @RequestParam(required = false) LocalDateTime endTime,
                                               @RequestParam(name = "offset", defaultValue = "0") int offset,
                                               @RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
             throws ProfitMandiBusinessException {
-        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-        Map<String, Object> map = orderService.getSaleHistory(loginDetails.getFofoId(), searchType, searchValue,
+        return this.downloadInvoice(request, null, null, null, null, searchValue, searchType, startTime, endTime,
-                startTime, endTime, offset, 100);
-        List<FofoOrder> fofoOrders = (List<FofoOrder>) map.get("saleHistories");
-        if (fofoOrders.size() == 0) {
-            throw new ProfitMandiBusinessException("Search criteria", "", "No orders found for criteria");
-        }
-        final HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_PDF);
-        headers.set("Content-disposition", "inline; filename=invoices.pdf");
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        List<InvoicePdfModel> pdfModels = new ArrayList<>();
-        for (FofoOrder fofoOrder : fofoOrders) {
-            try {
-                pdfModels.add(orderService.getInvoicePdfModel(fofoOrder.getId()));
-            } catch (Exception e) {
+                offset, true);
-                LOGGER.info("could not create invoice for {}, invoice number {}", fofoOrder.getId(),
-                        fofoOrder.getInvoiceNumber());
-            }
-        }
-        PdfUtils.generateAndWrite(pdfModels, byteArrayOutputStream);
-        headers.setContentLength(byteArrayOutputStream.toByteArray().length);
-        final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-        final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
-        return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+    }
     @RequestMapping(value = "/credit-note/{creditNoteId}")
     public ResponseEntity<?> downloadCreditNote(HttpServletRequest request, @PathVariable int creditNoteId)
             throws ProfitMandiBusinessException {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java – Rev 37380 → 37400