From fc0af83c16d1e0552ea607508250938cc903e563 Mon Sep 17 00:00:00 2001 From: Kenneth Trecy Tobias <19201.tobias.kennethtrecy.c@gmail.com> Date: Tue, 13 Sep 2022 00:15:34 +0800 Subject: [PATCH] intrn(route)!: apply organizational changes in the routes --- routes/api/audit_trail/list.get.ts | 2 +- routes/api/chat_message/create.post.ts | 4 ++-- routes/api/chat_message/create_with_file.post.ts | 2 +- routes/api/chat_message/update(id).patch.ts | 6 +++--- routes/api/chat_message_activity/archive.delete.ts | 2 +- routes/api/chat_message_activity/restore.patch.ts | 2 +- routes/api/consultation/create.post.ts | 2 +- routes/api/consultation/list.get.ts | 2 +- routes/api/consultation/update(id).patch.ts | 4 ++-- routes/api/department/archive.delete.ts | 2 +- routes/api/department/count_users.get.ts | 2 +- routes/api/department/create.post.ts | 2 +- routes/api/department/list.get.ts | 2 +- routes/api/department/restore.patch.ts | 2 +- routes/api/department/update(id).patch.ts | 4 ++-- routes/api/employee_schedule/archive.delete.ts | 2 +- routes/api/employee_schedule/create.post.ts | 4 ++-- routes/api/employee_schedule/list.get.ts | 2 +- routes/api/employee_schedule/restore.patch.ts | 2 +- routes/api/employee_schedule/update(id).patch.ts | 4 ++-- routes/api/profile_picture/read(id).get.ts | 4 ++-- routes/api/profile_picture/update(id).patch.ts | 2 +- routes/api/role/archive.delete.ts | 2 +- routes/api/role/count_users.get.ts | 2 +- routes/api/role/create.post.ts | 2 +- routes/api/role/list.get.ts | 2 +- routes/api/role/read(id).get.ts | 4 ++-- routes/api/role/restore.patch.ts | 2 +- routes/api/role/update(id).patch.ts | 4 ++-- routes/api/signature/read(id).get.ts | 4 ++-- .../relationships/profile_picture/create.post.ts | 2 +- .../api/user(id)/relationships/role/update.patch.ts | 4 ++-- .../user(id)/relationships/signature/update.patch.ts | 2 +- routes/api/user/archive.delete.ts | 2 +- routes/api/user/import.post.ts | 2 +- routes/api/user/list.get.ts | 2 +- routes/api/user/reset_password(id).patch.ts | 6 +++--- routes/api/user/restore.patch.ts | 2 +- routes/api/user/update(id).patch.ts | 11 ++++++++--- routes/dev/make_test_consultation.get.ts | 2 +- routes/enhancer/consultation/index.get.ts | 2 +- routes/enhancer/consultation/read(id).get.ts | 6 +++--- routes/enhancer/role/read(id).get.ts | 2 +- routes/enhancer/user/import.get.ts | 2 +- 44 files changed, 67 insertions(+), 62 deletions(-) diff --git a/routes/api/audit_trail/list.get.ts b/routes/api/audit_trail/list.get.ts index a8f93121f..045230e2a 100644 --- a/routes/api/audit_trail/list.get.ts +++ b/routes/api/audit_trail/list.get.ts @@ -29,7 +29,7 @@ export default class extends QueryController { async handle(request: Request, unusedResponse: Response): Promise { const constraints = { ...request.query } - const manager = new AuditTrailManager(request.transaction, request.cache) + const manager = new AuditTrailManager(request) const auditTrails = await manager.list(constraints as CommonQueryParameters) return new ListResponse(auditTrails) diff --git a/routes/api/chat_message/create.post.ts b/routes/api/chat_message/create.post.ts index 42a60b52e..333a9c28a 100644 --- a/routes/api/chat_message/create.post.ts +++ b/routes/api/chat_message/create.post.ts @@ -1,6 +1,6 @@ import type { FieldRules } from "!/types/validation" import type { Request, Response } from "!/types/dependent" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import type { ChatMessageDocument } from "$/types/documents/chat_message" import Socket from "!/ws/socket" @@ -70,7 +70,7 @@ export default class extends JSONController { get manager(): BaseManagerClass { return Manager } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const { data } = request.body as ChatMessageDocument<"create"> const { attributes, relationships } = data const chatMessageActivityID = Number(relationships.chatMessageActivity.data.id) diff --git a/routes/api/chat_message/create_with_file.post.ts b/routes/api/chat_message/create_with_file.post.ts index 54d9e9e1d..9e8e793e8 100644 --- a/routes/api/chat_message/create_with_file.post.ts +++ b/routes/api/chat_message/create_with_file.post.ts @@ -54,7 +54,7 @@ export default class extends CreateRoute { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const { data, meta } = request.body as ChatMessageDocument<"create"> & AttachedFile<"raw"> const { attributes, relationships } = data const chatMessageActivityID = Number(relationships.chatMessageActivity.data.id) diff --git a/routes/api/chat_message/update(id).patch.ts b/routes/api/chat_message/update(id).patch.ts index f19e5f9c0..ef45970d9 100644 --- a/routes/api/chat_message/update(id).patch.ts +++ b/routes/api/chat_message/update(id).patch.ts @@ -1,6 +1,6 @@ import type { Request, Response } from "!/types/dependent" import type { FieldRules } from "!/types/validation" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import type { ChatMessageActivityDocument } from "$/types/documents/chat_message_activity" import Socket from "!/ws/socket" @@ -53,11 +53,11 @@ export default class extends DoubleBoundJSONController { get manager(): BaseManagerClass { return Manager } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const { id } = request.params await manager.update(Number(id), request.body.data.attributes) - const activityManager = new ChatMessageActivityManager(request.transaction, request.cache) + const activityManager = new ChatMessageActivityManager(request) const activity = await activityManager.findWithID(Number(id)) as ChatMessageActivityDocument diff --git a/routes/api/chat_message_activity/archive.delete.ts b/routes/api/chat_message_activity/archive.delete.ts index 37b80da32..a7ceb80d8 100644 --- a/routes/api/chat_message_activity/archive.delete.ts +++ b/routes/api/chat_message_activity/archive.delete.ts @@ -28,7 +28,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new ChatMessageActivityManager(request.transaction, request.cache) + const manager = new ChatMessageActivityManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.archiveBatch(IDs) diff --git a/routes/api/chat_message_activity/restore.patch.ts b/routes/api/chat_message_activity/restore.patch.ts index 463b72a00..37946da68 100644 --- a/routes/api/chat_message_activity/restore.patch.ts +++ b/routes/api/chat_message_activity/restore.patch.ts @@ -28,7 +28,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new ChatMessageActivityManager(request.transaction, request.cache) + const manager = new ChatMessageActivityManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.restoreBatch(IDs) diff --git a/routes/api/consultation/create.post.ts b/routes/api/consultation/create.post.ts index 09e7f8e16..695545ff6 100644 --- a/routes/api/consultation/create.post.ts +++ b/routes/api/consultation/create.post.ts @@ -149,7 +149,7 @@ export default class extends JSONController { async handle(request: AuthenticatedRequest, unusedResponse: Response) : Promise { const user = deserialize(request.user) as DeserializedUserProfile - const manager = new ConsultationManager(request.transaction, request.cache) + const manager = new ConsultationManager(request) const consultationInfo = await manager.createUsingResource( request.body as ConsultationResource<"create">, diff --git a/routes/api/consultation/list.get.ts b/routes/api/consultation/list.get.ts index 4e1926dba..1c3c49647 100644 --- a/routes/api/consultation/list.get.ts +++ b/routes/api/consultation/list.get.ts @@ -34,7 +34,7 @@ export default class extends QueryController { async handle(request: Request): Promise { const constraints = { ...request.query } as ConsultationQueryParameters - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const consultations = await manager.list(constraints) return new ListResponse(consultations) diff --git a/routes/api/consultation/update(id).patch.ts b/routes/api/consultation/update(id).patch.ts index b5a440dbd..e1d4765dc 100644 --- a/routes/api/consultation/update(id).patch.ts +++ b/routes/api/consultation/update(id).patch.ts @@ -1,6 +1,6 @@ import type { Request, Response } from "!/types/dependent" import type { Rules, FieldRules } from "!/types/validation" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import Policy from "!/bases/policy" import Merger from "!/middlewares/miscellaneous/merger" @@ -115,7 +115,7 @@ export default class extends DoubleBoundJSONController { get manager(): BaseManagerClass { return ConsultationManager } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new ConsultationManager(request.transaction, request.cache) + const manager = new ConsultationManager(request) const { id } = request.params await manager.update(Number(id), request.body.data.attributes) diff --git a/routes/api/department/archive.delete.ts b/routes/api/department/archive.delete.ts index 3c150a92c..61a48bc96 100644 --- a/routes/api/department/archive.delete.ts +++ b/routes/api/department/archive.delete.ts @@ -29,7 +29,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new DepartmentManager(request.transaction, request.cache) + const manager = new DepartmentManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.archiveBatch(IDs) diff --git a/routes/api/department/count_users.get.ts b/routes/api/department/count_users.get.ts index e436432e6..c9125b297 100644 --- a/routes/api/department/count_users.get.ts +++ b/routes/api/department/count_users.get.ts @@ -67,7 +67,7 @@ export default class extends QueryController { async handle(request: Request, unusedResponse: Response): Promise { const query = request.query as unknown as Pick, "filter"> - const manager = new DepartmentManager(request.transaction, request.cache) + const manager = new DepartmentManager(request) const departmentWithUserCount = await manager // eslint-disable-next-line @typescript-eslint/no-non-null-assertion .countUsers(query.filter.IDs!) as DepartmentResourceIdentifier<"read"> diff --git a/routes/api/department/create.post.ts b/routes/api/department/create.post.ts index e05fea5ab..0cde6164e 100644 --- a/routes/api/department/create.post.ts +++ b/routes/api/department/create.post.ts @@ -70,7 +70,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new DepartmentManager(request.transaction, request.cache) + const manager = new DepartmentManager(request) const departmentInfo = await manager.create(request.body.data.attributes) return new CreatedResponseInfo(departmentInfo) diff --git a/routes/api/department/list.get.ts b/routes/api/department/list.get.ts index ceeb33c6e..01f88a94d 100644 --- a/routes/api/department/list.get.ts +++ b/routes/api/department/list.get.ts @@ -29,7 +29,7 @@ export default class extends QueryController { async handle(request: Request, unusedResponse: Response): Promise { const constraints = { ...request.query } - const manager = new DepartmentManager(request.transaction, request.cache) + const manager = new DepartmentManager(request) const departments = await manager.list(constraints as DepartmentQueryParameters) return new ListResponse(departments) diff --git a/routes/api/department/restore.patch.ts b/routes/api/department/restore.patch.ts index 7f0ad2eaf..9c6595dd7 100644 --- a/routes/api/department/restore.patch.ts +++ b/routes/api/department/restore.patch.ts @@ -29,7 +29,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new DepartmentManager(request.transaction, request.cache) + const manager = new DepartmentManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.restoreBatch(IDs) diff --git a/routes/api/department/update(id).patch.ts b/routes/api/department/update(id).patch.ts index 7081a18f3..04dd41dc4 100644 --- a/routes/api/department/update(id).patch.ts +++ b/routes/api/department/update(id).patch.ts @@ -1,6 +1,6 @@ import type { FieldRules } from "!/types/validation" import type { Request, Response } from "!/types/dependent" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import DepartmentManager from "%/managers/department" import NoContentResponseInfo from "!/response_infos/no_content" @@ -87,7 +87,7 @@ export default class extends DoubleBoundJSONController { get manager(): BaseManagerClass { return DepartmentManager } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new DepartmentManager(request.transaction, request.cache) + const manager = new DepartmentManager(request) const id = Number(request.params.id) await manager.update(id, request.body.data.attributes) diff --git a/routes/api/employee_schedule/archive.delete.ts b/routes/api/employee_schedule/archive.delete.ts index 588b12bcf..449bfe2c3 100644 --- a/routes/api/employee_schedule/archive.delete.ts +++ b/routes/api/employee_schedule/archive.delete.ts @@ -29,7 +29,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new EmployeeScheduleManager(request.transaction, request.cache) + const manager = new EmployeeScheduleManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.archiveBatch(IDs) diff --git a/routes/api/employee_schedule/create.post.ts b/routes/api/employee_schedule/create.post.ts index bed23e627..ee38c77fc 100644 --- a/routes/api/employee_schedule/create.post.ts +++ b/routes/api/employee_schedule/create.post.ts @@ -1,5 +1,5 @@ import type { FieldRules } from "!/types/validation" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import type { AuthenticatedIDRequest, Response } from "!/types/dependent" import type { EmployeeScheduleDocument } from "$/types/documents/employee_schedule" @@ -128,7 +128,7 @@ export default class extends JSONController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new EmployeeScheduleManager(request.transaction, request.cache) + const manager = new EmployeeScheduleManager(request) const { data } = request.body as EmployeeScheduleDocument<"create"> const { attributes, relationships } = data diff --git a/routes/api/employee_schedule/list.get.ts b/routes/api/employee_schedule/list.get.ts index 97dd82078..b40deadef 100644 --- a/routes/api/employee_schedule/list.get.ts +++ b/routes/api/employee_schedule/list.get.ts @@ -93,7 +93,7 @@ export default class extends QueryController { async handle(request: Request, unusedResponse: Response): Promise { const constraints = { ...request.query } as EmployeeScheduleQueryParameters - const manager = new EmployeeScheduleManager(request.transaction, request.cache) + const manager = new EmployeeScheduleManager(request) const roles = await manager.list(constraints) return new ListResponse(roles) diff --git a/routes/api/employee_schedule/restore.patch.ts b/routes/api/employee_schedule/restore.patch.ts index 5b0d2537e..47b07c743 100644 --- a/routes/api/employee_schedule/restore.patch.ts +++ b/routes/api/employee_schedule/restore.patch.ts @@ -28,7 +28,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new EmployeeScheduleManager(request.transaction, request.cache) + const manager = new EmployeeScheduleManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.restoreBatch(IDs) diff --git a/routes/api/employee_schedule/update(id).patch.ts b/routes/api/employee_schedule/update(id).patch.ts index 852cbd828..d1e0f2197 100644 --- a/routes/api/employee_schedule/update(id).patch.ts +++ b/routes/api/employee_schedule/update(id).patch.ts @@ -1,5 +1,5 @@ import type { FieldRules } from "!/types/validation" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import type { AuthenticatedIDRequest, Response } from "!/types/dependent" import type { EmployeeScheduleDocument } from "$/types/documents/employee_schedule" @@ -130,7 +130,7 @@ export default class extends DoubleBoundJSONController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new EmployeeScheduleManager(request.transaction, request.cache) + const manager = new EmployeeScheduleManager(request) const { data } = request.body as EmployeeScheduleDocument<"update"> const { id, attributes } = data diff --git a/routes/api/profile_picture/read(id).get.ts b/routes/api/profile_picture/read(id).get.ts index 4e80511f7..0205e03f8 100644 --- a/routes/api/profile_picture/read(id).get.ts +++ b/routes/api/profile_picture/read(id).get.ts @@ -1,4 +1,4 @@ -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import type { AuthenticatedIDRequest, Response } from "!/types/dependent" import type { ProfilePictureDocument } from "$/types/documents/profile_picture" @@ -33,7 +33,7 @@ export default class extends BoundController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new ProfilePictureManager(request.transaction, request.cache) + const manager = new ProfilePictureManager(request) const { id } = request.params const profilePictureDocument = await manager.findWithID( diff --git a/routes/api/profile_picture/update(id).patch.ts b/routes/api/profile_picture/update(id).patch.ts index 7e95e270b..1543eb25d 100644 --- a/routes/api/profile_picture/update(id).patch.ts +++ b/routes/api/profile_picture/update(id).patch.ts @@ -30,7 +30,7 @@ export default class extends CreateController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new ProfilePictureManager(request.transaction, request.cache) + const manager = new ProfilePictureManager(request) const { fileContents } = request.body.data.attributes const userData = deserialize(request.user) as DeserializedUserProfile const userID = userData.data.id diff --git a/routes/api/role/archive.delete.ts b/routes/api/role/archive.delete.ts index edc0b63bc..ca15278de 100644 --- a/routes/api/role/archive.delete.ts +++ b/routes/api/role/archive.delete.ts @@ -29,7 +29,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.archiveBatch(IDs) diff --git a/routes/api/role/count_users.get.ts b/routes/api/role/count_users.get.ts index 93b6252b1..17f527bc0 100644 --- a/routes/api/role/count_users.get.ts +++ b/routes/api/role/count_users.get.ts @@ -67,7 +67,7 @@ export default class extends QueryController { async handle(request: Request, unusedResponse: Response): Promise { const query = request.query as unknown as Pick, "filter"> - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) const rolesWithUserCount = await manager // eslint-disable-next-line @typescript-eslint/no-non-null-assertion .countUsers(query.filter.IDs!) as RoleResourceIdentifier diff --git a/routes/api/role/create.post.ts b/routes/api/role/create.post.ts index 11d0cdb39..8f5845c35 100644 --- a/routes/api/role/create.post.ts +++ b/routes/api/role/create.post.ts @@ -61,7 +61,7 @@ export default class extends JSONController { } async handle(request: Request, response: Response): Promise { - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) request.body.data.attributes.departmentFlags = 1 request.body.data.attributes.roleFlags = 1 const roleInfo = await manager.create(request.body.data.attributes) diff --git a/routes/api/role/list.get.ts b/routes/api/role/list.get.ts index cbed74c8f..2fda6c2fd 100644 --- a/routes/api/role/list.get.ts +++ b/routes/api/role/list.get.ts @@ -38,7 +38,7 @@ export default class extends QueryController { async handle(request: Request, unusedResponse: Response): Promise { const constraints = { ...request.query } as RoleQueryParameters - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const roles = await manager.list(constraints) return new ListResponse(roles) diff --git a/routes/api/role/read(id).get.ts b/routes/api/role/read(id).get.ts index fa096f6ee..00e2b5041 100644 --- a/routes/api/role/read(id).get.ts +++ b/routes/api/role/read(id).get.ts @@ -1,5 +1,5 @@ import type { Request, Response } from "!/types/dependent" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import Policy from "!/bases/policy" import RoleManager from "%/managers/role" @@ -22,7 +22,7 @@ export default class extends BoundController { get manager(): BaseManagerClass { return RoleManager } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) const { id } = request.params const document = await manager.findWithID(Number(id), { diff --git a/routes/api/role/restore.patch.ts b/routes/api/role/restore.patch.ts index 6cf5b3cc8..fc9751402 100644 --- a/routes/api/role/restore.patch.ts +++ b/routes/api/role/restore.patch.ts @@ -30,7 +30,7 @@ export default class extends JSONController { async handle(request: Request, unusedResponse: Response): Promise { - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.restoreBatch(IDs) diff --git a/routes/api/role/update(id).patch.ts b/routes/api/role/update(id).patch.ts index 01a3bd21c..02cefd0e6 100644 --- a/routes/api/role/update(id).patch.ts +++ b/routes/api/role/update(id).patch.ts @@ -1,6 +1,6 @@ import type { FieldRules } from "!/types/validation" import type { Request, Response } from "!/types/dependent" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import Policy from "!/bases/policy" import RoleManager from "%/managers/role" @@ -81,7 +81,7 @@ export default class extends DoubleBoundJSONController { get manager(): BaseManagerClass { return RoleManager } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) const { id, attributes } = request.body.data await manager.update(Number(id), attributes) diff --git a/routes/api/signature/read(id).get.ts b/routes/api/signature/read(id).get.ts index d7fdf66e0..467697df5 100644 --- a/routes/api/signature/read(id).get.ts +++ b/routes/api/signature/read(id).get.ts @@ -1,4 +1,4 @@ -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import type { SignatureDocument } from "$/types/documents/signature" import type { AuthenticatedIDRequest, Response } from "!/types/dependent" @@ -33,7 +33,7 @@ export default class extends BoundController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new SignatureManager(request.transaction, request.cache) + const manager = new SignatureManager(request) const { id } = request.params const signatureDocument = await manager.findWithID( diff --git a/routes/api/user(id)/relationships/profile_picture/create.post.ts b/routes/api/user(id)/relationships/profile_picture/create.post.ts index 4132a765f..207efbfce 100644 --- a/routes/api/user(id)/relationships/profile_picture/create.post.ts +++ b/routes/api/user(id)/relationships/profile_picture/create.post.ts @@ -79,7 +79,7 @@ export default class extends MultipartController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new ProfilePictureManager(request.transaction, request.cache) + const manager = new ProfilePictureManager(request) const { fileContents } = request.body.data.attributes const userID = Number(request.params.id) diff --git a/routes/api/user(id)/relationships/role/update.patch.ts b/routes/api/user(id)/relationships/role/update.patch.ts index f75b13c56..0d7b52794 100644 --- a/routes/api/user(id)/relationships/role/update.patch.ts +++ b/routes/api/user(id)/relationships/role/update.patch.ts @@ -1,5 +1,5 @@ import type { FieldRules } from "!/types/validation" -import type { BaseManagerClass } from "!/types/independent" +import type { BaseManagerClass } from "!/types/dependent" import type { DeserializedUserProfile } from "$/types/documents/user" import type { RoleIdentifierListDocument } from "$/types/documents/role" import type { AuthenticatedIDRequest, Response } from "!/types/dependent" @@ -50,7 +50,7 @@ export default class extends BoundJSONController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) const { data } = request.body as RoleIdentifierListDocument<"read"> const userData = deserialize(request.user) as DeserializedUserProfile const userID = Number(userData.data.id) diff --git a/routes/api/user(id)/relationships/signature/update.patch.ts b/routes/api/user(id)/relationships/signature/update.patch.ts index 1aa9b9902..5a10301f3 100644 --- a/routes/api/user(id)/relationships/signature/update.patch.ts +++ b/routes/api/user(id)/relationships/signature/update.patch.ts @@ -72,7 +72,7 @@ export default class extends MultipartController { async handle(request: AuthenticatedIDRequest, unusedResponse: Response) : Promise { - const manager = new SignatureManager(request.transaction, request.cache) + const manager = new SignatureManager(request) const { signature } = request.body.data.attributes const userData = deserialize(request.user) as DeserializedUserProfile const userID = userData.data.id diff --git a/routes/api/user/archive.delete.ts b/routes/api/user/archive.delete.ts index d071e4213..5a84184e8 100644 --- a/routes/api/user/archive.delete.ts +++ b/routes/api/user/archive.delete.ts @@ -32,7 +32,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new UserManager(request.transaction, request.cache) + const manager = new UserManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.archiveBatch(IDs) diff --git a/routes/api/user/import.post.ts b/routes/api/user/import.post.ts index 988e42a29..3be4ce95b 100644 --- a/routes/api/user/import.post.ts +++ b/routes/api/user/import.post.ts @@ -188,7 +188,7 @@ export default class extends MultipartController { ): Promise { Log.trace("controller", "entered POST /api/user/import") - const manager = new UserManager(request.transaction, request.cache) + const manager = new UserManager(request) const importedBody = request.body as unknown as ImportUserDocument const body: Partial = {} diff --git a/routes/api/user/list.get.ts b/routes/api/user/list.get.ts index b247ce47f..f01cde854 100644 --- a/routes/api/user/list.get.ts +++ b/routes/api/user/list.get.ts @@ -56,7 +56,7 @@ export default class extends QueryController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new UserManager(request.transaction, request.cache) + const manager = new UserManager(request) const users = await manager.list(request.query as UserQueryParameters) return new ListResponse(users) diff --git a/routes/api/user/reset_password(id).patch.ts b/routes/api/user/reset_password(id).patch.ts index 3164a4074..8484ca8ca 100644 --- a/routes/api/user/reset_password(id).patch.ts +++ b/routes/api/user/reset_password(id).patch.ts @@ -1,7 +1,7 @@ import { FieldRules } from "!/types/validation" +import type { PasswordResetArguments } from "!/types/independent" import type { DeserializedUserProfile } from "$/types/documents/user" -import type { PasswordResetArguments, BaseManagerClass } from "!/types/independent" -import type { Request, PreprocessedRequest, Response } from "!/types/dependent" +import type { Request, PreprocessedRequest, Response, BaseManagerClass } from "!/types/dependent" import Policy from "!/bases/policy" import UserManager from "%/managers/user" @@ -51,7 +51,7 @@ export default class extends DoubleBoundJSONController { request: Request & PreprocessedRequest, unusedResponse: Response ): Promise { - const manager = new UserManager(request.transaction, request.cache) + const manager = new UserManager(request) const { id } = request.body.data const userProfile = deserialize(await manager.findWithID(id)) as DeserializedUserProfile const newPassword = makeDefaultPassword(userProfile) diff --git a/routes/api/user/restore.patch.ts b/routes/api/user/restore.patch.ts index d72f5a983..d639f0742 100644 --- a/routes/api/user/restore.patch.ts +++ b/routes/api/user/restore.patch.ts @@ -28,7 +28,7 @@ export default class extends JSONController { } async handle(request: Request, unusedResponse: Response): Promise { - const manager = new UserManager(request.transaction, request.cache) + const manager = new UserManager(request) const IDs = request.body.data.map((identifier: { id: number }) => identifier.id) await manager.restoreBatch(IDs) diff --git a/routes/api/user/update(id).patch.ts b/routes/api/user/update(id).patch.ts index 3a7150d40..b6d6f7db7 100644 --- a/routes/api/user/update(id).patch.ts +++ b/routes/api/user/update(id).patch.ts @@ -1,8 +1,13 @@ import type { Serializable } from "$/types/general" import type { FieldRules } from "!/types/validation" import type { DeserializedUserProfile } from "$/types/documents/user" -import type { EmailVerificationArguments, BaseManagerClass } from "!/types/independent" -import type { AuthenticatedIDRequest, PreprocessedRequest, Response } from "!/types/dependent" +import type { EmailVerificationArguments } from "!/types/independent" +import type { + AuthenticatedIDRequest, + PreprocessedRequest, + Response, + BaseManagerClass +} from "!/types/dependent" import { personName } from "!/constants/regex" @@ -78,7 +83,7 @@ export default class extends DoubleBoundJSONController { request: AuthenticatedIDRequest & PreprocessedRequest, unusedResponse: Response ): Promise { - const manager = new UserManager(request.transaction, request.cache) + const manager = new UserManager(request) const { id } = request.body.data const { email } = request.body.data.attributes diff --git a/routes/dev/make_test_consultation.get.ts b/routes/dev/make_test_consultation.get.ts index 7ff558a4a..b1fd3fab1 100644 --- a/routes/dev/make_test_consultation.get.ts +++ b/routes/dev/make_test_consultation.get.ts @@ -211,7 +211,7 @@ export default class extends DevController { Log.success("controller", "attached test secretary role to test secretary user") - const consultationManager = new ConsultationManager(request.transaction, request.cache) + const consultationManager = new ConsultationManager(request) const createdConsultation = await consultationManager.createUsingResource({ "attributes": { diff --git a/routes/enhancer/consultation/index.get.ts b/routes/enhancer/consultation/index.get.ts index 26852c994..77254497d 100644 --- a/routes/enhancer/consultation/index.get.ts +++ b/routes/enhancer/consultation/index.get.ts @@ -22,7 +22,7 @@ export default class extends PageMiddleware { return [ new DynamicGatedRedirector(async(request: AuthenticatedRequest) => { const user = deserialize(request.user) as DeserializedUserProfile - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const consultations = await manager.list({ "filter": { diff --git a/routes/enhancer/consultation/read(id).get.ts b/routes/enhancer/consultation/read(id).get.ts index 786068e16..35ed0426d 100644 --- a/routes/enhancer/consultation/read(id).get.ts +++ b/routes/enhancer/consultation/read(id).get.ts @@ -38,7 +38,7 @@ export default class extends PageMiddleware { return [ new DynamicGatedRedirector(async(request: AuthenticatedRequest) => { const { id } = request.params - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const consultation = await manager.findWithID(Number(id)) @@ -58,7 +58,7 @@ export default class extends PageMiddleware { const user = deserialize(request.user) as DeserializedUserProfile const { id } = request.params - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const consultations = await manager.list({ "filter": { @@ -104,7 +104,7 @@ export default class extends PageMiddleware { }) - const chatMessageManager = new ChatMessageManager(request.transaction, request.cache) + const chatMessageManager = new ChatMessageManager(request) const chatMessages = await chatMessageManager.list({ "filter": { "consultationIDs": [ Number(consultation.data.id) ], diff --git a/routes/enhancer/role/read(id).get.ts b/routes/enhancer/role/read(id).get.ts index abcd01e85..2de3dedf4 100644 --- a/routes/enhancer/role/read(id).get.ts +++ b/routes/enhancer/role/read(id).get.ts @@ -31,7 +31,7 @@ export default class extends PageMiddleware { async getPageProps(request: AuthenticatedRequest): Promise { const { id } = request.params - const manager = new Manager(request.transaction, request.cache) + const manager = new Manager(request) const role = await manager.findWithID(Number(id), { "filter": { diff --git a/routes/enhancer/user/import.get.ts b/routes/enhancer/user/import.get.ts index 13ae320a0..aa9c021b8 100644 --- a/routes/enhancer/user/import.get.ts +++ b/routes/enhancer/user/import.get.ts @@ -24,7 +24,7 @@ export default class extends PageMiddleware { get validations(): Validation[] { return [] } async getPageProps(request: Request): Promise { - const manager = new RoleManager(request.transaction, request.cache) + const manager = new RoleManager(request) const pageProps: Partial = { "roles": await manager.list({ "filter": {