Merge pull request #228 from ASAP-as-soon-as-possible/feat/#227

#227 [feat] [feat] 로그인 시 발생하는 N+1 이슈 해결 및 기타 작업
ASAP-as-soon-as-possible · Oct 11, 2023 · b965b21 · b965b21
2 parents ede8459 + e0b077e
commit b965b21
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 66 deletions.
diff --git a/src/main/java/com/asap/server/controller/UserController.java b/src/main/java/com/asap/server/controller/UserController.java
@@ -44,7 +44,7 @@ public class UserController {
     @Operation(summary = "[회의 가능 시간 입력 뷰 - 방장] 방장 가능 시간 입력 API")
     @SecurityRequirement(name = "JWT Auth")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "방장의 회의 가능 시간이 성공적으로 입력되었습니다."),
+            @ApiResponse(responseCode = "201", description = "방장의 회의 가능 시간이 성공적으로 입력되었습니다."),
             @ApiResponse(responseCode = "400",
                     description = "1. 시간 형식이 잘못되었습니다. [YYYY/MM/DD HH:MM]\n"
                             + "2. 중복 입력된 시간이 있습니다.\n"
@@ -70,7 +70,7 @@ public SuccessResponse<UserMeetingTimeResponseDto> createHostTime(
 
     @Operation(summary = "[회의 가능 시간 입력 뷰 - 참여자] 참여자 정보 및 가능 시간 입력 API")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "참여자 회의 가능 시간 입력을 성공하였습니다."),
+            @ApiResponse(responseCode = "201", description = "참여자 회의 가능 시간 입력을 성공하였습니다."),
             @ApiResponse(responseCode = "400",
                     description = "1. 시간 형식이 잘못되었습니다. [YYYY/MM/DD HH:MM]\n"
                             + "2. 중복 입력된 시간이 있습니다.\n"

diff --git a/src/main/java/com/asap/server/repository/AvailableDateRepository.java b/src/main/java/com/asap/server/repository/AvailableDateRepository.java
@@ -2,10 +2,7 @@
 
 import com.asap.server.domain.AvailableDate;
 import com.asap.server.domain.Meeting;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.Param;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -17,8 +14,4 @@ public interface AvailableDateRepository extends Repository<AvailableDate, Long>
     List<AvailableDate> findByMeeting(final Meeting meeting);
 
     Optional<AvailableDate> findByMeetingAndDate(final Meeting meeting, final LocalDate date);
-
-    @Modifying(clearAutomatically = true)
-    @Query("delete from AvailableDate a where a.meeting = :meeting")
-    void deleteByMeeting(@Param("meeting") final Meeting meeting);
 }
diff --git a/src/main/java/com/asap/server/repository/MeetingRepository.java b/src/main/java/com/asap/server/repository/MeetingRepository.java
@@ -1,12 +1,21 @@
 package com.asap.server.repository;
 
 import com.asap.server.domain.Meeting;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
 public interface MeetingRepository extends Repository<Meeting, Long> {
     Optional<Meeting> findById(final Long id);
 
     Meeting save(final Meeting meeting);
+
+    void saveAndFlush(final Meeting meeting);
+
+    @EntityGraph(attributePaths = {"host"})
+    @Query("select m from Meeting m where m.id = :id")
+    Optional<Meeting> findByIdWithHost(@Param("id") final Long id);
 }
diff --git a/src/main/java/com/asap/server/repository/PreferTimeRepository.java b/src/main/java/com/asap/server/repository/PreferTimeRepository.java
@@ -2,10 +2,7 @@
 
 import com.asap.server.domain.Meeting;
 import com.asap.server.domain.PreferTime;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -14,9 +11,4 @@ public interface PreferTimeRepository extends Repository<PreferTime, Long> {
     PreferTime save(final PreferTime preferTime);
 
     List<PreferTime> findByMeeting(final Meeting meeting);
-
-
-    @Modifying(clearAutomatically = true)
-    @Query("delete from PreferTime p where p.meeting = :meeting")
-    void deleteByMeeting(@Param("meeting") final Meeting meeting);
 }
diff --git a/src/main/java/com/asap/server/repository/TimeBlockRepository.java b/src/main/java/com/asap/server/repository/TimeBlockRepository.java
@@ -3,10 +3,7 @@
 import com.asap.server.domain.AvailableDate;
 import com.asap.server.domain.TimeBlock;
 import com.asap.server.domain.enums.TimeSlot;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -18,10 +15,4 @@ public interface TimeBlockRepository extends Repository<TimeBlock, Long> {
     List<TimeBlock> findByAvailableDate(final AvailableDate availableDate);
 
     Optional<TimeBlock> findByAvailableDateAndTimeSlot(final AvailableDate availableDate, TimeSlot timeSlot);
-
-    List<TimeBlock> findByAvailableDateIn(final List<AvailableDate> availableDates);
-
-    @Modifying(clearAutomatically = true)
-    @Query("delete from TimeBlock t where t.availableDate in :availableDates")
-    void deleteByAvailableDatesIn(@Param("availableDates") final List<AvailableDate> availableDates);
 }
diff --git a/src/main/java/com/asap/server/repository/TimeBlockUserRepository.java b/src/main/java/com/asap/server/repository/TimeBlockUserRepository.java
@@ -17,8 +17,4 @@ public interface TimeBlockUserRepository extends Repository<TimeBlockUser, Long>
     List<TimeBlockUser> findAllByUser(final User user);
 
     List<TimeBlockUser> findByTimeBlock(final TimeBlock timeBlock);
-
-    @Modifying(clearAutomatically = true)
-    @Query("delete from TimeBlockUser t where t.timeBlock in :timeblocks")
-    void deleteByTimeBlocksIn(@Param("timeblocks") final List<TimeBlock> timeBlocks);
 }
