Skip to content

Commit ab264d9

Browse files
eunchan96eunchan96
authored
[Fix]: FileService 관련 오류 수정 (#173)
* [Fix]: FileService 관련 오류 수정 * [Fix]: build 오류 해결
1 parent 5f02e1a commit ab264d9

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

‎src/main/java/com/backend/domain/member/service/MemberService.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
package com.backend.domain.member.service;
22

3-
import com.backend.domain.member.dto.LoginRequestDto;
4-
import com.backend.domain.member.dto.LoginResponseDto;
5-
import com.backend.domain.member.dto.MemberModifyRequestDto;
6-
import com.backend.domain.member.dto.MemberMyInfoResponseDto;
7-
import com.backend.domain.member.dto.MemberSignUpRequestDto;
8-
import com.backend.domain.member.dto.MemberSignUpResponseDto;
9-
import com.backend.domain.member.dto.MemberInfoResponseDto;
3+
import com.backend.domain.member.dto.*;
104
import com.backend.domain.member.entity.Member;
115
import com.backend.domain.member.repository.MemberRepository;
12-
import com.backend.global.file.service.LocalFileService;
136
import com.backend.global.exception.ServiceException;
7+
import com.backend.global.file.service.FileService;
8+
import com.backend.global.redis.RedisUtil;
149
import com.backend.global.response.RsData;
1510
import com.backend.global.security.JwtUtil;
16-
import com.backend.global.redis.RedisUtil;
1711
import lombok.RequiredArgsConstructor;
1812
import org.springframework.security.crypto.password.PasswordEncoder;
1913
import org.springframework.stereotype.Service;
20-
import org.springframework.web.multipart.MultipartFile;
2114
import org.springframework.transaction.annotation.Transactional;
15+
import org.springframework.web.multipart.MultipartFile;
2216

2317
import java.util.Optional;
2418

@@ -31,7 +25,7 @@ public class MemberService {
3125
private final PasswordEncoder passwordEncoder;
3226
private final JwtUtil jwtUtil;
3327
private final RedisUtil redisUtil;
34-
private final LocalFileService fileService;
28+
private final FileService fileService;
3529

3630
public RsData<MemberSignUpResponseDto> signup(MemberSignUpRequestDto memberSignUpRequestDto) {
3731
checkEmailDuplication(memberSignUpRequestDto.email());

‎src/main/java/com/backend/domain/product/service/ProductImageService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.backend.domain.product.entity.ProductImage;
55
import com.backend.domain.product.exception.ProductException;
66
import com.backend.domain.product.repository.ProductImageRepository;
7-
import com.backend.global.file.service.LocalFileService;
7+
import com.backend.global.file.service.FileService;
88
import lombok.RequiredArgsConstructor;
99
import org.springframework.stereotype.Service;
1010
import org.springframework.web.multipart.MultipartFile;
@@ -21,7 +21,7 @@
2121
@Service
2222
@RequiredArgsConstructor
2323
public class ProductImageService {
24-
private final LocalFileService fileService;
24+
private final FileService fileService;
2525
private final ProductImageRepository productImageRepository;
2626

2727
// ======================================= public methods ======================================= //

‎src/test/java/com/backend/domain/payment/controller/ApiV1PaymentControllerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void setUp() {
7070
pmCard = paymentMethodRepository.save(
7171
PaymentMethod.builder()
7272
.member(me)
73-
.type(PaymentMethodType.CARD)
73+
.methodType(PaymentMethodType.CARD)
7474
.token(billingKey) // 토스 빌링키
7575
.alias("메인카드")
7676
.isDefault(true)

‎src/test/java/com/backend/domain/payment/service/PaymentMethodServiceTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void setUp() {
4848
private PaymentMethod cardEntity(Long id, Member m) {
4949
PaymentMethod e = PaymentMethod.builder()
5050
.member(m)
51-
.type(PaymentMethodType.CARD)
51+
.methodType(PaymentMethodType.CARD)
5252
.alias("카드별칭")
5353
.isDefault(false)
5454
.brand("VISA")
@@ -63,7 +63,7 @@ private PaymentMethod cardEntity(Long id, Member m) {
6363
private PaymentMethod bankEntity(Long id, Member m) {
6464
PaymentMethod e = PaymentMethod.builder()
6565
.member(m)
66-
.type(PaymentMethodType.BANK)
66+
.methodType(PaymentMethodType.BANK)
6767
.alias("계좌별칭")
6868
.isDefault(false)
6969
.bankCode("004")
@@ -120,7 +120,7 @@ void createCard_success() {
120120
ArgumentCaptor<PaymentMethod> captor = ArgumentCaptor.forClass(PaymentMethod.class);
121121
verify(paymentMethodRepository).save(captor.capture());
122122
PaymentMethod saved = captor.getValue();
123-
assertThat(saved.getType()).isEqualTo(PaymentMethodType.CARD);
123+
assertThat(saved.getMethodType()).isEqualTo(PaymentMethodType.CARD);
124124
assertThat(saved.getIsDefault()).isTrue();
125125
}
126126

@@ -163,7 +163,7 @@ void findAll_success_order_and_mapping() {
163163

164164
PaymentMethod defaultCard = PaymentMethod.builder()
165165
.member(member)
166-
.type(PaymentMethodType.CARD)
166+
.methodType(PaymentMethodType.CARD)
167167
.alias("내 주력카드")
168168
.isDefault(true)
169169
.brand("SHINHAN")
@@ -174,7 +174,7 @@ void findAll_success_order_and_mapping() {
174174

175175
PaymentMethod bank = PaymentMethod.builder()
176176
.member(member)
177-
.type(PaymentMethodType.BANK)
177+
.methodType(PaymentMethodType.BANK)
178178
.alias("급여통장")
179179
.isDefault(false)
180180
.bankCode("004")
@@ -340,7 +340,7 @@ void success() {
340340

341341
PaymentMethod entity = PaymentMethod.builder()
342342
.member(member)
343-
.type(PaymentMethodType.CARD) // CARD | BANK
343+
.methodType(PaymentMethodType.CARD) // CARD | BANK
344344
.alias("결혼식 카드")
345345
.brand("SHINHAN")
346346
.last4("1234")

‎src/test/java/com/backend/domain/payment/service/PaymentServiceTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,27 @@
55
import com.backend.domain.cash.repository.CashTransactionRepository;
66
import com.backend.domain.member.entity.Member;
77
import com.backend.domain.member.repository.MemberRepository;
8-
import com.backend.domain.payment.enums.PaymentMethodType;
8+
import com.backend.domain.payment.dto.request.PaymentRequest;
99
import com.backend.domain.payment.dto.response.MyPaymentResponse;
1010
import com.backend.domain.payment.dto.response.MyPaymentsResponse;
11-
import com.backend.domain.payment.dto.response.PgChargeResultResponse;
12-
import com.backend.domain.payment.dto.request.PaymentRequest;
1311
import com.backend.domain.payment.dto.response.PaymentResponse;
12+
import com.backend.domain.payment.dto.response.PgChargeResultResponse;
1413
import com.backend.domain.payment.entity.Payment;
1514
import com.backend.domain.payment.entity.PaymentMethod;
15+
import com.backend.domain.payment.enums.PaymentMethodType;
1616
import com.backend.domain.payment.repository.PaymentMethodRepository;
1717
import com.backend.domain.payment.repository.PaymentRepository;
1818
import org.junit.jupiter.api.BeforeEach;
1919
import org.junit.jupiter.api.Test;
2020
import org.mockito.ArgumentMatchers;
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.boot.test.context.SpringBootTest;
23-
import org.springframework.boot.test.mock.mockito.MockBean;
23+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2424
import org.springframework.transaction.annotation.Transactional;
2525
import org.springframework.web.server.ResponseStatusException;
2626

27-
import static org.assertj.core.api.Assertions.*;
27+
import static org.assertj.core.api.Assertions.assertThat;
28+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2829
import static org.mockito.BDDMockito.given;
2930
import static org.mockito.Mockito.times;
3031
import static org.mockito.Mockito.verify;
@@ -41,7 +42,7 @@ class PaymentServiceTest {
4142
@Autowired CashRepository cashRepository;
4243
@Autowired CashTransactionRepository cashTransactionRepository;
4344

44-
@MockBean TossBillingClientService tossBillingClientService;
45+
@MockitoBean TossBillingClientService tossBillingClientService;
4546

4647
Member me;
4748
PaymentMethod card;
@@ -61,7 +62,7 @@ void setUp() {
6162
card = paymentMethodRepository.save(
6263
PaymentMethod.builder()
6364
.member(me)
64-
.type(PaymentMethodType.CARD)
65+
.methodType(PaymentMethodType.CARD)
6566
.token("BILL-001") // billingKey
6667
.alias("테스트카드")
6768
.isDefault(true)
@@ -150,7 +151,7 @@ void setUp() {
150151
PaymentMethod noBillingKey = paymentMethodRepository.save(
151152
PaymentMethod.builder()
152153
.member(me)
153-
.type(PaymentMethodType.CARD)
154+
.methodType(PaymentMethodType.CARD)
154155
.token(null) // ★ 없음
155156
.alias("무효카드")
156157
.isDefault(false)

0 commit comments

Comments
 (0)