merge conflict fix

apps/edr-freight-api/src/seed/file-upload-settings.seeder.ts

@@ -4,33 +4,107 @@ import { DataSource } from "typeorm";
 import { FileUploadField } from "../modules/file-upload-settings/entities/file-upload-field.entity";
 import { FileUploadSetting } from "../modules/file-upload-settings/entities/file-upload-setting.entity";
 
-const COMPANY_ONBOARDING_DOCUMENTS = [
-  {
-    code: "company_onboarding_documents_customer",
-    label: "Customer onboarding documents",
-    entity: "customer",
-  },
-  {
-    code: "company_onboarding_documents_forwarder",
-    label: "Forwarder onboarding documents",
-    entity: "other",
-  },
-  {
-    code: "company_onboarding_documents_transporter",
-    label: "Transporter onboarding documents",
-    entity: "other",
-  },
-  {
-    code: "company_onboarding_documents_forwarder_dj",
-    label: "Djibouti forwarder onboarding documents",
-    entity: "other",
-  },
-] as const;
+interface OnboardingField {
+  fileKey: string;
+  fileLabel: string;
+  helpText: string;
+  isRequired: boolean;
+  isMultiple: boolean;
+  maxFiles: number;
+  allowedExtensions: string[];
+  maxSizeMb: number;
+  displayOrder: number;
+}
 
-const COMPANY_ONBOARDING_DESCRIPTION =
-  "Required documents for external company onboarding. The same set applies to customers, forwarders, transporters, and brokers.";
+const DOC_EXTENSIONS = ["pdf", "jpg", "jpeg", "png"];
 
-const COMPANY_ONBOARDING_FIELDS = [
+/** Documents required from an Ethiopian company at onboarding. */
+const ETHIOPIAN_ONBOARDING_FIELDS: OnboardingField[] = [
+  {
+    fileKey: "tin_certificate",
+    fileLabel: "TIN Certificate",
+    helpText: "Verified against the TIN registry during registration.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 10,
+    displayOrder: 1,
+  },
+  {
+    fileKey: "commercial_license",
+    fileLabel: "Commercial License",
+    helpText: "Verified against the government trade system during registration.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 10,
+    displayOrder: 2,
+  },
+  {
+    fileKey: "national_id",
+    fileLabel: "National ID",
+    helpText: "Verified against the National ID API during registration.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 10,
+    displayOrder: 3,
+  },
+];
+
+/** Documents required from a Foreign company at onboarding. */
+const FOREIGN_ONBOARDING_FIELDS: OnboardingField[] = [
+  {
+    fileKey: "tin_certificate",
+    fileLabel: "TIN Certificate",
+    helpText: "Verified against the TIN registry during registration.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 10,
+    displayOrder: 1,
+  },
+  {
+    fileKey: "investment_license",
+    fileLabel: "Investment License",
+    helpText: "Investment license issued for operating in Ethiopia.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 10,
+    displayOrder: 2,
+  },
+  {
+    fileKey: "national_id",
+    fileLabel: "National ID",
+    helpText: "National ID of the company's authorized representative.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 10,
+    displayOrder: 3,
+  },
+  {
+    fileKey: "passport",
+    fileLabel: "Passport",
+    helpText: "Passport of the company's authorized representative.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 10,
+    displayOrder: 4,
+  },
+];
+
+/** Legacy combined set, kept for the older per-company-type codes. */
+const LEGACY_ONBOARDING_FIELDS: OnboardingField[] = [
   {
     fileKey: "business_license",
     fileLabel: "Business License / Trade License",
@@ -38,7 +112,7 @@ const COMPANY_ONBOARDING_FIELDS = [
     isRequired: true,
     isMultiple: false,
     maxFiles: 1,
-    allowedExtensions: ["pdf", "jpg", "jpeg", "png"],
+    allowedExtensions: DOC_EXTENSIONS,
     maxSizeMb: 10,
     displayOrder: 1,
   },
@@ -49,7 +123,7 @@ const COMPANY_ONBOARDING_FIELDS = [
     isRequired: true,
     isMultiple: false,
     maxFiles: 1,
-    allowedExtensions: ["pdf", "jpg", "jpeg", "png"],
+    allowedExtensions: DOC_EXTENSIONS,
     maxSizeMb: 10,
     displayOrder: 2,
   },
@@ -60,11 +134,63 @@ const COMPANY_ONBOARDING_FIELDS = [
     isRequired: true,
     isMultiple: false,
     maxFiles: 1,
-    allowedExtensions: ["pdf", "jpg", "jpeg", "png"],
+    allowedExtensions: DOC_EXTENSIONS,
     maxSizeMb: 10,
     displayOrder: 3,
   },
-] as const;
+];
+
+interface OnboardingDocumentSetting {
+  code: string;
+  label: string;
+  entity: string;
+  fields: OnboardingField[];
+}
+
+const COMPANY_ONBOARDING_DOCUMENTS: OnboardingDocumentSetting[] = [
+  // Nationality-based sets — the document requirements depend only on whether
+  // the company is Ethiopian or Foreign (same for importer/exporter/forwarder).
+  {
+    code: "company_onboarding_documents_ethiopian",
+    label: "Ethiopian company onboarding documents",
+    entity: "customer",
+    fields: ETHIOPIAN_ONBOARDING_FIELDS,
+  },
+  {
+    code: "company_onboarding_documents_foreign",
+    label: "Foreign company onboarding documents",
+    entity: "customer",
+    fields: FOREIGN_ONBOARDING_FIELDS,
+  },
+  // Legacy per-company-type codes (kept for back-compat; no longer used by the portal).
+  {
+    code: "company_onboarding_documents_customer",
+    label: "Customer onboarding documents",
+    entity: "customer",
+    fields: LEGACY_ONBOARDING_FIELDS,
+  },
+  {
+    code: "company_onboarding_documents_forwarder",
+    label: "Forwarder onboarding documents",
+    entity: "other",
+    fields: LEGACY_ONBOARDING_FIELDS,
+  },
+  {
+    code: "company_onboarding_documents_transporter",
+    label: "Transporter onboarding documents",
+    entity: "other",
+    fields: LEGACY_ONBOARDING_FIELDS,
+  },
+  {
+    code: "company_onboarding_documents_forwarder_dj",
+    label: "Djibouti forwarder onboarding documents",
+    entity: "other",
+    fields: LEGACY_ONBOARDING_FIELDS,
+  },
+];
+
+const COMPANY_ONBOARDING_DESCRIPTION =
+  "Required documents for external company onboarding, by company nationality.";
 
 @Injectable()
 export class FileUploadSettingsSeeder {
@@ -102,7 +228,7 @@ export class FileUploadSettingsSeeder {
         await fieldRepository.delete({ settingId: setting.id });
 
         await fieldRepository.insert(
-          COMPANY_ONBOARDING_FIELDS.map((field, index) => ({
+          documentSetting.fields.map((field, index) => ({
             settingId: setting.id,
             fileKey: field.fileKey,
             fileLabel: field.fileLabel,