Skip to content

Commit 3379bfc

Browse files
committed
fix:불필요한 주석 삭제 및 계좌 생성시 productID받아서 생성하도록 변경
1 parent cc38a41 commit 3379bfc

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

src/main/java/org/baas/baascore/dto/request/AccountIssuedRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.baas.baascore.dto.request;
22

33
import jakarta.validation.constraints.NotBlank;
4+
import jakarta.validation.constraints.NotNull;
45
import lombok.AllArgsConstructor;
56
import lombok.Builder;
67
import lombok.Getter;
@@ -14,4 +15,7 @@ public class AccountIssuedRequest {
1415

1516
@NotBlank
1617
private String ci;
18+
19+
@NotNull
20+
private Long productId;
1721
}

src/main/java/org/baas/baascore/dto/response/ProductResponse.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class ProductResponse {
1414
private Long id;
1515
private String bankCode;
1616
private String bankName;
17+
private String bankImage;
1718
private String productName;
1819
private double highestRate;
1920
private double lowestRate;
@@ -22,6 +23,7 @@ public static ProductResponse from(Product product){
2223
return ProductResponse.builder().id(product.getId())
2324
.bankCode(product.getBank().getBankCode())
2425
.bankName(product.getBank().getBankName())
26+
.bankImage(product.getBank().getBankImage())
2527
.productName(product.getProductName())
2628
.highestRate(product.getHighestRate())
2729
.lowestRate(product.getLowestRate())

src/main/java/org/baas/baascore/model/Bank.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ public class Bank extends BaseTimeEntity {
2727
@Column(name = "name", nullable = false)
2828
private String bankName;
2929

30+
//은행 이미지
31+
@Column(name = "bank_image", nullable = false)
32+
private String bankImage;
33+
3034
// 해당 은행사의 상품 리스트
3135
@OneToMany(mappedBy = "bank", fetch = FetchType.LAZY)
3236
private List<Product> products = new ArrayList<>();

src/main/java/org/baas/baascore/service/AccountService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public AccountIssuedResponse accountIssued(AccountIssuedRequest accountIssuedReq
4343
Bank bank = bankRepository.findByBankCode("020").orElseThrow( //"020 - 우리은행 은행코드
4444
() -> new CustomException(ErrorCode.BANK_NOT_FOUND)
4545
);
46-
Product product = productRepository.findById(2L).orElseThrow(
46+
Product product = productRepository.findById(accountIssuedRequest.getProductId()).orElseThrow(
4747
() -> new CustomException(ErrorCode.BANK_NOT_FOUND)
4848
);
4949
String accountNumber = getAccountNumber();

src/main/java/org/baas/baascore/trace/AsyncConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public TaskExecutor taskExecutor() {
1818
taskExecutor.setCorePoolSize(processors);
1919
taskExecutor.setMaxPoolSize(processors * 2);
2020
taskExecutor.setQueueCapacity(100);
21-
taskExecutor.setMaxPoolSize(50);
2221
// 내가 만든 데코레이터 설정
2322
taskExecutor.setTaskDecorator(new ClonedTaskDecorator());
2423
taskExecutor.setThreadNamePrefix("async-task-");

src/main/java/org/baas/baascore/trace/logtrace/ThreadLocalLogTrace.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ public class ThreadLocalLogTrace implements LogTrace {
1313
private static final String COMPLETE_PREFIX = "<--";
1414
private static final String EX_PREFIX = "<X-";
1515

16+
private static final String TRACEID = "traceId";
1617
private String message;
1718

1819
@Override
1920
public TraceStatus begin(String message) {
2021
this.message = message;
2122
syncTraceId();
22-
String traceId = MDC.get("traceId");
23+
String traceId = MDC.get(TRACEID);
2324
TraceId traceId1 = new TraceId(traceId.split("\\.")[1], Integer.parseInt(traceId.split("\\.")[0]));
2425

2526
Long startTimeMs = System.currentTimeMillis();
@@ -62,18 +63,8 @@ private void complete(TraceStatus status, Exception e) {
6263
releaseTraceId();
6364
}
6465

65-
// private Object getSession() {
66-
// ServletRequestAttributes servletRequestAttribute = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
67-
// Object attribute = null;
68-
// if (servletRequestAttribute != null) {
69-
// attribute = servletRequestAttribute.getAttribute(SessionConst.LOGIN_MEMBER,
70-
// RequestAttributes.SCOPE_SESSION);
71-
// }
72-
// return attribute;
73-
// }
74-
7566
private void syncTraceId() {
76-
String traceId = MDC.get("traceId");
67+
String traceId = MDC.get(TRACEID);
7768
if (traceId == null) {
7869
TraceId traceId1 = new TraceId();
7970
MDC.put("traceId", traceId1.getMdcStr());
@@ -85,8 +76,7 @@ private void syncTraceId() {
8576
}
8677

8778
private void releaseTraceId() {
88-
// Object session = getSession();
89-
String traceId = MDC.get("traceId");
79+
String traceId = MDC.get(TRACEID);
9080
TraceId traceId1 = new TraceId(traceId.split("\\.")[1], Integer.parseInt(traceId.split("\\.")[0]));
9181
if (traceId1.isFirstLevel()) {
9282
MDC.clear();

0 commit comments

Comments
 (0)