jamesp/ppr-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Creating admin interface

Browse Source
This commit is contained in:
James Pattinson
2025-10-21 20:23:58 +00:00
parent f580d0fbf7
commit 28af669993
6 changed files with 1276 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
backend/app/crud/crud_ppr.py
View File

@@ -4,6 +4,7 @@ from sqlalchemy import and_, or_, func, desc
from datetime import date, datetime
from app.models.ppr import PPRRecord, PPRStatus
from app.schemas.ppr import PPRCreate, PPRUpdate
from app.crud.crud_journal import journal as crud_journal
class CRUDPPR:
@@ -62,7 +63,7 @@ class CRUDPPR:
)
).order_by(PPRRecord.etd).all()
def create(self, db: Session, obj_in: PPRCreate, created_by: str) -> PPRRecord:
def create(self, db: Session, obj_in: PPRCreate, created_by: str, user_ip: str = "127.0.0.1") -> PPRRecord:
db_obj = PPRRecord(
**obj_in.dict(),
created_by=created_by,
@@ -71,28 +72,52 @@ class CRUDPPR:
db.add(db_obj)
db.commit()
db.refresh(db_obj)
# Log creation in journal
crud_journal.log_change(
db,
db_obj.id,
f"PPR created for {db_obj.ac_reg}",
created_by,
user_ip
)
return db_obj
def update(self, db: Session, db_obj: PPRRecord, obj_in: PPRUpdate) -> PPRRecord:
def update(self, db: Session, db_obj: PPRRecord, obj_in: PPRUpdate, user: str = "system", user_ip: str = "127.0.0.1") -> PPRRecord:
update_data = obj_in.dict(exclude_unset=True)
for field, value in update_data.items():
setattr(db_obj, field, value)
changes = []
for field, value in update_data.items():
old_value = getattr(db_obj, field)
if old_value != value:
changes.append(f"{field} changed from '{old_value}' to '{value}'")
setattr(db_obj, field, value)
if changes:
db.add(db_obj)
db.commit()
db.refresh(db_obj)
# Log changes in journal
for change in changes:
crud_journal.log_change(db, db_obj.id, change, user, user_ip)
db.add(db_obj)
db.commit()
db.refresh(db_obj)
return db_obj
def update_status(
self,
db: Session,
ppr_id: int,
status: PPRStatus
status: PPRStatus,
user: str = "system",
user_ip: str = "127.0.0.1"
) -> Optional[PPRRecord]:
db_obj = self.get(db, ppr_id)
if not db_obj:
return None
old_status = db_obj.status
db_obj.status = status
# Set timestamps based on status
@@ -104,16 +129,36 @@ class CRUDPPR:
db.add(db_obj)
db.commit()
db.refresh(db_obj)
# Log status change in journal
crud_journal.log_change(
db,
db_obj.id,
f"Status changed from {old_status.value} to {status.value}",
user,
user_ip
)
return db_obj
def delete(self, db: Session, ppr_id: int) -> Optional[PPRRecord]:
def delete(self, db: Session, ppr_id: int, user: str = "system", user_ip: str = "127.0.0.1") -> Optional[PPRRecord]:
db_obj = self.get(db, ppr_id)
if db_obj:
old_status = db_obj.status
# Soft delete by setting status
db_obj.status = PPRStatus.DELETED
db.add(db_obj)
db.commit()
db.refresh(db_obj)
# Log the deletion in journal
crud_journal.log_change(
db,
db_obj.id,
f"PPR marked as DELETED (was {old_status.value})",
user,
user_ip
)
return db_obj