Merge pull request #40 from cheng521521/main

fix:add function get team detail
Dapp-Learning-DAO · Nov 2, 2023 · f1db20b · f1db20b
2 parents aa4021d + 37a7185
commit f1db20b
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 13 deletions.
diff --git a/src/main/java/com/dl/officialsite/common/enums/CodeEnums.java b/src/main/java/com/dl/officialsite/common/enums/CodeEnums.java
@@ -17,7 +17,8 @@ public enum CodeEnums {
     MEMBER_NOT_IN_TEAM("1004", "member not in team"),
 
     TEAM_NOT_EXIST("1005", "team not exist"),
-    LOGIN_IN("2001", "please login");
+    LOGIN_IN("2001", "please login"),
+    TEAM_ADMIN_NOT_EXIST("1006", "team admin not exist");
 
     private String code;
 

diff --git a/src/main/java/com/dl/officialsite/team/TeamController.java b/src/main/java/com/dl/officialsite/team/TeamController.java
@@ -79,8 +79,8 @@ BaseResponse getTeams(@RequestBody TeamQueryVo teamQueryVo, @RequestParam String
 
     @GetMapping("/id")
     BaseResponse getTeamById(@RequestParam Long teamId, @RequestParam String address) {
-        Team team = teamService.getTeamById(teamId);
-        return BaseResponse.successWithData(team);
+        TeamsMembersVo teamAndMembers = teamService.getTeamById(teamId);
+        return BaseResponse.successWithData(teamAndMembers);
     }
 
     /**

diff --git a/src/main/java/com/dl/officialsite/team/TeamMemberRepository.java b/src/main/java/com/dl/officialsite/team/TeamMemberRepository.java
@@ -17,6 +17,11 @@ public interface TeamMemberRepository extends JpaRepository<TeamMember, Long> {
     @Query(value = "select member_id from team_member where team_id = :team_id", nativeQuery = true)
     List<Long> findByTeamId(@Param("team_id")Long teamId);
 
+    @Query(value = "select member_id from team_member where team_id = :team_id and status = :status",
+        nativeQuery =
+        true)
+    List<Long> findByTeamIdStatus(@Param("team_id")Long teamId, @Param("status")int status);
+
     @Query(value = "select * from team_member where team_id = :team_id and member_id = :member_id",
         nativeQuery = true)
     Optional<TeamMember> findByTeamAndMember(@Param("team_id")Long teamId, @Param("member_id")Long memberId);

diff --git a/src/main/java/com/dl/officialsite/team/TeamService.java b/src/main/java/com/dl/officialsite/team/TeamService.java
@@ -1,5 +1,7 @@
 package com.dl.officialsite.team;
 
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.member;
+
 import com.dl.officialsite.common.constants.Constants;
 import com.dl.officialsite.common.enums.CodeEnums;
 import com.dl.officialsite.common.exception.BizException;
@@ -77,7 +79,7 @@ public javax.persistence.criteria.Predicate toPredicate(
             TeamsMembersVo teamsMembersVo = new TeamsMembersVo();
             BeanUtils.copyProperties(team, teamsMembersVo);
             List<Member> members = new ArrayList<>();
-            List<Long> memberIds = teamMemberRepository.findByTeamId(team.getId());
+            List<Long> memberIds = teamMemberRepository.findByTeamIdStatus(team.getId(), teamQueryVo.getStatus());
             memberIds.stream().forEach(memberId -> {
                 Member member = memberRepository.findById(memberId).get();
                 members.add(member);
@@ -90,11 +92,11 @@ public javax.persistence.criteria.Predicate toPredicate(
 
     public void join(TeamMemberJoinVO teamMember) {
         Member member = memberRepository.findById(teamMember.getMemberId()).get();
-        if (ObjectUtils.isEmpty(member.getTelegramId()) || ObjectUtils.isEmpty(
+/*        if (ObjectUtils.isEmpty(member.getTelegramId()) || ObjectUtils.isEmpty(
             member.getWechatId())) {
             throw new BizException(CodeEnums.TELEGRAM_WECHAT_NOT_BIND.getCode(),
                 CodeEnums.TELEGRAM_WECHAT_NOT_BIND.getMsg());
-        }
+        }*/
         //判断是否已经退出过团队
         Optional<TeamMember> optional = teamMemberRepository.findByTeamAndMember(
             teamMember.getTeamId()
@@ -112,6 +114,7 @@ public void join(TeamMemberJoinVO teamMember) {
 
     }
 
+    @Transactional(rollbackOn = Exception.class)
     public void approve(TeamMemberApproveVO teamMemberApproveVO) {
         List<Long> memberIds = teamMemberApproveVO.getMemberIds();
         List<TeamMember> teamMembers = new ArrayList<>();
@@ -127,11 +130,24 @@ public void approve(TeamMemberApproveVO teamMemberApproveVO) {
         teamMemberRepository.saveAll(teamMembers);
         //发送邮件
         Team team = teamRepository.findById(teamMemberApproveVO.getTeamId()).get();
-        String subject = team.getTeamName() + "团队新成员加入申请";
-        List<String> mailAddress = new ArrayList<>();
-        //todo 这里需要确认有那些管理员
-        if (mailAddress.size() != 0) {
-            emailService.memberExitTeam(mailAddress, subject, subject);
+        String administratorAddress = team.getAdministrator();
+        if (!ObjectUtils.isEmpty(administratorAddress) || !"".equals(administratorAddress)) {
+            Optional<Member> admin = memberRepository.findByAddress(administratorAddress);
+            if (admin.isPresent()) {
+                Member member = admin.get();
+                String email = member.getEmail();
+                String subject = team.getTeamName() + "团队新成员加入申请";
+                List<String> mailAddress = new ArrayList<>();
+                mailAddress.add(email);
+                emailService.memberExitTeam(mailAddress, subject, subject);
+            } else {
+                throw new BizException(CodeEnums.TEAM_ADMIN_NOT_EXIST.getCode(),
+                    CodeEnums.TEAM_ADMIN_NOT_EXIST.getMsg());
+            }
+
+        } else {
+            throw new BizException(CodeEnums.TEAM_ADMIN_NOT_EXIST.getCode(),
+                CodeEnums.TEAM_ADMIN_NOT_EXIST.getMsg());
         }
     }
 
@@ -174,16 +190,27 @@ public List<TeamVO> getMemberRole(Long memberId) {
                 Team team = teamRepository.findById(teamMember.getTeamId()).get();
                 TeamVO teamVO = new TeamVO();
                 BeanUtils.copyProperties(team, teamVO);
+                teamVO.setStatus(teamMember.getStatus());
                 teamVOS.add(teamVO);
             });
             return teamVOS;
         }
     }
 
-    public Team getTeamById(Long teamId) {
+    public TeamsMembersVo getTeamById(Long teamId) {
         Optional<Team> optional = teamRepository.findById(teamId);
         if (optional.isPresent()) {
-            return optional.get();
+            TeamsMembersVo teamsMembersVo = new TeamsMembersVo();
+            Team team = optional.get();
+            List<Member> members = new ArrayList<>();
+            List<Long> memberIds = teamMemberRepository.findByTeamId(team.getId());
+            memberIds.stream().forEach(memberId -> {
+                Member member = memberRepository.findById(memberId).get();
+                members.add(member);
+            });
+            teamsMembersVo.setMembers(members);
+            BeanUtils.copyProperties(team, teamsMembersVo);
+            return teamsMembersVo;
         } else {
             throw  new BizException(CodeEnums.TEAM_NOT_EXIST.getCode(),
                 CodeEnums.TEAM_NOT_EXIST.getMsg());

diff --git a/src/main/java/com/dl/officialsite/team/vo/TeamQueryVo.java b/src/main/java/com/dl/officialsite/team/vo/TeamQueryVo.java
@@ -12,4 +12,6 @@
 public class TeamQueryVo {
 
     private String teamName;
+
+    private int status;
 }
diff --git a/src/main/java/com/dl/officialsite/team/vo/TeamVO.java b/src/main/java/com/dl/officialsite/team/vo/TeamVO.java
@@ -12,6 +12,8 @@
 @Data
 public class TeamVO {
 
+    private Long id;
+
     private String teamName;
 
     private String teamProfile;
@@ -22,5 +24,7 @@ public class TeamVO {
     // dao admin , core contributor,  builder
     private String authority;
 
+    private int status;
+
     private List<Long> members;
 }