From 00dcf7ce3549bb731f45718a8d0a4352c5ea696d Mon Sep 17 00:00:00 2001
From: luxferre <chris@sr2.uk>
Date: Thu, 28 May 2026 14:27:14 +0100
Subject: [PATCH] minor: service schema nomenclature

---
 src/service/router.py  |  6 +++---
 src/service/schemas.py | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/service/router.py b/src/service/router.py
index 9bef22b..f53d666 100644
--- a/src/service/router.py
+++ b/src/service/router.py
@@ -17,7 +17,7 @@ from src.service.models import Service
 from src.service.utils import generate_api_key
 from src.service.dependencies import service_model_body_dependency
 from src.service.schemas import ServiceGetServiceResponse, ServicePostServiceRequest, ServicePostServiceResponse, \
-	ServiceWithKeyResponse, ServicePatchKeyResponse, ServicePatchKeyRequest, ServiceDeleteServiceRequest
+	ServiceWithKeySchema, ServicePatchKeyResponse, ServicePatchKeyRequest, ServiceDeleteServiceRequest
 
 router = APIRouter(
 	tags=["Service"],
@@ -42,7 +42,7 @@ async def register_service(db: db_dependency, su: super_admin_dependency, servic
 		if isinstance(e.orig, UniqueViolation):
 			raise Conflict(message="Service with this name already exists")
 	db.commit()
-	response = ServiceWithKeyResponse(**service_model.__dict__)
+	response = ServiceWithKeySchema(**service_model.__dict__)
 	db.commit()
 	return {"service": response}
 
@@ -52,7 +52,7 @@ async def regenerate_api_key(db: db_dependency, su: super_admin_dependency, serv
 	service_model.api_key = key
 
 	db.flush()
-	response = ServiceWithKeyResponse(**service_model.__dict__)
+	response = ServiceWithKeySchema(**service_model.__dict__)
 	db.commit()
 	return {"service": response}
 
diff --git a/src/service/schemas.py b/src/service/schemas.py
index deef4e3..d6f2882 100644
--- a/src/service/schemas.py
+++ b/src/service/schemas.py
@@ -12,29 +12,29 @@ from src.schemas import CustomBaseModel
 class ServiceIDMixin(CustomBaseModel):
 	service_id: int
 
-class ServiceResponse(CustomBaseModel):
+class ServiceSchema(CustomBaseModel):
 	model_config = ConfigDict(from_attributes=True, extra="ignore")
 
 	id: int
 	name: str
 
-class ServiceWithKeyResponse(ServiceResponse):
+class ServiceWithKeySchema(ServiceSchema):
 	api_key: str
 
 class ServiceGetServiceResponse(CustomBaseModel):
-	services: list[ServiceResponse]
+	services: list[ServiceSchema]
 
 class ServicePostServiceRequest(CustomBaseModel):
 	name: str
 
 class ServicePostServiceResponse(CustomBaseModel):
-	service: ServiceWithKeyResponse
+	service: ServiceWithKeySchema
 
 class ServicePatchKeyRequest(ServiceIDMixin):
 	pass
 
 class ServicePatchKeyResponse(CustomBaseModel):
-	service: ServiceWithKeyResponse
+	service: ServiceWithKeySchema
 
 class ServiceDeleteServiceRequest(ServiceIDMixin):
 	pass