#82 fix : userId -> id 변경

TeamSynergyy · Apr 25, 2024 · 0becea4 · 0becea4
1 parent 5738005
commit 0becea4
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 19 deletions.
diff --git a/src/main/java/com/seoultech/synergybe/domain/apply/service/ApplyService.java b/src/main/java/com/seoultech/synergybe/domain/apply/service/ApplyService.java
@@ -95,7 +95,7 @@ public void updateApplyStatusToReject(String userId, String projectId) {
 
     public GetListApplyResponse getMyApplyList(String userId) {
         User user = userService.getUser(userId);
-        List<Apply> applies = applyRepository.findAllProcessByUserId(user.getUserId());
+        List<Apply> applies = applyRepository.findAllProcessByUserId(user.getId());
 
         return ApplyMapperEntityToDto.applyListToResponse(applies);
     }

diff --git a/src/main/java/com/seoultech/synergybe/domain/follow/service/FollowService.java b/src/main/java/com/seoultech/synergybe/domain/follow/service/FollowService.java
@@ -62,7 +62,7 @@ public GetFollowResponse updateFollow(User user, String followingId, CreateFollo
     }
 
     public synchronized Follow update(User user, String followingId, FollowStatus status) {
-        Optional<Follow> followOptional = followRepository.findByFollowerIdAndFollowingId(user.getUserId(), followingId);
+        Optional<Follow> followOptional = followRepository.findByFollowerIdAndFollowingId(user.getId(), followingId);
 
         if (followOptional.isPresent()) {
             followOptional.get().updateStatus(status);

diff --git a/src/main/java/com/seoultech/synergybe/domain/post/service/PostService.java b/src/main/java/com/seoultech/synergybe/domain/post/service/PostService.java
@@ -150,7 +150,7 @@ public ListResponse<GetPostResponse> getPostListByUser(String userId) {
 //    }
 
     public ListResponse<GetPostResponse> getFeed(Long end, User user) {
-        List<String> followingIds = followService.findFollowingIdsByUserId(user.getUserId());
+        List<String> followingIds = followService.findFollowingIdsByUserId(user.getId());
         log.info("followingIds Size{}",followingIds.size());
         List<Post> allPosts = new ArrayList<>();
 
@@ -227,7 +227,7 @@ public Predicate toPredicate(Root<Post> postRoot, CriteriaQuery<?> query, Criter
     public ListResponse<GetPostResponse> getRecommendPostList(User user, Long end) {
         try {
             log.info("get recommend post list start");
-            String userId = user.getUserId();
+            String userId = user.getId();
             log.info("user Id {}", userId);
 
             RestTemplate restTemplate = new RestTemplate();

diff --git a/src/main/java/com/seoultech/synergybe/domain/postlike/service/PostLikeService.java b/src/main/java/com/seoultech/synergybe/domain/postlike/service/PostLikeService.java
@@ -59,7 +59,7 @@ public GetPostLikeResponse updatePostLike(User user, String postId, PostLikeType
      * post에서 해당 postlike 추가
      */
     public synchronized PostLike update(User user, String postId, LikeStatus likeStatus) {
-        Optional<PostLike> postLikeOptional = postLikeRepository.findByUserUserIdAndPostId(user.getUserId(), postId);
+        Optional<PostLike> postLikeOptional = postLikeRepository.findByUserUserIdAndPostId(user.getId(), postId);
 
         Post post = postRepository.findById(postId)
                 .orElseThrow(() -> new PostLikeNotFoundException("존재하지 않는 좋아요입니다."));
@@ -95,6 +95,6 @@ public synchronized PostLike update(User user, String postId, LikeStatus likeSta
 
 
     public List<String> findLikedPostIds(User user) {
-        return postLikeRepository.findPostIdsByUserId(user.getUserId());
+        return postLikeRepository.findPostIdsByUserId(user.getId());
     }
 }
diff --git a/src/main/java/com/seoultech/synergybe/domain/project/service/ProjectService.java b/src/main/java/com/seoultech/synergybe/domain/project/service/ProjectService.java
@@ -60,7 +60,7 @@ public GetProjectResponse createProject(User user, CreateProjectRequest request)
                 .location(point)
                 .startAt(request.startAt())
                 .endAt(request.endAt())
-                .leaderId(user.getUserId())
+                .leaderId(user.getId())
                 .build();
             Project savedProject = projectRepository.save(project);
             projectUserService.createProjectUser(savedProject, user);
@@ -163,7 +163,7 @@ public ListResponse<GetProjectResponse> getRecommendListByUser(User user, Long e
 
         try {
             log.info("get recommend project list start");
-            String userId = user.getUserId();
+            String userId = user.getId();
             log.info("user Id {}", userId);
 
             RestTemplate restTemplate = new RestTemplate();

diff --git a/src/main/java/com/seoultech/synergybe/domain/projectlike/service/ProjectLikeService.java b/src/main/java/com/seoultech/synergybe/domain/projectlike/service/ProjectLikeService.java
@@ -46,7 +46,7 @@ public ProjectLikeResponse updateProjectLike(User user, String projectId, Projec
     }
 
     public synchronized ProjectLike update(User user, String projectId, LikeStatus status) {
-        Optional<ProjectLike> projectLikeOptional = projectLikeRepository.findByUserUserIdAndProjectId(user.getUserId(), projectId);
+        Optional<ProjectLike> projectLikeOptional = projectLikeRepository.findByUserUserIdAndProjectId(user.getId(), projectId);
 
         if (projectLikeOptional.isPresent()) {
             projectLikeOptional.get().updateStatus(status);
@@ -68,6 +68,6 @@ public synchronized ProjectLike update(User user, String projectId, LikeStatus s
     }
 
     public List<String> findLikedProjectIds(User user) {
-        return projectLikeRepository.findProjectIdsByUserId(user.getUserId());
+        return projectLikeRepository.findProjectIdsByUserId(user.getId());
     }
 }
diff --git a/src/main/java/com/seoultech/synergybe/domain/projectuser/service/ProjectUserService.java b/src/main/java/com/seoultech/synergybe/domain/projectuser/service/ProjectUserService.java
@@ -25,7 +25,7 @@ public class ProjectUserService {
     private final ProjectRepository projectRepository;
 
     public void createProjectUser(Project project, User user) {
-        Optional<ProjectUser> projectUserOptional = projectUserRepository.findByProjectIdAndUserUserId(project.getId(), user.getUserId());
+        Optional<ProjectUser> projectUserOptional = projectUserRepository.findByProjectIdAndUserUserId(project.getId(), user.getId());
 
         if (projectUserOptional.isPresent()) {
             // 이미 생성됨
@@ -44,7 +44,7 @@ public List<String> getProjectUserIds(String projectId) {
     }
 
     public void deleteProjectUser(Project project, User user) {
-        Optional<ProjectUser> projectUserOptional = projectUserRepository.findByProjectIdAndUserUserId(project.getId(), user.getUserId());
+        Optional<ProjectUser> projectUserOptional = projectUserRepository.findByProjectIdAndUserUserId(project.getId(), user.getId());
 
         if (projectUserOptional.isPresent()) {
             projectUserRepository.delete(projectUserOptional.get());

diff --git a/src/main/java/com/seoultech/synergybe/domain/rate/service/RateService.java b/src/main/java/com/seoultech/synergybe/domain/rate/service/RateService.java
@@ -71,7 +71,7 @@ public List<UserRateResponse> updateTemperature(String projectId, User leader) {
     }
 
     private UserRateResponse CalculateUserRate(String projectId, User user) {
-        List<Rate> rates = rateRepository.findAllByProjectIdAndReceiverId(projectId, user.getUserId());
+        List<Rate> rates = rateRepository.findAllByProjectIdAndReceiverId(projectId, user.getId());
         int total = 0;
 
         for (Rate rate : rates) {
@@ -88,7 +88,7 @@ private UserRateResponse CalculateUserRate(String projectId, User user) {
 
     private void checkLeader(String projectId, User leader) {
         Project project = projectService.findProjectById(projectId);
-        if (!Objects.equals(project.getLeaderId(), leader.getUserId())) {
+        if (!Objects.equals(project.getLeaderId(), leader.getId())) {
             throw new ProjectLeaderBadRequestException("프로젝트 리더가 잘못되었습니다.");
         }
     }

diff --git a/src/main/java/com/seoultech/synergybe/domain/ticket/service/TicketService.java b/src/main/java/com/seoultech/synergybe/domain/ticket/service/TicketService.java
@@ -188,7 +188,7 @@ private void decreaseOrderNum(List<Ticket> tickets) {
     private void checkUser(List<User> authUsers, User user) {
         boolean userFound = false;
         for (User authUser : authUsers) {
-            if (authUser.getUserId().equals(user.getUserId())) {
+            if (authUser.getId().equals(user.getId())) {
                 userFound = true;
                 break;
             }

diff --git a/src/main/java/com/seoultech/synergybe/domain/ticketUser/service/TicketUserService.java b/src/main/java/com/seoultech/synergybe/domain/ticketUser/service/TicketUserService.java
@@ -19,7 +19,7 @@ public class TicketUserService {
     private final IdGenerator idGenerator;
 
     public void createTicketUser(Ticket ticket, User user) {
-        Optional<TicketUser> ticketUserOptional = ticketUserRepository.findByTicketIdAndUserUserId(ticket.getId(), user.getUserId());
+        Optional<TicketUser> ticketUserOptional = ticketUserRepository.findByTicketIdAndUserUserId(ticket.getId(), user.getId());
 
         if (ticketUserOptional.isPresent()) {
             // 이미 생성됨

diff --git a/src/main/java/com/seoultech/synergybe/domain/user/service/UserService.java b/src/main/java/com/seoultech/synergybe/domain/user/service/UserService.java
@@ -32,7 +32,7 @@
 
 @Slf4j
 @Service
-@Transactional
+@Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class UserService {
     private final UserRepository userRepository;
@@ -44,6 +44,7 @@ public CheckDuplicateVolunteerEmailResponse checkDuplicateVolunteerEmailResponse
         return CheckDuplicateVolunteerEmailResponse.from(isDuplicated);
     }
 
+    @Transactional
     public CreateUserResponse createUser(
             String email,
             String password,
@@ -52,11 +53,12 @@ public CreateUserResponse createUser(
     ) {
         String userId = idGenerator.generateId(IdPrefix.USER);
         User user = User.builder()
-                .userId(userId)
+                .id(userId)
                 .email(email)
                 .password(password)
                 .name(name)
-                .passwordEncoder(passwordEncoder).major(major)
+                .passwordEncoder(passwordEncoder)
+                .major(major)
                 .build();
         userRepository.save(user);