From 09d6488c84e5d6e177eba8bc29d11772655cb3bd Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Wed, 20 Dec 2023 10:22:41 +0000 Subject: [PATCH] Google Java Format --- .../plan/dto/request/SavePlanRequest.java | 7 ++++- .../domain/plan/mapper/PlanMapper.java | 2 +- .../domain/plan/service/PlanService.java | 5 ++-- .../group/repository/GroupRepositoryTest.java | 4 +-- .../plan/controller/PlanControllerTest.java | 4 +-- .../plan/repository/PlanRepositoryTest.java | 26 ++++++++++++++++--- .../domain/plan/service/PlanServiceTest.java | 14 ++++++---- 7 files changed, 45 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/SavePlanRequest.java b/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/SavePlanRequest.java index 5c149725..fad17772 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/SavePlanRequest.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/SavePlanRequest.java @@ -15,7 +15,12 @@ @AllArgsConstructor public class SavePlanRequest { private UUID groupId; - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul") + + @JsonFormat( + shape = JsonFormat.Shape.STRING, + pattern = "yyyy-MM-dd HH:mm", + timezone = "Asia/Seoul") private LocalDateTime planDay; + private PlaceDetails placeDetails; } diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/mapper/PlanMapper.java b/backend/src/main/java/com/twtw/backend/domain/plan/mapper/PlanMapper.java index f3f75e5b..f5beda0f 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/mapper/PlanMapper.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/mapper/PlanMapper.java @@ -33,7 +33,7 @@ public interface PlanMapper { @Mapping(target = "planMakerId", source = "plan.planMakerId") @Mapping(target = "groupInfo", source = "groupInfoResponse") @Mapping(target = "members", source = "memberResponses") - @Mapping(target = "planDay",source = "planDay") + @Mapping(target = "planDay", source = "planDay") PlanInfoResponse toPlanInfoResponse( Plan plan, PlaceClientDetails placeDetails, diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java b/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java index 31ee8c4a..45d179d0 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java @@ -78,7 +78,7 @@ public PlanResponse savePlan(final SavePlanRequest request) { Member member = authService.getMemberByJwt(); Group group = groupService.getGroupEntity(request.getGroupId()); Place place = placeService.getEntityByDetail(request.getPlaceDetails()); - Plan plan = new Plan(member, place, group,request.getPlanDay()); + Plan plan = new Plan(member, place, group, request.getPlanDay()); return planMapper.toPlanResponse(planRepository.save(plan)); } @@ -109,7 +109,8 @@ private PlanInfoResponse getPlanInfoResponse(final Plan plan) { String planDay = plan.getPlanDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")); List memberResponse = toMemberResponse(plan); - return planMapper.toPlanInfoResponse(plan, placeDetails, planDay, groupInfo, memberResponse); + return planMapper.toPlanInfoResponse( + plan, placeDetails, planDay, groupInfo, memberResponse); } public void deletePlan(UUID id) { diff --git a/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java b/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java index 4d0e4290..f0d0a7b9 100644 --- a/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java @@ -42,7 +42,7 @@ void makeGroup() { Place place = PlaceEntityFixture.FIRST_PLACE.toEntity(); - Plan plan = new Plan(member1, place, group, LocalDateTime.of(2023,12,25,13,30)); + Plan plan = new Plan(member1, place, group, LocalDateTime.of(2023, 12, 25, 13, 30)); plan.addMember(member2); // when @@ -87,7 +87,7 @@ void getPlan() { Place place = PlaceEntityFixture.FIRST_PLACE.toEntity(); - Plan plan = new Plan(member1, place, group,LocalDateTime.of(2023,12,25,13,30)); + Plan plan = new Plan(member1, place, group, LocalDateTime.of(2023, 12, 25, 13, 30)); plan.addMember(member2); // when diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java index 8462f5e3..0082dac4 100644 --- a/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java @@ -107,7 +107,7 @@ void savePlan() throws Exception { toRequestBody( new SavePlanRequest( UUID.randomUUID(), - LocalDateTime.of(2023,12,25,15,30), + LocalDateTime.of(2023, 12, 25, 15, 30), new PlaceDetails( "카페 온마이마인드", "https://place.map.kakao.com/1625295668", @@ -210,7 +210,7 @@ void joinPlan() throws Exception { toRequestBody( new SavePlanRequest( UUID.randomUUID(), - LocalDateTime.of(2023,12,25,13,30), + LocalDateTime.of(2023, 12, 25, 13, 30), new PlaceDetails( "이디야커피 안성죽산점", "http://place.map.kakao.com/1562566188", diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java index bb955c6e..90f7207a 100644 --- a/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java @@ -38,7 +38,9 @@ void saveAndFindById() { final Member member = memberRepository.save(MemberEntityFixture.LOGIN_MEMBER.toEntity()); final Plan plan = PlanEntityFixture.FIRST_PLACE.toEntity( - member, GroupEntityFixture.BTS_GROUP.toEntity(member), LocalDateTime.of(2023,12,25,13,30)); + member, + GroupEntityFixture.BTS_GROUP.toEntity(member), + LocalDateTime.of(2023, 12, 25, 13, 30)); // when final UUID expected = planRepository.save(plan).getId(); @@ -59,7 +61,15 @@ void softDelete() { final Group group = new Group("그룹", "http://abcdefg", member); - final UUID planId = planRepository.save(new Plan(member, place, group,LocalDateTime.of(2023,12,25,13,30))).getId(); + final UUID planId = + planRepository + .save( + new Plan( + member, + place, + group, + LocalDateTime.of(2023, 12, 25, 13, 30))) + .getId(); // when planRepository.deleteById(planId); @@ -89,8 +99,16 @@ void findAllPlanByMember() { final Group group = new Group("그룹", "http://abcdefg", member); - final Plan plan = planRepository.save(new Plan(member, firstPlace, group,LocalDateTime.of(2023,12,25,13,30))); - planRepository.save(new Plan(member, secondPlace, new Group("1", "2", member),LocalDateTime.of(2023,12,26,13,30))); + final Plan plan = + planRepository.save( + new Plan( + member, firstPlace, group, LocalDateTime.of(2023, 12, 25, 13, 30))); + planRepository.save( + new Plan( + member, + secondPlace, + new Group("1", "2", member), + LocalDateTime.of(2023, 12, 26, 13, 30))); plan.addMember(firstMember); plan.addMember(secondMember); diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java index 095cc3a5..5b731f78 100644 --- a/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java @@ -59,7 +59,9 @@ void savePlan() { final PlanResponse planResponse = planService.savePlan( new SavePlanRequest( - groupId, LocalDateTime.of(2023,12,25,15,30), PlaceDetailsFixture.FIRST_PLACE.toPlaceDetails())); + groupId, + LocalDateTime.of(2023, 12, 25, 15, 30), + PlaceDetailsFixture.FIRST_PLACE.toPlaceDetails())); // then final Optional result = planRepository.findById(planResponse.getPlanId()); @@ -77,7 +79,7 @@ void joinPlan() { member, PlaceEntityFixture.FIRST_PLACE.toEntity(), GroupEntityFixture.BTS_GROUP.toEntity(loginUser), - LocalDateTime.of(2023,12,25,15,30))); + LocalDateTime.of(2023, 12, 25, 15, 30))); final UUID planId = plan.getId(); // when @@ -94,7 +96,9 @@ void outPlan() { // given final Plan plan = PlanEntityFixture.SECOND_PLACE.toEntity( - loginUser, GroupEntityFixture.HDJ_GROUP.toEntity(loginUser),LocalDateTime.of(2023,12,25,13,30)); + loginUser, + GroupEntityFixture.HDJ_GROUP.toEntity(loginUser), + LocalDateTime.of(2023, 12, 25, 13, 30)); final UUID planId = planRepository.save(plan).getId(); // when @@ -116,7 +120,7 @@ void getPlanById() { loginUser, PlaceEntityFixture.SECOND_PLACE.toEntity(), GroupEntityFixture.HDJ_GROUP.toEntity(loginUser), - LocalDateTime.of(2023,12,25,15,30))) + LocalDateTime.of(2023, 12, 25, 15, 30))) .getId(); // when @@ -137,7 +141,7 @@ void deletePlan() { loginUser, PlaceEntityFixture.SECOND_PLACE.toEntity(), GroupEntityFixture.HDJ_GROUP.toEntity(loginUser), - LocalDateTime.of(2023,12,25,15,30))) + LocalDateTime.of(2023, 12, 25, 15, 30))) .getId(); // when