feat(meeting): Implementation of features related to meeting requests

src/main/java/com/e2i/wemeet/config/h2/H2DatabaseRunnerConfig.java

@@ -23,7 +23,7 @@ public class H2DatabaseRunnerConfig {
         """;
 
     @Bean
-    @Profile("default")
+    @Profile("!(prod | dev)")
     ApplicationRunner applicationRunner(final DataSource dataSource,
         final H2ConsoleProperties h2ConsoleProperties) {
         return args -> {

src/main/java/com/e2i/wemeet/config/resolver/member/MemberIdArgumentResolver.java

@@ -32,7 +32,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
         Object principal = SecurityContextHolder.getContext()
             .getAuthentication().getPrincipal();
 
-        if (!(principal instanceof MemberPrincipal memberPrincipal)) {
+        if (!(principal instanceof MemberPrincipal memberPrincipal) || memberPrincipal.getMemberId() == null) {
             throw new AccessTokenNotFoundException();
         }
 

src/main/java/com/e2i/wemeet/controller/meeting/MeetingController.java

@@ -0,0 +1,95 @@
+package com.e2i.wemeet.controller.meeting;
+
+import com.e2i.wemeet.config.resolver.member.MemberId;
+import com.e2i.wemeet.domain.meeting.data.AcceptStatus;
+import com.e2i.wemeet.dto.request.meeting.MeetingRequestAcceptDto;
+import com.e2i.wemeet.dto.request.meeting.SendMeetingRequestDto;
+import com.e2i.wemeet.dto.request.meeting.SendMeetingWithMessageRequestDto;
+import com.e2i.wemeet.dto.response.ResponseDto;
+import com.e2i.wemeet.dto.response.meeting.AcceptedMeetingResponseDto;
+import com.e2i.wemeet.dto.response.meeting.ReceivedMeetingResponseDto;
+import com.e2i.wemeet.dto.response.meeting.SentMeetingResponseDto;
+import com.e2i.wemeet.service.meeting.MeetingHandleService;
+import com.e2i.wemeet.service.meeting.MeetingListService;
+import jakarta.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RequestMapping("/v1/meeting")
+@RestController
+public class MeetingController {
+
+    private final MeetingHandleService meetingHandleService;
+    private final MeetingListService meetingListService;
+
+    @PostMapping
+    public ResponseDto<Void> sendMeetingRequest(@MemberId Long memberId, @RequestBody @Valid SendMeetingRequestDto requestDto) {
+        meetingHandleService.sendRequest(requestDto, memberId);
+
+        return ResponseDto.success("Send meeting request success");
+    }
+
+    @PostMapping("/message")
+    public ResponseDto<Void> sendMeetingRequestWithMessage(@MemberId Long memberId,
+        @RequestBody @Valid SendMeetingWithMessageRequestDto requestDto) {
+        meetingHandleService.sendRequestWithMessage(requestDto, memberId);
+
+        return ResponseDto.success("Send meeting request with message success");
+    }
+
+    @PostMapping("/accept/{meetingRequestId}")
+    public ResponseDto<Long> acceptMeetingRequest(@MemberId Long memberId,
+        @RequestBody @Valid MeetingRequestAcceptDto requestDto,
+        @PathVariable Long meetingRequestId) {
+        final String openChatLink = requestDto.kakaoOpenChatLink();
+        final LocalDateTime acceptDateTime = LocalDateTime.now();
+
+        Long meetingId = meetingHandleService.acceptRequest(openChatLink, memberId, meetingRequestId, acceptDateTime);
+
+        return ResponseDto.success("Meeting was successfully matched", meetingId);
+    }
+
+    @PostMapping("/reject/{meetingRequestId}")
+    public ResponseDto<AcceptStatus> rejectMeetingRequest(@MemberId Long memberId,
+        @PathVariable Long meetingRequestId) {
+        LocalDateTime rejectDateTime = LocalDateTime.now();
+        AcceptStatus acceptStatus = meetingHandleService.rejectRequest(memberId, meetingRequestId, rejectDateTime);
+
+        return ResponseDto.success("Meeting request successfully Rejected", acceptStatus);
+    }
+
+    @GetMapping("/accepted")
+    public ResponseDto<List<AcceptedMeetingResponseDto>> getAcceptedMeetingList(@MemberId Long memberId) {
+        final LocalDateTime findDateTime = LocalDateTime.now();
+        List<AcceptedMeetingResponseDto> acceptedMeetingList = meetingListService.getAcceptedMeetingList(memberId, findDateTime);
+
+        return ResponseDto.success("Get accepted meeting list success", acceptedMeetingList);
+    }
+
+
+    @GetMapping("/sent")
+    public ResponseDto<List<SentMeetingResponseDto>> getSentMeetingRequestList(@MemberId Long memberId) {
+        final LocalDateTime findDateTime = LocalDateTime.now();
+        List<SentMeetingResponseDto> sentRequestList = meetingListService.getSentRequestList(memberId, findDateTime);
+
+        return ResponseDto.success("Get sent meeting request list success", sentRequestList);
+    }
+
+    @GetMapping("/received")
+    public ResponseDto<List<ReceivedMeetingResponseDto>> getReceivedMeetingRequestList(@MemberId Long memberId) {
+        final LocalDateTime findDateTime = LocalDateTime.now();
+        List<ReceivedMeetingResponseDto> receiveRequestList = meetingListService.getReceiveRequestList(memberId, findDateTime);
+
+        return ResponseDto.success("Get receive meeting request list success", receiveRequestList);
+    }
+
+
+}

src/main/java/com/e2i/wemeet/domain/credit/Cost.java → src/main/java/com/e2i/wemeet/domain/cost/Cost.java

@@ -1,6 +1,5 @@
-package com.e2i.wemeet.domain.credit;
+package com.e2i.wemeet.domain.cost;
 
-import com.e2i.wemeet.domain.base.BaseTimeEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -13,7 +12,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class Cost extends BaseTimeEntity {
+public class Cost {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -22,16 +21,11 @@ public class Cost extends BaseTimeEntity {
     @Column(nullable = false)
     private String type;
 
-    @Column(nullable = false)
+    @Column(nullable = false, name = "cost_value")
     private Integer value;
 
-    public Cost(Earn earn, Integer value) {
-        this.type = earn.name();
+    public Cost(String type, Integer value) {
+        this.type = type;
         this.value = value;
     }
-
-    public Cost(Spent spent) {
-        this.type = spent.name();
-        this.value = spent.getValue();
-    }
 }

src/main/java/com/e2i/wemeet/domain/credit/CostHistory.java → src/main/java/com/e2i/wemeet/domain/cost/CostHistory.java

@@ -1,6 +1,6 @@
-package com.e2i.wemeet.domain.credit;
+package com.e2i.wemeet.domain.cost;
 
-import com.e2i.wemeet.domain.base.BaseTimeEntity;
+import com.e2i.wemeet.domain.base.CreateTimeEntity;
 import com.e2i.wemeet.domain.member.Member;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -16,7 +16,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class CostHistory extends BaseTimeEntity {
+public class CostHistory extends CreateTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -42,11 +42,18 @@ public CostHistory(Member member, Earn earn, Integer costValue) {
         this.costValue = costValue;
     }
 
-    public CostHistory(Member member, Spent spent) {
+    public CostHistory(Member member, Spent spent, Integer costValue) {
         this.member = member;
         this.costType = Spent.getTypeName();
         this.detail = spent.name();
-        this.costValue = spent.getValue();
+        this.costValue = costValue;
+    }
+
+    public CostHistory(Member member, Payment payment, Integer costValue) {
+        this.member = member;
+        this.costType = Payment.getTypeName();
+        this.detail = payment.name();
+        this.costValue = costValue;
     }
 
     public boolean isSpent() {
@@ -56,4 +63,8 @@ public boolean isSpent() {
     public boolean isEarn() {
         return Earn.getTypeName().equals(this.costType);
     }
+
+    public boolean isPayment() {
+        return Payment.getTypeName().equals(this.costType);
+    }
 }

src/main/java/com/e2i/wemeet/domain/cost/CostHistoryRepository.java

@@ -0,0 +1,13 @@
+package com.e2i.wemeet.domain.cost;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface CostHistoryRepository extends JpaRepository<CostHistory, Long> {
+
+    @Query("select ch from CostHistory ch where ch.member.memberId = :memberId")
+    List<CostHistory> findAllByMemberId(@Param("memberId") Long memberId);
+
+}

src/main/java/com/e2i/wemeet/domain/cost/CostRepository.java

@@ -0,0 +1,13 @@
+package com.e2i.wemeet.domain.cost;
+
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface CostRepository extends JpaRepository<Cost, Long> {
+
+    @Query("select c.value from Cost c where c.type = :type")
+    Optional<Integer> findValueByType(@Param(value = "type") String type);
+
+}

src/main/java/com/e2i/wemeet/domain/cost/Earn.java

@@ -0,0 +1,19 @@
+package com.e2i.wemeet.domain.cost;
+
+import lombok.Getter;
+
+@Getter
+public enum Earn {
+    EVENT("이벤트"),
+    ADVERTISEMENT("광고 시청");
+
+    private final String detail;
+
+    Earn(String detail) {
+        this.detail = detail;
+    }
+
+    public static String getTypeName() {
+        return "EARN";
+    }
+}

src/main/java/com/e2i/wemeet/domain/cost/Payment.java

@@ -0,0 +1,21 @@
+package com.e2i.wemeet.domain.cost;
+
+import lombok.Getter;
+
+@Getter
+public enum Payment {
+    PAYMENT_5900("5900원 결제"),
+    PAYMENT_9900("9900원 결제"),
+    PAYMENT_14900("14900원 결제"),
+    PAYMENT_19900("19900원 결제");
+
+    private final String detail;
+
+    Payment(String detail) {
+        this.detail = detail;
+    }
+
+    public static String getTypeName() {
+        return "PAYMENT";
+    }
+}

src/main/java/com/e2i/wemeet/domain/cost/Spent.java

@@ -0,0 +1,23 @@
+package com.e2i.wemeet.domain.cost;
+
+import lombok.Getter;
+
+@Getter
+public enum Spent {
+
+    DEFAULT("기본 값"),
+    MEETING_REQUEST("미팅 요청"),
+    MEETING_REQUEST_WITH_MESSAGE("쪽지와 함께 미팅 요청"),
+    MEETING_ACCEPT("미팅 수락"),
+    MORE_TEAM("팀 더보기");
+
+    private final String detail;
+
+    Spent(String detail) {
+        this.detail = detail;
+    }
+
+    public static String getTypeName() {
+        return "SPENT";
+    }
+}

src/main/java/com/e2i/wemeet/domain/meeting/Meeting.java

@@ -1,5 +1,7 @@
 package com.e2i.wemeet.domain.meeting;
 
+import static com.e2i.wemeet.util.validator.CustomFormatValidator.validateOpenChatLinkFormat;
+
 import com.e2i.wemeet.domain.base.BaseTimeEntity;
 import com.e2i.wemeet.domain.team.Team;
 import jakarta.persistence.Column;
@@ -9,8 +11,8 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import java.time.LocalDateTime;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -31,15 +33,22 @@ public class Meeting extends BaseTimeEntity {
     @JoinColumn(name = "partnerTeamId", referencedColumnName = "teamId", nullable = false)
     private Team partnerTeam;
 
-    @Column(length = 50)
+    @Column(length = 50, nullable = false)
     private String chatLink;
 
-    private LocalDateTime isOver;
+    @Column(nullable = false)
+    private Boolean isOver;
 
-    public Meeting(Team team, Team partnerTeam, String chatLink, LocalDateTime isOver) {
+    @Builder
+    public Meeting(Team team, Team partnerTeam, String chatLink) {
         this.team = team;
         this.partnerTeam = partnerTeam;
-        this.chatLink = chatLink;
-        this.isOver = isOver;
+        this.chatLink = validateOpenChatLinkFormat(chatLink);
+        this.isOver = false;
+    }
+
+    public void over() {
+        this.isOver = true;
     }
+
 }