Merge pull request #180 from openscript-ch/7-implement-basic-calendar-view-date-navigation-time-slots

7 implement basic calendar view date navigation time slots

Author: stampaaaron

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

@@ -481,8 +481,8 @@
         },
         {
           "name": "entry_weekly_recurring_check",
-          "expression": "weekday >= 1",
-          "definition": "check ((weekday >= 1))",
+          "expression": "weekly_recurring >= 1",
+          "definition": "check ((weekly_recurring >= 1))",
           "columnName": "weekly_recurring"
         }
       ],
@@ -558,7 +558,7 @@
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": false,
+          "nullable": true,
           "mappedType": "integer"
         }
       },
@@ -607,6 +607,7 @@
             "id"
           ],
           "referencedTableName": "public.entry",
+          "deleteRule": "cascade",
           "updateRule": "cascade"
         }
       },

apps/backend/db/migrations/Migration20241209144817.ts

@@ -0,0 +1,15 @@
+import { Migration } from "@mikro-orm/migrations";
+
+export class Migration20241209144817 extends Migration {
+  override async up(): Promise<void> {
+    this.addSql(`alter table "entry" drop constraint entry_weekly_recurring_check;`);
+
+    this.addSql(`alter table "entry" add constraint entry_weekly_recurring_check check(weekly_recurring >= 1);`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "entry" drop constraint entry_weekly_recurring_check;`);
+
+    this.addSql(`alter table "entry" add constraint entry_weekly_recurring_check check(weekday >= 1);`);
+  }
+}

apps/backend/db/migrations/Migration20241210094456.ts

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

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

@@ -14,7 +14,7 @@ export class EntriesService {
 
   async create(entryCreationDto: EntryCreationDto) {
     const entry = new Entry();
-    entry.assign(entryCreationDto);
+    entry.assign(entryCreationDto, { em: this.em });
 
     try {
       await this.em.persist(entry).flush();
@@ -25,23 +25,23 @@ export class EntriesService {
       throw e;
     }
 
-    return entry.toObject();
+    return (await entry.populate(["entryLanguages"])).toObject();
   }
 
   async findAll() {
-    return (await this.entryRepository.findAll()).map((entry) => entry.toObject());
+    return (await this.entryRepository.findAll({ populate: ["entryLanguages"] })).map((entry) => entry.toObject());
   }
 
   async findOne(id: number) {
-    return (await this.entryRepository.findOneOrFail(id)).toObject();
+    return (await this.entryRepository.findOneOrFail(id, { populate: ["entryLanguages"] })).toObject();
   }
 
   async findBy(filter: FilterQuery<Entry>) {
-    return (await this.entryRepository.findOneOrFail(filter)).toObject();
+    return (await this.entryRepository.findOneOrFail(filter, { populate: ["entryLanguages"] })).toObject();
   }
 
   async update(id: number, entryMutationDto: EntryMutationDto) {
-    const entry = await this.entryRepository.findOneOrFail(id);
+    const entry = await this.entryRepository.findOneOrFail(id, { populate: ["entryLanguages"] });
 
     entry.assign(entryMutationDto);
 

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

@@ -1,19 +1,20 @@
 import { ApiProperty, OmitType, PartialType } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { IsOptional, IsDate, Min, Max } from "class-validator";
-import { QuestionnaireDto } from "../questionnaires/questionnaire.dto";
+import { IsOptional, Min, Max, IsMilitaryTime } from "class-validator";
 import { CarerDto } from "../../defaults/carers/carer.dto";
+import { EntryQuestionnaireDto, QuestionnaireDto } from "../questionnaires/questionnaire.dto";
+import { EntryLanguageCreationDto, EntryLanguageResponseDto } from "../entry-languages/entry-language.dto";
 
 export class EntryDto {
   @ApiProperty({ example: 1, description: "The id of the entry" })
   id: number;
 
   @ApiProperty({ example: "2024-11-01T07:00:00.000Z", description: "The starting date of the entry" })
-  @IsDate()
+  @IsMilitaryTime()
   startedAt: string;
 
   @ApiProperty({ example: "2024-11-01T08:00:00.00Z", description: "The ending date of the entry" })
-  @IsDate()
+  @IsMilitaryTime()
   endedAt: string;
 
   @ApiProperty({ example: 1, description: "The weekday of the entry (Sunday is 0 like in JS)" })
@@ -27,14 +28,21 @@ export class EntryDto {
   weeklyRecurring?: number;
 
   @Type(() => QuestionnaireDto)
-  questionnaire: QuestionnaireDto;
+  questionnaire: EntryQuestionnaireDto;
 
   @Type(() => CarerDto)
   carer: CarerDto;
 
-  @Type(() => Array<number>)
-  entryLanguages: number[];
+  @Type(() => Array<EntryLanguageResponseDto>)
+  entryLanguages: Array<EntryLanguageResponseDto>;
 }
 export class EntryResponseDto extends EntryDto {}
-export class EntryCreationDto extends OmitType(EntryDto, ["id"]) {}
+export class QuestionnaireEntryDto extends OmitType(EntryDto, ["questionnaire"]) {}
+export class EntryCreationDto extends OmitType(EntryDto, ["id", "carer", "questionnaire", "entryLanguages"]) {
+  carer: number;
+  questionnaire: number;
+
+  @Type(() => EntryLanguageCreationDto)
+  entryLanguages: Array<EntryLanguageCreationDto>;
+}
 export class EntryMutationDto extends PartialType(EntryCreationDto) {}

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

@@ -20,7 +20,7 @@ export class Entry extends BaseEntity {
   weekday!: number;
 
   @Property({ default: 1, columnType: "smallint" })
-  @Check<Entry>({ expression: (columns) => `${columns.weekday} >= 1` })
+  @Check<Entry>({ expression: (columns) => `${columns.weeklyRecurring} >= 1` })
   weeklyRecurring!: number & Opt;
 
   @ManyToOne()
@@ -29,6 +29,6 @@ export class Entry extends BaseEntity {
   @ManyToOne()
   carer!: Carer;
 
-  @OneToMany(() => EntryLanguage, (entryLanguage) => entryLanguage.entry)
+  @OneToMany(() => EntryLanguage, (entryLanguage) => entryLanguage.entry, { orphanRemoval: true })
   entryLanguages = new Collection<EntryLanguage>(this);
 }

apps/backend/src/research/entry-languages/entry-language.dto.ts

@@ -1,8 +1,8 @@
-import { ApiProperty, OmitType, PartialType } from "@nestjs/swagger";
+import { ApiProperty, OmitType } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { Min, Max } from "class-validator";
 import { LanguageDto } from "../../defaults/languages/language.dto";
-import { EntryDto } from "../entries/entry.dto";
+import { QuestionnaireEntryDto } from "../entries/entry.dto";
 
 export class EntryLanguageDto {
   @ApiProperty({ example: 1, description: "The id of the entry language" })
@@ -16,9 +16,12 @@ export class EntryLanguageDto {
   @Type(() => LanguageDto)
   language: LanguageDto;
 
-  @Type(() => EntryDto)
-  entry: EntryDto;
+  @Type(() => QuestionnaireEntryDto)
+  entry: QuestionnaireEntryDto;
 }
-export class EntryLanguageResponseDto extends EntryLanguageDto {}
-export class EntryLanguageCreationDto extends OmitType(EntryLanguageDto, ["id"]) {}
-export class EntryLanguageMutationDto extends PartialType(EntryLanguageCreationDto) {}
+export class EntryLanguageResponseDto extends OmitType(EntryLanguageDto, ["entry"]) {}
+export class EntryLanguageMutationDto extends OmitType(EntryLanguageDto, ["id", "entry", "language"]) {
+  id?: number;
+  language?: number;
+}
+export class EntryLanguageCreationDto extends OmitType(EntryLanguageMutationDto, ["id"]) {}

apps/backend/src/research/entry-languages/entry-language.entity.ts

@@ -1,4 +1,4 @@
-import { Check, Entity, ManyToOne, Property } from "@mikro-orm/core";
+import { Cascade, Check, Entity, ManyToOne, Property } from "@mikro-orm/core";
 import { BaseEntity } from "../../common/entities/base.entity";
 import { Language } from "../../defaults/languages/language.entity";
 import { Entry } from "../entries/entry.entity";
@@ -12,6 +12,6 @@ export class EntryLanguage extends BaseEntity {
   @ManyToOne()
   language!: Language;
 
-  @ManyToOne()
+  @ManyToOne({ cascade: [Cascade.ALL] })
   entry!: Entry;
 }

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

@@ -3,6 +3,7 @@ import { Type } from "class-transformer";
 import { IsDateString, IsNotEmpty } from "class-validator";
 import { ParticipantDto } from "../participants/participant.dto";
 import { StudyDto } from "../studies/study.dto";
+import { QuestionnaireEntryDto } from "../entries/entry.dto";
 
 export class QuestionnaireDto {
   @ApiProperty({ example: 1, description: "The id of the questionnaire" })
@@ -29,10 +30,12 @@ export class QuestionnaireDto {
   @Type(() => ParticipantDto)
   participant?: ParticipantDto;
 
-  @Type(() => Array<number>)
-  entries?: number[];
+  @Type(() => Array<QuestionnaireEntryDto>)
+  entries?: QuestionnaireEntryDto[];
 }
 export class QuestionnaireResponseDto extends QuestionnaireDto {}
+export class EntryQuestionnaireDto extends OmitType(QuestionnaireDto, ["entries"]) {}
+export class QuestionnairesResponseDto 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,7 @@ 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 } from "./questionnaire.dto";
+import { QuestionnaireCreationDto, QuestionnaireResponseDto, QuestionnaireMutationDto, QuestionnairesResponseDto } from "./questionnaire.dto";
 
 @ApiTags("Questionnaires")
 @Controller("questionnaires")
@@ -20,7 +20,7 @@ export class QuestionnairesController {
 
   @Get()
   @ApiOperation({ summary: "Get all questionnairess" })
-  index(): Promise<QuestionnaireResponseDto[]> {
+  index(): Promise<QuestionnairesResponseDto[]> {
     return this.questionnairesService.findAll();
   }