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

 import com.spice.profitmandi.common.model.CustomPaymentOption;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.FoiBadReturnRequest;
 import com.spice.profitmandi.common.model.GadgetCopsInsuranceModel;
 import com.spice.profitmandi.common.model.GstRate;
+import com.spice.profitmandi.common.model.InsuranceModel;
 import com.spice.profitmandi.common.model.ItemIdQuantityAvailability;
 import com.spice.profitmandi.common.model.PdfModel;
 import com.spice.profitmandi.common.model.PriceModel;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.Quantity;
 import com.spice.profitmandi.common.model.SerialNumberDetail;
+import com.spice.profitmandi.common.model.WiseAppInsuaranceModel;
 import com.spice.profitmandi.common.util.FormattingUtils;
 import com.spice.profitmandi.common.util.InsuranceUtils;
 import com.spice.profitmandi.common.util.StringUtils;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.dao.entity.catalog.Item;
-import com.spice.profitmandi.dao.entity.dtr.GadgetCopsInsuranceCalc;
 import com.spice.profitmandi.dao.entity.dtr.InsurancePolicy;
-import com.spice.profitmandi.dao.entity.dtr.InsuranceProvider;
 import com.spice.profitmandi.dao.entity.dtr.PaymentOptionTransaction;
 import com.spice.profitmandi.dao.entity.dtr.PolicyNumberGenerationSequence;
 import com.spice.profitmandi.dao.entity.dtr.Retailer;
 import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.fofo.CurrentInventorySnapshot;
 import com.spice.profitmandi.dao.repository.fofo.PurchaseReturnItemRepository;
 import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
 import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.dao.repository.user.CounterRepository;
 import com.spice.profitmandi.dao.repository.user.PrivateDealUserRepository;
+import com.spice.profitmandi.service.integrations.zest.MobileInsurancePlan;
+import com.spice.profitmandi.service.integrations.zest.ZestService;
 import com.spice.profitmandi.service.inventory.InventoryService;
 import com.spice.profitmandi.service.inventory.PurchaseReturnService;
 import com.spice.profitmandi.service.pricing.PricingService;
 import com.spice.profitmandi.service.scheme.SchemeService;
 import com.spice.profitmandi.service.user.RetailerService;
 	@Autowired
 	private PurchaseReturnService purchaseReturnService;
 	@Autowired
