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

---
 .../java/com/safeqr/app/gmail/entity/GmailEmailEntity.java    | 2 +-
 src/main/java/com/safeqr/app/gmail/model/EmailMessage.java    | 2 ++
 .../safeqr/app/gmail/repository/GmailEmailRespository.java    | 4 ++--
 src/main/java/com/safeqr/app/gmail/service/GmailService.java  | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/safeqr/app/gmail/entity/GmailEmailEntity.java b/src/main/java/com/safeqr/app/gmail/entity/GmailEmailEntity.java
index 4db8ca1..ed66a2e 100644
--- a/src/main/java/com/safeqr/app/gmail/entity/GmailEmailEntity.java
+++ b/src/main/java/com/safeqr/app/gmail/entity/GmailEmailEntity.java
@@ -45,7 +45,7 @@ public class GmailEmailEntity {
     private OffsetDateTime dateCreated;
 
     @Column(name = "active")
-    private Integer active = 1;
+    private int active = 1;
 
     @PrePersist
     public void prePersist() {
diff --git a/src/main/java/com/safeqr/app/gmail/model/EmailMessage.java b/src/main/java/com/safeqr/app/gmail/model/EmailMessage.java
index e63a714..2e73528 100644
--- a/src/main/java/com/safeqr/app/gmail/model/EmailMessage.java
+++ b/src/main/java/com/safeqr/app/gmail/model/EmailMessage.java
@@ -13,6 +13,7 @@ public class EmailMessage {
     private String subject;
     private String historyId;
     private String date;
+    private int active;
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     List<QRCodeByContentId> qrCodeByContentId;
@@ -29,6 +30,7 @@ public class EmailMessage {
         this.subject = subject;
         this.historyId = historyId;
         this.date = date;
+        this.active = 1;
         this.qrCodeByContentId = new ArrayList<>();
         this.qrCodeByURL = new ArrayList<>();
         this.decodedContentsDetails = new ArrayList<>();
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 e1fbc7f..6f301d4 100644
--- a/src/main/java/com/safeqr/app/gmail/repository/GmailEmailRespository.java
+++ b/src/main/java/com/safeqr/app/gmail/repository/GmailEmailRespository.java
@@ -17,12 +17,12 @@ public interface GmailEmailRespository extends JpaRepository<GmailEmailEntity, U
     // Method to update active status to 0 for a specific userId
     @Modifying
     @Transactional
-    @Query("UPDATE GmailEmailEntity e SET e.active = 0 WHERE e.userId = :userId")
+    @Query("UPDATE GmailEmailEntity e SET e.active = e.active - 1 WHERE e.userId = :userId")
     int deactivateEmailsByUserId(String userId);
 
     // Method to update active status to 0 for a specific userId and messageId
     @Modifying
     @Transactional
-    @Query("UPDATE GmailEmailEntity e SET e.active = 0 WHERE e.userId = :userId AND e.messageId = :messageId")
+    @Query("UPDATE GmailEmailEntity e SET e.active = e.active - 1 WHERE e.userId = :userId AND e.messageId = :messageId")
     int deactivateEmailByUserIdAndMessageId(String userId, String messageId);
 }
diff --git a/src/main/java/com/safeqr/app/gmail/service/GmailService.java b/src/main/java/com/safeqr/app/gmail/service/GmailService.java
index 1008b12..26d1d8b 100644
--- a/src/main/java/com/safeqr/app/gmail/service/GmailService.java
+++ b/src/main/java/com/safeqr/app/gmail/service/GmailService.java
@@ -210,6 +210,7 @@ public class GmailService {
                     .historyId(Long.valueOf(emailMessage.getHistoryId()))
                     .subject(emailMessage.getSubject())
                     .dateReceived(dateReceived)
+                    .active(emailMessage.getActive())
                     .build();
             return gmailEmailRespository.save(gmailEmailEntity);
         } catch (DataIntegrityViolationException e) {