Pjh

API_CHANGES_INDUSTRY_REMOVAL.md

@@ -0,0 +1,232 @@
+# API 변경 사항 - industry 필드 제거
+
+## 개요
+`SolutionEntity`에서 `industry` 필드를 제거함에 따라 관련된 모든 API의 Request/Response 구조가 변경되었습니다.
+
+## 변경된 API 목록
+
+### 1. 솔루션 생성 API
+**엔드포인트**: `POST /api/solution-service/solution`
+
+#### Request 변경 사항
+**SaveSolutionEntityRequest**에서 `industry` 필드 제거
+
+**변경 전:**
+```json
+{
+  "vendorSeq": 1,
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "category": "CATEGORY_NAME",
+  "industry": "산업분야",
+  "recommendedCompanySize": "회사규모",
+  "solutionImplementationType": "구현방식",
+  "amount": 1000000,
+  "duration": 30,
+  "solutionEffect": [...],
+  "keyword": [...]
+}
+```
+
+**변경 후:**
+```json
+{
+  "vendorSeq": 1,
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "category": "CATEGORY_NAME",
+  "recommendedCompanySize": "회사규모",
+  "solutionImplementationType": "구현방식",
+  "amount": 1000000,
+  "duration": 30,
+  "solutionEffect": [...],
+  "keyword": [...]
+}
+```
+
+**제거된 필드:**
+- `industry` (String) - 필수 필드였으나 제거됨
+
+---
+
+### 2. 솔루션 수정 API
+**엔드포인트**: `PUT /api/solution-service/solution`
+
+#### Request 변경 사항
+**ModifySolutionEntityRequest**에서 `industry` 필드 제거
+
+**변경 전:**
+```json
+{
+  "vendorSeq": 1,
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "prevCategory": "이전카테고리",
+  "nextCategory": "변경카테고리",
+  "industry": "산업분야",
+  "recommendedCompanySize": "회사규모",
+  "solutionImplementationType": "구현방식",
+  "amount": 1000000,
+  "duration": 30,
+  "solutionEffect": [...],
+  "keyword": [...]
+}
+```
+
+**변경 후:**
+```json
+{
+  "vendorSeq": 1,
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "prevCategory": "이전카테고리",
+  "nextCategory": "변경카테고리",
+  "recommendedCompanySize": "회사규모",
+  "solutionImplementationType": "구현방식",
+  "amount": 1000000,
+  "duration": 30,
+  "solutionEffect": [...],
+  "keyword": [...]
+}
+```
+
+**제거된 필드:**
+- `industry` (String) - 필수 필드였으나 제거됨
+
+---
+
+### 3. 전체 솔루션 조회 API (필터링, 키워드 검색)
+**엔드포인트**: `GET /api/solution-service/solution/list`
+
+#### Query Parameter 변경 사항
+`industry` 쿼리 파라미터 제거
+
+**변경 전:**
+```
+GET /api/solution-service/solution/list?category=CATEGORY_NAME&industry=산업분야&budget=전체&keyword=키워드&start=0&end=15
+```
+
+**변경 후:**
+```
+GET /api/solution-service/solution/list?category=CATEGORY_NAME&budget=전체&keyword=키워드&start=0&end=15
+```
+
+**제거된 파라미터:**
+- `industry` (String, optional) - 산업분야 필터링 파라미터 제거
+
+**남아있는 파라미터:**
+- `category` (String, optional) - 카테고리 필터
+- `budget` (String, optional, default: "전체") - 예산 필터
+- `keyword` (String, optional) - 키워드 검색
+- `start` (int, default: 0) - 시작 인덱스
+- `end` (int, default: 15) - 종료 인덱스
+
+---
+
+### 4. 솔루션 카테고리별 조회 API
+**엔드포인트**: `GET /api/solution-service/solution/category`
+
+#### Response 변경 사항
+**GetSolutionEntityResponse**에서 `industry` 필드 제거
+
+**변경 전:**
+```json
+{
+  "solutionSeq": 1,
+  "representImageUrl": "이미지URL",
+  "descriptionPdfUrl": "PDFURL",
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "amount": 1000000,
+  "solutionImplementationType": ["방식1", "방식2"],
+  "duration": 30,
+  "industry": ["산업1", "산업2"],
+  "recommendedCompanySize": ["규모1", "규모2"],
+  "solutionEffect": [...],
+  "keywords": [...]
+}
+```
+
+**변경 후:**
+```json
+{
+  "solutionSeq": 1,
+  "representImageUrl": "이미지URL",
+  "descriptionPdfUrl": "PDFURL",
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "amount": 1000000,
+  "solutionImplementationType": ["방식1", "방식2"],
+  "duration": 30,
+  "recommendedCompanySize": ["규모1", "규모2"],
+  "solutionEffect": [...],
+  "keywords": [...]
+}
+```
+
+**제거된 필드:**
+- `industry` (List<String>) - 산업분야 리스트 제거
+
+---
+
+### 5. 솔루션 조회 API
+**엔드포인트**: `GET /api/solution-service/solution?solutionSeq={solutionSeq}`
+
+#### Response 변경 사항
+**GetSolutionEntityResponse**에서 `industry` 필드 제거
+
+**변경 전:**
+```json
+{
+  "solutionSeq": 1,
+  "representImageUrl": "이미지URL",
+  "descriptionPdfUrl": "PDFURL",
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "amount": 1000000,
+  "solutionImplementationType": ["방식1", "방식2"],
+  "duration": 30,
+  "industry": ["산업1", "산업2"],
+  "recommendedCompanySize": ["규모1", "규모2"],
+  "solutionEffect": [...],
+  "keywords": [...]
+}
+```
+
+**변경 후:**
+```json
+{
+  "solutionSeq": 1,
+  "representImageUrl": "이미지URL",
+  "descriptionPdfUrl": "PDFURL",
+  "solutionName": "솔루션명",
+  "solutionDetail": "상세설명",
+  "amount": 1000000,
+  "solutionImplementationType": ["방식1", "방식2"],
+  "duration": 30,
+  "recommendedCompanySize": ["규모1", "규모2"],
+  "solutionEffect": [...],
+  "keywords": [...]
+}
+```
+
+**제거된 필드:**
+- `industry` (List<String>) - 산업분야 리스트 제거
+
+---
+
+## 요약
+
+| API | 변경 유형 | 제거된 항목 |
+|-----|----------|------------|
+| POST /api/solution-service/solution | Request | `industry` 필드 |
+| PUT /api/solution-service/solution | Request | `industry` 필드 |
+| GET /api/solution-service/solution/list | Query Parameter | `industry` 파라미터 |
+| GET /api/solution-service/solution/category | Response | `industry` 필드 |
+| GET /api/solution-service/solution | Response | `industry` 필드 |
+
+**주의사항:**
+- 모든 `industry` 필드는 **필수 필드**였으나 제거되었습니다.
+- 기존 클라이언트 코드에서 `industry` 필드를 사용하고 있다면 반드시 수정해야 합니다.
+- 데이터베이스 스키마 변경이 필요할 수 있습니다.
+