+	private ZestService zestService;
+	@Autowired
 	private RetailerService retailerService;
 	@Autowired
 	private CustomerRepository customerRepository;
 				lineItemPrice.put(customFofoOrderItem.getItemId(), customFofoOrderItem.getSellingPrice());
 			} else {
 				totalAmount = totalAmount + customFofoOrderItem.getSellingPrice() * customFofoOrderItem.getQuantity();
 				totalAmount = totalAmount - customFofoOrderItem.getDiscountAmount() * customFofoOrderItem.getQuantity();
 				for (SerialNumberDetail serialNumberDetail : customFofoOrderItem.getSerialNumberDetails()) {
-					if (serialNumberDetail.isInsurance() && serialNumberDetail.getAmount() > 0) {
+					if (serialNumberDetail.getAmount() > 0) {
 						totalAmount = totalAmount + serialNumberDetail.getAmount();
+					}
+				}
+			}
 		Map<Integer, Item> itemMap = this.toItemMap(items);
 		Set<Integer> nonSerializedItemIds = new HashSet<>();
 		Set<String> serialNumbers = new HashSet<>();
-		Map<String, Float> insuranceSerialNumberItemPrice = new HashMap<>();
-		Map<String, Float> insuranceSerialNumberSaleAmount = new HashMap<>();
+		Map<String, InsuranceModel> insuranceSerialNumberMap = new HashMap<>();
-		Map<String, String> serialNumberModelName = new HashMap<>();
-		Map<String, String> serialNumberBrand = new HashMap<>();
 		for (CustomFofoOrderItem customFofoOrderItem : createOrderRequest.getFofoOrderItems()) {
 			Item item = itemMap.get(customFofoOrderItem.getItemId());
 			noGST = item.getHsnCode().equals("NOGST");
 			if (item.getType().equals(ItemType.SERIALIZED)) {
 				for (SerialNumberDetail serialNumberDetail : customFofoOrderItem.getSerialNumberDetails()) {
 					serialNumbers.add(serialNumberDetail.getSerialNumber());
-					if (serialNumberDetail.isInsurance()) {
+					if (serialNumberDetail.getAmount() > 0) {
-						insuranceSerialNumberItemPrice.put(serialNumberDetail.getSerialNumber(),
+						InsuranceModel im = new InsuranceModel();
-								customFofoOrderItem.getSellingPrice());
+						im.setBrand(item.getBrand());
-						insuranceSerialNumberSaleAmount.put(serialNumberDetail.getSerialNumber(),
+						im.setModelName(item.getModelName());
-								serialNumberDetail.getAmount());
+						im.setInsuranceAmount(serialNumberDetail.getAmount());
-						serialNumberModelName.put(serialNumberDetail.getSerialNumber(),
+						im.setDeviceSellingPrice(customFofoOrderItem.getSellingPrice());
-								(item.getModelName() + item.getModelNumber()).trim());
+						im.setInsuranceId(serialNumberDetail.getInsurance() + "");
-						serialNumberBrand.put(serialNumberDetail.getSerialNumber(), item.getBrand());
+						insuranceSerialNumberMap.put(serialNumberDetail.getSerialNumber(), im);
+					}
+				}
 			} else {
 				nonSerializedItemIds.add(customFofoOrderItem.getItemId());
+			}
 			if (item.getType().equals(ItemType.SERIALIZED)) {
 				// TODO:handle null
 				if (serializedInventoryItemMap.get(item.getId()) == null
 						|| itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails()
 								.size() != serializedInventoryItemMap.get(item.getId()).size()) {
-					// not enough serial numbers
-					// LOGGER.info("serialNumbers {}", serialNumbers);
-					// LOGGER.info("serializedInventoryItemMap {}", serializedInventoryItemMap);
 					LOGGER.error("itemId {} => mismatch size of requested serial numbers", item.getId());
-					Function<SerialNumberDetail, String> serialNumberDetailToSerialNumberFunction = new Function<SerialNumberDetail, String>() {
+					List<String> invalidSerialNumbers = itemIdCustomFofoOrderItemMap.get(item.getId())
-						@Override
-						public String apply(SerialNumberDetail serialNumberDetail) {
+							.getSerialNumberDetails().stream().map(x -> x.getSerialNumber())
-							return serialNumberDetail.getSerialNumber();
+							.collect(Collectors.toList());
-						}
-					};
-					throw new ProfitMandiBusinessException("invalidSerialNumbers",
+					throw new ProfitMandiBusinessException("invalidSerialNumbers", invalidSerialNumbers, "FFORDR_1004");
-							itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails().stream()
-									.map(serialNumberDetailToSerialNumberFunction).collect(Collectors.toList()),
-							"FFORDR_1004");
+				}
 				Set<InventoryItem> inventoryItemsSerializedserialized = serializedInventoryItemMap.get(item.getId());
 				for (InventoryItem inventoryItem : inventoryItemsSerializedserialized) {
 					inventoryItem.setGoodQuantity(0);
 					inventoryItemIdQuantityUsed.put(inventoryItem.getId(), 1);
 		} else {
 			this.validateMopPrice(itemIdMopPriceMap, itemIdCustomFofoOrderItemMap);
+		}
 		String fofoStoreCode = this.getFofoStoreCode(fofoId);
-		InvoiceNumberGenerationSequence invoiceNumberGenerationSequence = null;
 		String documentNumber = null;
 		if (noGST) {
 			documentNumber = this.getSecurityDepositNumber(fofoId, fofoStoreCode);
 		} else {
 			this.updateInventoryItemsAndScanRecord(inventoryItems, fofoId, inventoryItemIdQuantityUsed,
 					fofoOrder.getId());
+		}
 		// insurance calculation is insurance flag is enabled
+		//
-		if (!insuranceSerialNumberItemPrice.isEmpty()) {
+		if (!insuranceSerialNumberMap.isEmpty()) {
-			LOGGER.info("Processing for insurence for serialNumbers");
+			LOGGER.info("Processing insurane for serialNumbers");
-			Map<Float, GadgetCopsInsuranceCalc> insurancePricesMap = pricingService.getInsurancePrices(
-					new HashSet<>(insuranceSerialNumberItemPrice.values()), ProfitMandiConstants.GADGET_COPS);
-			InsuranceProvider insuranceProvider = insuranceProviderRepository
-					.selectByName(ProfitMandiConstants.GADGET_COPS);
-			this.validateInsuranceAmount(insuranceSerialNumberItemPrice, insuranceSerialNumberSaleAmount,
-					insurancePricesMap);
-			this.validateInsuranceMargin(insuranceSerialNumberItemPrice, itemIdCustomFofoOrderItemMap,
-					itemIdMopPriceMap, insurancePricesMap, insuranceSerialNumberSaleAmount);
-			LocalDate customerDateOfBirth = LocalDate.from(createOrderRequest.getCustomerDateOfBirth());
+			LocalDate customerDateOfBirth = LocalDate.from(createOrderRequest.getCustomer().getDateOfBirth());
-			for (Map.Entry<String, Float> entry : insuranceSerialNumberItemPrice.entrySet()) {
+			for (Map.Entry<String, InsuranceModel> entry : insuranceSerialNumberMap.entrySet()) {
+				InsuranceModel insuranceModel = entry.getValue();
-				PolicyNumberGenerationSequence policyNumberGenerationSequence = this
+				MobileInsurancePlan mobileInsurancePlan = zestService.getAllPlansMap()
-						.createPolicyNumberGenerationSequence();
+						.get(insuranceModel.getInsuranceId());
 				InsurancePolicy insurancePolicy = this.createInsurancePolicy(fofoOrder.getInvoiceNumber(), fofoId,
-						insurancePricesMap.get(entry.getValue()).getDealerPrice(),
+						insuranceModel.getInsuranceAmount() - mobileInsurancePlan.getPartnerCommission(),
-						insuranceSerialNumberSaleAmount.get(entry.getKey()), entry.getValue(), entry.getKey(),
+						insuranceModel.getInsuranceAmount(), insuranceModel.getDeviceSellingPrice(), entry.getKey(),
-						serialNumberModelName.get(entry.getKey()), serialNumberBrand.get(entry.getKey()),
+						insuranceModel.getModelName(), insuranceModel.getBrand(), customer, customerDateOfBirth,
-						policyNumberGenerationSequence.getSequence(), insuranceProvider.getId(), customer,
+						customerAddress, mobileInsurancePlan.getProductName() + " for " + mobileInsurancePlan.getDuration() + " Months");
-						customerDateOfBirth, customerAddress);
+				String walletDescription = null;
+				if (mobileInsurancePlan.getProviderId().equals("0")) {
+					insurancePolicy.setProviderId(1);
+					int policyNumberGenerationSequence = this.createPolicyNumberGenerationSequence().getSequence();
+					insurancePolicy.setPolicyNumber(StringUtils.generatePolicyNumber(
+							ProfitMandiConstants.POLICY_NUMBER_PREFIX, policyNumberGenerationSequence));
-				GadgetCopsInsuranceModel gadgetCopsInsuranceModel = this.createGadgetCopsInsuranceModel(
+					GadgetCopsInsuranceModel gadgetCopsInsuranceModel = this.createGadgetCopsInsuranceModel(
-						serialNumberBrand.get(entry.getKey()), serialNumberModelName.get(entry.getKey()),
+							entry.getValue().getBrand(), entry.getValue().getModelName(), entry.getKey(),
-						entry.getKey(), customerDateOfBirth, customer, customerAddress, insurancePolicy);
+							customerDateOfBirth, customer, customerAddress, insurancePolicy);
+					try {
+						InsuranceUtils.submitToGadgetCops(gadgetCopsInsuranceModel);
+						insurancePolicy.setPosted(true);
-				String walletDescription = "Sale of " + insurancePolicy.getPolicyNumber() + " for "
+						walletDescription = "Sale of " + insurancePolicy.getPolicyNumber() + " for "
+								+ fofoOrder.getInvoiceNumber();
+					} catch (ProfitMandiBusinessException profitMandiBusinessException) {
+						LOGGER.info("Unable to submit insurance policy details to {}", insuranceModel.getProviderName(),
+								profitMandiBusinessException);
+						throw new ProfitMandiBusinessException("Insurance", mobileInsurancePlan.getProductName(),
+								"Could not generate insurance for Gadget Cop");
+					}
+				} else {
+					try {
+						WiseAppInsuaranceModel wiseAppInsuaranceModel = this
+								.createWiseAppInsuranceModel(mobileInsurancePlan, insurancePolicy, customCustomer);
+						String wiseAppInsuranceCode = zestService.createInsurance(wiseAppInsuaranceModel);
+						insurancePolicy.setPolicyNumber(wiseAppInsuranceCode);
+						// TODO: remove hardcoding
+						insurancePolicy.setProviderId(2);
+						walletDescription = "Sale of " + insurancePolicy.getProductName() + " against "
-						+ fofoOrder.getInvoiceNumber();
+								+ fofoOrder.getInvoiceNumber();
+					} catch (ProfitMandiBusinessException pbe) {
+						pbe.printStackTrace();
+						throw new ProfitMandiBusinessException("Insurance", mobileInsurancePlan.getProductName(),
+								pbe.getMessage());
+					}
+				}
 				walletService.consumeAmountFromWallet(fofoId, insurancePolicy.getId(),
 						WalletReferenceType.DAMAGE_PROTECTION, walletDescription, insurancePolicy.getPurchaseAmount());
-				try {
-					InsuranceUtils.submitToGadgetCops(gadgetCopsInsuranceModel);
-					insurancePolicy.setPosted(true);
-				} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-					LOGGER.info("Unable to submit insurance policy details to {}", insuranceProvider.getName(),
-							profitMandiBusinessException);
-				}
 				insurancePolicyRepository.persist(insurancePolicy);
+			}
+		}
 		schemeService.processSchemeOut(fofoOrder.getId(), fofoId);
 		return fofoOrder.getId();
+	}
+	private WiseAppInsuaranceModel createWiseAppInsuranceModel(MobileInsurancePlan mobileInsurancePlan,
+			InsurancePolicy insurancePolicy, CustomCustomer customer) throws ProfitMandiBusinessException {
+		WiseAppInsuaranceModel wiseAppInsuranceModel = new WiseAppInsuaranceModel();
+		CustomAddress address = customer.getAddress();
+		String sAddress = (address.getLine1() + " " + address.getLine2()).replaceAll("  ", " ");
+		wiseAppInsuranceModel.setAddress(sAddress);
+		wiseAppInsuranceModel.setBrand(insurancePolicy.getBrand());
+		wiseAppInsuranceModel.setBalanceType("4");
+		wiseAppInsuranceModel.setProduct(mobileInsurancePlan.getProductId());
+		wiseAppInsuranceModel
+				.setName((insurancePolicy.getCustomerFirstName() + " " + insurancePolicy.getCustomerLastName()));
+		wiseAppInsuranceModel.setCity(address.getCity());
+		wiseAppInsuranceModel.setDob(StringUtils.toHyphenatedString(customer.getDateOfBirth()));
+		wiseAppInsuranceModel.setDuration(mobileInsurancePlan.getDuration());
+		wiseAppInsuranceModel.setPincode(address.getPinCode());
+		wiseAppInsuranceModel.setEmail(customer.getEmailId());
+		wiseAppInsuranceModel.setDeviceType(mobileInsurancePlan.getDeviceType());
+		wiseAppInsuranceModel.setImeiNo(insurancePolicy.getSerialNumber());
+		wiseAppInsuranceModel.setPlanValue(String.valueOf(insurancePolicy.getSaleAmount()));
+		wiseAppInsuranceModel.setRetailerId(zestService.getWiseAppPartnerCode(insurancePolicy.getRetailerId()));
+		wiseAppInsuranceModel.setDuration(mobileInsurancePlan.getDuration());
+		wiseAppInsuranceModel.setGender(customer.getGender());
+		wiseAppInsuranceModel.setInvoiceNo(insurancePolicy.getInvoiceNumber());
+		wiseAppInsuranceModel.setNumber(insurancePolicy.getCustomerMobileNumber());
+		wiseAppInsuranceModel
+				.setPurchaseDate(StringUtils.toHyphenatedString(insurancePolicy.getCreateTimestamp().toLocalDate()));
+		wiseAppInsuranceModel.setModel(insurancePolicy.getModelName());
+		wiseAppInsuranceModel.setHandSetValue(String.valueOf(insurancePolicy.getSellingPrice()));
+		wiseAppInsuranceModel.setInsurerCompany(mobileInsurancePlan.getProviderId());
+		return wiseAppInsuranceModel;
+	}
 	private String getInvoiceNumber(int fofoId, String fofoStoreCode) {
 		InvoiceNumberGenerationSequence invoiceNumberGenerationSequence = null;
 		try {
 			invoiceNumberGenerationSequence = invoiceNumberGenerationSequenceRepository.selectByFofoId(fofoId);
 			invoiceNumberGenerationSequence.setSequence(invoiceNumberGenerationSequence.getSequence() + 1);
 		return gadgetCopsInsuranceModel;
+	}
 	private InsurancePolicy createInsurancePolicy(String invoiceNumber, int retailerId, float purchaseAmount,
 			float saleAmount, float sellingPrice, String serialNumber, String modelName, String brand,
-			int policyNumberGenerationSequence, int insuranceProviderId, Customer customer,
-			LocalDate customerDateOfBirth, CustomerAddress customerAddress) {
+			Customer customer, LocalDate customerDateOfBirth, CustomerAddress customerAddress, String productName) {
 		InsurancePolicy insurancePolicy = new InsurancePolicy();
 		insurancePolicy.setInvoiceNumber(invoiceNumber);
 		insurancePolicy.setRetailerId(retailerId);
 		insurancePolicy.setPurchaseAmount(purchaseAmount);
 		insurancePolicy.setSaleAmount(saleAmount);
 		insurancePolicy.setSellingPrice(sellingPrice);
 		insurancePolicy.setSerialNumber(serialNumber);
 		insurancePolicy.setModelName(modelName);
 		insurancePolicy.setBrand(brand);
-		insurancePolicy.setPolicyNumber(StringUtils.generatePolicyNumber(ProfitMandiConstants.POLICY_NUMBER_PREFIX,
-				policyNumberGenerationSequence));
-		insurancePolicy.setProviderId(insuranceProviderId);
 		insurancePolicy.setCustomerFirstName(customer.getFirstName());
 		insurancePolicy.setCustomerLastName(customer.getLastName());
 		insurancePolicy.setCustomerMobileNumber(customer.getMobileNumber());
 		insurancePolicy.setCustomerEmailId(customer.getEmailId());
 		insurancePolicy.setCustomerDateOfBirth(customerDateOfBirth);
 		insurancePolicy.setCustomerAddress1(customerAddress.getLine1());
 		insurancePolicy.setCustomerAddress2(customerAddress.getLine2());
 		insurancePolicy.setCustomerCity(customerAddress.getCity());
 		insurancePolicy.setCustomerPinCode(customerAddress.getPinCode());
 		insurancePolicy.setCustomerState(customerAddress.getState());
+		insurancePolicy.setProductName(productName);
 		return insurancePolicy;
+	}
-	private void validateInsuranceMargin(Map<String, Float> insuranceSerialNumberItemPrice,
-			Map<Integer, CustomFofoOrderItem> itemIdCustomFofoOrderItemMap, Map<Integer, PriceModel> itemIdMopPriceMap,
-			Map<Float, GadgetCopsInsuranceCalc> insurancePricesMap, Map<String, Float> insuranceSerialNumberSaleAmount)
-			throws ProfitMandiBusinessException {
-		Map<Float, Float> invalidInsuranceMarginAmount = new HashMap<>();
-		for (Map.Entry<String, Float> entry : insuranceSerialNumberItemPrice.entrySet()) {
-			int itemId = this.getItemIdFromSerialNumber(itemIdCustomFofoOrderItemMap, entry.getKey());
-			float itemPurchasePrice = itemIdMopPriceMap.get(itemId).getPrice();
-			float itemSellingPrice = entry.getValue();
-			float itemMargin = itemSellingPrice - itemPurchasePrice;
-			float insurancePurchasePrice = insurancePricesMap.get(entry.getValue()).getDealerPrice();
-			float insuranceSellingPrice = insuranceSerialNumberSaleAmount.get(entry.getKey());
-			float insuranceMargin = insuranceSellingPrice - insurancePurchasePrice;
-			if (insuranceMargin < (itemMargin * 30 / 100)) {
-				invalidInsuranceMarginAmount.put(insuranceMargin, (itemMargin * 30 / 100));
-			}
-		}
-		if (!invalidInsuranceMarginAmount.isEmpty()) {
-			LOGGER.error(
-					"insurance marging should be greater than equal to item profit margin insuranceMarginItemIdMargin {}",
-					invalidInsuranceMarginAmount);
-			throw new ProfitMandiBusinessException("invalidInsuranceMarginAmount", invalidInsuranceMarginAmount,
-					"FFORDR_1007");
-		}
-	}
-	private void validateInsuranceAmount(Map<String, Float> insuranceSerialNumberItemPrice,
-			Map<String, Float> insuranceSerialNumberSaleAmount, Map<Float, GadgetCopsInsuranceCalc> insurancePricesMap)
-			throws ProfitMandiBusinessException {
-		Map<Float, Float> invalidInsurancePurchaseSaleAmount = new HashMap<>();
-		Map<Float, Float> invalidInsuranceSalePurchaseAmount = new HashMap<>();
-		for (Map.Entry<String, Float> entry : insuranceSerialNumberItemPrice.entrySet()) {
-			if (insuranceSerialNumberSaleAmount.get(entry.getKey()) < insurancePricesMap.get(entry.getValue())
-					.getDealerPrice()) {
-				invalidInsurancePurchaseSaleAmount.put(insurancePricesMap.get(entry.getValue()).getDealerPrice(),
-						insuranceSerialNumberSaleAmount.get(entry.getKey()));
-			}
-			if (insuranceSerialNumberSaleAmount.get(entry.getKey()) > insurancePricesMap.get(entry.getValue())
-					.getSellingPrice()) {
-				invalidInsuranceSalePurchaseAmount.put(insuranceSerialNumberSaleAmount.get(entry.getKey()),
-						insurancePricesMap.get(entry.getValue()).getDealerPrice());
-			}
-		}
-		// insurance sale amount can not be lesser than insurance purchase amount
-		if (!invalidInsurancePurchaseSaleAmount.isEmpty()) {
-			LOGGER.error(
-					"Invalid Insurance prices [{}], insurance sale amount can not be lesser than insurance purchase amount",
-					invalidInsurancePurchaseSaleAmount);
-			throw new ProfitMandiBusinessException("invalidInsurancePurchaseSaleAmount",
-					invalidInsurancePurchaseSaleAmount, "FFORDR_1008");
-		}
-		if (!invalidInsuranceSalePurchaseAmount.isEmpty()) {
-			LOGGER.error(
-					"Invalid Insurance prices [{}], insurance sale amount can not be greater than than insurance max amount",
-					invalidInsuranceSalePurchaseAmount);
-			throw new ProfitMandiBusinessException("invalidInsuranceSalePurchaseAmount",
-					invalidInsuranceSalePurchaseAmount, "FFORDR_1009");
-		}
-	}
 	private void validateDpPrice(Map<Integer, PriceModel> itemIdMopPriceMap,
 			Map<Integer, CustomFofoOrderItem> itemIdCustomFofoLineItemMap) throws ProfitMandiBusinessException {
 		for (Map.Entry<Integer, CustomFofoOrderItem> entry : itemIdCustomFofoLineItemMap.entrySet()) {
 			int itemId = entry.getKey();
 			CustomFofoOrderItem customFofoOrderItem = entry.getValue();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java – Rev 24400 → 24440