Skip to content

Commit 7085619

Browse files
OhjintaekOhjintaek
committed
refactor: RoadmapScheduler에서 goalRoom 의존성 제거 및 테스트코드 패키지 분리
1 parent 91f128b commit 7085619

37 files changed

+155
-211
lines changed

‎backend/kirikiri/src/main/java/co/kirikiri/persistence/goalroom/GoalRoomRepository.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package co.kirikiri.persistence.goalroom;
22

33
import co.kirikiri.domain.goalroom.GoalRoom;
4+
import org.springframework.data.jpa.repository.JpaRepository;
5+
46
import java.time.LocalDate;
57
import java.util.List;
68
import java.util.Optional;
7-
import org.springframework.data.jpa.repository.JpaRepository;
89

910
public interface GoalRoomRepository extends JpaRepository<GoalRoom, Long>, GoalRoomQueryRepository {
10-
11+
1112
Optional<GoalRoom> findById(final Long goalRoomId);
1213

1314
List<GoalRoom> findAllByEndDate(final LocalDate endDate);

‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/persistence/RoadmapQueryRepository.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
import co.kirikiri.roadmap.domain.Roadmap;
55
import co.kirikiri.roadmap.domain.RoadmapCategory;
66
import co.kirikiri.roadmap.domain.RoadmapStatus;
7-
import co.kirikiri.persistence.dto.RoadmapOrderType;
8-
import co.kirikiri.persistence.dto.RoadmapSearchDto;
7+
import co.kirikiri.roadmap.persistence.dto.RoadmapOrderType;
8+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchDto;
9+
910
import java.util.List;
1011
import java.util.Optional;
1112

‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/persistence/RoadmapQueryRepositoryImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import co.kirikiri.domain.member.Member;
44
import co.kirikiri.domain.member.vo.Identifier;
55
import co.kirikiri.persistence.QuerydslRepositorySupporter;
6-
import co.kirikiri.persistence.dto.RoadmapOrderType;
7-
import co.kirikiri.persistence.dto.RoadmapSearchCreatorNickname;
8-
import co.kirikiri.persistence.dto.RoadmapSearchDto;
9-
import co.kirikiri.persistence.dto.RoadmapSearchTagName;
10-
import co.kirikiri.persistence.dto.RoadmapSearchTitle;
116
import co.kirikiri.roadmap.domain.Roadmap;
127
import co.kirikiri.roadmap.domain.RoadmapCategory;
138
import co.kirikiri.roadmap.domain.RoadmapStatus;
9+
import co.kirikiri.roadmap.persistence.dto.RoadmapOrderType;
10+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchCreatorNickname;
11+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchDto;
12+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchTagName;
13+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchTitle;
1414
import com.querydsl.core.types.Order;
1515
import com.querydsl.core.types.OrderSpecifier;
1616
import com.querydsl.core.types.dsl.BooleanExpression;

‎backend/kirikiri/src/main/java/co/kirikiri/persistence/dto/RoadmapOrderType.java renamed to ‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/persistence/dto/RoadmapOrderType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.persistence.dto;
1+
package co.kirikiri.roadmap.persistence.dto;
22

33
public enum RoadmapOrderType {
44
LATEST, GOAL_ROOM_COUNT, PARTICIPANT_COUNT, REVIEW_RATE

‎backend/kirikiri/src/main/java/co/kirikiri/persistence/dto/RoadmapSearchCreatorNickname.java renamed to ‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/persistence/dto/RoadmapSearchCreatorNickname.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.persistence.dto;
1+
package co.kirikiri.roadmap.persistence.dto;
22

33
public record RoadmapSearchCreatorNickname(
44
String value

‎backend/kirikiri/src/main/java/co/kirikiri/persistence/dto/RoadmapSearchDto.java renamed to ‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/persistence/dto/RoadmapSearchDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.persistence.dto;
1+
package co.kirikiri.roadmap.persistence.dto;
22

33
import lombok.AccessLevel;
44
import lombok.AllArgsConstructor;

‎backend/kirikiri/src/main/java/co/kirikiri/persistence/dto/RoadmapSearchTagName.java renamed to ‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/persistence/dto/RoadmapSearchTagName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.persistence.dto;
1+
package co.kirikiri.roadmap.persistence.dto;
22

33
import co.kirikiri.service.exception.BadRequestException;
44

‎backend/kirikiri/src/main/java/co/kirikiri/persistence/dto/RoadmapSearchTitle.java renamed to ‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/persistence/dto/RoadmapSearchTitle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.persistence.dto;
1+
package co.kirikiri.roadmap.persistence.dto;
22

33
import co.kirikiri.service.exception.BadRequestException;
44

‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/service/RoadmapGoalRoomService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ public interface RoadmapGoalRoomService {
1616
RoadmapGoalRoomNumberDto findRoadmapGoalRoomsByRoadmap(final Roadmap roadmap);
1717

1818
RoadmapGoalRoomResponses makeRoadmapGoalRoomResponsesByOrderType(final Roadmap roadmap, final RoadmapGoalRoomsOrderTypeDto orderTypeDto, final CustomScrollRequest scrollRequest);
19+
20+
boolean canDeleteGoalRoomsInRoadmap(final Roadmap roadmap);
1921
}

‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/service/RoadmapReadService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import co.kirikiri.domain.member.Member;
44
import co.kirikiri.domain.member.vo.Identifier;
5-
import co.kirikiri.persistence.dto.RoadmapOrderType;
6-
import co.kirikiri.persistence.dto.RoadmapSearchDto;
5+
import co.kirikiri.roadmap.persistence.dto.RoadmapOrderType;
6+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchDto;
77
import co.kirikiri.persistence.member.MemberRepository;
88
import co.kirikiri.roadmap.domain.Roadmap;
99
import co.kirikiri.roadmap.domain.RoadmapCategory;

‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/service/mapper/RoadmapMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package co.kirikiri.roadmap.service.mapper;
22

33
import co.kirikiri.domain.member.Member;
4-
import co.kirikiri.persistence.dto.RoadmapOrderType;
4+
import co.kirikiri.roadmap.persistence.dto.RoadmapOrderType;
55
import co.kirikiri.roadmap.domain.Roadmap;
66
import co.kirikiri.roadmap.domain.RoadmapCategory;
77
import co.kirikiri.roadmap.service.dto.RoadmapCategoryDto;

‎backend/kirikiri/src/main/java/co/kirikiri/roadmap/service/scheduler/RoadmapScheduler.java

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package co.kirikiri.roadmap.service.scheduler;
22

3-
import co.kirikiri.domain.goalroom.GoalRoom;
4-
import co.kirikiri.persistence.goalroom.GoalRoomRepository;
53
import co.kirikiri.roadmap.domain.Roadmap;
64
import co.kirikiri.roadmap.domain.RoadmapStatus;
75
import co.kirikiri.roadmap.persistence.RoadmapRepository;
6+
import co.kirikiri.roadmap.service.RoadmapGoalRoomService;
87
import co.kirikiri.service.aop.ExceptionConvert;
98
import lombok.RequiredArgsConstructor;
109
import org.springframework.scheduling.annotation.Scheduled;
@@ -19,10 +18,8 @@
1918
@ExceptionConvert
2019
public class RoadmapScheduler {
2120

22-
private static final int DELETE_AFTER_MONTH = 3;
23-
2421
private final RoadmapRepository roadmapRepository;
25-
private final GoalRoomRepository goalRoomRepository;
22+
private final RoadmapGoalRoomService roadmapGoalRoomService;
2623

2724
@Scheduled(cron = "0 0 4 * * *")
2825
public void deleteRoadmaps() {
@@ -34,23 +31,12 @@ public void deleteRoadmaps() {
3431
}
3532

3633
private void delete(final Roadmap roadmap) {
37-
final List<GoalRoom> goalRooms = goalRoomRepository.findByRoadmap(roadmap);
38-
final boolean canDelete = canDeleteRoadmapBasedOnGoalRooms(goalRooms);
34+
final boolean canDelete = roadmapGoalRoomService.canDeleteGoalRoomsInRoadmap(roadmap);
3935
if (canDelete) {
40-
deleteGoalRooms(goalRooms);
4136
deleteRoadmap(roadmap);
4237
}
4338
}
4439

45-
private boolean canDeleteRoadmapBasedOnGoalRooms(final List<GoalRoom> goalRooms) {
46-
return goalRooms.stream()
47-
.allMatch(goalRoom -> goalRoom.isCompleted() && goalRoom.isCompletedAfterMonths(DELETE_AFTER_MONTH));
48-
}
49-
50-
private void deleteGoalRooms(final List<GoalRoom> goalRooms) {
51-
goalRoomRepository.deleteAll(goalRooms);
52-
}
53-
5440
private void deleteRoadmap(final Roadmap roadmap) {
5541
roadmapRepository.delete(roadmap);
5642
}

‎backend/kirikiri/src/main/java/co/kirikiri/service/member/RoadmapGoalRoomServiceImpl.java renamed to ‎backend/kirikiri/src/main/java/co/kirikiri/service/goalroom/RoadmapGoalRoomServiceImpl.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.service.member;
1+
package co.kirikiri.service.goalroom;
22

33
import co.kirikiri.domain.goalroom.GoalRoom;
44
import co.kirikiri.domain.goalroom.GoalRoomStatus;
@@ -35,6 +35,8 @@
3535
@ExceptionConvert
3636
public class RoadmapGoalRoomServiceImpl implements RoadmapGoalRoomService {
3737

38+
private static final int DELETE_AFTER_MONTH = 3;
39+
3840
private final GoalRoomRepository goalRoomRepository;
3941
private final GoalRoomMemberRepository goalRoomMemberRepository;
4042
private final FileService fileService;
@@ -87,4 +89,19 @@ private MemberDto makeMemberDto(final Member creator) {
8789
final URL url = fileService.generateUrl(creator.getImage().getServerFilePath(), HttpMethod.GET);
8890
return new MemberDto(creator.getId(), creator.getNickname().getValue(), url.toExternalForm());
8991
}
92+
93+
@Override
94+
public boolean canDeleteGoalRoomsInRoadmap(final Roadmap roadmap) {
95+
final List<GoalRoom> goalRooms = goalRoomRepository.findByRoadmap(roadmap);
96+
final boolean canDelete = canDeleteRoadmapBasedOnGoalRooms(goalRooms);
97+
if (canDelete) {
98+
goalRoomRepository.deleteAll(goalRooms);
99+
}
100+
return canDelete;
101+
}
102+
103+
private boolean canDeleteRoadmapBasedOnGoalRooms(final List<GoalRoom> goalRooms) {
104+
return goalRooms.stream()
105+
.allMatch(goalRoom -> goalRoom.isCompleted() && goalRoom.isCompletedAfterMonths(DELETE_AFTER_MONTH));
106+
}
90107
}

‎backend/kirikiri/src/test/java/co/kirikiri/integration/RoadmapReadIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import co.kirikiri.roadmap.domain.RoadmapCategory;
1717
import co.kirikiri.integration.helper.InitIntegrationTest;
18-
import co.kirikiri.persistence.dto.RoadmapOrderType;
18+
import co.kirikiri.roadmap.persistence.dto.RoadmapOrderType;
1919
import co.kirikiri.service.dto.ErrorResponse;
2020
import co.kirikiri.roadmap.service.dto.request.RoadmapDifficultyType;
2121
import co.kirikiri.roadmap.service.dto.request.RoadmapNodeSaveRequest;

‎backend/kirikiri/src/test/java/co/kirikiri/integration/RoadmapReadOrderIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import co.kirikiri.domain.goalroom.GoalRoom;
2222
import co.kirikiri.roadmap.domain.RoadmapCategory;
2323
import co.kirikiri.integration.helper.InitIntegrationTest;
24-
import co.kirikiri.persistence.dto.RoadmapOrderType;
24+
import co.kirikiri.roadmap.persistence.dto.RoadmapOrderType;
2525
import co.kirikiri.service.dto.goalroom.request.GoalRoomCreateRequest;
2626
import co.kirikiri.service.dto.goalroom.request.GoalRoomRoadmapNodeRequest;
2727
import co.kirikiri.service.dto.member.response.MemberInformationResponse;

‎backend/kirikiri/src/test/java/co/kirikiri/integration/fixture/RoadmapAPIFixture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package co.kirikiri.integration.fixture;
22

3-
import co.kirikiri.persistence.dto.RoadmapOrderType;
3+
import co.kirikiri.roadmap.persistence.dto.RoadmapOrderType;
44
import co.kirikiri.roadmap.domain.RoadmapCategory;
55
import co.kirikiri.roadmap.service.dto.request.RoadmapCategorySaveRequest;
66
import co.kirikiri.roadmap.service.dto.request.RoadmapNodeSaveRequest;

‎backend/kirikiri/src/test/java/co/kirikiri/persistence/dto/RoadmapSearchTagNameTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
55
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
66

7+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchTagName;
78
import co.kirikiri.service.exception.BadRequestException;
89
import org.junit.jupiter.params.ParameterizedTest;
910
import org.junit.jupiter.params.provider.CsvSource;

‎backend/kirikiri/src/test/java/co/kirikiri/persistence/dto/RoadmapSearchTitleTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
55
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
66

7+
import co.kirikiri.roadmap.persistence.dto.RoadmapSearchTitle;
78
import co.kirikiri.service.exception.BadRequestException;
89
import org.junit.jupiter.params.ParameterizedTest;
910
import org.junit.jupiter.params.provider.CsvSource;

‎backend/kirikiri/src/test/java/co/kirikiri/controller/RoadmapCreateApiTest.java renamed to ‎backend/kirikiri/src/test/java/co/kirikiri/roadmap/controller/RoadmapCreateApiTest.java

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,21 @@
1-
package co.kirikiri.controller;
2-
3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.ArgumentMatchers.any;
5-
import static org.mockito.ArgumentMatchers.anyLong;
6-
import static org.mockito.ArgumentMatchers.anyString;
7-
import static org.mockito.BDDMockito.given;
8-
import static org.mockito.Mockito.doNothing;
9-
import static org.mockito.Mockito.doThrow;
10-
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
11-
import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
12-
import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders;
13-
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete;
14-
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.multipart;
15-
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
16-
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
17-
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
18-
import static org.springframework.restdocs.payload.PayloadDocumentation.requestPartFields;
19-
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
20-
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
21-
import static org.springframework.restdocs.request.RequestDocumentation.partWithName;
22-
import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
23-
import static org.springframework.restdocs.request.RequestDocumentation.requestParts;
24-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
25-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
1+
package co.kirikiri.roadmap.controller;
262

273
import co.kirikiri.controller.helper.ControllerTestHelper;
28-
import co.kirikiri.roadmap.controller.RoadmapController;
29-
import co.kirikiri.service.dto.ErrorResponse;
4+
import co.kirikiri.roadmap.service.RoadmapCreateService;
5+
import co.kirikiri.roadmap.service.RoadmapReadService;
306
import co.kirikiri.roadmap.service.dto.request.RoadmapCategorySaveRequest;
317
import co.kirikiri.roadmap.service.dto.request.RoadmapDifficultyType;
328
import co.kirikiri.roadmap.service.dto.request.RoadmapNodeSaveRequest;
339
import co.kirikiri.roadmap.service.dto.request.RoadmapReviewSaveRequest;
3410
import co.kirikiri.roadmap.service.dto.request.RoadmapSaveRequest;
3511
import co.kirikiri.roadmap.service.dto.request.RoadmapTagSaveRequest;
12+
import co.kirikiri.service.dto.ErrorResponse;
3613
import co.kirikiri.service.exception.AuthenticationException;
3714
import co.kirikiri.service.exception.BadRequestException;
3815
import co.kirikiri.service.exception.ConflictException;
3916
import co.kirikiri.service.exception.ForbiddenException;
4017
import co.kirikiri.service.exception.NotFoundException;
41-
import co.kirikiri.roadmap.service.RoadmapCreateService;
42-
import co.kirikiri.roadmap.service.RoadmapReadService;
4318
import com.fasterxml.jackson.core.type.TypeReference;
44-
import java.util.ArrayList;
45-
import java.util.List;
4619
import org.junit.jupiter.api.Test;
4720
import org.junit.jupiter.params.ParameterizedTest;
4821
import org.junit.jupiter.params.provider.ValueSource;
@@ -57,6 +30,21 @@
5730
import org.springframework.test.web.servlet.ResultMatcher;
5831
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
5932

33+
import java.util.ArrayList;
34+
import java.util.List;
35+
36+
import static org.assertj.core.api.Assertions.assertThat;
37+
import static org.mockito.ArgumentMatchers.*;
38+
import static org.mockito.BDDMockito.given;
39+
import static org.mockito.Mockito.doNothing;
40+
import static org.mockito.Mockito.doThrow;
41+
import static org.springframework.restdocs.headers.HeaderDocumentation.*;
42+
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
43+
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
44+
import static org.springframework.restdocs.request.RequestDocumentation.*;
45+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
46+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
47+
6048
@WebMvcTest(RoadmapController.class)
6149
class RoadmapCreateApiTest extends ControllerTestHelper {
6250

‎backend/kirikiri/src/test/java/co/kirikiri/controller/RoadmapReadApiTest.java renamed to ‎backend/kirikiri/src/test/java/co/kirikiri/roadmap/controller/RoadmapReadApiTest.java

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
1-
package co.kirikiri.controller;
2-
3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.ArgumentMatchers.any;
5-
import static org.mockito.ArgumentMatchers.anyLong;
6-
import static org.mockito.BDDMockito.given;
7-
import static org.mockito.Mockito.when;
8-
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
9-
import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
10-
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
11-
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
12-
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
13-
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
14-
import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
15-
import static org.springframework.restdocs.request.RequestDocumentation.queryParameters;
16-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
17-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
1+
package co.kirikiri.roadmap.controller;
182

193
import co.kirikiri.controller.helper.ControllerTestHelper;
204
import co.kirikiri.domain.goalroom.GoalRoomStatus;
215
import co.kirikiri.roadmap.domain.RoadmapDifficulty;
22-
import co.kirikiri.roadmap.controller.RoadmapController;
23-
import co.kirikiri.service.dto.CustomScrollRequest;
24-
import co.kirikiri.service.dto.ErrorResponse;
25-
import co.kirikiri.service.dto.member.response.MemberResponse;
6+
import co.kirikiri.roadmap.service.RoadmapCreateService;
7+
import co.kirikiri.roadmap.service.RoadmapReadService;
268
import co.kirikiri.roadmap.service.dto.request.RoadmapOrderTypeRequest;
279
import co.kirikiri.roadmap.service.dto.response.MemberRoadmapResponse;
2810
import co.kirikiri.roadmap.service.dto.response.MemberRoadmapResponses;
@@ -36,14 +18,11 @@
3618
import co.kirikiri.roadmap.service.dto.response.RoadmapResponse;
3719
import co.kirikiri.roadmap.service.dto.response.RoadmapReviewResponse;
3820
import co.kirikiri.roadmap.service.dto.response.RoadmapTagResponse;
21+
import co.kirikiri.service.dto.CustomScrollRequest;
22+
import co.kirikiri.service.dto.ErrorResponse;
23+
import co.kirikiri.service.dto.member.response.MemberResponse;
3924
import co.kirikiri.service.exception.NotFoundException;
40-
import co.kirikiri.roadmap.service.RoadmapCreateService;
41-
import co.kirikiri.roadmap.service.RoadmapReadService;
4225
import com.fasterxml.jackson.core.type.TypeReference;
43-
import java.time.LocalDate;
44-
import java.time.LocalDateTime;
45-
import java.util.Collections;
46-
import java.util.List;
4726
import org.junit.jupiter.api.Test;
4827
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
4928
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -52,6 +31,25 @@
5231
import org.springframework.restdocs.snippet.Attributes;
5332
import org.springframework.test.web.servlet.MvcResult;
5433

34+
import java.time.LocalDate;
35+
import java.time.LocalDateTime;
36+
import java.util.Collections;
37+
import java.util.List;
38+
39+
import static org.assertj.core.api.Assertions.assertThat;
40+
import static org.mockito.ArgumentMatchers.any;
41+
import static org.mockito.ArgumentMatchers.anyLong;
42+
import static org.mockito.BDDMockito.given;
43+
import static org.mockito.Mockito.when;
44+
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
45+
import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
46+
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
47+
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
48+
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
49+
import static org.springframework.restdocs.request.RequestDocumentation.*;
50+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
51+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
52+
5553
@WebMvcTest(RoadmapController.class)
5654
class RoadmapReadApiTest extends ControllerTestHelper {
5755

‎backend/kirikiri/src/test/java/co/kirikiri/domain/roadmap/RoadmapCategoryTest.java renamed to ‎backend/kirikiri/src/test/java/co/kirikiri/roadmap/domain/RoadmapCategoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.domain.roadmap;
1+
package co.kirikiri.roadmap.domain;
22

33
import static org.assertj.core.api.Assertions.assertThatThrownBy;
44
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

‎backend/kirikiri/src/test/java/co/kirikiri/domain/roadmap/RoadmapContentTest.java renamed to ‎backend/kirikiri/src/test/java/co/kirikiri/roadmap/domain/RoadmapContentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.kirikiri.domain.roadmap;
1+
package co.kirikiri.roadmap.domain;
22

33
import static co.kirikiri.roadmap.domain.RoadmapDifficulty.DIFFICULT;
44
import static org.assertj.core.api.Assertions.assertThat;

0 commit comments

Comments
 (0)