From 5af192f470d878cfb191019baf9cc2e1e1db5f42 Mon Sep 17 00:00:00 2001
From: "vluk@2fi-solutions.com.hk" <vluk@2fi-solutions.com.hk>
Date: Fri, 9 Jan 2026 14:11:34 +0800
Subject: [PATCH] no message

---
 .../jwt/web/JwtAuthenticationController.java         |  8 +++-----
 .../lioner/pdf/service/ConsultantService.java        | 12 ++++++++++++
 .../modules/lioner/pdf/web/ConsultantController.java | 10 ++++++++--
 .../modules/lioner/web/TwoFactorController.java      |  4 ++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ffii/lioner/config/security/jwt/web/JwtAuthenticationController.java b/src/main/java/com/ffii/lioner/config/security/jwt/web/JwtAuthenticationController.java
index 4e6ee61..3158527 100644
--- a/src/main/java/com/ffii/lioner/config/security/jwt/web/JwtAuthenticationController.java
+++ b/src/main/java/com/ffii/lioner/config/security/jwt/web/JwtAuthenticationController.java
@@ -75,8 +75,7 @@ public class JwtAuthenticationController {
 
   private final Log logger = LogFactory.getLog(getClass());
 
-  private static final long EXPIRY_IN_MINTUE = 60000;
-  private static final long TOKEN_DURATION = 5;
+  private static final long TOKEN_DURATION_MINUTES = 5;
 
   @PostMapping("/login")
   public ResponseEntity<?> login(@RequestBody JwtRequest authenticationRequest, HttpServletRequest request)
@@ -192,7 +191,7 @@ public class JwtAuthenticationController {
     }
     // === END 2FA CHECK ===
 
-    long accessTokenExpiry = TOKEN_DURATION * EXPIRY_IN_MINTUE;
+    long accessTokenExpiry = TOKEN_DURATION_MINUTES * 60 * 1000;
     final String accessToken = jwtTokenUtil.generateToken(userDetails, accessTokenExpiry);
     final String refreshToken = jwtTokenUtil.createRefreshToken(userDetails.getUsername()).getToken();
 
@@ -205,8 +204,7 @@ public class JwtAuthenticationController {
   @PostMapping("/refresh-token")
   public ResponseEntity<TokenRefreshResponse> refreshtoken(@Valid @RequestBody TokenRefreshRequest request)
       throws Exception {
-    long accessTokenExpiry = /* settingsService.getInt(SettingNames.SYS_IDLE_LOGOUT_TIME) */ TOKEN_DURATION
-        * EXPIRY_IN_MINTUE;
+    long accessTokenExpiry = TOKEN_DURATION_MINUTES * 60 * 1000;
     String requestRefreshToken = request.getRefreshToken();
 
     requestRefreshToken = requestRefreshToken.replaceAll("\"", "");
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/ConsultantService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/ConsultantService.java
index 84842cd..5a845ee 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/ConsultantService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/ConsultantService.java
@@ -49,6 +49,18 @@ public class ConsultantService extends AbstractBaseEntityService<Consultant, Lon
 		);
 	}
 
+	public Map<String, Object> markDelete(UpdateConsultantReq req) {
+		Consultant instance;
+		// List<SubDivision> onUsingIdList = new ArrayList<SubDivision>();
+		instance = find(req.getId()).get();
+		instance.setDeleted(true);
+		instance = save(instance);
+		
+		return Map.of(
+			"id", instance.getId()
+		);
+	}
+
 	public List<Map<String,Object>> list(Map<String, Object> args){
 		StringBuilder sql = new StringBuilder("SELECT"
 			+ " c.id, "
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/web/ConsultantController.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/web/ConsultantController.java
index b230dcf..bac2011 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/web/ConsultantController.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/web/ConsultantController.java
@@ -70,9 +70,15 @@ public class ConsultantController {
         logger.info("saveOrUpdate");
 		return Map.of(
 				Params.DATA,consultantService.saveOrUpdate(req)
-			);
+			);   
+	}
 
-            
+	@Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class)
+	@PostMapping("/delete")
+	public Map<String, Object> delete(@RequestBody @Valid UpdateConsultantReq req) {
+		logger.info("Deleting consultant with id: {}", req.getId());
+		consultantService.markDelete(req);  // assuming this handles soft/hard delete
+		return Map.of(Params.DATA, true);  // or whatever your frontend expects
 	}
 
     @GetMapping("/combo")
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/web/TwoFactorController.java b/src/main/java/com/ffii/lioner/modules/lioner/web/TwoFactorController.java
index 900ba48..e774dc8 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/web/TwoFactorController.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/web/TwoFactorController.java
@@ -23,9 +23,9 @@ import java.util.Map;
 
 import com.ffii.lioner.modules.user.entity.User;
 import com.ffii.lioner.modules.user.service.UserService;
-import com.ffii.lioner.modules.user.service.UserAuthorityService;  // ← ADD THIS IMPORT
+import com.ffii.lioner.modules.user.service.UserAuthorityService;
 import com.ffii.lioner.config.security.jwt.service.JwtUserDetailsService;
-import com.ffii.core.utils.JwtTokenUtil;  // ← Use the correct path from your project
+import com.ffii.core.utils.JwtTokenUtil;
 import com.ffii.lioner.model.JwtResponse;
 
 @RestController