Update app.py

app.py

@@ -2,6 +2,7 @@ import os
 import logging
 import firebase_admin.messaging
 import requests
+import datetime
 from fastapi import FastAPI, HTTPException, status, Body
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel, Field, EmailStr
@@ -21,6 +22,7 @@ if not MONGODB_URI:
 # --- Configuration ---
 DATABASE_NAME = "userAuthDB"
 COLLECTION_NAME = "users"
+TOKEN_COLLECTION_NAME = "fcmtokens"
 
 # --- Logging Setup ---
 logging.basicConfig(level=logging.INFO)
@@ -31,9 +33,9 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 # --- FastAPI App Initialization ---
 app = FastAPI(
-    title="User Authentication API",
-    description="API for user signup and login for WhereIParked.",
-    version="1.0.0",
+    title="Backend API",
+    description="API for WhereIParked Backend OPerations.",
+    version="1.5.0",
 )
 
 # --- CORS Configuration ---
@@ -129,6 +131,9 @@ class TokenModel(BaseModel):
     email: str
     token: str
 
+class InAppEventNotification(BaseModel):
+    token: str
+
 # --- Helper Functions ---
 def verify_password(plain_password, hashed_password):
     return pwd_context.verify(plain_password, hashed_password)
@@ -166,11 +171,11 @@ FCM_SERVER_KEY = os.getenv("FCM_SERVER_KEY")
 
 def send_push(token: str, title: str, body: str):
     message = firebase_admin.messaging.Message(
-        notification=firebase_admin.messaging.Notification(
-        title=title,
-        body=body,
-        image="/icon.png"
-        ),
+        # notification=firebase_admin.messaging.Notification(
+        # title=title,
+        # body=body,
+        # image="./icon.png"
+        # ),
         data={
             "title": title,
             "body": body
@@ -182,10 +187,7 @@ def send_push(token: str, title: str, body: str):
 
     print('Successfully sent message:', response)
 
-async def send_user_push(email: str, title: str, body: str):
-    user = await db.users.find_one({"email": email})
-    if user and "fcm_token" in user:
-        send_push(user["fcm_token"], title, body)
+    return response
 
 
 # --- API Endpoints ---
@@ -254,38 +256,41 @@ async def login(login_data: UserLogin = Body(...)):
 
 @app.post("/api/save-token")
 async def save_token(token_model: TokenModel):
-    db.users.update_one(
-        {"email": token_model.email},
-        {"$set": {"fcm_token": token_model.token}}
-    )
+    existing = await db.fcmtokens.find_one({"token": token_model.token})
+    if not existing:
+        await db.fcmtokens.insert_one({
+            "email": token_model.email,
+            "token": token_model.token,
+            "createdAt": datetime.datetime.utcnow()
+        })
     return {"message": "Token saved"}
 
-
 @app.post("/api/parked")
-async def user_parked(email: str):
-    await send_user_push(email,"WhereIParked", "You parked your car. Timer started!")
+async def user_parked(requestBody: InAppEventNotification = Body(...)):
+    send_push(requestBody.token, "WhereIParked", "You parked your car. Timer started!")
     return {"message": "Notification sent"}
 
+
 @app.post("/api/clear-location")
-async def user_cleared(email: str):
-    await send_user_push(email, "WhereIParked", "Parking location cleared. Safe drive!")
+async def user_cleared(requestBody: InAppEventNotification = Body(...)):
+    send_push(requestBody.token, "WhereIParked", "Parking location cleared. Safe drive!")
     return {"message": "Notification sent"}
 
 @app.post("/api/park-duration")
-async def park_duration(email: str):
-    await send_user_push(email, "Reminder", "You’ve been parked for over 60 minutes!")
+async def park_duration(requestBody: InAppEventNotification = Body(...), duration = str):
+    send_push(requestBody.token, "Reminder", "You’ve been parked for over " + duration + " minutes!")
     return {"message": "Notification sent"}
 
 @app.post("/admin/push")
-async def admin_push(title: str, body: str):
-    users = await db.users.find().to_list(length=None)  
-    for user in users:
-        if "fcm_token" in user and user["fcm_token"]:
-            send_push(user["fcm_token"], title, body)
+async def admin_push(title: str = Body(...), body: str = Body(...)):
+    tokens = await db.fcmtokens.find().to_list(length=None)
+    for token_entry in tokens:
+        send_push(token_entry["token"], title, body)
     return {"message": "Notifications sent"}
 
 
+
 @app.get("/", status_code=status.HTTP_200_OK)
 async def read_root():
     """Root endpoint to check if the API is running."""
-    return {"message": "Authentication API is running!"}
+    return {"message": "Authentication API is running!"}