Skip to content

feat: 회원가입 시 어드민의 환영 메시지 전송 기능 추가 #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dh2906 merged 1 commit into from
Jan 23, 2026
+35 −0
Merged

feat: 회원가입 시 어드민의 환영 메시지 전송 기능 추가 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/gg/agit/konect/domain/user/repository/UserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import gg.agit.konect.global.code.ApiResponseCode;
import gg.agit.konect.global.exception.CustomException;
import gg.agit.konect.domain.user.enums.Provider;
import gg.agit.konect.domain.user.enums.UserRole;
import gg.agit.konect.domain.user.model.User;

public interface UserRepository extends Repository<User, Integer> {
Expand All @@ -22,6 +23,8 @@ public interface UserRepository extends Repository<User, Integer> {

Optional<User> findById(Integer id);

Optional<User> findFirstByRoleOrderByIdAsc(UserRole role);

default User getById(Integer id) {
return findById(id).orElseThrow(() ->
CustomException.of(ApiResponseCode.NOT_FOUND_USER));
Expand Down
32 changes: 32 additions & 0 deletions src/main/java/gg/agit/konect/domain/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;

import gg.agit.konect.domain.chat.model.ChatMessage;
import gg.agit.konect.domain.chat.model.ChatRoom;
import gg.agit.konect.domain.chat.repository.ChatMessageRepository;
import gg.agit.konect.domain.chat.repository.ChatRoomRepository;
import gg.agit.konect.domain.club.enums.ClubPositionGroup;
Expand All @@ -27,19 +29,24 @@
import gg.agit.konect.domain.user.dto.UserInfoResponse;
import gg.agit.konect.domain.user.dto.UserUpdateRequest;
import gg.agit.konect.domain.user.enums.Provider;
import gg.agit.konect.domain.user.enums.UserRole;
import gg.agit.konect.domain.user.model.UnRegisteredUser;
import gg.agit.konect.domain.user.model.User;
import gg.agit.konect.domain.user.repository.UnRegisteredUserRepository;
import gg.agit.konect.domain.user.repository.UserRepository;
import gg.agit.konect.global.code.ApiResponseCode;
import gg.agit.konect.global.exception.CustomException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

@Service
@Slf4j
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class UserService {

private static final String DEFAULT_WELCOME_MESSAGE = "KONECT에 오신 것을 환영합니다. 궁금한 점이 있으면 언제든 문의해 주세요.";

private final UserRepository userRepository;
private final UnRegisteredUserRepository unRegisteredUserRepository;
private final UniversityRepository universityRepository;
Expand Down Expand Up @@ -89,11 +96,36 @@ public Integer signup(String email, String providerId, Provider provider, Signup

joinPreMembers(savedUser, university.getId(), request.studentNumber(), request.name());

sendWelcomeMessage(savedUser);

unRegisteredUserRepository.delete(tempUser);

return savedUser.getId();
}

// TODO 추후에 슈퍼 어드민을 만들어 학교가 확장되는 것을 고려해야 함
private void sendWelcomeMessage(User newUser) {
try {
User operator = userRepository.findFirstByRoleOrderByIdAsc(UserRole.ADMIN)
.orElse(null);

if (operator == null) {
return;
}

ChatRoom chatRoom = chatRoomRepository.findByTwoUsers(operator.getId(), newUser.getId())
.orElseGet(() -> chatRoomRepository.save(ChatRoom.of(operator, newUser)));

ChatMessage chatMessage = chatMessageRepository.save(
ChatMessage.of(chatRoom, operator, newUser, DEFAULT_WELCOME_MESSAGE)
);

chatRoom.updateLastMessage(chatMessage.getContent(), chatMessage.getCreatedAt());
} catch (Exception e) {
log.warn("회원가입 환영 메시지 전송 실패. userId={}", newUser.getId(), e);
}
}

private UnRegisteredUser findUnregisteredUser(String email, String providerId, Provider provider) {
if (StringUtils.hasText(providerId)) {
if (unRegisteredUserRepository.existsByProviderIdAndProvider(providerId, provider)) {
Expand Down