Skip to content

feat: 일자별 가입자 수를 파악할 수 있도록 회원가입 시, 로그 출력 #92

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
merged 1 commit into from
Dec 4, 2024
Merged

feat: 일자별 가입자 수를 파악할 수 있도록 회원가입 시, 로그 출력 #92

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
38 changes: 22 additions & 16 deletions src/main/java/com/example/gimmegonghakauth/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.example.gimmegonghakauth.user.service;

import com.example.gimmegonghakauth.completed.infrastructure.CompletedCoursesDao;
import com.example.gimmegonghakauth.user.infrastructure.UserRepository;
import com.example.gimmegonghakauth.completed.domain.CompletedCoursesDomain;
import com.example.gimmegonghakauth.common.domain.MajorsDomain;
import com.example.gimmegonghakauth.completed.domain.CompletedCoursesDomain;
import com.example.gimmegonghakauth.completed.infrastructure.CompletedCoursesDao;
import com.example.gimmegonghakauth.user.domain.UserDomain;
import com.example.gimmegonghakauth.user.infrastructure.UserRepository;
import com.example.gimmegonghakauth.user.service.dto.ChangePasswordDto;
import com.example.gimmegonghakauth.user.service.dto.UserJoinDto;
import com.example.gimmegonghakauth.user.service.exception.UserNotFoundException;
import com.example.gimmegonghakauth.user.service.port.UserEncoder;
import java.time.LocalDate;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -19,20 +21,24 @@
@Transactional
@Service
@RequiredArgsConstructor
@Slf4j
public class UserService {

private final UserRepository userRepository;
private final CompletedCoursesDao completedCoursesDao;
private final UserEncoder userEncoder;

public UserDomain create(String _studentId, String password, String email,
MajorsDomain majorsDomain, String name) {
public UserDomain create(String _studentId, String password, String email, MajorsDomain majorsDomain, String name) {
Long studentId = Long.parseLong(_studentId);
UserDomain user = UserDomain.builder()
.studentId(studentId).password(userEncoder.encode(password))
.email(email).majorsDomain(majorsDomain).name(name)
.build();
.studentId(studentId).password(userEncoder.encode(password))
.email(email).majorsDomain(majorsDomain).name(name)
.build();
userRepository.save(user);

log.info("{} {}학번 {} {}님이 가입하셨습니다.",
LocalDate.now(), studentId / 1000000, majorsDomain.getMajor(), user.getName());

return user;
}

Expand All @@ -44,7 +50,7 @@ public UserDomain updatePassword(UserDomain user, String newPassword) {

public UserDomain getByStudentId(Long studentId) {
return userRepository.findByStudentId(studentId)
.orElseThrow(() -> new UserNotFoundException(studentId));
.orElseThrow(() -> new UserNotFoundException(studentId));
}

public boolean joinValidation(UserJoinDto userJoinDto, BindingResult bindingResult) {
Expand Down Expand Up @@ -82,7 +88,7 @@ public boolean withdrawal(String _studentId, String password) {
Long studentId = Long.parseLong(_studentId);

UserDomain user = userRepository.findByStudentId(studentId)
.orElseThrow(() -> new UsernameNotFoundException("학번이 존재하지 않습니다."));
.orElseThrow(() -> new UsernameNotFoundException("학번이 존재하지 않습니다."));

if (userEncoder.matches(password, user.getPassword())) {
List<CompletedCoursesDomain> coursesList = completedCoursesDao.findByUserDomain(user);
Expand All @@ -98,24 +104,24 @@ public boolean withdrawal(String _studentId, String password) {
}

public boolean changePasswordValidation(ChangePasswordDto changePasswordDto,
BindingResult bindingResult, UserDomain user) {
BindingResult bindingResult, UserDomain user) {
String password = user.getPassword();
String inputPassword = changePasswordDto.getCurrentPassword();
if (!userEncoder.matches(inputPassword, password)) { //입력한 패스워드가 현재 패스워드와 일치하지 않을 경우
bindingResult.rejectValue("currentPassword", "currentPasswordInCorrect",
"현재 패스워드가 일치하지 않습니다.");
"현재 패스워드가 일치하지 않습니다.");
return false;
}
if (userEncoder.matches(changePasswordDto.getNewPassword1(),
password)) { //입력한 새 패스워드가 현재 패스워드와 일치하는 경우
password)) { //입력한 새 패스워드가 현재 패스워드와 일치하는 경우
bindingResult.rejectValue("newPassword1", "sameCurrentPassword",
"현재 패스워드와 다른 패스워드를 입력해주세요.");
"현재 패스워드와 다른 패스워드를 입력해주세요.");
return false;
}
if (!changePasswordDto.getNewPassword1()
.equals(changePasswordDto.getNewPassword2())) {//새 패스워드 2개의 입력이 일치하지 않는 경우
.equals(changePasswordDto.getNewPassword2())) {//새 패스워드 2개의 입력이 일치하지 않는 경우
bindingResult.rejectValue("newPassword2", "newPasswordInCorrect",
"입력한 패스워드가 일치하지 않습니다.");
"입력한 패스워드가 일치하지 않습니다.");
return false;
}
return true;
Expand Down