isky/backend-springboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/feature-ml-integration' into dev

Browse Source
This commit is contained in:
ltiongku
2024-08-14 11:59:17 +08:00
parent e6899eafdb 334b3867ec
commit b86e680673
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/safeqr/app/gmail/repository/GmailEmailRespository.java
View File

@@ -25,9 +25,9 @@ public interface GmailEmailRespository extends JpaRepository<GmailEmailEntity, U
// Method to update active status to 0 for a specific userId and messageId // Method to update active status to 0 for a specific userId and messageId
@Modifying @Modifying
@Transactional @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 " + "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); int deactivateEmailByUserIdAndMessageId(String userId, String messageId);
} }

1
src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
View File

@@ -4,7 +4,6 @@ import static com.safeqr.app.constants.APIConstants.*;
import static com.safeqr.app.constants.CommonConstants.*; import static com.safeqr.app.constants.CommonConstants.*;
import com.safeqr.app.qrcode.dto.request.QRCodePayload; import com.safeqr.app.qrcode.dto.request.QRCodePayload;
import com.safeqr.app.qrcode.dto.RedirectCountResponse; 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.dto.response.BaseScanResponse;
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity; import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
import com.safeqr.app.qrcode.service.QRCodeTypeService; import com.safeqr.app.qrcode.service.QRCodeTypeService;