From 8195e828e4ce107130365df4c832ea3aa7796891 Mon Sep 17 00:00:00 2001
From: barsa <tumurbarsnarantuya@gmail.com>
Date: Thu, 25 Dec 2025 17:55:44 +0900
Subject: [PATCH] Update TypeScript Environment and Refactor Salesforce Mapper
 Logic

- Updated the import path in next-env.d.ts to reference the development types directory.
- Refactored the mapSimActivationFee function in the Salesforce mapper to remove reliance on Is_Default__c and Auto_Add__c fields, simplifying the logic for activation fees and handling default status through service fallback.
---
 apps/bff/src/modules/orders/services/checkout.service.ts | 5 -----
 apps/portal/next-env.d.ts                                | 2 +-
 .../services/components/sim/SimConfigureView.tsx         | 9 ++-------
 packages/domain/services/providers/salesforce/mapper.ts  | 7 +++----
 packages/domain/services/schema.ts                       | 1 -
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/apps/bff/src/modules/orders/services/checkout.service.ts b/apps/bff/src/modules/orders/services/checkout.service.ts
index 62fb89fd..d41e82a6 100644
--- a/apps/bff/src/modules/orders/services/checkout.service.ts
+++ b/apps/bff/src/modules/orders/services/checkout.service.ts
@@ -413,11 +413,6 @@ export class CheckoutService {
       return { fee: explicitFee, autoAdded: false };
     }
 
-    const autoAddFee = activationFees.find(fee => fee.catalogMetadata?.autoAdd);
-    if (autoAddFee) {
-      return { fee: autoAddFee, autoAdded: true };
-    }
-
     const defaultFee = activationFees.find(fee => fee.catalogMetadata?.isDefault);
     if (defaultFee) {
       return { fee: defaultFee, autoAdded: true };
diff --git a/apps/portal/next-env.d.ts b/apps/portal/next-env.d.ts
index 9edff1c7..c4b7818f 100644
--- a/apps/portal/next-env.d.ts
+++ b/apps/portal/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/portal/src/features/services/components/sim/SimConfigureView.tsx b/apps/portal/src/features/services/components/sim/SimConfigureView.tsx
index 4d3a943b..6753acdd 100644
--- a/apps/portal/src/features/services/components/sim/SimConfigureView.tsx
+++ b/apps/portal/src/features/services/components/sim/SimConfigureView.tsx
@@ -56,11 +56,7 @@ export function SimConfigureView({
     if (!Array.isArray(fees) || fees.length === 0) {
       return undefined;
     }
-    return (
-      fees.find(fee => fee.catalogMetadata?.autoAdd) ||
-      fees.find(fee => fee.catalogMetadata?.isDefault) ||
-      fees[0]
-    );
+    return fees.find(fee => fee.catalogMetadata?.isDefault) || fees[0];
   };
 
   const resolveOneTimeCharge = (value?: {
@@ -511,8 +507,7 @@ export function SimConfigureView({
                         ¥{activationFeeDetails.amount.toLocaleString()}
                       </span>
                     </div>
-                    {(requiredActivationFee?.catalogMetadata?.autoAdd ||
-                      requiredActivationFee?.catalogMetadata?.isDefault) && (
+                    {requiredActivationFee?.catalogMetadata?.isDefault && (
                       <p className="text-xs text-muted-foreground">
                         Required for all new SIM activations
                       </p>
diff --git a/packages/domain/services/providers/salesforce/mapper.ts b/packages/domain/services/providers/salesforce/mapper.ts
index 625e2ec1..09654b7b 100644
--- a/packages/domain/services/providers/salesforce/mapper.ts
+++ b/packages/domain/services/providers/salesforce/mapper.ts
@@ -186,15 +186,14 @@ export function mapSimActivationFee(
   pricebookEntry?: SalesforcePricebookEntryRecord
 ): SimActivationFeeCatalogItem {
   const simProduct = mapSimProduct(product, pricebookEntry);
-  const isDefault = product.Is_Default__c === true;
-  const autoAdd = product.Auto_Add__c === true;
+  // Auto_Add__c and Is_Default__c are no longer in the query.
+  // Default status is handled by SimServicesService fallback if not present.
 
   return {
     ...simProduct,
     catalogMetadata: {
       ...(simProduct.catalogMetadata ?? {}),
-      isDefault,
-      autoAdd,
+      isDefault: false, // Will be handled by service fallback
     },
   };
 }
diff --git a/packages/domain/services/schema.ts b/packages/domain/services/schema.ts
index 4de954ff..33dae875 100644
--- a/packages/domain/services/schema.ts
+++ b/packages/domain/services/schema.ts
@@ -127,7 +127,6 @@ export const simActivationFeeCatalogItemSchema = simCatalogProductSchema.extend(
   catalogMetadata: z
     .object({
       isDefault: z.boolean().optional(),
-      autoAdd: z.boolean().optional(),
     })
     .optional(),
 });