3 Commits

Author SHA1 Message Date
eastargh 384a3a5e47 UMS 발송
eapim-portal CI (from elink-portal-common) / build (push) Has been cancelled
2026-06-22 17:57:30 +09:00
Rinjae 207a2d692a 휴대폰번호 중복 사용자 조회 기능 추가
- 중복 사용자 필터링 및 목록 조회 기능 구현
- 중복 사용자 알림 배너 및 상세 조회 UI 개선
- 중복 허용 여부 설정 동기화 및 관련 서비스 추가
2026-06-22 17:03:33 +09:00
Rinjae ea6ae8c022 AgreementType 코드 업데이트: NOTIFICATION_CONSENT 동의서 항목 추가 2026-06-22 17:02:12 +09:00
4 changed files with 9 additions and 4 deletions
@@ -5,7 +5,8 @@ public enum AgreementType {
TERMS_OF_USE("TERMS_OF_USE", "이용약관"), TERMS_OF_USE("TERMS_OF_USE", "이용약관"),
PRIVACY_POLICY("PRIVACY_POLICY", "개인정보처리방침"), PRIVACY_POLICY("PRIVACY_POLICY", "개인정보처리방침"),
PRIVACY_COLLECT_IND("PRIVACY_COLLECT_IND", "개인용 개인정보수집동의서"), PRIVACY_COLLECT_IND("PRIVACY_COLLECT_IND", "개인용 개인정보수집동의서"),
PRIVACY_COLLECT_ORG("PRIVACY_COLLECT_ORG", "법인용 개인정보수집동의서"); PRIVACY_COLLECT_ORG("PRIVACY_COLLECT_ORG", "법인용 개인정보수집동의서"),
NOTIFICATION_CONSENT("NOTIFICATION_CONSENT", "알림 수신 동의서");
private final String code; private final String code;
private final String description; private final String description;
@@ -28,6 +28,8 @@ public interface PortalUserRepository extends BaseRepository<PortalUser, String>
boolean existsByLoginId(String loginId); boolean existsByLoginId(String loginId);
boolean existsByMobileNumber(String mobileNumber);
@Query("SELECT u FROM PortalUser u WHERE u.portalOrg = :org AND u.userStatus != :status") @Query("SELECT u FROM PortalUser u WHERE u.portalOrg = :org AND u.userStatus != :status")
Page<PortalUser> findActiveUsers(@Param("org") PortalOrg org, @Param("status") PortalUserEnums.UserStatus status, Pageable pageable); Page<PortalUser> findActiveUsers(@Param("org") PortalOrg org, @Param("status") PortalUserEnums.UserStatus status, Pageable pageable);
@@ -11,7 +11,8 @@ import lombok.*;
@Builder @Builder
public class MessageRecipient { public class MessageRecipient {
private String username; private String username;
private String userId; //email private String userId;
private String email;
private String phone; private String phone;
private String messengerId; private String messengerId;
@@ -20,6 +21,7 @@ public class MessageRecipient {
MessageRecipient recipient = new MessageRecipient(); MessageRecipient recipient = new MessageRecipient();
recipient.setUsername(user.getUserName()); recipient.setUsername(user.getUserName());
recipient.setUserId(user.getEmailAddr()); recipient.setUserId(user.getEmailAddr());
recipient.setEmail(user.getEmailAddr());
recipient.setPhone(user.getPhoneNumber()); recipient.setPhone(user.getPhoneNumber());
return recipient; return recipient;
} }
@@ -51,7 +51,7 @@ public class MessageSendService {
processSingleRecipient(user, template.get(), messageParams); processSingleRecipient(user, template.get(), messageParams);
} }
} else { } else {
log.error("메세지 템플릿이 존재 하지 않음 - {}", messageCode); log.warn("메세지 템플릿이 존재 하지 않음 - {}", messageCode);
} }
} }
@@ -59,7 +59,7 @@ public class MessageSendService {
List<MessageRecipient> recipients = new ArrayList<>(); List<MessageRecipient> recipients = new ArrayList<>();
for (UserInfo user : template.getAdditionalRecipients()) { for (UserInfo user : template.getAdditionalRecipients()) {
MessageRecipient messageRecipient = new MessageRecipient(user.getUsername(), user.getUserid(), user.getCphnno(), user.getUserid()); MessageRecipient messageRecipient = new MessageRecipient(user.getUsername(), user.getUserid(), user.getEmad(), user.getCphnno(), user.getUserid());
recipients.add(messageRecipient); recipients.add(messageRecipient);
} }