refactor : 추후 테스팅 용이성을 위해 추상화 된 UUID 생성 클래스를 주입하는 것으로 변경

Author: JaeyoungAhn

src/main/java/com/prgmrs/voucher/service/UserService.java

@@ -7,8 +7,8 @@
 import com.prgmrs.voucher.model.User;
 import com.prgmrs.voucher.model.wrapper.Username;
 import com.prgmrs.voucher.repository.UserRepository;
-import com.prgmrs.voucher.util.UUIDGenerator;
-import com.prgmrs.voucher.util.UuidConverter;
+import com.prgmrs.voucher.util.IdGenerator;
+import com.prgmrs.voucher.util.UUIDConverter;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -17,13 +17,15 @@
 @Service
 public class UserService {
     private final UserRepository userRepository;
+    private final IdGenerator idGenerator;
 
-    public UserService(UserRepository userRepository) {
+    public UserService(UserRepository userRepository, IdGenerator idGenerator) {
         this.userRepository = userRepository;
+        this.idGenerator = idGenerator;
     }
 
     public UserResponse createUser(UserRequest userRequest) { // 유저 생성
-        UUID uuid = UUIDGenerator.generateUUID();
+        UUID uuid = idGenerator.generate();
         User user = new User(uuid, new Username(userRequest.username()));
         userRepository.save(user);
 
@@ -41,7 +43,7 @@ public UserListResponse getUserListWithVoucherAssigned() {
     }
 
     public UserResponse getUserByVoucherId(VoucherIdRequest voucherIdRequest) {
-        UUID uuid = UuidConverter.fromString(voucherIdRequest.voucherUuid());
+        UUID uuid = UUIDConverter.fromString(voucherIdRequest.voucherUuid());
         User user = userRepository.getUserByVoucherId(uuid);
 
         return new UserResponse(user.userId(), user.username().value());

src/main/java/com/prgmrs/voucher/service/VoucherService.java

@@ -17,7 +17,7 @@
 import com.prgmrs.voucher.model.wrapper.Percent;
 import com.prgmrs.voucher.model.wrapper.Username;
 import com.prgmrs.voucher.repository.VoucherRepository;
-import com.prgmrs.voucher.util.UUIDGenerator;
+import com.prgmrs.voucher.util.IdGenerator;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -27,18 +27,20 @@
 public class VoucherService {
     private final VoucherRepository voucherRepository;
     private final VoucherValidator voucherValidator;
+    private final IdGenerator idGenerator;
 
-    public VoucherService(VoucherRepository voucherRepository, VoucherValidator voucherValidator) {
+    public VoucherService(VoucherRepository voucherRepository, VoucherValidator voucherValidator, IdGenerator idGenerator) {
         this.voucherRepository = voucherRepository;
         this.voucherValidator = voucherValidator;
+        this.idGenerator = idGenerator;
     }
 
     public VoucherResponse createVoucher(VoucherRequest voucherRequest) {
         DiscountType discountType = DiscountType.fromString(voucherRequest.discountType());
         Long validatedLongValue =
                 voucherValidator.convertToLongWithValidation(voucherRequest.discountStringValue(), discountType);
 
-        UUID uuid = UUIDGenerator.generateUUID();
+        UUID uuid = idGenerator.generate();
         Voucher voucher;
 
         switch (discountType) {

src/main/java/com/prgmrs/voucher/service/WalletService.java

@@ -8,7 +8,7 @@
 import com.prgmrs.voucher.model.wrapper.Username;
 import com.prgmrs.voucher.repository.UserRepository;
 import com.prgmrs.voucher.repository.WalletRepository;
-import com.prgmrs.voucher.util.UuidConverter;
+import com.prgmrs.voucher.util.UUIDConverter;
 import org.springframework.stereotype.Service;
 
 import java.util.UUID;
@@ -25,14 +25,14 @@ public WalletService(UserRepository userRepository, WalletRepository walletRepos
 
     public WalletResponse assignVoucher(AssignVoucherRequest assignVoucherRequest) {
         User user = userRepository.findByUsername(new Username(assignVoucherRequest.username()));
-        Wallet wallet = new Wallet(user.userId(), UuidConverter.fromString(assignVoucherRequest.voucherUuid()));
+        Wallet wallet = new Wallet(user.userId(), UUIDConverter.fromString(assignVoucherRequest.voucherUuid()));
         walletRepository.save(wallet);
 
         return new WalletResponse(wallet.voucherId(), user.username().value());
     }
 
     public WalletResponse removeVoucher(RemoveVoucherRequest removeVoucherRequest) {
-        UUID convertedUuid = UuidConverter.fromString(removeVoucherRequest.voucherUuid());
+        UUID convertedUuid = UUIDConverter.fromString(removeVoucherRequest.voucherUuid());
         User user = userRepository.getUserByVoucherId(convertedUuid);
         Wallet wallet = new Wallet(user.userId(), convertedUuid);
         walletRepository.remove(wallet);

src/main/java/com/prgmrs/voucher/util/UuidConverter.java renamed to src/main/java/com/prgmrs/voucher/util/UUIDConverter.java

@@ -1,12 +1,15 @@
 package com.prgmrs.voucher.util;
 
 import com.prgmrs.voucher.exception.WrongRangeFormatException;
-import org.springframework.stereotype.Component;
 
 import java.util.UUID;
 
-@Component
-public class UuidConverter {
+public class UUIDConverter {
+
+    private UUIDConverter() {
+        throw new IllegalStateException("Util class");
+    }
+
     public static UUID fromString(String uuidString) {
         try {
             return UUID.fromString(uuidString);

src/main/java/com/prgmrs/voucher/util/UUIDGenerator.java

@@ -5,8 +5,8 @@
 import java.util.UUID;
 
 @Component
-public class UUIDGenerator {
-    public static UUID generateUUID() {
+public class UUIDGenerator implements IdGenerator {
+    public UUID generate() {
         return UUID.randomUUID();
     }
 }