Release user-service-v0.0.1-beta-SNAPSHOT

.github/workflows/ci-python.yml

@@ -2,6 +2,8 @@ name: CI (Python/FastAPI)
 
 on:
   push:
+    branches:
+      - feature/onnx
     tags:
       - 'pre-processing-v*'
   pull_request:

.github/workflows/deploy-java.yml

@@ -28,6 +28,9 @@ jobs:
           echo "DB_USER=${{ secrets.DB_USER }}" >> .env.prod
           echo "DB_PASS=${{ secrets.DB_PASS }}" >> .env.prod
           echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env.prod
+          echo "ENV_NAME=${{ secrets.LOKI_URL }}" >> .env.prod
+          echo "ENV_NAME=${{ secrets.LOKI_USERNAME }}" >> .env.prod
+          echo "ENV_NAME=${{ secrets.LOKI_PASSWORD }}" >> .env.prod
           echo "ENV_NAME=${{ secrets.ENV_NAME }}" >> .env.prod
 
       - name: Set repo lowercase
@@ -52,6 +55,27 @@ jobs:
           target: "~/app/docker/production/"
           overwrite: true
 
+      - name: Copy Caddyfile to EC2
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ubuntu
+          key: ${{ secrets.SERVER_SSH_KEY }}
+          source: "docker/production/Caddyfile"
+          target: "~/app/docker/production/"
+          overwrite: true
+
+      - name: Copy promtail-config to EC2
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ubuntu
+          key: ${{ secrets.SERVER_SSH_KEY }}
+          source: "docker/production/promtail-config.yml"
+          target: "~/app/docker/production/"
+          overwrite: true
+
+
       - name: Deploy on EC2
         uses: appleboy/ssh-action@v1.0.3
         with:

apps/pre-processing-service/app/api/endpoints/blog.py

@@ -4,16 +4,16 @@
 from ...model.schemas import *
 from app.service.blog.tistory_blog_post_service import TistoryBlogPostService
 from app.service.blog.naver_blog_post_service import NaverBlogPostService
-from ...service.blog.blogger_blog_post_service import BloggerBlogPostService
+from ...service.blog.blogger_blog_post_adapter import (
+    BloggerBlogPostAdapter,
+)  # 수정된 import
+from app.utils.response import Response
+from app.service.blog.blog_create_service import BlogContentService
+from app.service.blog.blog_publish_service import BlogPublishService
 
 router = APIRouter()
 
 
