Google Java Format

HongDam-org · Jan 19, 2024 · ccc6bc2 · ccc6bc2
1 parent dc3d7ab
commit ccc6bc2
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 15 deletions.
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/controller/GroupController.java b/backend/src/main/java/com/twtw/backend/domain/group/controller/GroupController.java
@@ -3,6 +3,7 @@
 import com.twtw.backend.domain.group.dto.request.*;
 import com.twtw.backend.domain.group.dto.response.GroupInfoResponse;
 import com.twtw.backend.domain.group.service.GroupService;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,8 +31,7 @@ public ResponseEntity<GroupInfoResponse> makeGroup(
     }
 
     @PostMapping("/join")
-    public ResponseEntity<Void> joinGroup(
-            @RequestBody JoinGroupRequest joinGroupRequest) {
+    public ResponseEntity<Void> joinGroup(@RequestBody JoinGroupRequest joinGroupRequest) {
         groupService.joinGroup(joinGroupRequest);
         return ResponseEntity.noContent().build();
     }

diff --git a/backend/src/main/java/com/twtw/backend/domain/group/mapper/GroupMapper.java b/backend/src/main/java/com/twtw/backend/domain/group/mapper/GroupMapper.java
@@ -6,6 +6,7 @@
 import com.twtw.backend.domain.group.entity.Group;
 import com.twtw.backend.domain.group.entity.GroupMember;
 import com.twtw.backend.domain.member.entity.Member;
+
 import org.mapstruct.*;
 
 import java.util.List;

diff --git a/backend/src/main/java/com/twtw/backend/domain/group/service/GroupService.java b/backend/src/main/java/com/twtw/backend/domain/group/service/GroupService.java
@@ -15,6 +15,7 @@
 import com.twtw.backend.global.constant.NotificationBody;
 import com.twtw.backend.global.constant.NotificationTitle;
 import com.twtw.backend.global.exception.EntityNotFoundException;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,8 +46,10 @@ public GroupService(
 
     @Transactional(readOnly = true)
     public GroupInfoResponse getGroupById(UUID groupId) {
-        final Group group = groupRepository.findById(groupId).orElseThrow(EntityNotFoundException::new);
-        return groupMapper.toGroupInfo(group, groupMapper.toGroupMemberResponseList(group.getGroupMembers()));
+        final Group group =
+                groupRepository.findById(groupId).orElseThrow(EntityNotFoundException::new);
+        return groupMapper.toGroupInfo(
+                group, groupMapper.toGroupMemberResponseList(group.getGroupMembers()));
     }
 
     public Group getGroupEntity(UUID groupId) {
@@ -57,7 +60,8 @@ public Group getGroupEntity(UUID groupId) {
     public GroupInfoResponse makeGroup(MakeGroupRequest groupDto) {
         final Member member = authService.getMemberByJwt();
         final Group group = groupRepository.save(groupMapper.toGroupEntity(groupDto, member));
-        final List<GroupMemberResponse> groupMemberResponses = groupMapper.toGroupMemberResponseList(group.getGroupMembers());
+        final List<GroupMemberResponse> groupMemberResponses =
+                groupMapper.toGroupMemberResponseList(group.getGroupMembers());
 
         return groupMapper.toGroupInfo(group, groupMemberResponses);
     }
@@ -101,7 +105,8 @@ public GroupInfoResponse inviteGroup(InviteGroupRequest inviteGroupRequest) {
         final UUID id = group.getId();
         friends.forEach(friend -> sendNotification(friend.getDeviceTokenValue(), groupName, id));
 
-        final List<GroupMemberResponse> groupMemberResponses = groupMapper.toGroupMemberResponseList(group.getGroupMembers());
+        final List<GroupMemberResponse> groupMemberResponses =
+                groupMapper.toGroupMemberResponseList(group.getGroupMembers());
 
         return groupMapper.toGroupInfo(group, groupMemberResponses);
     }
@@ -116,7 +121,8 @@ private void sendNotification(final String deviceToken, final String groupName,
     }
 
     public GroupInfoResponse getGroupInfoResponse(Group group) {
-        final List<GroupMemberResponse> groupMemberResponses = groupMapper.toGroupMemberResponseList(group.getGroupMembers());
+        final List<GroupMemberResponse> groupMemberResponses =
+                groupMapper.toGroupMemberResponseList(group.getGroupMembers());
         return groupMapper.toGroupInfo(group, groupMemberResponses);
     }
 

diff --git a/backend/src/main/java/com/twtw/backend/domain/member/controller/AuthController.java b/backend/src/main/java/com/twtw/backend/domain/member/controller/AuthController.java
@@ -7,7 +7,9 @@
 import com.twtw.backend.domain.member.dto.response.AfterLoginResponse;
 import com.twtw.backend.domain.member.dto.response.TokenDto;
 import com.twtw.backend.domain.member.service.AuthService;
+
 import jakarta.validation.Valid;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/backend/src/test/java/com/twtw/backend/domain/group/controller/GroupControllerTest.java b/backend/src/test/java/com/twtw/backend/domain/group/controller/GroupControllerTest.java
@@ -15,7 +15,6 @@
 import com.twtw.backend.domain.group.dto.request.*;
 import com.twtw.backend.domain.group.dto.response.GroupInfoResponse;
 import com.twtw.backend.domain.group.dto.response.GroupMemberResponse;
-import com.twtw.backend.domain.group.dto.response.SimpleGroupInfoResponse;
 import com.twtw.backend.domain.group.service.GroupService;
 import com.twtw.backend.domain.member.dto.response.MemberResponse;
 import com.twtw.backend.support.docs.RestDocsTest;

diff --git a/backend/src/test/java/com/twtw/backend/domain/group/service/GroupServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/group/service/GroupServiceTest.java
@@ -7,7 +7,6 @@
 import com.twtw.backend.domain.group.dto.request.MakeGroupRequest;
 import com.twtw.backend.domain.group.dto.response.GroupInfoResponse;
 import com.twtw.backend.domain.group.dto.response.GroupMemberResponse;
-import com.twtw.backend.domain.group.dto.response.SimpleGroupInfoResponse;
 import com.twtw.backend.domain.group.entity.Group;
 import com.twtw.backend.domain.group.entity.GroupMember;
 import com.twtw.backend.domain.group.repository.GroupMemberRepository;

diff --git a/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java
@@ -1,22 +1,22 @@
 package com.twtw.backend.domain.member.service;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.twtw.backend.domain.member.dto.request.MemberSaveRequest;
 import com.twtw.backend.domain.member.dto.request.OAuthRequest;
 import com.twtw.backend.domain.member.dto.response.AfterLoginResponse;
 import com.twtw.backend.domain.member.entity.AuthStatus;
 import com.twtw.backend.domain.member.entity.AuthType;
 import com.twtw.backend.domain.member.entity.Member;
 import com.twtw.backend.domain.member.repository.MemberRepository;
-import com.twtw.backend.domain.member.repository.RefreshTokenRepository;
 import com.twtw.backend.fixture.member.MemberEntityFixture;
 import com.twtw.backend.support.database.DatabaseTest;
 import com.twtw.backend.support.exclude.ExcludeTest;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 @DatabaseTest
 @DisplayName("AuthService의 ")
 public class AuthServiceTest extends ExcludeTest {

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
@@ -1,5 +1,7 @@
 package com.twtw.backend.domain.plan.service;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.twtw.backend.domain.group.repository.GroupRepository;
 import com.twtw.backend.domain.member.entity.Member;
 import com.twtw.backend.domain.place.entity.CategoryGroupCode;
@@ -17,6 +19,7 @@
 import com.twtw.backend.fixture.place.PlaceEntityFixture;
 import com.twtw.backend.fixture.plan.PlanEntityFixture;
 import com.twtw.backend.support.service.LoginTest;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +29,6 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 @DisplayName("PlanService의")
 class PlanServiceTest extends LoginTest {
 
@@ -176,7 +177,18 @@ void updatePlan() {
 
         // when
         final String placeName = "placeName";
-        planService.updatePlan(new UpdatePlanRequest(planId, LocalDateTime.now(), "모임", placeName, "url", CategoryGroupCode.CE7, "도로명주소", 1.0, 2.0, List.of()));
+        planService.updatePlan(
+                new UpdatePlanRequest(
+                        planId,
+                        LocalDateTime.now(),
+                        "모임",
+                        placeName,
+                        "url",
+                        CategoryGroupCode.CE7,
+                        "도로명주소",
+                        1.0,
+                        2.0,
+                        List.of()));
 
         // then
         final Plan plan = planRepository.findById(planId).orElseThrow();