[FEAT] Share (위치 공유 여부 구현)

HongDam-org · Oct 17, 2023 · bb1160b · bb1160b
1 parent fe89141
commit bb1160b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 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.JoinGroupDto;
 import com.twtw.backend.domain.group.dto.request.MakeGroupDto;
 import com.twtw.backend.domain.group.dto.response.GroupInfoDto;
+import com.twtw.backend.domain.group.dto.response.ShareInfo;
 import com.twtw.backend.domain.group.service.GroupService;
 
 import org.springframework.http.ResponseEntity;
@@ -35,9 +36,14 @@ public ResponseEntity<GroupInfoDto> joinGroup(@RequestBody JoinGroupDto joinGrou
         return ResponseEntity.ok(groupService.joinGroup(joinGroupDto));
     }
 
-    @PutMapping("/share/{group}")
+    @PutMapping("/share/{id}")
     public ResponseEntity<Void> changeShare(@PathVariable UUID id){
         groupService.changeShare(id);
         return ResponseEntity.ok().build();
     }
+
+    @GetMapping("/share/{id}")
+    public ResponseEntity<ShareInfo> getshare(@PathVariable UUID id){
+        return ResponseEntity.ok(groupService.getShare(id));
+    }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/dto/response/ShareInfo.java b/backend/src/main/java/com/twtw/backend/domain/group/dto/response/ShareInfo.java
@@ -0,0 +1,16 @@
+package com.twtw.backend.domain.group.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShareInfo {
+    private UUID groupId;
+    private UUID memberId;
+    private Boolean share;
+}
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
@@ -2,6 +2,7 @@
 
 import com.twtw.backend.domain.group.dto.request.MakeGroupDto;
 import com.twtw.backend.domain.group.dto.response.GroupInfoDto;
+import com.twtw.backend.domain.group.dto.response.ShareInfo;
 import com.twtw.backend.domain.group.entity.Group;
 import com.twtw.backend.domain.group.entity.GroupMember;
 import com.twtw.backend.domain.member.entity.Member;
@@ -21,6 +22,10 @@ public Group toGroupEntity(MakeGroupDto groupDto) {
     }
 
     public GroupInfoDto toGroupInfo(Group group){
-        return new GroupInfoDto(group.getId(),group.getLeader(),group.getName(),group.getGroupImage());
+        return new GroupInfoDto(group.getId(),group.getLeaderId(),group.getName(),group.getGroupImage());
+    }
+
+    public ShareInfo toShareInfo(GroupMember groupMember){
+        return new ShareInfo(groupMember.getGroup().getId(),groupMember.getMember().getId(),groupMember.getShare());
     }
 }
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,7 @@
 import com.twtw.backend.domain.group.dto.request.JoinGroupDto;
 import com.twtw.backend.domain.group.dto.request.MakeGroupDto;
 import com.twtw.backend.domain.group.dto.response.GroupInfoDto;
+import com.twtw.backend.domain.group.dto.response.ShareInfo;
 import com.twtw.backend.domain.group.entity.Group;
 import com.twtw.backend.domain.group.entity.GroupMember;
 import com.twtw.backend.domain.group.mapper.GroupMapper;
@@ -64,7 +65,13 @@ public void changeShare(UUID id){
         groupMember.changeShare();
     }
 
-    public void removeGroup(UUID groupId) {
-        // TODO()
+    @Transactional
+    public ShareInfo getShare(UUID id){
+        Member member = this.authService.getMemberByJwt();
+        GroupInfoDto groupInfo = getGroupById(id);
+
+        GroupMember groupMember = groupMemberRepository.findByGroupIdAndMemberId(groupInfo.getGroupId(),member.getId()).orElseThrow(EntityNotFoundException::new);
+
+        return groupMapper.toShareInfo(groupMember);
     }
 }