Merge pull request #184 from swyp3-babpool/fix/possibledatetime

fix(possibledatetime): 일정 추가/삭제 쿼리 수정
swyp3-babpool · Aug 4, 2024 · cee0fee · cee0fee
2 parents d2f8b28 + 39b7182
commit cee0fee
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 13 deletions.
diff --git a/.github/workflows/github-actions-server.yaml b/.github/workflows/github-actions-server.yaml
@@ -1,4 +1,4 @@
-name: Spring Boot Gradle CICD (version 0.2.3)
+name: Spring Boot Gradle CICD (version 0.2.4)
 
 on:
   push:

diff --git a/...va/com/swyp3/babpool/domain/possibledatetime/application/PossibleDateTimeServiceImpl.java b/...va/com/swyp3/babpool/domain/possibledatetime/application/PossibleDateTimeServiceImpl.java
@@ -52,14 +52,13 @@ public boolean changeStatusAsReserved(Long possibleDateTimeId) {
 
     @Override
     public List<PossibleDateTimeResponse> updatePossibleDateTime(Long userId, PossibleDateTimeUpdateRequest possibleDateTimeUpdateRequest) {
-
-        // 일정 제거 : possibleDateTimeStatus 가 RESERVED 인 경우는 제외하고 삭제
+        // 일정 제거
         if(!possibleDateTimeUpdateRequest.getPossibleDateTimeDelList().isEmpty()) {
             possibleDateTimeRepository.deletePossibleDateTimeWhereStatusIsNotReserved(userId, possibleDateTimeUpdateRequest.getPossibleDateTimeDelList());
         }
-        // 추가
+        // 일정 추가
         if(!possibleDateTimeUpdateRequest.getPossibleDateTimeAddList().isEmpty()) {
-            possibleDateTimeRepository.savePossibleDateTimeList(possibleDateTimeUpdateRequest.getPossibleDateTimeAddList().stream()
+            possibleDateTimeRepository.savePossibleDateTimeListWhereNotExist(possibleDateTimeUpdateRequest.getPossibleDateTimeAddList().stream()
                     .map(datetime -> PossibleDateTime.builder().possibleDateTimeId(tsidKeyGenerator.generateTsid())
                             .userId(userId)
                             .possibleDateTime(datetime)

diff --git a/src/main/java/com/swyp3/babpool/domain/possibledatetime/dao/PossibleDateTimeRepository.java b/src/main/java/com/swyp3/babpool/domain/possibledatetime/dao/PossibleDateTimeRepository.java
@@ -40,6 +40,8 @@ public interface PossibleDateTimeRepository {
     // 테스트 코드 작성 완료
     void savePossibleDateTimeList(List<PossibleDateTime> possibleDateTimeList);
 
+    // 테스트 코드 작성 완료
+    void savePossibleDateTimeListWhereNotExist(List<PossibleDateTime> possibleDateTimeList);
 
     @Deprecated
     List<PossibleDateAndTime> findAllPossibleDateAndTimeByProfileIdAndNowDateWithoutAcceptOrDone(Long profileId);

diff --git a/src/main/resources/mapper/PossibleDateTimeMapper.xml b/src/main/resources/mapper/PossibleDateTimeMapper.xml
@@ -131,6 +131,26 @@
         </foreach>
     </insert>
 
+    <insert id="savePossibleDateTimeListWhereNotExist">
+        INSERT INTO t_possible_datetime (possible_datetime_id, possible_datetime, possible_datetime_status, user_id)
+        SELECT possibleDateTimeId, possibleDateTime, possibleDateTimeStatus, userId
+        FROM (
+        <foreach collection="possibleDateTimeList" item="possibleDateTime" separator=" UNION ALL ">
+            SELECT CAST(#{possibleDateTime.possibleDateTimeId} AS BIGINT) AS possibleDateTimeId,
+            CAST(#{possibleDateTime.possibleDateTime} AS TIMESTAMP) AS possibleDateTime,
+            CAST(#{possibleDateTime.possibleDateTimeStatus} AS VARCHAR) AS possibleDateTimeStatus,
+            CAST(#{possibleDateTime.userId} AS BIGINT) AS userId
+        </foreach>
+        ) AS new_values
+        WHERE NOT EXISTS (
+        SELECT 1
+        FROM t_possible_datetime
+        WHERE user_id = new_values.userId
+        AND possible_datetime = new_values.possibleDateTime
+        );
+    </insert>
+
+
     <insert id="insertPossibleDate" parameterType="com.swyp3.babpool.domain.possibledatetime.domain.PossibleDateInsertDto"
             useGeneratedKeys="true" keyProperty="possibleDateId">
         INSERT INTO t_possible_datetime(possible_date,profile_id)
@@ -177,14 +197,17 @@
             <when test="possibleDateTimeDelList != null and possibleDateTimeDelList.size() != 0">
                 DELETE FROM t_possible_datetime
                 WHERE possible_datetime_id IN (
-                    SELECT possible_datetime_id
-                    FROM t_possible_datetime
-                    WHERE user_id = #{userId}
-                    AND possible_datetime_status != 'RESERVED'
-                    AND possible_datetime IN
-                    <foreach collection="possibleDateTimeDelList" item="possibleDateTime" open="(" close=")" separator=",">
-                        #{possibleDateTime}
-                    </foreach>
+                    SELECT temp.possible_datetime_id
+                    FROM (
+                        SELECT possible_datetime_id
+                        FROM t_possible_datetime
+                        WHERE user_id = #{userId}
+                        AND possible_datetime_status != 'RESERVED'
+                        AND possible_datetime IN
+                        <foreach collection="possibleDateTimeDelList" item="possibleDateTime" open="(" close=")" separator=",">
+                            #{possibleDateTime}
+                        </foreach>
+                    ) AS temp
                 )
             </when>
         </choose>

diff --git a/...st/java/com/swyp3/babpool/domain/possibledatetime/dao/PossibleDateTimeRepositoryTest.java b/...st/java/com/swyp3/babpool/domain/possibledatetime/dao/PossibleDateTimeRepositoryTest.java
@@ -73,6 +73,44 @@ void deletePossibleDateTimeWhereStatusIsNotReservedWithEmptyList(){
         assertThat(possibleDateTimeList).hasSize(9);
     }
 
+    @DisplayName("deletePossibleDateTimeWhereStatusIsNotReserved 매퍼는 possibleDateTimeDelList에 존재하지 않는 일정이 존재하면 무시하고 정상동작한다.")
+    @Test
+    void deletePossibleDateTimeWhereStatusIsNotReservedWithNotExistDateTime(){
+        // given
+        Long userId = 100000000000000009L;
+        List<LocalDateTime> possibleDateTimeAddList = List.of(
+                LocalDateTime.of(2024, 7, 6, 11, 0),
+                LocalDateTime.of(2024, 7, 6, 12, 0),
+                LocalDateTime.of(2024, 7, 6, 8, 0)
+        );
+        possibleDateTimeRepository.savePossibleDateTimeList(possibleDateTimeAddList.stream()
+                .map(dateTime -> PossibleDateTime.builder()
+                        .possibleDateTimeId(tsidKeyGenerator.generateTsid())
+                        .userId(userId)
+                        .possibleDateTime(dateTime)
+                        .possibleDateTimeStatus(PossibleDateTimeStatusType.AVAILABLE)
+                        .build())
+                .toList()
+        );
+        List<LocalDateTime> possibleDateTimeDelList = List.of(
+                LocalDateTime.of(2024, 7, 6, 11, 0),
+                LocalDateTime.of(2024, 7, 6, 9, 0),
+                LocalDateTime.of(2024, 7, 6, 10, 0)
+        );
+
+        // when
+        possibleDateTimeRepository.deletePossibleDateTimeWhereStatusIsNotReserved(userId, possibleDateTimeDelList);
+
+        // then
+        List<PossibleDateTime> possibleDateTimeList = possibleDateTimeRepository.findAllByUserId(userId);
+        log.info("possibleDateTimeList : {}", possibleDateTimeList);
+        assertThat(possibleDateTimeList).hasSize(2);
+        assertThat(possibleDateTimeList).extracting(PossibleDateTime::getPossibleDateTime)
+                .containsAll(List.of(LocalDateTime.of(2024, 7, 6, 12, 0),
+                        LocalDateTime.of(2024, 7, 6, 8, 0))
+                );
+    }
+
     @DisplayName("savePossibleDateTime 매퍼는 1개 이상의 PossibleDateTime 를 저장한다.")
     @Test
     void savePossibleDateTime(){
@@ -98,6 +136,47 @@ void savePossibleDateTime(){
         assertThat(allByUserId).hasSize(2);
     }
 
+    @DisplayName("savePossibleDateTimeListWhereNotExist 매퍼는 중복되는 일정이 존재하지 않는 경우에만 일정을 저장한다.")
+    @Test
+    void savePossibleDateTimeListWhereNotExist(){
+        // given
+        Long userId = 100000000000000009L;
+        List<LocalDateTime> possibleDateTimeAddList1 = List.of(
+                LocalDateTime.of(2024, 7, 6, 11, 0),
+                LocalDateTime.of(2024, 7, 6, 12, 0)
+        );
+        possibleDateTimeRepository.savePossibleDateTimeList(possibleDateTimeAddList1.stream()
+                .map(dateTime -> PossibleDateTime.builder()
+                        .possibleDateTimeId(tsidKeyGenerator.generateTsid())
+                        .userId(userId)
+                        .possibleDateTime(dateTime)
+                        .possibleDateTimeStatus(PossibleDateTimeStatusType.AVAILABLE)
+                        .build())
+                .toList());
+
+        List<LocalDateTime> possibleDateTimeAddList2 = List.of(
+                LocalDateTime.of(2024, 7, 6, 11, 0),
+                LocalDateTime.of(2024, 7, 6, 12, 0),
+                LocalDateTime.of(2024, 7, 6, 13, 0)
+        );
+
+        // when
+        possibleDateTimeRepository.savePossibleDateTimeListWhereNotExist(possibleDateTimeAddList2.stream()
+                .map(dateTime -> PossibleDateTime.builder()
+                        .possibleDateTimeId(tsidKeyGenerator.generateTsid())
+                        .userId(userId)
+                        .possibleDateTime(dateTime)
+                        .possibleDateTimeStatus(PossibleDateTimeStatusType.AVAILABLE)
+                        .build())
+                .toList()
+        );
+
+        // then
+        List<PossibleDateTime> possibleDateTimeList = possibleDateTimeRepository.findAllByUserId(userId);
+        log.info("possibleDateTimeList : {}", possibleDateTimeList);
+        assertThat(possibleDateTimeList).hasSize(3);
+    }
+
     @DisplayName("findAllByUserId 매퍼는 status와 무관하게 특정 사용자의 모든 가능한 일정을 조회한다.")
     @Test
     void findAllByUserId(){