Skip to content

refactor: 불변객체 record사용 #128

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 29, 2025
Merged

refactor: 불변객체 record사용 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions src/main/java/com/threestar/trainus/domain/coupon/user/dto/CouponPageResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import java.util.List;

import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class CouponPageResponseDto {
private List<CouponResponseDto> coupons;
}
public record CouponPageResponseDto(
List<CouponResponseDto> coupons
) {
}
29 changes: 11 additions & 18 deletions src/main/java/com/threestar/trainus/domain/coupon/user/dto/CouponResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,15 @@
import com.threestar.trainus.domain.coupon.user.entity.CouponCategory;
import com.threestar.trainus.domain.coupon.user.entity.OwnedStatus;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
@AllArgsConstructor
public class CouponResponseDto {
private Long couponId;
private String couponName;
private String discountPrice;
private Integer minOrderPrice;
private LocalDateTime expirationDate;
private OwnedStatus ownedStatus;
private Integer quantity;
private CouponCategory category;
private LocalDateTime openTime;

public record CouponResponseDto(
Long couponId,
String couponName,
String discountPrice,
Integer minOrderPrice,
LocalDateTime expirationDate,
OwnedStatus ownedStatus,
Integer quantity,
CouponCategory category,
LocalDateTime openTime
) {
}
19 changes: 7 additions & 12 deletions src/main/java/com/threestar/trainus/domain/coupon/user/dto/CreateUserCouponResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.threestar.trainus.domain.coupon.user.entity.CouponStatus;

import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class CreateUserCouponResponseDto {
private Long couponId;
private Long userId;
public record CreateUserCouponResponseDto(
Long couponId,
Long userId,
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
private LocalDateTime createdAt;
private LocalDateTime expirationDate;
private CouponStatus status;

LocalDateTime createdAt,
LocalDateTime expirationDate,
CouponStatus status
) {
}
10 changes: 3 additions & 7 deletions src/main/java/com/threestar/trainus/domain/coupon/user/dto/UserCouponPageResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import java.util.List;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public class UserCouponPageResponseDto {
private List<UserCouponResponseDto> userCoupons;
public record UserCouponPageResponseDto(
List<UserCouponResponseDto> userCoupons
) {
}
22 changes: 9 additions & 13 deletions src/main/java/com/threestar/trainus/domain/coupon/user/dto/UserCouponResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@

import com.threestar.trainus.domain.coupon.user.entity.CouponStatus;

import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class UserCouponResponseDto {
private Long couponId;
private String couponName;
private String discountPrice;
private Integer minOrderPrice;
private LocalDateTime expirationDate;
private CouponStatus status;
private LocalDateTime useDate;
public record UserCouponResponseDto(
Long couponId,
String couponName,
String discountPrice,
Integer minOrderPrice,
LocalDateTime expirationDate,
CouponStatus status,
LocalDateTime useDate
) {
}
22 changes: 11 additions & 11 deletions src/main/java/com/threestar/trainus/domain/coupon/user/mapper/CouponMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
public class CouponMapper {

public static CouponResponseDto toDto(Coupon coupon, boolean owned) {
return CouponResponseDto.builder()
.couponId(coupon.getId())
.couponName(coupon.getName())
.discountPrice(coupon.getDiscountPrice())
.minOrderPrice(coupon.getMinOrderPrice())
.expirationDate(coupon.getExpirationDate())
.ownedStatus(owned ? OwnedStatus.OWNED : OwnedStatus.NOT_OWNED)
.quantity(coupon.getQuantity())
.category(coupon.getCategory())
.openTime(coupon.getOpenAt())
.build();
return new CouponResponseDto(
coupon.getId(),
coupon.getName(),
coupon.getDiscountPrice(),
coupon.getMinOrderPrice(),
coupon.getExpirationDate(),
owned ? OwnedStatus.OWNED : OwnedStatus.NOT_OWNED,
coupon.getQuantity(),
coupon.getCategory(),
coupon.getOpenAt()
);
}

public static List<CouponResponseDto> toDtoList(List<Coupon> coupons, List<Long> ownedCouponIds) {
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/com/threestar/trainus/domain/coupon/user/mapper/UserCouponMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ private UserCouponMapper() {
}

public static CreateUserCouponResponseDto toCreateUserCouponResponseDto(UserCoupon userCoupon) {
return CreateUserCouponResponseDto.builder()
.couponId(userCoupon.getCoupon().getId())
.userId(userCoupon.getUser().getId())
.createdAt(userCoupon.getCreatedAt())
.expirationDate(userCoupon.getExpirationDate())
.status(userCoupon.getStatus())
.build();
return new CreateUserCouponResponseDto(
userCoupon.getCoupon().getId(),
userCoupon.getUser().getId(),
userCoupon.getCreatedAt(),
userCoupon.getExpirationDate(),
userCoupon.getStatus()
);
}

public static UserCouponResponseDto toUserCouponResponseDto(UserCoupon userCoupon) {
Coupon coupon = userCoupon.getCoupon();
return UserCouponResponseDto.builder()
.couponId(coupon.getId())
.couponName(coupon.getName())
.discountPrice(coupon.getDiscountPrice())
.minOrderPrice(coupon.getMinOrderPrice())
.expirationDate(coupon.getExpirationDate())
.status(coupon.getStatus())
.useDate(userCoupon.getUseDate())
.build();
return new UserCouponResponseDto(
coupon.getId(),
coupon.getName(),
coupon.getDiscountPrice(),
coupon.getMinOrderPrice(),
coupon.getExpirationDate(),
coupon.getStatus(),
userCoupon.getUseDate()
);
}

public static List<UserCouponResponseDto> toDtoList(List<UserCoupon> userCoupons) {
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/threestar/trainus/domain/coupon/user/service/CouponService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ public CouponPageResponseDto getCoupons(Long userId) {
List<CouponResponseDto> dtoList =
couponRepository.findAvailableCouponsWithOwnership(userId, LocalDateTime.now());

return CouponPageResponseDto.builder()
.coupons(dtoList)
.build();
return new CouponPageResponseDto(dtoList);
}

@Transactional
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/threestar/trainus/domain/user/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
Expand All @@ -17,6 +19,7 @@
import com.threestar.trainus.domain.user.dto.PasswordUpdateDto;
import com.threestar.trainus.domain.user.dto.SignupRequestDto;
import com.threestar.trainus.domain.user.dto.SignupResponseDto;
import com.threestar.trainus.domain.user.dto.UserInfoResponseDto;
import com.threestar.trainus.domain.user.service.EmailVerificationService;
import com.threestar.trainus.domain.user.service.UserService;
import com.threestar.trainus.global.annotation.LoginUser;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/threestar/trainus/domain/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.threestar.trainus.domain.user.dto.PasswordUpdateDto;
import com.threestar.trainus.domain.user.dto.SignupRequestDto;
import com.threestar.trainus.domain.user.dto.SignupResponseDto;
import com.threestar.trainus.domain.user.dto.UserInfoResponseDto;
import com.threestar.trainus.domain.user.entity.User;
import com.threestar.trainus.domain.user.entity.UserRole;
import com.threestar.trainus.domain.user.mapper.UserMapper;
Expand Down