refactor : 패키지 및 도메인 group -> space로 네이밍 통일화

요청과 응답을 제외하여 수정
moidot · Feb 5, 2024 · 2b85753 · 2b85753
1 parent 0b31d50
commit 2b85753
Show file tree

Hide file tree

Showing 55 changed files with 684 additions and 699 deletions.
diff --git a/...ain/space/controller/GroupController.java → ...ain/space/controller/SpaceController.java b/...ain/space/controller/GroupController.java → ...ain/space/controller/SpaceController.java
@@ -1,12 +1,12 @@
 package com.moim.backend.domain.space.controller;
 
-import com.moim.backend.domain.space.request.controller.GroupCreateRequest;
-import com.moim.backend.domain.space.request.controller.GroupNameUpdateRequest;
-import com.moim.backend.domain.space.request.controller.GroupParticipateRequest;
-import com.moim.backend.domain.space.request.controller.GroupParticipateUpdateRequest;
+import com.moim.backend.domain.space.request.controller.SpaceCreateRequest;
+import com.moim.backend.domain.space.request.controller.SpaceNameUpdateRequest;
+import com.moim.backend.domain.space.request.controller.SpaceParticipateRequest;
+import com.moim.backend.domain.space.request.controller.SpaceParticipateUpdateRequest;
 import com.moim.backend.domain.space.response.*;
-import com.moim.backend.domain.space.response.group.*;
-import com.moim.backend.domain.space.service.GroupService;
+import com.moim.backend.domain.space.response.space.*;
+import com.moim.backend.domain.space.service.SpaceService;
 import com.moim.backend.domain.user.entity.Users;
 import com.moim.backend.global.auth.Login;
 import com.moim.backend.global.common.CustomResponseEntity;
