From 7ffd2d562fa562e62df9f45e82d8062880024ad8 Mon Sep 17 00:00:00 2001
From: barsa <tumurbarsnarantuya@gmail.com>
Date: Tue, 21 Oct 2025 10:19:30 +0900
Subject: [PATCH] Remove Activation_Last_Attempt_At__c field from Salesforce
 order schema and related utility functions to streamline order data
 structure. Update buildInClause function to format output with parentheses
 for improved query syntax.

---
 .../integrations/salesforce/utils/order-query-builder.ts  | 2 --
 apps/bff/src/integrations/salesforce/utils/soql.util.ts   | 2 +-
 .../domain/orders/providers/salesforce/raw.types.d.ts     | 1 -
 packages/domain/orders/providers/salesforce/raw.types.js  | 3 +--
 packages/domain/orders/providers/salesforce/raw.types.ts  | 1 -
 packages/domain/sim/schema.ts                             | 8 ++++++++
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/bff/src/integrations/salesforce/utils/order-query-builder.ts b/apps/bff/src/integrations/salesforce/utils/order-query-builder.ts
index 99796b88..de4a593a 100644
--- a/apps/bff/src/integrations/salesforce/utils/order-query-builder.ts
+++ b/apps/bff/src/integrations/salesforce/utils/order-query-builder.ts
@@ -29,7 +29,6 @@ export function buildOrderSelectFields(
     "Activation_Scheduled_At__c",
     "Activation_Error_Code__c",
     "Activation_Error_Message__c",
-    "Activation_Last_Attempt_At__c",
     "ActivatedDate",
     "Internet_Plan_Tier__c",
     "Installment_Plan__c",
@@ -88,4 +87,3 @@ export function buildOrderItemProduct2Fields(
 
   return UNIQUE([...fields, ...additional]);
 }
-
diff --git a/apps/bff/src/integrations/salesforce/utils/soql.util.ts b/apps/bff/src/integrations/salesforce/utils/soql.util.ts
index cc0c10ba..b017198a 100644
--- a/apps/bff/src/integrations/salesforce/utils/soql.util.ts
+++ b/apps/bff/src/integrations/salesforce/utils/soql.util.ts
@@ -46,5 +46,5 @@ export function buildInClause(values: string[], contextLabel: string): string {
     }
   });
 
-  return sanitized.join(", ");
+  return `(${sanitized.join(", ")})`;
 }
diff --git a/packages/domain/orders/providers/salesforce/raw.types.d.ts b/packages/domain/orders/providers/salesforce/raw.types.d.ts
index 58d4f9f9..63fd1b2c 100644
--- a/packages/domain/orders/providers/salesforce/raw.types.d.ts
+++ b/packages/domain/orders/providers/salesforce/raw.types.d.ts
@@ -30,7 +30,6 @@ export declare const salesforceOrderRecordSchema: z.ZodObject<{
     Activation_Scheduled_At__c: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     Activation_Error_Code__c: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     Activation_Error_Message__c: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    Activation_Last_Attempt_At__c: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     ActivatedDate: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     Internet_Plan_Tier__c: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     Installment_Plan__c: z.ZodOptional<z.ZodNullable<z.ZodString>>;
diff --git a/packages/domain/orders/providers/salesforce/raw.types.js b/packages/domain/orders/providers/salesforce/raw.types.js
index c339a8d3..3eedf065 100644
--- a/packages/domain/orders/providers/salesforce/raw.types.js
+++ b/packages/domain/orders/providers/salesforce/raw.types.js
@@ -30,7 +30,6 @@ exports.salesforceOrderRecordSchema = zod_1.z.object({
     Activation_Scheduled_At__c: zod_1.z.string().nullable().optional(),
     Activation_Error_Code__c: zod_1.z.string().nullable().optional(),
     Activation_Error_Message__c: zod_1.z.string().nullable().optional(),
-    Activation_Last_Attempt_At__c: zod_1.z.string().nullable().optional(),
     ActivatedDate: zod_1.z.string().nullable().optional(),
     Internet_Plan_Tier__c: zod_1.z.string().nullable().optional(),
     Installment_Plan__c: zod_1.z.string().nullable().optional(),
@@ -98,4 +97,4 @@ exports.salesforcePubSubCallbackSchema = zod_1.z.object({
         zod_1.z.null(),
     ]),
 });
-//# sourceMappingURL=raw.types.js.map
\ No newline at end of file
+//# sourceMappingURL=raw.types.js.map
diff --git a/packages/domain/orders/providers/salesforce/raw.types.ts b/packages/domain/orders/providers/salesforce/raw.types.ts
index 9c79c1a9..eae0ca15 100644
--- a/packages/domain/orders/providers/salesforce/raw.types.ts
+++ b/packages/domain/orders/providers/salesforce/raw.types.ts
@@ -50,7 +50,6 @@ export const salesforceOrderRecordSchema = z.object({
   Activation_Scheduled_At__c: z.string().nullable().optional(),
   Activation_Error_Code__c: z.string().nullable().optional(),
   Activation_Error_Message__c: z.string().nullable().optional(),
-  Activation_Last_Attempt_At__c: z.string().nullable().optional(),
   ActivatedDate: z.string().nullable().optional(),
   
   // Internet fields
diff --git a/packages/domain/sim/schema.ts b/packages/domain/sim/schema.ts
index 0a3f69c9..51c00704 100644
--- a/packages/domain/sim/schema.ts
+++ b/packages/domain/sim/schema.ts
@@ -104,6 +104,13 @@ export const simFeaturesUpdateRequestSchema = z.object({
   networkType: z.enum(["4G", "5G"]).optional(),
 });
 
+export const simReissueRequestSchema = z.object({
+  newEid: z
+    .string()
+    .regex(/^\d{32}$/, "EID must be exactly 32 digits")
+    .optional(),
+});
+
 // ============================================================================
 // SIM Order Activation Schemas
 // ============================================================================
@@ -194,3 +201,4 @@ export type SimPlanChangeRequest = z.infer<typeof simPlanChangeRequestSchema>;
 export type SimCancelRequest = z.infer<typeof simCancelRequestSchema>;
 export type SimTopUpHistoryRequest = z.infer<typeof simTopUpHistoryRequestSchema>;
 export type SimFeaturesUpdateRequest = z.infer<typeof simFeaturesUpdateRequestSchema>;
+export type SimReissueRequest = z.infer<typeof simReissueRequestSchema>;