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

 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.brandFee.BrandFee;
 import com.spice.profitmandi.dao.entity.brandFee.BrandFeeCollection;
 import com.spice.profitmandi.dao.entity.dtr.Otp;
+import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 import com.spice.profitmandi.dao.entity.fofo.PaymentOption;
 import com.spice.profitmandi.dao.entity.onBoarding.*;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
 import com.spice.profitmandi.dao.enumuration.dtr.StoreTimeline;
+import com.spice.profitmandi.dao.enumuration.onBorading.OnboardingType;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.FeePaymentStatus;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.LoiStatus;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.StoreType;
 import com.spice.profitmandi.dao.model.LoiFormModel;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.brandFee.BrandFeeCollectionRepository;
 import com.spice.profitmandi.dao.repository.brandFee.BrandFeeRepository;
 import com.spice.profitmandi.dao.repository.catalog.BrandCategoryRepository;
 import com.spice.profitmandi.dao.repository.catalog.BrandsRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
-import com.spice.profitmandi.dao.repository.dtr.DistrictMasterRepository;
-import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
-import com.spice.profitmandi.dao.repository.dtr.OtpRepository;
+import com.spice.profitmandi.dao.repository.dtr.*;
-import com.spice.profitmandi.dao.repository.dtr.PartnerOnBoardingPanelRepository;
 import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
 import com.spice.profitmandi.dao.repository.inventory.PartnerOnboardingService;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 import com.spice.profitmandi.dao.repository.onboarding.*;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
     @Autowired
     PaymentOptionRepository paymentOptionRepository;
     @Autowired
+    FofoStoreRepository fofoStoreRepository;
+    @Autowired
     ResponseSender responseSender;
     List<String> agreedBrandFeeChangerEmail = Arrays.asList("sm@smartdukaan.com", "kamini.sharma@smartdukaan.com");
     // Loi Form
     // Save Loi data in fofo.loi_form table
     @RequestMapping(value = "/submitLoiForm", method = RequestMethod.POST)
     public String submitLoiForm(HttpServletRequest request, @RequestBody LoiFormData loiFormData, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         LOGGER.info("filledBy - " + loginDetails.getEmailId());
+        String validationError = validateOnboardingTypeFields(loiFormData);
+        if (validationError != null) {
+            LOGGER.warn("LOI submit rejected for " + loginDetails.getEmailId() + ": " + validationError);
+            model.addAttribute("response1", mvcResponseSender.createResponseString(false));
+            return "response";
+        }
         boolean isDataCreated = loiFormService.createLoiForm(loiFormData, loginDetails.getEmailId());
         if (isDataCreated) {
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
             return "response";
         } else {
             model.addAttribute("response1", mvcResponseSender.createResponseString(false));
             return "response";
+        }
+    }
+    // Returns null if valid, else an error message. NEW is default; only REVIVAL / ANY_OTHER need extras.
+    private String validateOnboardingTypeFields(LoiFormData loiFormData) throws ProfitMandiBusinessException {
+        String rawType = loiFormData.getOnboardingType();
+        if (rawType == null || rawType.trim().isEmpty()) {
+            loiFormData.setOnboardingType(OnboardingType.NEW.name());
+            return null;
+        }
+        OnboardingType type;
+        try {
+            type = OnboardingType.valueOf(rawType.trim().toUpperCase());
+        } catch (IllegalArgumentException e) {
+            return "Invalid onboarding type: " + rawType;
+        }
+        if (type == OnboardingType.NEW) return null;
+        String reason = loiFormData.getRevivalReason();
+        if (reason == null || reason.trim().isEmpty()) {
+            return "Reason is mandatory for " + type + " onboarding";
+        }
+        if (type == OnboardingType.REVIVAL) {
+            String oldCode = loiFormData.getOldStoreCode();
+            if (oldCode == null || oldCode.trim().isEmpty()) {
+                return "Old Store Code is mandatory for REVIVAL";
+            }
+            FofoStore existing = fofoStoreRepository.selectByStoreCode(oldCode.trim());
+            if (existing == null) {
+                return "Old Store Code " + oldCode + " does not exist";
+            }
+            boolean stillActive = fofoStoreRepository.selectActiveStores().stream()
+                    .anyMatch(s -> oldCode.trim().equalsIgnoreCase(s.getCode()));
+            if (stillActive) {
+                return "Old Store Code " + oldCode + " is still active — revival is only for closed stores";
+            }
+        }
+        return null;
+    }
     // show all pending loi form to specific auth user who have filled the form(type based)
     @RequestMapping(value = "/pendingLoiForm", method = RequestMethod.GET)
     public String pendingLoiForm(HttpServletRequest request, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java – Rev 37516 → 37523