From e0342a8858afe466aae045275d274f181a38b52b Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Thu, 4 Jul 2024 14:45:19 +0800
Subject: [PATCH] add sub-contract fee to project

---
 .../java/com/ffii/tsms/modules/project/entity/Project.kt     | 3 +++
 .../com/ffii/tsms/modules/project/service/ProjectsService.kt | 5 ++++-
 .../tsms/modules/project/web/models/EditProjectDetails.kt    | 3 ++-
 .../tsms/modules/project/web/models/NewProjectRequest.kt     | 3 ++-
 .../changes/20240704_01_cyril/01_update_project.sql          | 5 +++++
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changes/20240704_01_cyril/01_update_project.sql

diff --git a/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt b/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt
index 533dcd3..e52f80b 100644
--- a/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt
@@ -77,6 +77,9 @@ open class Project : BaseEntity<Long>() {
     @Column(name = "expectedTotalFee")
     open var expectedTotalFee: Double? = null
 
+    @Column(name = "subContractFee")
+    open var subContractFee: Double? = null
+
     @ManyToOne
     @JoinColumn(name = "serviceTypeId")
     open var serviceType: ServiceType? = null
diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
index bc3fbd4..ba83321 100644
--- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
@@ -197,6 +197,7 @@ open class ProjectsService(
                     project
                 ) else this.code
             expectedTotalFee = request.expectedProjectFee
+            subContractFee = request.subContractFee
             totalManhour = request.totalManhour
             actualStart = request.projectActualStart
             actualEnd = request.projectActualEnd
@@ -402,7 +403,8 @@ open class ProjectsService(
                             )
                         })
                 },
-                expectedProjectFee = it.expectedTotalFee
+                expectedProjectFee = it.expectedTotalFee,
+                subContractFee = it.subContractFee
             )
         }
     }
@@ -644,6 +646,7 @@ open class ProjectsService(
                         clientId = clientId,
                         clientSubsidiaryId = subsidiary?.id,
                         expectedProjectFee = row.getCell(9).numericCellValue,
+                        subContractFee = null,
                         totalManhour = row.getCell(11).numericCellValue,
                         locationId = 1, // HK
                         buildingTypeIds = mutableListOf(buildingType!!.id!!),
diff --git a/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectDetails.kt b/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectDetails.kt
index 704f0fd..0cb0f1e 100644
--- a/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectDetails.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectDetails.kt
@@ -40,5 +40,6 @@ data class EditProjectDetails(
     val milestones: Map<Long, Milestone>,
 
     // Miscellaneous
-    val expectedProjectFee: Double?
+    val expectedProjectFee: Double?,
+    val subContractFee: Double?
 )
diff --git a/src/main/java/com/ffii/tsms/modules/project/web/models/NewProjectRequest.kt b/src/main/java/com/ffii/tsms/modules/project/web/models/NewProjectRequest.kt
index aab4473..5fdea98 100644
--- a/src/main/java/com/ffii/tsms/modules/project/web/models/NewProjectRequest.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/web/models/NewProjectRequest.kt
@@ -45,7 +45,8 @@ data class NewProjectRequest(
     val milestones: Map<Long, Milestone>,
 
     // Miscellaneous
-    val expectedProjectFee: Double
+    val expectedProjectFee: Double,
+    val subContractFee: Double?
 )
 
 data class TaskGroupAllocation(
diff --git a/src/main/resources/db/changelog/changes/20240704_01_cyril/01_update_project.sql b/src/main/resources/db/changelog/changes/20240704_01_cyril/01_update_project.sql
new file mode 100644
index 0000000..275afac
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/20240704_01_cyril/01_update_project.sql
@@ -0,0 +1,5 @@
+-- liquibase formatted sql
+-- changeset cyril:project
+
+ALTER TABLE `project`
+    ADD COLUMN `subContractFee` DOUBLE NULL DEFAULT NULL AFTER `expectedTotalFee`;
\ No newline at end of file