migatation and get tab4

src/controllers/DevelopmentController.ts

@@ -877,11 +877,6 @@ export class DevelopmentController extends Controller {
     @Body() requestBody: UpdateDevelopment3,
     @Request() request: RequestWithUser,
   ) {
-    // addLogSequence(request, {
-    //   action: "database",
-    //   status: "success",
-    //   description: "Get Development.",
-    // });
     const development = await this.developmentRepository.findOne({
       where: { id },
       relations: {
@@ -901,30 +896,15 @@ export class DevelopmentController extends Controller {
     });
     development.lastUpdateUserId = request.user.sub;
     development.lastUpdateFullName = request.user.name;
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove data in DevelopmentProjectType.",
-    // });
     await this.developmentProjectTypeRepository.remove(development.developmentProjectTypes, {
       data: request,
     });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove data in DevelopmentProjectTechniquePlanned.",
-    // });
     await this.developmentProjectTechniquePlannedRepository.remove(
       development.developmentProjectTechniquePlanneds,
       {
         data: request,
       },
     );
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove data in DevelopmentProjectTechniqueActual.",
-    // });
     await this.developmentProjectTechniqueActualRepository.remove(
       development.developmentProjectTechniqueActuals,
       {
@@ -1142,11 +1122,6 @@ export class DevelopmentController extends Controller {
           throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลยุทธศาสตร์เป้าหมายตามจริง");
       }
     }
-    // addLogSequence(request, {
-    //   action: "database",
-    //   status: "success",
-    //   description: "Store Development.",
-    // });
     await this.developmentRepository.save(development, { data: request });
     if (requestBody.developmentProjectTypes != null) {
       await Promise.all(
@@ -1158,11 +1133,6 @@ export class DevelopmentController extends Controller {
           data.lastUpdateUserId = request.user.sub;
           data.lastUpdateFullName = request.user.name;
           data.developmentId = development.id;
-          // addLogSequence(request, {
-          //   action: "database",
-          //   status: "success",
-          //   description: "Store DevelopmentProjectType.",
-          // });
           await this.developmentProjectTypeRepository.save(data, { data: request });
         }),
       );
@@ -1177,11 +1147,6 @@ export class DevelopmentController extends Controller {
           data.lastUpdateUserId = request.user.sub;
           data.lastUpdateFullName = request.user.name;
           data.developmentId = development.id;
-          // addLogSequence(request, {
-          //   action: "database",
-          //   status: "success",
-          //   description: "Store DevelopmentProjectTechniquePlanned.",
-          // });
           await this.developmentProjectTechniquePlannedRepository.save(data, { data: request });
         }),
       );
@@ -1196,11 +1161,6 @@ export class DevelopmentController extends Controller {
           data.lastUpdateUserId = request.user.sub;
           data.lastUpdateFullName = request.user.name;
           data.developmentId = development.id;
-          // addLogSequence(request, {
-          //   action: "database",
-          //   status: "success",
-          //   description: "Store DevelopmentProjectTechniqueActual.",
-          // });
           await this.developmentProjectTechniqueActualRepository.save(data, { data: request });
         }),
       );
@@ -2144,12 +2104,8 @@ export class DevelopmentController extends Controller {
                 b.indicators == null ? "" : b.indicators,
               ),
             ),
-      project: getDevelopment.project,
+      progressTracking: getDevelopment.progressTracking,
-      isPassAllocate: getDevelopment.isPassAllocate,
+      projectEvaluation: getDevelopment.projectEvaluation,
-      isPassNoAllocate: getDevelopment.isPassNoAllocate,
-      isNoPass: getDevelopment.isNoPass,
-      isBudget: getDevelopment.isBudget,
-      isOutBudget: getDevelopment.isOutBudget,
     };
 
     return new HttpSuccess(_getDevelopment);

src/entities/Development.ts

@@ -17,6 +17,7 @@ import { StrategyChild3 } from "./StrategyChild3";
 import { StrategyChild2 } from "./StrategyChild2";
 import { StrategyChild1 } from "./StrategyChild1";
 import { DevelopmentRisk } from "./DevelopmentRisk";
+import { DevelopmentOther } from "./DevelopmentOther";
 
 @Entity("development")
 export class Development extends EntityBase {
@@ -194,6 +195,12 @@ export class Development extends EntityBase {
   )
   developmentRisks: DevelopmentRisk[];
 
+  @OneToMany(
+    () => DevelopmentOther,
+    (developmentOther: DevelopmentOther) => developmentOther.development,
+  )
+  developmentOthers: DevelopmentOther[];
+
   @OneToMany(
     () => DevelopmentProjectType,
     (developmentProjectType: DevelopmentProjectType) => developmentProjectType.development,

src/entities/DevelopmentOther.ts

@@ -0,0 +1,48 @@
+import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
+import { EntityBase } from "./base/Base";
+import { Development } from "./Development";
+import { Province } from "./Province";
+
+@Entity("developmentOther")
+export class DevelopmentOther extends EntityBase {
+  @Column({
+    nullable: true,
+    comment: "หัวข้อ/ประเด็นการฝึกอบรม ศึกษาดูงาน",
+    default: null,
+  })
+  topicAcademic: string;
+
+  @Column({
+    nullable: true,
+    comment: "สถานที่ฝึกอบรม ศึกษาดูงาน",
+    default: null,
+  })
+  addressAcademic: string;
+
+  @Column({
+    nullable: true,
+    comment: "จังหวัด(ข้อมูลวิชาการ)",
+    default: null,
+  })
+  provinceActualId: string;
+
+  @Column({
+    nullable: true,
+    comment: "คีย์นอก(FK)ของตาราง development",
+    default: null,
+  })
+  developmentId: string;
+
+  @ManyToOne(() => Development, (development: Development) => development.developmentOthers)
+  @JoinColumn({ name: "developmentId" })
+  development: Development;
+}
+
+export class UpdateDevelopmentOther {
+  @Column()
+  topicAcademic: string | null;
+  @Column()
+  addressAcademic: number | null;
+  @Column()
+  provinceActualId: number | null;
+}