Merge pull request #44 from ResQ-404Found/feat/#43

[Notification] 재난 알림 발송 방식 변경 및 알림 설정(필터링) 구현

Author: ddoed

Dockerfile

@@ -6,7 +6,7 @@ COPY . /app/
 
 RUN pip install --upgrade pip && \
     pip install "fastapi[standard]" \
-    sqlmodel pymysql redis passlib[bcrypt] PyJWT requests pandas boto3 aiosmtplib cryptography apscheduler openai langchain langchain-openai celery firebase_admin
+    sqlmodel pymysql redis passlib[bcrypt] PyJWT requests pandas boto3 aiosmtplib cryptography apscheduler openai langchain langchain-openai firebase_admin
 
 RUN pip install cryptography
 

README.md

@@ -25,7 +25,6 @@ pip install apscheduler
 pip install openai
 pip install langchain
 pip install langchain-openai
-pip install celery
 pip install firebase_admin
 ```
 
@@ -81,58 +80,68 @@ project-root/
 │
 ├── app/
 │   ├── core/
+│   │   ├── firebase.py
 │   │   └── redis.py
 │   ├── db/               
 │   │   ├── session.py
 │   │   └── init_db.py
 │   ├── handlers/
+│   │   ├── chatbot_handler.py
 │   │   ├── comment_handler.py
 │   │   ├── disaster_handler.py
 │   │   ├── email_handler.py
+│   │   ├── fcm_handler.py
 │   │   ├── like_handler.py
+│   │   ├── notification_disastertype_handler.py
+│   │   ├── notification_handler.py
+│   │   ├── notification_region_handler.py
 │   │   ├── post_handler.py
 │   │   ├── shelter_handler.py
 │   │   └── user_handler.py
 │   ├── models/
+│   │   ├── chatbot_model.py
 │   │   ├── comment_model.py
 │   │   ├── disaster_model.py
-│   │   ├── region_model.py
 │   │   ├── disaster_region_model.py
 │   │   ├── like_model.py
+│   │   ├── notification_model.py
 │   │   ├── post_model.py
+│   │   ├── region_model.py
 │   │   ├── shelter_model.py
-│   │   ├── chatbot_model.py
-│   │   ├── notification_model.py
 │   │   └── user_model.py           
 │   ├── schemas/
+│   │   ├── chatbot_schema.py
 │   │   ├── comment_schema.py
 │   │   ├── common_schema.py
 │   │   ├── disaster_schema.py
 │   │   ├── email_schema.py
 │   │   ├── like_schema.py
+│   │   ├── notification_disastertype_schema.py
+│   │   ├── notification_region_schema.py
+│   │   ├── notification_schema.py
 │   │   ├── post_schema.py
 │   │   ├── shelter_schema.py
-│   │   ├── chatbot_schema.py
 │   │   └── user_schema.py          
 │   ├── services/
+│   │   ├── chatbot_service.py
 │   │   ├── comment_service.py
 │   │   ├── disaster_region_service.py
 │   │   ├── disaster_service.py
 │   │   ├── email_service.py 
+│   │   ├── fcm_service.py 
 │   │   ├── like_service.py 
+│   │   ├── notification_disastertype_service.py 
+│   │   ├── notification_region_service.py 
+│   │   ├── notification_service.py 
 │   │   ├── post_service.py
 │   │   ├── region_service.py
 │   │   ├── shelter_service.py
-│   │   ├── chatbot_service.py
-│   │   ├── notification_service.py
-│   │   └── user_service.py  
-│   ├── tasks/
-│   │   └── fcm_task.py   
+│   │   └── user_service.py   
 │   └── utils/
 │       ├── fcm_util.py
 │       ├── jwt_util.py
-│       ├── s3_util.py
-│       └── redis_util.py 
+│       ├── redis_util.py
+│       └── s3_util.py 
 ```
 
 ### 개발 버전 관리

app/core/firebase.py

@@ -0,0 +1,11 @@
+import firebase_admin
+from firebase_admin import credentials
+import os
+import json
+
+def init_firebase():
+    with open("secrets/firebase_service_account.json") as f:
+        cred_dict = json.load(f)
+    cred = credentials.Certificate(cred_dict)
+    firebase_admin.initialize_app(cred)
+    print("[INFO] Firebase Admin SDK Initialized!")

app/db/init_db.py

@@ -1,10 +1,12 @@
 from sqlmodel import SQLModel, Session
 from app.db.session import db_engine
