등)
+"""
+
+ return prompt
+
+ def _parse_generated_content(self, content: str, product_data: ProductData,
+ request: BlogContentRequest) -> BlogPostContent:
+ """생성된 콘텐츠를 파싱하여 구조화"""
+
+ # 제목 추출 (첫 번째 h1이나 강조된 줄)
+ lines = content.strip().split('\n')
+ title = product_data.title # 기본값
+
+ for line in lines[:10]: # 처음 10줄에서 제목 찾기
+ clean_line = line.strip().replace('#', '').replace('', '').replace(' ', '')
+ if clean_line and len(clean_line) > 5 and ('제목' in line or '' in line or line.startswith('#')):
+ title = clean_line
+ break
+ elif clean_line and len(clean_line) > 10 and len(clean_line) < 100:
+ # 적당한 길이의 첫 번째 줄을 제목으로
+ title = clean_line
+ break
+
+ # 태그 생성
+ tags = self._generate_tags_from_product(product_data, request)
+
+ return BlogPostContent(
+ title=title,
+ content=content,
+ tags=tags
+ )
+
+ def _generate_tags_from_product(self, product_data: ProductData, request: BlogContentRequest) -> List[str]:
+ """상품 정보 기반 태그 생성"""
+ tags = []
+
+ # 사용자 지정 키워드가 있으면 우선 추가
+ if request.target_keywords:
+ tags.extend(request.target_keywords[:5])
+
+ # 기본 태그 추가
+ if product_data.tag:
+ tags.append(product_data.tag)
+
+ # 제품 타입 추론해서 태그 추가
+ title_lower = product_data.title.lower()
+ if any(word in title_lower for word in ["iphone", "아이폰", "phone"]):
+ tags.extend(["아이폰", "스마트폰"])
+ if any(word in title_lower for word in ["필름", "보호", "강화"]):
+ tags.extend(["보호필름", "강화필름"])
+ if any(word in title_lower for word in ["케이스", "커버"]):
+ tags.extend(["폰케이스", "액세서리"])
+
+ # 재료 정보에서 태그 생성
+ if product_data.material_info:
+ for key, value in product_data.material_info.items():
+ if value and len(value.strip()) <= 20: # 너무 긴 값은 제외
+ clean_value = value.strip()
+ if clean_value not in tags:
+ tags.append(clean_value)
+
+ # 중복 제거 및 개수 제한
+ unique_tags = []
+ for tag in tags:
+ if tag not in unique_tags and len(unique_tags) < 10:
+ unique_tags.append(tag)
+
+ return unique_tags
+
+ def _create_fallback_content(self, product_data: ProductData, request: BlogContentRequest) -> BlogPostContent:
+ """콘텐츠 생성 실패 시 대안 콘텐츠 생성"""
+ title = f"{product_data.title} - 상품 정보 및 구매 가이드"
+
+ content = f"""
+{product_data.title}
+
+상품 소개
+ {product_data.title}에 대한 상세한 정보를 소개합니다.
+
+가격 정보
+판매가: {product_data.price:,}원
+"""
+
+ if product_data.material_info:
+ content += "상품 사양 \n\n"
+ for key, value in product_data.material_info.items():
+ content += f"{key}: {value} \n"
+
+ if product_data.options:
+ content += f"구매 옵션 ({len(product_data.options)}가지) \n\n"
+ for option in product_data.options[:5]:
+ content += f"{option.get('name', 'N/A')} \n"
+ content += " \n"
+
+ content += f"""
+구매 안내
+상품 구매는 여기 에서 가능합니다.
+"""
+
+ return BlogPostContent(
+ title=title,
+ content=content,
+ tags=[product_data.tag] if product_data.tag else ["상품정보"]
+ )
+
+class ProductBlogPostingService:
+ """상품 데이터를 Blogger에 포스팅하는 메인 서비스"""
+
+ def __init__(self):
+ self.content_generator = ProductContentGenerator()
+ self.blogger_service = BloggerBlogPostAdapter()
+
+ def post_product_to_blogger(self, product_data: ProductData, request: BlogContentRequest) -> dict:
+ """상품 데이터를 Blogger에 포스팅"""
+ try:
+ # 1. GPT를 통한 콘텐츠 생성
+ blog_content = self.content_generator.generate_blog_content(product_data, request)
+
+ # 2. Blogger에 포스팅
+ self.blogger_service.post_content(
+ title=blog_content.title,
+ content=blog_content.content,
+ tags=blog_content.tags
+ )
+
+ # 3. 성공 결과 반환
+ return {
+ "status": "success",
+ "platform": "blogger",
+ "title": blog_content.title,
+ "tags": blog_content.tags,
+ "posted_at": datetime.now().isoformat(),
+ "product_tag": product_data.tag
+ }
+
+ except Exception as e:
+ logging.error(f"Blogger 포스팅 실패: {e}")
+ # ProductData 객체 기준으로 처리
+ return {
+ "status": "failed",
+ "error": str(e),
+ "platform": "blogger",
+ "attempted_at": datetime.now().isoformat(),
+ "product_tag": getattr(product_data, "tag", "unknown")
+ }
+
+ # def batch_post_products(self, products_data: List[Dict], request: BlogContentRequest) -> List[Dict[str, Any]]:
+ # """여러 상품을 일괄 포스팅"""
+ # results = []
+ #
+ # for product_data in products_data:
+ # result = self.post_product_to_blogger(product_data, request)
+ # results.append(result)
+ #
+ # # API 호출 제한을 고려한 딜레이
+ # import time
+ # time.sleep(3) # 3초 대기
+ #
+ # return results
\ No newline at end of file
diff --git a/apps/pre-processing-service/app/service/search_service.py b/apps/pre-processing-service/app/service/search_service.py
index 6fb09c0f..a71d6a8d 100644
--- a/apps/pre-processing-service/app/service/search_service.py
+++ b/apps/pre-processing-service/app/service/search_service.py
@@ -1,4 +1,4 @@
-from app.utils.crawler_utils import SearchCrawler
+from app.service.crawlers.search_crawler import SearchCrawler
from app.errors.CustomException import InvalidItemDataException
from ..model.schemas import RequestSadaguSearch
from loguru import logger
@@ -17,7 +17,8 @@ async def search_products(self, request: RequestSadaguSearch) -> dict:
try:
logger.info(
- f"상품 검색 서비스 시작: job_id={request.job_id}, schedule_id={request.schedule_id}, keyword='{keyword}'"
+ # f"상품 검색 서비스 시작: job_id={request.job_id}, schedule_id={request.schedule_id}, keyword='{keyword}'"
+ f"keyword='{keyword}'"
)
# Selenium 또는 httpx로 상품 검색
@@ -29,9 +30,6 @@ async def search_products(self, request: RequestSadaguSearch) -> dict:
if not search_results:
logger.warning(f"검색 결과가 없습니다: keyword='{keyword}'")
return {
- "job_id": request.job_id,
- "schedule_id": request.schedule_id,
- "schedule_his_id": request.schedule_his_id,
"keyword": keyword,
"search_results": [],
"status": "success",
@@ -90,18 +88,13 @@ async def search_products(self, request: RequestSadaguSearch) -> dict:
)
return {
- "job_id": request.job_id,
- "schedule_id": request.schedule_id,
- "schedule_his_id": request.schedule_his_id,
"keyword": keyword,
"search_results": enriched_results,
"status": "success",
}
except Exception as e:
- logger.error(
- f"검색 서비스 오류: job_id={request.job_id}, keyword='{keyword}', error='{e}'"
- )
+ logger.error(f"검색 서비스 오류: keyword='{keyword}', error='{e}'")
raise InvalidItemDataException()
finally:
diff --git a/apps/pre-processing-service/app/service/similarity_service.py b/apps/pre-processing-service/app/service/similarity_service.py
index 0e245da1..c77aa8ba 100644
--- a/apps/pre-processing-service/app/service/similarity_service.py
+++ b/apps/pre-processing-service/app/service/similarity_service.py
@@ -1,177 +1,160 @@
-# from app.utils.similarity_analyzer import SimilarityAnalyzer
-# from app.errors.CustomException import InvalidItemDataException
-# from ..model.schemas import RequestSadaguSimilarity
-# from loguru import logger
-#
-#
-# class SimilarityService:
-# def __init__(self):
-# pass
-#
-# def select_product_by_similarity(self, request: RequestSadaguSimilarity) -> dict:
-# """
-# BERT 기반 유사도 분석 후 상품 선택 - 4단계
-# """
-# keyword = request.keyword
-# candidates = request.matched_products
-# fallback_products = request.search_results or []
-#
-# logger.info(
-# f"유사도 분석 서비스 시작: job_id={request.job_id}, keyword='{keyword}', matched_count={len(candidates) if candidates else 0}, fallback_count={len(fallback_products)}"
-# )
-#
-# # 매칭된 상품이 없으면 전체 검색 결과로 폴백
-# if not candidates:
-# if not fallback_products:
-# logger.warning(
-# f"매칭된 상품과 검색 결과가 모두 없음: keyword='{keyword}'"
-# )
-# return {
-# "job_id": request.job_id,
-# "schedule_id": request.schedule_id,
-# "schedule_his_id": request.schedule_his_id,
-# "keyword": keyword,
-# "selected_product": None,
-# "reason": "매칭된 상품과 검색 결과가 모두 없음",
-# "status": "success",
-# }
-#
-# logger.info("매칭된 상품 없음 → 전체 검색 결과에서 유사도 분석")
-# candidates = fallback_products
-# analysis_mode = "fallback_similarity_only"
-# else:
-# analysis_mode = "matched_products"
-#
-# try:
-# analyzer = SimilarityAnalyzer()
-#
-# logger.info(
-# f"키워드 '{keyword}'와 {len(candidates)}개 상품의 유사도 분석 시작... (모드: {analysis_mode})"
-# )
-#
-# # 한 개만 있으면 바로 선택
-# if len(candidates) == 1:
-# selected_product = candidates[0]
-#
-# logger.info("단일 후보 상품 - 유사도 검증 진행")
-# # 유사도 계산
-# similarity = analyzer.calculate_similarity(
-# keyword, selected_product["title"]
-# )
-#
-# # 폴백 모드에서는 임계값 검증
-# if analysis_mode == "fallback_similarity_only":
-# similarity_threshold = 0.3
-# if similarity < similarity_threshold:
-# logger.warning(
-# f"단일 상품 유사도 미달: similarity={similarity:.4f} < threshold={similarity_threshold}"
-# )
-# return {
-# "job_id": request.job_id,
-# "schedule_id": request.schedule_id,
-# "schedule_his_id": request.schedule_his_id,
-# "keyword": keyword,
-# "selected_product": None,
-# "reason": f"단일 상품 유사도({similarity:.4f}) < 기준({similarity_threshold})",
-# "status": "success",
-# }
-#
-# selected_product["similarity_info"] = {
-# "similarity_score": float(similarity),
-# "analysis_type": "single_candidate",
-# "analysis_mode": analysis_mode,
-# }
-#
-# logger.success(
-# f"단일 상품 선택 완료: title='{selected_product['title'][:30]}', similarity={similarity:.4f}"
-# )
-#
-# return {
-# "job_id": request.job_id,
-# "schedule_id": request.schedule_id,
-# "schedule_his_id": request.schedule_his_id,
-# "keyword": keyword,
-# "selected_product": selected_product,
-# "reason": f"단일 상품 - 유사도: {similarity:.4f} ({analysis_mode})",
-# "status": "success",
-# }
-#
-# # 여러 개가 있으면 유사도 비교
-# logger.info("여러 상품 중 최고 유사도로 선택...")
-#
-# # 제목만 추출해서 배치 분석
-# titles = [product["title"] for product in candidates]
-# similarity_results = analyzer.analyze_similarity_batch(keyword, titles)
-#
-# # 결과 출력
-# logger.info("유사도 분석 결과:")
-# for i, result in enumerate(similarity_results[:5]): # 상위 5개만 로그
-# logger.info(
-# f" {i+1}위: {result['title'][:40]} | 유사도: {result['similarity']:.4f}"
-# )
-#
-# # 최고 유사도 선택
-# best_result = similarity_results[0]
-# selected_product = candidates[best_result["index"]].copy()
-#
-# # 폴백 모드에서는 임계값 검증
-# similarity_threshold = 0.3
-# if (
-# analysis_mode == "fallback_similarity_only"
-# and best_result["similarity"] < similarity_threshold
-# ):
-# logger.warning(
-# f"최고 유사도 미달: similarity={best_result['similarity']:.4f} < threshold={similarity_threshold}"
-# )
-# return {
-# "job_id": request.job_id,
-# "schedule_id": request.schedule_id,
-# "schedule_his_id": request.schedule_his_id,
-# "keyword": keyword,
-# "selected_product": None,
-# "reason": f"최고 유사도({best_result['similarity']:.4f}) < 기준({similarity_threshold})",
-# "status": "success",
-# }
-#
-# # 유사도 정보 추가
-# selected_product["similarity_info"] = {
-# "similarity_score": best_result["similarity"],
-# "analysis_type": "multi_candidate_bert",
-# "analysis_mode": analysis_mode,
-# "rank": 1,
-# "total_candidates": len(candidates),
-# }
-#
-# # 매칭 모드에서는 종합 점수도 계산
-# if analysis_mode == "matched_products" and "match_info" in selected_product:
-# match_score = selected_product["match_info"]["match_score"]
-# similarity_score = best_result["similarity"]
-# # 가중치: 매칭 40%, 유사도 60%
-# final_score = match_score * 0.4 + similarity_score * 0.6
-# selected_product["final_score"] = final_score
-# reason = f"종합점수({final_score:.4f}) = 매칭({match_score:.4f})*0.4 + 유사도({similarity_score:.4f})*0.6"
-# logger.info(
-# f"종합 점수 계산: match_score={match_score:.4f}, similarity_score={similarity_score:.4f}, final_score={final_score:.4f}"
-# )
-# else:
-# reason = f"유사도({best_result['similarity']:.4f}) 기준 선택 ({analysis_mode})"
-#
-# logger.success(
-# f"상품 선택 완료: title='{selected_product['title'][:30]}', {reason}"
-# )
-#
-# return {
-# "job_id": request.job_id,
-# "schedule_id": request.schedule_id,
-# "schedule_his_id": request.schedule_his_id,
-# "keyword": keyword,
-# "selected_product": selected_product,
-# "reason": reason,
-# "status": "success",
-# }
-#
-# except Exception as e:
-# logger.error(
-# f"유사도 분석 서비스 오류: job_id={request.job_id}, keyword='{keyword}', error='{e}'"
-# )
-# raise InvalidItemDataException()
+from app.utils.similarity_analyzer import SimilarityAnalyzerONNX
+from app.errors.CustomException import InvalidItemDataException
+from ..model.schemas import RequestSadaguSimilarity
+from loguru import logger
+
+
+class SimilarityService:
+ def __init__(self):
+ pass
+
+ def select_product_by_similarity(self, request: RequestSadaguSimilarity) -> dict:
+ """
+ BERT 기반 유사도 분석 후 상품 선택 - 4단계
+ """
+ keyword = request.keyword
+ candidates = request.matched_products
+ fallback_products = request.search_results or []
+
+ logger.info(
+ f"유사도 분석 서비스 시작: keyword='{keyword}', matched_count={len(candidates) if candidates else 0}, fallback_count={len(fallback_products)}"
+ )
+
+ # 매칭된 상품이 없으면 전체 검색 결과로 폴백
+ if not candidates:
+ if not fallback_products:
+ logger.warning(
+ f"매칭된 상품과 검색 결과가 모두 없음: keyword='{keyword}'"
+ )
+ return {
+ "keyword": keyword,
+ "selected_product": None,
+ "reason": "매칭된 상품과 검색 결과가 모두 없음",
+ "status": "success",
+ }
+
+ logger.info("매칭된 상품 없음 → 전체 검색 결과에서 유사도 분석")
+ candidates = fallback_products
+ analysis_mode = "fallback_similarity_only"
+ else:
+ analysis_mode = "matched_products"
+
+ try:
+ analyzer = SimilarityAnalyzerONNX()
+
+ logger.info(
+ f"키워드 '{keyword}'와 {len(candidates)}개 상품의 유사도 분석 시작... (모드: {analysis_mode})"
+ )
+
+ # 한 개만 있으면 바로 선택
+ if len(candidates) == 1:
+ selected_product = candidates[0]
+
+ logger.info("단일 후보 상품 - 유사도 검증 진행")
+ # 유사도 계산
+ similarity = analyzer.calculate_similarity(
+ keyword, selected_product["title"]
+ )
+
+ # 폴백 모드에서는 임계값 검증
+ if analysis_mode == "fallback_similarity_only":
+ similarity_threshold = 0.3
+ if similarity < similarity_threshold:
+ logger.warning(
+ f"단일 상품 유사도 미달: similarity={similarity:.4f} < threshold={similarity_threshold}"
+ )
+ return {
+ "keyword": keyword,
+ "selected_product": None,
+ "reason": f"단일 상품 유사도({similarity:.4f}) < 기준({similarity_threshold})",
+ "status": "success",
+ }
+
+ selected_product["similarity_info"] = {
+ "similarity_score": float(similarity),
+ "analysis_type": "single_candidate",
+ "analysis_mode": analysis_mode,
+ }
+
+ logger.success(
+ f"단일 상품 선택 완료: title='{selected_product['title'][:30]}', similarity={similarity:.4f}"
+ )
+
+ return {
+ "keyword": keyword,
+ "selected_product": selected_product,
+ "reason": f"단일 상품 - 유사도: {similarity:.4f} ({analysis_mode})",
+ "status": "success",
+ }
+
+ # 여러 개가 있으면 유사도 비교
+ logger.info("여러 상품 중 최고 유사도로 선택...")
+
+ # 제목만 추출해서 배치 분석
+ titles = [product["title"] for product in candidates]
+ similarity_results = analyzer.analyze_similarity_batch(keyword, titles)
+
+ # 결과 출력
+ logger.info("유사도 분석 결과:")
+ for i, result in enumerate(similarity_results[:5]): # 상위 5개만 로그
+ logger.info(
+ f" {i+1}위: {result['title'][:40]} | 유사도: {result['similarity']:.4f}"
+ )
+
+ # 최고 유사도 선택
+ best_result = similarity_results[0]
+ selected_product = candidates[best_result["index"]].copy()
+
+ # 폴백 모드에서는 임계값 검증
+ similarity_threshold = 0.3
+ if (
+ analysis_mode == "fallback_similarity_only"
+ and best_result["similarity"] < similarity_threshold
+ ):
+ logger.warning(
+ f"최고 유사도 미달: similarity={best_result['similarity']:.4f} < threshold={similarity_threshold}"
+ )
+ return {
+ "keyword": keyword,
+ "selected_product": None,
+ "reason": f"최고 유사도({best_result['similarity']:.4f}) < 기준({similarity_threshold})",
+ "status": "success",
+ }
+
+ # 유사도 정보 추가
+ selected_product["similarity_info"] = {
+ "similarity_score": best_result["similarity"],
+ "analysis_type": "multi_candidate_bert",
+ "analysis_mode": analysis_mode,
+ "rank": 1,
+ "total_candidates": len(candidates),
+ }
+
+ # 매칭 모드에서는 종합 점수도 계산
+ if analysis_mode == "matched_products" and "match_info" in selected_product:
+ match_score = selected_product["match_info"]["match_score"]
+ similarity_score = best_result["similarity"]
+ # 가중치: 매칭 40%, 유사도 60%
+ final_score = match_score * 0.4 + similarity_score * 0.6
+ selected_product["final_score"] = final_score
+ reason = f"종합점수({final_score:.4f}) = 매칭({match_score:.4f})*0.4 + 유사도({similarity_score:.4f})*0.6"
+ logger.info(
+ f"종합 점수 계산: match_score={match_score:.4f}, similarity_score={similarity_score:.4f}, final_score={final_score:.4f}"
+ )
+ else:
+ reason = f"유사도({best_result['similarity']:.4f}) 기준 선택 ({analysis_mode})"
+
+ logger.success(
+ f"상품 선택 완료: title='{selected_product['title'][:30]}', {reason}"
+ )
+
+ return {
+ "keyword": keyword,
+ "selected_product": selected_product,
+ "reason": reason,
+ "status": "success",
+ }
+
+ except Exception as e:
+ logger.error(f"유사도 분석 서비스 오류: keyword='{keyword}', error='{e}'")
+ raise InvalidItemDataException()
diff --git a/apps/pre-processing-service/app/test/test_keyword.py b/apps/pre-processing-service/app/test/test_keyword.py
index 2a96796e..11bd69fa 100644
--- a/apps/pre-processing-service/app/test/test_keyword.py
+++ b/apps/pre-processing-service/app/test/test_keyword.py
@@ -4,10 +4,6 @@
client = TestClient(app)
-JOB_ID = 1
-SCHEDULE_ID = 1
-SCHEDULE_HIS_ID = 1
-
def test_read_root():
response = client.get("/keywords/")
@@ -26,9 +22,6 @@ def test_read_root():
)
def test_search(tag, category, start_date, end_date):
body = {
- "job_id": JOB_ID,
- "schedule_id": SCHEDULE_ID,
- "schedule_his_id": SCHEDULE_HIS_ID, # 오타 수정
"tag": tag,
"category": category,
"start_date": start_date,
@@ -39,9 +32,6 @@ def test_search(tag, category, start_date, end_date):
assert response.status_code == 200
response_data = response.json()
- assert response_data["job_id"] == body["job_id"]
- assert response_data["schedule_id"] == body["schedule_id"]
- assert response_data["schedule_his_id"] == body["schedule_his_id"] # 오타 수정
assert response_data["status"] == "success"
assert "keyword" in response_data
assert isinstance(response_data["total_keyword"], dict)
diff --git a/apps/pre-processing-service/app/test/test_match_service.py b/apps/pre-processing-service/app/test/test_match_service.py
index 7750cd3d..3f50ffad 100644
--- a/apps/pre-processing-service/app/test/test_match_service.py
+++ b/apps/pre-processing-service/app/test/test_match_service.py
@@ -23,9 +23,6 @@ def test_match_success():
]
body = {
- "job_id": 1,
- "schedule_id": 1,
- "schedule_his_id": 1,
"keyword": "반지",
"search_results": sample_search_results,
}
@@ -35,7 +32,6 @@ def test_match_success():
assert response.status_code == 200
data = response.json()
- assert data["job_id"] == body["job_id"]
assert data["keyword"] == body["keyword"]
assert data["status"] == "success"
assert isinstance(data["matched_products"], list)
@@ -51,9 +47,6 @@ def test_match_success():
def test_match_no_results():
"""검색 결과가 없는 경우"""
body = {
- "job_id": 2,
- "schedule_id": 2,
- "schedule_his_id": 2,
"keyword": "반지",
"search_results": [],
}
@@ -80,9 +73,6 @@ def test_match_no_matches():
]
body = {
- "job_id": 3,
- "schedule_id": 3,
- "schedule_his_id": 3,
"keyword": "반지",
"search_results": sample_search_results,
}
diff --git a/apps/pre-processing-service/app/test/test_product_blog_posting_service.py b/apps/pre-processing-service/app/test/test_product_blog_posting_service.py
new file mode 100644
index 00000000..2757eb14
--- /dev/null
+++ b/apps/pre-processing-service/app/test/test_product_blog_posting_service.py
@@ -0,0 +1,80 @@
+import pytest
+from app.service.product_blog_posting_service import (
+ ProductBlogPostingService, BlogContentRequest, ProductData
+)
+
+# 샘플 데이터
+sample_product_data = {
+ "tag": "test001",
+ "product_url": "https://ssadagu.kr/shop/view.php?platform=1688&num_iid=902500949447",
+ "status": "success",
+ "product_detail": {
+ "url": "https://ssadagu.kr/shop/view.php?platform=1688&num_iid=902500949447",
+ "title": "코닝 적용 가능한 애플 13 강화 필름 iphone16/15promax 휴대 전화 필름 애플 11 안티-peep 및 먼지없는 빈",
+ "price": 430,
+ "rating": 5.0,
+ "options": [
+ {"name": "먼지 없는 창고 2차 필름 [코닝글라스 방폭丨초투명]", "stock": 0},
+ {"name": "먼지 없는 창고 2차 필름 [코닝글라스 방폭丨훔쳐보기 방지]", "stock": 0}
+ ],
+ "material_info": {
+ "상표": "다른",
+ "재료": "강화 유리",
+ "필름 종류": "전막",
+ "크기": "애플 16프로맥스( 6.9inch )",
+ "적용 모델": "iPhone13 Pro Max"
+ },
+ "product_images": []
+ },
+ "crawled_at": "2025-09-16 11:49:24"
+}
+
+
+@pytest.fixture
+def blog_service():
+ return ProductBlogPostingService()
+
+
+def test_generate_blog_content(blog_service):
+ """GPT를 통한 블로그 콘텐츠 생성 테스트"""
+ request = BlogContentRequest(
+ content_style="informative",
+ target_keywords=["아이폰", "강화필름", "보호필름", "스마트폰액세서리"],
+ include_pricing=True,
+ content_length="medium"
+ )
+
+ product_obj = ProductData.from_dict(sample_product_data)
+
+ # 순수 콘텐츠 생성만 테스트
+ blog_content = blog_service.content_generator.generate_blog_content(product_obj, request)
+
+ assert blog_content.title
+ assert "" in blog_content.content
+ assert len(blog_content.tags) > 0
+
+
+def test_post_product_to_blogger(blog_service, monkeypatch):
+ """Blogger 포스팅 테스트 (실제 API 호출을 막고 mock)"""
+
+ class MockBloggerAdapter:
+ def post_content(self, title, content, tags):
+ return {"mock": True}
+
+ monkeypatch.setattr(blog_service, "blogger_service", MockBloggerAdapter())
+
+ request = BlogContentRequest(
+ content_style="informative",
+ target_keywords=["아이폰", "강화필름", "보호필름", "스마트폰액세서리"],
+ include_pricing=True,
+ content_length="medium"
+ )
+
+ product_obj = ProductData.from_dict(sample_product_data)
+
+ result = blog_service.post_product_to_blogger(product_obj, request)
+
+ assert result["status"] == "success"
+ assert result["platform"] == "blogger"
+ assert "title" in result
+ assert "tags" in result
diff --git a/apps/pre-processing-service/app/test/test_sadagu_crawl.py b/apps/pre-processing-service/app/test/test_sadagu_crawl.py
index 6c6ad84a..b419b5c6 100644
--- a/apps/pre-processing-service/app/test/test_sadagu_crawl.py
+++ b/apps/pre-processing-service/app/test/test_sadagu_crawl.py
@@ -7,9 +7,6 @@
def test_crawl_success():
body = {
- "job_id": 1, # 문자열 -> 숫자로 수정
- "schedule_id": 1, # 문자열 -> 숫자로 수정
- "schedule_his_id": 1,
"tag": "detail",
"product_url": "https://ssadagu.kr/shop/view.php?platform=1688&num_iid=886788894790",
"use_selenium": False,
@@ -21,8 +18,6 @@ def test_crawl_success():
assert response.status_code == 200
data = response.json()
- assert data["job_id"] == body["job_id"]
- assert data["schedule_id"] == body["schedule_id"]
assert data["product_url"] == body["product_url"]
assert "product_detail" in data
@@ -39,7 +34,7 @@ def test_crawl_success():
# "include_images": False,
# }
#
-# response = client.post("/products/crawl", json=body)
+# response = client.post("/products/crawlers", json=body)
# print(f"Response: {response.json()}")
#
# assert response.status_code == 200
@@ -62,7 +57,7 @@ def test_crawl_success():
# "include_images": False,
# }
#
-# response = client.post("/products/crawl", json=body)
+# response = client.post("/products/crawlers", json=body)
# print(f"Response: {response.json()}")
#
# assert response.status_code in (400, 422, 500)
@@ -79,7 +74,7 @@ def test_crawl_success():
# "include_images": True,
# }
#
-# response = client.post("/products/crawl", json=body)
+# response = client.post("/products/crawlers", json=body)
# print(f"Response: {response.json()}")
#
# assert response.status_code == 200
diff --git a/apps/pre-processing-service/app/test/test_search_service.py b/apps/pre-processing-service/app/test/test_search_service.py
index fc64c9cd..d5d3a618 100644
--- a/apps/pre-processing-service/app/test/test_search_service.py
+++ b/apps/pre-processing-service/app/test/test_search_service.py
@@ -7,14 +7,13 @@
def test_search_success():
"""상품 검색 성공 테스트"""
- body = {"job_id": 1, "schedule_id": 1, "schedule_his_id": 1, "keyword": "반지"}
+ body = {"keyword": "반지"}
response = client.post("/products/search", json=body)
print(f"Search Response: {response.json()}")
assert response.status_code == 200
data = response.json()
- assert data["job_id"] == body["job_id"]
assert data["keyword"] == body["keyword"]
assert data["status"] == "success"
assert isinstance(data["search_results"], list)
@@ -22,7 +21,7 @@ def test_search_success():
def test_search_empty_keyword():
"""빈 키워드 검색 테스트"""
- body = {"job_id": 2, "schedule_id": 2, "schedule_his_id": 2, "keyword": ""}
+ body = {"keyword": ""}
response = client.post("/products/search", json=body)
print(f"Empty keyword response: {response.json()}")
@@ -36,9 +35,6 @@ def test_search_empty_keyword():
def test_search_nonexistent_keyword():
"""존재하지 않는 키워드 검색"""
body = {
- "job_id": 3,
- "schedule_id": 3,
- "schedule_his_id": 3,
"keyword": "zxcvbnmasdfghjklqwertyuiop123456789",
}
diff --git a/apps/pre-processing-service/app/test/test_similarity_service.py b/apps/pre-processing-service/app/test/test_similarity_service.py
index cb84d3c3..5eeba78d 100644
--- a/apps/pre-processing-service/app/test/test_similarity_service.py
+++ b/apps/pre-processing-service/app/test/test_similarity_service.py
@@ -29,9 +29,6 @@ def test_similarity_with_matched_products():
]
body = {
- "job_id": 1,
- "schedule_id": 1,
- "schedule_his_id": 1,
"keyword": "반지",
"matched_products": matched_products,
}
@@ -41,7 +38,6 @@ def test_similarity_with_matched_products():
assert response.status_code == 200
data = response.json()
- assert data["job_id"] == body["job_id"]
assert data["keyword"] == body["keyword"]
assert data["status"] == "success"
@@ -65,9 +61,6 @@ def test_similarity_fallback_to_search_results():
]
body = {
- "job_id": 2,
- "schedule_id": 2,
- "schedule_his_id": 2,
"keyword": "반지",
"matched_products": [], # 매칭된 상품 없음
"search_results": search_results, # 폴백용
@@ -100,9 +93,6 @@ def test_similarity_single_candidate():
]
body = {
- "job_id": 3,
- "schedule_id": 3,
- "schedule_his_id": 3,
"keyword": "반지",
"matched_products": single_product,
}
@@ -122,9 +112,6 @@ def test_similarity_single_candidate():
def test_similarity_no_candidates():
"""후보가 없는 경우"""
body = {
- "job_id": 4,
- "schedule_id": 4,
- "schedule_his_id": 4,
"keyword": "반지",
"matched_products": [],
"search_results": [],
diff --git a/apps/pre-processing-service/app/utils/crawling_util.py b/apps/pre-processing-service/app/utils/crawling_util.py
index 8ec47518..5e50528d 100644
--- a/apps/pre-processing-service/app/utils/crawling_util.py
+++ b/apps/pre-processing-service/app/utils/crawling_util.py
@@ -1,59 +1,70 @@
from selenium import webdriver
from selenium.webdriver.chrome.options import Options
from selenium.webdriver.support.ui import WebDriverWait
+from typing import Optional
class CrawlingUtil:
+ """
+ 공통 Selenium WebDriver 유틸리티
+ 블로그 포스팅과 상품 크롤링 모두 지원
+ """
- def __init__(self):
- self.options = self._get_chrome_options()
- self.driver = None
-
- def _get_chrome_options(self):
+ def __init__(self, headless: bool = True, for_blog_posting: bool = False):
"""
- 크롬 옵션 설정
- 1. 헤드리스 모드 비활성화 (네이버 탐지 우회)
- 2. 샌드박스 비활성화
- 3. GPU 비활성화
- 4. 완전한 사용자 에이전트 설정
- 5. 자동화 탐지 우회 설정
+ :param headless: 헤드리스 모드 사용 여부
+ :param for_blog_posting: 블로그 포스팅용 설정 사용 여부
"""
+ self.headless = headless
+ self.for_blog_posting = for_blog_posting
+ self.options = self._get_chrome_options()
+ self.driver = None
+ def _get_chrome_options(self) -> Options:
+ """크롬 옵션 설정"""
options = Options()
- options.add_argument(
- "--user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36"
- )
- # options.add_argument('--headless') 백그라운드 실행시 주석 해제
+ # 기본 설정
options.add_argument("--no-sandbox")
options.add_argument("--disable-dev-shm-usage")
options.add_argument("--disable-gpu")
options.add_argument("--disable-extensions")
- options.add_experimental_option("excludeSwitches", ["enable-automation"])
- options.add_experimental_option("useAutomationExtension", False)
- options.add_argument("--disable-blink-features=AutomationControlled")
- return options
+ # 헤드리스 모드 설정
+ if self.headless:
+ options.add_argument("--headless")
+ options.add_argument("--window-size=1920,1080")
- def get_driver(self):
- """
- 셀레니움 웹 드라이버 반환
- :return: 셀레니움 웹 드라이버
- """
+ # 블로그 포스팅용 특별 설정 (네이버 탐지 우회)
+ if self.for_blog_posting:
+ options.add_argument(
+ "--user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36"
+ )
+ options.add_experimental_option("excludeSwitches", ["enable-automation"])
+ options.add_experimental_option("useAutomationExtension", False)
+ options.add_argument("--disable-blink-features=AutomationControlled")
+ else:
+ # 일반 크롤링용 설정
+ options.add_argument(
+ "--user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+ )
+ return options
+
+ def get_driver(self) -> webdriver.Chrome:
+ """셀레니움 웹 드라이버 반환"""
if self.driver is None:
self.driver = webdriver.Chrome(options=self.options)
-
return self.driver
- def get_wait(self, timeout: int = 15):
- """
- WebDriverWait 객체 반환
- :param timeout: 대기 시간 (초)
- :return: WebDriverWait 객체
- """
-
+ def get_wait(self, timeout: int = 15) -> WebDriverWait:
+ """WebDriverWait 객체 반환"""
if self.driver is None:
self.get_driver()
-
return WebDriverWait(self.driver, timeout)
+
+ def close(self):
+ """드라이버 종료"""
+ if self.driver:
+ self.driver.quit()
+ self.driver = None
diff --git a/apps/pre-processing-service/app/utils/similarity_analyzer.py b/apps/pre-processing-service/app/utils/similarity_analyzer.py
index a5e855e7..d4e7c0c5 100644
--- a/apps/pre-processing-service/app/utils/similarity_analyzer.py
+++ b/apps/pre-processing-service/app/utils/similarity_analyzer.py
@@ -1,110 +1,93 @@
-# import torch
-# import numpy as np
-# from sklearn.metrics.pairwise import cosine_similarity
-# from transformers import AutoTokenizer, AutoModel
-# from loguru import logger
-#
-#
-# class SimilarityAnalyzer:
-# """텍스트 유사도 분석기"""
-#
-# def __init__(self):
-# try:
-# logger.info("KLUE BERT 모델 로딩 시도 중...")
-# self.tokenizer = AutoTokenizer.from_pretrained("klue/bert-base")
-# self.model = AutoModel.from_pretrained("klue/bert-base")
-# logger.success("KLUE BERT 모델 로딩 성공")
-# except Exception as e:
-# logger.warning(f"KLUE BERT 로딩 실패, 다국어 BERT로 대체: {e}")
-# try:
-# logger.info("다국어 BERT 모델 로딩 시도 중...")
-# self.tokenizer = AutoTokenizer.from_pretrained(
-# "bert-base-multilingual-cased"
-# )
-# self.model = AutoModel.from_pretrained("bert-base-multilingual-cased")
-# logger.success("다국어 BERT 모델 로딩 성공")
-# except Exception as e2:
-# logger.error(f"모든 BERT 모델 로딩 실패: {e2}")
-# raise e2
-#
-# def get_embedding(self, text: str) -> np.ndarray:
-# """텍스트 임베딩 생성"""
-# try:
-# logger.debug(f"임베딩 생성 시작: text='{text[:50]}'")
-# inputs = self.tokenizer(
-# text, return_tensors="pt", padding=True, truncation=True, max_length=128
-# )
-# with torch.no_grad():
-# outputs = self.model(**inputs)
-# embedding = outputs.last_hidden_state[:, 0, :].numpy()
-# logger.debug(f"임베딩 생성 완료: shape={embedding.shape}")
-# return embedding
-# except Exception as e:
-# logger.error(f"임베딩 생성 오류: text='{text[:30]}', error='{e}'")
-# raise
-#
-# def calculate_similarity(self, text1: str, text2: str) -> float:
-# """두 텍스트 간 유사도 계산"""
-# try:
-# logger.debug(
-# f"유사도 계산 시작: text1='{text1[:30]}', text2='{text2[:30]}'"
-# )
-# embedding1 = self.get_embedding(text1)
-# embedding2 = self.get_embedding(text2)
-# similarity = cosine_similarity(embedding1, embedding2)[0][0]
-# logger.debug(f"유사도 계산 완료: similarity={similarity:.4f}")
-# return similarity
-# except Exception as e:
-# logger.error(
-# f"유사도 계산 오류: text1='{text1[:30]}', text2='{text2[:30]}', error='{e}'"
-# )
-# raise
-#
-# def analyze_similarity_batch(
-# self, keyword: str, product_titles: list[str]
-# ) -> list[dict]:
-# """배치로 유사도 분석"""
-# logger.info(
-# f"배치 유사도 분석 시작: keyword='{keyword}', titles_count={len(product_titles)}"
-# )
-#
-# try:
-# keyword_embedding = self.get_embedding(keyword)
-# results = []
-#
-# for i, title in enumerate(product_titles):
-# try:
-# logger.debug(
-# f"유사도 계산 중 ({i + 1}/{len(product_titles)}): title='{title[:30]}'"
-# )
-# title_embedding = self.get_embedding(title)
-# similarity = cosine_similarity(keyword_embedding, title_embedding)[
-# 0
-# ][0]
-#
-# results.append(
-# {
-# "index": i,
-# "title": title,
-# "similarity": float(similarity),
-# "score": float(similarity),
-# }
-# )
-# logger.debug(
-# f"유사도 계산 완료 ({i + 1}/{len(product_titles)}): similarity={similarity:.4f}"
-# )
-# except Exception as e:
-# logger.error(f"유사도 계산 오류 (제목: {title[:30]}): {e}")
-# results.append(
-# {"index": i, "title": title, "similarity": 0.0, "score": 0.0}
-# )
-#
-# # 유사도 기준 내림차순 정렬
-# results.sort(key=lambda x: x["similarity"], reverse=True)
-# logger.info(
-# f"배치 유사도 분석 완료: 총 {len(results)}개, 최고 유사도={results[0]['similarity']:.4f}"
-# )
-# return results
-# except Exception as e:
-# logger.error(f"배치 유사도 분석 실패: keyword='{keyword}', error='{e}'")
-# raise
+import numpy as np
+from sklearn.metrics.pairwise import cosine_similarity
+from loguru import logger
+import onnxruntime as ort
+from transformers import AutoTokenizer
+
+
+class SimilarityAnalyzerONNX:
+ """ONNX 기반 텍스트 유사도 분석기"""
+
+ def __init__(self, model_path: str = "klue_bert.onnx"):
+ try:
+ logger.info("토크나이저 로딩 중: klue/bert-base")
+ self.tokenizer = AutoTokenizer.from_pretrained("klue/bert-base")
+ logger.info(f"ONNX 모델 로딩 중: {model_path}")
+ self.ort_session = ort.InferenceSession(model_path)
+ logger.success("ONNX 모델 로딩 성공")
+ except Exception as e:
+ logger.error(f"모델 로딩 실패: {e}")
+ raise e
+
+ def get_embedding(self, text: str) -> np.ndarray:
+ """텍스트 임베딩 생성 (ONNX)"""
+ try:
+ logger.debug(f"임베딩 생성 시작: text='{text[:50]}'")
+ # 토큰화
+ inputs = self.tokenizer(
+ text, return_tensors="np", padding=True, truncation=True, max_length=128
+ )
+ ort_inputs = {
+ "input_ids": inputs["input_ids"].astype(np.int64),
+ "attention_mask": inputs["attention_mask"].astype(np.int64),
+ }
+ ort_outs = self.ort_session.run(None, ort_inputs)
+ embedding = ort_outs[0][:, 0, :] # [CLS] 토큰 임베딩
+ logger.debug(f"임베딩 생성 완료: shape={embedding.shape}")
+ return embedding
+ except Exception as e:
+ logger.error(f"임베딩 생성 오류: text='{text[:30]}', error='{e}'")
+ raise
+
+ def calculate_similarity(self, text1: str, text2: str) -> float:
+ """두 텍스트 간 유사도 계산"""
+ try:
+ logger.debug(
+ f"유사도 계산 시작: text1='{text1[:30]}', text2='{text2[:30]}'"
+ )
+ emb1 = self.get_embedding(text1)
+ emb2 = self.get_embedding(text2)
+ similarity = cosine_similarity(emb1, emb2)[0][0]
+ logger.debug(f"유사도 계산 완료: similarity={similarity:.4f}")
+ return similarity
+ except Exception as e:
+ logger.error(f"유사도 계산 오류: {e}")
+ raise
+
+ def analyze_similarity_batch(
+ self, keyword: str, product_titles: list[str]
+ ) -> list[dict]:
+ """배치 유사도 분석"""
+ logger.info(
+ f"배치 유사도 분석 시작: keyword='{keyword}', titles_count={len(product_titles)}"
+ )
+ try:
+ keyword_emb = self.get_embedding(keyword)
+ results = []
+
+ for i, title in enumerate(product_titles):
+ try:
+ title_emb = self.get_embedding(title)
+ sim = cosine_similarity(keyword_emb, title_emb)[0][0]
+ results.append(
+ {
+ "index": i,
+ "title": title,
+ "similarity": float(sim),
+ "score": float(sim),
+ }
+ )
+ except Exception as e:
+ logger.error(f"유사도 계산 오류 (제목: {title[:30]}): {e}")
+ results.append(
+ {"index": i, "title": title, "similarity": 0.0, "score": 0.0}
+ )
+
+ results.sort(key=lambda x: x["similarity"], reverse=True)
+ logger.info(
+ f"배치 유사도 분석 완료: 총 {len(results)}개, 최고 유사도={results[0]['similarity']:.4f}"
+ )
+ return results
+ except Exception as e:
+ logger.error(f"배치 유사도 분석 실패: {e}")
+ raise
diff --git a/apps/pre-processing-service/poetry.lock b/apps/pre-processing-service/poetry.lock
index e65412d3..d47e6783 100644
--- a/apps/pre-processing-service/poetry.lock
+++ b/apps/pre-processing-service/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand.
[[package]]
name = "annotated-types"
@@ -438,6 +438,24 @@ files = [
{file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
]
+[[package]]
+name = "coloredlogs"
+version = "15.0.1"
+description = "Colored terminal output for Python's logging module"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+groups = ["main"]
+files = [
+ {file = "coloredlogs-15.0.1-py2.py3-none-any.whl", hash = "sha256:612ee75c546f53e92e70049c9dbfcc18c935a2b9a53b66085ce9ef6a6e5c0934"},
+ {file = "coloredlogs-15.0.1.tar.gz", hash = "sha256:7c991aa71a4577af2f82600d8f8f3a89f936baeaf9b50a9c197da014e5bf16b0"},
+]
+
+[package.dependencies]
+humanfriendly = ">=9.1"
+
+[package.extras]
+cron = ["capturer (>=2.4)"]
+
[[package]]
name = "dbutils"
version = "3.1.2"
@@ -455,6 +473,18 @@ docs = ["docutils"]
pg = ["PyGreSQL (>=5)"]
tests = ["pytest (>=7)", "ruff"]
+[[package]]
+name = "distro"
+version = "1.9.0"
+description = "Distro - an OS platform information API"
+optional = false
+python-versions = ">=3.6"
+groups = ["main"]
+files = [
+ {file = "distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2"},
+ {file = "distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed"},
+]
+
[[package]]
name = "fastapi"
version = "0.116.1"
@@ -477,6 +507,18 @@ all = ["email-validator (>=2.0.0)", "fastapi-cli[standard] (>=0.0.8)", "httpx (>
standard = ["email-validator (>=2.0.0)", "fastapi-cli[standard] (>=0.0.8)", "httpx (>=0.23.0)", "jinja2 (>=3.1.5)", "python-multipart (>=0.0.18)", "uvicorn[standard] (>=0.12.0)"]
standard-no-fastapi-cloud-cli = ["email-validator (>=2.0.0)", "fastapi-cli[standard-no-fastapi-cloud-cli] (>=0.0.8)", "httpx (>=0.23.0)", "jinja2 (>=3.1.5)", "python-multipart (>=0.0.18)", "uvicorn[standard] (>=0.12.0)"]
+[[package]]
+name = "flatbuffers"
+version = "25.2.10"
+description = "The FlatBuffers serialization format for Python"
+optional = false
+python-versions = "*"
+groups = ["main"]
+files = [
+ {file = "flatbuffers-25.2.10-py2.py3-none-any.whl", hash = "sha256:ebba5f4d5ea615af3f7fd70fc310636fbb2bbd1f566ac0a23d98dd412de50051"},
+ {file = "flatbuffers-25.2.10.tar.gz", hash = "sha256:97e451377a41262f8d9bd4295cc836133415cc03d8cb966410a4af92eb00d26e"},
+]
+
[[package]]
name = "google"
version = "3.0.0"
@@ -746,14 +788,14 @@ trio = ["trio (>=0.22.0,<1.0)"]
[[package]]
name = "httplib2"
-version = "0.30.2"
+version = "0.31.0"
description = "A comprehensive HTTP client library."
optional = false
python-versions = ">=3.6"
groups = ["main"]
files = [
- {file = "httplib2-0.30.2-py3-none-any.whl", hash = "sha256:62a665905c1f1d1069c34f933787d2a4435c67c0bc2b323645dcfbb64661b5ec"},
- {file = "httplib2-0.30.2.tar.gz", hash = "sha256:050bde6a332824b05a3deef5238f2b0372f71af46f8ca2190c2cb1f66aa376cd"},
+ {file = "httplib2-0.31.0-py3-none-any.whl", hash = "sha256:b9cd78abea9b4e43a7714c6e0f8b6b8561a6fc1e95d5dbd367f5bf0ef35f5d24"},
+ {file = "httplib2-0.31.0.tar.gz", hash = "sha256:ac7ab497c50975147d4f7b1ade44becc7df2f8954d42b38b3d69c515f531135c"},
]
[package.dependencies]
@@ -784,6 +826,21 @@ http2 = ["h2 (>=3,<5)"]
socks = ["socksio (==1.*)"]
zstd = ["zstandard (>=0.18.0)"]
+[[package]]
+name = "humanfriendly"
+version = "10.0"
+description = "Human friendly output for text interfaces using Python"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+groups = ["main"]
+files = [
+ {file = "humanfriendly-10.0-py2.py3-none-any.whl", hash = "sha256:1697e1a8a8f550fd43c2865cd84542fc175a61dcb779b6fee18cf6b6ccba1477"},
+ {file = "humanfriendly-10.0.tar.gz", hash = "sha256:6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"},
+]
+
+[package.dependencies]
+pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_version >= \"3.8\""}
+
[[package]]
name = "idna"
version = "3.10"
@@ -811,6 +868,94 @@ files = [
{file = "iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7"},
]
+[[package]]
+name = "jiter"
+version = "0.11.0"
+description = "Fast iterable JSON parser."
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+ {file = "jiter-0.11.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3893ce831e1c0094a83eeaf56c635a167d6fa8cc14393cc14298fd6fdc2a2449"},
+ {file = "jiter-0.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:25c625b9b61b5a8725267fdf867ef2e51b429687f6a4eef211f4612e95607179"},
+ {file = "jiter-0.11.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd4ca85fb6a62cf72e1c7f5e34ddef1b660ce4ed0886ec94a1ef9777d35eaa1f"},
+ {file = "jiter-0.11.0-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:572208127034725e79c28437b82414028c3562335f2b4f451d98136d0fc5f9cd"},
+ {file = "jiter-0.11.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:494ba627c7f550ad3dabb21862864b8f2216098dc18ff62f37b37796f2f7c325"},
+ {file = "jiter-0.11.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8da18a99f58bca3ecc2d2bba99cac000a924e115b6c4f0a2b98f752b6fbf39a"},
+ {file = "jiter-0.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4ffd3b0fff3fabbb02cc09910c08144db6bb5697a98d227a074401e01ee63dd"},
+ {file = "jiter-0.11.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8fe6530aa738a4f7d4e4702aa8f9581425d04036a5f9e25af65ebe1f708f23be"},
+ {file = "jiter-0.11.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e35d66681c133a03d7e974e7eedae89720fe8ca3bd09f01a4909b86a8adf31f5"},
+ {file = "jiter-0.11.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c59459beca2fbc9718b6f1acb7bfb59ebc3eb4294fa4d40e9cb679dafdcc6c60"},
+ {file = "jiter-0.11.0-cp310-cp310-win32.whl", hash = "sha256:b7b0178417b0dcfc5f259edbc6db2b1f5896093ed9035ee7bab0f2be8854726d"},
+ {file = "jiter-0.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:11df2bf99fb4754abddd7f5d940a48e51f9d11624d6313ca4314145fcad347f0"},
+ {file = "jiter-0.11.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:cb5d9db02979c3f49071fce51a48f4b4e4cf574175fb2b11c7a535fa4867b222"},
+ {file = "jiter-0.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1dc6a123f3471c4730db7ca8ba75f1bb3dcb6faeb8d46dd781083e7dee88b32d"},
+ {file = "jiter-0.11.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09858f8d230f031c7b8e557429102bf050eea29c77ad9c34c8fe253c5329acb7"},
+ {file = "jiter-0.11.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dbe2196c4a0ce760925a74ab4456bf644748ab0979762139626ad138f6dac72d"},
+ {file = "jiter-0.11.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5beb56d22b63647bafd0b74979216fdee80c580c0c63410be8c11053860ffd09"},
+ {file = "jiter-0.11.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:97025d09ef549795d8dc720a824312cee3253c890ac73c621721ddfc75066789"},
+ {file = "jiter-0.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d50880a6da65d8c23a2cf53c412847d9757e74cc9a3b95c5704a1d1a24667347"},
+ {file = "jiter-0.11.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:452d80a1c86c095a242007bd9fc5d21b8a8442307193378f891cb8727e469648"},
+ {file = "jiter-0.11.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e84e58198d4894668eec2da660ffff60e0f3e60afa790ecc50cb12b0e02ca1d4"},
+ {file = "jiter-0.11.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:df64edcfc5dd5279a791eea52aa113d432c933119a025b0b5739f90d2e4e75f1"},
+ {file = "jiter-0.11.0-cp311-cp311-win32.whl", hash = "sha256:144fc21337d21b1d048f7f44bf70881e1586401d405ed3a98c95a114a9994982"},
+ {file = "jiter-0.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:b0f32e644d241293b892b1a6dd8f0b9cc029bfd94c97376b2681c36548aabab7"},
+ {file = "jiter-0.11.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:2fb7b377688cc3850bbe5c192a6bd493562a0bc50cbc8b047316428fbae00ada"},
+ {file = "jiter-0.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a1b7cbe3f25bd0d8abb468ba4302a5d45617ee61b2a7a638f63fee1dc086be99"},
+ {file = "jiter-0.11.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c0a7f0ec81d5b7588c5cade1eb1925b91436ae6726dc2df2348524aeabad5de6"},
+ {file = "jiter-0.11.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:07630bb46ea2a6b9c6ed986c6e17e35b26148cce2c535454b26ee3f0e8dcaba1"},
+ {file = "jiter-0.11.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7764f27d28cd4a9cbc61704dfcd80c903ce3aad106a37902d3270cd6673d17f4"},
+ {file = "jiter-0.11.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1d4a6c4a737d486f77f842aeb22807edecb4a9417e6700c7b981e16d34ba7c72"},
+ {file = "jiter-0.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf408d2a0abd919b60de8c2e7bc5eeab72d4dafd18784152acc7c9adc3291591"},
+ {file = "jiter-0.11.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cdef53eda7d18e799625023e1e250dbc18fbc275153039b873ec74d7e8883e09"},
+ {file = "jiter-0.11.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:53933a38ef7b551dd9c7f1064f9d7bb235bb3168d0fa5f14f0798d1b7ea0d9c5"},
+ {file = "jiter-0.11.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:11840d2324c9ab5162fc1abba23bc922124fedcff0d7b7f85fffa291e2f69206"},
+ {file = "jiter-0.11.0-cp312-cp312-win32.whl", hash = "sha256:4f01a744d24a5f2bb4a11657a1b27b61dc038ae2e674621a74020406e08f749b"},
+ {file = "jiter-0.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:29fff31190ab3a26de026da2f187814f4b9c6695361e20a9ac2123e4d4378a4c"},
+ {file = "jiter-0.11.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:4441a91b80a80249f9a6452c14b2c24708f139f64de959943dfeaa6cb915e8eb"},
+ {file = "jiter-0.11.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ff85fc6d2a431251ad82dbd1ea953affb5a60376b62e7d6809c5cd058bb39471"},
+ {file = "jiter-0.11.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5e86126d64706fd28dfc46f910d496923c6f95b395138c02d0e252947f452bd"},
+ {file = "jiter-0.11.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4ad8bd82165961867a10f52010590ce0b7a8c53da5ddd8bbb62fef68c181b921"},
+ {file = "jiter-0.11.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b42c2cd74273455ce439fd9528db0c6e84b5623cb74572305bdd9f2f2961d3df"},
+ {file = "jiter-0.11.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f0062dab98172dd0599fcdbf90214d0dcde070b1ff38a00cc1b90e111f071982"},
+ {file = "jiter-0.11.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb948402821bc76d1f6ef0f9e19b816f9b09f8577844ba7140f0b6afe994bc64"},
+ {file = "jiter-0.11.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:25a5b1110cca7329fd0daf5060faa1234be5c11e988948e4f1a1923b6a457fe1"},
+ {file = "jiter-0.11.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:bf11807e802a214daf6c485037778843fadd3e2ec29377ae17e0706ec1a25758"},
+ {file = "jiter-0.11.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:dbb57da40631c267861dd0090461222060960012d70fd6e4c799b0f62d0ba166"},
+ {file = "jiter-0.11.0-cp313-cp313-win32.whl", hash = "sha256:8e36924dad32c48d3c5e188d169e71dc6e84d6cb8dedefea089de5739d1d2f80"},
+ {file = "jiter-0.11.0-cp313-cp313-win_amd64.whl", hash = "sha256:452d13e4fd59698408087235259cebe67d9d49173b4dacb3e8d35ce4acf385d6"},
+ {file = "jiter-0.11.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:089f9df9f69532d1339e83142438668f52c97cd22ee2d1195551c2b1a9e6cf33"},
+ {file = "jiter-0.11.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:29ed1fe69a8c69bf0f2a962d8d706c7b89b50f1332cd6b9fbda014f60bd03a03"},
+ {file = "jiter-0.11.0-cp313-cp313t-win_amd64.whl", hash = "sha256:a4d71d7ea6ea8786291423fe209acf6f8d398a0759d03e7f24094acb8ab686ba"},
+ {file = "jiter-0.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:9a6dff27eca70930bdbe4cbb7c1a4ba8526e13b63dc808c0670083d2d51a4a72"},
+ {file = "jiter-0.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b1ae2a7593a62132c7d4c2abbee80bbbb94fdc6d157e2c6cc966250c564ef774"},
+ {file = "jiter-0.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7b13a431dba4b059e9e43019d3022346d009baf5066c24dcdea321a303cde9f0"},
+ {file = "jiter-0.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:af62e84ca3889604ebb645df3b0a3f3bcf6b92babbff642bd214616f57abb93a"},
+ {file = "jiter-0.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c6f3b32bb723246e6b351aecace52aba78adb8eeb4b2391630322dc30ff6c773"},
+ {file = "jiter-0.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:adcab442f4a099a358a7f562eaa54ed6456fb866e922c6545a717be51dbed7d7"},
+ {file = "jiter-0.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9967c2ab338ee2b2c0102fd379ec2693c496abf71ffd47e4d791d1f593b68e2"},
+ {file = "jiter-0.11.0-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e7d0bed3b187af8b47a981d9742ddfc1d9b252a7235471ad6078e7e4e5fe75c2"},
+ {file = "jiter-0.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:f6fe0283e903ebc55f1a6cc569b8c1f3bf4abd026fed85e3ff8598a9e6f982f0"},
+ {file = "jiter-0.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:4ee5821e3d66606b29ae5b497230b304f1376f38137d69e35f8d2bd5f310ff73"},
+ {file = "jiter-0.11.0-cp314-cp314-win32.whl", hash = "sha256:c2d13ba7567ca8799f17c76ed56b1d49be30df996eb7fa33e46b62800562a5e2"},
+ {file = "jiter-0.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:fb4790497369d134a07fc763cc88888c46f734abdd66f9fdf7865038bf3a8f40"},
+ {file = "jiter-0.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e2bbf24f16ba5ad4441a9845e40e4ea0cb9eed00e76ba94050664ef53ef4406"},
+ {file = "jiter-0.11.0-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:719891c2fb7628a41adff4f2f54c19380a27e6fdfdb743c24680ef1a54c67bd0"},
+ {file = "jiter-0.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:df7f1927cbdf34cb91262a5418ca06920fd42f1cf733936d863aeb29b45a14ef"},
+ {file = "jiter-0.11.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e71ae6d969d0c9bab336c5e9e2fabad31e74d823f19e3604eaf96d9a97f463df"},
+ {file = "jiter-0.11.0-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5661469a7b2be25ade3a4bb6c21ffd1e142e13351a0759f264dfdd3ad99af1ab"},
+ {file = "jiter-0.11.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:76c15ef0d3d02f8b389066fa4c410a0b89e9cc6468a1f0674c5925d2f3c3e890"},
+ {file = "jiter-0.11.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:63782a1350917a27817030716566ed3d5b3c731500fd42d483cbd7094e2c5b25"},
+ {file = "jiter-0.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a7092b699646a1ddc03a7b112622d9c066172627c7382659befb0d2996f1659"},
+ {file = "jiter-0.11.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f637b8e818f6d75540f350a6011ce21252573c0998ea1b4365ee54b7672c23c5"},
+ {file = "jiter-0.11.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a624d87719e1b5d09c15286eaee7e1532a40c692a096ea7ca791121365f548c1"},
+ {file = "jiter-0.11.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a9d0146d8d9b3995821bb586fc8256636258947c2f39da5bab709f3a28fb1a0b"},
+ {file = "jiter-0.11.0-cp39-cp39-win32.whl", hash = "sha256:d067655a7cf0831eb8ec3e39cbd752995e9b69a2206df3535b3a067fac23b032"},
+ {file = "jiter-0.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:f05d03775a11aaf132c447436983169958439f1219069abf24662a672851f94e"},
+ {file = "jiter-0.11.0-graalpy311-graalpy242_311_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:902b43386c04739229076bd1c4c69de5d115553d982ab442a8ae82947c72ede7"},
+ {file = "jiter-0.11.0.tar.gz", hash = "sha256:1d9637eaf8c1d6a63d6562f2a6e5ab3af946c66037eb1b894e8fad75422266e4"},
+]
+
[[package]]
name = "joblib"
version = "1.5.2"
@@ -895,6 +1040,24 @@ files = [
unidic = ["unidic"]
unidic-lite = ["unidic-lite"]
+[[package]]
+name = "mpmath"
+version = "1.3.0"
+description = "Python library for arbitrary-precision floating-point arithmetic"
+optional = false
+python-versions = "*"
+groups = ["main"]
+files = [
+ {file = "mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c"},
+ {file = "mpmath-1.3.0.tar.gz", hash = "sha256:7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f"},
+]
+
+[package.extras]
+develop = ["codecov", "pycodestyle", "pytest (>=4.6)", "pytest-cov", "wheel"]
+docs = ["sphinx"]
+gmpy = ["gmpy2 (>=2.1.0a4) ; platform_python_implementation != \"PyPy\""]
+tests = ["pytest (>=4.6)"]
+
[[package]]
name = "mypy-extensions"
version = "1.1.0"
@@ -1008,6 +1171,70 @@ rsa = ["cryptography (>=3.0.0)"]
signals = ["blinker (>=1.4.0)"]
signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"]
+[[package]]
+name = "onnxruntime"
+version = "1.22.1"
+description = "ONNX Runtime is a runtime accelerator for Machine Learning models"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+ {file = "onnxruntime-1.22.1-cp310-cp310-macosx_13_0_universal2.whl", hash = "sha256:80e7f51da1f5201c1379b8d6ef6170505cd800e40da216290f5e06be01aadf95"},
+ {file = "onnxruntime-1.22.1-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b89ddfdbbdaf7e3a59515dee657f6515601d55cb21a0f0f48c81aefc54ff1b73"},
+ {file = "onnxruntime-1.22.1-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bddc75868bcf6f9ed76858a632f65f7b1846bdcefc6d637b1e359c2c68609964"},
+ {file = "onnxruntime-1.22.1-cp310-cp310-win_amd64.whl", hash = "sha256:01e2f21b2793eb0c8642d2be3cee34cc7d96b85f45f6615e4e220424158877ce"},
+ {file = "onnxruntime-1.22.1-cp311-cp311-macosx_13_0_universal2.whl", hash = "sha256:f4581bccb786da68725d8eac7c63a8f31a89116b8761ff8b4989dc58b61d49a0"},
+ {file = "onnxruntime-1.22.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7ae7526cf10f93454beb0f751e78e5cb7619e3b92f9fc3bd51aa6f3b7a8977e5"},
+ {file = "onnxruntime-1.22.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f6effa1299ac549a05c784d50292e3378dbbf010346ded67400193b09ddc2f04"},
+ {file = "onnxruntime-1.22.1-cp311-cp311-win_amd64.whl", hash = "sha256:f28a42bb322b4ca6d255531bb334a2b3e21f172e37c1741bd5e66bc4b7b61f03"},
+ {file = "onnxruntime-1.22.1-cp312-cp312-macosx_13_0_universal2.whl", hash = "sha256:a938d11c0dc811badf78e435daa3899d9af38abee950d87f3ab7430eb5b3cf5a"},
+ {file = "onnxruntime-1.22.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:984cea2a02fcc5dfea44ade9aca9fe0f7a8a2cd6f77c258fc4388238618f3928"},
+ {file = "onnxruntime-1.22.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2d39a530aff1ec8d02e365f35e503193991417788641b184f5b1e8c9a6d5ce8d"},
+ {file = "onnxruntime-1.22.1-cp312-cp312-win_amd64.whl", hash = "sha256:6a64291d57ea966a245f749eb970f4fa05a64d26672e05a83fdb5db6b7d62f87"},
+ {file = "onnxruntime-1.22.1-cp313-cp313-macosx_13_0_universal2.whl", hash = "sha256:d29c7d87b6cbed8fecfd09dca471832384d12a69e1ab873e5effbb94adc3e966"},
+ {file = "onnxruntime-1.22.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:460487d83b7056ba98f1f7bac80287224c31d8149b15712b0d6f5078fcc33d0f"},
+ {file = "onnxruntime-1.22.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b0c37070268ba4e02a1a9d28560cd00cd1e94f0d4f275cbef283854f861a65fa"},
+ {file = "onnxruntime-1.22.1-cp313-cp313-win_amd64.whl", hash = "sha256:70980d729145a36a05f74b573435531f55ef9503bcda81fc6c3d6b9306199982"},
+ {file = "onnxruntime-1.22.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:33a7980bbc4b7f446bac26c3785652fe8730ed02617d765399e89ac7d44e0f7d"},
+ {file = "onnxruntime-1.22.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6e7e823624b015ea879d976cbef8bfaed2f7e2cc233d7506860a76dd37f8f381"},
+]
+
+[package.dependencies]
+coloredlogs = "*"
+flatbuffers = "*"
+numpy = ">=1.21.6"
+packaging = "*"
+protobuf = "*"
+sympy = "*"
+
+[[package]]
+name = "openai"
+version = "1.107.3"
+description = "The official Python library for the openai API"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+ {file = "openai-1.107.3-py3-none-any.whl", hash = "sha256:4ca54a847235ac04c6320da70fdc06b62d71439de9ec0aa40d5690c3064d4025"},
+ {file = "openai-1.107.3.tar.gz", hash = "sha256:69bb8032b05c5f00f7660e422f70f9aabc94793b9a30c5f899360ed21e46314f"},
+]
+
+[package.dependencies]
+anyio = ">=3.5.0,<5"
+distro = ">=1.7.0,<2"
+httpx = ">=0.23.0,<1"
+jiter = ">=0.4.0,<1"
+pydantic = ">=1.9.0,<3"
+sniffio = "*"
+tqdm = ">4"
+typing-extensions = ">=4.11,<5"
+
+[package.extras]
+aiohttp = ["aiohttp", "httpx-aiohttp (>=0.1.8)"]
+datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"]
+realtime = ["websockets (>=13,<16)"]
+voice-helpers = ["numpy (>=2.0.2)", "sounddevice (>=0.5.1)"]
+
[[package]]
name = "outcome"
version = "1.3.0.post0"
@@ -1082,14 +1309,14 @@ testing = ["coverage", "pytest", "pytest-benchmark"]
[[package]]
name = "poetry-core"
-version = "2.1.3"
+version = "2.2.0"
description = "Poetry PEP 517 Build Backend"
optional = false
python-versions = "<4.0,>=3.9"
groups = ["main"]
files = [
- {file = "poetry_core-2.1.3-py3-none-any.whl", hash = "sha256:2c704f05016698a54ca1d327f46ce2426d72eaca6ff614132c8477c292266771"},
- {file = "poetry_core-2.1.3.tar.gz", hash = "sha256:0522a015477ed622c89aad56a477a57813cace0c8e7ff2a2906b7ef4a2e296a4"},
+ {file = "poetry_core-2.2.0-py3-none-any.whl", hash = "sha256:0edea81d07e88cbd407369eef753c722da8ff1338f554788dc04636e756318fc"},
+ {file = "poetry_core-2.2.0.tar.gz", hash = "sha256:b4033b71b99717a942030e074fec7e3082e5fde7a8ed10f02cd2413bdf940b1f"},
]
[[package]]
@@ -1112,21 +1339,21 @@ testing = ["google-api-core (>=1.31.5)"]
[[package]]
name = "protobuf"
-version = "6.32.0"
+version = "6.32.1"
description = ""
optional = false
python-versions = ">=3.9"
groups = ["main"]
files = [
- {file = "protobuf-6.32.0-cp310-abi3-win32.whl", hash = "sha256:84f9e3c1ff6fb0308dbacb0950d8aa90694b0d0ee68e75719cb044b7078fe741"},
- {file = "protobuf-6.32.0-cp310-abi3-win_amd64.whl", hash = "sha256:a8bdbb2f009cfc22a36d031f22a625a38b615b5e19e558a7b756b3279723e68e"},
- {file = "protobuf-6.32.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:d52691e5bee6c860fff9a1c86ad26a13afbeb4b168cd4445c922b7e2cf85aaf0"},
- {file = "protobuf-6.32.0-cp39-abi3-manylinux2014_aarch64.whl", hash = "sha256:501fe6372fd1c8ea2a30b4d9be8f87955a64d6be9c88a973996cef5ef6f0abf1"},
- {file = "protobuf-6.32.0-cp39-abi3-manylinux2014_x86_64.whl", hash = "sha256:75a2aab2bd1aeb1f5dc7c5f33bcb11d82ea8c055c9becbb41c26a8c43fd7092c"},
- {file = "protobuf-6.32.0-cp39-cp39-win32.whl", hash = "sha256:7db8ed09024f115ac877a1427557b838705359f047b2ff2f2b2364892d19dacb"},
- {file = "protobuf-6.32.0-cp39-cp39-win_amd64.whl", hash = "sha256:15eba1b86f193a407607112ceb9ea0ba9569aed24f93333fe9a497cf2fda37d3"},
- {file = "protobuf-6.32.0-py3-none-any.whl", hash = "sha256:ba377e5b67b908c8f3072a57b63e2c6a4cbd18aea4ed98d2584350dbf46f2783"},
- {file = "protobuf-6.32.0.tar.gz", hash = "sha256:a81439049127067fc49ec1d36e25c6ee1d1a2b7be930675f919258d03c04e7d2"},
+ {file = "protobuf-6.32.1-cp310-abi3-win32.whl", hash = "sha256:a8a32a84bc9f2aad712041b8b366190f71dde248926da517bde9e832e4412085"},
+ {file = "protobuf-6.32.1-cp310-abi3-win_amd64.whl", hash = "sha256:b00a7d8c25fa471f16bc8153d0e53d6c9e827f0953f3c09aaa4331c718cae5e1"},
+ {file = "protobuf-6.32.1-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:d8c7e6eb619ffdf105ee4ab76af5a68b60a9d0f66da3ea12d1640e6d8dab7281"},
+ {file = "protobuf-6.32.1-cp39-abi3-manylinux2014_aarch64.whl", hash = "sha256:2f5b80a49e1eb7b86d85fcd23fe92df154b9730a725c3b38c4e43b9d77018bf4"},
+ {file = "protobuf-6.32.1-cp39-abi3-manylinux2014_x86_64.whl", hash = "sha256:b1864818300c297265c83a4982fd3169f97122c299f56a56e2445c3698d34710"},
+ {file = "protobuf-6.32.1-cp39-cp39-win32.whl", hash = "sha256:68ff170bac18c8178f130d1ccb94700cf72852298e016a2443bdb9502279e5f1"},
+ {file = "protobuf-6.32.1-cp39-cp39-win_amd64.whl", hash = "sha256:d0975d0b2f3e6957111aa3935d08a0eb7e006b1505d825f862a1fffc8348e122"},
+ {file = "protobuf-6.32.1-py3-none-any.whl", hash = "sha256:2601b779fc7d32a866c6b4404f9d42a3f67c5b9f3f15b4db3cccabe06b95c346"},
+ {file = "protobuf-6.32.1.tar.gz", hash = "sha256:ee2469e4a021474ab9baafea6cd070e5bf27c7d29433504ddea1a4ee5850f68d"},
]
[[package]]
@@ -1249,14 +1476,14 @@ files = [
[[package]]
name = "pydantic"
-version = "2.11.7"
+version = "2.11.9"
description = "Data validation using Python type hints"
optional = false
python-versions = ">=3.9"
groups = ["main"]
files = [
- {file = "pydantic-2.11.7-py3-none-any.whl", hash = "sha256:dde5df002701f6de26248661f6835bbe296a47bf73990135c7d07ce741b9623b"},
- {file = "pydantic-2.11.7.tar.gz", hash = "sha256:d989c3c6cb79469287b1569f7447a17848c998458d49ebe294e975b9baf0f0db"},
+ {file = "pydantic-2.11.9-py3-none-any.whl", hash = "sha256:c42dd626f5cfc1c6950ce6205ea58c93efa406da65f479dcb4029d5934857da2"},
+ {file = "pydantic-2.11.9.tar.gz", hash = "sha256:6b8ffda597a14812a7975c90b82a8a2e777d9257aba3453f973acd3c032a18e2"},
]
[package.dependencies]
@@ -1438,14 +1665,14 @@ rsa = ["cryptography"]
[[package]]
name = "pyparsing"
-version = "3.2.3"
-description = "pyparsing module - Classes and methods to define and execute parsing grammars"
+version = "3.2.4"
+description = "pyparsing - Classes and methods to define and execute parsing grammars"
optional = false
python-versions = ">=3.9"
groups = ["main"]
files = [
- {file = "pyparsing-3.2.3-py3-none-any.whl", hash = "sha256:a749938e02d6fd0b59b356ca504a24982314bb090c383e3cf201c95ef7e2bfcf"},
- {file = "pyparsing-3.2.3.tar.gz", hash = "sha256:b9c13f1ab8b3b542f72e28f634bad4de758ab3ce4546e4301970ad6fa77c38be"},
+ {file = "pyparsing-3.2.4-py3-none-any.whl", hash = "sha256:91d0fcde680d42cd031daf3a6ba20da3107e08a75de50da58360e7d94ab24d36"},
+ {file = "pyparsing-3.2.4.tar.gz", hash = "sha256:fff89494f45559d0f2ce46613b419f632bbb6afbdaed49696d322bcf98a58e99"},
]
[package.extras]
@@ -1462,6 +1689,22 @@ files = [
{file = "pyperclip-1.9.0.tar.gz", hash = "sha256:b7de0142ddc81bfc5c7507eea19da920b92252b548b96186caf94a5e2527d310"},
]
+[[package]]
+name = "pyreadline3"
+version = "3.5.4"
+description = "A python implementation of GNU readline."
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+markers = "sys_platform == \"win32\""
+files = [
+ {file = "pyreadline3-3.5.4-py3-none-any.whl", hash = "sha256:eaf8e6cc3c49bcccf145fc6067ba8643d1df34d604a1ec0eccbf7a18e6d3fae6"},
+ {file = "pyreadline3-3.5.4.tar.gz", hash = "sha256:8d57d53039a1c75adba8e50dd3d992b28143480816187ea5efbd5c78e6c885b7"},
+]
+
+[package.extras]
+dev = ["build", "flake8", "mypy", "pytest", "twine"]
+
[[package]]
name = "pysocks"
version = "1.7.1"
@@ -1626,67 +1869,73 @@ tests = ["matplotlib (>=3.5.0)", "mypy (>=1.15)", "numpydoc (>=1.2.0)", "pandas
[[package]]
name = "scipy"
-version = "1.16.1"
+version = "1.16.2"
description = "Fundamental algorithms for scientific computing in Python"
optional = false
python-versions = ">=3.11"
groups = ["main"]
files = [
- {file = "scipy-1.16.1-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:c033fa32bab91dc98ca59d0cf23bb876454e2bb02cbe592d5023138778f70030"},
- {file = "scipy-1.16.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:6e5c2f74e5df33479b5cd4e97a9104c511518fbd979aa9b8f6aec18b2e9ecae7"},
- {file = "scipy-1.16.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:0a55ffe0ba0f59666e90951971a884d1ff6f4ec3275a48f472cfb64175570f77"},
- {file = "scipy-1.16.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:f8a5d6cd147acecc2603fbd382fed6c46f474cccfcf69ea32582e033fb54dcfe"},
- {file = "scipy-1.16.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cb18899127278058bcc09e7b9966d41a5a43740b5bb8dcba401bd983f82e885b"},
- {file = "scipy-1.16.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:adccd93a2fa937a27aae826d33e3bfa5edf9aa672376a4852d23a7cd67a2e5b7"},
- {file = "scipy-1.16.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:18aca1646a29ee9a0625a1be5637fa798d4d81fdf426481f06d69af828f16958"},
- {file = "scipy-1.16.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d85495cef541729a70cdddbbf3e6b903421bc1af3e8e3a9a72a06751f33b7c39"},
- {file = "scipy-1.16.1-cp311-cp311-win_amd64.whl", hash = "sha256:226652fca853008119c03a8ce71ffe1b3f6d2844cc1686e8f9806edafae68596"},
- {file = "scipy-1.16.1-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:81b433bbeaf35728dad619afc002db9b189e45eebe2cd676effe1fb93fef2b9c"},
- {file = "scipy-1.16.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:886cc81fdb4c6903a3bb0464047c25a6d1016fef77bb97949817d0c0d79f9e04"},
- {file = "scipy-1.16.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:15240c3aac087a522b4eaedb09f0ad061753c5eebf1ea430859e5bf8640d5919"},
- {file = "scipy-1.16.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:65f81a25805f3659b48126b5053d9e823d3215e4a63730b5e1671852a1705921"},
- {file = "scipy-1.16.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6c62eea7f607f122069b9bad3f99489ddca1a5173bef8a0c75555d7488b6f725"},
- {file = "scipy-1.16.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f965bbf3235b01c776115ab18f092a95aa74c271a52577bcb0563e85738fd618"},
- {file = "scipy-1.16.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f006e323874ffd0b0b816d8c6a8e7f9a73d55ab3b8c3f72b752b226d0e3ac83d"},
- {file = "scipy-1.16.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e8fd15fc5085ab4cca74cb91fe0a4263b1f32e4420761ddae531ad60934c2119"},
- {file = "scipy-1.16.1-cp312-cp312-win_amd64.whl", hash = "sha256:f7b8013c6c066609577d910d1a2a077021727af07b6fab0ee22c2f901f22352a"},
- {file = "scipy-1.16.1-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:5451606823a5e73dfa621a89948096c6528e2896e40b39248295d3a0138d594f"},
- {file = "scipy-1.16.1-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:89728678c5ca5abd610aee148c199ac1afb16e19844401ca97d43dc548a354eb"},
- {file = "scipy-1.16.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:e756d688cb03fd07de0fffad475649b03cb89bee696c98ce508b17c11a03f95c"},
- {file = "scipy-1.16.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:5aa2687b9935da3ed89c5dbed5234576589dd28d0bf7cd237501ccfbdf1ad608"},
- {file = "scipy-1.16.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0851f6a1e537fe9399f35986897e395a1aa61c574b178c0d456be5b1a0f5ca1f"},
- {file = "scipy-1.16.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fedc2cbd1baed37474b1924c331b97bdff611d762c196fac1a9b71e67b813b1b"},
- {file = "scipy-1.16.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2ef500e72f9623a6735769e4b93e9dcb158d40752cdbb077f305487e3e2d1f45"},
- {file = "scipy-1.16.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:978d8311674b05a8f7ff2ea6c6bce5d8b45a0cb09d4c5793e0318f448613ea65"},
- {file = "scipy-1.16.1-cp313-cp313-win_amd64.whl", hash = "sha256:81929ed0fa7a5713fcdd8b2e6f73697d3b4c4816d090dd34ff937c20fa90e8ab"},
- {file = "scipy-1.16.1-cp313-cp313t-macosx_10_14_x86_64.whl", hash = "sha256:bcc12db731858abda693cecdb3bdc9e6d4bd200213f49d224fe22df82687bdd6"},
- {file = "scipy-1.16.1-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:744d977daa4becb9fc59135e75c069f8d301a87d64f88f1e602a9ecf51e77b27"},
- {file = "scipy-1.16.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:dc54f76ac18073bcecffb98d93f03ed6b81a92ef91b5d3b135dcc81d55a724c7"},
- {file = "scipy-1.16.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:367d567ee9fc1e9e2047d31f39d9d6a7a04e0710c86e701e053f237d14a9b4f6"},
- {file = "scipy-1.16.1-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:4cf5785e44e19dcd32a0e4807555e1e9a9b8d475c6afff3d21c3c543a6aa84f4"},
- {file = "scipy-1.16.1-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3d0b80fb26d3e13a794c71d4b837e2a589d839fd574a6bbb4ee1288c213ad4a3"},
- {file = "scipy-1.16.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:8503517c44c18d1030d666cb70aaac1cc8913608816e06742498833b128488b7"},
- {file = "scipy-1.16.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:30cc4bb81c41831ecfd6dc450baf48ffd80ef5aed0f5cf3ea775740e80f16ecc"},
- {file = "scipy-1.16.1-cp313-cp313t-win_amd64.whl", hash = "sha256:c24fa02f7ed23ae514460a22c57eca8f530dbfa50b1cfdbf4f37c05b5309cc39"},
- {file = "scipy-1.16.1-cp314-cp314-macosx_10_14_x86_64.whl", hash = "sha256:796a5a9ad36fa3a782375db8f4241ab02a091308eb079746bc0f874c9b998318"},
- {file = "scipy-1.16.1-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:3ea0733a2ff73fd6fdc5fecca54ee9b459f4d74f00b99aced7d9a3adb43fb1cc"},
- {file = "scipy-1.16.1-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:85764fb15a2ad994e708258bb4ed8290d1305c62a4e1ef07c414356a24fcfbf8"},
- {file = "scipy-1.16.1-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:ca66d980469cb623b1759bdd6e9fd97d4e33a9fad5b33771ced24d0cb24df67e"},
- {file = "scipy-1.16.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e7cc1ffcc230f568549fc56670bcf3df1884c30bd652c5da8138199c8c76dae0"},
- {file = "scipy-1.16.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3ddfb1e8d0b540cb4ee9c53fc3dea3186f97711248fb94b4142a1b27178d8b4b"},
- {file = "scipy-1.16.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:4dc0e7be79e95d8ba3435d193e0d8ce372f47f774cffd882f88ea4e1e1ddc731"},
- {file = "scipy-1.16.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f23634f9e5adb51b2a77766dac217063e764337fbc816aa8ad9aaebcd4397fd3"},
- {file = "scipy-1.16.1-cp314-cp314-win_amd64.whl", hash = "sha256:57d75524cb1c5a374958a2eae3d84e1929bb971204cc9d52213fb8589183fc19"},
- {file = "scipy-1.16.1-cp314-cp314t-macosx_10_14_x86_64.whl", hash = "sha256:d8da7c3dd67bcd93f15618938f43ed0995982eb38973023d46d4646c4283ad65"},
- {file = "scipy-1.16.1-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:cc1d2f2fd48ba1e0620554fe5bc44d3e8f5d4185c8c109c7fbdf5af2792cfad2"},
- {file = "scipy-1.16.1-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:21a611ced9275cb861bacadbada0b8c0623bc00b05b09eb97f23b370fc2ae56d"},
- {file = "scipy-1.16.1-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:8dfbb25dffc4c3dd9371d8ab456ca81beeaf6f9e1c2119f179392f0dc1ab7695"},
- {file = "scipy-1.16.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f0ebb7204f063fad87fc0a0e4ff4a2ff40b2a226e4ba1b7e34bf4b79bf97cd86"},
- {file = "scipy-1.16.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f1b9e5962656f2734c2b285a8745358ecb4e4efbadd00208c80a389227ec61ff"},
- {file = "scipy-1.16.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5e1a106f8c023d57a2a903e771228bf5c5b27b5d692088f457acacd3b54511e4"},
- {file = "scipy-1.16.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:709559a1db68a9abc3b2c8672c4badf1614f3b440b3ab326d86a5c0491eafae3"},
- {file = "scipy-1.16.1-cp314-cp314t-win_amd64.whl", hash = "sha256:c0c804d60492a0aad7f5b2bb1862f4548b990049e27e828391ff2bf6f7199998"},
- {file = "scipy-1.16.1.tar.gz", hash = "sha256:44c76f9e8b6e8e488a586190ab38016e4ed2f8a038af7cd3defa903c0a2238b3"},
+ {file = "scipy-1.16.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:6ab88ea43a57da1af33292ebd04b417e8e2eaf9d5aa05700be8d6e1b6501cd92"},
+ {file = "scipy-1.16.2-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:c95e96c7305c96ede73a7389f46ccd6c659c4da5ef1b2789466baeaed3622b6e"},
+ {file = "scipy-1.16.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:87eb178db04ece7c698220d523c170125dbffebb7af0345e66c3554f6f60c173"},
+ {file = "scipy-1.16.2-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:4e409eac067dcee96a57fbcf424c13f428037827ec7ee3cb671ff525ca4fc34d"},
+ {file = "scipy-1.16.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e574be127bb760f0dad24ff6e217c80213d153058372362ccb9555a10fc5e8d2"},
+ {file = "scipy-1.16.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f5db5ba6188d698ba7abab982ad6973265b74bb40a1efe1821b58c87f73892b9"},
+ {file = "scipy-1.16.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ec6e74c4e884104ae006d34110677bfe0098203a3fec2f3faf349f4cb05165e3"},
+ {file = "scipy-1.16.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:912f46667d2d3834bc3d57361f854226475f695eb08c08a904aadb1c936b6a88"},
+ {file = "scipy-1.16.2-cp311-cp311-win_amd64.whl", hash = "sha256:91e9e8a37befa5a69e9cacbe0bcb79ae5afb4a0b130fd6db6ee6cc0d491695fa"},
+ {file = "scipy-1.16.2-cp311-cp311-win_arm64.whl", hash = "sha256:f3bf75a6dcecab62afde4d1f973f1692be013110cad5338007927db8da73249c"},
+ {file = "scipy-1.16.2-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:89d6c100fa5c48472047632e06f0876b3c4931aac1f4291afc81a3644316bb0d"},
+ {file = "scipy-1.16.2-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:ca748936cd579d3f01928b30a17dc474550b01272d8046e3e1ee593f23620371"},
+ {file = "scipy-1.16.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:fac4f8ce2ddb40e2e3d0f7ec36d2a1e7f92559a2471e59aec37bd8d9de01fec0"},
+ {file = "scipy-1.16.2-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:033570f1dcefd79547a88e18bccacff025c8c647a330381064f561d43b821232"},
+ {file = "scipy-1.16.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ea3421209bf00c8a5ef2227de496601087d8f638a2363ee09af059bd70976dc1"},
+ {file = "scipy-1.16.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f66bd07ba6f84cd4a380b41d1bf3c59ea488b590a2ff96744845163309ee8e2f"},
+ {file = "scipy-1.16.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:5e9feab931bd2aea4a23388c962df6468af3d808ddf2d40f94a81c5dc38f32ef"},
+ {file = "scipy-1.16.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:03dfc75e52f72cf23ec2ced468645321407faad8f0fe7b1f5b49264adbc29cb1"},
+ {file = "scipy-1.16.2-cp312-cp312-win_amd64.whl", hash = "sha256:0ce54e07bbb394b417457409a64fd015be623f36e330ac49306433ffe04bc97e"},
+ {file = "scipy-1.16.2-cp312-cp312-win_arm64.whl", hash = "sha256:2a8ffaa4ac0df81a0b94577b18ee079f13fecdb924df3328fc44a7dc5ac46851"},
+ {file = "scipy-1.16.2-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:84f7bf944b43e20b8a894f5fe593976926744f6c185bacfcbdfbb62736b5cc70"},
+ {file = "scipy-1.16.2-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:5c39026d12edc826a1ef2ad35ad1e6d7f087f934bb868fc43fa3049c8b8508f9"},
+ {file = "scipy-1.16.2-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:e52729ffd45b68777c5319560014d6fd251294200625d9d70fd8626516fc49f5"},
+ {file = "scipy-1.16.2-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:024dd4a118cccec09ca3209b7e8e614931a6ffb804b2a601839499cb88bdf925"},
+ {file = "scipy-1.16.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7a5dc7ee9c33019973a470556081b0fd3c9f4c44019191039f9769183141a4d9"},
+ {file = "scipy-1.16.2-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c2275ff105e508942f99d4e3bc56b6ef5e4b3c0af970386ca56b777608ce95b7"},
+ {file = "scipy-1.16.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:af80196eaa84f033e48444d2e0786ec47d328ba00c71e4299b602235ffef9acb"},
+ {file = "scipy-1.16.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9fb1eb735fe3d6ed1f89918224e3385fbf6f9e23757cacc35f9c78d3b712dd6e"},
+ {file = "scipy-1.16.2-cp313-cp313-win_amd64.whl", hash = "sha256:fda714cf45ba43c9d3bae8f2585c777f64e3f89a2e073b668b32ede412d8f52c"},
+ {file = "scipy-1.16.2-cp313-cp313-win_arm64.whl", hash = "sha256:2f5350da923ccfd0b00e07c3e5cfb316c1c0d6c1d864c07a72d092e9f20db104"},
+ {file = "scipy-1.16.2-cp313-cp313t-macosx_10_14_x86_64.whl", hash = "sha256:53d8d2ee29b925344c13bda64ab51785f016b1b9617849dac10897f0701b20c1"},
+ {file = "scipy-1.16.2-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:9e05e33657efb4c6a9d23bd8300101536abd99c85cca82da0bffff8d8764d08a"},
+ {file = "scipy-1.16.2-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:7fe65b36036357003b3ef9d37547abeefaa353b237e989c21027b8ed62b12d4f"},
+ {file = "scipy-1.16.2-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:6406d2ac6d40b861cccf57f49592f9779071655e9f75cd4f977fa0bdd09cb2e4"},
+ {file = "scipy-1.16.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ff4dc42bd321991fbf611c23fc35912d690f731c9914bf3af8f417e64aca0f21"},
+ {file = "scipy-1.16.2-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:654324826654d4d9133e10675325708fb954bc84dae6e9ad0a52e75c6b1a01d7"},
+ {file = "scipy-1.16.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:63870a84cd15c44e65220eaed2dac0e8f8b26bbb991456a033c1d9abfe8a94f8"},
+ {file = "scipy-1.16.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:fa01f0f6a3050fa6a9771a95d5faccc8e2f5a92b4a2e5440a0fa7264a2398472"},
+ {file = "scipy-1.16.2-cp313-cp313t-win_amd64.whl", hash = "sha256:116296e89fba96f76353a8579820c2512f6e55835d3fad7780fece04367de351"},
+ {file = "scipy-1.16.2-cp313-cp313t-win_arm64.whl", hash = "sha256:98e22834650be81d42982360382b43b17f7ba95e0e6993e2a4f5b9ad9283a94d"},
+ {file = "scipy-1.16.2-cp314-cp314-macosx_10_14_x86_64.whl", hash = "sha256:567e77755019bb7461513c87f02bb73fb65b11f049aaaa8ca17cfaa5a5c45d77"},
+ {file = "scipy-1.16.2-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:17d9bb346194e8967296621208fcdfd39b55498ef7d2f376884d5ac47cec1a70"},
+ {file = "scipy-1.16.2-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:0a17541827a9b78b777d33b623a6dcfe2ef4a25806204d08ead0768f4e529a88"},
+ {file = "scipy-1.16.2-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:d7d4c6ba016ffc0f9568d012f5f1eb77ddd99412aea121e6fa8b4c3b7cbad91f"},
+ {file = "scipy-1.16.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:9702c4c023227785c779cba2e1d6f7635dbb5b2e0936cdd3a4ecb98d78fd41eb"},
+ {file = "scipy-1.16.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d1cdf0ac28948d225decdefcc45ad7dd91716c29ab56ef32f8e0d50657dffcc7"},
+ {file = "scipy-1.16.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:70327d6aa572a17c2941cdfb20673f82e536e91850a2e4cb0c5b858b690e1548"},
+ {file = "scipy-1.16.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5221c0b2a4b58aa7c4ed0387d360fd90ee9086d383bb34d9f2789fafddc8a936"},
+ {file = "scipy-1.16.2-cp314-cp314-win_amd64.whl", hash = "sha256:f5a85d7b2b708025af08f060a496dd261055b617d776fc05a1a1cc69e09fe9ff"},
+ {file = "scipy-1.16.2-cp314-cp314-win_arm64.whl", hash = "sha256:2cc73a33305b4b24556957d5857d6253ce1e2dcd67fa0ff46d87d1670b3e1e1d"},
+ {file = "scipy-1.16.2-cp314-cp314t-macosx_10_14_x86_64.whl", hash = "sha256:9ea2a3fed83065d77367775d689401a703d0f697420719ee10c0780bcab594d8"},
+ {file = "scipy-1.16.2-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:7280d926f11ca945c3ef92ba960fa924e1465f8d07ce3a9923080363390624c4"},
+ {file = "scipy-1.16.2-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:8afae1756f6a1fe04636407ef7dbece33d826a5d462b74f3d0eb82deabefd831"},
+ {file = "scipy-1.16.2-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:5c66511f29aa8d233388e7416a3f20d5cae7a2744d5cee2ecd38c081f4e861b3"},
+ {file = "scipy-1.16.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:efe6305aeaa0e96b0ccca5ff647a43737d9a092064a3894e46c414db84bc54ac"},
+ {file = "scipy-1.16.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7f3a337d9ae06a1e8d655ee9d8ecb835ea5ddcdcbd8d23012afa055ab014f374"},
+ {file = "scipy-1.16.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bab3605795d269067d8ce78a910220262711b753de8913d3deeaedb5dded3bb6"},
+ {file = "scipy-1.16.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:b0348d8ddb55be2a844c518cd8cc8deeeb8aeba707cf834db5758fc89b476a2c"},
+ {file = "scipy-1.16.2-cp314-cp314t-win_amd64.whl", hash = "sha256:26284797e38b8a75e14ea6631d29bda11e76ceaa6ddb6fdebbfe4c4d90faf2f9"},
+ {file = "scipy-1.16.2-cp314-cp314t-win_arm64.whl", hash = "sha256:d2a4472c231328d4de38d5f1f68fdd6d28a615138f842580a8a321b5845cf779"},
+ {file = "scipy-1.16.2.tar.gz", hash = "sha256:af029b153d243a80afb6eabe40b0a07f8e35c9adc269c019f364ad747f826a6b"},
]
[package.dependencies]
@@ -1695,7 +1944,7 @@ numpy = ">=1.25.2,<2.6"
[package.extras]
dev = ["cython-lint (>=0.12.2)", "doit (>=0.36.0)", "mypy (==1.10.0)", "pycodestyle", "pydevtool", "rich-click", "ruff (>=0.0.292)", "types-psutil", "typing_extensions"]
doc = ["intersphinx_registry", "jupyterlite-pyodide-kernel", "jupyterlite-sphinx (>=0.19.1)", "jupytext", "linkify-it-py", "matplotlib (>=3.5)", "myst-nb (>=1.2.0)", "numpydoc", "pooch", "pydata-sphinx-theme (>=0.15.2)", "sphinx (>=5.0.0,<8.2.0)", "sphinx-copybutton", "sphinx-design (>=0.4.0)"]
-test = ["Cython", "array-api-strict (>=2.3.1)", "asv", "gmpy2", "hypothesis (>=6.30)", "meson", "mpmath", "ninja ; sys_platform != \"emscripten\"", "pooch", "pytest", "pytest-cov", "pytest-timeout", "pytest-xdist", "scikit-umfpack", "threadpoolctl"]
+test = ["Cython", "array-api-strict (>=2.3.1)", "asv", "gmpy2", "hypothesis (>=6.30)", "meson", "mpmath", "ninja ; sys_platform != \"emscripten\"", "pooch", "pytest (>=8.0.0)", "pytest-cov", "pytest-timeout", "pytest-xdist", "scikit-umfpack", "threadpoolctl"]
[[package]]
name = "selenium"
@@ -1868,6 +2117,24 @@ typing-extensions = {version = ">=4.10.0", markers = "python_version < \"3.13\""
[package.extras]
full = ["httpx (>=0.27.0,<0.29.0)", "itsdangerous", "jinja2", "python-multipart (>=0.0.18)", "pyyaml"]
+[[package]]
+name = "sympy"
+version = "1.14.0"
+description = "Computer algebra system (CAS) in Python"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+ {file = "sympy-1.14.0-py3-none-any.whl", hash = "sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5"},
+ {file = "sympy-1.14.0.tar.gz", hash = "sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517"},
+]
+
+[package.dependencies]
+mpmath = ">=1.1.0,<1.4"
+
+[package.extras]
+dev = ["hypothesis (>=6.70.0)", "pytest (>=7.1.0)"]
+
[[package]]
name = "threadpoolctl"
version = "3.6.0"
@@ -1880,6 +2147,28 @@ files = [
{file = "threadpoolctl-3.6.0.tar.gz", hash = "sha256:8ab8b4aa3491d812b623328249fab5302a68d2d71745c8a4c719a2fcaba9f44e"},
]
+[[package]]
+name = "tqdm"
+version = "4.67.1"
+description = "Fast, Extensible Progress Meter"
+optional = false
+python-versions = ">=3.7"
+groups = ["main"]
+files = [
+ {file = "tqdm-4.67.1-py3-none-any.whl", hash = "sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2"},
+ {file = "tqdm-4.67.1.tar.gz", hash = "sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[package.extras]
+dev = ["nbval", "pytest (>=6)", "pytest-asyncio (>=0.24)", "pytest-cov", "pytest-timeout"]
+discord = ["requests"]
+notebook = ["ipywidgets (>=6)"]
+slack = ["slack-sdk"]
+telegram = ["requests"]
+
[[package]]
name = "trio"
version = "0.30.0"
@@ -2047,4 +2336,4 @@ h11 = ">=0.9.0,<1"
[metadata]
lock-version = "2.1"
python-versions = ">=3.11,<3.14"
-content-hash = "4977aa61a86e0ad28813ae35592d3911f058b2893f46b87677d7a77b61d9d06f"
+content-hash = "a2a9a376c855a2599db8f932f42029ee9f016babdf0f004cb53690caa8f5a330"
diff --git a/apps/pre-processing-service/pyproject.toml b/apps/pre-processing-service/pyproject.toml
index 93b6c1da..42997650 100644
--- a/apps/pre-processing-service/pyproject.toml
+++ b/apps/pre-processing-service/pyproject.toml
@@ -5,15 +5,8 @@ description = ""
authors = [
{name = "skip"}
]
-readme = "README.md"
requires-python = ">=3.11,<3.14"
-
-#[[tool.poetry.source]]
-#name = "pytorch"
-#url = "https://download.pytorch.org/whl/cpu"
-#priority = "explicit"
-
[tool.poetry.dependencies]
python = ">=3.11,<3.14"
fastapi = ">=0.116.1,<0.117.0"
@@ -28,7 +21,6 @@ bs4 = ">=0.0.2,<0.0.3"
selenium = ">=4.35.0,<5.0.0"
#transformers = ">=4.56.0,<5.0.0"
numpy = ">=2.3.2,<3.0.0"
-#torch = ">=2.8.0,<3.0.0"
scikit-learn = ">=1.7.1,<2.0.0"
python-dotenv = ">=1.1.1,<2.0.0"
mecab-python3 = ">=1.0.10,<2.0.0"
@@ -41,6 +33,8 @@ google-auth-oauthlib = "^1.2.2"
google-api-python-client = "^2.181.0"
poetry-core=">=2.1.3,<3.0.0"
dbutils=">=3.1.2,<4.0.0"
+onnxruntime = "^1.22.1"
+openai = "^1.107.3"
[build-system]
requires = ["poetry-core>=2.0.0,<3.0.0"]
diff --git a/apps/user-service/build.gradle b/apps/user-service/build.gradle
index 624067f6..8aa7715a 100644
--- a/apps/user-service/build.gradle
+++ b/apps/user-service/build.gradle
@@ -54,10 +54,19 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.22.1'
implementation 'org.apache.logging.log4j:log4j-jul:2.22.1'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
+ implementation 'org.apache.logging.log4j:log4j-layout-template-json:2.22.1'
+
+ implementation 'org.apache.httpcomponents:httpclient:4.5.14'
+ implementation 'org.apache.httpcomponents:httpcore:4.4.16'
+ implementation 'pl.tkowalcz.tjahzi:log4j2-appender-nodep:0.9.17'
// 비동기 로깅
implementation 'com.lmax:disruptor:3.4.4'
+ implementation "io.micrometer:micrometer-tracing-bridge-brave"
+ implementation "io.micrometer:micrometer-tracing"
+ implementation "org.springframework.boot:spring-boot-starter-actuator"
+
// Lombok
compileOnly 'org.projectlombok:lombok:1.18.30'
annotationProcessor 'org.projectlombok:lombok:1.18.30'
diff --git a/apps/user-service/src/main/java/site/icebang/batch/common/JobContextKeys.java b/apps/user-service/src/main/java/site/icebang/batch/common/JobContextKeys.java
new file mode 100644
index 00000000..d28b7bd0
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/common/JobContextKeys.java
@@ -0,0 +1,15 @@
+package site.icebang.batch.common;
+
+/**
+ * Spring Batch의 JobExecutionContext에서 Step 간 데이터 공유를 위해 사용되는 Key들을 상수로 정의하는 인터페이스. 모든 Tasklet은 이
+ * 인터페이스를 참조하여 데이터의 일관성을 유지합니다.
+ */
+public interface JobContextKeys {
+
+ String EXTRACTED_KEYWORD = "extractedKeyword";
+ String SEARCHED_PRODUCTS = "searchedProducts";
+ String MATCHED_PRODUCTS = "matchedProducts";
+ String SELECTED_PRODUCT = "selectedProduct";
+ String CRAWLED_PRODUCT_DETAIL = "crawledProductDetail";
+ String GENERATED_CONTENT = "generatedContent";
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/job/BlogAutomationJobConfig.java b/apps/user-service/src/main/java/site/icebang/batch/job/BlogAutomationJobConfig.java
new file mode 100644
index 00000000..d0c934b9
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/job/BlogAutomationJobConfig.java
@@ -0,0 +1,115 @@
+package site.icebang.batch.job; // 패키지 경로 수정
+
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import lombok.RequiredArgsConstructor;
+
+import site.icebang.batch.tasklet.*;
+
+/** [배치 시스템 구현] 트렌드 기반 블로그 자동화 워크플로우를 구성하는 Job들을 정의합니다. */
+@Configuration
+@RequiredArgsConstructor
+public class BlogAutomationJobConfig {
+
+ // --- Tasklets ---
+ private final ExtractTrendKeywordTasklet extractTrendKeywordTask;
+ private final SearchProductsFromMallTasklet searchProductsFromMallTask;
+ private final MatchProductWithKeywordTasklet matchProductWithKeywordTask;
+ private final FindSimilarProductsTasklet findSimilarProductsTask;
+ private final CrawlSelectedProductTasklet crawlSelectedProductTask;
+ private final GenerateBlogContentTasklet generateBlogContentTask;
+ private final PublishBlogPostTasklet publishBlogPostTask;
+
+ /** Job 1: 상품 선정 및 정보 수집 키워드 추출부터 최종 상품 정보 크롤링까지의 과정을 책임집니다. */
+ @Bean
+ public Job productSelectionJob(
+ JobRepository jobRepository,
+ Step extractTrendKeywordStep,
+ Step searchProductsFromMallStep,
+ Step matchProductWithKeywordStep,
+ Step findSimilarProductsStep,
+ Step crawlSelectedProductStep) {
+ return new JobBuilder("productSelectionJob", jobRepository)
+ .start(extractTrendKeywordStep)
+ .next(searchProductsFromMallStep)
+ .next(matchProductWithKeywordStep)
+ .next(findSimilarProductsStep)
+ .next(crawlSelectedProductStep)
+ .build();
+ }
+
+ /** Job 2: 콘텐츠 생성 및 발행 수집된 상품 정보로 블로그 콘텐츠를 생성하고 발행합니다. */
+ @Bean
+ public Job contentPublishingJob(
+ JobRepository jobRepository, Step generateBlogContentStep, Step publishBlogPostStep) {
+ return new JobBuilder("contentPublishingJob", jobRepository)
+ .start(generateBlogContentStep)
+ .next(publishBlogPostStep)
+ .build();
+ }
+
+ // --- Steps for productSelectionJob ---
+ @Bean
+ public Step extractTrendKeywordStep(
+ JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+ return new StepBuilder("extractTrendKeywordStep", jobRepository)
+ .tasklet(extractTrendKeywordTask, transactionManager)
+ .build();
+ }
+
+ @Bean
+ public Step searchProductsFromMallStep(
+ JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+ return new StepBuilder("searchProductsFromMallStep", jobRepository)
+ .tasklet(searchProductsFromMallTask, transactionManager)
+ .build();
+ }
+
+ @Bean
+ public Step matchProductWithKeywordStep(
+ JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+ return new StepBuilder("matchProductWithKeywordStep", jobRepository)
+ .tasklet(matchProductWithKeywordTask, transactionManager)
+ .build();
+ }
+
+ @Bean
+ public Step findSimilarProductsStep(
+ JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+ return new StepBuilder("findSimilarProductsStep", jobRepository)
+ .tasklet(findSimilarProductsTask, transactionManager)
+ .build();
+ }
+
+ @Bean
+ public Step crawlSelectedProductStep(
+ JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+ return new StepBuilder("crawlSelectedProductStep", jobRepository)
+ .tasklet(crawlSelectedProductTask, transactionManager)
+ .build();
+ }
+
+ // --- Steps for contentPublishingJob ---
+ @Bean
+ public Step generateBlogContentStep(
+ JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+ return new StepBuilder("generateBlogContentStep", jobRepository)
+ .tasklet(generateBlogContentTask, transactionManager)
+ .build();
+ }
+
+ @Bean
+ public Step publishBlogPostStep(
+ JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+ return new StepBuilder("publishBlogPostStep", jobRepository)
+ .tasklet(publishBlogPostTask, transactionManager)
+ .build();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/job/BlogContentJobConfig.java b/apps/user-service/src/main/java/site/icebang/batch/job/BlogContentJobConfig.java
deleted file mode 100644
index 5e85fe9f..00000000
--- a/apps/user-service/src/main/java/site/icebang/batch/job/BlogContentJobConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package site.icebang.batch.job;
-
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.PlatformTransactionManager;
-
-import lombok.RequiredArgsConstructor;
-
-import site.icebang.batch.tasklet.ContentGenerationTasklet;
-import site.icebang.batch.tasklet.KeywordExtractionTasklet;
-
-@Configuration
-@RequiredArgsConstructor
-public class BlogContentJobConfig {
-
- // 변경점 1: Factory 대신 실제 Tasklet만 필드로 주입받습니다.
- private final KeywordExtractionTasklet keywordExtractionTasklet;
- private final ContentGenerationTasklet contentGenerationTasklet;
-
- @Bean
- public Job blogContentJob(
- JobRepository jobRepository, Step keywordExtractionStep, Step contentGenerationStep) {
- return new JobBuilder("blogContentJob", jobRepository) // 변경점 2: JobBuilder를 직접 생성합니다.
- .start(keywordExtractionStep)
- .next(contentGenerationStep)
- .build();
- }
-
- @Bean
- public Step keywordExtractionStep(
- JobRepository jobRepository, PlatformTransactionManager transactionManager) {
- return new StepBuilder("keywordExtractionStep", jobRepository) // 변경점 3: StepBuilder를 직접 생성합니다.
- .tasklet(
- keywordExtractionTasklet,
- transactionManager) // 변경점 4: tasklet에 transactionManager를 함께 전달합니다.
- .build();
- }
-
- @Bean
- public Step contentGenerationStep(
- JobRepository jobRepository, PlatformTransactionManager transactionManager) {
- return new StepBuilder("contentGenerationStep", jobRepository)
- .tasklet(contentGenerationTasklet, transactionManager)
- .build();
- }
-}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/ContentGenerationTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/ContentGenerationTasklet.java
deleted file mode 100644
index a6ef4505..00000000
--- a/apps/user-service/src/main/java/site/icebang/batch/tasklet/ContentGenerationTasklet.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package site.icebang.batch.tasklet;
-
-import java.util.List;
-
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.scope.context.ChunkContext;
-import org.springframework.batch.core.step.tasklet.Tasklet;
-import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.repeat.RepeatStatus;
-import org.springframework.stereotype.Component;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class ContentGenerationTasklet implements Tasklet {
-
- // private final ContentService contentService; // 비즈니스 로직을 담은 서비스
- // private final FastApiClient fastApiClient; // FastAPI 통신을 위한 클라이언트
-
- @Override
- public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
- throws Exception {
- log.info(">>>> [Step 2] ContentGenerationTasklet executed.");
-
- // --- 핵심: JobExecutionContext에서 이전 Step의 결과물 가져오기 ---
- ExecutionContext jobExecutionContext =
- chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
-
- // KeywordExtractionTasklet이 저장한 "extractedKeywordIds" Key로 데이터 조회
- List keywordIds = (List) jobExecutionContext.get("extractedKeywordIds");
-
- if (keywordIds == null || keywordIds.isEmpty()) {
- log.warn(">>>> No keyword IDs found from previous step. Skipping content generation.");
- return RepeatStatus.FINISHED;
- }
-
- log.info(">>>> Received Keyword IDs for content generation: {}", keywordIds);
-
- // TODO: 1. 전달받은 키워드 ID 목록으로 DB에서 상세 정보 조회
- // TODO: 2. 각 키워드/상품 정보에 대해 외부 AI 서비스(FastAPI/LangChain)를 호출하여 콘텐츠 생성을 요청
- // TODO: 3. 생성된 콘텐츠를 DB에 저장
-
- log.info(">>>> [Step 2] ContentGenerationTasklet finished.");
- return RepeatStatus.FINISHED;
- }
-}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/CrawlSelectedProductTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/CrawlSelectedProductTasklet.java
new file mode 100644
index 00000000..6a182c37
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/tasklet/CrawlSelectedProductTasklet.java
@@ -0,0 +1,60 @@
+package site.icebang.batch.tasklet;
+
+import java.util.Map;
+
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.batch.common.JobContextKeys;
+import site.icebang.external.fastapi.adapter.FastApiAdapter;
+import site.icebang.external.fastapi.dto.FastApiDto.RequestSsadaguCrawl;
+import site.icebang.external.fastapi.dto.FastApiDto.ResponseSsadaguCrawl;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CrawlSelectedProductTasklet implements Tasklet {
+
+ private final FastApiAdapter fastApiAdapter;
+
+ @Override
+ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
+ throws Exception {
+ // log.info(">>>> [Step 5] 최종 상품 크롤링 Tasklet 실행 시작");
+
+ ExecutionContext jobExecutionContext = getJobExecutionContext(chunkContext);
+ Map selectedProduct =
+ (Map) jobExecutionContext.get(JobContextKeys.SELECTED_PRODUCT);
+
+ if (selectedProduct == null || !selectedProduct.containsKey("link")) {
+ throw new RuntimeException("크롤링할 상품 URL이 없습니다.");
+ }
+ String productUrl = (String) selectedProduct.get("link");
+
+ RequestSsadaguCrawl request = new RequestSsadaguCrawl(1, 1, null, "detail", productUrl);
+ ResponseSsadaguCrawl response = fastApiAdapter.requestProductCrawl(request);
+
+ if (response == null || !"200".equals(response.status())) {
+ throw new RuntimeException("FastAPI 상품 크롤링에 실패했습니다.");
+ }
+
+ Map productDetail = response.productDetail();
+ log.info(">>>> FastAPI로부터 크롤링된 상품 상세 정보 획득");
+
+ jobExecutionContext.put(JobContextKeys.CRAWLED_PRODUCT_DETAIL, productDetail);
+
+ // log.info(">>>> [Step 5] 최종 상품 크롤링 Tasklet 실행 완료");
+ return RepeatStatus.FINISHED;
+ }
+
+ private ExecutionContext getJobExecutionContext(ChunkContext chunkContext) {
+ return chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/ExtractTrendKeywordTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/ExtractTrendKeywordTasklet.java
new file mode 100644
index 00000000..a35bebf9
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/tasklet/ExtractTrendKeywordTasklet.java
@@ -0,0 +1,51 @@
+package site.icebang.batch.tasklet;
+
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.batch.common.JobContextKeys;
+import site.icebang.external.fastapi.adapter.FastApiAdapter;
+import site.icebang.external.fastapi.dto.FastApiDto.RequestNaverSearch;
+import site.icebang.external.fastapi.dto.FastApiDto.ResponseNaverSearch;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ExtractTrendKeywordTasklet implements Tasklet {
+
+ private final FastApiAdapter fastApiAdapter;
+
+ @Override
+ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
+ throws Exception {
+ // log.info(">>>> [Step 1] 키워드 추출 Tasklet 실행 시작");
+
+ RequestNaverSearch request =
+ new RequestNaverSearch(1, 1, null, "naver", "50000000", null, null);
+ ResponseNaverSearch response = fastApiAdapter.requestNaverKeywordSearch(request);
+
+ if (response == null || !"200".equals(response.status())) {
+ throw new RuntimeException("FastAPI로부터 키워드를 추출하는 데 실패했습니다.");
+ }
+ String extractedKeyword = response.keyword();
+ log.info(">>>> FastAPI로부터 추출된 키워드: {}", extractedKeyword);
+
+ ExecutionContext jobExecutionContext = getJobExecutionContext(chunkContext);
+ // 다른 클래스의 상수를 직접 참조하는 대신 공용 인터페이스의 키를 사용
+ jobExecutionContext.put(JobContextKeys.EXTRACTED_KEYWORD, extractedKeyword);
+
+ // log.info(">>>> [Step 1] 키워드 추출 Tasklet 실행 완료");
+ return RepeatStatus.FINISHED;
+ }
+
+ private ExecutionContext getJobExecutionContext(ChunkContext chunkContext) {
+ return chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/FindSimilarProductsTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/FindSimilarProductsTasklet.java
new file mode 100644
index 00000000..316641e1
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/tasklet/FindSimilarProductsTasklet.java
@@ -0,0 +1,60 @@
+package site.icebang.batch.tasklet;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.batch.common.JobContextKeys;
+import site.icebang.external.fastapi.adapter.FastApiAdapter;
+import site.icebang.external.fastapi.dto.FastApiDto.RequestSsadaguSimilarity;
+import site.icebang.external.fastapi.dto.FastApiDto.ResponseSsadaguSimilarity;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class FindSimilarProductsTasklet implements Tasklet {
+
+ private final FastApiAdapter fastApiAdapter;
+
+ @Override
+ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
+ throws Exception {
+ // log.info(">>>> [Step 4] 상품 유사도 분석 Tasklet 실행 시작");
+
+ ExecutionContext jobExecutionContext = getJobExecutionContext(chunkContext);
+ String keyword = (String) jobExecutionContext.get(JobContextKeys.EXTRACTED_KEYWORD);
+ List> matchedProducts =
+ (List>) jobExecutionContext.get(JobContextKeys.MATCHED_PRODUCTS);
+ List> searchResults =
+ (List>) jobExecutionContext.get(JobContextKeys.SEARCHED_PRODUCTS);
+
+ RequestSsadaguSimilarity request =
+ new RequestSsadaguSimilarity(1, 1, null, keyword, matchedProducts, searchResults);
+ ResponseSsadaguSimilarity response = fastApiAdapter.requestProductSimilarity(request);
+
+ if (response == null || !"200".equals(response.status())) {
+ throw new RuntimeException("FastAPI 상품 유사도 분석에 실패했습니다.");
+ }
+
+ Map selectedProduct = response.selectedProduct();
+ log.info(">>>> FastAPI로부터 최종 선택된 상품: {}", selectedProduct.get("title"));
+
+ jobExecutionContext.put(JobContextKeys.SELECTED_PRODUCT, selectedProduct);
+
+ // log.info(">>>> [Step 4] 상품 유사도 분석 Tasklet 실행 완료");
+ return RepeatStatus.FINISHED;
+ }
+
+ private ExecutionContext getJobExecutionContext(ChunkContext chunkContext) {
+ return chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/GenerateBlogContentTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/GenerateBlogContentTasklet.java
new file mode 100644
index 00000000..ecf44cbb
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/tasklet/GenerateBlogContentTasklet.java
@@ -0,0 +1,62 @@
+package site.icebang.batch.tasklet;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.batch.common.JobContextKeys;
+import site.icebang.external.fastapi.adapter.FastApiAdapter;
+import site.icebang.external.fastapi.dto.FastApiDto.RequestBlogCreate;
+import site.icebang.external.fastapi.dto.FastApiDto.ResponseBlogCreate;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class GenerateBlogContentTasklet implements Tasklet {
+
+ private final FastApiAdapter fastApiAdapter;
+
+ @Override
+ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
+ throws Exception {
+ // log.info(">>>> [Step 6] 블로그 콘텐츠 생성 Tasklet 실행 시작");
+
+ ExecutionContext jobExecutionContext = getJobExecutionContext(chunkContext);
+ Map productDetail =
+ (Map) jobExecutionContext.get(JobContextKeys.CRAWLED_PRODUCT_DETAIL);
+
+ // TODO: productDetail을 기반으로 LLM에 전달할 프롬프트 생성
+ RequestBlogCreate request = new RequestBlogCreate(1, 1, null);
+ ResponseBlogCreate response = fastApiAdapter.requestBlogCreation(request);
+
+ if (response == null || !"200".equals(response.status())) {
+ throw new RuntimeException("FastAPI 블로그 콘텐츠 생성에 실패했습니다.");
+ }
+
+ // TODO: 실제 생성된 콘텐츠를 response로부터 받아와야 함 (현재는 더미 데이터)
+ Map generatedContent =
+ Map.of(
+ "title", "엄청난 상품을 소개합니다! " + productDetail.get("title"),
+ "content", "이 상품은 정말... 좋습니다. 상세 정보: " + productDetail.toString(),
+ "tags", List.of("상품리뷰", "최고"));
+ log.info(">>>> FastAPI로부터 블로그 콘텐츠 생성 완료");
+
+ jobExecutionContext.put(JobContextKeys.GENERATED_CONTENT, generatedContent);
+
+ // log.info(">>>> [Step 6] 블로그 콘텐츠 생성 Tasklet 실행 완료");
+ return RepeatStatus.FINISHED;
+ }
+
+ private ExecutionContext getJobExecutionContext(ChunkContext chunkContext) {
+ return chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/KeywordExtractionTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/KeywordExtractionTasklet.java
deleted file mode 100644
index ebc27117..00000000
--- a/apps/user-service/src/main/java/site/icebang/batch/tasklet/KeywordExtractionTasklet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package site.icebang.batch.tasklet;
-
-import java.util.List;
-
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.scope.context.ChunkContext;
-import org.springframework.batch.core.step.tasklet.Tasklet;
-import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.repeat.RepeatStatus;
-import org.springframework.stereotype.Component;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class KeywordExtractionTasklet implements Tasklet {
-
- // private final TrendKeywordService trendKeywordService; // 비즈니스 로직을 담은 서비스
-
- @Override
- public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
- throws Exception {
- log.info(">>>> [Step 1] KeywordExtractionTasklet executed.");
-
- // TODO: 1. DB에서 카테고리 정보 조회
- // TODO: 2. 외부 API 또는 내부 로직을 통해 트렌드 키워드 추출
- // TODO: 3. 추출된 키워드를 DB에 저장
-
- // --- 핵심: 다음 Step에 전달할 데이터 생성 ---
- // 예시: 새로 생성된 키워드 ID 목록을 가져왔다고 가정
- List extractedKeywordIds = List.of(1L, 2L, 3L); // 실제로는 DB 저장 후 반환된 ID 목록
- log.info(">>>> Extracted Keyword IDs: {}", extractedKeywordIds);
-
- // --- 핵심: JobExecutionContext에 결과물 저장 ---
- // JobExecution 전체에서 공유되는 컨텍스트를 가져옵니다.
- ExecutionContext jobExecutionContext =
- chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
-
- // "extractedKeywordIds" 라는 Key로 데이터 저장
- jobExecutionContext.put("extractedKeywordIds", extractedKeywordIds);
-
- log.info(">>>> [Step 1] KeywordExtractionTasklet finished.");
- return RepeatStatus.FINISHED;
- }
-}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/MatchProductWithKeywordTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/MatchProductWithKeywordTasklet.java
new file mode 100644
index 00000000..bdb15200
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/tasklet/MatchProductWithKeywordTasklet.java
@@ -0,0 +1,57 @@
+package site.icebang.batch.tasklet;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.batch.common.JobContextKeys;
+import site.icebang.external.fastapi.adapter.FastApiAdapter;
+import site.icebang.external.fastapi.dto.FastApiDto.RequestSsadaguMatch;
+import site.icebang.external.fastapi.dto.FastApiDto.ResponseSsadaguMatch;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class MatchProductWithKeywordTasklet implements Tasklet {
+
+ private final FastApiAdapter fastApiAdapter;
+
+ @Override
+ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
+ throws Exception {
+ // log.info(">>>> [Step 3] 상품 매칭 Tasklet 실행 시작");
+
+ ExecutionContext jobExecutionContext = getJobExecutionContext(chunkContext);
+ String keyword = (String) jobExecutionContext.get(JobContextKeys.EXTRACTED_KEYWORD);
+ List> searchResults =
+ (List>) jobExecutionContext.get(JobContextKeys.SEARCHED_PRODUCTS);
+
+ RequestSsadaguMatch request = new RequestSsadaguMatch(1, 1, null, keyword, searchResults);
+ ResponseSsadaguMatch response = fastApiAdapter.requestProductMatch(request);
+
+ if (response == null || !"200".equals(response.status())) {
+ throw new RuntimeException("FastAPI 상품 매칭에 실패했습니다.");
+ }
+
+ List> matchedProducts = response.matchedProducts();
+ log.info(">>>> FastAPI로부터 매칭된 상품 {}개", matchedProducts.size());
+
+ jobExecutionContext.put(JobContextKeys.MATCHED_PRODUCTS, matchedProducts);
+
+ log.info(">>>> [Step 3] 상품 매칭 Tasklet 실행 완료");
+ return RepeatStatus.FINISHED;
+ }
+
+ private ExecutionContext getJobExecutionContext(ChunkContext chunkContext) {
+ return chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/PublishBlogPostTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/PublishBlogPostTasklet.java
new file mode 100644
index 00000000..e1b75a18
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/tasklet/PublishBlogPostTasklet.java
@@ -0,0 +1,68 @@
+package site.icebang.batch.tasklet;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.batch.common.JobContextKeys;
+import site.icebang.external.fastapi.adapter.FastApiAdapter;
+import site.icebang.external.fastapi.dto.FastApiDto.RequestBlogPublish;
+import site.icebang.external.fastapi.dto.FastApiDto.ResponseBlogPublish;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class PublishBlogPostTasklet implements Tasklet {
+
+ private final FastApiAdapter fastApiAdapter;
+
+ @Override
+ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
+ throws Exception {
+ // log.info(">>>> [Step 7] 블로그 발행 Tasklet 실행 시작");
+
+ ExecutionContext jobExecutionContext = getJobExecutionContext(chunkContext);
+ Map content =
+ (Map) jobExecutionContext.get(JobContextKeys.GENERATED_CONTENT);
+
+ // TODO: UserConfig 등에서 실제 블로그 정보(ID, PW)를 가져와야 함
+ String blogId = "my_blog_id";
+ String blogPw = "my_blog_password";
+
+ RequestBlogPublish request =
+ new RequestBlogPublish(
+ 1,
+ 1,
+ null,
+ "naver",
+ blogId,
+ blogPw,
+ (String) content.get("title"),
+ (String) content.get("content"),
+ (List) content.get("tags"));
+
+ ResponseBlogPublish response = fastApiAdapter.requestBlogPost(request);
+
+ if (response == null || !"200".equals(response.status())) {
+ throw new RuntimeException("FastAPI 블로그 발행에 실패했습니다.");
+ }
+
+ log.info(">>>> FastAPI를 통해 블로그 발행 성공: {}", response.metadata());
+
+ // log.info(">>>> [Step 7] 블로그 발행 Tasklet 실행 완료");
+ return RepeatStatus.FINISHED;
+ }
+
+ private ExecutionContext getJobExecutionContext(ChunkContext chunkContext) {
+ return chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/batch/tasklet/SearchProductsFromMallTasklet.java b/apps/user-service/src/main/java/site/icebang/batch/tasklet/SearchProductsFromMallTasklet.java
new file mode 100644
index 00000000..3480f391
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/batch/tasklet/SearchProductsFromMallTasklet.java
@@ -0,0 +1,58 @@
+package site.icebang.batch.tasklet;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.batch.common.JobContextKeys;
+import site.icebang.external.fastapi.adapter.FastApiAdapter;
+import site.icebang.external.fastapi.dto.FastApiDto.RequestSsadaguSearch;
+import site.icebang.external.fastapi.dto.FastApiDto.ResponseSsadaguSearch;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class SearchProductsFromMallTasklet implements Tasklet {
+
+ private final FastApiAdapter fastApiAdapter;
+
+ @Override
+ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
+ throws Exception {
+ // log.info(">>>> [Step 2] 상품 검색 Tasklet 실행 시작");
+
+ ExecutionContext jobExecutionContext = getJobExecutionContext(chunkContext);
+ String keyword = (String) jobExecutionContext.get(JobContextKeys.EXTRACTED_KEYWORD);
+
+ if (keyword == null) {
+ throw new RuntimeException("이전 Step에서 키워드를 전달받지 못했습니다.");
+ }
+
+ RequestSsadaguSearch request = new RequestSsadaguSearch(1, 1, null, keyword);
+ ResponseSsadaguSearch response = fastApiAdapter.requestSsadaguProductSearch(request);
+
+ if (response == null || !"200".equals(response.status())) {
+ throw new RuntimeException("FastAPI 상품 검색에 실패했습니다.");
+ }
+ List> searchResults = response.searchResults();
+ log.info(">>>> FastAPI로부터 검색된 상품 {}개", searchResults.size());
+
+ jobExecutionContext.put(JobContextKeys.SEARCHED_PRODUCTS, searchResults);
+
+ // log.info(">>>> [Step 2] 상품 검색 Tasklet 실행 완료");
+ return RepeatStatus.FINISHED;
+ }
+
+ private ExecutionContext getJobExecutionContext(ChunkContext chunkContext) {
+ return chunkContext.getStepContext().getStepExecution().getJobExecution().getExecutionContext();
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/common/dto/PageParams.java b/apps/user-service/src/main/java/site/icebang/common/dto/PageParams.java
new file mode 100644
index 00000000..5f2f0d30
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/common/dto/PageParams.java
@@ -0,0 +1,25 @@
+package site.icebang.common.dto;
+
+import lombok.Data;
+
+@Data
+public class PageParams {
+ private int current = 1;
+ private int pageSize = 10;
+ private String search;
+ private String[] sorters;
+ private String[] filters;
+
+ // 계산된 offset
+ public int getOffset() {
+ return (current - 1) * pageSize;
+ }
+
+ public boolean hasSearch() {
+ return search != null && !search.trim().isEmpty();
+ }
+
+ public boolean hasSorters() {
+ return sorters != null && sorters.length > 0;
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/common/dto/PageResult.java b/apps/user-service/src/main/java/site/icebang/common/dto/PageResult.java
new file mode 100644
index 00000000..4a2a8bfa
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/common/dto/PageResult.java
@@ -0,0 +1,77 @@
+package site.icebang.common.dto;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class PageResult {
+ private List data;
+ private int total;
+ private int current;
+ private int pageSize;
+ private int totalPages;
+ private boolean hasNext;
+ private boolean hasPrevious;
+
+ public PageResult(List data, int total, int current, int pageSize) {
+ this.data = data;
+ this.total = total;
+ this.current = current;
+ this.pageSize = pageSize;
+ calculatePagination();
+ }
+
+ // 페이징 계산 로직 분리
+ private void calculatePagination() {
+ this.totalPages = total > 0 ? (int) Math.ceil((double) total / pageSize) : 0;
+ this.hasNext = current < totalPages;
+ this.hasPrevious = current > 1;
+ }
+
+ // 기존 of 메서드
+ public static PageResult of(List data, int total, int current, int pageSize) {
+ return new PageResult<>(data, total, current, pageSize);
+ }
+
+ // PageParams를 받는 of 메서드
+ public static PageResult of(List data, int total, PageParams pageParams) {
+ return new PageResult<>(data, total, pageParams.getCurrent(), pageParams.getPageSize());
+ }
+
+ // 함수형 인터페이스를 활용한 from 메서드 (트랜잭션 내에서 실행)
+ public static PageResult from(
+ PageParams pageParams, Supplier> dataSupplier, Supplier countSupplier) {
+ List data = dataSupplier.get();
+ int total = countSupplier.get();
+ return new PageResult<>(data, total, pageParams.getCurrent(), pageParams.getPageSize());
+ }
+
+ // 빈 페이지 결과 생성
+ public static PageResult empty(PageParams pageParams) {
+ return new PageResult<>(List.of(), 0, pageParams.getCurrent(), pageParams.getPageSize());
+ }
+
+ // 빈 페이지 결과 생성 (기본값)
+ public static PageResult empty() {
+ return new PageResult<>(List.of(), 0, 1, 10);
+ }
+
+ // 데이터가 있는지 확인
+ public boolean hasData() {
+ return data != null && !data.isEmpty();
+ }
+
+ // 첫 번째 페이지인지 확인
+ public boolean isFirstPage() {
+ return current == 1;
+ }
+
+ // 마지막 페이지인지 확인
+ public boolean isLastPage() {
+ return current == totalPages;
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/common/exception/DuplicateDataException.java b/apps/user-service/src/main/java/site/icebang/common/exception/DuplicateDataException.java
new file mode 100644
index 00000000..e673ab86
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/common/exception/DuplicateDataException.java
@@ -0,0 +1,25 @@
+package site.icebang.common.exception;
+
+public class DuplicateDataException extends RuntimeException {
+
+ public DuplicateDataException() {
+ super();
+ }
+
+ public DuplicateDataException(String message) {
+ super(message);
+ }
+
+ public DuplicateDataException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public DuplicateDataException(Throwable cause) {
+ super(cause);
+ }
+
+ protected DuplicateDataException(
+ String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/common/service/PageableService.java b/apps/user-service/src/main/java/site/icebang/common/service/PageableService.java
new file mode 100644
index 00000000..25d41d29
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/common/service/PageableService.java
@@ -0,0 +1,8 @@
+package site.icebang.common.service;
+
+import site.icebang.common.dto.PageParams;
+import site.icebang.common.dto.PageResult;
+
+public interface PageableService {
+ PageResult getPagedResult(PageParams pageParams);
+}
diff --git a/apps/user-service/src/main/java/site/icebang/domain/auth/controller/AuthController.java b/apps/user-service/src/main/java/site/icebang/domain/auth/controller/AuthController.java
index d0a98142..2303cf74 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/auth/controller/AuthController.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/auth/controller/AuthController.java
@@ -61,4 +61,18 @@ public ApiResponse checkSession(@AuthenticationPrincipal AuthCredential
public ApiResponse getPermissions(@AuthenticationPrincipal AuthCredential user) {
return ApiResponse.success(user);
}
+
+ @PostMapping("/logout")
+ public ApiResponse logout(HttpServletRequest request) {
+ // SecurityContext 정리
+ SecurityContextHolder.clearContext();
+
+ // 세션 무효화
+ HttpSession session = request.getSession(false);
+ if (session != null) {
+ session.invalidate();
+ }
+
+ return ApiResponse.success(null);
+ }
}
diff --git a/apps/user-service/src/main/java/site/icebang/domain/auth/service/AuthService.java b/apps/user-service/src/main/java/site/icebang/domain/auth/service/AuthService.java
index 091861b2..25a5bd42 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/auth/service/AuthService.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/auth/service/AuthService.java
@@ -6,6 +6,7 @@
import lombok.RequiredArgsConstructor;
+import site.icebang.common.exception.DuplicateDataException;
import site.icebang.common.utils.RandomPasswordGenerator;
import site.icebang.domain.auth.dto.RegisterDto;
import site.icebang.domain.auth.mapper.AuthMapper;
@@ -23,7 +24,7 @@ public class AuthService {
public void registerUser(RegisterDto registerDto) {
if (authMapper.existsByEmail(registerDto.getEmail())) {
- throw new IllegalArgumentException("이미 가입된 이메일입니다.");
+ throw new DuplicateDataException("이미 가입된 이메일입니다.");
}
String randomPassword = passwordGenerator.generate();
String hashedPassword = passwordEncoder.encode(randomPassword);
diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/controller/WorkflowController.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/controller/WorkflowController.java
new file mode 100644
index 00000000..39077eca
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/controller/WorkflowController.java
@@ -0,0 +1,28 @@
+package site.icebang.domain.workflow.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+import site.icebang.common.dto.ApiResponse;
+import site.icebang.common.dto.PageParams;
+import site.icebang.common.dto.PageResult;
+import site.icebang.domain.workflow.dto.WorkflowCardDto;
+import site.icebang.domain.workflow.service.WorkflowService;
+
+@RestController
+@RequestMapping("/v0/workflows")
+@RequiredArgsConstructor
+public class WorkflowController {
+ private final WorkflowService workflowService;
+
+ @GetMapping("")
+ public ApiResponse> getWorkflowList(
+ @ModelAttribute PageParams pageParams) {
+ PageResult result = workflowService.getPagedResult(pageParams);
+ return ApiResponse.success(result);
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java
new file mode 100644
index 00000000..b54a29c0
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java
@@ -0,0 +1,6 @@
+package site.icebang.domain.workflow.dto;
+
+import lombok.Data;
+
+@Data
+public class WorkflowCardDto {}
diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java
new file mode 100644
index 00000000..1a358924
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java
@@ -0,0 +1,27 @@
+package site.icebang.domain.workflow.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import lombok.RequiredArgsConstructor;
+
+import site.icebang.common.dto.PageParams;
+import site.icebang.common.dto.PageResult;
+import site.icebang.common.service.PageableService;
+import site.icebang.domain.workflow.dto.WorkflowCardDto;
+
+@Service
+@RequiredArgsConstructor
+public class WorkflowService implements PageableService {
+
+ @Override
+ @Transactional(readOnly = true)
+ public PageResult getPagedResult(PageParams pageParams) {
+ throw new RuntimeException("Not implemented");
+ // return PageResult.from(
+ // pageParams,
+ // () -> workflowMapper.selectWorkflowList(pageParams),
+ // () -> workflowMapper.selectWorkflowCount(pageParams)
+ // );
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/external/fastapi/adapter/FastApiAdapter.java b/apps/user-service/src/main/java/site/icebang/external/fastapi/adapter/FastApiAdapter.java
new file mode 100644
index 00000000..e4e81a73
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/external/fastapi/adapter/FastApiAdapter.java
@@ -0,0 +1,106 @@
+package site.icebang.external.fastapi.adapter;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.external.fastapi.dto.FastApiDto.*;
+import site.icebang.global.config.properties.FastApiProperties;
+
+/** FastAPI 서버와의 통신을 전담하는 어댑터 클래스. 모든 외부 API 호출은 이 클래스를 통해 이루어집니다. */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class FastApiAdapter {
+
+ private final RestTemplate restTemplate;
+ private final FastApiProperties properties;
+
+ /** TASK 1: 네이버 키워드 추출을 FastAPI에 요청합니다. */
+ public ResponseNaverSearch requestNaverKeywordSearch(RequestNaverSearch request) {
+ String url = properties.getUrl() + "/keyword/search";
+ log.info("Requesting to FastAPI [POST {}]", url);
+ try {
+ return restTemplate.postForObject(url, request, ResponseNaverSearch.class);
+ } catch (RestClientException e) {
+ log.error("Failed to call FastAPI keyword search API. Error: {}", e.getMessage());
+ // TODO: 비즈니스 요구사항에 맞는 예외 처리 (재시도, 기본값 반환, 특정 예외 던지기 등)
+ return null;
+ }
+ }
+
+ /** TASK 2: 싸다구몰 상품 검색을 FastAPI에 요청합니다. */
+ public ResponseSsadaguSearch requestSsadaguProductSearch(RequestSsadaguSearch request) {
+ String url = properties.getUrl() + "/product/search";
+ log.info("Requesting to FastAPI [POST {}]", url);
+ try {
+ return restTemplate.postForObject(url, request, ResponseSsadaguSearch.class);
+ } catch (RestClientException e) {
+ log.error("Failed to call FastAPI product search API. Error: {}", e.getMessage());
+ return null;
+ }
+ }
+
+ /** TASK 3: 상품 매칭을 FastAPI에 요청합니다. */
+ public ResponseSsadaguMatch requestProductMatch(RequestSsadaguMatch request) {
+ String url = properties.getUrl() + "/product/match";
+ log.info("Requesting to FastAPI [POST {}]", url);
+ try {
+ return restTemplate.postForObject(url, request, ResponseSsadaguMatch.class);
+ } catch (RestClientException e) {
+ log.error("Failed to call FastAPI product match API. Error: {}", e.getMessage());
+ return null;
+ }
+ }
+
+ /** TASK 4: 상품 유사도 분석을 FastAPI에 요청합니다. (메서드명 수정) */
+ public ResponseSsadaguSimilarity requestProductSimilarity(RequestSsadaguSimilarity request) {
+ String url = properties.getUrl() + "/product/similarity";
+ log.info("Requesting to FastAPI [POST {}]", url);
+ try {
+ return restTemplate.postForObject(url, request, ResponseSsadaguSimilarity.class);
+ } catch (RestClientException e) {
+ log.error("Failed to call FastAPI product similarity API. Error: {}", e.getMessage());
+ return null;
+ }
+ }
+
+ /** TASK 5: 상품 상세 정보 크롤링을 FastAPI에 요청합니다. */
+ public ResponseSsadaguCrawl requestProductCrawl(RequestSsadaguCrawl request) {
+ String url = properties.getUrl() + "/product/crawl";
+ log.info("Requesting to FastAPI [POST {}]", url);
+ try {
+ return restTemplate.postForObject(url, request, ResponseSsadaguCrawl.class);
+ } catch (RestClientException e) {
+ log.error("Failed to call FastAPI product crawl API. Error: {}", e.getMessage());
+ return null;
+ }
+ }
+
+ /** TASK 6: 블로그 콘텐츠 생성을 FastAPI에 요청합니다. */
+ public ResponseBlogCreate requestBlogCreation(RequestBlogCreate request) {
+ String url = properties.getUrl() + "/blog/rag/create";
+ log.info("Requesting to FastAPI [POST {}]", url);
+ try {
+ return restTemplate.postForObject(url, request, ResponseBlogCreate.class);
+ } catch (RestClientException e) {
+ log.error("Failed to call FastAPI blog creation API. Error: {}", e.getMessage());
+ return null;
+ }
+ }
+
+ /** TASK 7: 블로그 발행을 FastAPI에 요청합니다. */
+ public ResponseBlogPublish requestBlogPost(RequestBlogPublish request) {
+ String url = properties.getUrl() + "/blog/publish";
+ log.info("Requesting to FastAPI [POST {}]", url);
+ try {
+ return restTemplate.postForObject(url, request, ResponseBlogPublish.class);
+ } catch (RestClientException e) {
+ log.error("Failed to call FastAPI blog publish API. Error: {}", e.getMessage());
+ return null;
+ }
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/external/fastapi/dto/FastApiDto.java b/apps/user-service/src/main/java/site/icebang/external/fastapi/dto/FastApiDto.java
new file mode 100644
index 00000000..88ffe284
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/external/fastapi/dto/FastApiDto.java
@@ -0,0 +1,103 @@
+package site.icebang.external.fastapi.dto;
+
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** FastAPI 서버와 통신하기 위한 DTO 클래스 모음. Java의 record를 사용하여 불변 데이터 객체를 간결하게 정의합니다. */
+public final class FastApiDto {
+
+ // --- 1. 네이버 키워드 추출 ---
+ public record RequestNaverSearch(
+ @JsonProperty("job_id") int jobId,
+ @JsonProperty("schedule_id") int scheduleId,
+ @JsonProperty("schedule_his_id") Integer scheduleHisId,
+ String tag,
+ String category,
+ @JsonProperty("start_date") String startDate,
+ @JsonProperty("end_date") String endDate) {}
+
+ public record ResponseNaverSearch(
+ String status,
+ String category,
+ String keyword,
+ @JsonProperty("total_keyword") Map totalKeyword) {}
+
+ // --- 2. 상품 검색 ---
+ public record RequestSsadaguSearch(
+ @JsonProperty("job_id") int jobId,
+ @JsonProperty("schedule_id") int scheduleId,
+ @JsonProperty("schedule_his_id") Integer scheduleHisId,
+ String keyword) {}
+
+ public record ResponseSsadaguSearch(
+ String status,
+ String keyword,
+ @JsonProperty("search_results") List> searchResults) {}
+
+ // --- 3. 상품 매칭 ---
+ public record RequestSsadaguMatch(
+ @JsonProperty("job_id") int jobId,
+ @JsonProperty("schedule_id") int scheduleId,
+ @JsonProperty("schedule_his_id") Integer scheduleHisId,
+ String keyword,
+ @JsonProperty("search_results") List> searchResults) {}
+
+ public record ResponseSsadaguMatch(
+ String status,
+ String keyword,
+ @JsonProperty("matched_products") List> matchedProducts) {}
+
+ // --- 4. 상품 유사도 ---
+ public record RequestSsadaguSimilarity(
+ @JsonProperty("job_id") int jobId,
+ @JsonProperty("schedule_id") int scheduleId,
+ @JsonProperty("schedule_his_id") Integer scheduleHisId,
+ String keyword,
+ @JsonProperty("matched_products") List> matchedProducts,
+ @JsonProperty("search_results") List> searchResults) {}
+
+ public record ResponseSsadaguSimilarity(
+ String status,
+ String keyword,
+ @JsonProperty("selected_product") Map selectedProduct,
+ String reason) {}
+
+ // --- 5. 상품 크롤링 ---
+ public record RequestSsadaguCrawl(
+ @JsonProperty("job_id") int jobId,
+ @JsonProperty("schedule_id") int scheduleId,
+ @JsonProperty("schedule_his_id") Integer scheduleHisId,
+ String tag,
+ @JsonProperty("product_url") String productUrl) {}
+
+ public record ResponseSsadaguCrawl(
+ String status,
+ String tag,
+ @JsonProperty("product_url") String productUrl,
+ @JsonProperty("product_detail") Map productDetail,
+ @JsonProperty("crawled_at") String crawledAt) {}
+
+ // --- 6. 블로그 콘텐츠 생성 ---
+ public record RequestBlogCreate(
+ @JsonProperty("job_id") int jobId,
+ @JsonProperty("schedule_id") int scheduleId,
+ @JsonProperty("schedule_his_id") Integer scheduleHisId) {}
+
+ public record ResponseBlogCreate(String status) {}
+
+ // --- 7. 블로그 발행 ---
+ public record RequestBlogPublish(
+ @JsonProperty("job_id") int jobId,
+ @JsonProperty("schedule_id") int scheduleId,
+ @JsonProperty("schedule_his_id") Integer scheduleHisId,
+ String tag,
+ @JsonProperty("blog_id") String blogId,
+ @JsonProperty("blog_pw") String blogPw,
+ @JsonProperty("post_title") String postTitle,
+ @JsonProperty("post_content") String postContent,
+ @JsonProperty("post_tags") List postTags) {}
+
+ public record ResponseBlogPublish(String status, Map metadata) {}
+}
diff --git a/apps/user-service/src/main/java/site/icebang/global/aop/logging/LoggingAspect.java b/apps/user-service/src/main/java/site/icebang/global/aop/logging/LoggingAspect.java
index 126c7d35..b1806cff 100644
--- a/apps/user-service/src/main/java/site/icebang/global/aop/logging/LoggingAspect.java
+++ b/apps/user-service/src/main/java/site/icebang/global/aop/logging/LoggingAspect.java
@@ -22,6 +22,9 @@ public void serviceMethods() {}
@Pointcut("execution(public * site.icebang..service..mapper..*(..))")
public void repositoryMethods() {}
+ @Pointcut("execution(public * site.icebang.batch.tasklet..*(..))")
+ public void taskletMethods() {}
+
@Around("controllerMethods()")
public Object logController(ProceedingJoinPoint joinPoint) throws Throwable {
long start = System.currentTimeMillis();
@@ -51,4 +54,15 @@ public Object logRepository(ProceedingJoinPoint joinPoint) throws Throwable {
log.debug("[REPOSITORY] End: {} ({}ms)", joinPoint.getSignature(), duration);
return result;
}
+
+ @Around("taskletMethods()")
+ public Object logTasklet(ProceedingJoinPoint joinPoint) throws Throwable {
+ long start = System.currentTimeMillis();
+ // Tasklet 이름만으로도 구분이 되므로, 클래스명 + 메서드명으로 로그를 남깁니다.
+ log.info(">>>> [TASKLET] Start: {}", joinPoint.getSignature().toShortString());
+ Object result = joinPoint.proceed(); // 실제 Tasklet의 execute() 메서드 실행
+ long duration = System.currentTimeMillis() - start;
+ log.info("<<<< [TASKLET] End: {} ({}ms)", joinPoint.getSignature().toShortString(), duration);
+ return result;
+ }
}
diff --git a/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java b/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java
index aba3ee3c..c915867d 100644
--- a/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java
+++ b/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java
@@ -19,16 +19,23 @@
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import lombok.RequiredArgsConstructor;
import site.icebang.domain.auth.service.AuthCredentialAdapter;
import site.icebang.global.config.security.endpoints.SecurityEndpoints;
+import site.icebang.global.handler.exception.RestAccessDeniedHandler;
+import site.icebang.global.handler.exception.RestAuthenticationEntryPoint;
@Configuration
@RequiredArgsConstructor
public class SecurityConfig {
private final Environment environment;
private final AuthCredentialAdapter userDetailsService;
+ private final ObjectMapper objectMapper;
+ private final RestAuthenticationEntryPoint restAuthenticationEntryPoint;
+ private final RestAccessDeniedHandler restAccessDeniedHandler;
@Bean
public AuthenticationProvider authenticationProvider() {
@@ -97,6 +104,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.logout(
logout -> logout.logoutUrl("/auth/logout").logoutSuccessUrl("/auth/login").permitAll())
.csrf(AbstractHttpConfigurer::disable)
+ .exceptionHandling(
+ ex ->
+ ex.authenticationEntryPoint(restAuthenticationEntryPoint)
+ .accessDeniedHandler(restAccessDeniedHandler))
.build();
}
diff --git a/apps/user-service/src/main/java/site/icebang/global/filter/LoggingFilter.java b/apps/user-service/src/main/java/site/icebang/global/filter/LoggingFilter.java
deleted file mode 100644
index e89f2d80..00000000
--- a/apps/user-service/src/main/java/site/icebang/global/filter/LoggingFilter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package site.icebang.global.filter;
-
-import java.io.IOException;
-import java.util.UUID;
-
-import org.slf4j.MDC;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-@Component
-public class LoggingFilter extends OncePerRequestFilter {
-
- public static final String TRACE_ID_HEADER = "X-Request-ID";
-
- @Override
- protected void doFilterInternal(
- HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
- throws ServletException, IOException {
-
- // 다른 시스템에서 이미 전달한 Trace ID가 있는지 확인
- String traceId = request.getHeader(TRACE_ID_HEADER);
-
- // 없다면 새로 생성 (요청의 시작점)
- if (traceId == null || traceId.isEmpty()) {
- traceId = UUID.randomUUID().toString();
- }
-
- MDC.put("traceId", traceId.substring(0, 8));
-
- // ⭐️ 요청 객체에 attribute로 traceId를 저장하여 컨트롤러 등에서 사용할 수 있게 함
- request.setAttribute("X-Request-ID", traceId);
-
- // 응답 헤더에 traceId를 넣어주면 클라이언트가 추적하기 용이
- response.setHeader(TRACE_ID_HEADER, traceId);
-
- filterChain.doFilter(request, response);
- }
-}
diff --git a/apps/user-service/src/main/java/site/icebang/global/handler/exception/GlobalExceptionHandler.java b/apps/user-service/src/main/java/site/icebang/global/handler/exception/GlobalExceptionHandler.java
new file mode 100644
index 00000000..6923f455
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/global/handler/exception/GlobalExceptionHandler.java
@@ -0,0 +1,54 @@
+package site.icebang.global.handler.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+
+import site.icebang.common.dto.ApiResponse;
+import site.icebang.common.exception.DuplicateDataException;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+ @ExceptionHandler(MethodArgumentNotValidException.class)
+ @ResponseStatus(HttpStatus.BAD_REQUEST)
+ public ApiResponse handleValidation(MethodArgumentNotValidException ex) {
+ String detail = ex.getBindingResult().toString();
+ return ApiResponse.error("Validation failed: " + detail, HttpStatus.BAD_REQUEST);
+ }
+
+ @ExceptionHandler(Exception.class)
+ @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+ public ApiResponse handleGeneric(Exception ex) {
+ return ApiResponse.error(
+ "Internal error: " + ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+ @ExceptionHandler(NoResourceFoundException.class)
+ @ResponseStatus(HttpStatus.NOT_FOUND)
+ public ApiResponse handleNotFound(NoResourceFoundException ex) {
+ return ApiResponse.error("Notfound: " + ex.getMessage(), HttpStatus.NOT_FOUND);
+ }
+
+ @ExceptionHandler(AuthenticationException.class)
+ @ResponseStatus(HttpStatus.UNAUTHORIZED)
+ public ApiResponse handleAuthentication(AuthenticationException ex) {
+ return ApiResponse.error("Authentication failed: " + ex.getMessage(), HttpStatus.UNAUTHORIZED);
+ }
+
+ @ExceptionHandler(AccessDeniedException.class)
+ @ResponseStatus(HttpStatus.FORBIDDEN)
+ public ApiResponse handleAccessDenied(AccessDeniedException ex) {
+ return ApiResponse.error("Access denied: " + ex.getMessage(), HttpStatus.FORBIDDEN);
+ }
+
+ @ExceptionHandler(DuplicateDataException.class)
+ @ResponseStatus(HttpStatus.CONFLICT)
+ public ApiResponse handleDuplicateData(DuplicateDataException ex) {
+ return ApiResponse.error("Duplicate: " + ex.getMessage(), HttpStatus.CONFLICT);
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/global/handler/exception/RestAccessDeniedHandler.java b/apps/user-service/src/main/java/site/icebang/global/handler/exception/RestAccessDeniedHandler.java
new file mode 100644
index 00000000..efeffde1
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/global/handler/exception/RestAccessDeniedHandler.java
@@ -0,0 +1,33 @@
+package site.icebang.global.handler.exception;
+
+import java.io.IOException;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+
+import site.icebang.common.dto.ApiResponse;
+
+@Component
+@RequiredArgsConstructor
+public class RestAccessDeniedHandler implements AccessDeniedHandler {
+ private final ObjectMapper objectMapper;
+
+ @Override
+ public void handle(
+ HttpServletRequest request, HttpServletResponse response, AccessDeniedException ex)
+ throws IOException {
+ ApiResponse body = ApiResponse.error("Access denied", HttpStatus.FORBIDDEN);
+
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ response.setContentType("application/json;charset=UTF-8");
+ response.getWriter().write(objectMapper.writeValueAsString(body));
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/global/handler/exception/RestAuthenticationEntryPoint.java b/apps/user-service/src/main/java/site/icebang/global/handler/exception/RestAuthenticationEntryPoint.java
new file mode 100644
index 00000000..b7c50d76
--- /dev/null
+++ b/apps/user-service/src/main/java/site/icebang/global/handler/exception/RestAuthenticationEntryPoint.java
@@ -0,0 +1,34 @@
+package site.icebang.global.handler.exception;
+
+import java.io.IOException;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+
+import site.icebang.common.dto.ApiResponse;
+
+@Component
+@RequiredArgsConstructor
+public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
+ private final ObjectMapper objectMapper;
+
+ @Override
+ public void commence(
+ HttpServletRequest request, HttpServletResponse response, AuthenticationException ex)
+ throws IOException {
+ ApiResponse body =
+ ApiResponse.error("Authentication required", HttpStatus.UNAUTHORIZED);
+
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ response.setContentType("application/json;charset=UTF-8");
+ response.getWriter().write(objectMapper.writeValueAsString(body));
+ }
+}
diff --git a/apps/user-service/src/main/java/site/icebang/domain/schedule/mapper/ScheduleMapper.java b/apps/user-service/src/main/java/site/icebang/schedule/mapper/ScheduleMapper.java
similarity index 63%
rename from apps/user-service/src/main/java/site/icebang/domain/schedule/mapper/ScheduleMapper.java
rename to apps/user-service/src/main/java/site/icebang/schedule/mapper/ScheduleMapper.java
index c757fc36..b1a92f1e 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/schedule/mapper/ScheduleMapper.java
+++ b/apps/user-service/src/main/java/site/icebang/schedule/mapper/ScheduleMapper.java
@@ -1,10 +1,10 @@
-package site.icebang.domain.schedule.mapper;
+package site.icebang.schedule.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
-import site.icebang.domain.schedule.model.Schedule;
+import site.icebang.schedule.model.Schedule;
@Mapper
public interface ScheduleMapper {
diff --git a/apps/user-service/src/main/java/site/icebang/domain/schedule/model/Schedule.java b/apps/user-service/src/main/java/site/icebang/schedule/model/Schedule.java
similarity index 84%
rename from apps/user-service/src/main/java/site/icebang/domain/schedule/model/Schedule.java
rename to apps/user-service/src/main/java/site/icebang/schedule/model/Schedule.java
index 65c48366..ced2900c 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/schedule/model/Schedule.java
+++ b/apps/user-service/src/main/java/site/icebang/schedule/model/Schedule.java
@@ -1,4 +1,4 @@
-package site.icebang.domain.schedule.model;
+package site.icebang.schedule.model;
import lombok.Getter;
import lombok.Setter;
diff --git a/apps/user-service/src/main/java/site/icebang/domain/schedule/runner/SchedulerInitializer.java b/apps/user-service/src/main/java/site/icebang/schedule/runner/SchedulerInitializer.java
similarity index 78%
rename from apps/user-service/src/main/java/site/icebang/domain/schedule/runner/SchedulerInitializer.java
rename to apps/user-service/src/main/java/site/icebang/schedule/runner/SchedulerInitializer.java
index 0dfb8b33..ee8580dd 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/schedule/runner/SchedulerInitializer.java
+++ b/apps/user-service/src/main/java/site/icebang/schedule/runner/SchedulerInitializer.java
@@ -1,4 +1,4 @@
-package site.icebang.domain.schedule.runner;
+package site.icebang.schedule.runner;
import java.util.List;
@@ -9,9 +9,9 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import site.icebang.domain.schedule.mapper.ScheduleMapper;
-import site.icebang.domain.schedule.model.Schedule;
-import site.icebang.domain.schedule.service.DynamicSchedulerService;
+import site.icebang.schedule.mapper.ScheduleMapper;
+import site.icebang.schedule.model.Schedule;
+import site.icebang.schedule.service.DynamicSchedulerService;
@Slf4j
@Component
diff --git a/apps/user-service/src/main/java/site/icebang/domain/schedule/service/DynamicSchedulerService.java b/apps/user-service/src/main/java/site/icebang/schedule/service/DynamicSchedulerService.java
similarity index 95%
rename from apps/user-service/src/main/java/site/icebang/domain/schedule/service/DynamicSchedulerService.java
rename to apps/user-service/src/main/java/site/icebang/schedule/service/DynamicSchedulerService.java
index 372e0e1d..b81e30eb 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/schedule/service/DynamicSchedulerService.java
+++ b/apps/user-service/src/main/java/site/icebang/schedule/service/DynamicSchedulerService.java
@@ -1,4 +1,4 @@
-package site.icebang.domain.schedule.service;
+package site.icebang.schedule.service;
import java.time.LocalDateTime;
import java.util.Map;
@@ -16,7 +16,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import site.icebang.domain.schedule.model.Schedule;
+import site.icebang.schedule.model.Schedule;
@Slf4j
@Service
diff --git a/apps/user-service/src/main/resources/application-develop.yml b/apps/user-service/src/main/resources/application-develop.yml
index e7bc3f09..8c24f49d 100644
--- a/apps/user-service/src/main/resources/application-develop.yml
+++ b/apps/user-service/src/main/resources/application-develop.yml
@@ -33,6 +33,7 @@ spring:
- classpath:sql/00-truncate.sql
- classpath:sql/01-insert-internal-users.sql
- classpath:sql/02-insert-external-users.sql
+ - classpath:sql/03-insert-workflow.sql
encoding: UTF-8
mybatis:
@@ -43,3 +44,9 @@ mybatis:
logging:
config: classpath:log4j2-develop.yml
+
+management:
+ tracing:
+ enabled: true
+ sampling:
+ probability: 1.0 # 100% 샘플링 (개발 환경에서만 권장)
\ No newline at end of file
diff --git a/apps/user-service/src/main/resources/application-test-e2e.yml b/apps/user-service/src/main/resources/application-test-e2e.yml
index f7dceba9..3a777909 100644
--- a/apps/user-service/src/main/resources/application-test-e2e.yml
+++ b/apps/user-service/src/main/resources/application-test-e2e.yml
@@ -18,4 +18,4 @@ mybatis:
map-underscore-to-camel-case: true
logging:
- config: classpath:log4j2-production.yml
\ No newline at end of file
+ config: classpath:log4j2-test-e2e.yml
\ No newline at end of file
diff --git a/apps/user-service/src/main/resources/application-test-integration.yml b/apps/user-service/src/main/resources/application-test-integration.yml
index 0ed34f36..526cf151 100644
--- a/apps/user-service/src/main/resources/application-test-integration.yml
+++ b/apps/user-service/src/main/resources/application-test-integration.yml
@@ -39,4 +39,4 @@ mybatis:
map-underscore-to-camel-case: true
logging:
- config: classpath:log4j2-develop.yml
\ No newline at end of file
+ config: classpath:log4j2-test-unit.yml
\ No newline at end of file
diff --git a/apps/user-service/src/main/resources/application.yml b/apps/user-service/src/main/resources/application.yml
index d6f68b0e..7ede99ae 100644
--- a/apps/user-service/src/main/resources/application.yml
+++ b/apps/user-service/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
mybatis:
# Mapper XML 파일 위치
mapper-locations: classpath:mapper/**/*.xml
- type-handlers-package: site.icebang.config.mybatis.typehandler
+ type-handlers-package: site.icebang.global.config.mybatis.typehandler
# 외부 API 연동을 위한 설정 섹션
api:
diff --git a/apps/user-service/src/main/resources/log4j2-develop.yml b/apps/user-service/src/main/resources/log4j2-develop.yml
index f900c3b1..41a369bf 100644
--- a/apps/user-service/src/main/resources/log4j2-develop.yml
+++ b/apps/user-service/src/main/resources/log4j2-develop.yml
@@ -1,133 +1,169 @@
Configuration:
+ status: DEBUG
name: develop
properties:
property:
+ - name: "app-name"
+ value: "user-service"
- name: "log-path"
value: "./logs"
- name: "charset-UTF-8"
value: "UTF-8"
- # 통일된 콘솔 패턴 - 모든 로그에 RequestId 포함
+ # DEBUG 환경용 콘솔 패턴 - 더 간단하고 가독성 좋게
- name: "console-layout-pattern"
- value: "%highlight{[%-5level]} [%X{traceId}] %d{MM-dd HH:mm:ss} [%t] %n %msg%n%n"
- # 파일용 상세 패턴 - RequestId 포함
+ value: "%highlight{[%-5level]} [%X{traceId}] [%X{spanId}] %d{HH:mm:ss} [%t] %n %logger{20} - %msg%n%n "
+ # 파일용 패턴
- name: "file-layout-pattern"
value: "[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
- # 로그 파일 경로들
- - name: "info-log"
- value: ${log-path}/user-service/info.log
+ # 개발 환경용 로그 파일들
+ - name: "dev-log"
+ value: ${log-path}/develop/app.log
- name: "error-log"
- value: ${log-path}/user-service/error.log
- - name: "auth-log"
- value: ${log-path}/user-service/auth.log
- - name: "json-log"
- value: ${log-path}/user-service/json-info.log
+ value: ${log-path}/develop/error.log
- # [Appenders] 로그 기록방식 정의
Appenders:
- # 통일된 콘솔 출력
+ # 콘솔 출력 - 개발 시 주요 출력
Console:
name: console-appender
target: SYSTEM_OUT
PatternLayout:
pattern: ${console-layout-pattern}
+ disableAnsi: false
- # 롤링 파일 로그
- RollingFile:
- name: rolling-file-appender
- fileName: ${log-path}/rolling-file.log
- filePattern: "logs/archive/rolling-file.log.%d{yyyy-MM-dd-hh-mm}_%i.gz"
- PatternLayout:
- charset: ${charset-UTF-8}
- pattern: ${file-layout-pattern}
- Policies:
- SizeBasedTriggeringPolicy:
- size: "200KB"
- TimeBasedTriggeringPolicy:
- interval: "1"
- DefaultRollOverStrategy:
- max: "30"
- fileIndex: "max"
+ # Loki Appender - 개발환경 모니터링용
+ Loki:
+ name: loki-appender
+ host: localhost
+ port: 3100
+ JsonLayout:
+ compact: true
+ eventEol: true
+ includeStacktrace: true
+ KeyValuePair:
+ - key: "app"
+ value: "${app-name}"
+ - key: "env"
+ value: "develop"
+ Label:
+ - name: "app"
+ value: "${app-name}"
+ - name: "env"
+ value: "develop"
+ - name: "traceId"
+ value: "${ctx:traceId}"
+ - name: "spanId"
+ value: "${ctx:spanId}"
+ - name: "executionType"
+ value: "${ctx:executionType:-application}"
+ - name: "sourceId"
+ value: "${ctx:sourceId}"
+ - name: "runId"
+ value: "${ctx:runId}"
+
+# ExecutionDB:
+# name: ExecutionDB
+# class: org.apache.logging.log4j.core.appender.db.jdbc.JdbcAppender
+# tableName: execution_log
+# columnMappings:
+# - name: log_level
+# pattern: "%level"
+# - name: log_message
+# pattern: "%message"
+# - name: trace_id
+# pattern: "%X{traceId}"
+# - name: execution_type
+# pattern: "%X{executionType}"
+# - name: source_id
+# pattern: "%X{sourceId}"
+# - name: run_id
+# pattern: "%X{runId}"
+# - name: executed_at
+# pattern: "%d{yyyy-MM-dd HH:mm:ss}"
+# connectionSource:
+# class: org.apache.logging.log4j.core.appender.db.jdbc.DataSourceConnectionSource
+# dataSource: "#dataSource
- # 파일 로그들
+ # 개발용 일반 로그 파일
File:
- - name: file-info-appender
- fileName: ${info-log}
+ - name: file-dev-appender
+ fileName: ${dev-log}
PatternLayout:
pattern: ${file-layout-pattern}
- name: file-error-appender
fileName: ${error-log}
PatternLayout:
pattern: ${file-layout-pattern}
- - name: file-auth-appender
- fileName: ${auth-log}
- PatternLayout:
- pattern: ${file-layout-pattern}
- - name: file-json-info-appender
- fileName: ${json-log}
- PatternLayout:
- pattern: ${file-layout-pattern}
+ ThresholdFilter:
+ level: ERROR
- # [Loggers] 로그 출력 범위를 정의
Loggers:
- # [Loggers - Root] 모든 로그를 기록하는 최상위 로그를 정의
+ # Root 로거 - 개발환경에서는 기본적으로 INFO 레벨
Root:
- level: OFF
+ level: INFO
AppenderRef:
- ref: console-appender
- - ref: rolling-file-appender
- # [Loggers - Loggers] 특정 패키지나 클래스에 대한 로그를 정의
Logger:
- # 1. Spring Framework 로그
- - name: org.springframework
- additivity: "false"
+ # 애플리케이션 로그 - 개발 시 모든 레벨 + Loki 전송
+ - name: site.icebang
+ additivity: false
level: DEBUG
AppenderRef:
- ref: console-appender
- - ref: file-info-appender
+ - ref: loki-appender
+ - ref: file-dev-appender
- ref: file-error-appender
- # 2. 애플리케이션 로그
- - name: site.icebang
- additivity: "false"
- level: TRACE
+ # Spring Framework - 개발 시 필요한 정보만
+ - name: org.springframework
+ additivity: false
+ level: INFO
AppenderRef:
- ref: console-appender
- - ref: file-info-appender
- - ref: file-error-appender
+ - ref: file-dev-appender
- # 3. HikariCP 로그 비활성화
- - name: com.zaxxer.hikari
- level: OFF
-
- # 4. Spring Security 로그 - 인증/인가 추적에 중요
+ # Spring Security - 인증 디버깅용
- name: org.springframework.security
level: DEBUG
- additivity: "false"
+ additivity: false
AppenderRef:
- ref: console-appender
- - ref: file-auth-appender
+ - ref: file-dev-appender
+ - ref: loki-appender
- # 5. 웹 요청 로그 - 요청 처리 과정 추적
+ # 웹 요청 로그 - API 개발 시 유용
- name: org.springframework.web
level: DEBUG
- additivity: "false"
+ additivity: false
AppenderRef:
- ref: console-appender
- - ref: file-info-appender
+ - ref: file-dev-appender
+ - ref: loki-appender
- # 6. 트랜잭션 로그 - DB 작업 추적
+ # 트랜잭션 로그 - DB 작업 디버깅
- name: org.springframework.transaction
level: DEBUG
- additivity: "false"
+ additivity: false
AppenderRef:
- ref: console-appender
- - ref: file-info-appender
+ - ref: file-dev-appender
+ - ref: loki-appender
+
+ # HikariCP 로그 비활성화
+ - name: com.zaxxer.hikari
+ level: OFF
- - name: site.icebang.domain.auth.mapper
+ # SQL 로그 - 개발 시 쿼리 확인용 (필요시 활성화)
+ - name: org.hibernate.SQL
level: DEBUG
- additivity: "false"
+ additivity: false
AppenderRef:
- ref: console-appender
- - ref: file-info-appender
\ No newline at end of file
+
+ # 파라미터 바인딩 로그 (필요시 활성화)
+ - name: org.hibernate.type.descriptor.sql.BasicBinder
+ level: TRACE
+ additivity: false
+ AppenderRef:
+ - ref: console-appender
\ No newline at end of file
diff --git a/apps/user-service/src/main/resources/log4j2-production.yml b/apps/user-service/src/main/resources/log4j2-production.yml
index 31393458..2e7d282b 100644
--- a/apps/user-service/src/main/resources/log4j2-production.yml
+++ b/apps/user-service/src/main/resources/log4j2-production.yml
@@ -1,5 +1,5 @@
Configuration:
- name: develop
+ name: production
properties:
property:
diff --git a/apps/user-service/src/main/resources/log4j2-test-e2e.yml b/apps/user-service/src/main/resources/log4j2-test-e2e.yml
new file mode 100644
index 00000000..557f426b
--- /dev/null
+++ b/apps/user-service/src/main/resources/log4j2-test-e2e.yml
@@ -0,0 +1,168 @@
+Configuration:
+ status: DEBUG
+ name: e2e
+
+ properties:
+ property:
+ - name: "app-name"
+ value: "user-service"
+ - name: "log-path"
+ value: "./logs"
+ - name: "charset-UTF-8"
+ value: "UTF-8"
+ # DEBUG 환경용 콘솔 패턴 - 더 간단하고 가독성 좋게
+ - name: "console-layout-pattern"
+ value: "%highlight{[%-5level]} [%X{traceId}] [%X{spanId}] %d{HH:mm:ss} [%t] %n %logger{20} - %msg%n%n "
+ # 파일용 패턴
+ - name: "file-layout-pattern"
+ value: "[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
+ # 개발 환경용 로그 파일들
+ - name: "dev-log"
+ value: ${log-path}/develop/app.log
+ - name: "error-log"
+ value: ${log-path}/develop/error.log
+
+ Appenders:
+ # 콘솔 출력 - 개발 시 주요 출력
+ Console:
+ name: console-appender
+ target: SYSTEM_OUT
+ PatternLayout:
+ pattern: ${console-layout-pattern}
+ disableAnsi: false
+
+ Loki:
+ name: loki-appender
+ host: localhost
+ port: ${sys:loki.port}
+ JsonLayout:
+ compact: true
+ eventEol: true
+ includeStacktrace: true
+ KeyValuePair:
+ - key: "app"
+ value: "${app-name}"
+ - key: "env"
+ value: "test-e2e"
+ Label:
+ - name: "app"
+ value: "${app-name}"
+ - name: "env"
+ value: "test-e2e"
+ - name: "traceId"
+ value: "${ctx:traceId}"
+ - name: "spanId"
+ value: "${ctx:spanId}"
+ - name: "executionType"
+ value: "${ctx:executionType:-application}"
+ - name: "sourceId"
+ value: "${ctx:sourceId}"
+ - name: "runId"
+ value: "${ctx:runId}"
+
+# ExecutionDB:
+# name: ExecutionDB
+# class: org.apache.logging.log4j.core.appender.db.jdbc.JdbcAppender
+# tableName: execution_log
+# columnMappings:
+# - name: log_level
+# pattern: "%level"
+# - name: log_message
+# pattern: "%message"
+# - name: trace_id
+# pattern: "%X{traceId}"
+# - name: execution_type
+# pattern: "%X{executionType}"
+# - name: source_id
+# pattern: "%X{sourceId}"
+# - name: run_id
+# pattern: "%X{runId}"
+# - name: executed_at
+# pattern: "%d{yyyy-MM-dd HH:mm:ss}"
+# connectionSource:
+# class: org.apache.logging.log4j.core.appender.db.jdbc.DataSourceConnectionSource
+# dataSource: "#dataSource
+
+ # 개발용 일반 로그 파일
+ File:
+ - name: file-dev-appender
+ fileName: ${dev-log}
+ PatternLayout:
+ pattern: ${file-layout-pattern}
+ - name: file-error-appender
+ fileName: ${error-log}
+ PatternLayout:
+ pattern: ${file-layout-pattern}
+ ThresholdFilter:
+ level: ERROR
+
+ Loggers:
+ # Root 로거 - 개발환경에서는 기본적으로 INFO 레벨
+ Root:
+ level: INFO
+ AppenderRef:
+ - ref: console-appender
+
+ Logger:
+ # 애플리케이션 로그 - 개발 시 모든 레벨 + Loki 전송
+ - name: site.icebang
+ additivity: false
+ level: DEBUG
+ AppenderRef:
+ - ref: console-appender
+ - ref: loki-appender
+ - ref: file-dev-appender
+ - ref: file-error-appender
+
+ # Spring Framework - 개발 시 필요한 정보만
+ - name: org.springframework
+ additivity: false
+ level: INFO
+ AppenderRef:
+ - ref: console-appender
+ - ref: file-dev-appender
+
+ # Spring Security - 인증 디버깅용
+ - name: org.springframework.security
+ level: DEBUG
+ additivity: false
+ AppenderRef:
+ - ref: console-appender
+ - ref: file-dev-appender
+ - ref: loki-appender
+
+ # 웹 요청 로그 - API 개발 시 유용
+ - name: org.springframework.web
+ level: DEBUG
+ additivity: false
+ AppenderRef:
+ - ref: console-appender
+ - ref: file-dev-appender
+ - ref: loki-appender
+
+ # 트랜잭션 로그 - DB 작업 디버깅
+ - name: org.springframework.transaction
+ level: DEBUG
+ additivity: false
+ AppenderRef:
+ - ref: console-appender
+ - ref: file-dev-appender
+ - ref: loki-appender
+
+ # HikariCP 로그 비활성화
+ - name: com.zaxxer.hikari
+ level: OFF
+
+ # SQL 로그 - 개발 시 쿼리 확인용 (필요시 활성화)
+ - name: org.hibernate.SQL
+ level: DEBUG
+ additivity: false
+ AppenderRef:
+ - ref: console-appender
+
+ # 파라미터 바인딩 로그 (필요시 활성화)
+ - name: org.hibernate.type.descriptor.sql.BasicBinder
+ level: TRACE
+ additivity: false
+ AppenderRef:
+ - ref: console-appender
\ No newline at end of file
diff --git a/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml
index 3cdcc90e..f9629b8a 100644
--- a/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml
+++ b/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml
@@ -1,16 +1,16 @@
-
+
- SELECT
+ SELECT
id AS scheduleId,
workflow_id AS workflowId,
cron_expression AS cronExpression,
is_active AS isActive
- FROM
+ FROM
schedule
- WHERE
+ WHERE
is_active = #{isActive}
diff --git a/apps/user-service/src/main/resources/sql/01-schema-h2.sql b/apps/user-service/src/main/resources/sql/01-schema-h2.sql
new file mode 100644
index 00000000..018ebb1d
--- /dev/null
+++ b/apps/user-service/src/main/resources/sql/01-schema-h2.sql
@@ -0,0 +1,328 @@
+-- H2 데이터베이스 호환 스키마 (테스트용)
+-- MySQL의 unsigned, AFTER 절 등을 H2 호환으로 변경
+
+CREATE TABLE `permission` (
+ `id` int NOT NULL AUTO_INCREMENT,
+ `resource` varchar(100) NULL,
+ `description` varchar(255) NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `is_active` boolean DEFAULT TRUE,
+ `updated_by` bigint NULL,
+ `created_by` bigint NULL,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `organization` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `name` varchar(150) NULL,
+ `domain_name` varchar(100) NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `role` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `organization_id` bigint NULL,
+ `name` varchar(100) NULL,
+ `description` varchar(500) NULL,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `user` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) NULL,
+ `email` varchar(100) NULL,
+ `password` varchar(255) NULL,
+ `status` varchar(20) NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `department` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `organization_id` bigint NOT NULL,
+ `name` varchar(100) NULL,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `position` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `organization_id` bigint NOT NULL,
+ `title` varchar(100) NULL,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `user_organization` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `user_id` bigint NOT NULL,
+ `organization_id` bigint NOT NULL,
+ `position_id` bigint NOT NULL,
+ `department_id` bigint NOT NULL,
+ `employee_number` varchar(50) NULL,
+ `status` varchar(20) NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `role_permission` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `role_id` bigint NOT NULL,
+ `permission_id` int NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_role_permission` (`role_id`, `permission_id`)
+);
+
+CREATE TABLE `user_role` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `role_id` bigint NOT NULL,
+ `user_organization_id` bigint NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_user_role` (`role_id`, `user_organization_id`)
+);
+
+-- 성능 최적화를 위한 인덱스
+CREATE INDEX `idx_user_email` ON `user` (`email`);
+CREATE INDEX `idx_user_status` ON `user` (`status`);
+CREATE INDEX `idx_user_organization_user` ON `user_organization` (`user_id`);
+CREATE INDEX `idx_user_organization_org` ON `user_organization` (`organization_id`);
+CREATE INDEX `idx_user_organization_status` ON `user_organization` (`status`);
+CREATE INDEX `idx_role_org` ON `role` (`organization_id`);
+CREATE INDEX `idx_permission_resource` ON `permission` (`resource`);
+CREATE INDEX `idx_permission_active` ON `permission` (`is_active`);
+
+CREATE TABLE `workflow` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `name` varchar(100) NOT NULL UNIQUE,
+ `description` text NULL,
+ `is_enabled` boolean DEFAULT TRUE,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `created_by` bigint NULL,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `updated_by` bigint NULL,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `schedule` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `workflow_id` bigint NOT NULL,
+ `cron_expression` varchar(50) NULL,
+ `parameters` json NULL,
+ `is_active` boolean DEFAULT TRUE,
+ `last_run_status` varchar(20) NULL,
+ `last_run_at` timestamp NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `created_by` bigint NULL,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `updated_by` bigint NULL,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `job` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `name` varchar(100) NOT NULL UNIQUE,
+ `description` text NULL,
+ `is_enabled` boolean DEFAULT TRUE,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `created_by` bigint NULL,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `updated_by` bigint NULL,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `task` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `name` varchar(100) NOT NULL UNIQUE,
+ `type` varchar(50) NULL,
+ `parameters` json NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `workflow_job` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `workflow_id` bigint NOT NULL,
+ `job_id` bigint NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_workflow_job` (`workflow_id`, `job_id`)
+);
+
+CREATE TABLE `job_task` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `job_id` bigint NOT NULL,
+ `task_id` bigint NOT NULL,
+ `execution_order` int NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_job_task` (`job_id`, `task_id`)
+);
+
+CREATE TABLE `execution_log` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `execution_type` varchar(20) NULL COMMENT 'task, schedule, job, workflow',
+ `source_id` bigint NULL COMMENT '모든 데이터에 대한 ID ex: job_id, schedule_id, task_id, ...',
+ `log_level` varchar(20) NULL,
+ `executed_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `log_message` text NULL,
+ `trace_id` char(36) NULL,
+ `config_snapshot` json NULL,
+ PRIMARY KEY (`id`),
+ INDEX `idx_source_id_type` (`source_id`, `execution_type`)
+);
+
+CREATE TABLE `task_io_data` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `task_run_id` bigint NOT NULL,
+ `io_type` varchar(10) NOT NULL COMMENT 'INPUT, OUTPUT',
+ `name` varchar(100) NOT NULL COMMENT '파라미터/변수 이름',
+ `data_type` varchar(50) NOT NULL COMMENT 'string, number, json, file, etc',
+ `data_value` json NULL COMMENT '실제 데이터 값',
+ `data_size` bigint NULL COMMENT '데이터 크기 (bytes)',
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`),
+ INDEX `idx_task_io_task_run_id` (`task_run_id`),
+ INDEX `idx_task_io_type` (`io_type`),
+ INDEX `idx_task_io_name` (`name`)
+);
+
+CREATE TABLE `config` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `target_type` varchar(50) NULL COMMENT 'user, job, workflow',
+ `target_id` bigint NULL,
+ `version` int NULL,
+ `json` json NULL,
+ `is_active` boolean DEFAULT TRUE,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `created_by` bigint NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_config_target` (`target_type`, `target_id`)
+);
+
+CREATE TABLE `category` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `name` varchar(100) NULL,
+ `description` text NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `user_config` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `user_id` bigint NOT NULL,
+ `type` varchar(50) NULL,
+ `name` varchar(100) NULL,
+ `json` json NULL,
+ `is_active` boolean DEFAULT TRUE,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `updated_at` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+-- 인덱스 추가 (성능 최적화)
+CREATE INDEX `idx_schedule_workflow` ON `schedule` (`workflow_id`);
+CREATE INDEX `idx_job_enabled` ON `job` (`is_enabled`);
+CREATE INDEX `idx_task_type` ON `task` (`type`);
+CREATE INDEX `idx_workflow_enabled` ON `workflow` (`is_enabled`);
+CREATE UNIQUE INDEX `uk_schedule_workflow` ON `schedule` (`workflow_id`);
+CREATE UNIQUE INDEX `uk_job_name` ON `job` (`name`);
+CREATE UNIQUE INDEX `uk_task_name` ON `task` (`name`);
+CREATE UNIQUE INDEX `uk_workflow_name` ON `workflow` (`name`);
+CREATE INDEX `idx_user_config_user` ON `user_config` (`user_id`);
+
+-- 워크플로우 실행 테이블
+CREATE TABLE `workflow_run` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `workflow_id` bigint NOT NULL,
+ `trace_id` char(36) NOT NULL,
+ `run_number` varchar(20) NULL,
+ `status` varchar(20) NULL COMMENT 'pending, running, success, failed, cancelled',
+ `trigger_type` varchar(20) NULL COMMENT 'manual, schedule, push, pull_request',
+ `started_at` timestamp NULL,
+ `finished_at` timestamp NULL,
+ `created_by` bigint NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_workflow_run_trace` (`trace_id`),
+ INDEX `idx_workflow_run_status` (`status`),
+ INDEX `idx_workflow_run_workflow_id` (`workflow_id`),
+ INDEX `idx_workflow_run_created_at` (`created_at`)
+);
+
+-- Job 실행 테이블
+CREATE TABLE `job_run` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `workflow_run_id` bigint NOT NULL,
+ `job_id` bigint NOT NULL,
+ `status` varchar(20) NULL COMMENT 'pending, running, success, failed, cancelled, skipped',
+ `started_at` timestamp NULL,
+ `finished_at` timestamp NULL,
+ `execution_order` int NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`),
+ INDEX `idx_job_run_workflow_run_id` (`workflow_run_id`),
+ INDEX `idx_job_run_status` (`status`),
+ INDEX `idx_job_run_job_id` (`job_id`)
+);
+
+-- Task 실행 테이블
+CREATE TABLE `task_run` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `job_run_id` bigint NOT NULL,
+ `task_id` bigint NOT NULL,
+ `status` varchar(20) NULL COMMENT 'pending, running, success, failed, cancelled, skipped',
+ `started_at` timestamp NULL,
+ `finished_at` timestamp NULL,
+ `execution_order` int NULL,
+ `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`),
+ INDEX `idx_task_run_job_run_id` (`job_run_id`),
+ INDEX `idx_task_run_status` (`status`),
+ INDEX `idx_task_run_task_id` (`task_id`)
+);
+
+-- v0.0.3 - H2 호환 버전
+DROP TABLE IF EXISTS `config`;
+
+-- H2에서는 한 번에 하나씩 컬럼 추가
+ALTER TABLE `workflow_job` ADD COLUMN `execution_order` INT NULL;
+
+ALTER TABLE `schedule` ADD COLUMN `schedule_text` varchar(20) NULL;
+
+ALTER TABLE `workflow` ADD COLUMN `default_config` json NULL;
+
+ALTER TABLE `user` ADD COLUMN `joined_at` timestamp NULL;
+
+ALTER TABLE `department` ADD COLUMN `description` varchar(100) NULL;
+
+-- v0.4 - H2 호환 버전 (AFTER 절 제거, unsigned 제거, 개별 ALTER 구문으로 분리)
+-- execution_log 테이블 컬럼 추가 (H2 호환)
+ALTER TABLE `execution_log` ADD COLUMN `run_id` bigint NULL;
+ALTER TABLE `execution_log` ADD COLUMN `status` varchar(20) NULL;
+ALTER TABLE `execution_log` ADD COLUMN `duration_ms` int NULL;
+ALTER TABLE `execution_log` ADD COLUMN `error_code` varchar(50) NULL;
+ALTER TABLE `execution_log` ADD COLUMN `reserved1` varchar(100) NULL;
+ALTER TABLE `execution_log` ADD COLUMN `reserved2` varchar(100) NULL;
+ALTER TABLE `execution_log` ADD COLUMN `reserved3` int NULL;
+ALTER TABLE `execution_log` ADD COLUMN `reserved4` json NULL;
+ALTER TABLE `execution_log` ADD COLUMN `reserved5` timestamp NULL;
+
+-- 기존 컬럼 수정 (H2 호환)
+ALTER TABLE `execution_log` ALTER COLUMN `log_message` varchar(500) NOT NULL;
+ALTER TABLE `execution_log` ALTER COLUMN `executed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
+-- 기존 불필요한 컬럼 제거
+ALTER TABLE `execution_log` DROP COLUMN IF EXISTS `config_snapshot`;
+
+-- 새로운 인덱스 추가
+CREATE INDEX `idx_run_id` ON `execution_log` (`run_id`);
+CREATE INDEX `idx_log_level_status` ON `execution_log` (`log_level`, `status`);
+CREATE INDEX `idx_error_code` ON `execution_log` (`error_code`);
+CREATE INDEX `idx_duration` ON `execution_log` (`duration_ms`);
+
+-- 기존 인덱스 수정
+DROP INDEX IF EXISTS `idx_source_id_type`;
+CREATE INDEX `idx_execution_type_source` ON `execution_log` (`execution_type`, `source_id`);
diff --git a/apps/user-service/src/main/resources/sql/01-schema.sql b/apps/user-service/src/main/resources/sql/01-schema.sql
index 569c452a..31242c33 100644
--- a/apps/user-service/src/main/resources/sql/01-schema.sql
+++ b/apps/user-service/src/main/resources/sql/01-schema.sql
@@ -284,4 +284,52 @@ CREATE TABLE `task_run` (
INDEX `idx_task_run_job_run_id` (`job_run_id`),
INDEX `idx_task_run_status` (`status`),
INDEX `idx_task_run_task_id` (`task_id`)
- );
\ No newline at end of file
+ );
+
+-- v0.0.3
+DROP TABLE IF EXISTS `config`;
+
+ALTER TABLE `workflow_job`
+ ADD COLUMN `execution_order` INT NULL AFTER `job_id`;
+
+
+ALTER TABLE `schedule`
+ ADD COLUMN `schedule_text` varchar(20) NULL;
+
+ALTER TABLE `workflow`
+ ADD COLUMN `default_config`json NULL;
+
+
+ALTER TABLE `user`
+ ADD COLUMN `joined_at` timestamp NULL;
+
+ALTER TABLE `department`
+ ADD COLUMN `description` varchar(100) NULL;
+
+-- v0.4
+-- 기존 execution_log 테이블 수정
+-- 컬럼 추가 (한 번에 하나씩)
+-- 컬럼 추가
+ALTER TABLE execution_log ADD COLUMN run_id BIGINT NULL;
+ALTER TABLE execution_log ADD COLUMN status VARCHAR(20) NULL;
+ALTER TABLE execution_log ADD COLUMN duration_ms INT NULL;
+ALTER TABLE execution_log ADD COLUMN error_code VARCHAR(50) NULL;
+ALTER TABLE execution_log ADD COLUMN reserved1 VARCHAR(100) NULL;
+ALTER TABLE execution_log ADD COLUMN reserved2 VARCHAR(100) NULL;
+ALTER TABLE execution_log ADD COLUMN reserved3 INT NULL;
+ALTER TABLE execution_log ADD COLUMN reserved4 json NULL;
+ALTER TABLE execution_log ADD COLUMN reserved5 TIMESTAMP NULL;
+
+-- 컬럼 수정
+ALTER TABLE execution_log MODIFY COLUMN log_message VARCHAR(500) NOT NULL;
+ALTER TABLE execution_log MODIFY COLUMN executed_at TIMESTAMP NOT NULL;
+
+-- 컬럼 삭제
+ALTER TABLE execution_log DROP COLUMN config_snapshot;
+
+-- 인덱스 생성 (CREATE INDEX 별도)
+CREATE INDEX idx_run_id ON execution_log(run_id);
+CREATE INDEX idx_log_level_status ON execution_log(log_level, status);
+CREATE INDEX idx_error_code ON execution_log(error_code);
+CREATE INDEX idx_duration ON execution_log(duration_ms);
+CREATE INDEX idx_execution_type_source ON execution_log(execution_type, source_id);
diff --git a/apps/user-service/src/main/resources/sql/03-insert-workflow.sql b/apps/user-service/src/main/resources/sql/03-insert-workflow.sql
new file mode 100644
index 00000000..dd2ddb15
--- /dev/null
+++ b/apps/user-service/src/main/resources/sql/03-insert-workflow.sql
@@ -0,0 +1,120 @@
+-- 워크플로우 관련 데이터 삽입
+
+-- 카테고리 삽입
+INSERT INTO `category` (`name`, `description`) VALUES
+ ('마케팅', '마케팅 관련 자동화 워크플로우'),
+ ('콘텐츠', '콘텐츠 생성 및 관리'),
+ ('데이터 수집', '웹 크롤링 및 데이터 수집 관련');
+
+-- 워크플로우 생성
+INSERT INTO `workflow` (`name`, `description`, `is_enabled`, `created_by`) VALUES
+ ('트렌드_블로그_자동화', '트렌드 검색부터 블로그 글 작성까지 전체 자동화 프로세스', TRUE, 1);
+
+-- Job 생성
+INSERT INTO `job` (`name`, `description`, `is_enabled`, `created_by`) VALUES
+ ('트렌드_검색_작업', '최신 트렌드 키워드 검색 및 분석', TRUE, 1),
+ ('싸다구_크롤링_작업', '싸다구 사이트에서 관련 상품 정보 크롤링', TRUE, 1),
+ ('블로그_글_작성_작업', '수집된 데이터를 바탕으로 블로그 글 자동 생성', TRUE, 1);
+
+-- Task 생성
+INSERT INTO `task` (`name`, `type`, `parameters`) VALUES
+-- 트렌드 검색 관련 태스크
+('구글_트렌드_검색', 'API_CALL', JSON_OBJECT(
+ 'api_endpoint', 'https://trends.googleapis.com/trends/api',
+ 'search_region', 'KR',
+ 'timeframe', 'now 7-d',
+ 'category', '0'
+ )),
+('네이버_트렌드_검색', 'API_CALL', JSON_OBJECT(
+ 'api_endpoint', 'https://datalab.naver.com/keyword/trendSearch.naver',
+ 'period', 'week',
+ 'device', 'pc'
+ )),
+('키워드_분석_및_필터링', 'DATA_PROCESSING', JSON_OBJECT(
+ 'min_score', 50,
+ 'max_keywords', 10,
+ 'filter_rules', JSON_ARRAY('adult_content', 'spam_keywords')
+ )),
+
+-- 싸다구 크롤링 관련 태스크
+('싸다구_상품_검색', 'WEB_SCRAPING', JSON_OBJECT(
+ 'base_url', 'https://www.ssg.com',
+ 'search_path', '/search.ssg',
+ 'max_pages', 3,
+ 'delay_ms', 2000
+ )),
+('상품_정보_추출', 'DATA_EXTRACTION', JSON_OBJECT(
+ 'extract_fields', JSON_ARRAY('title', 'price', 'rating', 'review_count', 'image_url'),
+ 'data_validation', true
+ )),
+('가격_비교_분석', 'DATA_ANALYSIS', JSON_OBJECT(
+ 'comparison_sites', JSON_ARRAY('쿠팡', '11번가', '옥션'),
+ 'price_threshold', 0.1
+ )),
+
+-- 블로그 글 작성 관련 태스크
+('블로그_템플릿_선택', 'TEMPLATE_PROCESSING', JSON_OBJECT(
+ 'template_type', 'product_review',
+ 'style', 'conversational',
+ 'target_length', 1500
+ )),
+('AI_콘텐츠_생성', 'AI_GENERATION', JSON_OBJECT(
+ 'model', 'gpt-4',
+ 'temperature', 0.7,
+ 'max_tokens', 2000,
+ 'prompt_template', '트렌드 키워드와 상품 정보를 바탕으로 자연스러운 블로그 글을 작성해주세요.'
+ )),
+('콘텐츠_검수_및_최적화', 'CONTENT_REVIEW', JSON_OBJECT(
+ 'seo_optimization', true,
+ 'readability_check', true,
+ 'plagiarism_check', true
+ )),
+('블로그_플랫폼_발행', 'PUBLISHING', JSON_OBJECT(
+ 'platforms', JSON_ARRAY('네이버 블로그', '티스토리', '브런치'),
+ 'schedule_publish', false,
+ 'auto_tags', true
+ ));
+
+-- 워크플로우-Job 연결
+INSERT INTO `workflow_job` (`workflow_id`, `job_id`) VALUES
+ (1, 1), -- 트렌드_블로그_자동화 + 트렌드_검색_작업
+ (1, 2), -- 트렌드_블로그_자동화 + 싸다구_크롤링_작업
+ (1, 3); -- 트렌드_블로그_자동화 + 블로그_글_작성_작업
+
+-- Job-Task 연결 (실행 순서 포함)
+-- 트렌드 검색 작업의 태스크들
+INSERT INTO `job_task` (`job_id`, `task_id`, `execution_order`) VALUES
+ (1, 1, 1), -- 구글_트렌드_검색
+ (1, 2, 2), -- 네이버_트렌드_검색
+ (1, 3, 3); -- 키워드_분석_및_필터링
+
+-- 싸다구 크롤링 작업의 태스크들
+INSERT INTO `job_task` (`job_id`, `task_id`, `execution_order`) VALUES
+ (2, 4, 1), -- 싸다구_상품_검색
+ (2, 5, 2), -- 상품_정보_추출
+ (2, 6, 3); -- 가격_비교_분석
+
+-- 블로그 글 작성 작업의 태스크들
+INSERT INTO `job_task` (`job_id`, `task_id`, `execution_order`) VALUES
+ (3, 7, 1), -- 블로그_템플릿_선택
+ (3, 8, 2), -- AI_콘텐츠_생성
+ (3, 9, 3), -- 콘텐츠_검수_및_최적화
+ (3, 10, 4); -- 블로그_플랫폼_발행
+
+-- 스케줄 설정 (매일 오전 8시 실행)
+INSERT INTO `schedule` (`workflow_id`, `cron_expression`, `parameters`, `is_active`, `created_by`) VALUES
+ (1, '0 0 8 * * *', JSON_OBJECT(
+ 'timezone', 'Asia/Seoul',
+ 'retry_count', 3,
+ 'timeout_minutes', 60,
+ 'notification_email', 'admin@icebang.site'
+ ), TRUE, 1);
+
+-- 사용자별 설정 (관리자용)
+INSERT INTO `user_config` (`user_id`, `type`, `name`, `json`, `is_active`) VALUES
+ (1, 'workflow_preference', '트렌드_블로그_설정', JSON_OBJECT(
+ 'preferred_keywords', JSON_ARRAY('테크', 'IT', '트렌드', '리뷰'),
+ 'blog_style', 'casual',
+ 'auto_publish', false,
+ 'notification_enabled', true
+ ), TRUE);
\ No newline at end of file
diff --git a/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserLogoutFlowE2eTest.java b/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserLogoutFlowE2eTest.java
new file mode 100644
index 00000000..8fea2764
--- /dev/null
+++ b/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserLogoutFlowE2eTest.java
@@ -0,0 +1,159 @@
+package site.icebang.e2e.scenario;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.*;
+import org.springframework.test.context.jdbc.Sql;
+
+import site.icebang.e2e.setup.annotation.E2eTest;
+import site.icebang.e2e.setup.support.E2eTestSupport;
+
+@Sql(
+ value = "classpath:sql/01-insert-internal-users.sql",
+ executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS)
+@DisplayName("사용자 로그아웃 플로우 E2E 테스트")
+@E2eTest
+class UserLogoutFlowE2eTest extends E2eTestSupport {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ @DisplayName("정상 로그아웃 전체 플로우 - TDD REd 단계")
+ void completeUserRegistrationFlow_shouldFailBecauseApiNotImplemented() throws Exception {
+ logStep(1, "관리자 로그인 (최우선)");
+
+ // 1. 관리자 로그인으로 인증 상태 확립
+ Map loginRequest = new HashMap<>();
+ loginRequest.put("email", "admin@icebang.site");
+ loginRequest.put("password", "qwer1234!A");
+
+ HttpHeaders loginHeaders = new HttpHeaders();
+ loginHeaders.setContentType(MediaType.APPLICATION_JSON);
+ loginHeaders.set("Origin", "https://admin.icebang.site");
+ loginHeaders.set("Referer", "https://admin.icebang.site/");
+
+ HttpEntity> loginEntity = new HttpEntity<>(loginRequest, loginHeaders);
+
+ ResponseEntity loginResponse =
+ restTemplate.postForEntity(getV0ApiUrl("/auth/login"), loginEntity, Map.class);
+
+ assertThat(loginResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+ assertThat((Boolean) loginResponse.getBody().get("success")).isTrue();
+
+ logSuccess("관리자 로그인 성공 - 인증 상태 확립 완료");
+
+ logStep(2, "로그인 상태에서 보호된 리소스 접근 확인");
+
+ // 로그인 응답에서 세션 쿠키 추출
+ String sessionCookie = null;
+ java.util.List cookies = loginResponse.getHeaders().get("Set-Cookie");
+ if (cookies != null) {
+ for (String cookie : cookies) {
+ if (cookie.startsWith("JSESSIONID")) {
+ sessionCookie = cookie.split(";")[0]; // JSESSIONID=XXX 부분만 추출
+ break;
+ }
+ }
+ }
+
+ // 2. 로그인된 상태에서 본인 프로필 조회로 인증 상태 확인
+ // /v0/users/me는 인증된 사용자만 접근 가능한 일반적인 API
+ HttpHeaders authenticatedHeaders = new HttpHeaders();
+ if (sessionCookie != null) {
+ authenticatedHeaders.set("Cookie", sessionCookie);
+ }
+
+ HttpEntity authenticatedEntity = new HttpEntity<>(authenticatedHeaders);
+ ResponseEntity beforeLogoutResponse =
+ restTemplate.exchange(
+ getV0ApiUrl("/users/me"), HttpMethod.GET, authenticatedEntity, Map.class);
+
+ assertThat(beforeLogoutResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+ assertThat((Boolean) beforeLogoutResponse.getBody().get("success")).isTrue();
+ assertThat(beforeLogoutResponse.getBody().get("data")).isNotNull();
+
+ logSuccess("인증된 상태에서 본인 프로필 조회 성공");
+
+ // 3. 로그아웃 API 호출
+ HttpHeaders logoutHeaders = new HttpHeaders();
+ logoutHeaders.setContentType(MediaType.APPLICATION_JSON);
+ logoutHeaders.set("Origin", "https://admin.icebang.site");
+ logoutHeaders.set("Referer", "https://admin.icebang.site/");
+
+ // 로그아웃 요청에도 세션 쿠키 포함
+ if (sessionCookie != null) {
+ logoutHeaders.set("Cookie", sessionCookie);
+ }
+
+ HttpEntity> logoutEntity = new HttpEntity<>(new HashMap<>(), logoutHeaders);
+
+ try {
+ ResponseEntity logoutResponse =
+ restTemplate.postForEntity(getV0ApiUrl("/auth/logout"), logoutEntity, Map.class);
+ logStep(4, "로그아웃 응답 검증 (API구현 돼있으면)");
+
+ logSuccess("로그아웃 API 호출 성공");
+
+ logStep(5, "로그아웃 후 인증 무효화 확인");
+
+ // 5. 로그아웃 후 동일한 프로필 API 접근 시 인증 실패 확인
+ HttpEntity afterLogoutEntity = new HttpEntity<>(authenticatedHeaders);
+ ResponseEntity afterLogoutResponse =
+ restTemplate.exchange(
+ getV0ApiUrl("/users/me"), HttpMethod.GET, afterLogoutEntity, Map.class);
+
+ // 핵심 검증: 로그아웃 후에는 인증 실패로 401 또는 403 응답이어야 함
+ assertThat(afterLogoutResponse.getStatusCode())
+ .withFailMessage(
+ "로그아웃 후 프로필 접근이 차단되어야 합니다. 현재 상태코드: %s", afterLogoutResponse.getStatusCode())
+ .isIn(HttpStatus.UNAUTHORIZED, HttpStatus.FORBIDDEN);
+ logSuccess("로그아웃 후 프로필 접근 차단 확인 - 인증 무효화 성공");
+
+ logCompletion("일반 사용자 로그아웃 플로우");
+
+ } catch (org.springframework.web.client.HttpClientErrorException.NotFound ex) {
+ logError("예상된 실패: 로그아웃 API가 구현되지 않음 (404 Not Found");
+ logError("에러 메시지 : " + ex.getMessage());
+
+ fail(
+ "로그아웃 API (/v0/auth/logout)가 구현되지 않았습니다. "
+ + "다음 단계에서 API를 구현해야 합니다. 에러: "
+ + ex.getMessage());
+ } catch (Exception ex) {
+ logError("예상치 못한 오류 발생: " + ex.getClass().getSimpleName());
+ logError("에러 메시지: " + ex.getMessage());
+
+ // 기타 예상치 못한 에러도 기록
+ fail("로그아웃 API 호출 중 예상치 못한 오류 발생: " + ex.getMessage());
+ }
+ }
+
+ /** 일반 사용자 로그인을 수행하는 헬퍼 메서드 관리자가 아닌 콘텐츠팀장으로 로그인 */
+ private void performRegularUserLogin() {
+ Map loginRequest = new HashMap<>();
+ loginRequest.put("email", "viral.jung@icebang.site");
+ loginRequest.put("password", "qwer1234!A"); // 실제 비밀번호 확인 필요
+
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.set("Origin", "https://admin.icebang.site");
+ headers.set("Referer", "https://admin.icebang.site/");
+
+ HttpEntity> entity = new HttpEntity<>(loginRequest, headers);
+
+ ResponseEntity response =
+ restTemplate.postForEntity(getV0ApiUrl("/auth/login"), entity, Map.class);
+
+ if (response.getStatusCode() != HttpStatus.OK) {
+ logError("일반 사용자 로그인 실패: " + response.getStatusCode());
+ throw new RuntimeException("Regular user login failed for logout test");
+ }
+
+ logSuccess("일반 사용자 로그인 완료 (로그아웃 테스트용)");
+ }
+}
diff --git a/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java b/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java
index a873d2d5..1cf10e95 100644
--- a/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java
+++ b/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java
@@ -7,7 +7,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.http.*;
@@ -116,52 +115,6 @@ void completeUserRegistrationFlow() throws Exception {
logCompletion("ERP 사용자 등록 플로우");
}
- @Disabled
- @DisplayName("로그인 없이 리소스 접근 시 모든 요청 차단")
- void accessResourcesWithoutLogin_shouldFailForAll() {
- logStep(1, "인증 없이 조직 목록 조회 시도");
-
- // 1. 로그인 없이 조직 목록 조회 시도
- ResponseEntity orgResponse =
- restTemplate.getForEntity(getV0ApiUrl("/organizations"), Map.class);
-
- assertThat(orgResponse.getStatusCode()).isIn(HttpStatus.UNAUTHORIZED, HttpStatus.FORBIDDEN);
- logSuccess("미인증 조직 조회 차단 확인");
-
- logStep(2, "인증 없이 조직 옵션 조회 시도");
-
- // 2. 로그인 없이 조직 옵션 조회 시도
- ResponseEntity optResponse =
- restTemplate.getForEntity(getV0ApiUrl("/organizations/1/options"), Map.class);
-
- assertThat(optResponse.getStatusCode()).isIn(HttpStatus.UNAUTHORIZED, HttpStatus.FORBIDDEN);
- logSuccess("미인증 옵션 조회 차단 확인");
-
- logStep(3, "인증 없이 회원가입 시도");
-
- // 3. 로그인 없이 회원가입 시도
- Map registerRequest = new HashMap<>();
- registerRequest.put("name", "테스트사용자");
- registerRequest.put("email", "test@example.com");
- registerRequest.put("orgId", 1);
- registerRequest.put("deptId", 2);
- registerRequest.put("positionId", 5);
- registerRequest.put("roleIds", Arrays.asList(6));
-
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_JSON);
-
- HttpEntity> entity = new HttpEntity<>(registerRequest, headers);
-
- ResponseEntity regResponse =
- restTemplate.postForEntity(getV0ApiUrl("/auth/register"), entity, Map.class);
-
- assertThat(regResponse.getStatusCode()).isIn(HttpStatus.UNAUTHORIZED, HttpStatus.FORBIDDEN);
- logSuccess("미인증 회원가입 차단 확인");
-
- logCompletion("ERP 보안 검증");
- }
-
@Test
@DisplayName("잘못된 자격증명으로 로그인 시도 시 실패")
void loginWithInvalidCredentials_shouldFail() {
@@ -200,7 +153,7 @@ void loginWithInvalidCredentials_shouldFail() {
}
@SuppressWarnings("unchecked")
- @Disabled
+ @Test
@DisplayName("중복 이메일로 사용자 등록 시도 시 실패")
void register_withDuplicateEmail_shouldFail() {
// 선행 조건: 관리자 로그인
diff --git a/apps/user-service/src/test/java/site/icebang/e2e/setup/config/E2eTestConfiguration.java b/apps/user-service/src/test/java/site/icebang/e2e/setup/config/E2eTestConfiguration.java
index 4976d0b8..dd5e0d1a 100644
--- a/apps/user-service/src/test/java/site/icebang/e2e/setup/config/E2eTestConfiguration.java
+++ b/apps/user-service/src/test/java/site/icebang/e2e/setup/config/E2eTestConfiguration.java
@@ -5,8 +5,12 @@
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.MariaDBContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
+import org.testcontainers.utility.DockerImageName;
@TestConfiguration(proxyBeanMethods = false)
public class E2eTestConfiguration {
@@ -15,6 +19,11 @@ public ObjectMapper objectMapper() {
return new ObjectMapper();
}
+ @Bean
+ public Network testNetwork() {
+ return Network.newNetwork();
+ }
+
@Bean
@ServiceConnection
MariaDBContainer mariadbContainer() {
@@ -24,8 +33,20 @@ MariaDBContainer mariadbContainer() {
.withPassword("qwer1234");
}
+ @Bean
+ GenericContainer lokiContainer(Network network) {
+ return new GenericContainer<>(DockerImageName.parse("grafana/loki:2.9.0"))
+ .withNetwork(network)
+ .withNetworkAliases("loki")
+ .withExposedPorts(3100)
+ .withCommand("-config.file=/etc/loki/local-config.yaml")
+ .waitingFor(Wait.forHttp("/ready"))
+ .withStartupTimeout(java.time.Duration.ofMinutes(2));
+ }
+
@DynamicPropertySource
- static void configureProperties(DynamicPropertyRegistry registry, MariaDBContainer mariadb) {
+ static void configureProperties(
+ DynamicPropertyRegistry registry, MariaDBContainer mariadb, GenericContainer loki) {
// MariaDB 연결 설정
registry.add("spring.datasource.url", mariadb::getJdbcUrl);
registry.add("spring.datasource.username", mariadb::getUsername);
@@ -39,5 +60,7 @@ static void configureProperties(DynamicPropertyRegistry registry, MariaDBContain
registry.add("spring.hikari.maximum-pool-size", () -> "10");
registry.add("spring.hikari.minimum-idle", () -> "5");
registry.add("spring.hikari.pool-name", () -> "HikariCP-E2E");
+
+ System.setProperty("loki.port", String.valueOf(loki.getMappedPort(3100)));
}
}
diff --git a/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupport.java b/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupport.java
index c2d10870..56a1259f 100644
--- a/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupport.java
+++ b/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupport.java
@@ -5,6 +5,7 @@
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
+import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.context.WebApplicationContext;
import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
@@ -15,6 +16,7 @@
@Import(E2eTestConfiguration.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@E2eTest
+@Sql(value = "classpath:sql/00-truncate.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS)
public abstract class E2eTestSupport {
@Autowired protected TestRestTemplate restTemplate;
diff --git a/apps/user-service/src/test/java/site/icebang/integration/tests/auth/AuthApiIntegrationTest.java b/apps/user-service/src/test/java/site/icebang/integration/tests/auth/AuthApiIntegrationTest.java
index 5c538105..4fe3b00d 100644
--- a/apps/user-service/src/test/java/site/icebang/integration/tests/auth/AuthApiIntegrationTest.java
+++ b/apps/user-service/src/test/java/site/icebang/integration/tests/auth/AuthApiIntegrationTest.java
@@ -13,6 +13,7 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.http.*;
+import org.springframework.mock.web.MockHttpSession;
import org.springframework.restdocs.payload.JsonFieldType;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.transaction.annotation.Transactional;
@@ -79,4 +80,62 @@ void login_success() throws Exception {
.description("HTTP 상태"))
.build())));
}
+
+ @Test
+ @DisplayName("사용자 로그아웃 성공")
+ void logout_success() throws Exception {
+ // given - 먼저 로그인
+ Map loginRequest = new HashMap<>();
+ loginRequest.put("email", "admin@icebang.site");
+ loginRequest.put("password", "qwer1234!A");
+
+ MockHttpSession session = new MockHttpSession();
+
+ // 로그인 먼저 수행
+ mockMvc
+ .perform(
+ post(getApiUrlForDocs("/v0/auth/login"))
+ .contentType(MediaType.APPLICATION_JSON)
+ .session(session)
+ .content(objectMapper.writeValueAsString(loginRequest)))
+ .andExpect(status().isOk());
+
+ // when & then - 로그아웃 수행
+ mockMvc
+ .perform(
+ post(getApiUrlForDocs("/v0/auth/logout"))
+ .contentType(MediaType.APPLICATION_JSON)
+ .session(session)
+ .header("Origin", "https://admin.icebang.site")
+ .header("Referer", "https://admin.icebang.site/"))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.success").value(true))
+ .andExpect(jsonPath("$.status").value("OK"))
+ .andExpect(jsonPath("$.message").value("OK"))
+ .andExpect(jsonPath("$.data").isEmpty())
+ .andDo(
+ document(
+ "auth-logout",
+ preprocessRequest(prettyPrint()),
+ preprocessResponse(prettyPrint()),
+ resource(
+ ResourceSnippetParameters.builder()
+ .tag("Authentication")
+ .summary("사용자 로그아웃")
+ .description("현재 인증된 사용자의 세션을 무효화합니다")
+ .responseFields(
+ fieldWithPath("success")
+ .type(JsonFieldType.BOOLEAN)
+ .description("요청 성공 여부"),
+ fieldWithPath("data")
+ .type(JsonFieldType.NULL)
+ .description("응답 데이터 (로그아웃 성공 시 null)"),
+ fieldWithPath("message")
+ .type(JsonFieldType.STRING)
+ .description("응답 메시지"),
+ fieldWithPath("status")
+ .type(JsonFieldType.STRING)
+ .description("HTTP 상태"))
+ .build())));
+ }
}
diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml
index c0bf14fd..c69ea697 100644
--- a/docker/local/docker-compose.yml
+++ b/docker/local/docker-compose.yml
@@ -33,5 +33,40 @@ services:
depends_on:
- mariadb
+ loki:
+ image: grafana/loki:2.9.0
+ container_name: loki
+ restart: unless-stopped
+ ports:
+ - "3100:3100"
+ command: -config.file=/etc/loki/local-config.yaml
+ volumes:
+ - loki_data:/loki
+ healthcheck:
+ test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1"]
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
+ grafana:
+ image: grafana/grafana:10.1.0
+ container_name: grafana
+ restart: unless-stopped
+ environment:
+ - GF_SECURITY_ADMIN_PASSWORD=admin
+ ports:
+ - "3030:3000"
+ volumes:
+ - grafana_data:/var/lib/grafana
+ depends_on:
+ - loki
+ healthcheck:
+ test: ["CMD-SHELL", "curl -f http://localhost:3000/api/health || exit 1"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+
volumes:
- mariadb_data:
\ No newline at end of file
+ mariadb_data:
+ loki_data:
+ grafana_data:
\ No newline at end of file
diff --git a/docker/production/docker-compose.yml b/docker/production/docker-compose.yml
index 659934c7..f3016096 100644
--- a/docker/production/docker-compose.yml
+++ b/docker/production/docker-compose.yml
@@ -38,10 +38,14 @@ services:
- app-network
env_file:
- .env.prod
+ volumes:
+ - onnx_models:/app/models # ONNX 모델 저장용 볼륨 -> 서버에 만들어야함
volumes:
caddy_data:
caddy_config:
+ onnx_models:
+ driver: local
networks:
app-network:
diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 00000000..3557bc5a
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand.
+package = []
+
+[metadata]
+lock-version = "2.1"
+python-versions = ">=3.11"
+content-hash = "f5666f5625d676c506924a57dc0520a1f3ed2b2c774baed3dc85353594f8473d"