Merge pull request #189 from openscript-ch/47-finish-a-questionnaire-when-there-is-no-other-period

47 finish a questionnaire when there is no other period

Author: openscript

apps/backend/db/migrations/.snapshot-postgres.json

@@ -445,7 +445,7 @@
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": false,
+          "nullable": true,
           "mappedType": "integer"
         },
         "carer_id": {
@@ -497,6 +497,7 @@
             "id"
           ],
           "referencedTableName": "public.questionnaire",
+          "deleteRule": "cascade",
           "updateRule": "cascade"
         },
         "entry_carer_id_foreign": {

apps/backend/db/migrations/Migration20241211083949.ts

@@ -0,0 +1,23 @@
+import { Migration } from "@mikro-orm/migrations";
+
+export class Migration20241211083949 extends Migration {
+  override async up(): Promise<void> {
+    this.addSql(`alter table "entry" drop constraint "entry_questionnaire_id_foreign";`);
+
+    this.addSql(`alter table "entry" alter column "questionnaire_id" type int using ("questionnaire_id"::int);`);
+    this.addSql(`alter table "entry" alter column "questionnaire_id" drop not null;`);
+    this.addSql(
+      `alter table "entry" add constraint "entry_questionnaire_id_foreign" foreign key ("questionnaire_id") references "questionnaire" ("id") on update cascade on delete cascade;`
+    );
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "entry" drop constraint "entry_questionnaire_id_foreign";`);
+
+    this.addSql(`alter table "entry" alter column "questionnaire_id" type int using ("questionnaire_id"::int);`);
+    this.addSql(`alter table "entry" alter column "questionnaire_id" set not null;`);
+    this.addSql(
+      `alter table "entry" add constraint "entry_questionnaire_id_foreign" foreign key ("questionnaire_id") references "questionnaire" ("id") on update cascade;`
+    );
+  }
+}

apps/backend/package.json

@@ -42,6 +42,7 @@
     "@nestjs/terminus": "^10.2.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "date-fns": "^4.1.0",
     "fastify": "^4.28.1",
     "hash-wasm": "^4.12.0",
     "reflect-metadata": "^0.2.2",

apps/backend/src/research/entries/entry.entity.ts

@@ -1,4 +1,4 @@
-import { Check, Collection, Entity, ManyToOne, OneToMany, Opt, Property } from "@mikro-orm/core";
+import { Cascade, Check, Collection, Entity, ManyToOne, OneToMany, Opt, Property } from "@mikro-orm/core";
 import { BaseEntity } from "../../common/entities/base.entity";
 import { Carer } from "../../defaults/carers/carer.entity";
 import { EntryLanguage } from "../entry-languages/entry-language.entity";
@@ -23,7 +23,7 @@ export class Entry extends BaseEntity {
   @Check<Entry>({ expression: (columns) => `${columns.weeklyRecurring} >= 1` })
   weeklyRecurring!: number & Opt;
 
-  @ManyToOne()
+  @ManyToOne({ cascade: [Cascade.ALL] })
   questionnaire!: Questionnaire;
 
   @ManyToOne()

apps/backend/src/research/participants/participant.dto.ts

@@ -1,6 +1,7 @@
 import { ApiProperty, OmitType, PartialType } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsDateString, IsOptional } from "class-validator";
+import { QuestionnaireListResponseDto } from "../questionnaires/questionnaire.dto";
 
 export class ParticipantDto {
   @ApiProperty({ example: 1, description: "The id of the participant (child id)" })
@@ -11,6 +12,9 @@ export class ParticipantDto {
   @IsOptional()
   birthday?: Date;
 
+  @Type(() => QuestionnaireListResponseDto)
+  latestQuestionnaire?: QuestionnaireListResponseDto;
+
   @Type(() => Array<number>)
   questionnaires: number[];
 

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

@@ -5,11 +5,15 @@ import { ParticipantCreationDto, ParticipantMutationDto, ParticipantResponseDto
 import { ErrorResponseDto } from "../../common/dto/error.dto";
 import { Roles } from "../../system/users/roles.decorator";
 import { UserRole } from "../../system/users/user.entity";
+import { QuestionnairesService } from "../questionnaires/questionnaires.service";
 
 @ApiTags("Participants")
 @Controller("participants")
 export class ParticipantsController {
-  constructor(private readonly participantService: ParticipantsService) {}
+  constructor(
+    private readonly participantService: ParticipantsService,
+    private readonly questionnairesService: QuestionnairesService
+  ) {}
 
   @Post()
   @ApiOperation({ summary: "Create a participant" })
@@ -27,8 +31,10 @@ export class ParticipantsController {
   @Get(":id")
   @ApiOperation({ summary: "Get a participant by ID" })
   @ApiNotFoundResponse({ description: "Entity not found exception", type: ErrorResponseDto })
-  get(@Param("id") id: string): Promise<ParticipantResponseDto> {
-    return this.participantService.findOne(+id);
+  async get(@Param("id") id: string): Promise<ParticipantResponseDto> {
+    const participant = await this.participantService.findOne(+id);
+    const latestQuestionnaire = (await this.questionnairesService.findLatestByParticipant(+id))?.toObject();
+    return { ...participant, latestQuestionnaire };
   }
 
   @Patch(":id")

apps/backend/src/research/questionnaires/questionnaire.dto.ts

@@ -35,7 +35,7 @@ export class QuestionnaireDto {
 }
 export class QuestionnaireResponseDto extends QuestionnaireDto {}
 export class EntryQuestionnaireDto extends OmitType(QuestionnaireDto, ["entries"]) {}
-export class QuestionnairesResponseDto extends OmitType(QuestionnaireDto, ["entries"]) {}
+export class QuestionnaireListResponseDto extends OmitType(QuestionnaireDto, ["entries"]) {}
 export class QuestionnaireCreationDto extends OmitType(QuestionnaireDto, ["id", "study", "participant"]) {
   study: number;
   participant: number;

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

@@ -4,7 +4,12 @@ import { ErrorResponseDto } from "../../common/dto/error.dto";
 import { Roles } from "../../system/users/roles.decorator";
 import { UserRole } from "../../system/users/user.entity";
 import { QuestionnairesService } from "./questionnaires.service";
-import { QuestionnaireCreationDto, QuestionnaireResponseDto, QuestionnaireMutationDto, QuestionnairesResponseDto } from "./questionnaire.dto";
+import {
+  QuestionnaireCreationDto,
+  QuestionnaireResponseDto,
+  QuestionnaireMutationDto,
+  QuestionnaireListResponseDto,
+} from "./questionnaire.dto";
 
 @ApiTags("Questionnaires")
 @Controller("questionnaires")
@@ -20,7 +25,7 @@ export class QuestionnairesController {
 
   @Get()
   @ApiOperation({ summary: "Get all questionnairess" })
-  index(): Promise<QuestionnairesResponseDto[]> {
+  index(): Promise<QuestionnaireListResponseDto[]> {
     return this.questionnairesService.findAll();
   }
 

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

@@ -3,6 +3,9 @@ import { InjectRepository } from "@mikro-orm/nestjs";
 import { Injectable, UnprocessableEntityException } from "@nestjs/common";
 import { QuestionnaireCreationDto, QuestionnaireMutationDto } from "./questionnaire.dto";
 import { Questionnaire } from "./questionnaire.entity";
+import { Entry } from "../entries/entry.entity";
+import { EntryLanguage } from "../entry-languages/entry-language.entity";
+import { addDays, isSameDay } from "date-fns";
 
 @Injectable()
 export class QuestionnairesService {
@@ -16,6 +19,25 @@ export class QuestionnairesService {
     const questionnaire = new Questionnaire();
     questionnaire.assign(questionnaireCreationDto, { em: this.em });
 
+    const prevQuestionnaire = await this.findLatestByParticipant(questionnaire.participant!.id);
+    this.validateStartDate(questionnaire, prevQuestionnaire);
+
+    await prevQuestionnaire?.populate(["entries.entryLanguages"]);
+
+    const clonedEntries = prevQuestionnaire?.entries.map((entry) => {
+      const { id: _id, entryLanguages: _entryLanguages, questionnaire: _questionnaire, ...rest } = entry.toPOJO();
+      const newEntry = this.em.create(Entry, { ...rest, questionnaire });
+
+      entry.entryLanguages.map((entryLanguage) => {
+        const { id: _id, entry: _entry, ...rest } = entryLanguage.toPOJO();
+        return this.em.create(EntryLanguage, { ...rest, entry: newEntry });
+      });
+
+      return newEntry;
+    });
+
+    questionnaire.assign({ entries: clonedEntries ?? [] });
+
     try {
       await this.em.persist(questionnaire).flush();
     } catch (e) {
@@ -42,12 +64,21 @@ export class QuestionnairesService {
     return (await this.questionnaireRepository.findOneOrFail(filter)).toObject();
   }
 
+  async findLatestByParticipant(participantId: number) {
+    return this.questionnaireRepository.findOne({ participant: participantId }, { orderBy: { endedAt: "desc" } });
+  }
+
   async update(id: number, questionnaireMutationDto: QuestionnaireMutationDto) {
     const questionnaire = await this.questionnaireRepository.findOneOrFail(id, {
       populate: ["entries", "entries.carer", "entries.entryLanguages.language"],
     });
     questionnaire.assign(questionnaireMutationDto);
 
+    const prevQuestionnaire = await this.findLatestByParticipant(questionnaire.participant!.id);
+    if (prevQuestionnaire?.id !== id) {
+      this.validateStartDate(questionnaire, prevQuestionnaire);
+    }
+
     await this.em.persist(questionnaire).flush();
 
     return questionnaire.toObject();
@@ -56,4 +87,10 @@ export class QuestionnairesService {
   remove(id: number) {
     return this.em.remove(this.questionnaireRepository.getReference(id)).flush();
   }
+
+  private validateStartDate(questionnaire: Questionnaire, prevQuestionnaire: Questionnaire | null) {
+    if (prevQuestionnaire && !isSameDay(addDays(prevQuestionnaire.endedAt!, 1), questionnaire.startedAt!)) {
+      throw new UnprocessableEntityException("Start of the new questionnaire must match with the end of the previous");
+    }
+  }
 }

apps/frontend/package.json

@@ -20,22 +20,22 @@
     "@fullcalendar/interaction": "^6.1.15",
     "@fullcalendar/react": "^6.1.15",
     "@fullcalendar/timegrid": "^6.1.15",
-    "@mantine/form": "^7.15.0",
+    "@mantine/form": "^7.15.1",
     "@nanostores/i18n": "^0.12.2",
     "@nanostores/persistent": "^0.10.2",
     "@nanostores/react": "^0.8.2",
     "@quassel/ui": "workspace:*",
-    "@tanstack/react-query": "^5.62.3",
-    "@tanstack/react-router": "^1.87.3",
+    "@tanstack/react-query": "^5.62.7",
+    "@tanstack/react-router": "^1.88.0",
     "nanostores": "^0.11.3",
     "openapi-fetch": "0.13.3",
     "openapi-react-query": "0.2.8",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@tanstack/router-devtools": "^1.87.3",
-    "@tanstack/router-plugin": "^1.87.4",
+    "@tanstack/router-devtools": "^1.88.0",
+    "@tanstack/router-plugin": "^1.87.13",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@types/react": "^18.3.1",