Merge pull request #386 from mash-up-kr/feature/add-member-gen

add transfer api
mash-up-kr · Dec 16, 2023 · 68bcee6 · 68bcee6
2 parents 667b2d1 + 98ba4ec
commit 68bcee6
Show file tree

Hide file tree

Showing 21 changed files with 286 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ out/
 
 ### VS Code ###
 .vscode/
+/mashup-domain/src/main/generated/
diff --git a/mashup-admin/src/main/java/kr/mashup/branding/facade/member/MemberFacadeService.java b/mashup-admin/src/main/java/kr/mashup/branding/facade/member/MemberFacadeService.java
@@ -1,25 +1,22 @@
 package kr.mashup.branding.facade.member;
 
 import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import kr.mashup.branding.domain.member.MemberGeneration;
-import kr.mashup.branding.domain.member.MemberStatus;
+import kr.mashup.branding.domain.member.*;
+import kr.mashup.branding.service.member.CurrentMemberStatusCalculationService;
+import kr.mashup.branding.ui.member.request.MemberDropOutRequest;
 import kr.mashup.branding.ui.member.request.MemberStatusUpdateRequest;
+import kr.mashup.branding.ui.member.request.MemberTransferRequest;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import kr.mashup.branding.domain.generation.Generation;
-import kr.mashup.branding.domain.member.Member;
-import kr.mashup.branding.domain.member.Platform;
 import kr.mashup.branding.repository.member.MemberRepositoryCustomImpl.MemberScoreQueryResult;
 import kr.mashup.branding.service.generation.GenerationService;
 import kr.mashup.branding.service.member.MemberService;
