From df9d0c4a27fb4d213520315a01fdf47d4d13c9d5 Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:35:45 +0900 Subject: [PATCH 01/10] [feat]:Main #144 invalid user type --- .../java/com/kusitms/mainservice/global/error/ErrorCode.java | 1 + 1 file changed, 1 insertion(+) diff --git a/MainService/src/main/java/com/kusitms/mainservice/global/error/ErrorCode.java b/MainService/src/main/java/com/kusitms/mainservice/global/error/ErrorCode.java index 4e43ad37..12659462 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/global/error/ErrorCode.java +++ b/MainService/src/main/java/com/kusitms/mainservice/global/error/ErrorCode.java @@ -18,6 +18,7 @@ public enum ErrorCode { INVALID_SHARED_TYPE(HttpStatus.BAD_REQUEST,"유효하지않은 공유된 템플릿,로드맵 타입 입니다."), INVALID_TEAM_TYPE(HttpStatus.BAD_REQUEST, "유효하지 않은 팀 타입입니다."), INVALID_TEAM_SPACE_SIZE(HttpStatus.BAD_REQUEST, "유효하지 않은 팀 스페이스 크기입니다."), + INVALID_USER_TYPE(HttpStatus.BAD_REQUEST, "유효하지 않은 유저 타입니다."), EMPTY_TEAM_SPACE(HttpStatus.BAD_REQUEST, "요청에 팀 스페이스 정보가 없습니다."), /** From 228289b5aee746afca0e3356a9d798ca8fd0edbb Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:36:50 +0900 Subject: [PATCH 02/10] =?UTF-8?q?[feat]:Main=20#144=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20service=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kusitms/mainservice/domain/user/domain/User.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/User.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/User.java index 2db2d0f0..c2e23933 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/User.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/User.java @@ -54,9 +54,10 @@ public class User { @Builder.Default private List reviewerList = new ArrayList<>(); - public static User createUser(PlatformUserInfo platformUserInfo, String sessionId) { + public static User createUser(PlatformUserInfo platformUserInfo, Platform platform, String sessionId) { return User.builder() .platformId(platformUserInfo.getId()) + .platform(platform) .email(platformUserInfo.getEmail()) .name(platformUserInfo.getName()) .profile(platformUserInfo.getPicture()) @@ -64,6 +65,11 @@ public static User createUser(PlatformUserInfo platformUserInfo, String sessionI .build(); } + public void updateSignUpUserInfo(String name, UserType userType){ + this.name = name; + this.userType = userType; + } + public void updatePlatform(Platform platform) { this.platform = platform; } From 0b18b07a8a2694c3e046c9eecac4b2f312e6ce78 Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:36:54 +0900 Subject: [PATCH 03/10] =?UTF-8?q?[feat]:Main=20#144=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20service=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/service/AuthService.java | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java index c1e4a28e..8ed1200c 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java @@ -1,16 +1,19 @@ package com.kusitms.mainservice.domain.user.service; +import com.kusitms.mainservice.domain.team.domain.Team; +import com.kusitms.mainservice.domain.team.repository.TeamRepository; import com.kusitms.mainservice.domain.user.auth.PlatformUserInfo; import com.kusitms.mainservice.domain.user.auth.RestTemplateProvider; import com.kusitms.mainservice.domain.user.domain.Platform; import com.kusitms.mainservice.domain.user.domain.User; +import com.kusitms.mainservice.domain.user.domain.UserType; import com.kusitms.mainservice.domain.user.dto.request.UserSignInRequestDto; +import com.kusitms.mainservice.domain.user.dto.request.UserSignUpRequestDto; import com.kusitms.mainservice.domain.user.dto.response.UserAuthResponseDto; import com.kusitms.mainservice.domain.user.repository.RefreshTokenRepository; import com.kusitms.mainservice.domain.user.repository.UserRepository; import com.kusitms.mainservice.global.config.auth.JwtProvider; import com.kusitms.mainservice.global.config.auth.TokenInfo; -import com.kusitms.mainservice.global.error.exception.ConflictException; import com.kusitms.mainservice.global.error.exception.EntityNotFoundException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -22,7 +25,7 @@ import static com.kusitms.mainservice.domain.user.domain.Platform.getEnumPlatformFromStringPlatform; import static com.kusitms.mainservice.domain.user.domain.RefreshToken.createRefreshToken; -import static com.kusitms.mainservice.global.error.ErrorCode.DUPLICATE_USER; +import static com.kusitms.mainservice.domain.user.domain.UserType.getEnumUserTypeFromStringUserType; import static com.kusitms.mainservice.global.error.ErrorCode.USER_NOT_FOUND; @@ -32,6 +35,7 @@ @Service public class AuthService { private final UserRepository userRepository; + private final TeamRepository teamRepository; private final JwtProvider jwtProvider; private final RestTemplateProvider restTemplateProvider; private final RefreshTokenRepository refreshTokenRepository; @@ -39,23 +43,21 @@ public class AuthService { public UserAuthResponseDto signIn(UserSignInRequestDto userSignInRequestDto, String authToken) { Platform platform = getEnumPlatformFromStringPlatform(userSignInRequestDto.getPlatform()); PlatformUserInfo platformUser = getPlatformUserInfoFromRestTemplate(platform, authToken); - User getUser = getUserByPlatformUserInfo(platformUser); - Boolean isFistLogin = Objects.isNull(getUser.getPlatform()) ? Boolean.TRUE : Boolean.FALSE; + User getUser = getUserByPlatformUserInfo(platformUser, platform); + Boolean isFistLogin = Objects.isNull(getUser.getUserType()) ? Boolean.TRUE : Boolean.FALSE; TokenInfo tokenInfo = issueAccessTokenAndRefreshToken(getUser); updateRefreshToken(tokenInfo.getRefreshToken(), getUser); saveUser(getUser, platform); return UserAuthResponseDto.of(getUser, tokenInfo, isFistLogin); } -// public UserAuthResponseDto signUp(UserSignUpRequestDto userSignUpRequestDto, String authToken) { -// Platform platform = getEnumPlatformFromStringPlatform(userSignUpRequestDto.getPlatform()); -// PlatformUserInfo platformUser = getPlatformUserInfoFromRestTemplate(platform, authToken); -// validateDuplicateUser(platform, platformUser.getId()); -// User createdUser = saveUser(platformUser, platform); -// TokenInfo tokenInfo = issueAccessTokenAndRefreshToken(createdUser); -// updateRefreshToken(tokenInfo.getRefreshToken(), createdUser); -// return UserAuthResponseDto.of(createdUser, tokenInfo); -// } + public void signUp(Long userId, UserSignUpRequestDto userSignUpRequestDto) { + User user = getUserFromUserId(userId); + UserType userType = getEnumUserTypeFromStringUserType(userSignUpRequestDto.getUserType()); + user.updateSignUpUserInfo(userSignUpRequestDto.getUserName(), userType); + Team team = Team.createTeam(userSignUpRequestDto.getTeamName(), null, null, user); + saveTeam(team); + } public void signOut(Long userId) { User findUser = getUserFromUserId(userId); @@ -67,11 +69,6 @@ private void deleteRefreshToken(User user) { refreshTokenRepository.deleteById(user.getId()); } - private void validateDuplicateUser(Platform platform, String platformId) { - if (userRepository.existsUserByPlatformAndPlatformId(platform, platformId)) - throw new ConflictException(DUPLICATE_USER); - } - private void saveUser(User createdUser, Platform platform) { createdUser.updatePlatform(platform); userRepository.save(createdUser); @@ -91,15 +88,19 @@ private User getUserFromUserId(Long userId) { .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND)); } - private User getUserByPlatformUserInfo(PlatformUserInfo platformUserInfo) { + private User getUserByPlatformUserInfo(PlatformUserInfo platformUserInfo, Platform platform) { return userRepository.findByPlatformId(platformUserInfo.getId()) - .orElse(User.createUser(platformUserInfo, generateRandomUuid(platformUserInfo))); + .orElse(User.createUser(platformUserInfo, platform, generateRandomUuid(platformUserInfo))); } private PlatformUserInfo getPlatformUserInfoFromRestTemplate(Platform platform, String authToken) { return restTemplateProvider.getUserInfoUsingRestTemplate(platform, authToken); } + private void saveTeam(Team team) { + teamRepository.save(team); + } + private String generateRandomUuid(PlatformUserInfo platformUserInfo) { UUID randomUuid = UUID.randomUUID(); String uuidAsString = randomUuid.toString().replace("-", ""); From d4d97c00c4f4f34b4849f303ca78abdccf45577d Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:38:34 +0900 Subject: [PATCH 04/10] =?UTF-8?q?[refactor]:Main=20#144=20team=20service?= =?UTF-8?q?=20=EB=B6=88=ED=95=84=EC=9A=94=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainservice/domain/team/service/TeamService.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/team/service/TeamService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/team/service/TeamService.java index a2fb8cd8..59ac03f2 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/team/service/TeamService.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/team/service/TeamService.java @@ -136,13 +136,8 @@ private Team createTeamFromRequestDto(TeamRequestDto teamRequestDto, User user) } private void deleteTeamSpaceList(Team team) { - team.getTeamSpaceList() - .forEach(teamSpace -> deleteTeamSpace(teamSpace.getId())); + team.getTeamSpaceList().forEach(teamSpace -> deleteTeamSpace(teamSpace.getId())); team.resetTeamSpaceList(); -// spaceList.forEach(space -> { -// if (!Objects.isNull(space.getTeamSpaceId())) -// deleteTeamSpace(space.getTeamSpaceId()); -// }); } private List getTeamListFromUserId(Long userId) { From 346b79af1d88988e210d529e544c4abfae49b825 Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:39:04 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[refactor]:Main=20#144=20=ED=95=84?= =?UTF-8?q?=EC=9A=94=EC=97=86=EB=8A=94=20id=20response=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/dto/response/UserAuthResponseDto.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/UserAuthResponseDto.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/UserAuthResponseDto.java index ae0c26e9..153c5f7d 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/UserAuthResponseDto.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/UserAuthResponseDto.java @@ -8,7 +8,6 @@ @Builder @Getter public class UserAuthResponseDto { - private Long id; private String email; private String name; private String picture; @@ -19,7 +18,6 @@ public class UserAuthResponseDto { public static UserAuthResponseDto of(User user, TokenInfo token, Boolean isFirst) { return UserAuthResponseDto.builder() - .id(user.getId()) .email(user.getEmail()) .name(user.getName()) .picture(user.getProfile()) From e0eb2bfc7f567b322700699f3a46b0be41c80dc8 Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:39:34 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[feat]:Main=20#144=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EB=A1=9C=EC=A7=81=20controller=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/controller/UserController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/controller/UserController.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/controller/UserController.java index b774eded..83bb9924 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/controller/UserController.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/controller/UserController.java @@ -19,21 +19,21 @@ public class UserController { private final AuthService authService; - @PostMapping("/signIn") + @PostMapping("/signin") public ResponseEntity> signIn(@RequestHeader("Authorization") final String authToken, @RequestBody final UserSignInRequestDto requestDto) { final UserAuthResponseDto responseDto = authService.signIn(requestDto, authToken); return SuccessResponse.ok(responseDto); } -// @PostMapping("/signUp") -// public ResponseEntity> signUp(@RequestHeader("Authorization") final String authToken, -// @RequestBody final UserSignUpRequestDto requestDto) { -// final UserAuthResponseDto responseDto = authService.signUp(requestDto, authToken); -// return SuccessResponse.ok(responseDto); -// } + @PostMapping("/signup") + public ResponseEntity> signUp(@UserId final Long userId, + @RequestBody final UserSignUpRequestDto requestDto) { + authService.signUp(userId, requestDto); + return SuccessResponse.ok(null); + } - @PatchMapping("/signOut") + @PatchMapping("/signout") public ResponseEntity> signOut(@UserId final Long userId) { authService.signOut(userId); return SuccessResponse.ok(null); From dbcce173593dbb4fa22f7deeaaa8341a3b40126f Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:39:52 +0900 Subject: [PATCH 07/10] =?UTF-8?q?[feat]:Main=20#144=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20request=20dto=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/dto/request/UserSignUpRequestDto.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/request/UserSignUpRequestDto.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/request/UserSignUpRequestDto.java index 01a0be48..01358277 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/request/UserSignUpRequestDto.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/request/UserSignUpRequestDto.java @@ -7,5 +7,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter public class UserSignUpRequestDto { - private String platform; + private String userName; + private String userType; + private String teamName; } From 6fcae34583203e17f4ae7e889c2fbaa14e165845 Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:44:39 +0900 Subject: [PATCH 08/10] =?UTF-8?q?[refactore]:Main=20#144=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/MyPageUserResponseDto.java | 5 ++-- .../domain/user/domain/UserType.java | 26 ++++++++++++++----- .../dto/response/DetailUserResponseDto.java | 5 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/mypage/dto/response/MyPageUserResponseDto.java b/MainService/src/main/java/com/kusitms/mainservice/domain/mypage/dto/response/MyPageUserResponseDto.java index 500b6b8e..045f3c2e 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/mypage/dto/response/MyPageUserResponseDto.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/mypage/dto/response/MyPageUserResponseDto.java @@ -1,7 +1,6 @@ package com.kusitms.mainservice.domain.mypage.dto.response; import com.kusitms.mainservice.domain.user.domain.User; -import com.kusitms.mainservice.domain.user.domain.UserType; import lombok.Builder; import lombok.Getter; @@ -10,7 +9,7 @@ public class MyPageUserResponseDto { private Long userId; private String profile; - private UserType userType; + private String userType; private String name; private String email; private int templateNum; @@ -21,7 +20,7 @@ public static MyPageUserResponseDto of(User user,int templateNum, int roadmapNum return MyPageUserResponseDto.builder() .userId(user.getId()) .profile(user.getProfile()) - .userType(user.getUserType()) + .userType(user.getUserType().getStringUserType()) .name(user.getName()) .email(user.getEmail()) .templateNum(templateNum) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/UserType.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/UserType.java index 64d84020..4b47bacf 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/UserType.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/domain/UserType.java @@ -1,15 +1,29 @@ package com.kusitms.mainservice.domain.user.domain; +import com.kusitms.mainservice.global.error.exception.InvalidValueException; import lombok.Getter; import lombok.RequiredArgsConstructor; +import java.util.Arrays; + +import static com.kusitms.mainservice.global.error.ErrorCode.INVALID_USER_TYPE; + @RequiredArgsConstructor @Getter public enum UserType { - PM, - 마케터, - 디자이너, - 개발자, - 기획자, - 에디터 + PM("PM"), + MARKETER("마케터"), + DESIGNER("디자이너"), + DEVELOPER("개발자"), + PLANNER("기획자"), + EDITOR("에디터"); + + private final String stringUserType; + + public static UserType getEnumUserTypeFromStringUserType(String stringUserType) { + return Arrays.stream(values()) + .filter(userType -> userType.stringUserType.equals(stringUserType)) + .findFirst() + .orElseThrow(() -> new InvalidValueException(INVALID_USER_TYPE)); + } } diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/DetailUserResponseDto.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/DetailUserResponseDto.java index a15fd268..ea955835 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/DetailUserResponseDto.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/dto/response/DetailUserResponseDto.java @@ -1,7 +1,6 @@ package com.kusitms.mainservice.domain.user.dto.response; import com.kusitms.mainservice.domain.user.domain.User; -import com.kusitms.mainservice.domain.user.domain.UserType; import lombok.Builder; import lombok.Getter; @@ -10,7 +9,7 @@ public class DetailUserResponseDto { private Long id; private String profile; - private UserType userType; + private String userType; private String name; private String email; private int templateNum; @@ -21,7 +20,7 @@ public static DetailUserResponseDto of(User user, int templateNum, int roadmapNu return DetailUserResponseDto.builder() .id(user.getId()) .profile(user.getProfile()) - .userType(user.getUserType()) + .userType(user.getUserType().getStringUserType()) .name(user.getName()) .email(user.getEmail()) .templateNum(templateNum) From 4cb5853c6e6d4e096a61387c1510d0d166dad77d Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:57:19 +0900 Subject: [PATCH 09/10] =?UTF-8?q?[refactore]:Main=20#144=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kusitms/mainservice/domain/user/service/AuthService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java index 8ed1200c..9e1350e9 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java @@ -70,7 +70,6 @@ private void deleteRefreshToken(User user) { } private void saveUser(User createdUser, Platform platform) { - createdUser.updatePlatform(platform); userRepository.save(createdUser); } From 2d8036d1b0eb5196f0527183e0ea34d995664183 Mon Sep 17 00:00:00 2001 From: RyuKwanKon Date: Mon, 20 Nov 2023 14:57:35 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[refactore]:Main=20#144=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kusitms/mainservice/domain/user/service/AuthService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java index 9e1350e9..c5e365d5 100644 --- a/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java +++ b/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java @@ -47,7 +47,7 @@ public UserAuthResponseDto signIn(UserSignInRequestDto userSignInRequestDto, Str Boolean isFistLogin = Objects.isNull(getUser.getUserType()) ? Boolean.TRUE : Boolean.FALSE; TokenInfo tokenInfo = issueAccessTokenAndRefreshToken(getUser); updateRefreshToken(tokenInfo.getRefreshToken(), getUser); - saveUser(getUser, platform); + saveUser(getUser); return UserAuthResponseDto.of(getUser, tokenInfo, isFistLogin); } @@ -69,7 +69,7 @@ private void deleteRefreshToken(User user) { refreshTokenRepository.deleteById(user.getId()); } - private void saveUser(User createdUser, Platform platform) { + private void saveUser(User createdUser) { userRepository.save(createdUser); }