Merge branch 'develop' into dev

* develop:
  migration: add field dnaId and profileId
  no message

src/controllers/OrganizationDotnetController.ts

@@ -2657,12 +2657,17 @@ export class OrganizationDotnetController extends Controller {
         dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
         posLevel: profile.posLevel?.posLevelName ?? "",
         posType: profile.posType?.posTypeName ?? "",
-        profileSalary: profile.profileSalary,
+        // profileSalary: profile.profileSalary,
+        profileSalary: profile.profileSalary?.map((x) => ({
+          ...x,
+          date: x.commandDateAffect ?? new Date()
+        })) ?? [],
         // profileInsignia: profile.profileInsignias.map((x) => {
         //   return { ...x, insignia: x.insignia.name };
         // }),
         profileInsignia: profile.profileInsignias?.map((x) => ({
           ...x,
+          insigniaId: x.insignia?.id ?? null,
           insignia: x.insignia?.name ?? null,
         })) ?? [],
         amount: profile.amount,
@@ -2962,9 +2967,14 @@ export class OrganizationDotnetController extends Controller {
             : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
         posType: profile.posType?.posTypeName ?? "",
         profileSalary: profile.profileSalary,
-        profileInsignia: profile.profileInsignias.map((x) => {
+        // profileInsignia: profile.profileInsignias.map((x) => {
-          return { ...x, insignia: x.insignia.name };
+        //   return { ...x, insignia: x.insignia.name };
-        }),
+        // }),
+        profileInsignia: profile.profileInsignias?.map((x) => ({
+          ...x,
+          insigniaId: x.insignia?.id ?? null,
+          insignia: x.insignia?.name ?? null,
+        })) ?? [],
         amount: profile.amount,
         positionSalaryAmount: profile.positionSalaryAmount,
         mouthSalaryAmount: profile.mouthSalaryAmount,
@@ -3176,12 +3186,21 @@ export class OrganizationDotnetController extends Controller {
             ? ""
             : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
         posType: profile.posType?.posTypeName ?? "",
-        profileSalary: profile.profileSalary.map((x) => {
+        // profileSalary: profile.profileSalary.map((x) => {
-          return { ...x, date: x.commandDateAffect ?? new Date() };
+        //   return { ...x, date: x.commandDateAffect ?? new Date() };
-        }),
+        // }),
-        profileInsignia: profile.profileInsignias.map((x) => {
+        profileSalary: profile.profileSalary?.map((x) => ({
-          return { ...x, insignia: x.insignia.name };
+          ...x,
-        }),
+          date: x.commandDateAffect ?? new Date()
+        })) ?? [],
+        // profileInsignia: profile.profileInsignias.map((x) => {
+        //   return { ...x, insignia: x.insignia.name };
+        // }),
+        profileInsignia: profile.profileInsignias?.map((x) => ({
+          ...x,
+          insigniaId: x.insignia?.id ?? null,
+          insignia: x.insignia?.name ?? null,
+        })) ?? [],
         amount: profile.amount,
         positionSalaryAmount: profile.positionSalaryAmount,
         mouthSalaryAmount: profile.mouthSalaryAmount,

src/controllers/OrganizationUnauthorizeController.ts

@@ -1663,12 +1663,17 @@ export class OrganizationUnauthorizeController extends Controller {
         dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
         posLevel: profile.posLevel?.posLevelName ?? "",
         posType: profile.posType?.posTypeName ?? "",
-        profileSalary: profile.profileSalary,
+        // profileSalary: profile.profileSalary,
+        profileSalary: profile.profileSalary?.map((x) => ({
+          ...x,
+          date: x.commandDateAffect ?? new Date()
+        })) ?? [],
         // profileInsignia: profile.profileInsignias.map((x) => {
         //   return { ...x, insignia: x.insignia.name };
         // }),
          profileInsignia: profile.profileInsignias?.map((x) => ({
           ...x,
+          insigniaId: x.insignia?.id ?? null,
           insignia: x.insignia?.name ?? null,
         })) ?? [],
         amount: profile.amount,
@@ -1879,7 +1884,12 @@ export class OrganizationUnauthorizeController extends Controller {
       posLevel: profile.posLevel ? profile.posLevel : null,
       posType: profile.posType ? profile.posType : null,
       profileSalary: profile.profileSalary,
-      profileInsignia: profile.profileInsignias,
+      // profileInsignia: profile.profileInsignias,
+      profileInsignia: profile.profileInsignias?.map((x) => ({
+          ...x,
+          insigniaId: x.insignia?.id ?? null,
+          insignia: x.insignia?.name ?? null,
+        })) ?? [],
     }));
 
     return new HttpSuccess(mapProfile);
@@ -2053,12 +2063,21 @@ export class OrganizationUnauthorizeController extends Controller {
             ? ""
             : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
         posType: profile.posType?.posTypeName ?? "",
-        profileSalary: profile.profileSalary.map((x) => {
+        // profileSalary: profile.profileSalary.map((x) => {
-          return { ...x, date: x.commandDateAffect ?? new Date() };
+        //   return { ...x, date: x.commandDateAffect ?? new Date() };
-        }),
+        // }),
-        profileInsignia: profile.profileInsignias.map((x) => {
+        profileSalary: profile.profileSalary?.map((x) => ({
-          return { ...x, insignia: x.insignia.name };
+          ...x,
-        }),
+          date: x.commandDateAffect ?? new Date()
+        })) ?? [],
+        // profileInsignia: profile.profileInsignias.map((x) => {
+        //   return { ...x, insignia: x.insignia.name };
+        // }),
+        profileInsignia: profile.profileInsignias?.map((x) => ({
+          ...x,
+          insigniaId: x.insignia?.id ?? null,
+          insignia: x.insignia?.name ?? null,
+        })) ?? [],
         amount: profile.amount,
         positionSalaryAmount: profile.positionSalaryAmount,
         mouthSalaryAmount: profile.mouthSalaryAmount,

src/entities/PosMasterHistory.ts

@@ -98,4 +98,52 @@ export class PosMasterHistory extends EntityBase {
     default: null,
   })
   ancestorDNA: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง profile",
+    default: null,
+  })
+  profileId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "dna ของตาราง orgRoot",
+    default: null,
+  })
+  rootDnaId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "dna ของตาราง orgChild1",
+    default: null,
+  })
+  child1DnaId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "dna ของตาราง orgChild2",
+    default: null,
+  })
+  child2DnaId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "dna ของตาราง orgChild3",
+    default: null,
+  })
+  child3DnaId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "dna ของตาราง orgChild4",
+    default: null,
+  })
+  child4DnaId: string;
 }

src/migration/1766760828376-add_field_dnaid_and_prodileid.ts

@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddFieldDnaidAndProdileid1766760828376 implements MigrationInterface {
+    name = 'AddFieldDnaidAndProdileid1766760828376'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`profileId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง profile'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`rootDnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgRoot'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child1DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild1'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child2DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild2'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child3DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild3'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child4DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild4'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` DROP COLUMN \`child4DnaId\``);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` DROP COLUMN \`child3DnaId\``);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` DROP COLUMN \`child2DnaId\``);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` DROP COLUMN \`child1DnaId\``);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` DROP COLUMN \`rootDnaId\``);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` DROP COLUMN \`profileId\``);
+    }
+
+}