diff --git a/src/main/java/com/asap/server/service/AvailableDateService.java b/src/main/java/com/asap/server/service/AvailableDateService.java
@@ -6,7 +6,6 @@
 import com.asap.server.controller.dto.response.TimeSlotDto;
 import com.asap.server.domain.AvailableDate;
 import com.asap.server.domain.Meeting;
-import com.asap.server.domain.TimeBlock;
 import com.asap.server.exception.Error;
 import com.asap.server.exception.model.BadRequestException;
 import com.asap.server.exception.model.NotFoundException;
@@ -115,13 +114,4 @@ public void create(final Meeting meeting, final List<String> availableDates) {
     private boolean isDuplicatedDate(final List<String> availableDates) {
         return availableDates.size() != availableDates.stream().distinct().count();
     }
-
-    public void deleteUserTimes(final Meeting meeting) {
-        List<AvailableDate> availableDates = availableDateRepository.findByMeeting(meeting);
-        List<TimeBlock> timeBlocks = timeBlockService.findByAvailableDateIn(availableDates);
-
-        timeBlockUserService.deleteTimeBlockUsers(timeBlocks);
-        timeBlockService.deleteTimeBlocks(availableDates);
-        availableDateRepository.deleteByMeeting(meeting);
-    }
 }
diff --git a/src/main/java/com/asap/server/service/MeetingService.java b/src/main/java/com/asap/server/service/MeetingService.java
@@ -96,10 +96,6 @@ public void confirmMeeting(
         if (!meeting.authenticateHost(userId))
             throw new UnauthorizedException(INVALID_MEETING_HOST_EXCEPTION);
 
-        userService.setFixedUsers(meeting, meetingConfirmRequestDto.getUsers());
-
-        deleteMeetingTimes(meeting);
-
         LocalDate fixedDate = DateUtil.transformLocalDate(meetingConfirmRequestDto.getMonth(), meetingConfirmRequestDto.getDay());
         LocalTime startTime = DateUtil.parseLocalTime(meetingConfirmRequestDto.getStartTime().getTime());
         LocalTime endTime = DateUtil.parseLocalTime(meetingConfirmRequestDto.getEndTime().getTime());
@@ -108,12 +104,9 @@ public void confirmMeeting(
         LocalDateTime fixedEndDateTime = LocalDateTime.of(fixedDate, endTime);
         meeting.setConfirmedDateTime(fixedStartDateTime, fixedEndDateTime);
 
-        meetingRepository.save(meeting);
-    }
+        meetingRepository.saveAndFlush(meeting);
 
-    private void deleteMeetingTimes(final Meeting meeting) {
-        availableDateService.deleteUserTimes(meeting);
-        preferTimeService.deletePreferTimes(meeting);
+        userService.setFixedUsers(meeting, meetingConfirmRequestDto.getUsers());
     }
 
     @Transactional(readOnly = true)

diff --git a/src/main/java/com/asap/server/service/PreferTimeService.java b/src/main/java/com/asap/server/service/PreferTimeService.java
@@ -48,10 +48,6 @@ public List<PreferTimeResponseDto> getPreferTimes(final Meeting meeting) {
                 .collect(Collectors.toList());
     }
 
-    public void deletePreferTimes(final Meeting meeting) {
-        preferTimeRepository.deleteByMeeting(meeting);
-    }
-
     private boolean isPreferTimeDuplicated(List<PreferTimeSaveRequestDto> requestDtos) {
         List<TimeSlot> timeSlots = requestDtos.stream()
                 .flatMap(requestDto -> TimeSlot.getTimeSlots(requestDto.getStartTime().ordinal(), requestDto.getEndTime().ordinal() - 1).stream())

diff --git a/src/main/java/com/asap/server/service/TimeBlockService.java b/src/main/java/com/asap/server/service/TimeBlockService.java
@@ -51,12 +51,4 @@ private TimeBlock create(final TimeSlot timeSlot, final AvailableDate availableD
     public List<TimeBlock> getTimeBlocksByAvailableDate(final AvailableDate availableDate) {
         return timeBlockRepository.findByAvailableDate(availableDate);
     }
-
-    public List<TimeBlock> findByAvailableDateIn(final List<AvailableDate> availableDates) {
-        return timeBlockRepository.findByAvailableDateIn(availableDates);
-    }
-
-    public void deleteTimeBlocks(final List<AvailableDate> availableDates) {
-        timeBlockRepository.deleteByAvailableDatesIn(availableDates);
-    }
 }
diff --git a/src/main/java/com/asap/server/service/TimeBlockUserService.java b/src/main/java/com/asap/server/service/TimeBlockUserService.java
@@ -48,8 +48,4 @@ public boolean isEmptyHostTimeBlock(final User user) {
         return hostTimeBlocks.isEmpty();
     }
 
-    public void deleteTimeBlockUsers(final List<TimeBlock> timeBlocks) {
-        timeBlockUserRepository.deleteByTimeBlocksIn(timeBlocks);
-    }
-
 }
diff --git a/src/main/java/com/asap/server/service/UserService.java b/src/main/java/com/asap/server/service/UserService.java
@@ -156,7 +156,7 @@ public HostLoginResponseDto loginByHost(
             final Long meetingId,
             final HostLoginRequestDto requestDto
     ) {
-        Meeting meeting = meetingRepository.findById(meetingId)
+        Meeting meeting = meetingRepository.findByIdWithHost(meetingId)
                 .orElseThrow(() -> new NotFoundException(Error.MEETING_NOT_FOUND_EXCEPTION));
 
         if (!meeting.checkHostName(requestDto.getName()))