-@router.get("/", summary="블로그 API 상태 확인")
-async def root():
-    return {"message": "blog API"}
-
-
 @router.post(
     "/rag/create",
     response_model=ResponseBlogCreate,
@@ -23,7 +23,10 @@ async def rag_create(request: RequestBlogCreate):
     """
     RAG 기반 블로그 콘텐츠 생성
     """
-    return {"message": "blog API"}
+    blog_service = BlogContentService()
+    response_data = blog_service.generate_blog_content(request)
+
+    return Response.ok(response_data)
 
 
 @router.post(
@@ -37,52 +40,7 @@ async def publish(request: RequestBlogPublish):
     네이버 블로그와 티스토리 블로그를 지원하며,
     현재는 생성된 콘텐츠가 아닌 임의의 제목, 내용, 태그를 배포합니다.
     """
-    if request.tag == "naver":
-        naver_service = NaverBlogPostService()
-        result = naver_service.post_content(
-            title=request.post_title,
-            content=request.post_content,
-            tags=request.post_tags,
-        )
-
-        if not result:
-            raise CustomException(
-                "네이버 블로그 포스팅에 실패했습니다.", status_code=500
-            )
-        return ResponseBlogPublish(
-            job_id=1, schedule_id=1, schedule_his_id=1, status="200", metadata=result
-        )
-
-    elif request.tag == "tistory":
-        tistory_service = TistoryBlogPostService()
-        result = tistory_service.post_content(
-            title=request.post_title,
-            content=request.post_content,
-            tags=request.post_tags,
-        )
-
-        if not result:
-            raise CustomException(
-                "티스토리 블로그 포스팅에 실패했습니다.", status_code=500
-            )
-
-        return ResponseBlogPublish(
-            job_id=1, schedule_id=1, schedule_his_id=1, status="200", metadata=result
-        )
-
-    elif request.tag == "blogger":
-        blogger_service = BloggerBlogPostService()
-        result = blogger_service.post_content(
-            title=request.post_title,
-            content=request.post_content,
-            tags=request.post_tags,
-        )
-
-        if not result:
-            raise CustomException(
-                "블로거 블로그 포스팅에 실패했습니다.", status_code=500
-            )
+    publish_service = BlogPublishService()
+    response_data = publish_service.publish_content(request)
 
-        return ResponseBlogPublish(
-            job_id=1, schedule_id=1, schedule_his_id=1, status="200", metadata=result
-        )
+    return Response.ok(response_data)

apps/pre-processing-service/app/api/endpoints/keywords.py

@@ -6,14 +6,6 @@
 router = APIRouter()
 
 
-@router.get("/", summary="키워드 API 상태 확인")
-async def root():
-    """
-    키워드 API가 정상 동작하는지 확인
-    """
-    return {"message": "keyword API"}
-
-
 @router.post(
     "/search", response_model=ResponseNaverSearch, summary="네이버 키워드 검색"
 )
@@ -23,9 +15,6 @@ async def search(request: RequestNaverSearch):
 
     요청 예시:
     {
-        "job_id": 1,
-        "schedule_id": 1,
-        "schedule_his_id": 1,
         "tag": "naver",
         "category": "50000000",
         "start_date": "2025-09-01",
@@ -34,15 +23,3 @@ async def search(request: RequestNaverSearch):
     """
     response_data = await keyword_search(request)
     return response_data
-
-
-@router.post(
-    "/ssadagu/validate",
-    response_model=ResponseNaverSearch,
-    summary="사다구몰 키워드 검증",
-)
-async def ssadagu_validate(request: RequestNaverSearch):
-    """
-    사다구몰 키워드 검증 테스트용 엔드포인트
-    """
-    return ResponseNaverSearch()

apps/pre-processing-service/app/api/endpoints/product.py

@@ -8,6 +8,7 @@
 from ...service.crawl_service import CrawlService
 from ...service.search_service import SearchService
 from ...service.match_service import MatchService
+from ...service.similarity_service import SimilarityService
 
 
 # from ...service.similarity_service import SimilarityService
@@ -16,27 +17,19 @@
 router = APIRouter()
 
 
-@router.get("/", summary="상품 API 상태 확인")
-async def root():
-    """
-    상품 API 서버 상태 확인용 엔드포인트
-    """
-    return {"message": "product API"}
-
-
 @router.post("/search", response_model=ResponseSadaguSearch, summary="상품 검색")
 async def search(request: RequestSadaguSearch):
     """
     요청된 키워드로 사다구몰 상품을 검색합니다.
     """
     try:
         search_service = SearchService()
-        result = await search_service.search_products(request)
+        response_data = await search_service.search_products(request)
 
-        if not result:
+        if not response_data:
             raise CustomException(500, "상품 검색에 실패했습니다.", "SEARCH_FAILED")
 
-        return result
+        return response_data
     except InvalidItemDataException as e:
         raise HTTPException(status_code=e.status_code, detail=e.detail)
     except Exception as e:
@@ -50,56 +43,56 @@ async def match(request: RequestSadaguMatch):
     """
     try:
         match_service = MatchService()
-        result = match_service.match_products(request)
+        response_data = match_service.match_products(request)
 
-        if not result:
+        if not response_data:
             raise CustomException(500, "상품 매칭에 실패했습니다.", "MATCH_FAILED")
 
-        return result
+        return response_data
     except InvalidItemDataException as e:
         raise HTTPException(status_code=e.status_code, detail=e.detail)
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
 
-# @router.post(
-#     "/similarity", response_model=ResponseSadaguSimilarity, summary="상품 유사도 분석"
-# )
-# async def similarity(request: RequestSadaguSimilarity):
-#     """
-#     매칭된 상품들 중 키워드와의 유사도를 계산하여 최적의 상품을 선택합니다.
-#     """
-#     try:
-#         similarity_service = SimilarityService()
-#         result = similarity_service.select_product_by_similarity(request)
-#
-#         if not result:
-#             raise CustomException(
-#                 500, "유사도 분석에 실패했습니다.", "SIMILARITY_FAILED"
-#             )
-#
-#         return result
-#     except InvalidItemDataException as e:
-#         raise HTTPException(status_code=e.status_code, detail=e.detail)
-#     except Exception as e:
-#         raise HTTPException(status_code=500, detail=str(e))
+@router.post(
+    "/similarity", response_model=ResponseSadaguSimilarity, summary="상품 유사도 분석"
+)
+async def similarity(request: RequestSadaguSimilarity):
+    """
+    매칭된 상품들 중 키워드와의 유사도를 계산하여 최적의 상품을 선택합니다.
+    """
+    try:
+        similarity_service = SimilarityService()
+        response_data = similarity_service.select_product_by_similarity(request)
+
+        if not response_data:
+            raise CustomException(
+                500, "유사도 분석에 실패했습니다.", "SIMILARITY_FAILED"
+            )
+
+        return response_data
+    except InvalidItemDataException as e:
+        raise HTTPException(status_code=e.status_code, detail=e.detail)
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
 
 
 @router.post(
     "/crawl", response_model=ResponseSadaguCrawl, summary="상품 상세 정보 크롤링"
 )
-async def crawl(request: Request, body: RequestSadaguCrawl):
+async def crawl(body: RequestSadaguCrawl):
     """
     상품 상세 페이지를 크롤링하여 상세 정보를 수집합니다.
     """
     try:
         crawl_service = CrawlService()
-        result = await crawl_service.crawl_product_detail(body)
+        response_data = await crawl_service.crawl_product_detail(body)
 
-        if not result:
+        if not response_data:
             raise CustomException(500, "상품 크롤링에 실패했습니다.", "CRAWL_FAILED")
 
-        return result
+        return response_data
     except InvalidItemDataException as e:
         raise HTTPException(status_code=e.status_code, detail=e.detail)
     except ItemNotFoundException as e:

apps/pre-processing-service/app/api/endpoints/sample.py

@@ -0,0 +1,45 @@
+from fastapi import APIRouter
+from ...model.schemas import *
+from app.utils.response import Response
+
+router = APIRouter()
+
+
+@router.get("/")
+async def root():
+    return {"message": "sample API"}
+
+
+@router.post("/keywords/search", summary="네이버 키워드 검색")
+async def search(request: RequestNaverSearch):
+    return Response.ok({"test": "hello world"})
+
+
+@router.post("/blogs/rag/create", summary="RAG 기반 블로그 콘텐츠 생성")
+async def rag_create(request: RequestBlogCreate):
+    return Response.ok({"test": "hello world"})
+
+
+@router.post("/blogs/publish", summary="블로그 콘텐츠 배포")
+async def publish(request: RequestBlogPublish):
+    return Response.ok({"test": "hello world"})
+
+
+@router.post("/products/search", summary="상품 검색")
+async def product_search(request: RequestSadaguSearch):
+    return Response.ok({"test": "hello world"})
+
+
+@router.post("/products/match", summary="상품 매칭")
+async def product_match(request: RequestSadaguMatch):
+    return Response.ok({"test": "hello world"})
+
+
+@router.post("/products/similarity", summary="상품 유사도 분석")
+async def product_similarity(request: RequestSadaguSimilarity):
+    return Response.ok({"test": "hello world"})
+
+
+@router.post("/products/crawl", summary="상품 상세 정보 크롤링")
+async def product_crawl(request: RequestSadaguCrawl):
+    return Response.ok({"test": "hello world"})