Merge pull request #481 from openscript-ch/480-add-filter-by-study-id

480 add filter by study

Author: openscript

.changeset/four-facts-end.md

@@ -0,0 +1,6 @@
+---
+"@quassel/frontend": patch
+"@quassel/backend": patch
+---
+
+Filter by study id in questionnaires

apps/backend/src/research/questionnaires/questionnaires.controller.ts

@@ -37,16 +37,18 @@ export class QuestionnairesController {
   })
   @ApiQuery({ name: "sortOrder", enumName: "SortOrder", enum: SortOrder, required: false, description: "Sort order" })
   @ApiQuery({ name: "participantId", required: false, description: "Filter by participant ID" })
+  @ApiQuery({ name: "studyId", required: false, description: "Filter by study ID" })
   @ApiQuery({ name: "studyTitle", required: false, description: "Filter by study title" })
   @ApiOperation({ summary: "Get all questionnairess" })
   @Serialize(QuestionnaireResponseDto)
   index(
     @Query("sortBy") sortBy?: QuestionnaireSortableField,
     @Query("sortOrder") sortOrder?: SortOrder,
     @Query("participantId") participantId?: number,
+    @Query("studyId") studyId?: number,
     @Query("studyTitle") studyTitle?: string
   ): Promise<QuestionnaireResponseDto[]> {
-    return this.questionnairesService.findAll({ sortBy, sortOrder, participantId, studyTitle });
+    return this.questionnairesService.findAll({ sortBy, sortOrder, participantId, studyId, studyTitle });
   }
 
   @Get(":id")

apps/backend/src/research/questionnaires/questionnaires.service.ts

@@ -59,17 +59,20 @@ export class QuestionnairesService {
     sortBy,
     sortOrder,
     participantId,
+    studyId,
     studyTitle,
   }: {
     sortBy?: keyof QueryOrderMap<Questionnaire>;
     sortOrder?: SortOrder;
     participantId?: number;
+    studyId?: number;
     studyTitle?: string;
   }) {
     return (
       await this.questionnaireRepository.findAll({
         where: {
           ...(participantId && { participant: participantId }),
+          ...(studyId && { participant: { studies: { $some: { id: studyId } } } }),
           ...(studyTitle && { participant: { studies: { $some: { title: { $fulltext: studyTitle } } } } }),
         },
         populate: ["participant"],

apps/frontend/src/api.gen.ts

@@ -1929,6 +1929,8 @@ export interface operations {
                 sortOrder?: components["schemas"]["SortOrder"];
                 /** @description Filter by participant ID */
                 participantId?: number;
+                /** @description Filter by study ID */
+                studyId?: number;
                 /** @description Filter by study title */
                 studyTitle?: string;
             };
@@ -2336,7 +2338,7 @@ export interface operations {
 type ReadonlyArray<T> = [
     Exclude<T, undefined>
 ] extends [
-    any[]
+    unknown[]
 ] ? Readonly<Exclude<T, undefined>> : Readonly<Exclude<T, undefined>[]>;
 export const userCreationDtoRoleValues: ReadonlyArray<components["schemas"]["UserCreationDto"]["role"]> = ["ASSISTANT", "ADMIN"];
 export const userResponseDtoRoleValues: ReadonlyArray<components["schemas"]["UserResponseDto"]["role"]> = ["ASSISTANT", "ADMIN"];

apps/frontend/src/routes/_auth/administration/questionnaires/index.tsx

@@ -10,6 +10,7 @@ import { paths } from "../../../../api.gen";
 type QuestionnaireFilter = {
   participantId?: string | number;
   studyTitle?: string;
+  studyId?: string | number;
 };
 
 function AdministrationQuestionnairesIndex() {
@@ -44,7 +45,8 @@ function AdministrationQuestionnairesIndex() {
       <form onSubmit={f.onSubmit(applyFilters)}>
         <Group align="flex-end">
           <NumberInput {...f.getInputProps("participantId")} label="Child ID" />
-          <TextInput {...f.getInputProps("studyTitle")} label="Study" />
+          <TextInput {...f.getInputProps("studyId")} label="Study ID" />
+          <TextInput {...f.getInputProps("studyTitle")} label="Study Name" />
           <Button type="submit" variant="default" rightSection={<IconFilter size={20} />}>
             Filter
           </Button>

package.json

@@ -18,7 +18,7 @@
   "author": "openscript GmbH",
   "license": "MIT",
   "devDependencies": {
-    "@changesets/cli": "^2.29.6",
+    "@changesets/cli": "^2.29.7",
     "@eslint/js": "^9.35.0",
     "@nestjs/cli": "^11.0.10",
     "@nx-tools/container-metadata": "^6.8.2",