Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

나의 쿠폰 목록 조회 API 컨트롤러 개발 #80

Merged
merged 3 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,36 @@
import com.ayuconpon.usercoupon.controller.request.UseUserCouponRequest;
import com.ayuconpon.usercoupon.controller.request.IssueUserCouponRequest;
import com.ayuconpon.usercoupon.controller.response.IssueUserCouponResponse;
import com.ayuconpon.usercoupon.controller.response.ShowUserCouponsResponse;
import com.ayuconpon.usercoupon.controller.response.UseUserCouponResponse;
import com.ayuconpon.usercoupon.service.IssueUserCouponCommand;
import com.ayuconpon.usercoupon.service.IssueUserCouponService;
import com.ayuconpon.usercoupon.service.*;
import com.ayuconpon.common.resolver.UserId;
import com.ayuconpon.usercoupon.service.UseUserCouponCommand;
import com.ayuconpon.usercoupon.service.UseUserCouponService;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RestController;

import java.time.LocalDateTime;
import java.util.List;

@RequiredArgsConstructor
@RestController
public class UserCouponController {

private final IssueUserCouponService issueUserCouponService;
private final UseUserCouponService useUserCouponService;
private final ShowUserCouponService showUserCouponService;

@GetMapping("/v1/users/me/user-coupons")
public ResponseEntity<ShowUserCouponsResponse> showUserCoupons(@UserId Long userId, Pageable pageable) {

List<UserCouponDto> userCouponDtos = showUserCouponService.getUnexpiredUserCoupons(userId, LocalDateTime.now(), pageable);
ShowUserCouponsResponse response = ShowUserCouponsResponse.from(userCouponDtos);

return ResponseEntity.ok(response);
}

@PostMapping("/v1/users/me/user-coupons")
public ResponseEntity<IssueUserCouponResponse> issueCoupon(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.ayuconpon.usercoupon.controller.response;

import com.ayuconpon.usercoupon.service.UserCouponDto;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class ShowUserCouponsResponse {

private List<UserCouponDto> userCouponDtoList;

public static ShowUserCouponsResponse from(List<UserCouponDto> userCouponDtos) {
ShowUserCouponsResponse showUserCouponsResponse = new ShowUserCouponsResponse();
showUserCouponsResponse.userCouponDtoList = userCouponDtos;
return showUserCouponsResponse;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.ayuconpon.usercoupon.service;

import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
public class ShowUserCouponService {

public List<UserCouponDto> getUserCouponsInProgress(Long userId, Pageable pageable) {
return null;
}

}
23 changes: 23 additions & 0 deletions src/main/java/com/ayuconpon/usercoupon/service/UserCouponDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.ayuconpon.usercoupon.service;

import com.ayuconpon.coupon.domain.value.DiscountType;
import com.ayuconpon.usercoupon.domain.value.Status;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Getter
@Setter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class UserCouponDto {

private Long userCouponId;
private String couponName;
private DiscountType discountType;
private String discountContent;
private Long minProductPrice;
private Status status;
private String expiredAt;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.ayuconpon.usercoupon.service;

import com.ayuconpon.common.Money;
import com.ayuconpon.coupon.domain.value.DiscountPolicy;
import com.ayuconpon.coupon.domain.value.DiscountType;
import com.ayuconpon.usercoupon.domain.entity.UserCoupon;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Named;
import org.mapstruct.factory.Mappers;

import java.time.LocalDateTime;

@Mapper(componentModel = "spring")
public interface UserCouponMapper {

UserCouponMapper INSTANCE = Mappers.getMapper(UserCouponMapper.class);

@Mapping(source = "coupon.name", target = "couponName")
@Mapping(source = "coupon.discountPolicy", target = "discountType", qualifiedByName = "discountType")
@Mapping(source = "coupon.discountPolicy", target = "discountContent", qualifiedByName = "discountContent")
@Mapping(source = "coupon.minProductPrice", target = "minProductPrice", qualifiedByName = "minProductPrice")
@Mapping(source = "status", target = "status")
@Mapping(source = "expiredAt", target = "expiredAt", qualifiedByName = "localDateTimeToString")
UserCouponDto toUserCouponDto(UserCoupon userCoupon);

@Named("localDateTimeToString")
static String localDateTimeToString(LocalDateTime localDateTime) {
return localDateTime.toString();
}

@Named("minProductPrice")
static Long minProductPrice(Money minProductPrice) {
return minProductPrice.getValue();
}

@Named("discountType")
static DiscountType discountType(DiscountPolicy discountPolicy) {
return discountPolicy.getDiscountType();
}

@Named("discountContent")
static String discountContent(DiscountPolicy discountPolicy) {
if (discountPolicy.getDiscountType() == DiscountType.FIX_DISCOUNT) {
return discountPolicy.getDiscountPrice().getValue().toString();
}
return discountPolicy.getDiscountRate().toString();
}

}
Original file line number Diff line number Diff line change
@@ -1,29 +1,38 @@
package com.ayuconpon.usercoupon.controller;

import com.ayuconpon.common.Money;
import com.ayuconpon.coupon.domain.entity.Coupon;
import com.ayuconpon.coupon.domain.value.Quantity;
import com.ayuconpon.usercoupon.controller.request.UseUserCouponRequest;
import com.ayuconpon.usercoupon.controller.request.IssueUserCouponRequest;
import com.ayuconpon.usercoupon.service.IssueUserCouponCommand;
import com.ayuconpon.usercoupon.service.IssueUserCouponService;
import com.ayuconpon.usercoupon.service.UseUserCouponCommand;
import com.ayuconpon.usercoupon.service.UseUserCouponService;
import com.ayuconpon.usercoupon.domain.entity.UserCoupon;
import com.ayuconpon.usercoupon.service.*;
import com.ayuconpon.util.Coupons;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;

import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

import static org.mockito.ArgumentMatchers.*;
import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;

@WebMvcTest(controllers = {UserCouponController.class})
@Import(UserCouponMapperImpl.class)
class CouponControllerTest {

@Autowired
Expand All @@ -33,9 +42,13 @@ class CouponControllerTest {
private IssueUserCouponService issueUserCouponService;
@MockBean
private UseUserCouponService useUserCouponService;
@MockBean
private ShowUserCouponService showUserCouponService;

@Autowired
private ObjectMapper objectMapper;
@Autowired
private UserCouponMapper userCouponMapper;

@DisplayName("쿠폰 발급을 요청한다.")
@Test
Expand Down Expand Up @@ -214,4 +227,51 @@ public void useCouponWithoutProductPrice() throws Exception {
.andExpect(content().string("상품 가격이 비어있습니다."));
}

@DisplayName("사용자 자신의 쿠폰 목록을 조회할 수 있다.")
@Test
public void showUserCoupons() throws Exception {
//given
List<UserCouponDto> userCouponDtos = getDefaultUserCouopnDtos();

given(showUserCouponService.getUnexpiredUserCoupons(any(), any(), any())).willReturn(userCouponDtos);

//when //then
mockMvc.perform(
get("/v1/users/me/user-coupons")
.header("User-Id", String.valueOf(1L))
).andDo(print())
.andExpect(status().isOk())
.andExpect(jsonPath("$.userCouponDtoList[0].userCouponId").value(userCouponDtos.get(0).getUserCouponId()))
.andExpect(jsonPath("$.userCouponDtoList[0].couponName").value(userCouponDtos.get(0).getCouponName()))
.andExpect(jsonPath("$.userCouponDtoList[0].discountType").value(userCouponDtos.get(0).getDiscountType().toString()))
.andExpect(jsonPath("$.userCouponDtoList[0].discountContent").value(userCouponDtos.get(0).getDiscountContent()))
.andExpect(jsonPath("$.userCouponDtoList[0].minProductPrice").value(userCouponDtos.get(0).getMinProductPrice()))
.andExpect(jsonPath("$.userCouponDtoList[0].status").value(userCouponDtos.get(0).getStatus().toString()))
.andExpect(jsonPath("$.userCouponDtoList[0].expiredAt").value(userCouponDtos.get(0).getExpiredAt()))

.andExpect(jsonPath("$.userCouponDtoList[1].userCouponId").value(userCouponDtos.get(1).getUserCouponId()))
.andExpect(jsonPath("$.userCouponDtoList[1].couponName").value(userCouponDtos.get(1).getCouponName()))
.andExpect(jsonPath("$.userCouponDtoList[1].discountType").value(userCouponDtos.get(1).getDiscountType().toString()))
.andExpect(jsonPath("$.userCouponDtoList[1].discountContent").value(userCouponDtos.get(1).getDiscountContent()))
.andExpect(jsonPath("$.userCouponDtoList[1].minProductPrice").value(userCouponDtos.get(1).getMinProductPrice()))
.andExpect(jsonPath("$.userCouponDtoList[1].status").value(userCouponDtos.get(1).getStatus().toString()))
.andExpect(jsonPath("$.userCouponDtoList[1].expiredAt").value(userCouponDtos.get(1).getExpiredAt())
);
}

private List<UserCouponDto> getDefaultUserCouopnDtos() {
Long userId = 1L;
LocalDateTime currentTime = LocalDateTime.of(2023, 9, 24, 0, 0, 0);
Coupon fixDiscountCoupon = Coupons.getDefaultFixDiscountCouponWithQuantity(Quantity.of(0L));
Coupon rateDiscountCoupon = Coupons.getDefaultRateDiscountCoupon();
UserCoupon fixUserCoupon = new UserCoupon(userId, fixDiscountCoupon, currentTime);
UserCoupon rateUserCoupon = new UserCoupon(userId, rateDiscountCoupon, currentTime);

return new ArrayList<>(
List.of(userCouponMapper.toUserCouponDto(fixUserCoupon),
userCouponMapper.toUserCouponDto(rateUserCoupon))
);

}

}