Merge branch 'dev'

Author: 82everywin

src/main/generated/com/appcenter/marketplace/domain/member_coupon/QMemberCoupon.java

@@ -31,6 +31,8 @@ public class QMemberCoupon extends EntityPathBase<MemberCoupon> {
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
+    public final BooleanPath isExpired = createBoolean("isExpired");
+
     public final BooleanPath isUsed = createBoolean("isUsed");
 
     public final com.appcenter.marketplace.domain.member.QMember member;

src/main/java/com/appcenter/marketplace/domain/cheer/controller/CheerController.java

@@ -18,7 +18,8 @@ public class CheerController {
 
     private final CheerService cheerService;
 
-    @Operation(summary = "공감탭 매장 공감하기", description = "임시 매장을 공감합니다. ")
+    @Operation(summary = "공감탭 매장 공감하기", description = "임시 매장을 공감합니다. <br>" +
+            "공감권은 매일 1개씩 충전됩니다. 따라서, 1개의 매장을 공감하게 되면, 더이상 공감할 수 없습니다.( 에러 처리 (409) : 공감권이 소진되었습니다)")
     @PostMapping
     public ResponseEntity<CommonResponse<Object>> createCheer(
             @RequestParam Long memberId,

src/main/java/com/appcenter/marketplace/domain/cheer/service/impl/CheerServiceImpl.java

@@ -30,6 +30,10 @@ public void cheerTempMarket(Long memberId, Long marketId) {
         TempMarket tempMarket = tempMarketRepository.findById(marketId).orElseThrow(()-> new CustomException(MARKET_NOT_EXIST));
         Member member = memberRepository.findById(memberId).orElseThrow(()-> new CustomException(MEMBER_NOT_EXIST));
 
+        if(member.getCheerTicket() == 0){
+            throw new CustomException(TICKET_SOLD_OUT);
+        }
+
         Optional<Cheer> isCheer = cheerRepository.findByMemberIdAndTempMarketId(memberId, marketId);
 
         if(!isCheer.isPresent()){

src/main/java/com/appcenter/marketplace/domain/member/Member.java

@@ -32,9 +32,5 @@ public Member (Long id, Integer cheerTicket) {
     public void reduceTicket() {
         this.cheerTicket--;
     }
-
-    public void resetTicket() {
-        this.cheerTicket = 1;
-    }
 }
 

src/main/java/com/appcenter/marketplace/domain/member/repository/MemberRepositoryImpl.java

@@ -2,7 +2,6 @@
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
-
 import static com.appcenter.marketplace.domain.member.QMember.member;
 
 @RequiredArgsConstructor

src/main/java/com/appcenter/marketplace/domain/member/service/MemberService.java

@@ -6,4 +6,5 @@
 public interface MemberService {
     MemberLoginRes login(MemberLoginReq memberLoginReq);
     MemberLoginRes getMember(Long studentId);
+    long resetCheerTickets();
 }

src/main/java/com/appcenter/marketplace/domain/member/service/impl/MemberServiceImpl.java

@@ -8,13 +8,16 @@
 import com.appcenter.marketplace.global.exception.CustomException;
 import com.appcenter.marketplace.global.oracleRepository.InuLoginRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import static com.appcenter.marketplace.global.common.StatusCode.INVALID_STUDENT_ID;
 import static com.appcenter.marketplace.global.common.StatusCode.UNAUTHORIZED_LOGIN_ERROR;
 
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class MemberServiceImpl implements MemberService {
@@ -46,6 +49,12 @@ public MemberLoginRes getMember(Long studentId) {
         return MemberLoginRes.toDto(member);
     }
 
+    @Override
+    @Transactional
+    public long resetCheerTickets() {
+            return memberRepository.resetCheerTickets();
+    }
+
     // 학번 로그인 검증 및 형변환
     private Long validateAndParseStudentId(MemberLoginReq memberLoginReq) {
         // 로그인 검증

src/main/java/com/appcenter/marketplace/domain/member_coupon/MemberCoupon.java

@@ -22,6 +22,9 @@ public class MemberCoupon extends BaseEntity {
     @Column(nullable = false)
     private Boolean isUsed;
 
+    @Column(nullable = false)
+    private Boolean isExpired;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id", nullable = false)
     private Member member;
@@ -31,10 +34,11 @@ public class MemberCoupon extends BaseEntity {
     private Coupon coupon;
 
     @Builder
-    public MemberCoupon(Member member, Coupon coupon, Boolean isUsed) {
+    public MemberCoupon(Member member, Coupon coupon, Boolean isUsed, Boolean isExpired) {
         this.member = member;
         this.coupon = coupon;
         this.isUsed = isUsed;
+        this.isExpired = isExpired;
     }
 
     public void usedToggle() {

src/main/java/com/appcenter/marketplace/domain/member_coupon/controller/MemberCouponController.java

@@ -35,7 +35,7 @@ public ResponseEntity<CommonResponse<Object>> issuedCoupon(@RequestParam(name="m
     @Operation(summary = "회원의 쿠폰 리스트", description = "type은 'ISSUED(사용가능한)', 'EXPIRED(기간 만료된)', 'USED(사용 완료된)' 중에서 작성해주시면 됩니다. <br>" +
             "쿠폰 리스트를 조회하면 기본적으로 조회되는 리스트는 ISSUED로 사용가능한 쿠폰 리스트입니다.<br> " +
             "무한 스크롤 방식으로 hasNext가 true 면 마지막 데이터의 memberCouponId를 입력하여, 다음 페이지==다음 데이터를 받아올 수 있습니다." )
-    @GetMapping("/valid")
+    @GetMapping
     public ResponseEntity<CommonResponse<CouponPageRes<IssuedCouponRes>>> getCouponList(
                                                                                         @RequestParam(name="type", defaultValue = "ISSUED") MemberCouponType memberCouponType,
                                                                                         @RequestParam(name="memberId")Long memberId,

src/main/java/com/appcenter/marketplace/domain/member_coupon/repository/MemberCouponRepositoryCustom.java

@@ -10,4 +10,6 @@ public interface MemberCouponRepositoryCustom {
     List<IssuedCouponRes> findIssuedCouponResDtoByMemberId(Long memberId, Long memberCouponId, Integer size);
     List<IssuedCouponRes> findExpiredCouponResDtoByMemberId(Long memberId, Long memberCouponId, Integer size);
     List<IssuedCouponRes> findUsedMemberCouponResDtoByMemberId(Long memberId, Long memberCouponId, Integer size);
+    void check3DaysCoupons();
+    void checkExpiredCoupons();
 }