+from app.models.notification_model import NotificationDisasterType, NotificationRegion
+from app.models.region_model import Region
 from app.models.user_model import User
 from app.schemas.user_schema import UserCreate
 from app.services.user_service import UserService
 from sqlalchemy import text
-# from app.services.user_service import pwd_context 
+from app.services.user_service import pwd_context 
 
 async def create_db_and_tables():
     # DB 리셋 함수, 필요에 따라 주석 해제
@@ -17,7 +19,7 @@ async def create_db_and_tables():
     SQLModel.metadata.create_all(db_engine)
 
 
-    # # 3. 테스트 유저 삽입
+    # 3. 테스트 유저 삽입
     # with Session(db_engine) as session:
     #     dummy_user = User(
     #         login_id="test",
@@ -29,4 +31,31 @@ async def create_db_and_tables():
     #         status="active"
     #     )
     #     session.add(dummy_user)
-    #     session.commit()
+    #     session.commit()
+    #     session.refresh(dummy_user)
+
+    #     region = Region(
+    #         sido="경상북도",
+    #         sigungu="의성군",
+    #     )
+    #     session.add(region)
+    #     session.commit()
+    #     session.refresh(region)
+
+    #     user_id = dummy_user.id
+    #     region_id = region.id
+    
+    # with Session(db_engine) as session:
+    #     notification_region = NotificationRegion(
+    #     user_id=user_id,
+    #     region_id=region_id
+    #     )
+    #     session.add(notification_region)
+    #     session.commit()
+
+    #     notification_disastertype = NotificationDisasterType(
+    #     user_id=user_id,
+    #     disaster_type="폭염"   # 예시: 원하는 재난 타입
+    #     )
+    #     session.add(notification_disastertype)
+    #     session.commit()

app/handlers/fcm_handler.py

@@ -0,0 +1,18 @@
+from fastapi import APIRouter, Depends
+
+from app.handlers.user_handler import get_current_user
+from app.models.user_model import User
+from app.schemas.common_schema import ApiResponse
+from app.schemas.user_schema import FCMTokenUpdate
+from app.services.fcm_service import FcmService
+
+router = APIRouter()
+
+@router.patch("/users/fcm-token", response_model_exclude_none=True)
+def update_fcm_token(
+    req: FCMTokenUpdate,
+    user: User=Depends(get_current_user),
+    fcm_service: FcmService = Depends()
+) -> ApiResponse[None]:
+    fcm_service.update_user_fcm_token(user,req.fcm_token)
+    return ApiResponse(message="FCM 토큰이 성공적으로 등록되었습니다.")

app/handlers/notification_disastertype_handler.py

@@ -0,0 +1,29 @@
+from fastapi import APIRouter, Depends, HTTPException
+from sqlmodel import Session
+
+from app.db.session import get_db_session
+from app.handlers.user_handler import get_current_user
+from app.models.user_model import User
+from app.schemas.notification_disastertype_schema import NotificationDisasterTypeCreate, NotificationDisasterTypeRead
+from app.services.notification_disastertype_service import (
+    create_notification_disastertype,
+    get_notification_disastertypes_by_user,
+    delete_notification_disastertype
+)
+
+router = APIRouter(prefix="/notification-disastertypes")
+
+@router.post("/", response_model=NotificationDisasterTypeRead)
+def create_disastertype(req: NotificationDisasterTypeCreate, user: User = Depends(get_current_user), session: Session = Depends(get_db_session)):
+    return create_notification_disastertype(session, user.id, req.disaster_type)
+
+@router.get("/", response_model=list[NotificationDisasterTypeRead])
+def get_user_disastertypes(user: User = Depends(get_current_user), session: Session = Depends(get_db_session)):
+    return get_notification_disastertypes_by_user(session, user.id)
+
+@router.delete("/{disastertype_id}")
+def delete_disastertype(disastertype_id: int, user: User = Depends(get_current_user), session: Session = Depends(get_db_session)):
+    success = delete_notification_disastertype(session, disastertype_id, user.id)
+    if not success:
+        raise HTTPException(status_code=404, detail="NotificationDisasterType not found")
+    return {"message": "Deleted successfully"}

app/handlers/notification_handler.py

