fix merge conflicts

Author: coolraycode

backend/src/main.py

@@ -1,9 +1,10 @@
 from fastapi import FastAPI, HTTPException, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
+from src.modules.account.account_router import account_router
 from src.modules.location.location_router import location_router
-from src.modules.student.student_router import student_router
 from src.modules.party.party_router import party_router
+from src.modules.student.student_router import student_router
 
 app = FastAPI()
 
@@ -37,6 +38,7 @@ def read_root():
     return {"message": "Successful Test"}
 
 
+app.include_router(account_router)
 app.include_router(party_router)
 app.include_router(student_router)
 app.include_router(location_router)

backend/src/modules/account/account_router.py

@@ -0,0 +1,66 @@
+from fastapi import APIRouter, Depends, Query
+from src.core.authentication import authenticate_admin
+from src.modules.account.account_model import Account, AccountData, AccountRole
+from src.modules.account.account_service import AccountService
+from src.modules.police.police_model import PoliceAccount, PoliceAccountUpdate
+from src.modules.police.police_service import PoliceService
+
+account_router = APIRouter(prefix="/api/accounts", tags=["accounts"])
+
+
+@account_router.get("/police")
+async def get_police_credentials(
+    police_service: PoliceService = Depends(),
+    _=Depends(authenticate_admin),
+) -> PoliceAccount:
+    police_entity = await police_service.get_police()
+    return PoliceAccount(email=police_entity.email)
+
+
+@account_router.put("/police")
+async def update_police_credentials(
+    data: PoliceAccountUpdate,
+    police_service: PoliceService = Depends(),
+    _=Depends(authenticate_admin),
+) -> PoliceAccount:
+    police_entity = await police_service.update_police(data.email, data.password)
+    return PoliceAccount(email=police_entity.email)
+
+
+@account_router.get("")
+async def list_accounts(
+    role: list[AccountRole] | None = Query(
+        None, description="Filter by role(s): admin, staff, student"
+    ),
+    account_service: AccountService = Depends(),
+    _=Depends(authenticate_admin),
+) -> list[Account]:
+    return await account_service.get_accounts_by_roles(role)
+
+
+@account_router.post("")
+async def create_account(
+    data: AccountData,
+    account_service: AccountService = Depends(),
+    _=Depends(authenticate_admin),
+) -> Account:
+    return await account_service.create_account(data)
+
+
+@account_router.put("/{account_id}")
+async def update_account(
+    account_id: int,
+    data: AccountData,
+    account_service: AccountService = Depends(),
+    _=Depends(authenticate_admin),
+) -> Account:
+    return await account_service.update_account(account_id, data)
+
+
+@account_router.delete("/{account_id}")
+async def delete_account(
+    account_id: int,
+    account_service: AccountService = Depends(),
+    _=Depends(authenticate_admin),
+) -> Account:
+    return await account_service.delete_account(account_id)

backend/src/modules/account/account_service.py

@@ -50,6 +50,18 @@ async def get_accounts(self) -> list[Account]:
         accounts = result.scalars().all()
         return [Account.from_entity(account) for account in accounts]
 
+    async def get_accounts_by_roles(
+        self, roles: list[AccountRole] | None = None
+    ) -> list[Account]:
+        if not roles:
+            return await self.get_accounts()
+
+        result = await self.session.execute(
+            select(AccountEntity).where(AccountEntity.role.in_(roles))
+        )
+        accounts = result.scalars().all()
+        return [Account.from_entity(account) for account in accounts]
+
     async def get_account_by_id(self, account_id: int) -> Account:
         account_entity = await self._get_account_entity_by_id(account_id)
         return Account.from_entity(account_entity)