WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
+    }
     @SuppressWarnings("unchecked")
     @Override
+    @Transactional(rollbackFor = Throwable.class)
     public Map<String, Object> updateRetailerDetails(UpdateRetailerRequest updateRetailerRequest) throws
             ProfitMandiBusinessException {
         Map<String, Object> map = this.getByEmailIdOrMobileNumber(updateRetailerRequest.getEmailIdOrMobileNumber());
         User dtrUser = (User) map.get("user");
+        if (updateRetailerRequest.isFofo()) {
+            Retailer resolvedRetailer = (Retailer) map.get("retailer");
+            if (resolvedRetailer == null) {
+                // This save would mint a brand-new identity chain. Mandate: a partner
+                // gets a new store code only after the old store is closed, and the
+                // re-onboarding must reuse the partner's real email (takeover below) —
+                // never a variant email that forks a duplicate chain.
+                this.guardAgainstDuplicatePartnerChain(updateRetailerRequest);
+            } else if (updateRetailerRequest.isActive()) {
+                FofoStore existingStore = this.selectStoreOrNull(resolvedRetailer.getId());
+                if (existingStore != null && existingStore.isClosed()) {
+                    this.takeoverClosedStoreIdentity(existingStore, map);
+                }
+            }
+        }
         dtrUser = this.createUser(dtrUser, updateRetailerRequest);
         map.put("user", dtrUser);
         List<UserRole> userRoles = (List<UserRole>) map.get("userRoles");
         Role roleUser = roleRepository.selectByName(RoleType.USER.toString());
         Retailer retailer = (Retailer) map.get("retailer");
         retailer = this.updateRetailer(dtrUser, retailer, updateRetailerRequest);
         map.put("retailer", retailer);
-        // Ensure UserAccount links new dtr user to retailer (handles case where
+        // Ensure the dtr login's bridge rows point at the current identity. Repairs
-        // dtr.user was deleted and re-created with a new ID)
+        // recreated logins and repoints the login after a closed-store takeover.
+        userAccountRepository.upsert(dtrUser.getId(), AccountType.saholic, retailer.getId());
         try {
-            userAccountRepository.selectSaholicByUserId(dtrUser.getId());
+            com.spice.profitmandi.dao.entity.user.User identity = userUserRepository.selectById(retailer.getId());
-        } catch (ProfitMandiBusinessException e) {
-            try {
-                UserAccount ua = new UserAccount();
-                ua.setAccountKey(retailer.getId());
+            if (identity.getActiveCartId() > 0) {
-                ua.setUserId(dtrUser.getId());
-                ua.setType(AccountType.saholic);
-                userAccountRepository.persist(ua);
-            } catch (Exception ex) {
-                LOGGER.error("Error creating saholic UserAccount for userId: {}", dtrUser.getId(), ex);
+                userAccountRepository.upsert(dtrUser.getId(), AccountType.cartId, identity.getActiveCartId());
+            }
+        } catch (ProfitMandiBusinessException e) {
+            LOGGER.error("Error ensuring cartId UserAccount for userId: {}", dtrUser.getId(), e);
+        }
         List<String> retailerBlockBrands = retailerBlockBrandsRepository.selectAllByRetailer(retailer.getId()).stream().map(x -> x.getBlockBrands()).collect(Collectors.toList());
         LOGGER.info("retailerBlockBrands" + retailerBlockBrands);
         return map;
+    }
+    private FofoStore selectStoreOrNull(int retailerId) {
+        try {
+            return fofoStoreRepository.selectByRetailerId(retailerId);
+        } catch (ProfitMandiBusinessException e) {
+            return null;
+        }
+    }
+    private void guardAgainstDuplicatePartnerChain(UpdateRetailerRequest updateRetailerRequest)
+            throws ProfitMandiBusinessException {
+        User byMobile = null;
+        try {
+            byMobile = userRepository.selectByMobileNumber(updateRetailerRequest.getUserMobileNumber());
+        } catch (ProfitMandiBusinessException e) {
+            // no dtr user with this mobile
+        }
+        if (byMobile != null) {
+            Integer accountKey = userAccountRepository.selectSaholicAccountKeySafe(byMobile.getId());
+            FofoStore store = accountKey != null ? this.selectStoreOrNull(accountKey) : null;
+            if (store != null) {
+                if (!store.isClosed()) {
+                    throw new ProfitMandiBusinessException("Open store exists", store.getCode(),
+                            "Partner mobile " + updateRetailerRequest.getUserMobileNumber()
+                                    + " already owns open store " + store.getCode()
+                                    + ". Close it first, or use email-change to keep the same code.");
+                }
+                throw new ProfitMandiBusinessException("Closed store exists", store.getCode(),
+                        "Old store " + store.getCode() + " is closed. Re-onboard using the partner's existing email "
+                                + byMobile.getEmailId() + " and a new code will be issued automatically.");
+            }
+        }
+        if (!updateRetailerRequest.isAllowAdditionalOutlet()) {
+            List<FofoStore> openGstStores = fofoStoreRepository.selectAllOpenByGstNumber(updateRetailerRequest.getGstNumber());
+            if (!openGstStores.isEmpty()) {
+                String codes = openGstStores.stream().map(FofoStore::getCode).collect(Collectors.joining(", "));
+                throw new ProfitMandiBusinessException("Open store exists for GST", codes,
+                        "GST " + updateRetailerRequest.getGstNumber() + " already has open store(s) " + codes
+                                + ". Close the old store first, or tick 'Additional outlet for same GST' if this is genuinely a new outlet.");
+            }
+        }
+    }
+    private void takeoverClosedStoreIdentity(FofoStore oldStore, Map<String, Object> map) {
+        // Mandate: closed stores are never reopened. Re-onboarding with the partner's
+        // real contacts issues a fresh code on the same dtr login: free the old
+        // identity's email so the new user.user can take it over, then drop the old
+        // chain from the resolution map so the save proceeds as a fresh onboarding.
+        try {
+            com.spice.profitmandi.dao.entity.user.User oldIdentity = userUserRepository.selectById(oldStore.getId());
+            String tombstone = "closed." + oldStore.getId() + "." + oldIdentity.getEmailId();
+            if (tombstone.length() > 128) {
+                tombstone = tombstone.substring(0, 128);
+            }
+            oldIdentity.setEmailId(tombstone);
+        } catch (ProfitMandiBusinessException e) {
+            LOGGER.error("Takeover: identity not found for closed store {}", oldStore.getId(), e);
+        }
+        LOGGER.info("Takeover: closed store {} ({}) — issuing new code on the same login", oldStore.getCode(), oldStore.getId());
+        map.remove("retailer");
+        map.remove("retailerAddress");
+        map.remove("shops");
+        map.remove("fofoStore");
+    }
     private void createDefaultPaymentOption(int fofoId) {
         List<Integer> paymentOptionIds = fofoPartnerPaymentOptionRepository.selectPaymentOptionIdsByFofoId(fofoId);
         if (paymentOptionIds.isEmpty()) {
             PaymentOption paymentOption = null;
             try {
             saholicUser.setName(retailerName);
             saholicUser.setActiveCartId(cart.getId());
             saholicUser.setCreateTimestamp(LocalDateTime.now());
             userUserRepository.persist(saholicUser);
-            UserAccount ua = new UserAccount();
-            ua.setAccountKey(saholicUser.getId());
+            userAccountRepository.upsert(user.getId(), AccountType.saholic, saholicUser.getId());
-            ua.setUserId(user.getId());
-            ua.setType(AccountType.saholic);
-            userAccountRepository.persist(ua);
-            UserAccount ua2 = new UserAccount();
-            ua2.setAccountKey(saholicUser.getActiveCartId());
+            userAccountRepository.upsert(user.getId(), AccountType.cartId, saholicUser.getActiveCartId());
-            ua2.setUserId(user.getId());
-            ua2.setType(AccountType.cartId);
-            userAccountRepository.persist(ua2);
             LOGGER.info("created....");
+        }
         return saholicUser.getId();
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java – Rev 37151 → 37156