Merge pull request #76 from HongDam-org/feat/plan-group-api

[FEAT] 누락된 api 구현
HongDam-org · Dec 11, 2023 · 0ea2357 · 0ea2357
2 parents 1a74d0a + e42e593
commit 0ea2357
Show file tree

Hide file tree

Showing 27 changed files with 504 additions and 21 deletions.
diff --git a/backend/src/docs/group.adoc b/backend/src/docs/group.adoc
@@ -28,3 +28,9 @@ operation::get share[snippets='http-request,http-response']
 
 === 자신의 소속 그룹 정보 반환
 operation::get myGroups[snippets='http-request,http-response']
+
+=== 그룹 자신 위치 수정
+operation::post update group member location[snippets='http-request,http-response']
+
+=== 그룹 탈퇴
+operation::post out group[snippets='http-request,http-response']
diff --git a/backend/src/docs/plan.adoc b/backend/src/docs/plan.adoc
@@ -25,3 +25,6 @@ operation::post out plan[snippets='http-request,http-response']
 
 === 본인이 속한 계획 전체 조회
 operation::get all plans[snippets='http-request,http-response']
+
+=== 본인이 속한 계획 전체 조회
+operation::post update plan[snippets='http-request,http-response']
diff --git a/backend/src/main/java/com/twtw/backend/config/security/SecurityConfig.java b/backend/src/main/java/com/twtw/backend/config/security/SecurityConfig.java
@@ -35,11 +35,8 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
                                                 "auth/save",
                                                 "auth/login",
                                                 "member/duplicate/**",
-                                                "plan/**",
                                                 "actuator/**")
                                         .permitAll())
-                .authorizeHttpRequests(
-                        x -> x.requestMatchers("/test/**").permitAll().anyRequest().authenticated())
                 .sessionManagement(x -> x.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class)
                 .exceptionHandling(

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,13 +3,20 @@
 import com.twtw.backend.domain.group.dto.request.InviteGroupRequest;
 import com.twtw.backend.domain.group.dto.request.JoinGroupRequest;
 import com.twtw.backend.domain.group.dto.request.MakeGroupRequest;
+import com.twtw.backend.domain.group.dto.request.OutGroupRequest;
+import com.twtw.backend.domain.group.dto.request.UpdateLocationRequest;
 import com.twtw.backend.domain.group.dto.response.GroupInfoResponse;
 import com.twtw.backend.domain.group.dto.response.ShareInfoResponse;
 import com.twtw.backend.domain.group.dto.response.SimpleGroupInfoResponse;
 import com.twtw.backend.domain.group.service.GroupService;
 
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.UUID;
@@ -67,4 +74,17 @@ public ResponseEntity<ShareInfoResponse> getShare(@PathVariable UUID id) {
     public ResponseEntity<List<GroupInfoResponse>> getMyGroups() {
         return ResponseEntity.ok(groupService.getMyGroups());
     }
+
+    @PostMapping("location")
+    public ResponseEntity<Void> updateLocation(
+            @RequestBody final UpdateLocationRequest updateLocationRequest) {
+        groupService.updateLocation(updateLocationRequest);
+        return ResponseEntity.noContent().build();
+    }
+
+    @PostMapping("out")
+    public ResponseEntity<Void> outGroup(@RequestBody final OutGroupRequest outGroupRequest) {
+        groupService.outGroup(outGroupRequest);
+        return ResponseEntity.noContent().build();
+    }
 }
diff --git a/.../src/main/java/com/twtw/backend/domain/group/controller/advice/GroupControllerAdvice.java b/.../src/main/java/com/twtw/backend/domain/group/controller/advice/GroupControllerAdvice.java
@@ -0,0 +1,19 @@
+package com.twtw.backend.domain.group.controller.advice;
+
+import com.twtw.backend.domain.group.exception.IllegalGroupMemberException;
+import com.twtw.backend.global.advice.ErrorResponse;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class GroupControllerAdvice {
+
+    @ExceptionHandler(IllegalGroupMemberException.class)
+    public ResponseEntity<ErrorResponse> invalidFriendMember(final IllegalGroupMemberException e) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(new ErrorResponse(e.getMessage()));
+    }
+}
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/dto/request/OutGroupRequest.java b/backend/src/main/java/com/twtw/backend/domain/group/dto/request/OutGroupRequest.java
@@ -0,0 +1,14 @@
+package com.twtw.backend.domain.group.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class OutGroupRequest {
+    private UUID groupId;
+}
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/dto/request/UpdateLocationRequest.java b/backend/src/main/java/com/twtw/backend/domain/group/dto/request/UpdateLocationRequest.java
@@ -0,0 +1,16 @@
+package com.twtw.backend.domain.group.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateLocationRequest {
+    private UUID groupId;
+    private Double longitude;
+    private Double latitude;
+}
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java b/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java
@@ -1,5 +1,6 @@
 package com.twtw.backend.domain.group.entity;
 
