From 983762e5976538d76467c34a6dde7b28aa865f06 Mon Sep 17 00:00:00 2001 From: aiaiaiai1 Date: Thu, 19 Oct 2023 02:09:21 +0900 Subject: [PATCH 1/7] =?UTF-8?q?refactor:=20(#767)=20=EB=A6=AC=ED=8C=8C?= =?UTF-8?q?=EC=A7=80=ED=84=B0=EB=A6=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ReportActionAlarmRepository.java | 2 +- .../domain/alarm/service/AlarmQueryService.java | 9 ++------- .../ReportActionAlarmRepositoryTest.java | 16 +++++++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java b/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java index abe814924..f1e78062a 100644 --- a/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java +++ b/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java @@ -9,7 +9,7 @@ public interface ReportActionAlarmRepository extends JpaRepository { - List findByMember(final Member member, final Pageable pageable); + List findByMemberOrderByCreatedAtDesc(final Member member, final Pageable pageable); Optional findByIdAndMember(final Long Id, final Member member); diff --git a/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java b/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java index 2cb9b85a0..c907ed482 100644 --- a/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java +++ b/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java @@ -15,7 +15,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; -import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -55,13 +54,9 @@ private String makeNicknameBy(final Alarm alarm) { } public List getReportActionAlarms(final Member member, final int page) { - final PageRequest pageRequest = PageRequest.of( - page, - BASIC_PAGE_SIZE, - Sort.by(Sort.Direction.DESC, "createdAt") - ); + final PageRequest pageRequest = PageRequest.of(page, BASIC_PAGE_SIZE); final List reportActionAlarms = reportActionAlarmRepository - .findByMember(member, pageRequest); + .findByMemberOrderByCreatedAtDesc(member, pageRequest); return reportActionAlarms.stream() .map(ReportActionAlarmResponse::from) diff --git a/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java b/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java index c26e394b9..f15f45935 100644 --- a/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java +++ b/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java @@ -12,7 +12,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; class ReportActionAlarmRepositoryTest extends RepositoryTest { @@ -54,8 +53,9 @@ void getInLatestOrder() { reportActionAlarmRepository.save(reportActionAlarmC); // when - PageRequest pageRequest = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createdAt")); - List reportActionAlarms = reportActionAlarmRepository.findByMember(member, pageRequest); + PageRequest pageRequest = PageRequest.of(0, 10); + List reportActionAlarms = reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc( + member, pageRequest); // then assertAll( @@ -87,11 +87,13 @@ void getWithTen() { } // when - PageRequest pageRequestA = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createdAt")); - List reportActionAlarmsA = reportActionAlarmRepository.findByMember(member, pageRequestA); + PageRequest pageRequestA = PageRequest.of(0, 10); + List reportActionAlarmsA = reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc( + member, pageRequestA); - PageRequest pageRequestB = PageRequest.of(1, 10, Sort.by(Sort.Direction.DESC, "createdAt")); - List reportActionAlarmsB = reportActionAlarmRepository.findByMember(member, pageRequestB); + PageRequest pageRequestB = PageRequest.of(1, 10); + List reportActionAlarmsB = reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc( + member, pageRequestB); // then assertAll( From d3a29daf2e263452cf2bb392b5b89a918d95b9e5 Mon Sep 17 00:00:00 2001 From: aiaiaiai1 Date: Thu, 19 Oct 2023 02:09:43 +0900 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20(#767)=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EA=B0=80=EB=8F=85=EC=84=B1=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/alarm/controller/AlarmQueryControllerTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/src/test/java/com/votogether/domain/alarm/controller/AlarmQueryControllerTest.java b/backend/src/test/java/com/votogether/domain/alarm/controller/AlarmQueryControllerTest.java index becdb7049..c647b016b 100644 --- a/backend/src/test/java/com/votogether/domain/alarm/controller/AlarmQueryControllerTest.java +++ b/backend/src/test/java/com/votogether/domain/alarm/controller/AlarmQueryControllerTest.java @@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -90,12 +89,14 @@ void getReportAlarmActions() { // when List results = RestAssuredMockMvc + .given().log().all() + .queryParam("page", 0) .when().get("/alarms/report?page=0") .then().log().all() .status(HttpStatus.OK) .extract() - .as(new ParameterizedTypeReference>() { - }.getType()); + .as(new TypeRef<>() { + }); // then assertThat(results.get(0)).isEqualTo(response); @@ -117,6 +118,7 @@ void getReportAlarmAction() { // when ReportActionResponse result = RestAssuredMockMvc + .given().log().all() .when().get("/alarms/report/{id}", 1) .then().log().all() .status(HttpStatus.OK) From ba0b65ce4e1f27392690359f2813a279d86e7bcc Mon Sep 17 00:00:00 2001 From: aiaiaiai1 Date: Thu, 19 Oct 2023 02:31:08 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20(#767)=20=ED=9A=8C=EC=9B=90=ED=83=88?= =?UTF-8?q?=ED=87=B4=EC=8B=9C=20=ED=9A=8C=EC=9B=90=EC=9D=B4=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=ED=95=9C=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD,=20?= =?UTF-8?q?=EC=8B=A0=EA=B3=A0=EC=A1=B0=EC=B9=98=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportActionAlarmRepository.java | 2 + .../domain/member/service/MemberService.java | 24 ++++++++ .../notice/repository/NoticeRepository.java | 3 + .../member/service/MemberServiceTest.java | 59 +++++++++++++++++++ 4 files changed, 88 insertions(+) diff --git a/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java b/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java index f1e78062a..cb813f55a 100644 --- a/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java +++ b/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java @@ -13,4 +13,6 @@ public interface ReportActionAlarmRepository extends JpaRepository findByIdAndMember(final Long Id, final Member member); + List findAllByMember(final Member member); + } diff --git a/backend/src/main/java/com/votogether/domain/member/service/MemberService.java b/backend/src/main/java/com/votogether/domain/member/service/MemberService.java index 81d6dad7d..f244dbf6d 100644 --- a/backend/src/main/java/com/votogether/domain/member/service/MemberService.java +++ b/backend/src/main/java/com/votogether/domain/member/service/MemberService.java @@ -1,7 +1,9 @@ package com.votogether.domain.member.service; import com.votogether.domain.alarm.entity.Alarm; +import com.votogether.domain.alarm.entity.ReportActionAlarm; import com.votogether.domain.alarm.repository.AlarmRepository; +import com.votogether.domain.alarm.repository.ReportActionAlarmRepository; import com.votogether.domain.member.dto.request.MemberDetailRequest; import com.votogether.domain.member.dto.response.MemberInfoResponse; import com.votogether.domain.member.entity.Member; @@ -12,6 +14,8 @@ import com.votogether.domain.member.repository.MemberCategoryRepository; import com.votogether.domain.member.repository.MemberMetricRepository; import com.votogether.domain.member.repository.MemberRepository; +import com.votogether.domain.notice.entity.Notice; +import com.votogether.domain.notice.repository.NoticeRepository; import com.votogether.domain.post.entity.Post; import com.votogether.domain.post.entity.comment.Comment; import com.votogether.domain.post.repository.CommentRepository; @@ -43,6 +47,8 @@ public class MemberService { private final ReportRepository reportRepository; private final CommentRepository commentRepository; private final AlarmRepository alarmRepository; + private final ReportActionAlarmRepository reportActionAlarmRepository; + private final NoticeRepository noticeRepository; @Transactional public Member register(final Member member) { @@ -120,6 +126,8 @@ public void deleteMember(final Member member) { deleteMemberCategories(member); deleteReports(member, posts, comments); deleteAlarms(member); + deleteReportActionAlarms(member); + deleteNotices(member); memberMetricRepository.deleteByMember(member); memberRepository.delete(member); @@ -216,4 +224,20 @@ private void deleteAlarms(final Member member) { alarmRepository.deleteAllById(alarmIds); } + private void deleteReportActionAlarms(final Member member) { + final List reportActionAlarmIds = reportActionAlarmRepository.findAllByMember(member) + .stream() + .map(ReportActionAlarm::getId) + .toList(); + reportActionAlarmRepository.deleteAllById(reportActionAlarmIds); + } + + private void deleteNotices(final Member member) { + final List noticeIds = noticeRepository.findAllByMember(member) + .stream() + .map(Notice::getId) + .toList(); + noticeRepository.deleteAllById(noticeIds); + } + } diff --git a/backend/src/main/java/com/votogether/domain/notice/repository/NoticeRepository.java b/backend/src/main/java/com/votogether/domain/notice/repository/NoticeRepository.java index 1bd9f4b55..7dcdc246c 100644 --- a/backend/src/main/java/com/votogether/domain/notice/repository/NoticeRepository.java +++ b/backend/src/main/java/com/votogether/domain/notice/repository/NoticeRepository.java @@ -1,5 +1,6 @@ package com.votogether.domain.notice.repository; +import com.votogether.domain.member.entity.Member; import com.votogether.domain.notice.entity.Notice; import java.time.LocalDateTime; import java.util.List; @@ -13,4 +14,6 @@ public interface NoticeRepository extends JpaRepository { List findAllByOrderByIdDesc(final Pageable pageable); + List findAllByMember(final Member member); + } diff --git a/backend/src/test/java/com/votogether/domain/member/service/MemberServiceTest.java b/backend/src/test/java/com/votogether/domain/member/service/MemberServiceTest.java index 267bd961f..64d0ac694 100644 --- a/backend/src/test/java/com/votogether/domain/member/service/MemberServiceTest.java +++ b/backend/src/test/java/com/votogether/domain/member/service/MemberServiceTest.java @@ -5,6 +5,8 @@ import static org.assertj.core.api.SoftAssertions.assertSoftly; import static org.junit.jupiter.api.Assertions.assertAll; +import com.votogether.domain.alarm.entity.ReportActionAlarm; +import com.votogether.domain.alarm.repository.ReportActionAlarmRepository; import com.votogether.domain.category.entity.Category; import com.votogether.domain.category.repository.CategoryRepository; import com.votogether.domain.member.dto.request.MemberDetailRequest; @@ -16,6 +18,8 @@ import com.votogether.domain.member.repository.MemberCategoryRepository; import com.votogether.domain.member.repository.MemberMetricRepository; import com.votogether.domain.member.repository.MemberRepository; +import com.votogether.domain.notice.entity.Notice; +import com.votogether.domain.notice.repository.NoticeRepository; import com.votogether.domain.post.entity.Post; import com.votogether.domain.post.entity.comment.Comment; import com.votogether.domain.post.repository.CommentRepository; @@ -67,6 +71,12 @@ class MemberServiceTest extends ServiceTest { @Autowired PostTestPersister postTestPersister; + @Autowired + ReportActionAlarmRepository reportActionAlarmRepository; + + @Autowired + NoticeRepository noticeRepository; + @Autowired EntityManager em; @@ -481,6 +491,55 @@ void deleteWithReportedNickname() { ); } + @Test + @DisplayName("회원과 신고조치알림 모두 삭제된다.") + void deleteWithReportActionAlarms() { + // given + Member member = memberRepository.save(MemberFixtures.MALE_20.get()); + + ReportActionAlarm reportActionAlarm = ReportActionAlarm.builder() + .reportType(ReportType.POST) + .member(member) + .isChecked(false) + .target("1") + .reasons("광고성, 부적합성") + .build(); + reportActionAlarmRepository.save(reportActionAlarm); + + // when + memberService.deleteMember(member); + + // then + assertAll( + () -> assertThat(memberRepository.findAll()).isEmpty(), + () -> assertThat(reportActionAlarmRepository.findAll()).isEmpty() + ); + } + + @Test + @DisplayName("회원과 작성한 공지사항 모두 삭제된다.") + void deleteWithNotices() { + // given + Member member = memberRepository.save(MemberFixtures.MALE_20.get()); + + Notice notice = Notice.builder() + .member(member) + .title("title") + .content("content") + .deadline(LocalDateTime.now().plusDays(1)) + .build(); + noticeRepository.save(notice); + + // when + memberService.deleteMember(member); + + // then + assertAll( + () -> assertThat(memberRepository.findAll()).isEmpty(), + () -> assertThat(noticeRepository.findAll()).isEmpty() + ); + } + } } From 8bb0a9cc0ebb4f5a11cad212339d2da53e30d0c7 Mon Sep 17 00:00:00 2001 From: aiaiaiai1 Date: Thu, 19 Oct 2023 02:37:14 +0900 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20(#767)=20=EC=BB=A4=EB=84=A5?= =?UTF-8?q?=EC=85=98=ED=92=80=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 1cd6a6613..e87e9a6d1 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -4,6 +4,10 @@ spring: url: ${DATASOURCE_URL} username: ${DATASOURCE_USERNAME} password: ${DATASOURCE_PASSWORD} + hikari: + maximumPoolSize: ${MAXIMUM_POOL_SIZE} + connectionTimeout: ${CONNECTION_TIMEOUT} + maxLifetime: ${MAX_LIFETIME} jpa: database-platform: org.hibernate.dialect.MySQLDialect From 2abc0a6017d162e6bdbb92bdd890f5223ddb35cb Mon Sep 17 00:00:00 2001 From: aiaiaiai1 Date: Thu, 19 Oct 2023 11:31:25 +0900 Subject: [PATCH 5/7] =?UTF-8?q?refactor:=20(#767)=20=EA=B0=80=EB=8F=85?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportActionAlarmRepositoryTest.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java b/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java index f15f45935..a096f8f3b 100644 --- a/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java +++ b/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java @@ -1,7 +1,6 @@ package com.votogether.domain.alarm.repository; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertAll; +import static org.assertj.core.api.SoftAssertions.assertSoftly; import com.votogether.domain.alarm.entity.ReportActionAlarm; import com.votogether.domain.member.entity.Member; @@ -23,7 +22,7 @@ class ReportActionAlarmRepositoryTest extends RepositoryTest { void getInLatestOrder() { // given Member member = memberTestPersister.builder().save(); - + ReportActionAlarm reportActionAlarmA = ReportActionAlarm.builder() .reportType(ReportType.POST) .member(member) @@ -54,19 +53,19 @@ void getInLatestOrder() { // when PageRequest pageRequest = PageRequest.of(0, 10); - List reportActionAlarms = reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc( - member, pageRequest); + List reportActionAlarms = reportActionAlarmRepository + .findByMemberOrderByCreatedAtDesc(member, pageRequest); // then - assertAll( - () -> assertThat(reportActionAlarms).hasSize(3), - () -> assertThat(reportActionAlarms.get(0).getReportType()).isEqualTo( - reportActionAlarmC.getReportType()), - () -> assertThat(reportActionAlarms.get(1).getReportType()).isEqualTo( - reportActionAlarmB.getReportType()), - () -> assertThat(reportActionAlarms.get(2).getReportType()).isEqualTo( - reportActionAlarmA.getReportType()) - ); + assertSoftly(softly -> { + softly.assertThat(reportActionAlarms).hasSize(3); + softly.assertThat(reportActionAlarms.get(0).getReportType()).isEqualTo( + reportActionAlarmC.getReportType()); + softly.assertThat(reportActionAlarms.get(1).getReportType()).isEqualTo( + reportActionAlarmB.getReportType()); + softly.assertThat(reportActionAlarms.get(2).getReportType()).isEqualTo( + reportActionAlarmA.getReportType()); + }); } @Test @@ -88,17 +87,18 @@ void getWithTen() { // when PageRequest pageRequestA = PageRequest.of(0, 10); - List reportActionAlarmsA = reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc( - member, pageRequestA); + List reportActionAlarmsA = reportActionAlarmRepository + .findByMemberOrderByCreatedAtDesc(member, pageRequestA); PageRequest pageRequestB = PageRequest.of(1, 10); - List reportActionAlarmsB = reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc( - member, pageRequestB); + List reportActionAlarmsB = reportActionAlarmRepository + .findByMemberOrderByCreatedAtDesc(member, pageRequestB); // then - assertAll( - () -> assertThat(reportActionAlarmsA).hasSize(10), - () -> assertThat(reportActionAlarmsB).hasSize(1) + assertSoftly(softly -> { + softly.assertThat(reportActionAlarmsA).hasSize(10); + softly.assertThat(reportActionAlarmsB).hasSize(1); + } ); } From 21de2720860bf3ed2ba7543f866d45574ebeec1d Mon Sep 17 00:00:00 2001 From: aiaiaiai1 Date: Thu, 19 Oct 2023 11:58:20 +0900 Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20(#767)=20id=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=ED=95=B4=EC=84=9C=20=EA=B0=80=EC=A0=B8?= =?UTF-8?q?=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarm/repository/ReportActionAlarmRepository.java | 2 +- .../domain/alarm/service/AlarmQueryService.java | 2 +- .../alarm/repository/ReportActionAlarmRepositoryTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java b/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java index cb813f55a..4b43c3948 100644 --- a/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java +++ b/backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java @@ -9,7 +9,7 @@ public interface ReportActionAlarmRepository extends JpaRepository { - List findByMemberOrderByCreatedAtDesc(final Member member, final Pageable pageable); + List findByMemberOrderByIdDesc(final Member member, final Pageable pageable); Optional findByIdAndMember(final Long Id, final Member member); diff --git a/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java b/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java index c907ed482..edf38c20b 100644 --- a/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java +++ b/backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java @@ -56,7 +56,7 @@ private String makeNicknameBy(final Alarm alarm) { public List getReportActionAlarms(final Member member, final int page) { final PageRequest pageRequest = PageRequest.of(page, BASIC_PAGE_SIZE); final List reportActionAlarms = reportActionAlarmRepository - .findByMemberOrderByCreatedAtDesc(member, pageRequest); + .findByMemberOrderByIdDesc(member, pageRequest); return reportActionAlarms.stream() .map(ReportActionAlarmResponse::from) diff --git a/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java b/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java index a096f8f3b..cc2cf6d8b 100644 --- a/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java +++ b/backend/src/test/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepositoryTest.java @@ -22,7 +22,7 @@ class ReportActionAlarmRepositoryTest extends RepositoryTest { void getInLatestOrder() { // given Member member = memberTestPersister.builder().save(); - + ReportActionAlarm reportActionAlarmA = ReportActionAlarm.builder() .reportType(ReportType.POST) .member(member) @@ -54,7 +54,7 @@ void getInLatestOrder() { // when PageRequest pageRequest = PageRequest.of(0, 10); List reportActionAlarms = reportActionAlarmRepository - .findByMemberOrderByCreatedAtDesc(member, pageRequest); + .findByMemberOrderByIdDesc(member, pageRequest); // then assertSoftly(softly -> { @@ -88,11 +88,11 @@ void getWithTen() { // when PageRequest pageRequestA = PageRequest.of(0, 10); List reportActionAlarmsA = reportActionAlarmRepository - .findByMemberOrderByCreatedAtDesc(member, pageRequestA); + .findByMemberOrderByIdDesc(member, pageRequestA); PageRequest pageRequestB = PageRequest.of(1, 10); List reportActionAlarmsB = reportActionAlarmRepository - .findByMemberOrderByCreatedAtDesc(member, pageRequestB); + .findByMemberOrderByIdDesc(member, pageRequestB); // then assertSoftly(softly -> { From f1aa59eee940f4d054ddcd37020973ff0fb80b51 Mon Sep 17 00:00:00 2001 From: aiaiaiai1 Date: Thu, 19 Oct 2023 12:02:39 +0900 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20(#767)=20test=20yml=20=EC=9E=84?= =?UTF-8?q?=EC=9D=98=EC=9D=98=EA=B0=92=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/test/resources/application.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/test/resources/application.yml b/backend/src/test/resources/application.yml index 16f7bfb53..6bc5d992f 100644 --- a/backend/src/test/resources/application.yml +++ b/backend/src/test/resources/application.yml @@ -45,6 +45,10 @@ server: max-connections: 8192 threads: max: 200 + hikari: + maximumPoolSize: 10 + connectionTimeout: 30000 + maxLifetime: 180000 springdoc: swagger-ui: