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

CouponGuestService 추가 #226

Merged
merged 1 commit into from
Jan 30, 2024
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,6 +4,7 @@
import com.coolpeace.domain.coupon.dto.request.CouponRegisterRequest;
import com.coolpeace.domain.coupon.dto.request.CouponUpdateRequest;
import com.coolpeace.domain.coupon.dto.response.CouponResponse;
import com.coolpeace.domain.coupon.service.CouponGuestService;
import com.coolpeace.domain.coupon.service.CouponService;
import com.coolpeace.global.jwt.security.JwtPrincipal;
import com.coolpeace.global.resolver.AuthJwtPrincipal;
Expand All @@ -20,6 +21,7 @@
@RequiredArgsConstructor
public class CouponController {
private final CouponService couponService;
private final CouponGuestService couponGuestService;

@GetMapping("/{coupon_number}")
public ResponseEntity<CouponResponse> getCouponByCouponNumber(
Expand All @@ -45,7 +47,11 @@ public ResponseEntity<Void> registerCoupon(
@Valid @RequestBody CouponRegisterRequest couponRegisterRequest,
@AuthJwtPrincipal JwtPrincipal jwtPrincipal
) {
couponService.register(Long.valueOf(jwtPrincipal.getMemberId()), couponRegisterRequest);
if (jwtPrincipal.isGuestUser()) {
couponGuestService.register(Long.valueOf(jwtPrincipal.getMemberId()), couponRegisterRequest);
} else {
couponService.register(Long.valueOf(jwtPrincipal.getMemberId()), couponRegisterRequest);
}
return ResponseEntity.created(URI.create("/")).build();
}

Expand All @@ -54,8 +60,13 @@ public ResponseEntity<Void> updateCoupon(
@PathVariable("coupon_number") String couponNumber,
@Valid @RequestBody CouponUpdateRequest couponUpdateRequest,
@AuthJwtPrincipal JwtPrincipal jwtPrincipal) {
couponService.updateCoupon(
Long.valueOf(jwtPrincipal.getMemberId()), couponNumber, couponUpdateRequest);
if (jwtPrincipal.isGuestUser()) {
couponGuestService.updateCoupon(
Long.valueOf(jwtPrincipal.getMemberId()), couponNumber, couponUpdateRequest);
} else {
couponService.updateCoupon(
Long.valueOf(jwtPrincipal.getMemberId()), couponNumber, couponUpdateRequest);
}
return ResponseEntity.ok().build();
}

Expand All @@ -75,7 +86,11 @@ public ResponseEntity<Void> deleteCoupon(
@PathVariable("coupon_number") String couponNumber,
@AuthJwtPrincipal JwtPrincipal jwtPrincipal
) {
couponService.deleteCoupon(Long.valueOf(jwtPrincipal.getMemberId()), couponNumber);
if (jwtPrincipal.isGuestUser()) {
couponGuestService.deleteCoupon(Long.valueOf(jwtPrincipal.getMemberId()), couponNumber);
} else {
couponService.deleteCoupon(Long.valueOf(jwtPrincipal.getMemberId()), couponNumber);
}
return ResponseEntity.ok().build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
package com.coolpeace.domain.coupon.service;

import com.coolpeace.domain.accommodation.entity.Accommodation;
import com.coolpeace.domain.accommodation.exception.AccommodationNotFoundException;
import com.coolpeace.domain.accommodation.repository.AccommodationRepository;
import com.coolpeace.domain.coupon.dto.request.CouponRegisterRequest;
import com.coolpeace.domain.coupon.dto.request.CouponUpdateRequest;
import com.coolpeace.domain.coupon.dto.request.type.DtoCouponUseDayOfWeekType;
import com.coolpeace.domain.coupon.dto.request.type.DtoCouponUseDaysType;
import com.coolpeace.domain.coupon.entity.Coupon;
import com.coolpeace.domain.coupon.entity.type.*;
import com.coolpeace.domain.coupon.exception.CouponAccessDeniedException;
import com.coolpeace.domain.coupon.exception.CouponNotFoundException;
import com.coolpeace.domain.coupon.repository.CouponRepository;
import com.coolpeace.domain.member.entity.Member;
import com.coolpeace.domain.member.exception.MemberNotFoundException;
import com.coolpeace.domain.member.repository.MemberRepository;
import com.coolpeace.domain.room.entity.Room;
import com.coolpeace.domain.room.exception.RegisterRoomsEmptyException;
import com.coolpeace.domain.room.exception.RoomNotFoundException;
import com.coolpeace.domain.room.repository.RoomRepository;
import com.coolpeace.global.common.ValuedEnum;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.Collections;
import java.util.List;
import java.util.Optional;

@RequiredArgsConstructor
@Service
public class CouponGuestService {

private final MemberRepository memberRepository;
private final CouponRepository couponRepository;
private final AccommodationRepository accommodationRepository;
private final RoomRepository roomRepository;

@Transactional
public void register(Long memberId, CouponRegisterRequest couponRegisterRequest) {
Member storedMember = memberRepository.findById(memberId)
.orElseThrow(MemberNotFoundException::new);
Accommodation accommodation = accommodationRepository.findById(
couponRegisterRequest.accommodationId())
.orElseThrow(AccommodationNotFoundException::new);

List<Room> rooms;
if (!couponRegisterRequest.registerAllRoom()) {
if (CollectionUtils.isEmpty(couponRegisterRequest.registerRooms())) {
throw new RegisterRoomsEmptyException();
}
rooms = couponRegisterRequest.registerRooms()
.stream().map(roomNumber -> roomRepository.findByRoomNumber(roomNumber)
.orElseThrow(RoomNotFoundException::new))
.toList();
} else {
rooms = Collections.emptyList();
}

DiscountType discountType = ValuedEnum.of(DiscountType.class,
couponRegisterRequest.discountType());
Integer discountValue = switch (discountType) {
case FIXED_RATE -> couponRegisterRequest.discountFlatRate();
case FIXED_PRICE -> couponRegisterRequest.discountFlatValue();
};

CouponRoomType couponRoomTypeValue = getCouponRoomType(
couponRegisterRequest.couponRoomTypes(), CouponRoomType.RENTAL);
CouponRoomType couponRoomStayTypeValue = getCouponRoomStayTypeValue(
couponRegisterRequest.couponRoomTypes(), couponRoomTypeValue);

CouponUseDaysType couponUseDays = getCouponUseDays(
couponRegisterRequest.couponUseConditionDays(),
couponRegisterRequest.couponUseConditionDayOfWeek());
}

private CouponUseDaysType getCouponUseDays(String couponUseDaysStr, String couponUseDayOfWeekStr) {
if (!StringUtils.hasText(couponUseDaysStr)) {
return CouponUseDaysType.ALL;
}
DtoCouponUseDaysType dtoCouponUseDaysType = ValuedEnum.of(DtoCouponUseDaysType.class, couponUseDaysStr);
return switch (dtoCouponUseDaysType) {
case ONEDAY -> CouponUseDaysType.valueOf(
ValuedEnum.of(DtoCouponUseDayOfWeekType.class, couponUseDayOfWeekStr).name());
case WEEKDAY -> CouponUseDaysType.WEEKDAY;
case WEEKEND -> CouponUseDaysType.WEEKEND;
};
}

@Transactional
public void updateCoupon(Long memberId, String couponNumber,
CouponUpdateRequest couponUpdateRequest) {
validateMemberHasCoupon(memberId, couponNumber);
Coupon storedCoupon = couponRepository.findByCouponNumber(couponNumber)
.orElseThrow(CouponNotFoundException::new);
List<Room> rooms;
if (couponUpdateRequest.registerRooms() != null) {
rooms = couponUpdateRequest.registerRooms()
.stream().map(roomNumber -> roomRepository.findByRoomNumber(roomNumber)
.orElseThrow(RoomNotFoundException::new))
.toList();
} else {
rooms = Collections.emptyList();
}

DiscountType discountType = Optional.ofNullable(couponUpdateRequest.discountType())
.map(str -> ValuedEnum.of(DiscountType.class, str))
.orElse(null);

Integer discountValue = null;
if (discountType != null) {
discountValue = switch (discountType) {
case FIXED_RATE -> couponUpdateRequest.discountFlatRate();
case FIXED_PRICE -> couponUpdateRequest.discountFlatValue();
};
}

CustomerType customerType = Optional.ofNullable(couponUpdateRequest.customerType())
.map(str -> ValuedEnum.of(CustomerType.class, str))
.orElse(null);

CouponRoomType couponRoomTypeValue = getCouponRoomType(
couponUpdateRequest.couponRoomTypes(), CouponRoomType.RENTAL);
CouponRoomType couponRoomStayTypeValue = getCouponRoomStayTypeValue(
couponUpdateRequest.couponRoomTypes(), couponRoomTypeValue);

CouponUseDaysType couponUseDays = Optional.ofNullable(couponUpdateRequest.couponUseConditionDays())
.map(str -> getCouponUseDays(
couponUpdateRequest.couponUseConditionDays(),
couponUpdateRequest.couponUseConditionDayOfWeek()))
.orElse(null);
}

private CouponRoomType getCouponRoomStayTypeValue(List<String> couponRoomTypeStrings,
CouponRoomType couponRoomTypeRentalValue) {
if (couponRoomTypeRentalValue != null) {
return null;
}
CouponRoomType couponRoomType = getCouponRoomType(couponRoomTypeStrings, CouponRoomType.LODGE);
if (couponRoomType == null) {
return getCouponRoomType(couponRoomTypeStrings, CouponRoomType.TWO_NIGHT);
}
return couponRoomType;
}

private CouponRoomType getCouponRoomType(List<String> request, CouponRoomType couponRoomType) {
return request.stream()
.map(str -> ValuedEnum.of(CouponRoomType.class, str))
.filter(roomType -> roomType.equals(couponRoomType))
.findFirst().orElse(null);
}

@Transactional
public void deleteCoupon(Long memberId, String couponNumber) {
validateMemberHasCoupon(memberId, couponNumber);
Coupon storedCoupon = couponRepository.findByCouponNumber(couponNumber)
.orElseThrow(CouponNotFoundException::new);
}

public void validateMemberHasCoupon(Long memberId, String couponNumber) {
if (!couponRepository.existsByMemberIdAndCouponNumber(memberId, couponNumber)) {
throw new CouponAccessDeniedException();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.coolpeace.global.jwt.security;

import com.coolpeace.domain.member.entity.Member;
import com.coolpeace.domain.member.entity.type.RoleType;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
Expand All @@ -18,13 +19,16 @@ public class JwtPrincipal implements UserDetails {
private final String memberId;
private final String memberEmail;
private final boolean enabled;
private final boolean isGuestUser;
private final List<GrantedAuthority> authorities;

public JwtPrincipal(String memberId, String memberEmail, boolean enabled, List<GrantedAuthority> authorities) {
public JwtPrincipal(String memberId, String memberEmail, boolean enabled,
List<GrantedAuthority> authorities, boolean isGuestUser) {
this.memberId = memberId;
this.memberEmail = memberEmail;
this.enabled = enabled;
this.authorities = authorities;
this.isGuestUser = isGuestUser;
}

public static JwtPrincipal from(Member member) {
Expand All @@ -35,11 +39,12 @@ public static JwtPrincipal from(Member member) {
String.valueOf(member.getId()),
member.getEmail(),
!member.isDeleted(),
AuthorityUtils.createAuthorityList(roles)
AuthorityUtils.createAuthorityList(roles),
roles.contains(RoleType.USER.getValue())
);
}
public static JwtPrincipal emptyPrincipal() {
return new JwtPrincipal(null, null, false, AuthorityUtils.NO_AUTHORITIES);
return new JwtPrincipal(null, null, false, AuthorityUtils.NO_AUTHORITIES, false);
}

@Override
Expand Down
Loading