Merge pull request #25 from TreeNut-KR/develop

v0.2.0 (Develop 병합)

Author: CutTheWire

.gitattributes

@@ -0,0 +1 @@
+gradlew text eol=lf

.github/workflows/build-and-push.yml

@@ -49,7 +49,10 @@ jobs:
           # FastAPI 관련 .env 파일 생성
           mkdir -p fastapi/sources
           echo "${{ secrets.FASTAPI_ENV }}" > ./fastapi/sources/.env
-        
+
+          # springboot 관련 application.properties 파일 생성
+          mkdir -p ./springboot/src/main/resources
+          echo "${{ secrets.SPRING_ENV }}" > ./springboot/src/main/resources/application.properties
 
       - name: Build and push Nginx image
         uses: docker/build-push-action@v3
@@ -86,3 +89,12 @@ jobs:
           tags: |
             ghcr.io/treenut-kr/mongodb:latest
             ghcr.io/treenut-kr/mongodb:${{ github.ref_name }}
+
+      - name: Build and push SpringBoot image
+        uses: docker/build-push-action@v3 
+        with:
+          context: ./springboot
+          push: true
+          tags: |
+            ghcr.io/treenut-kr/springboot:latest
+            ghcr.io/treenut-kr/springboot:${{ github.ref_name }}

.gitignore

@@ -191,7 +191,7 @@ cython_debug/
 # PyCharm
 
 
-
+springboot/src/main/resources/application.properties
 springboot/gradlew
 springboot/HELP.md
 springboot/.gradle
@@ -230,3 +230,6 @@ springboot/.nb-gradle/
 
 ### VS Code ###
 springboot/.vscode/
+springboot/gradlew
+springboot/.gradle/8.8/fileHashes/fileHashes.bin
+springboot/.gradle/8.8/fileHashes/fileHashes.lock

.vscode/settings.json

@@ -1,21 +1,27 @@
 import os
+from pydantic import ValidationError
 from contextlib import asynccontextmanager
 
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.utils import get_openapi
-from pydantic import ValidationError
+
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.responses import JSONResponse
+
 from utils.DB_mongo import MongoDBHandler
 from utils.DB_mysql import MySQLDBHandler
-from utils.Error_handlers import (BadRequestException,
-                                  InternalServerErrorException,
-                                  NotFoundException, add_exception_handlers)
-from utils.Models import (ChatLog_Update_Request, ChatLog_Create_Request,
-                          ChatLog_Delete_Request, ChatRoom_Delete_Request,
-                          ChatLog_Identifier_Request, ChatLog_Id_Request,
-                          ChatData_Response, Validators)
+from utils.Error_handlers import (
+    BadRequestException,
+    InternalServerErrorException,
+    NotFoundException, add_exception_handlers
+)
+from utils.Models import (Validators,
+    Identifier_Request, Log_Delete_Request,
+    Room_Delete_Request, Id_Request, Response,
+    Office_Create_Request, Office_Update_Request,
+    ChatBot_Create_Request, ChatBot_Update_Request,
+)
 
 from fastapi import APIRouter, FastAPI, HTTPException, Query, Request
 
@@ -69,30 +75,17 @@ def _get_error_detail(self, exception: Exception) -> str:
     allow_methods=["*"],
     allow_headers=["*"],
 )
-
 def custom_openapi():
     if app.openapi_schema:
         return app.openapi_schema
 
     openapi_schema = get_openapi(
         title="ChatBot FastAPI",
-        version="v0.1.0-dev",
+        version="v0.2.0",
         summary="쳇봇 데이터 관리 API (개발 중인 버전)",
         routes=app.routes,
         description=(
             "이 API는 다음과 같은 기능을 제공합니다:\n\n"
-            "1. **유저 채팅 문서 생성**\n"
-            "   - **Endpoint**: `GET /chat/create`\n"
-            "   - **설명**: MongoDB에 새로운 유저 채팅 문서(채팅 로그)를 생성합니다.\n\n"
-            "2. **유저 채팅 저장**\n"
-            "   - **Endpoint**: `POST /chat/save_log`\n"
-            "   - **설명**: MongoDB의 생성된 문서에 유저의 채팅 데이터를 저장합니다.\n\n"
-            "3. **데이터베이스 목록 조회**\n"
-            "   - **Endpoint**: `GET /database/names`\n"
-            "   - **설명**: MongoDB 서버에 있는 데이터베이스 목록을 조회합니다.\n\n"
-            "4. **데이터베이스 컬렉션 목록 조회**\n"
-            "   - **Endpoint**: `GET /database/collections`\n"
-            "   - **설명**: 현재 데이터베이스의 컬렉션 목록을 조회합니다.\n\n"
             "각 엔드포인트의 자세한 정보는 해당 엔드포인트의 문서에서 확인할 수 있습니다."
         ),
     )
