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

 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.PartnerOnBoardingPanel;
+import com.spice.profitmandi.dao.entity.fofo.PartnerOnboardingTrainingPanel;
 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.enumuration.transaction.PartnerOnBoardingStatus;
 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;
     @Autowired
     AgreementEsignRepository agreementEsignRepository;
     @Autowired
+    PartnerDashboardTrainingRepository partnerDashboardTrainingRepository;
+    @Autowired
     ResponseSender responseSender;
     List<String> agreedBrandFeeChangerEmail = Arrays.asList("kamini.sharma@smartdukaan.com");
     // Loi Form
+    }
     // For a REVIVAL LOI whose brand-fee payment just got confirmed:
     //   1. Reactivate the FofoStore behind the old code so orders / wallet / inventory
     //      start honoring the store again.
-    //   2. Wipe the previous partner-life's AGREEMENT_ESIGN + PO_CREATION + PO_APPROVAL
+    //   2. Wipe all Store Setup + Launch timeline events (RECCE, WOD, FIN_CODE,
+    //      WOD_FINANCE_MAPPING, BRANDING, ADVANCE_STOCK_PAYMENT, FULL_STOCK_PAYMENT,
+    //      AGREEMENT_ESIGN, PO_CREATION, PO_APPROVAL, BILLING, INAUGRATION, TRAINING)
+    //      plus RBM_ASSIGNMENT so the revived partner has to redo the full lifecycle.
+    //      Kept from old life: ON_BOARDING, VERIFICATION, STORE_CODE_CREATED,
+    //      DOCUMENTS, WELCOME_CALL — partner is already known + verified.
+    //   3. Reset the backing panel fields (billingStatus, inaugrationDate,
+    //      deploymentDate, receeActual, status) and the training panel's
-    //      timeline rows on the reused onboarding so the partner appears back on the
+    //      appTraining / dashboardTraning flags so the events can actually re-fire.
-    //      agreement-esign panel and gaurav.sharma can re-verify a freshly signed doc.
+    //   4. Wipe the AgreementEsign record so the upload widget starts blank.
     // No-op for NEW and ANY_OTHER LOIs.
     private void applyRevivalPaymentHooks(LoiForm loi) throws ProfitMandiBusinessException {
         if (loi == null || loi.getOnboardingType() != OnboardingType.REVIVAL) return;
         String oldCode = loi.getOldStoreCode();
         if (oldCode != null && !oldCode.trim().isEmpty()) {
                 LOGGER.info("Revival PAYMENT_APPROVAL: reactivated FofoStore code=" + oldCode);
+            }
+        }
         int onboardingId = loi.getOnBoardingId();
         if (onboardingId > 0) {
+            StoreTimeline[] revivalClearEvents = {
+                    StoreTimeline.RECCE,
+                    StoreTimeline.WOD,
+                    StoreTimeline.FIN_CODE,
+                    StoreTimeline.WOD_FINANCE_MAPPING,
+                    StoreTimeline.BRANDING,
+                    StoreTimeline.ADVANCE_STOCK_PAYMENT,
+                    StoreTimeline.FULL_STOCK_PAYMENT,
-            storeTimelinetbRepository.deleteByOnboardingIdAndEvent(onboardingId, StoreTimeline.AGREEMENT_ESIGN);
+                    StoreTimeline.AGREEMENT_ESIGN,
-            storeTimelinetbRepository.deleteByOnboardingIdAndEvent(onboardingId, StoreTimeline.PO_CREATION);
+                    StoreTimeline.PO_CREATION,
+                    StoreTimeline.PO_APPROVAL,
+                    StoreTimeline.BILLING,
+                    StoreTimeline.INAUGRATION,
+                    StoreTimeline.TRAINING,
+                    StoreTimeline.RBM_ASSIGNMENT
+            };
+            for (StoreTimeline ev : revivalClearEvents) {
-            storeTimelinetbRepository.deleteByOnboardingIdAndEvent(onboardingId, StoreTimeline.PO_APPROVAL);
+                storeTimelinetbRepository.deleteByOnboardingIdAndEvent(onboardingId, ev);
+            }
             agreementEsignRepository.deleteByOnboardingId(onboardingId);
+            PartnerOnBoardingPanel panel = partnerOnBoardingPanelRepository.selectById(onboardingId);
+            if (panel != null) {
+                panel.setBillingStatus(0);
+                panel.setInaugrationDate(null);
+                panel.setDeploymentDate(null);
+                panel.setReceeActual(null);
+                panel.setStatus(PartnerOnBoardingStatus.pending);
+                panel.setUpdatedTimestamp(LocalDateTime.now());
+                partnerOnBoardingPanelRepository.persist(panel);
+            }
+            PartnerOnboardingTrainingPanel training = partnerDashboardTrainingRepository.selectByOnboardingId(onboardingId);
+            if (training != null) {
+                training.setAppTraining(null);
+                training.setDashboardTraning(null);
+                training.setDateCompleted(null);
+                training.setUpdateTimestamp(LocalDateTime.now());
+                partnerDashboardTrainingRepository.persist(training);
+            }
+            LOGGER.info("Revival PAYMENT_APPROVAL: cleared " + revivalClearEvents.length
-            LOGGER.info("Revival PAYMENT_APPROVAL: cleared AGREEMENT_ESIGN + PO_CREATION + PO_APPROVAL + AgreementEsign row for onboardingId=" + onboardingId);
+                    + " timeline events + AgreementEsign + reset panel/training state for onboardingId=" + onboardingId);
+        }
+    }
+}

Subversion Repositories SmartDukaan

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