Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

import gg.agit.konect.domain.user.dto.SignupRequest;
import gg.agit.konect.domain.user.dto.UserAccessTokenResponse;
import gg.agit.konect.domain.user.dto.UserInfoResponse;
import gg.agit.konect.domain.user.dto.UserUpdateRequest;
import gg.agit.konect.global.auth.annotation.PublicApi;
import gg.agit.konect.global.auth.annotation.UserId;
import io.swagger.v3.oas.annotations.Operation;
Expand Down Expand Up @@ -48,13 +46,6 @@ ResponseEntity<Void> signup(
@GetMapping("/me")
ResponseEntity<UserInfoResponse> getMyInfo(@UserId Integer userId);

@Operation(summary = "로그인한 사용자의 정보를 수정한다.")
@PutMapping("/me")
ResponseEntity<Void> updateMyInfo(
@UserId Integer userId,
@RequestBody @Valid UserUpdateRequest request
);

@Operation(summary = "로그아웃한다.")
@PostMapping("/logout")
@PublicApi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import gg.agit.konect.domain.user.dto.SignupRequest;
import gg.agit.konect.domain.user.dto.UserAccessTokenResponse;
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.service.UserService;
import gg.agit.konect.global.auth.annotation.PublicApi;
import gg.agit.konect.global.auth.annotation.UserId;
Expand Down Expand Up @@ -69,16 +69,6 @@ public ResponseEntity<UserInfoResponse> getMyInfo(@UserId Integer userId) {
return ResponseEntity.ok(response);
}

@Override
public ResponseEntity<Void> updateMyInfo(
@UserId Integer userId,
@RequestBody @Valid UserUpdateRequest request
) {
userService.updateUserInfo(userId, request);

return ResponseEntity.ok().build();
}

@Override
@PublicApi
public ResponseEntity<Void> logout(HttpServletRequest request, HttpServletResponse response) {
Expand Down

This file was deleted.

39 changes: 0 additions & 39 deletions src/main/java/gg/agit/konect/domain/user/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import gg.agit.konect.domain.university.repository.UniversityRepository;
Copy link

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UserUpdateRequest DTO 파일이 더 이상 사용되지 않으므로 삭제해야 합니다. 현재 src/main/java/gg/agit/konect/domain/user/dto/UserUpdateRequest.java 파일이 여전히 존재하지만 어디서도 참조되지 않습니다.

Copilot uses AI. Check for mistakes.
import gg.agit.konect.domain.user.dto.SignupRequest;
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;
Expand Down Expand Up @@ -192,30 +191,6 @@ public UserInfoResponse getUserInfo(Integer userId) {
return UserInfoResponse.from(user, joinedClubCount, studyTime, unreadCouncilNoticeCount, isClubManager);
Copy link

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

User 모델의 updateInfo 메서드가 더 이상 사용되지 않습니다. 이 메서드는 삭제된 updateUserInfo 서비스 메서드에서만 호출되었으므로, User.java 파일에서도 제거하는 것을 고려해야 합니다.

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

User 모델의 hasSameStudentNumber와 hasSamePhoneNumber 메서드가 더 이상 사용되지 않습니다. 이 메서드들은 삭제된 검증 로직에서만 사용되었으므로, User.java 파일에서도 제거하는 것을 고려해야 합니다.

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UserRepository의 existsByUniversityIdAndStudentNumberAndIdNot 메서드가 더 이상 사용되지 않습니다. 이 메서드는 삭제된 validateStudentNumberDuplication 메서드에서만 호출되었으므로, UserRepository.java에서도 제거하는 것을 고려해야 합니다.

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UserRepository의 existsByPhoneNumberAndIdNot 메서드가 더 이상 사용되지 않습니다. 이 메서드는 삭제된 validatePhoneNumberDuplication 메서드에서만 호출되었으므로, UserRepository.java에서도 제거하는 것을 고려해야 합니다.

Copilot uses AI. Check for mistakes.
}

@Transactional
public void updateUserInfo(Integer userId, UserUpdateRequest request) {
User user = userRepository.getById(userId);

validateStudentNumberDuplication(user, request);
validatePhoneNumberDuplication(user, request);

user.updateInfo(request.name(), request.studentNumber(), request.phoneNumber());
}

private void validateStudentNumberDuplication(User user, UserUpdateRequest request) {
if (user.hasSameStudentNumber(request.studentNumber())) {
return;
}

boolean exists = userRepository.existsByUniversityIdAndStudentNumberAndIdNot(
user.getUniversity().getId(), request.studentNumber(), user.getId()
);

if (exists) {
throw CustomException.of(ApiResponseCode.DUPLICATE_STUDENT_NUMBER);
}
}

private void validateStudentNumberDuplicationOnSignup(Integer universityId, String studentNumber) {
boolean exists = userRepository.existsByUniversityIdAndStudentNumber(universityId, studentNumber);

Expand All @@ -224,20 +199,6 @@ private void validateStudentNumberDuplicationOnSignup(Integer universityId, Stri
}
}

private void validatePhoneNumberDuplication(User user, UserUpdateRequest request) {
String phoneNumber = request.phoneNumber();

if (!StringUtils.hasText(phoneNumber) || user.hasSamePhoneNumber(phoneNumber)) {
return;
}

boolean exists = userRepository.existsByPhoneNumberAndIdNot(phoneNumber, user.getId());

if (exists) {
throw CustomException.of(ApiResponseCode.DUPLICATE_PHONE_NUMBER);
}
}

@Transactional
public void deleteUser(Integer userId) {
User user = userRepository.getById(userId);
Expand Down
Loading