🚀 [Feature] - 호감 보내기, 수락, 번호오픈 구현

src/main/java/com/tikitaka/naechinso/domain/TestController.java

@@ -2,6 +2,11 @@
 
 import com.tikitaka.naechinso.domain.card.CardRepository;
 import com.tikitaka.naechinso.domain.card.CardService;
+import com.tikitaka.naechinso.domain.match.MatchRepository;
+import com.tikitaka.naechinso.domain.match.MatchService;
+import com.tikitaka.naechinso.domain.match.constant.MatchStatus;
+import com.tikitaka.naechinso.domain.match.dto.MatchResponseDTO;
+import com.tikitaka.naechinso.domain.match.entity.Match;
 import com.tikitaka.naechinso.domain.member.MemberDetailRepository;
 import com.tikitaka.naechinso.domain.member.MemberRepository;
 import com.tikitaka.naechinso.domain.member.MemberService;
@@ -14,11 +19,13 @@
 import com.tikitaka.naechinso.domain.recommend.RecommendService;
 import com.tikitaka.naechinso.domain.recommend.dto.RecommendBySenderRequestDTO;
 import com.tikitaka.naechinso.domain.recommend.dto.RecommendResponseDTO;
+import com.tikitaka.naechinso.global.annotation.AuthMember;
 import com.tikitaka.naechinso.global.config.CommonApiResponse;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -42,8 +49,10 @@ public class TestController {
     private final PendingService pendingService;
     private final CardService cardService;
     private final CardRepository cardRepository;
+    private final MatchService matchService;
+    private final MatchRepository matchRepository;
 
-    @GetMapping("/request-member")
+    @GetMapping("/create-recommend-request-member")
     @ApiOperation(value = "[*TEST*] 추천사를 요청하는 유저를 생성하고 엑세스 토큰을 반환한다")
     public CommonApiResponse<Object> generateRecommendRequestUser(
     ) {
@@ -66,8 +75,8 @@ public CommonApiResponse<Object> generateRecommendRequestUser(
         return CommonApiResponse.of(responseDTO);
     }
 
-    @GetMapping("/recommend-send")
-    @ApiOperation(value = "[*TEST*] 추천사를 요청하는 유저를 생성하고 엑세스 토큰을 반환한다")
+    @GetMapping("/create-recommend-received-member")
+    @ApiOperation(value = "[*TEST*] 추천사를 받은 멤버를 임시 유저로 가입시킨 후 엑세스 토큰을 반환한다")
     public CommonApiResponse<Object> generateRecommendReceiver(
     ) {
 
@@ -455,6 +464,22 @@ public CommonApiResponse<Object> createMultipleMembers() {
         return CommonApiResponse.of(accessToken);
     }
 
+    @GetMapping("/create-match")
+    @ApiOperation(value = "[*TEST*] 나에게 호감을 보낸 매칭을 하나 생성한다")
+    public CommonApiResponse<Object> dropAllTable(
+            @ApiIgnore @AuthMember Member member
+    ) {
+        Match match = Match.builder()
+                .fromMember(memberService.findById(20L))
+                .toMember(memberService.findByMember(member))
+                .status(MatchStatus.PENDING)
+                .build();
+
+        matchRepository.save(match);
+
+        return CommonApiResponse.of(MatchResponseDTO.of(match));
+    }
+
     @DeleteMapping("/drop-all-table")
     @ApiOperation(value = "[*TEST*] 모든 DB 테이블을 초기화")
     public CommonApiResponse<Object> dropAllTable(){

src/main/java/com/tikitaka/naechinso/domain/card/CardRepository.java

@@ -5,14 +5,11 @@
 import com.tikitaka.naechinso.domain.member.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
 import java.time.LocalDateTime;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-@Repository
 public interface CardRepository extends JpaRepository<Card, Long> {
     int countByIsActive(boolean isActive);
 

src/main/java/com/tikitaka/naechinso/domain/card/CardService.java

@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -55,7 +56,6 @@ public CardThumbnailResponseDTO createRandomCard(Member authMember) {
         if (cardRepository.existsByMemberAndIsActiveTrue(authMember)) {
             throw new BadRequestException(ErrorCode.ACTIVE_CARD_ALREADY_EXIST);
         }
-
         //하루에 세 장 이상 추천을 요청할 경우 에러
         if (countCardByMemberAndCreatedAtBetween(authMember) >= 3) {
             throw new BadRequestException(ErrorCode.CARD_LIMIT_EXCEED);
@@ -69,9 +69,13 @@ public CardThumbnailResponseDTO createRandomCard(Member authMember) {
         List<Long> existTargetMemberIds = member.getCards().stream().map(Card::getTargetMemberId).collect(Collectors.toList());
         existTargetMemberIds.add(member.getId());
 
-        //추천 받았던 적 없는 새로운 추천 상대 ( todo : 이 중에서 랜덤으로 골라야함 )
-        Member newTargetMember = memberRepository.findTopByIdNotInAndGenderNotAndDetailNotNull(existTargetMemberIds, memberGender)
-                .orElseThrow(() -> new NotFoundException(ErrorCode.RANDOM_USER_NOT_FOUND));
+        //추천 받았던 적 없는 새로운 추천 상대 리스트
+        List<Member> newTargetMemberList = memberRepository.findByIdNotInAndGenderNotAndDetailNotNull(existTargetMemberIds, memberGender);
+        if (newTargetMemberList.isEmpty()) {
+            throw new NotFoundException(ErrorCode.RANDOM_USER_NOT_FOUND);
+        }
+        //(0 ~ size) 사이의 랜덤 인덱스 멤버 추출
+        Member newTargetMember = newTargetMemberList.get(new Random().nextInt(newTargetMemberList.size()));
 
         Card newCard = Card.builder()
                 .member(member)
@@ -114,7 +118,7 @@ public Card findByMemberAndIsActiveTrue(Member member) {
      * */
     private long countCardByMemberAndCreatedAtBetween(Member member) {
         //서버 시간으로 00시00분부터 23시59분까지받은 카드 수 종합
-        LocalDateTime startDatetime = LocalDateTime.of(LocalDate.now().minusDays(1), LocalTime.of(0,0,0));
+        LocalDateTime startDatetime = LocalDateTime.of(LocalDate.now(), LocalTime.of(0,0,0));
         LocalDateTime endDatetime = LocalDateTime.of(LocalDate.now(), LocalTime.of(23,59,59));
         return cardRepository.countByMemberAndCreatedAtBetween(member, startDatetime, endDatetime);
     }

src/main/java/com/tikitaka/naechinso/domain/card/dto/CardThumbnailResponseDTO.java

@@ -4,10 +4,13 @@
 import com.tikitaka.naechinso.domain.member.constant.Gender;
 import com.tikitaka.naechinso.domain.member.dto.MemberOppositeProfileResponseDTO;
 import com.tikitaka.naechinso.domain.member.entity.Member;
+import com.tikitaka.naechinso.domain.recommend.entity.Recommend;
 import com.tikitaka.naechinso.global.error.ErrorCode;
 import com.tikitaka.naechinso.global.error.exception.NotFoundException;
 import lombok.*;
 
+import java.time.*;
+import java.util.Date;
 import java.util.List;
 
 @NoArgsConstructor
@@ -20,10 +23,12 @@ public class CardThumbnailResponseDTO {
     private Boolean isActive;
     private String createdAt;
 
+    @Builder.Default
+    private long dueDate = 0L;
+
     private List<String> images;
     private String name;
     private int age;
-
     private String address;
     private Gender gender;
 
@@ -35,8 +40,29 @@ public class CardThumbnailResponseDTO {
     private String eduMajor;
     private String eduLevel;
 
-    private String appeal;
+    private Recommendation recommend;
+
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Getter
+    @Builder
+    @ToString
+    private static class Recommendation {
+        private String name;
+        private Gender gender;
+        private String appeal;
+
+        private String jobName;
+        private String jobPart;
+        private String jobLocation;
+        private String eduName;
+        private String eduMajor;
+        private String eduLevel;
 
+        private String meet;
+        private String period;
+        private String appealDetail;
+    }
 
     public static CardThumbnailResponseDTO of(Card card, Member targetMember) {
         if (targetMember == null) {
@@ -50,6 +76,7 @@ public static CardThumbnailResponseDTO of(Card card, Member targetMember) {
                 .targetMemberId(card.getTargetMemberId())
                 .isActive(card.getIsActive())
                 .createdAt(card.getCreatedAt().toString())
+                .dueDate(generateDueDate(card.getCreatedAt()))
                 .images(targetMember.getDetail().getImages())
                 .name(dto.getName())
                 .age(dto.getAge())
@@ -61,7 +88,29 @@ public static CardThumbnailResponseDTO of(Card card, Member targetMember) {
                 .eduMajor(dto.getEduMajor())
                 .eduLevel(dto.getEduLevel())
                 .gender(dto.getGender())
-                .appeal(dto.getAppeal())
+                .recommend(Recommendation.builder()
+                        .name(dto.getRecommend().getName())
+                        .gender(dto.getRecommend().getGender())
+                        .appeal(dto.getRecommend().getAppeal())
+                        .jobName(dto.getRecommend().getJobName())
+                        .jobLocation(dto.getRecommend().getJobLocation())
+                        .jobPart(dto.getRecommend().getJobPart())
+                        .eduName(dto.getRecommend().getEduName())
+                        .eduMajor(dto.getRecommend().getEduMajor())
+                        .eduLevel(dto.getRecommend().getEduLevel())
+                        .meet(dto.getRecommend().getMeet())
+                        .period(dto.getRecommend().getPeriod())
+                        .appealDetail(dto.getRecommend().getAppealDetail())
+                        .build())
                 .build();
     }
+
+    private static long generateDueDate(LocalDateTime createdAt) {
+        LocalDateTime endDatetime = LocalDateTime.of(createdAt.toLocalDate().plusDays(7), LocalTime.of(23,59,59));
+        long dueDate = Duration.between(LocalDateTime.now(), endDatetime).toDays();
+        if (dueDate < 0) {
+            return 0;
+        }
+        return dueDate;
+    }
 }

src/main/java/com/tikitaka/naechinso/domain/card/entity/Card.java

@@ -12,7 +12,7 @@
  * @author gengminy 220924
  * */
 @Entity
-@Table(name = "card")
+@Table(name = "Card")
 @Getter
 @Builder
 @AllArgsConstructor

src/main/java/com/tikitaka/naechinso/domain/match/MatchController.java

@@ -1,29 +1,74 @@
 package com.tikitaka.naechinso.domain.match;
 
+import com.tikitaka.naechinso.domain.card.CardService;
 import com.tikitaka.naechinso.domain.match.dto.MatchListResponseDTO;
 import com.tikitaka.naechinso.domain.match.dto.MatchResponseDTO;
+import com.tikitaka.naechinso.domain.match.dto.MatchThumbnailResponseDTO;
 import com.tikitaka.naechinso.domain.member.entity.Member;
 import com.tikitaka.naechinso.global.annotation.AuthMember;
 import com.tikitaka.naechinso.global.config.CommonApiResponse;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequestMapping("/match")
 @RequiredArgsConstructor
 public class MatchController {
     private final MatchService matchService;
-    @GetMapping
-    @ApiOperation(value = "매칭페이지에 진입 시 자신의 모든 매칭 정보를 가져온다 (AccessToken)")
-    public CommonApiResponse<MatchListResponseDTO> getAllMatchByMember(
+    private final CardService cardService;
+    @GetMapping("/receive")
+    @ApiOperation(value = "내가 받은 호감 정보를 가져온다 (AccessToken)")
+    public CommonApiResponse<List<MatchThumbnailResponseDTO>> getAllMatchByMemberFrom(
+            @ApiIgnore @AuthMember Member member
+    ) {
+        return CommonApiResponse.of(matchService.findAllByToMember(member));
+    }
+
+    @GetMapping("/send")
+    @ApiOperation(value = "내가 보낸 호감 정보를 가져온다 (AccessToken)")
+    public CommonApiResponse<List<MatchThumbnailResponseDTO>> getAllMatchByMemberTo(
+            @ApiIgnore @AuthMember Member member
+    ) {
+        return CommonApiResponse.of(matchService.findAllByFromMember(member));
+    }
+
+    @GetMapping("/complete")
+    @ApiOperation(value = "서로 호감을 보낸 성사된 매칭 정보를 가져온다 (AccessToken)")
+    public CommonApiResponse<List<MatchThumbnailResponseDTO>> getAllCompleteMatchByMember(
+            @ApiIgnore @AuthMember Member member
+    ) {
+        return CommonApiResponse.of(matchService.findAllByMatchComplete(member));
+    }
+
+    @PostMapping("/like")
+    @ApiOperation(value = "현재 활성화된 카드의 상대에게 호감을 보낸다 (AccessToken)")
+    public CommonApiResponse<MatchResponseDTO> like(
+            @ApiIgnore @AuthMember Member member
+    ) {
+        return CommonApiResponse.of(matchService.like(member));
+    }
+
+    @PostMapping("/{id}/accept")
+    @ApiOperation(value = "현재 호감을 보낸 상대를 수락하여 매칭을 성사시킨다 (AccessToken)")
+    public CommonApiResponse<MatchResponseDTO> accept(
+            @PathVariable("id") Long id,
+            @ApiIgnore @AuthMember Member member
+    ) {
+        return CommonApiResponse.of(matchService.accept(member, id));
+    }
+
+    @PostMapping("/{id}/open")
+    @ApiOperation(value = "현재 호감을 보낸 상대의 번호 오픈을 요청한다 (AccessToken)")
+    public CommonApiResponse<MatchResponseDTO> openPhone(
+            @PathVariable("id") Long id,
             @ApiIgnore @AuthMember Member member
     ) {
-        return CommonApiResponse.of(matchService.findAllByMember(member));
+        return CommonApiResponse.of(matchService.openPhone(member, id));
     }
 }

src/main/java/com/tikitaka/naechinso/domain/match/MatchRepository.java

@@ -1,16 +1,60 @@
 package com.tikitaka.naechinso.domain.match;
 
+import com.tikitaka.naechinso.domain.match.constant.MatchStatus;
+import com.tikitaka.naechinso.domain.match.dto.MatchResponseDTO;
 import com.tikitaka.naechinso.domain.match.entity.Match;
 import com.tikitaka.naechinso.domain.member.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 import java.util.Optional;
 
-@Repository
 public interface MatchRepository extends JpaRepository<Match, Long> {
 
-    List<Match> findAllByFromMember(Member member);
-    List<Match> findAllByToMember(Member member);
+    /* OPEN 이나 ACCEPT 상태가 아닌 것들만 가져와야함 */
+
+    List<Match> findAllByFromMemberAndStatusNotIn(Member member, List<MatchStatus> statusList);
+
+    List<Match> findAllByToMemberAndStatusNotIn(Member member, List<MatchStatus> statusList);
+
+    @Query("SELECT m " +
+            "FROM Match m " +
+            "JOIN m.toMember t " +
+            "WHERE t = :member " +
+            "AND m.status <> com.tikitaka.naechinso.domain.match.constant.MatchStatus.ACCEPTED " +
+            "AND m.status <> com.tikitaka.naechinso.domain.match.constant.MatchStatus.OPEN")
+    List<Match> findAllByToMemberNotComplete(Member member);
+
+    @Query("SELECT m " +
+            "FROM Match m " +
+            "JOIN m.fromMember f " +
+            "WHERE f = :member " +
+            "AND m.status <> com.tikitaka.naechinso.domain.match.constant.MatchStatus.ACCEPTED " +
+            "AND m.status <> com.tikitaka.naechinso.domain.match.constant.MatchStatus.OPEN")
+    List<Match> findAllByFromMemberNotComplete(Member member);
+
+    @Query("SELECT m " +
+            "FROM Match m " +
+            "JOIN m.fromMember f JOIN m.toMember t " +
+            "WHERE (f = :member OR t = :member) " +
+            "AND (m.status = com.tikitaka.naechinso.domain.match.constant.MatchStatus.ACCEPTED " +
+            "OR m.status = com.tikitaka.naechinso.domain.match.constant.MatchStatus.OPEN)")
+    List<Match> findAllByMemberComplete(Member member);
+
+    @Query("SELECT m " +
+            "FROM Match m " +
+            "JOIN m.fromMember f JOIN m.toMember t " +
+            "WHERE m.id = :id AND (f = :member OR t = :member) " +
+            "AND m.status = com.tikitaka.naechinso.domain.match.constant.MatchStatus.ACCEPTED")
+    Optional<Match> findAllByIdAndMemberAndStatusIsAccept(Long id, Member member);
+
+    Optional<Match> findByIdAndToMemberAndStatus(Long id, Member member, MatchStatus status);
+
+    Optional<Match> findByIdAndStatus(Long id, MatchStatus status);
+
+//    @Query("select new com.tikitaka.naechinso.domain.match.dto.MatchResponseDTO(mat, m1, m2) " +
+//            "from Match mat " +
+//            "join mat.toMember m1, mat.fromMember m2")
+//    List<MatchResponseDTO> findAllDTO();
 }