ewandor/roleplay-contract
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming Collection CurrentFirmModel to CurrentFirm

Browse Source
This commit is contained in:
ewandor
2025-05-04 00:03:43 +02:00
parent a9e9f97c14
commit b542fd40a6
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/rpk-api/firm/core/depends.py
View File

@@ -2,7 +2,7 @@ from fastapi import HTTPException, Depends
from hub.auth import get_current_user
from firm.current_firm import CurrentFirmModel, Partner
from firm.current_firm import CurrentFirm, Partner
from firm.db import get_db_client
from firm.entity.models import Entity
@@ -16,7 +16,7 @@ class Registry:
self.instance = instance
self.firm = firm
self.current_firm = CurrentFirmModel.get_current(self.db)
self.current_firm = CurrentFirm.get_current(self.db)
async def set_user(self, user):
for firm in user.firms:

3
api/rpk-api/firm/current_firm/__init__.py
View File

@@ -7,8 +7,7 @@ from firm.core.models import CrudDocument
from firm.core.schemas import Writer, Reader
from firm.entity.schemas import EntityIndividualCreate, EntityCorporationCreate, EntityRead
class CurrentFirmModel(CrudDocument):
class CurrentFirm(CrudDocument):
instance: str = Field()
firm: str = Field()
entity_id: PydanticObjectId = Field()

10
api/rpk-api/firm/current_firm/routes.py
View File

@@ -1,7 +1,7 @@
from fastapi import APIRouter, Depends
from firm.core.depends import get_authed_tenant_registry, get_uninitialized_registry
from firm.current_firm import CurrentFirmModel, CurrentFirmSchemaRead, CurrentFirmSchemaCreate, CurrentFirmSchemaUpdate, Partner
from firm.current_firm import CurrentFirm, CurrentFirmSchemaRead, CurrentFirmSchemaCreate, CurrentFirmSchemaUpdate, Partner
from firm.entity.models import Entity, Employee
from firm.entity.schemas import EntityRead
@@ -9,7 +9,7 @@ current_firm_router = APIRouter()
@current_firm_router.get("/", response_model=CurrentFirmSchemaRead, response_description=f"Current Firm records retrieved")
async def read(reg=Depends(get_authed_tenant_registry)) -> CurrentFirmSchemaRead:
document = await CurrentFirmModel.get_current(reg.db)
document = await CurrentFirm.get_current(reg.db)
firm_entity = await Entity.get(reg.db, document.entity_id)
partner = await Partner.get_by_user_id(reg.db, reg.user.id)
partner = await Entity.get(reg.db, partner.entity_id)
@@ -31,7 +31,7 @@ async def create(schema: CurrentFirmSchemaCreate, reg=Depends(get_uninitialized_
corporation_schema.entity_data.employees.append(Employee(entity_id=owner_entity.id, position=schema.position))
corp = await Entity.create(reg.db, corporation_schema)
document = await CurrentFirmModel.create(reg.db, CurrentFirmModel(
document = await CurrentFirm.create(reg.db, CurrentFirm(
instance=reg.instance,
firm=reg.firm,
entity_id=corp.id,
@@ -42,6 +42,6 @@ async def create(schema: CurrentFirmSchemaCreate, reg=Depends(get_uninitialized_
@current_firm_router.put("/", response_description=f"Current Firm record updated")
async def update(schema: CurrentFirmSchemaUpdate, reg=Depends(get_authed_tenant_registry)) -> CurrentFirmSchemaRead:
document = await CurrentFirmModel.get_current(reg.db)
document = await CurrentFirmModel.update(reg.db, document, schema)
document = await CurrentFirm.get_current(reg.db)
document = await CurrentFirm.update(reg.db, document, schema)
return CurrentFirmSchemaRead.from_model(document)