@@ -38,27 +35,43 @@ public class MemberFacadeService {
     private final MemberService memberService;
     private final GenerationService generationService;
     private final ScoreHistoryService scoreHistoryService;
+    private final CurrentMemberStatusCalculationService currentMemberStatusCalculationService;
 
     @Transactional(readOnly = true)
-    public Page<MemberResponse> getAllNotRun(Integer generationNumber, Platform platform, String searchName, Pageable pageable) {
+    public Page<MemberResponse> getAll(
+        final Integer generationNumber,
+        final Platform platform,
+        final String searchName,
+        final Pageable pageable
+    ) {
 
         final Generation generation = generationService.getByNumberOrThrow(generationNumber);
 
         final Page<MemberScoreQueryResult> queryResults
                 = memberService.getActiveAllByGeneration(generation, platform, searchName, pageable);
 
         final List<MemberResponse> response = new ArrayList<>();
+        final List<Member> members =
+            queryResults
+                .getContent()
+                .stream()
+                .map(MemberScoreQueryResult::getMember)
+                .collect(Collectors.toList());
+        final Map<Long, CurrentMemberStatus> currentStatus =
+            currentMemberStatusCalculationService.getCurrentStatus(generation, members);
 
         for (final MemberScoreQueryResult result : queryResults) {
 
             final Member member = result.getMember();
+            final MemberGeneration memberGeneration = result.getMemberGeneration();
 
-            final MemberResponse memberResponse = MemberResponse.of(member.getId(),
+            final MemberResponse memberResponse = MemberResponse.of(
+                member.getId(),
                 member.getName(),
                 member.getIdentification(),
-                result.getPlatform().name(),
+                memberGeneration.getPlatform().name(),
                 result.getScore(),
-                member.getStatus());
+                currentStatus.get(member.getId()));
 
             response.add(memberResponse);
         }
@@ -123,7 +136,25 @@ public void updateMemberStatus(Integer generationNumber, MemberStatusUpdateReque
 
         final List<Long> memberIds = memberStatusUpdateRequest.getMemberIds();
 
-        List<Member> members = memberIds.stream().map(memberService::findMemberById).collect(Collectors.toList());
+        final List<Member> members = memberIds.stream().map(memberService::findMemberById).collect(Collectors.toList());
         memberService.updateStatus(memberStatus, generation, memberStatusUpdateRequest.getPlatform(), members);
     }
+
+    @Transactional
+    public void transfer(final MemberTransferRequest request) {
+
+        final Generation oldGeneration = generationService.getByNumberOrThrow(request.getOldGenerationNumber());
+        final Generation newGeneration = generationService.getByNumberOrThrow(request.getNewGenerationNumber());
+        final List<Member> members = memberService.findAllByMemberIds(request.getMemberIds());
+
+        memberService.transfer(oldGeneration, newGeneration, members);
+    }
+
+    @Transactional
+    public void dropOut(final MemberDropOutRequest request) {
+        final Generation generation = generationService.getByNumberOrThrow(request.getGenerationNumber());
+        final List<Member> members = memberService.findAllByMemberIds(request.getMemberIds());
+
+        memberService.dropOut(generation, members);
+    }
 }
diff --git a/mashup-admin/src/main/java/kr/mashup/branding/ui/adminmember/AdminMemberController.java b/mashup-admin/src/main/java/kr/mashup/branding/ui/adminmember/AdminMemberController.java
@@ -5,7 +5,12 @@
 import kr.mashup.branding.domain.adminmember.vo.AdminLoginCommand;
 import kr.mashup.branding.domain.adminmember.vo.AdminMemberSignUpCommand;
 import kr.mashup.branding.domain.adminmember.vo.AdminMemberVo;
-import kr.mashup.branding.ui.adminmember.vo.*;
+import kr.mashup.branding.ui.adminmember.vo.AdminDeleteRequest;
+import kr.mashup.branding.ui.adminmember.vo.AdminMemberResponse;
+import kr.mashup.branding.ui.adminmember.vo.AdminPasswordChangeRequest;
+import kr.mashup.branding.ui.adminmember.vo.AdminPasswordResetRequest;
+import kr.mashup.branding.ui.adminmember.vo.LoginRequest;
+import kr.mashup.branding.ui.adminmember.vo.LoginResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/mashup-admin/src/main/java/kr/mashup/branding/ui/member/MemberController.java b/mashup-admin/src/main/java/kr/mashup/branding/ui/member/MemberController.java
@@ -2,7 +2,9 @@
 
 import java.util.List;
 
+import kr.mashup.branding.ui.member.request.MemberDropOutRequest;
 import kr.mashup.branding.ui.member.request.MemberStatusUpdateRequest;
+import kr.mashup.branding.ui.member.request.MemberTransferRequest;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
@@ -33,7 +35,8 @@ public ApiResponse<List<MemberResponse>> getAllByGeneration(
         @RequestParam(value = "platform", required = false) Platform platform,
         @RequestParam(value = "searchName", required = false) String searchName
     ) {
-        Page<MemberResponse> response = memberFacadeService.getAllNotRun(generationNumber, platform, searchName, pageable);
+        final Page<MemberResponse> response =
+            memberFacadeService.getAll(generationNumber, platform, searchName, pageable);
 
         return ApiResponse.success(response);
     }
@@ -43,8 +46,8 @@ public ApiResponse<List<MemberResponse>> getAllByGeneration(
     public ApiResponse<MemberDetailResponse> getByID(
         @PathVariable Integer generationNumber,
         @PathVariable Long memberId
-    ){
-        MemberDetailResponse response = memberFacadeService.getAttendance(generationNumber, memberId);
+    ) {
+        final MemberDetailResponse response = memberFacadeService.getAttendance(generationNumber, memberId);
 
         return ApiResponse.success(response);
     }
@@ -60,8 +63,8 @@ public ApiResponse<EmptyResponse> resetPassword(
         return ApiResponse.success();
     }
 
-    @ApiOperation("회원 강제 탈퇴")
-    @DeleteMapping("/{memberId}")
+    @ApiOperation("멤버 전체 기수 활동 내역 삭제 및 멤버 삭제")
+    @DeleteMapping
     public ApiResponse<EmptyResponse> withdraw(
         @PathVariable Long memberId
     ) {
@@ -70,14 +73,34 @@ public ApiResponse<EmptyResponse> withdraw(
         return ApiResponse.success();
     }
 
+    @ApiOperation("특정 기수 중도 하차 처리")
+    @DeleteMapping("/drop-out")
+    public ApiResponse<EmptyResponse> dropOut(
+        @RequestBody MemberDropOutRequest request
+    ) {
+        memberFacadeService.dropOut(request);
+
+        return ApiResponse.success();
+    }
+
     @ApiOperation("멤버 상태 변경")
     @PostMapping("/status/{generationNumber}")
     public ApiResponse<EmptyResponse> updateMemberStatus(
-            @PathVariable Integer generationNumber,
-            @RequestBody MemberStatusUpdateRequest memberStatusUpdateRequest
+        @PathVariable Integer generationNumber,
+        @RequestBody MemberStatusUpdateRequest memberStatusUpdateRequest
     ) {
         memberFacadeService.updateMemberStatus(generationNumber, memberStatusUpdateRequest);
 
         return ApiResponse.success();
     }
+
+    @ApiOperation("새로운 기수로 멤버 이관")
+    @PostMapping("/transfer")
+    public ApiResponse<EmptyResponse> transferMemberToNewGeneration(
+        @RequestBody MemberTransferRequest memberTransferRequest
+    ){
+        memberFacadeService.transfer(memberTransferRequest);
+
+        return ApiResponse.success();
+    }
 }
diff --git a/mashup-admin/src/main/java/kr/mashup/branding/ui/member/request/MemberDropOutRequest.java b/mashup-admin/src/main/java/kr/mashup/branding/ui/member/request/MemberDropOutRequest.java
@@ -0,0 +1,12 @@
+package kr.mashup.branding.ui.member.request;
+
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class MemberDropOutRequest {
+
+    private List<Long> memberIds;
+    private Integer generationNumber;
+}
diff --git a/mashup-admin/src/main/java/kr/mashup/branding/ui/member/request/MemberTransferRequest.java b/mashup-admin/src/main/java/kr/mashup/branding/ui/member/request/MemberTransferRequest.java
@@ -0,0 +1,12 @@
+package kr.mashup.branding.ui.member.request;
+
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class MemberTransferRequest {
+    private Integer oldGenerationNumber;
+    private Integer newGenerationNumber;
+    private List<Long> memberIds;
+}
diff --git a/mashup-admin/src/main/java/kr/mashup/branding/ui/member/response/MemberResponse.java b/mashup-admin/src/main/java/kr/mashup/branding/ui/member/response/MemberResponse.java
@@ -1,5 +1,6 @@
 package kr.mashup.branding.ui.member.response;
 
+import kr.mashup.branding.domain.member.CurrentMemberStatus;
 import kr.mashup.branding.domain.member.MemberStatus;
 import lombok.Getter;
 import lombok.Value;
@@ -12,5 +13,6 @@ public class MemberResponse {
     private String identification;
     private String platform;
     private Double score;
-    private MemberStatus memberStatus;
+    private CurrentMemberStatus memberStatus;
+
 }
diff --git a/mashup-domain/src/main/java/kr/mashup/branding/domain/adminmember/entity/AdminMember.java b/mashup-domain/src/main/java/kr/mashup/branding/domain/adminmember/entity/AdminMember.java
@@ -15,7 +15,7 @@
 
 @Entity
 @Getter
-@ToString(of = {"adminMemberId", "username", "phoneNumber", "position", "createdAt", "updatedAt"})
+@ToString(of = {"adminMemberId", "username", "position", "createdAt", "updatedAt"})
 @EqualsAndHashCode(of = "adminMemberId")
 @EntityListeners(AuditingEntityListener.class)
 public class AdminMember {

diff --git a/mashup-domain/src/main/java/kr/mashup/branding/domain/generation/Generation.java b/mashup-domain/src/main/java/kr/mashup/branding/domain/generation/Generation.java
@@ -72,6 +72,10 @@ public void changeEndedDate(LocalDate newEndedDate){
         this.endedAt = newEndedDate;
     }
 
+    public boolean isInProgress(LocalDate baseTime){
+        return DateUtil.isInTime(startedAt, baseTime, endedAt);
+    }
+
     public GenerationStatus getStatus(){
 
         // 현재 일자 기준으로 기수 종료일자가 미래이거나 같은 경우

diff --git a/mashup-domain/src/main/java/kr/mashup/branding/domain/member/CurrentMemberStatus.java b/mashup-domain/src/main/java/kr/mashup/branding/domain/member/CurrentMemberStatus.java
@@ -0,0 +1,5 @@
+package kr.mashup.branding.domain.member;
+
+public enum CurrentMemberStatus {
+    ACTIVE, END, DROP_OUT, TRANSFER
+}
diff --git a/mashup-domain/src/main/java/kr/mashup/branding/domain/member/MemberGeneration.java b/mashup-domain/src/main/java/kr/mashup/branding/domain/member/MemberGeneration.java
@@ -29,6 +29,9 @@ public class MemberGeneration extends BaseEntity {
 
     private String role;
 
+    @Enumerated(EnumType.STRING)
+    private MemberGenerationStatus status;
+
     public static MemberGeneration of(Member member, Generation generation, Platform platform){
         return new MemberGeneration(member, generation, platform);
     }
@@ -40,13 +43,18 @@ private MemberGeneration(Member member, Generation generation, Platform platform
         this.member = member;
         this.generation = generation;
         this.platform = platform;
+        this.status = MemberGenerationStatus.ACTIVE;
     }
 
-    public void update(
-            String projectTeamName,
-            String role
+    public void updateProjectInfo(
+        String projectTeamName,
+        String role
     ) {
         this.projectTeamName = projectTeamName;
         this.role = role;
     }
+
+    public void dropOut(){
+        this.status = MemberGenerationStatus.DROP_OUT;
+    }
 }
diff --git a/mashup-domain/src/main/java/kr/mashup/branding/domain/member/MemberGenerationStatus.java b/mashup-domain/src/main/java/kr/mashup/branding/domain/member/MemberGenerationStatus.java
@@ -0,0 +1,11 @@
+package kr.mashup.branding.domain.member;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum MemberGenerationStatus {
+    ACTIVE("정상 활동"),
+    DROP_OUT("중도 하차");
+
+    private final String description;
+}
diff --git a/.../src/main/java/kr/mashup/branding/repository/member/MemberGenerationRepositoryCustom.java b/.../src/main/java/kr/mashup/branding/repository/member/MemberGenerationRepositoryCustom.java
@@ -2,8 +2,11 @@
 
 import kr.mashup.branding.domain.member.MemberGeneration;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface MemberGenerationRepositoryCustom {
     Optional<MemberGeneration> findByMemberIdAndGenerationNumber(Long memberId, Integer generationNumber);
+
+    List<MemberGeneration> findByMemberIdsAndGenerationNumber(List<Long> memberIds, Integer generationNumber);
 }
diff --git a/.../main/java/kr/mashup/branding/repository/member/MemberGenerationRepositoryCustomImpl.java b/.../main/java/kr/mashup/branding/repository/member/MemberGenerationRepositoryCustomImpl.java
@@ -4,9 +4,11 @@
 import kr.mashup.branding.domain.member.MemberGeneration;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
 import java.util.Optional;
 
 import static kr.mashup.branding.domain.generation.QGeneration.generation;
+import static kr.mashup.branding.domain.member.QMember.member;
 import static kr.mashup.branding.domain.member.QMemberGeneration.memberGeneration;
 
 @RequiredArgsConstructor
@@ -18,9 +20,20 @@ public Optional<MemberGeneration> findByMemberIdAndGenerationNumber(Long memberI
         return Optional.ofNullable(queryFactory
             .selectFrom(memberGeneration)
             .join(memberGeneration.generation, generation)
-            .where(memberGeneration.member.id.eq(memberId), generation.number.eq(generationNumber))
+            .join(memberGeneration.member, member)
+            .where(member.id.eq(memberId), generation.number.eq(generationNumber))
             .fetchOne()
         );
     }
+
+    @Override
+    public List<MemberGeneration> findByMemberIdsAndGenerationNumber(List<Long> memberIds, Integer generationNumber) {
+        return queryFactory
+            .selectFrom(memberGeneration)
+            .join(memberGeneration.member, member).fetchJoin()
+            .join(memberGeneration.generation, generation)
+            .where(member.id.in(memberIds), generation.number.eq(generationNumber))
+            .fetch();
+    }
 }
 
diff --git a/mashup-domain/src/main/java/kr/mashup/branding/repository/member/MemberRepository.java b/mashup-domain/src/main/java/kr/mashup/branding/repository/member/MemberRepository.java
@@ -14,9 +14,4 @@ public interface MemberRepository extends JpaRepository<Member, Long>, MemberRep
 
     Boolean existsByIdentification(String identification);
 
-    Page<Member> findAllByStatus(MemberStatus status, Pageable pageable);
-}
-/**
- * Member 연관관계
- * one to many : memberGeneration, attendance
- */
+}
diff --git a/mashup-domain/src/main/java/kr/mashup/branding/repository/member/MemberRepositoryCustom.java b/mashup-domain/src/main/java/kr/mashup/branding/repository/member/MemberRepositoryCustom.java
@@ -13,9 +13,7 @@
 
 public interface MemberRepositoryCustom {
 
-    Page<MemberScoreQueryResult> findAllNotRunByGeneration(Generation generation, Platform platform, String searchName, Pageable pageable);
-
-    Long countActiveByPlatformAndGeneration(Platform platform, Generation generation);
+    Page<MemberScoreQueryResult> findAllByGeneration(Generation generation, Platform platform, String searchName, Pageable pageable);
 
     List<Member> findActiveByPlatformAndGeneration(Platform platform, Generation generation);
 
@@ -25,7 +23,3 @@ public interface MemberRepositoryCustom {
 
     List<Member> findAllActiveByGeneration(Generation generation);
 }
-/**
- * Member 연관관계
- * one to many : memberGeneration, attendance
- */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,3 +35,4 @@ out/

		### VS Code ###
		.vscode/
		/mashup-domain/src/main/generated/