From fc835dc98231c076fc368a1b794bbd0a76cfe22f Mon Sep 17 00:00:00 2001 From: luxferre Date: Wed, 27 May 2026 15:59:12 +0100 Subject: [PATCH] feat: missing dependency injections on org endpoints --- src/organisation/router.py | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/src/organisation/router.py b/src/organisation/router.py index 5695889..0811457 100644 --- a/src/organisation/router.py +++ b/src/organisation/router.py @@ -23,8 +23,7 @@ from src.contact.schemas import ContactAddress from src.contact.exceptions import ContactNotFoundException from src.database import db_dependency from src.user.models import User -from src.user.exceptions import UserNotFoundException -from src.auth.service import claims_dependency +from user.dependencies import user_model_body_dependency, user_model_claims_dependency from src.auth.dependencies import super_admin_dependency, org_model_root_claim_query_dependency, org_model_root_claim_body_dependency from src.organisation.dependencies import org_model_body_dependency @@ -35,6 +34,7 @@ from src.organisation.schemas import OrgOrgPostRequest, OrgQuestionnairePatchReq OrgUserPostRequest, OrgUserGetResponse, OrgContactGetResponse, OrgOrgGetResponse, OrgRootPatchRequest, \ OrgGroupGetResponse, OrgUserDeleteRequest, OrgDeleteOrgRequest + router = APIRouter( prefix="/org", tags=["org"], @@ -56,11 +56,7 @@ async def get_org_by_id(org_model: org_model_root_claim_query_dependency): @router.post("/") -async def create_org(db: db_dependency, user: claims_dependency, request_model: OrgOrgPostRequest): - db_id: Optional[int] = user.get("db_id", None) - if db_id is None: - raise UserNotFoundException() - +async def create_org(db: db_dependency, user_model: user_model_claims_dependency, request_model: OrgOrgPostRequest): if request_model.intake_questionnaire: intake_questionnaire = request_model.intake_questionnaire.model_dump() else: @@ -112,9 +108,7 @@ async def get_users(org_model: org_model_root_claim_query_dependency): @router.post("/users") -async def add_user_to_org(db: db_dependency, org_model: org_model_root_claim_body_dependency, request_model: OrgUserPostRequest): - # TODO: user_model_body_dependency - user_model = db.get(User, request_model.user_id) +async def add_user_to_org(db: db_dependency, org_model: org_model_root_claim_body_dependency, user_model: user_model_body_dependency, request_model: OrgUserPostRequest): if user_model in org_model.user_rel: return org_model.user_rel.append(user_model) @@ -128,13 +122,8 @@ async def delete_organisation_by_id(db: db_dependency, org_model: org_model_body @router.patch("/root_user", status_code=status.HTTP_204_NO_CONTENT) -async def update_root_user(db: db_dependency, org_model: org_model_body_dependency, su: super_admin_dependency, request_model: OrgRootPatchRequest): - # TODO: user_model_body_dependency - root_user_model = db.get(User, request_model.user_id) - if root_user_model is None: - raise UserNotFoundException(user_id=request_model.user_id) - - org_model.root_user_rel = root_user_model +async def update_root_user(db: db_dependency, org_model: org_model_body_dependency, user_model: user_model_body_dependency, su: super_admin_dependency, request_model: OrgRootPatchRequest): + org_model.root_user_rel = user_model db.commit() @@ -144,18 +133,11 @@ async def get_org_groups(org_model: org_model_root_claim_query_dependency): @router.delete("/user", status_code=status.HTTP_204_NO_CONTENT) -async def remove_user_from_org(db: db_dependency, org_model: org_model_root_claim_query_dependency, request_model: OrgUserDeleteRequest): - # TODO: user_model_body_dependency - user_id = request_model.user_id - user = db.get(User, user_id) - - if user is None: - raise UserNotFoundException(user_id=user_id) - - if user not in org_model.user_rel: +async def remove_user_from_org(db: db_dependency, org_model: org_model_root_claim_body_dependency, user_model: user_model_body_dependency, request_model: OrgUserDeleteRequest): + if user_model not in org_model.user_rel: return - org_model.user_rel.remove(user) + org_model.user_rel.remove(user_model) db.commit()