@@ -0,0 +1,20 @@
+from fastapi import APIRouter, Depends
+from sqlmodel import Session
+from app.db.session import get_db_session
+from app.handlers.user_handler import get_current_user
+from app.models.user_model import User
+from app.schemas.notification_schema import NotificationCreate, NotificationRead
+from app.services.notification_service import (
+    create_notification,
+    get_notifications_by_user
+)
+
+router = APIRouter(prefix="/notifications")
+
+@router.post("/", response_model=NotificationRead)
+def create(req: NotificationCreate, user: User = Depends(get_current_user), session: Session = Depends(get_db_session)):
+    return create_notification(session, user.id, req.disaster_id, req.title, req.body)
+
+@router.get("/", response_model=list[NotificationRead])
+def get_user_notifications(user: User = Depends(get_current_user), session: Session = Depends(get_db_session)):
+    return get_notifications_by_user(session, user.id)

app/handlers/notification_region_handler.py

@@ -0,0 +1,40 @@
+from fastapi import APIRouter, Depends, HTTPException
+from sqlmodel import Session
+
+from app.db.session import get_db_session
+from app.schemas.notification_region_schema import NotificationRegionCreate, NotificationRegionRead
+from app.services.notification_region_service import (
+    create_notification_region,
+    get_notification_regions_by_user,
+    delete_notification_region
+)
+from app.handlers.user_handler import get_current_user
+from app.models.user_model import User
+
+router = APIRouter(prefix="/notification-regions")
+
+@router.post("/", response_model=NotificationRegionRead)
+def create_region_subscription(
+    req: NotificationRegionCreate,
+    session: Session = Depends(get_db_session),
+    user: User = Depends(get_current_user)
+):
+    return create_notification_region(session, user_id=user.id, region_id=req.region_id)
+
+@router.get("/", response_model=list[NotificationRegionRead])
+def get_my_regions(
+    session: Session = Depends(get_db_session),
+    user: User = Depends(get_current_user)
+):
+    return get_notification_regions_by_user(session, user.id)
+
+@router.delete("/{notification_region_id}")
+def delete_region_subscription(
+    notification_region_id: int,
+    session: Session = Depends(get_db_session),
+    user: User = Depends(get_current_user)
+):
+    success = delete_notification_region(session, notification_region_id, user_id=user.id)
+    if not success:
+        raise HTTPException(status_code=404, detail="NotificationRegion not found or unauthorized")
+    return {"message": "Deleted successfully"}

app/handlers/user_handler.py

@@ -1,10 +1,7 @@
 from fastapi import APIRouter, Depends, HTTPException, Header
-from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer, OAuth2PasswordBearer
-from sqlmodel import Session
-from app.db.session import get_db_session
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from app.models.user_model import User
-from app.schemas.common_schema import ApiResponse
-from app.schemas.user_schema import FCMTokenUpdate, UserCreate, UserCreateResponse, UserDeleteResponse, UserLogin, UserLoginResponse, UserReadResponse, UserUpdate, UserUpdateResponse
+from app.schemas.user_schema import UserCreate, UserCreateResponse, UserDeleteResponse, UserLogin, UserLoginResponse, UserReadResponse, UserUpdate, UserUpdateResponse
 from app.services.user_service import UserService
 from app.core.redis import get_redis
 from redis.asyncio import Redis
@@ -77,16 +74,4 @@ def get_user_info(
     user_service: UserService = Depends(),
 ) -> UserReadResponse:
     user_data = user_service.get_info(user.id)
-    return UserReadResponse(message="회원정보 조회 성공", data=user_data)
-
-@router.patch("/users/fcm-token", response_model_exclude_none=True)
-def update_fcm_token(
-    req: FCMTokenUpdate,
-    user: User=Depends(get_current_user),
-    user_service: UserService = Depends()
-) -> ApiResponse[None]:
-    try:
-        user_service.update_user_fcm_token(user,req.fcm_token)
-    except ValueError as ve:
-        raise HTTPException(status_code=400, detail=str(ve))
-    return ApiResponse(message="FCM 토큰이 성공적으로 등록되었습니다.")
+    return UserReadResponse(message="회원정보 조회 성공", data=user_data)

app/schemas/notification_disastertype_schema.py

@@ -0,0 +1,12 @@
+from pydantic import BaseModel
+
+class NotificationDisasterTypeCreate(BaseModel):
+    disaster_type: str
+
+class NotificationDisasterTypeRead(BaseModel):
+    id: int
+    user_id: int
+    disaster_type: str
+
+    class Config:
+        orm_mode = True