@@ -101,11 +94,9 @@ def custom_openapi():
     }
     app.openapi_schema = openapi_schema
     return app.openapi_schema
-
 app.openapi = custom_openapi
 
-# MySQL 관련 라우터 정의
-mysql_router = APIRouter()
+mysql_router = APIRouter() # MySQL 관련 라우터 정의
 
 @mysql_router.get("/tables", summary="테이블 목록 가져오기")
 async def list_tables():
@@ -141,8 +132,7 @@ async def execute_query(query: str):
     responses={500: {"description": "Internal Server Error"}}
 )
 
-# MongoDB 관련 라우터 정의
-mongo_router = APIRouter()
+mongo_router = APIRouter() # MySQL 관련 라우터 정의
 
 @mongo_router.get("/db", summary="데이터베이스 목록 가져오기")
 async def list_databases():
@@ -166,19 +156,140 @@ async def list_collections(db_name: str = Query(..., description="데이터베
     except Exception as e:
         raise InternalServerErrorException(detail=str(e))
 
-@mongo_router.post("/chat/create", summary="유저 채팅방 ID 생성")
-async def create_chat(request: ChatLog_Id_Request):
+office_router = APIRouter() # Office 관련 라우터 정의
+
+@office_router.post("/create", summary="유저 채팅방 ID 생성")
+async def create_chat(request: Id_Request):
+    '''
+    새로운 유저 채팅 문서(채팅 로그)를 MongoDB에 생성합니다.
+    '''
+    try:
+        document_id = await mongo_handler.create_office_collection(user_id=request.user_id)
+        return {"Document ID": document_id}
+    except Exception as e:
+        raise InternalServerErrorException(detail=str(e))
+
+@office_router.put("/save_log", summary="유저 채팅 저장")
+async def save_chat_log(request: Office_Create_Request):
+    '''
+    생성된 채팅 문서에 유저의 채팅 데이터를 저장합니다.
+    '''
+    try:
+        request_data = request.model_dump()
+        filtered_data = {key: value for key, value in request_data.items() if key != 'id'}
+        
+        response_message = await mongo_handler.add_office_log(
+            user_id=request.user_id,
+            document_id=request.id,
+            new_data=filtered_data
+        )
+        return {"Result": response_message}
+    except ValidationError as e:
+        raise BadRequestException(detail=str(e))
+    except NotFoundException as e:
+        raise NotFoundException(detail=str(e))
+    except Exception as e:
+        raise InternalServerErrorException(detail=str(e))
+    
+@office_router.put("/update_log", summary="유저 채팅 업데이트")
+async def update_chat_log(request: Office_Update_Request):
+    '''
+    기존 채팅 문서에 유저의 채팅 데이터를 수정합니다.
+    '''
+    try:
+        request_data = request.model_dump()
+        filtered_data = {key: value for key, value in request_data.items() if key != 'id'}
+        
+        response_message = await mongo_handler.update_office_log(
+            user_id=request.user_id,
+            document_id=request.id,
+            new_Data=filtered_data
+        )
+        return {"Result": response_message}
+    except ValidationError as e:
+        raise BadRequestException(detail=str(e))
+    except NotFoundException as e:
+        raise NotFoundException(detail=str(e))
+    except Exception as e:
+        raise InternalServerErrorException(detail=str(e))
+    
+
+@office_router.post("/load_log", response_model=Response, summary="유저 채팅 불러오기")
+async def load_chat_log(request: Identifier_Request) -> Response:
+    '''
+    생성된 채팅 문서의 채팅 로그를 MongoDB에서 불러옵니다.
+    '''
+    try:
+        chat_logs = await mongo_handler.get_office_log(
+            user_id=request.user_id,
+            document_id=request.id
+        )
+
+        response_data = Response(
+            id=request.id,
+            value=chat_logs
+        )
+        
+        return response_data
+    except ValidationError as e:
+        raise BadRequestException(detail=str(e))
+    except NotFoundException as e:
+        raise NotFoundException(detail=str(e))
+    except Exception as e:
+        raise InternalServerErrorException(detail=str(e))
+    
+@office_router.delete("/delete_log", summary="유저 채팅 일부 지우기")
+async def delete_chat_log(request: Log_Delete_Request):
+    '''
+    최신 대화 ~ 선택된 채팅을 로그에서 삭제합니다.
+    '''
+    try:
+        response_message = await mongo_handler.remove_office_log(
+            user_id=request.user_id,
+            document_id=request.id,
+            selected_count=request.index
+        )
+        return {"Result": response_message}
+    except ValidationError as e:
+        raise BadRequestException(detail=str(e))
+    except NotFoundException as e:
+        raise NotFoundException(detail=str(e))
+    except Exception as e:
+        raise InternalServerErrorException(detail=str(e))
+    
+@office_router.delete("/delete_room", summary="유저 채팅 지우기")
+async def delete_chat_room(request: Room_Delete_Request):
+    '''
+    유저의 채팅방을 삭제합니다.
+    '''
+    try:
+        response_message = await mongo_handler.remove_office_collection(
+            user_id=request.user_id,
+            document_id=request.id
+        )
+        return {"Result": response_message}
+    except ValidationError as e:
+        raise BadRequestException(detail=str(e))
+    except NotFoundException as e:
+        raise NotFoundException(detail=str(e))
+    except Exception as e:
+        raise InternalServerErrorException(detail=str(e))
+    
+chatbot_router = APIRouter() # Chatbot 관련 라우터 정의
+
+@chatbot_router.post("/create", summary="유저 채팅방 ID 생성")
+async def create_chat(request: Id_Request):
     '''
     새로운 유저 채팅 문서(채팅 로그)를 MongoDB에 생성합니다.
     '''
     try:
-        document_id = await mongo_handler.create_chatlog_collection(user_id=request.user_id)
+        document_id = await mongo_handler.create_chatbot_collection(user_id=request.user_id)
         return {"Document ID": document_id}
     except Exception as e:
         raise InternalServerErrorException(detail=str(e))
 
-@mongo_router.put("/chat/save_log", summary="유저 채팅 저장")
-async def save_chat_log(request: ChatLog_Create_Request):
+@chatbot_router.put("/save_log", summary="유저 채팅 저장")
+async def save_chat_log(request: ChatBot_Create_Request):
     '''
     생성된 채팅 문서에 유저의 채팅 데이터를 저장합니다.
     '''
@@ -187,7 +298,7 @@ async def save_chat_log(request: ChatLog_Create_Request):
         request_data = request.model_dump()
         filtered_data = {key: value for key, value in request_data.items() if key != 'id'}
 
-        response_message = await mongo_handler.add_chatlog_value(
+        response_message = await mongo_handler.add_chatbot_log(
             user_id=request.user_id,
             document_id=request.id,
             new_data=filtered_data
@@ -200,8 +311,8 @@ async def save_chat_log(request: ChatLog_Create_Request):
     except Exception as e:
         raise InternalServerErrorException(detail=str(e))
 
-@mongo_router.put("/chat/update_log", summary="유저 채팅 업데이트")
-async def update_chat_log(request: ChatLog_Update_Request):
+@chatbot_router.put("/update_log", summary="유저 채팅 업데이트")
+async def update_chat_log(request: ChatBot_Update_Request):
     '''
     기존 채팅 문서에 유저의 채팅 데이터를 수정합니다.
     '''
@@ -210,7 +321,7 @@ async def update_chat_log(request: ChatLog_Update_Request):
         request_data = request.model_dump()
         filtered_data = {key: value for key, value in request_data.items() if key != 'id'}
 
-        response_message = await mongo_handler.update_chatlog_value(
+        response_message = await mongo_handler.update_chatbot_log(
             user_id=request.user_id,
             document_id=request.id,
             new_Data=filtered_data
@@ -224,18 +335,18 @@ async def update_chat_log(request: ChatLog_Update_Request):
         raise InternalServerErrorException(detail=str(e))
 
 
-@mongo_router.post("/chat/load_log", response_model=ChatData_Response, summary="유저 채팅 불러오기")
-async def load_chat_log(request: ChatLog_Identifier_Request) -> ChatData_Response:
+@chatbot_router.post("/load_log", response_model=Response, summary="유저 채팅 불러오기")
+async def load_chat_log(request: Identifier_Request) -> Response:
     '''
     생성된 채팅 문서의 채팅 로그를 MongoDB에서 불러옵니다.
     '''
     try:
-        chat_logs = await mongo_handler.get_chatlog_value(
+        chat_logs = await mongo_handler.get_chatbot_log(
             user_id=request.user_id,
             document_id=request.id
 
         )
-        response_data = ChatData_Response(
+        response_data = Response(
             id=request.id,
             value=chat_logs
         )
@@ -247,13 +358,13 @@ async def load_chat_log(request: ChatLog_Identifier_Request) -> ChatData_Respons
     except Exception as e:
         raise InternalServerErrorException(detail=str(e))
 
-@mongo_router.delete("/chat/delete_log", summary="유저 채팅 일부 지우기")
-async def delete_chat_log(request: ChatLog_Delete_Request):
+@chatbot_router.delete("/delete_log", summary="유저 채팅 일부 지우기")
+async def delete_chat_log(request: Log_Delete_Request):
     '''
     최신 대화 ~ 선택된 채팅을 로그에서 삭제합니다.
     '''
     try:
-        response_message = await mongo_handler.remove_chatlog_value(
+        response_message = await mongo_handler.remove_chatbot_log(
             user_id=request.user_id,
             document_id=request.id,
             selected_count=request.index
@@ -266,13 +377,13 @@ async def delete_chat_log(request: ChatLog_Delete_Request):
     except Exception as e:
         raise InternalServerErrorException(detail=str(e))
 
-@mongo_router.delete("/chat/delete_room", summary="유저 채팅 지우기")
-async def delete_chat_room(request: ChatRoom_Delete_Request):
+@chatbot_router.delete("/delete_room", summary="유저 채팅 지우기")
+async def delete_chat_room(request: Room_Delete_Request):
     '''
     유저의 채팅방을 삭제합니다.
     '''
     try:
-        response_message = await mongo_handler.remove_chatroom_value(
+        response_message = await mongo_handler.remove_chatbot_collection(
             user_id=request.user_id,
             document_id=request.id
         )
@@ -284,20 +395,18 @@ async def delete_chat_room(request: ChatRoom_Delete_Request):
     except Exception as e:
         raise InternalServerErrorException(detail=str(e))
 
+# mongo_router에 세분화된 라우터 추가
+mongo_router.include_router(office_router, prefix="/office", tags=["MongoDB Router / Office Router"])
+mongo_router.include_router(chatbot_router, prefix="/chatbot", tags=["MongoDB Router / Chatbot Router"])
+
+# FastAPI 애플리케이션에 mongo_router를 추가
 app.include_router(
     mongo_router,
     prefix="/mongo",
     tags=["MongoDB Router"],
     responses={500: {"description": "Internal Server Error"}}
 )
 
-@app.get("/")
-async def health_check():
-    '''
-    서버의 상태를 확인하는 헬스 체크 엔드포인트입니다.
-    '''
-    return {"Connection": "Success"}
-
 @app.middleware("http")
 async def catch_exceptions_middleware(request: Request, call_next):
     """