@@ -19,110 +19,110 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/group")
-public class GroupController {
+public class SpaceController {
 
-    private final GroupService groupService;
+    private final SpaceService spaceService;
 
     // 모임 생성 API
     @PostMapping("")
-    public CustomResponseEntity<GroupCreateResponse> createGroup(
-            @RequestBody @Valid GroupCreateRequest request, @Login Users user
+    public CustomResponseEntity<SpaceCreateResponse> createSpace(
+            @RequestBody @Valid SpaceCreateRequest request, @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.createGroup(request.toServiceRequest(), user));
+        return CustomResponseEntity.success(spaceService.createSpace(request.toServiceRequest(), user));
     }
 
     // 모임 참여자 정보 리스트 조회 API
     @GetMapping("")
-    public CustomResponseEntity<GroupDetailResponse> readParticipateGroupByRegion(
+    public CustomResponseEntity<SpaceDetailResponse> readParticipateSpaceByRegion(
             @RequestParam Long groupId
     ) {
-        return CustomResponseEntity.success(groupService.readParticipateGroupByRegion(groupId));
+        return CustomResponseEntity.success(spaceService.readParticipateSpaceByRegion(groupId));
     }
 
     // 모임 이름 수정 API
     @PatchMapping("")
-    public CustomResponseEntity<Void> updateGroupName(
+    public CustomResponseEntity<Void> updateSpaceName(
             @RequestParam Long groupId,
-            @RequestBody @Valid GroupNameUpdateRequest request, @Login Users user
+            @RequestBody @Valid SpaceNameUpdateRequest request, @Login Users user
     ) {
         return CustomResponseEntity.success(
-                groupService.updateGroupName(groupId, request.toServiceRequest(), user)
+                spaceService.updateSpaceName(groupId, request.toServiceRequest(), user)
         );
     }
 
     // 모임 참여 API
     @PostMapping("/participate")
-    public CustomResponseEntity<GroupParticipateResponse> participateGroup(
-            @RequestBody @Valid GroupParticipateRequest request, @Login Users user
+    public CustomResponseEntity<SpaceParticipateResponse> participateSpace(
+            @RequestBody @Valid SpaceParticipateRequest request, @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.participateGroup(request.toServiceRequest(), user));
+        return CustomResponseEntity.success(spaceService.participateSpace(request.toServiceRequest(), user));
     }
 
     // 모임 삭제 API
     @DeleteMapping("")
-    public CustomResponseEntity<Void> deleteGroup(
+    public CustomResponseEntity<Void> deleteSpace(
             @RequestParam Long groupId, @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.participateDelete(groupId, user));
+        return CustomResponseEntity.success(spaceService.participateDelete(groupId, user));
     }
 
     // 내 참여 정보 수정 API
     @PatchMapping("/participate")
-    public CustomResponseEntity<GroupParticipateUpdateResponse> participateUpdate(
-            @RequestBody @Valid GroupParticipateUpdateRequest request, @Login Users user
+    public CustomResponseEntity<SpaceParticipateUpdateResponse> participateUpdate(
+            @RequestBody @Valid SpaceParticipateUpdateRequest request, @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.participateUpdate(request.toServiceRequest(), user));
+        return CustomResponseEntity.success(spaceService.participateUpdate(request.toServiceRequest(), user));
     }
 
     // 모임 나가기 API
     @DeleteMapping("/participate")
-    public CustomResponseEntity<GroupExitResponse> participateExit(
+    public CustomResponseEntity<SpaceExitResponse> participateExit(
             @RequestParam Long participateId, @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.participateExit(participateId, user));
+        return CustomResponseEntity.success(spaceService.participateExit(participateId, user));
     }
 
     // 모임 전체 나가기 API
     @DeleteMapping("/participate/all")
     public CustomResponseEntity<Void> allParticipateExit(
             @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.allParticipateExit(user));
+        return CustomResponseEntity.success(spaceService.allParticipateExit(user));
     }
 
     // 모임원 내보내기 API
     @DeleteMapping("/participate/removal")
     public CustomResponseEntity<Void> participateRemoval(
             @RequestParam Long participateId, @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.participateRemoval(participateId, user));
+        return CustomResponseEntity.success(spaceService.participateRemoval(participateId, user));
     }
 
     // 모임 추천 역(랜드마크) 조회하기 API
     @GetMapping("/best-region")
     public CustomResponseEntity<List<PlaceRouteResponse>> getBestRegion(
             @RequestParam Long groupId
     ) {
-        return CustomResponseEntity.success(groupService.getBestRegion(groupId));
+        return CustomResponseEntity.success(spaceService.getBestRegion(groupId));
     }
 
     // 내 모임 확인하기 API
     @GetMapping("/participate")
-    public CustomResponseEntity<List<GroupMyParticipateResponse>> getMyParticipate(
+    public CustomResponseEntity<List<SpaceMyParticipateResponse>> getMyParticipate(
             @Login Users user
     ) {
-        return CustomResponseEntity.success(groupService.getMyParticipate(user));
+        return CustomResponseEntity.success(spaceService.getMyParticipate(user));
     }
 
     // 모임 장소 추천 조회 리스트 API
     @GetMapping("/best-region/place")
-    public CustomResponseEntity<List<GroupPlaceResponse>> keywordCentralizedMeetingSpot(
+    public CustomResponseEntity<List<SpacePlaceResponse>> keywordCentralizedMeetingSpot(
             @RequestParam Double x,
             @RequestParam Double y,
             @RequestParam String local,
             @RequestParam String keyword
     ) {
-        return CustomResponseEntity.success(groupService.keywordCentralizedMeetingSpot(x, y, local, keyword));
+        return CustomResponseEntity.success(spaceService.keywordCentralizedMeetingSpot(x, y, local, keyword));
     }
 
     // 닉네임 유효성 체크
@@ -131,6 +131,6 @@ public CustomResponseEntity<NicknameValidationResponse> checkNicknameValidation(
             @RequestParam Long groupId,
             @RequestParam String nickname
     ) {
-        return CustomResponseEntity.success(groupService.checkNicknameValidation(groupId, nickname));
+        return CustomResponseEntity.success(spaceService.checkNicknameValidation(groupId, nickname));
     }
 }
diff --git a/src/main/java/com/moim/backend/domain/space/entity/BestPlace.java b/src/main/java/com/moim/backend/domain/space/entity/BestPlace.java
@@ -1,6 +1,6 @@
 package com.moim.backend.domain.space.entity;
 
-import com.moim.backend.domain.groupvote.entity.SelectPlace;
+import com.moim.backend.domain.spacevote.entity.SelectPlace;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
@@ -21,8 +21,8 @@ public class BestPlace {
     private Long bestPlaceId;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "group_id")
-    private Groups group;
+    @JoinColumn(name = "space_id")
+    private Space space;
 
     @NotNull
     private String placeName;

diff --git a/src/main/java/com/moim/backend/domain/space/entity/Participation.java b/src/main/java/com/moim/backend/domain/space/entity/Participation.java
@@ -1,6 +1,6 @@
 package com.moim.backend.domain.space.entity;
 
-import com.moim.backend.domain.space.request.service.GroupParticipateUpdateServiceRequest;
+import com.moim.backend.domain.space.request.service.SpaceParticipateUpdateServiceRequest;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
@@ -18,8 +18,8 @@ public class Participation {
     private Long participationId;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "group_id")
-    private Groups group;
+    @JoinColumn(name = "space_id")
+    private Space space;
 
     @NotNull
     private Long userId;
@@ -42,9 +42,9 @@ public class Participation {
     private String password;
 
     @Builder
-    private Participation(Long participationId, Groups group, Long userId, String userName, String locationName, Double latitude, Double longitude, TransportationType transportation, String password) {
+    private Participation(Long participationId, Space group, Long userId, String userName, String locationName, Double latitude, Double longitude, TransportationType transportation, String password) {
         this.participationId = participationId;
-        this.group = group;
+        this.space = group;
         this.userId = userId;
         this.userName = userName;
         this.locationName = locationName;
@@ -54,7 +54,7 @@ private Participation(Long participationId, Groups group, Long userId, String us
         this.password = password;
     }
 
-    public void update(GroupParticipateUpdateServiceRequest request) {
+    public void update(SpaceParticipateUpdateServiceRequest request) {
         this.userName = request.getUserName();
         this.locationName = request.getLocationName();
         this.latitude = request.getLatitude();

diff --git a/...m/backend/domain/space/entity/Groups.java → ...im/backend/domain/space/entity/Space.java b/...m/backend/domain/space/entity/Groups.java → ...im/backend/domain/space/entity/Space.java
@@ -9,16 +9,15 @@
 import java.util.Optional;
 
 @Entity
-@Table(name = "my_groups")
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 @Builder
-public class Groups {
+public class Space {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long groupId;
+    private Long spaceId;
 
     @NotNull
     private Long adminId;
@@ -30,10 +29,10 @@ public class Groups {
 
     private String place;
 
-    @OneToMany(mappedBy = "group", orphanRemoval = true)
+    @OneToMany(mappedBy = "space", orphanRemoval = true)
     private List<Participation> participations;
 
-    @OneToMany(mappedBy = "group", orphanRemoval = true)
+    @OneToMany(mappedBy = "space", orphanRemoval = true)
     private List<BestPlace> bestPlaces;
 
     public void confirmPlace(String place) {

diff --git a/src/main/java/com/moim/backend/domain/space/repository/BestPlaceRepository.java b/src/main/java/com/moim/backend/domain/space/repository/BestPlaceRepository.java
@@ -1,7 +1,7 @@
 package com.moim.backend.domain.space.repository;
 
 import com.moim.backend.domain.space.entity.BestPlace;
-import com.moim.backend.domain.space.entity.Groups;
+import com.moim.backend.domain.space.entity.Space;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,7 +10,6 @@
 @Repository
 public interface BestPlaceRepository extends JpaRepository<BestPlace, Long> {
 
-    int deleteAllByGroup(Groups group);
-    List<BestPlace> findAllByGroup(Groups group);
+    List<BestPlace> findAllBySpace(Space space);
 
 }
diff --git a/src/main/java/com/moim/backend/domain/space/repository/GroupCustomRepository.java b/src/main/java/com/moim/backend/domain/space/repository/GroupCustomRepository.java
diff --git a/src/main/java/com/moim/backend/domain/space/repository/GroupRepositoryImpl.java b/src/main/java/com/moim/backend/domain/space/repository/GroupRepositoryImpl.java
diff --git a/src/main/java/com/moim/backend/domain/space/repository/ParticipationRepository.java b/src/main/java/com/moim/backend/domain/space/repository/ParticipationRepository.java
@@ -1,6 +1,6 @@
 package com.moim.backend.domain.space.repository;
 
-import com.moim.backend.domain.space.entity.Groups;
+import com.moim.backend.domain.space.entity.Space;
 import com.moim.backend.domain.space.entity.Participation;
 import com.moim.backend.domain.space.response.MiddlePoint;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -15,15 +15,15 @@ public interface ParticipationRepository extends JpaRepository<Participation, Lo
     @Query("SELECT "
             + "new com.moim.backend.domain.space.response.MiddlePoint(SUM(p.latitude), SUM(p.longitude), COUNT(*)) "
             + "FROM Participation p "
-            + "GROUP BY p.group "
-            + "HAVING p.group = :group")
-    MiddlePoint getMiddlePoint(@Param("group") Groups group);
+            + "GROUP BY p.space "
+            + "HAVING p.space = :space")
+    MiddlePoint getMiddlePoint(@Param("space") Space space);
 
-    int countByGroupAndUserId(Groups group, Long userId);
+    int countBySpaceAndUserId(Space space, Long userId);
 
-    List<Participation> findAllByGroupGroupIdAndUserIdIn(Long group_groupId, List<Long> userId);
-    List<Participation> findAllByGroup(Groups group);
-    List<Participation> findAllByGroupAndUserName(Groups group, String name);
+    List<Participation> findAllBySpaceSpaceIdAndUserIdIn(Long spaceId, List<Long> userId);
+    List<Participation> findAllBySpace(Space space);
+    List<Participation> findAllBySpaceAndUserName(Space space, String name);
 
     List<Participation> findByUserId(Long userId);
     void deleteByUserId(Long userId);

diff --git a/src/main/java/com/moim/backend/domain/space/repository/SpaceCustomRepository.java b/src/main/java/com/moim/backend/domain/space/repository/SpaceCustomRepository.java
@@ -0,0 +1,13 @@
+package com.moim.backend.domain.space.repository;
+
+import com.moim.backend.domain.space.entity.Space;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface SpaceCustomRepository {
+    List<Space> findBySpaceFetch(Long userId);
+    Optional<Space> findBySpaceParticipation(Long groupId);
+}
diff --git a/...ain/space/repository/GroupRepository.java → ...ain/space/repository/SpaceRepository.java b/...ain/space/repository/GroupRepository.java → ...ain/space/repository/SpaceRepository.java
@@ -1,9 +1,9 @@
 package com.moim.backend.domain.space.repository;
 
-import com.moim.backend.domain.space.entity.Groups;
+import com.moim.backend.domain.space.entity.Space;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface GroupRepository extends JpaRepository<Groups, Long>, GroupCustomRepository {
+public interface SpaceRepository extends JpaRepository<Space, Long>, SpaceCustomRepository {
 }