Merge branch 'main' of https://github.com/GBSL-Informatik/teaching-api

Author: lebalz

src/controllers/documentRoots.ts

@@ -25,7 +25,7 @@ export const findManyFor: RequestHandler<
     { id: string /** userId */ },
     any,
     any,
-    { ignoreMissingRoots?: boolean; ids: string[] }
+    { ignoreMissingRoots?: boolean; type?: string; ids: string[] }
 > = async (req, res, next) => {
     if (!req.params.id) {
         throw new HTTP400Error('Missing user id');
@@ -38,7 +38,10 @@ export const findManyFor: RequestHandler<
     if (ids.length === 0 || !req.query.ids) {
         return res.json([]);
     }
-    const documents = await DocumentRoot.findManyModels(req.params.id, ids, !!req.query.ignoreMissingRoots);
+    const documents = await DocumentRoot.findManyModels(req.params.id, ids, {
+        ignoreMissingRoots: !!req.query.ignoreMissingRoots,
+        documentType: req.query.type && (req.query.type as string | undefined)
+    });
     res.json(documents);
 };
 

src/models/DocumentRoot.ts

@@ -96,7 +96,10 @@ function DocumentRoot(db: PrismaClient['documentRoot']) {
         async findManyModels(
             actorId: string,
             ids: string[],
-            ignoreMissingRoots: boolean = false
+            config: {
+                ignoreMissingRoots?: boolean;
+                documentType?: string;
+            } = {}
         ): Promise<ApiDocumentRoot[] | null> {
             const documentRoots = (await prisma.view_UsersDocuments.findMany({
                 where: { id: { in: ids }, userId: actorId },
@@ -106,6 +109,11 @@ function DocumentRoot(db: PrismaClient['documentRoot']) {
                 .filter((docRoot) => docRoot !== null)
                 .map((docRoot) => {
                     delete (docRoot as any).userId;
+                    if (config.documentType) {
+                        docRoot.documents = docRoot.documents.filter(
+                            (doc) => doc.type === config.documentType
+                        );
+                    }
                     return docRoot;
                 });
             const missingDocumentRoots = ids.filter(
@@ -115,7 +123,7 @@ function DocumentRoot(db: PrismaClient['documentRoot']) {
              * Possibly the user does not have documents in the requested document roots (and thus no docRoot is returned above).
              * In this case, we have to load these documentRoots too.
              */
-            if (missingDocumentRoots.length > 0 && !ignoreMissingRoots) {
+            if (missingDocumentRoots.length > 0 && !config.ignoreMissingRoots) {
                 const docRoots = await db.findMany({
                     where: { id: { in: missingDocumentRoots } },
                     include: {

src/routes/router.ts

@@ -61,6 +61,7 @@ router.get('/users/:id', findUser);
 router.put('/users/:id', updateUser);
 /**
  * @optional ?ignoreMissingRoots: boolean
+ * @optional ?type: string -> filter included documents by provided type
  * @requires ?ids: string[]
  */
 router.get('/users/:id/documentRoots', findManyDocumentRootsFor);