From 6d0f180e5a161d76db039256c31fd4356034abc9 Mon Sep 17 00:00:00 2001 From: eisbilir Date: Mon, 17 Oct 2022 00:28:51 +0300 Subject: [PATCH] fix email check --- .../com/appirio/tech/core/service/identity/dao/UserDAO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/appirio/tech/core/service/identity/dao/UserDAO.java b/src/main/java/com/appirio/tech/core/service/identity/dao/UserDAO.java index 08ac2bb..d943b91 100644 --- a/src/main/java/com/appirio/tech/core/service/identity/dao/UserDAO.java +++ b/src/main/java/com/appirio/tech/core/service/identity/dao/UserDAO.java @@ -138,7 +138,7 @@ public abstract class UserDAO implements DaoBase, Transactional { public abstract List findUsersByEmail(@Bind("email") String email); @SqlQuery("SELECT COUNT(e2.email_id) " + - "FROM common_oltp.user AS u LEFT JOIN common_oltp.email AS e ON e.user_id = u.user_id " + + "FROM common_oltp.user AS u LEFT JOIN common_oltp.email AS e ON e.user_id = u.user_id AND e.email_type_id = 1 AND e.primary_ind = 1 " + "LEFT JOIN common_oltp.email AS e2 ON LOWER(e2.address) = LOWER(e.address) " + "WHERE u.user_id = :userId") public abstract int getEmailCount(@Bind("userId") long userId); @@ -147,7 +147,7 @@ public abstract class UserDAO implements DaoBase, Transactional { @SqlQuery( "SELECT mfa.id AS id, u.user_id AS userId, u.handle AS handle, u.first_name AS firstName, e.address AS email, mfa.mfa_enabled AS mfaEnabled, mfa.dice_enabled AS diceEnabled" + ", dc.id AS diceConnectionId, dc.connection AS diceConnection, dc.accepted AS diceConnectionAccepted, dc.created_at AS diceConnectionCreatedAt " + - "FROM common_oltp.user AS u LEFT JOIN common_oltp.email AS e ON e.user_id = u.user_id " + + "FROM common_oltp.user AS u LEFT JOIN common_oltp.email AS e ON e.user_id = u.user_id AND e.email_type_id = 1 AND e.primary_ind = 1 " + "LEFT JOIN common_oltp.user_2fa AS mfa ON mfa.user_id = u.user_id " + "LEFT JOIN common_oltp.dice_connection AS dc ON dc.user_id = u.user_id " + "WHERE u.user_id = :userId")