+import com.twtw.backend.domain.group.exception.IllegalGroupMemberException;
 import com.twtw.backend.domain.member.entity.Member;
 import com.twtw.backend.domain.plan.entity.Plan;
 import com.twtw.backend.global.audit.AuditListener;
@@ -75,4 +76,28 @@ public void inviteAll(final List<Member> friends) {
     private boolean addGroupMember(final GroupMember groupMember) {
         return this.groupMembers.add(groupMember);
     }
+
+    public void updateMemberLocation(
+            final Member member, final Double longitude, final Double latitude) {
+        final GroupMember groupMember = getGroupMember(member);
+        groupMember.updateCoordinate(longitude, latitude);
+    }
+
+    private GroupMember getGroupMember(final Member member) {
+        return this.groupMembers.stream()
+                .filter(groupMember -> groupMember.isSameMember(member))
+                .findAny()
+                .orElseThrow(IllegalGroupMemberException::new);
+    }
+
+    public void outGroup(final Member member) {
+        this.groupMembers.removeIf(groupMember -> groupMember.isSameMember(member));
+        if (hasNoLeader()) {
+            this.leaderId = this.groupMembers.get(0).getMember().getId();
+        }
+    }
+
+    private boolean hasNoLeader() {
+        return this.groupMembers.stream().noneMatch(GroupMember::isLeader);
+    }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/entity/GroupMember.java b/backend/src/main/java/com/twtw/backend/domain/group/entity/GroupMember.java
@@ -1,6 +1,7 @@
 package com.twtw.backend.domain.group.entity;
 
 import com.twtw.backend.domain.member.entity.Member;
+import com.twtw.backend.domain.place.entity.Coordinate;
 import com.twtw.backend.global.audit.AuditListener;
 import com.twtw.backend.global.audit.Auditable;
 import com.twtw.backend.global.audit.BaseTime;
@@ -31,6 +32,7 @@
 @EntityListeners(AuditListener.class)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class GroupMember implements Auditable {
+
     @Id
     @GeneratedValue(generator = "uuid2")
     @Column(name = "id", columnDefinition = "BINARY(16)")
@@ -44,6 +46,8 @@ public class GroupMember implements Auditable {
     @JoinColumn(name = "member_id")
     private Member member;
 
+    @Embedded private Coordinate coordinate;
+
     private Boolean share;
 
     @Enumerated(EnumType.STRING)
@@ -77,4 +81,25 @@ public void acceptInvite() {
     public UUID getGroupId() {
         return this.group.getId();
     }
+
+    public Coordinate getCoordinate() {
+        if (share) {
+            return coordinate;
+        }
+        return Coordinate.empty();
+    }
+
+    public void updateCoordinate(final Double longitude, final Double latitude) {
+        if (share) {
+            this.coordinate = new Coordinate(longitude, latitude);
+        }
+    }
+
+    public boolean isSameMember(final Member member) {
+        return this.member.getId().equals(member.getId());
+    }
+
+    public boolean isLeader() {
+        return this.group.getLeaderId().equals(this.member.getId());
+    }
 }
diff --git a/...nd/src/main/java/com/twtw/backend/domain/group/exception/IllegalGroupMemberException.java b/...nd/src/main/java/com/twtw/backend/domain/group/exception/IllegalGroupMemberException.java
@@ -0,0 +1,10 @@
+package com.twtw.backend.domain.group.exception;
+
+public class IllegalGroupMemberException extends IllegalArgumentException {
+
+    private static final String MESSAGE = "그룹에 포함되지 않은 멤버입니다.";
+
+    public IllegalGroupMemberException() {
+        super(MESSAGE);
+    }
+}
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
@@ -3,6 +3,8 @@
 import com.twtw.backend.domain.group.dto.request.InviteGroupRequest;
 import com.twtw.backend.domain.group.dto.request.JoinGroupRequest;
 import com.twtw.backend.domain.group.dto.request.MakeGroupRequest;
+import com.twtw.backend.domain.group.dto.request.OutGroupRequest;
+import com.twtw.backend.domain.group.dto.request.UpdateLocationRequest;
 import com.twtw.backend.domain.group.dto.response.GroupInfoResponse;
 import com.twtw.backend.domain.group.dto.response.ShareInfoResponse;
 import com.twtw.backend.domain.group.dto.response.SimpleGroupInfoResponse;
@@ -131,4 +133,19 @@ public List<GroupInfoResponse> getMyGroups() {
 
         return groupMapper.toMyGroupsInfo(loginMember.getGroupMembers());
     }
+
+    @Transactional
+    public void updateLocation(final UpdateLocationRequest updateLocationRequest) {
+        final Member member = authService.getMemberByJwt();
+        final Group group = getGroupEntity(updateLocationRequest.getGroupId());
+        group.updateMemberLocation(
+                member, updateLocationRequest.getLongitude(), updateLocationRequest.getLatitude());
+    }
+
+    @Transactional
+    public void outGroup(final OutGroupRequest outGroupRequest) {
+        final Member member = authService.getMemberByJwt();
+        final Group group = getGroupEntity(outGroupRequest.getGroupId());
+        group.outGroup(member);
+    }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/location/controller/LocationController.java b/backend/src/main/java/com/twtw/backend/domain/location/controller/LocationController.java
@@ -27,6 +27,8 @@ public void share(
             @DestinationVariable final UUID planId,
             @Payload final LocationRequest locationRequest) {
         rabbitTemplate.convertAndSend(
-                EXCHANGE_NAME, ROUTING_KEY + planId, locationService.addInfo(locationRequest));
+                EXCHANGE_NAME,
+                ROUTING_KEY + planId,
+                locationService.addInfo(planId, locationRequest));
     }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/location/dto/response/AverageCoordinate.java b/backend/src/main/java/com/twtw/backend/domain/location/dto/response/AverageCoordinate.java
@@ -0,0 +1,16 @@
+package com.twtw.backend.domain.location.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AverageCoordinate {
+    private Double longitude;
+    private Double latitude;
+    private Double distance;
+}
diff --git a/backend/src/main/java/com/twtw/backend/domain/location/dto/response/LocationResponse.java b/backend/src/main/java/com/twtw/backend/domain/location/dto/response/LocationResponse.java
@@ -13,5 +13,6 @@ public class LocationResponse {
     private String nickname;
     private Double longitude;
     private Double latitude;
+    private AverageCoordinate averageCoordinate;
     private LocalDateTime time;
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/location/mapper/LocationMapper.java b/backend/src/main/java/com/twtw/backend/domain/location/mapper/LocationMapper.java
@@ -1,14 +1,21 @@
 package com.twtw.backend.domain.location.mapper;
 
 import com.twtw.backend.domain.location.dto.request.LocationRequest;
+import com.twtw.backend.domain.location.dto.response.AverageCoordinate;
 import com.twtw.backend.domain.location.dto.response.LocationResponse;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 
 import java.time.LocalDateTime;
 
 @Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
 public interface LocationMapper {
-    LocationResponse toResponse(LocationRequest locationRequest, LocalDateTime time);
+    @Mapping(target = "longitude", source = "locationRequest.longitude")
+    @Mapping(target = "latitude", source = "locationRequest.latitude")
+    LocationResponse toResponse(
+            LocationRequest locationRequest,
+            AverageCoordinate averageCoordinate,
+            LocalDateTime time);
 }