src/main/java/startwithco/startwithbackend/admin/settlement/service/SettlementService.java

@@ -9,6 +9,7 @@
 import startwithco.startwithbackend.exception.ServerException;
 import startwithco.startwithbackend.payment.payment.domain.PaymentEntity;
 import startwithco.startwithbackend.payment.payment.repository.PaymentEntityRepository;
+import startwithco.startwithbackend.payment.payment.util.PAYMENT_STATUS;
 import startwithco.startwithbackend.admin.settlement.dto.SettlementDto;
 import startwithco.startwithbackend.payment.snapshot.entity.TossPaymentDailySnapshotEntity;
 import startwithco.startwithbackend.payment.snapshot.repository.TossPaymentDailySnapshotEntityRepository;
@@ -78,7 +79,7 @@ public void approveSettlement(String orderId) {
                         getCode("내부 서버 오류가 발생했습니다.", ExceptionType.SERVER)
                 ));
 
-        paymentEntity.updateSETTLEDStatus();
+        paymentEntity.markAsSettled();
         paymentEntityRepository.savePaymentEntity(paymentEntity);
 
         tossPaymentDailySnapshotEntity.updateApproveSettlement();
@@ -100,7 +101,7 @@ public void cancelSettlement(String orderId) {
                         getCode("내부 서버 오류가 발생했습니다.", ExceptionType.SERVER)
                 ));
 
-        paymentEntity.updateCANCELDStatus();
+        paymentEntity.setPaymentStatus(PAYMENT_STATUS.CANCELED);
         paymentEntityRepository.savePaymentEntity(paymentEntity);
 
         tossPaymentDailySnapshotEntity.updateDeleteSettlement();

src/main/java/startwithco/startwithbackend/b2b/vendor/service/VendorService.java

@@ -2,7 +2,6 @@
 
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,7 +29,6 @@
 import startwithco.startwithbackend.exception.code.ExceptionCodeMapper;
 import startwithco.startwithbackend.payment.payment.domain.PaymentEntity;
 import startwithco.startwithbackend.payment.payment.repository.PaymentEntityRepository;
-import startwithco.startwithbackend.payment.paymentEvent.repository.PaymentEventEntityRepository;
 import startwithco.startwithbackend.payment.snapshot.entity.TossPaymentDailySnapshotEntity;
 import startwithco.startwithbackend.payment.snapshot.repository.TossPaymentDailySnapshotEntityRepository;
 import startwithco.startwithbackend.solution.solution.domain.SolutionEntity;
@@ -352,8 +350,8 @@ public List<Object> getVendorDashboardList(Long vendorSeq, String paymentStatus,
                         solutionEntity.getSolutionSeq(),
                         solutionEntity.getSolutionName(),
                         paymentEntity.getAmount(),
-                        paymentEntity.getAutoConfirmScheduledAt(),
-                        paymentEntity.getAutoConfirmScheduledAt(),
+                        paymentEntity.getDueDate(),
+                        paymentEntity.getPaymentCompletedAt(),
                         consumerEntity.getConsumerSeq(),
                         consumerEntity.getConsumerName()
                 );
