fix: only fetch carers of current participant

Author: stampaaaron

apps/backend/src/defaults/carers/carers.controller.ts

@@ -1,5 +1,5 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post } from "@nestjs/common";
-import { ApiOperation, ApiTags, ApiUnprocessableEntityResponse } from "@nestjs/swagger";
+import { Body, Controller, Delete, Get, Param, Patch, Post, Query } from "@nestjs/common";
+import { ApiOperation, ApiQuery, ApiTags, ApiUnprocessableEntityResponse } from "@nestjs/swagger";
 import { CarersService } from "./carers.service";
 import { CarerCreationDto, CarerMutationDto, CarerResponseDto } from "./carer.dto";
 import { ErrorResponseDto } from "../../common/dto/error.dto";
@@ -19,9 +19,10 @@ export class CarersController {
   }
 
   @Get()
+  @ApiQuery({ name: "participantId", required: false, type: Number })
   @ApiOperation({ summary: "Get all carers" })
-  index(): Promise<CarerResponseDto[]> {
-    return this.carersService.findAll();
+  index(@Query("participantId") participantId?: number): Promise<CarerResponseDto[]> {
+    return this.carersService.findAll(participantId);
   }
 
   @Get(":id")

apps/backend/src/defaults/carers/carers.service.ts

@@ -14,7 +14,7 @@ export class CarersService {
 
   async create(carerCreationDto: CarerCreationDto) {
     const carer = new Carer();
-    carer.assign(carerCreationDto);
+    carer.assign(carerCreationDto, { em: this.em });
 
     try {
       await this.em.persist(carer).flush();
@@ -28,8 +28,12 @@ export class CarersService {
     return carer.toObject();
   }
 
-  async findAll() {
-    return (await this.carerRepository.findAll()).map((carer) => carer.toObject());
+  async findAll(participantId?: number) {
+    return (
+      await this.carerRepository.findAll({
+        where: participantId ? { $or: [{ participant: null }, { participant: participantId }] } : { participant: null },
+      })
+    ).map((carer) => carer.toObject());
   }
 
   async findOne(id: number) {

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

@@ -25,7 +25,7 @@ export class QuestionnairesService {
       throw e;
     }
 
-    return (await questionnaire.populate(["entries", "entries.carer", "entries.entryLanguages.language"])).toObject();
+    return (await questionnaire.populate(["entries", "entries.carer", "entries.entryLanguages.language", "participant"])).toObject();
   }
 
   async findAll() {
@@ -34,7 +34,9 @@ export class QuestionnairesService {
 
   async findOne(id: number) {
     return (
-      await this.questionnaireRepository.findOneOrFail(id, { populate: ["entries", "entries.carer", "entries.entryLanguages.language"] })
+      await this.questionnaireRepository.findOneOrFail(id, {
+        populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant"],
+      })
     ).toObject();
   }
 
@@ -44,7 +46,7 @@ export class QuestionnairesService {
 
   async update(id: number, questionnaireMutationDto: QuestionnaireMutationDto) {
     const questionnaire = await this.questionnaireRepository.findOneOrFail(id, {
-      populate: ["entries", "entries.carer", "entries.entryLanguages.language"],
+      populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant"],
     });
     questionnaire.assign(questionnaireMutationDto);
 

apps/frontend/src/api.gen.ts

@@ -1306,7 +1306,9 @@ export interface operations {
     };
     CarersController_index: {
         parameters: {
-            query?: never;
+            query?: {
+                participantId?: number;
+            };
             header?: never;
             path?: never;
             cookie?: never;

apps/frontend/src/components/CarerSelect.tsx

@@ -1,10 +1,10 @@
-import { $api } from "../stores/api";
+import { components } from "../api.gen";
 import { EntitySelect, EntitySelectProps } from "./EntitySelect";
 
-type CarerSelectProps = EntitySelectProps;
-
-export function CarerSelect({ value, onChange, onAddNew, ...rest }: CarerSelectProps) {
-  const { data } = $api.useQuery("get", "/carers");
+type CarerSelectProps = EntitySelectProps & {
+  data: components["schemas"]["CarerDto"][];
+};
 
+export function CarerSelect({ value, onChange, onAddNew, data, ...rest }: CarerSelectProps) {
   return <EntitySelect value={value} onChange={onChange} onAddNew={onAddNew} {...rest} data={data} inputKey="name" />;
 }

apps/frontend/src/components/questionnaire/calendar/EntryForm.tsx

@@ -5,6 +5,7 @@ import { useStore } from "@nanostores/react";
 import { useEffect } from "react";
 import { CarerSelect } from "../../CarerSelect";
 import { LanguageSelect } from "../../LanguageSelect";
+import { components } from "../../../api.gen";
 
 export type EntryFormValues = {
   carer?: number;
@@ -32,10 +33,11 @@ type EntityFormProps = {
   onDelete?: () => void;
   onAddCarer: (value: string) => Promise<number>;
   entry?: Partial<EntryFormValues>;
+  carers: components["schemas"]["CarerDto"][];
   actionLabel: string;
 };
 
-export function EntityForm({ onSave, onDelete, onAddCarer, actionLabel, entry }: EntityFormProps) {
+export function EntityForm({ onSave, onDelete, onAddCarer, actionLabel, entry, carers }: EntityFormProps) {
   const t = useStore(messages);
   const f = useForm<EntryFormValues>({
     initialValues: {
@@ -90,7 +92,7 @@ export function EntityForm({ onSave, onDelete, onAddCarer, actionLabel, entry }:
   return (
     <form onSubmit={f.onSubmit(onSave)}>
       <Stack>
-        <CarerSelect {...f.getInputProps("carer")} onAddNew={onAddCarer} placeholder={t.labelCarer} />
+        <CarerSelect data={carers} {...f.getInputProps("carer")} onAddNew={onAddCarer} placeholder={t.labelCarer} />
 
         {f.getValues().entryLanguages.map((_, index) => (
           // TODO: make key either languageId or name of new language entry

apps/frontend/src/routes/_auth/questionnaire/_questionnaire/$id/entries.tsx

@@ -53,6 +53,7 @@ function QuestionnaireEntries() {
   const deleteMutation = $api.useMutation("delete", "/entries/{id}");
   const { data: questionnaire, refetch } = $api.useSuspenseQuery("get", "/questionnaires/{id}", { params: { path: { id: p.id } } });
 
+  const { data: carers } = $api.useQuery("get", "/carers", { params: { query: { participantId: questionnaire.participant?.id } } });
   const createCarerMutation = $api.useMutation("post", "/carers", {
     onSuccess() {
       c.refetchQueries($api.queryOptions("get", "/carers"));
@@ -126,6 +127,7 @@ function QuestionnaireEntries() {
           onSave={handleOnSave}
           onDelete={entryUpdatingId ? () => handleDelete(entryUpdatingId) : undefined}
           entry={entryDraft}
+          carers={carers ?? []}
           actionLabel={t.addEntityLabel}
         />
       </Modal>