From 334b3867ec06c65b70c1420d99781aace342b8d9 Mon Sep 17 00:00:00 2001
From: ltiongku <alex.b.lim@accenture.com>
Date: Wed, 14 Aug 2024 11:57:09 +0800
Subject: [PATCH] fixed email active NULL

---
 .../safeqr/app/gmail/repository/GmailEmailRespository.java    | 4 ++--
 .../safeqr/app/qrcode/controller/QRCodeTypeController.java    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/safeqr/app/gmail/repository/GmailEmailRespository.java b/src/main/java/com/safeqr/app/gmail/repository/GmailEmailRespository.java
index 3807860..3edca2c 100644
--- a/src/main/java/com/safeqr/app/gmail/repository/GmailEmailRespository.java
+++ b/src/main/java/com/safeqr/app/gmail/repository/GmailEmailRespository.java
@@ -25,9 +25,9 @@ public interface GmailEmailRespository extends JpaRepository<GmailEmailEntity, U
     // Method to update active status to 0 for a specific userId and messageId
     @Modifying
     @Transactional
-    @Query("UPDATE GmailEmailEntity e SET e.active = e.active - 1 " +
+    @Query("UPDATE GmailEmailEntity e SET e.active = (SELECT MIN(e2.active) FROM GmailEmailEntity e2 WHERE e2.userId = :userId AND e2.messageId = :messageId) - 1 " +
             "WHERE e.userId = :userId AND e.messageId = :messageId " +
-            "AND e.active = (SELECT MIN(e2.active) FROM GmailEmailEntity e2 WHERE e2.userId = :userId AND e2.messageId = :messageId)")
+            "AND e.active = 1")
 
     int deactivateEmailByUserIdAndMessageId(String userId, String messageId);
 }
diff --git a/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java b/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
index aff7a4d..0a66533 100644
--- a/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
+++ b/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
@@ -4,7 +4,6 @@ import static com.safeqr.app.constants.APIConstants.*;
 import static com.safeqr.app.constants.CommonConstants.*;
 import com.safeqr.app.qrcode.dto.request.QRCodePayload;
 import com.safeqr.app.qrcode.dto.RedirectCountResponse;
-import com.safeqr.app.qrcode.dto.URLVerificationResponse;
 import com.safeqr.app.qrcode.dto.response.BaseScanResponse;
 import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
 import com.safeqr.app.qrcode.service.QRCodeTypeService;