@@ -366,7 +364,7 @@ public List<Object> getVendorDashboardList(Long vendorSeq, String paymentStatus,
                         solutionEntity.getSolutionSeq(),
                         solutionEntity.getSolutionName(),
                         paymentEntity.getAmount(),
-                        paymentEntity.getAutoConfirmScheduledAt(),
+                        paymentEntity.getDueDate(),
                         tossPaymentDailySnapshotEntity.getSettlementAmount(),
                         consumerEntity.getConsumerSeq(),
                         consumerEntity.getConsumerName()

src/main/java/startwithco/startwithbackend/common/service/CommonService.java

@@ -11,7 +11,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -28,12 +27,10 @@
 import startwithco.startwithbackend.exception.BadRequestException;
 import startwithco.startwithbackend.exception.NotFoundException;
 import startwithco.startwithbackend.exception.ServerException;
-import startwithco.startwithbackend.payment.payment.domain.PaymentEntity;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -56,9 +53,6 @@ public class CommonService {
     @Qualifier("tossPaymentWebClient")
     private final WebClient tossPaymentWebClient;
 
-    @Qualifier("frontWebClient")
-    private final WebClient frontWebClient;
-
     private final TemplateEngine templateEngine;
 
     private final JavaMailSender javaMailSender;
@@ -166,12 +160,17 @@ public Mono<JsonNode> executeTossPaymentApproval(String paymentKey, String order
                 .doOnError(WebClientResponseException.class, err -> {
                     String responseBody = err.getResponseBodyAsString();
                     String errorMessage = "TOSS 결제 승인 실패";
+
+                    log.error("❌ 토스페이먼츠 API 오류 응답: HTTP {}, Body: {}", err.getStatusCode(), responseBody);
 
                     try {
                         JsonNode errorJson = objectMapper.readTree(responseBody);
                         if (errorJson.has("message")) {
                             errorMessage = errorJson.get("message").asText();
                         }
+                        if (errorJson.has("code")) {
+                            log.error("토스페이먼츠 에러 코드: {}", errorJson.get("code").asText());
+                        }
                     } catch (Exception parseError) {
                         log.warn("⚠️ Toss 오류 응답 파싱 실패: {}", responseBody);
                     }
@@ -182,11 +181,19 @@ public Mono<JsonNode> executeTossPaymentApproval(String paymentKey, String order
                             getCode(errorMessage, ExceptionType.SERVER)
                     );
                 })
+                .doOnError(err -> {
+                    if (!(err instanceof WebClientResponseException)) {
+                        log.error("❌ 토스페이먼츠 API 호출 실패: {}", err.getMessage(), err);
+                    }
+                })
                 .onErrorResume(err -> {
+                    if (err instanceof ServerException) {
+                        return Mono.error(err);
+                    }
                     return Mono.error(new ServerException(
                             HttpStatus.INTERNAL_SERVER_ERROR.value(),
-                            err.getMessage(),
-                            getCode(err.getMessage(), ExceptionType.SERVER)
+                            "토스페이먼츠 API 호출 실패: " + err.getMessage(),
+                            getCode("토스페이먼츠 API 호출 실패", ExceptionType.SERVER)
                     ));
                 });
     }
@@ -242,28 +249,6 @@ public Mono<JsonNode> cancelTossPaymentApproval(String paymentKey, String cancel
                 });
     }
 
-    public void notifyFrontOfVirtualAccountStatus(PaymentEntity paymentEntity) {
-        Map<String, Object> payload = new HashMap<>();
-        payload.put("paymentSeq", paymentEntity.getPaymentSeq());
-        payload.put("orderId", paymentEntity.getOrderId());
-        payload.put("paymentKey", paymentEntity.getPaymentKey());
-        payload.put("amount", paymentEntity.getAmount());
-        payload.put("paymentStatus", paymentEntity.getPaymentStatus().name());
-        payload.put("method", paymentEntity.getMethod() != null ? paymentEntity.getMethod().name() : null);
-        payload.put("secret", paymentEntity.getSecret());
-        payload.put("paymentCompletedAt", paymentEntity.getPaymentCompletedAt() != null ? paymentEntity.getPaymentCompletedAt().toString() : null);
-        payload.put("autoConfirmScheduledAt", paymentEntity.getAutoConfirmScheduledAt() != null ? paymentEntity.getAutoConfirmScheduledAt().toString() : null);
-        payload.put("dueDate", paymentEntity.getDueDate() != null ? paymentEntity.getDueDate().toString() : null);
-
-        frontWebClient.post()
-                .uri("/api/deposit-webhook")
-                .bodyValue(payload)
-                .retrieve()
-                .toBodilessEntity()
-                .doOnError(err -> log.error("❌ 프론트 전달 실패: error={}", err.getMessage()))
-                .subscribe();
-    }
-
     public void sendResetLink(String email, String link) {
 
         String subject = "Solu 비밀번호 재설정";