From 7a74ac48cc4963d1f241db8a20c301ecda038d55 Mon Sep 17 00:00:00 2001
From: kelvinsuen <kelvin.suen@2fi-solutions.com.hk>
Date: Thu, 31 Jul 2025 15:25:06 +0800
Subject: [PATCH] update client

---
 .../modules/lioner/client/entity/Client.java  | 33 +++++++++++------
 .../lioner/client/req/UpdateClientReq.java    | 10 +++---
 .../lioner/client/service/ClientService.java  | 36 ++++++++-----------
 .../lioner/client/web/ClientController.java   |  4 +--
 .../01_update_client_table.sql                |  8 +++++
 5 files changed, 53 insertions(+), 38 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changes/10_update_client_table/01_update_client_table.sql

diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/entity/Client.java b/src/main/java/com/ffii/lioner/modules/lioner/client/entity/Client.java
index 2eca609..aca14dc 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/client/entity/Client.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/client/entity/Client.java
@@ -19,10 +19,14 @@ import jakarta.validation.constraints.NotNull;
 @Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
 public class Client extends BaseEntity<Long>{
 
-    @NotBlank
-	@Column
+    @Column
 	private String fullname;
     
+    @NotBlank
+    @Column
+	private String clientCode;
+    
+    @NotBlank
     @Column
 	private String lastname;
 
@@ -34,19 +38,28 @@ public class Client extends BaseEntity<Long>{
 
     @Column
 	private String email;
-
+    
     @Column
 	private String phone1;
-
+    
     @Column
 	private String phone2;
-
+    
     @Column
 	private String remarks;
     
     @Column
-	private LocalDate joinDate;
+	private LocalDate dob;
+    
+    
+    public String getClientCode() {
+        return clientCode;
+    }
 
+    public void setClientCode(String clientCode) {
+        this.clientCode = clientCode;
+    }
+    
     public String getFullname() {
         return fullname;
     }
@@ -111,12 +124,12 @@ public class Client extends BaseEntity<Long>{
         this.remarks = remarks;
     }
 
-    public LocalDate getJoinDate() {
-        return joinDate;
+    public LocalDate getDob() {
+        return dob;
     }
 
-    public void setJoinDate(LocalDate joinDate) {
-        this.joinDate = joinDate;
+    public void setDob(LocalDate dob) {
+        this.dob = dob;
     }
 
 }
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/req/UpdateClientReq.java b/src/main/java/com/ffii/lioner/modules/lioner/client/req/UpdateClientReq.java
index 8a8c4ca..b761045 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/client/req/UpdateClientReq.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/client/req/UpdateClientReq.java
@@ -33,7 +33,7 @@ public class UpdateClientReq {
 
     String remarks;
 
-    LocalDate joinDate;
+    LocalDate dob;
 
     Integer caseManagerId;
 
@@ -111,12 +111,12 @@ public class UpdateClientReq {
         this.remarks = remarks;
     }
 
-    public LocalDate getJoinDate() {
-        return joinDate;
+    public LocalDate getDob() {
+        return dob;
     }
 
-    public void setJoinDate(LocalDate joinDate) {
-        this.joinDate = joinDate;
+    public void setDob(LocalDate dob) {
+        this.dob = dob;
     }
     
     public Integer getCaseManagerId() {
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
index 6c9daf8..4ba3b33 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
@@ -4,7 +4,6 @@ import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.ffii.core.support.AbstractBaseEntityService;
@@ -117,14 +116,13 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
 	public Map<String, Object> saveOrUpdate(UpdateClientReq req) {
 		Client instance;
 		// List<SubDivision> onUsingIdList = new ArrayList<SubDivision>();
-		if(req.getId()>0){
+		if (req.getId() > 0){
 			instance = find(req.getId()).get();
 			// onUsingIdList = this.getSelectedSubDivisionList(req.getId());
 		}
-		else{
+		else {
 			instance = new Client();
-			//default using the current year to get the client code
-			//getNewClientCode(LocalDate.now().getYear());
+			instance.setClientCode(getNewClientCode());
 		}
 
 		// List<String> subDivisionNameList = new ArrayList<String>();
@@ -267,7 +265,7 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
 				+ " , phone2 "
 				+ " , remarks "
 				+ " , created "
-				// + " , joinDate "
+				+ " , dob "
 				+ " , caseManagerId "
 				+ " , consultantId "
 				+ " FROM client "
@@ -303,16 +301,11 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
 				sql.append(" AND email LIKE :email ");
 			if (args.containsKey("remarks")) 
 				sql.append(" AND remarks LIKE :remarks ");
-			if (args.containsKey("joinDateFrom")) 
-				sql.append(" AND joinDate >= :joinDateFrom ");
-			if (args.containsKey("joinDateTo")) 
-				sql.append(" AND joinDate <= :joinDateTo ");
-			// if (args.containsKey("type")) 
-			// 	sql.append(" AND eventType LIKE :type ");
-			// if (args.containsKey("divisionIdList")) 
-			// 	sql.append(" AND sd.divisionId IN (:divisionIdList) ");
-			// if (args.containsKey("subDivisionIdList")) 
-			// 	sql.append(" AND sd.id IN (:subDivisionIdList) ");
+			// if (args.containsKey("dobFrom")) 
+			// 	sql.append(" AND dob >= :dobFrom ");
+			// if (args.containsKey("dobTo")) 
+			// 	sql.append(" AND dob <= :dobTo ");
+
 			// if (args.containsKey("keyword")){
 			// 	sql.append(" AND ( createdBy LIKE :keyword ");
 			// 	sql.append(" OR u.username  LIKE :keyword ");
@@ -1029,12 +1022,13 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
         return jdbcDao.queryForInt(sql.toString(), Map.of("name", name));
     }
 
-	public String getNewClientCode(int year) {
+	public String getNewClientCode() {
+		int year = LocalDate.now().getYear();
+
         String sql = "select "
-            + " count(1) "
-            + " from client "
-            //+ " where year(joinDate) = :year "            
-			+ " where year(created) = :year "            
+            + " COUNT(1) "
+            + " FROM client "         
+			+ " WHERE YEAR(created) = :year "            
         ;
         
         int idCount = jdbcDao.queryForInt(sql, Map.of("year", year));
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java b/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java
index decb5b6..9849056 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java
@@ -89,8 +89,8 @@ public class ClientController{
                         .addStringLike("email")
                         .addStringLike("phone1")
                         .addStringLike("phone2")
-                        .addDate("joinDateFrom")
-                        .addDate("joinDateTo")
+                        // .addDate("dobFrom")
+                        // .addDate("dobTo")
                         .addStringLike("remarks")
 						.build()));
 	}
diff --git a/src/main/resources/db/changelog/changes/10_update_client_table/01_update_client_table.sql b/src/main/resources/db/changelog/changes/10_update_client_table/01_update_client_table.sql
new file mode 100644
index 0000000..ee650da
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/10_update_client_table/01_update_client_table.sql
@@ -0,0 +1,8 @@
+--liquibase formatted sql
+
+--changeset kelvin:update client table
+
+ALTER TABLE `lionerdb`.`client` 
+CHANGE COLUMN `joinDate` `dob` DATE NULL ,
+CHANGE COLUMN `fullname` `fullname` VARCHAR(90) NULL ,
+ADD COLUMN `clientCode` VARCHAR(45) NOT NULL AFTER `deleted`;
\ No newline at end of file