fast track and users

vatger · Mar 17, 2024 · fb68783 · fb68783
1 parent 685dd46
commit fb68783
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/src/controllers/fast-track/FastTrackAdminController.ts b/src/controllers/fast-track/FastTrackAdminController.ts
@@ -9,6 +9,19 @@ import { Config } from "../../core/Config";
 import path from "path";
 import Validator, { ValidationTypeEnum } from "../../utility/Validator";
 
+/**
+ * Returns the fast track including target user and requesting user
+ * @param id
+ */
+async function _getFastTrackByID(id: any) {
+    return await FastTrackRequest.findOne({
+        where: {
+            id: id,
+        },
+        include: [FastTrackRequest.associations.user, FastTrackRequest.associations.requested_by_user],
+    });
+}
+
 /**
  * Returns a list of all fast track requests
  * @param request
@@ -39,7 +52,7 @@ async function getAll(request: Request, response: Response, next: NextFunction)
 async function getAllPending(request: Request, response: Response, next: NextFunction) {
     try {
         const user: User = response.locals.user;
-        PermissionHelper.checkUserHasPermission(user, "atd.fast-track.pending.view", true);
+        PermissionHelper.checkUserHasPermission(user, "atd.fast_track.view", false);
 
         const pendingFastTracks = await FastTrackRequest.findAll({
             where: {
@@ -102,14 +115,9 @@ async function getAttachmentByID(request: Request, response: Response, next: Nex
     try {
         const user: User = response.locals.user;
         const params = request.params as { id: string };
-        PermissionHelper.checkUserHasPermission(user, "atd.fast-track.pending.view", true);
+        PermissionHelper.checkUserHasPermission(user, "atd.fast_track.view", false);
 
-        const pendingFastTracks = await FastTrackRequest.findOne({
-            where: {
-                id: params.id,
-            },
-            include: [FastTrackRequest.associations.user, FastTrackRequest.associations.requested_by_user],
-        });
+        const pendingFastTracks = await _getFastTrackByID(params.id);
 
         if (pendingFastTracks == null) {
             response.sendStatus(HttpStatusCode.NotFound);
@@ -133,14 +141,9 @@ async function getByID(request: Request, response: Response, next: NextFunction)
     try {
         const user: User = response.locals.user;
         const params = request.params as { id: string };
-        PermissionHelper.checkUserHasPermission(user, "atd.fast-track.pending.view", true);
+        PermissionHelper.checkUserHasPermission(user, "atd.fast_track.view", false);
 
-        const pendingFastTracks = await FastTrackRequest.findOne({
-            where: {
-                id: params.id,
-            },
-            include: [FastTrackRequest.associations.user, FastTrackRequest.associations.requested_by_user],
-        });
+        const pendingFastTracks = await _getFastTrackByID(params.id);
 
         if (pendingFastTracks == null) {
             response.sendStatus(HttpStatusCode.NotFound);
@@ -164,7 +167,7 @@ async function updateByID(request: Request, response: Response, next: NextFuncti
         const user: User = response.locals.user;
         const params = request.params as { id: string };
         const body = request.body as { comment?: string; status: number };
-        PermissionHelper.checkUserHasPermission(user, "atd.fast-track.update", true);
+        PermissionHelper.checkUserHasPermission(user, "atd.fast_track.view", true);
 
         if (body.status == null || params.id == null) {
             response.sendStatus(HttpStatusCode.BadRequest);

diff --git a/src/controllers/log-template/LogTemplateAdminController.ts b/src/controllers/log-template/LogTemplateAdminController.ts
@@ -60,7 +60,7 @@ async function create(request: Request, response: Response, next: NextFunction)
 
         Validator.validate(body, {
             name: [ValidationTypeEnum.NON_NULL],
-            content: [ValidationTypeEnum.NON_NULL, ValidationTypeEnum.VALID_JSON],
+            content: [ValidationTypeEnum.NON_NULL, ValidationTypeEnum.VALID_JSON, ValidationTypeEnum.IS_ARRAY],
         });
 
         const logTemplate = await TrainingLogTemplate.create({

diff --git a/src/controllers/training-request/TrainingRequestController.ts b/src/controllers/training-request/TrainingRequestController.ts
@@ -118,10 +118,22 @@ async function getPlanned(request: Request, response: Response) {
             user_id: user.id,
             passed: null,
         },
+        attributes: ["id", "user_id", "createdAt"],
         include: [
             {
                 association: TrainingSessionBelongsToUsers.associations.training_session,
-                include: [TrainingSession.associations.mentor, TrainingSession.associations.training_station],
+                include: [
+                    TrainingSession.associations.mentor,
+                    {
+                        association: TrainingSession.associations.training_station,
+                        attributes: ["id", "callsign", "frequency"],
+                    },
+                    {
+                        association: TrainingSession.associations.training_type,
+                        attributes: ["id", "name"],
+                    },
+                ],
+                attributes: ["uuid", "mentor_id", "date", "createdAt"],
             },
         ],
     });

diff --git a/src/models/TrainingSession.ts b/src/models/TrainingSession.ts
@@ -24,7 +24,7 @@ export class TrainingSession extends Model<InferAttributes<TrainingSession>, Inf
     declare mentor_id: CreationOptional<number> | null; // NULL for CPTs without Beisitzer ONLY!
     declare completed: CreationOptional<boolean>;
     declare date: CreationOptional<Date> | null;
-    declare training_type_id: number | undefined | null;
+    declare training_type_id: CreationOptional<ForeignKey<TrainingType["id"]>> | null;
     declare training_station_id: CreationOptional<ForeignKey<TrainingStation["id"]>> | undefined | null;
     declare cpt_session_id: CreationOptional<ForeignKey<CptSession["id"]>> | null;
     declare createdAt: CreationOptional<Date> | null;

diff --git a/src/models/User.ts b/src/models/User.ts
@@ -190,7 +190,7 @@ User.init(USER_TABLE_ATTRIBUTES, {
 
     defaultScope: {
         attributes: {
-            exclude: ["access_token", "refresh_token", "email"],
+            exclude: ["access_token", "refresh_token", "email", "createdAt", "updatedAt"],
         },
     },
     scopes: {