Merge pull request #112 from Hanaemong/hyeonu

Feat: get nickname #111
Hanaemong · Jul 8, 2024 · f6c0549 · f6c0549
2 parents bbb9fdd + b6b08b5
commit f6c0549
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/src/main/java/com/hana/hanalink/teammember/controller/TeamMemberController.java b/src/main/java/com/hana/hanalink/teammember/controller/TeamMemberController.java
@@ -4,6 +4,7 @@
 import com.hana.hanalink.common.dto.SuccessResponse;
 import com.hana.hanalink.meetingacount.service.MeetingAccountService;
 import com.hana.hanalink.member.domain.MemberDetails;
+import com.hana.hanalink.teammember.dto.MyTeamMemberRes;
 import com.hana.hanalink.teammember.dto.TeamMemberRes;
 import com.hana.hanalink.teammember.dto.TeamMemberRoleChangeReq;
 import com.hana.hanalink.teammember.service.TeamMemberService;
@@ -27,10 +28,16 @@ public SuccessResponse<List<TeamMemberRes>> getTeamMemberList(@PathVariable("tea
         return SuccessResponse.success(teamMemberService.getTeamMembers(teamId));
     }
 
+    @GetMapping("/my/{teamId}")
+    public SuccessResponse<MyTeamMemberRes> getMyNickname(@AuthenticationPrincipal MemberDetails member, @PathVariable("teamId") Long teamId) {
+        return SuccessResponse.success(teamMemberService.getMyNickname(member, teamId));
+    }
+
     /*모임원 내보내기*/
     @DeleteMapping("/{teamMemberId}")
     public SuccessResponse<Long> deleteTeamMember(@PathVariable("teamMemberId") Long teamMemberId, @RequestParam("type") String type, @AuthenticationPrincipal MemberDetails member) {
-        teamMemberService.deleteTeamMember(teamMemberId,type,member);
+
+        teamMemberService.deleteTeamMember(teamMemberId, type, member);
         return SuccessResponse.successWithNoData();
     }
 

diff --git a/src/main/java/com/hana/hanalink/teammember/dto/MyTeamMemberRes.java b/src/main/java/com/hana/hanalink/teammember/dto/MyTeamMemberRes.java
@@ -0,0 +1,4 @@
+package com.hana.hanalink.teammember.dto;
+
+public record MyTeamMemberRes(String nickname) {
+}
diff --git a/src/main/java/com/hana/hanalink/teammember/dto/TeamMemberRes.java b/src/main/java/com/hana/hanalink/teammember/dto/TeamMemberRes.java
@@ -4,5 +4,6 @@
 import lombok.Builder;
 
 @Builder
-public record TeamMemberRes(Long teamMemberId,String profile, String nickName, String gender, TeamMemberRole role) {
+public record TeamMemberRes(Long teamMemberId, String profile, String nickName, String gender, TeamMemberRole role) {
+
 }
diff --git a/src/main/java/com/hana/hanalink/teammember/dto/TeamMemberRoleChangeReq.java b/src/main/java/com/hana/hanalink/teammember/dto/TeamMemberRoleChangeReq.java
@@ -1,4 +1,5 @@
 package com.hana.hanalink.teammember.dto;
 
-public record TeamMemberRoleChangeReq( Long ToChairId){
+public record TeamMemberRoleChangeReq(Long ToChairId) {
+
 }
diff --git a/src/main/java/com/hana/hanalink/teammember/repository/TeamMemberRepository.java b/src/main/java/com/hana/hanalink/teammember/repository/TeamMemberRepository.java
@@ -14,15 +14,10 @@ public interface TeamMemberRepository extends JpaRepository<TeamMember,Long> {
     List<TeamMember> findTeamMemberByTeam_TeamId(Long teamId);
     List<TeamMember> findTeamMembersByTeam_TeamIdAndRole(Long teamId, TeamMemberRole role);
     Integer countByTeamAndRoleNot(Team team, TeamMemberRole role);
-
     TeamMember findTeamMemberByTeam_TeamIdAndRole(Long teamId, TeamMemberRole role);
     List<TeamMember> findByMember(Member member);
-
     Optional<TeamMember> findByMemberAndTeam(Member member, Team team);
-
     Optional<TeamMember> findByMemberAndTeam_TeamId(Member member, Long teamId);
-
     Boolean existsByNickname(String nickname);
 
-
 }
diff --git a/src/main/java/com/hana/hanalink/teammember/service/TeamMemberService.java b/src/main/java/com/hana/hanalink/teammember/service/TeamMemberService.java
@@ -6,8 +6,12 @@
 import com.hana.hanalink.member.domain.MemberDetails;
 import com.hana.hanalink.member.exception.MemberNotFoundException;
 import com.hana.hanalink.member.repository.MemberRepository;
+import com.hana.hanalink.team.domain.Team;
+import com.hana.hanalink.team.exception.TeamNotFoundException;
+import com.hana.hanalink.team.repository.TeamRepository;
 import com.hana.hanalink.teammember.domain.TeamMember;
 import com.hana.hanalink.teammember.domain.TeamMemberRole;
+import com.hana.hanalink.teammember.dto.MyTeamMemberRes;
 import com.hana.hanalink.teammember.dto.TeamMemberRes;
 import com.hana.hanalink.teammember.exception.TeamMemberNotFoundException;
 import com.hana.hanalink.teammember.repository.TeamMemberRepository;
@@ -16,11 +20,13 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
 public class TeamMemberService {
 
+    private final TeamRepository teamRepository;
     private final TeamMemberRepository teamMemberRepository;
     private final FirebaseFcmService firebaseFcmService;
     private final MemberRepository memberRepository;
@@ -31,6 +37,14 @@ public List<TeamMemberRes> getTeamMembers(Long teamId) {
                 ).toList();
     }
 
+    public MyTeamMemberRes getMyNickname(MemberDetails memberDetails, Long teamId) {
+        Member member = memberRepository.findByPhone(memberDetails.getUsername()).orElseThrow(MemberNotFoundException::new);
+        Team team = teamRepository.findById(teamId).orElseThrow(TeamNotFoundException::new);
+        TeamMember teamMember = teamMemberRepository.findByMemberAndTeam(member, team).orElseThrow(TeamMemberNotFoundException::new);
+
+        return new MyTeamMemberRes(teamMember.getNickname());
+    }
+
     @Transactional
     public void deleteTeamMember(Long teamMemberId, String type, MemberDetails memberDetails) {
         TeamMember teamMember = teamMemberRepository.findById(teamMemberId).orElseThrow(TeamMemberNotFoundException::new);