Merge pull request #371 from openscript-ch/337-the-same-child-cannot-be-assigned-to-different-studies

337 the same child cannot be assigned to different studies

Author: openscript

.changeset/vast-showers-tan.md

@@ -0,0 +1,7 @@
+---
+"@quassel/frontend": patch
+"@quassel/backend": patch
+"@quassel/ui": patch
+---
+
+Redesign data model. Allow assigning Participants to multiple studies.

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

@@ -234,55 +234,6 @@
         }
       }
     },
-    {
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "serial",
-          "unsigned": false,
-          "autoincrement": true,
-          "primary": true,
-          "nullable": false,
-          "mappedType": "integer"
-        },
-        "title": {
-          "name": "title",
-          "type": "varchar(255)",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "length": 255,
-          "mappedType": "string"
-        }
-      },
-      "name": "study",
-      "schema": "public",
-      "indexes": [
-        {
-          "keyName": "study_pkey",
-          "columnNames": [
-            "id"
-          ],
-          "composite": false,
-          "constraint": true,
-          "primary": true,
-          "unique": true
-        }
-      ],
-      "checks": [],
-      "foreignKeys": {},
-      "nativeEnums": {
-        "UserRole": {
-          "name": "UserRole",
-          "schema": "public",
-          "items": [
-            "ASSISTANT",
-            "ADMIN"
-          ]
-        }
-      }
-    },
     {
       "columns": {
         "id": {
@@ -354,15 +305,6 @@
           "length": 6,
           "mappedType": "datetime"
         },
-        "study_id": {
-          "name": "study_id",
-          "type": "int",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "mappedType": "integer"
-        },
         "participant_id": {
           "name": "participant_id",
           "type": "bigint",
@@ -389,18 +331,6 @@
       ],
       "checks": [],
       "foreignKeys": {
-        "questionnaire_study_id_foreign": {
-          "constraintName": "questionnaire_study_id_foreign",
-          "columnNames": [
-            "study_id"
-          ],
-          "localTableName": "public.questionnaire",
-          "referencedColumnNames": [
-            "id"
-          ],
-          "referencedTableName": "public.study",
-          "updateRule": "cascade"
-        },
         "questionnaire_participant_id_foreign": {
           "constraintName": "questionnaire_participant_id_foreign",
           "columnNames": [
@@ -659,6 +589,131 @@
         }
       }
     },
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "unsigned": false,
+          "autoincrement": true,
+          "primary": true,
+          "nullable": false,
+          "mappedType": "integer"
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(255)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 255,
+          "mappedType": "string"
+        }
+      },
+      "name": "study",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "study_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {},
+      "nativeEnums": {
+        "UserRole": {
+          "name": "UserRole",
+          "schema": "public",
+          "items": [
+            "ASSISTANT",
+            "ADMIN"
+          ]
+        }
+      }
+    },
+    {
+      "columns": {
+        "study_id": {
+          "name": "study_id",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "integer"
+        },
+        "participant_id": {
+          "name": "participant_id",
+          "type": "bigint",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "bigint"
+        }
+      },
+      "name": "study_participants",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "study_participants_pkey",
+          "columnNames": [
+            "study_id",
+            "participant_id"
+          ],
+          "composite": true,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {
+        "study_participants_study_id_foreign": {
+          "constraintName": "study_participants_study_id_foreign",
+          "columnNames": [
+            "study_id"
+          ],
+          "localTableName": "public.study_participants",
+          "referencedColumnNames": [
+            "id"
+          ],
+          "referencedTableName": "public.study",
+          "deleteRule": "cascade",
+          "updateRule": "cascade"
+        },
+        "study_participants_participant_id_foreign": {
+          "constraintName": "study_participants_participant_id_foreign",
+          "columnNames": [
+            "participant_id"
+          ],
+          "localTableName": "public.study_participants",
+          "referencedColumnNames": [
+            "id"
+          ],
+          "referencedTableName": "public.participant",
+          "deleteRule": "cascade",
+          "updateRule": "cascade"
+        }
+      },
+      "nativeEnums": {
+        "UserRole": {
+          "name": "UserRole",
+          "schema": "public",
+          "items": [
+            "ASSISTANT",
+            "ADMIN"
+          ]
+        }
+      }
+    },
     {
       "columns": {
         "id": {

apps/backend/db/migrations/Migration20250305095459.ts

@@ -0,0 +1,33 @@
+import { Migration } from '@mikro-orm/migrations';
+import { Questionnaire } from '../../src/research/questionnaires/questionnaire.entity';
+
+export class Migration20250305095459 extends Migration {
+
+  override async up(): Promise<void> {
+    const em = this.getEntityManager();
+    const qb = em.createQueryBuilder(Questionnaire)
+
+    this.addSql(`create table "study_participants" ("study_id" int not null, "participant_id" bigint not null, constraint "study_participants_pkey" primary key ("study_id", "participant_id"));`);
+
+    this.addSql(`alter table "study_participants" add constraint "study_participants_study_id_foreign" foreign key ("study_id") references "study" ("id") on update cascade on delete cascade;`);
+    this.addSql(`alter table "study_participants" add constraint "study_participants_participant_id_foreign" foreign key ("participant_id") references "participant" ("id") on update cascade on delete cascade;`);
+
+    const questionnaires = await qb.select(["participant_id","study_id"]).distinct().execute<{ participant: number, study_id: number }[]>()
+
+    for (const { participant, study_id } of questionnaires) {
+      this.addSql(`insert into "study_participants" ("study_id", "participant_id") values (${study_id}, ${participant});`);
+    }
+
+    this.addSql(`alter table "questionnaire" drop constraint "questionnaire_study_id_foreign";`);
+
+    this.addSql(`alter table "questionnaire" drop column "study_id";`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop table if exists "study_participants" cascade;`);
+
+    this.addSql(`alter table "questionnaire" add column "study_id" int not null;`);
+    this.addSql(`alter table "questionnaire" add constraint "questionnaire_study_id_foreign" foreign key ("study_id") references "study" ("id") on update cascade;`);
+  }
+
+}

apps/backend/src/main.ts

@@ -13,6 +13,7 @@ async function bootstrap() {
   app.enableCors({
     credentials: true,
     origin: configService.get("cors.origin"),
+    methods: ["GET", "POST", "PUT", "DELETE"],
     exposedHeaders: ["Content-Disposition"],
   });
   app.enableShutdownHooks();

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

@@ -1,7 +1,8 @@
-import { BaseEntity, Collection, Entity, OneToMany, PrimaryKey, Property } from "@mikro-orm/core";
+import { BaseEntity, Collection, Entity, ManyToMany, OneToMany, PrimaryKey, Property } from "@mikro-orm/core";
 import { Carer } from "../../defaults/carers/carer.entity";
 import { Language } from "../../defaults/languages/language.entity";
 import { Questionnaire } from "../questionnaires/questionnaire.entity";
+import { Study } from "../studies/study.entity";
 
 @Entity()
 export class Participant extends BaseEntity {
@@ -19,4 +20,7 @@ export class Participant extends BaseEntity {
 
   @OneToMany(() => Language, (language) => language.participant)
   languages = new Collection<Language>(this);
+
+  @ManyToMany(() => Study, (study) => study.participants)
+  studies = new Collection<Study>(this);
 }

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

@@ -1,7 +1,6 @@
 import { ApiProperty, PartialType } from "@nestjs/swagger";
 import { Expose, Type } from "class-transformer";
 import { IsDateString, IsNotEmpty, IsOptional } from "class-validator";
-import { StudyResponseDto } from "../studies/study.dto";
 import { EntryResponseDto } from "../entries/entry.dto";
 import { ParticipantResponseDto } from "../participants/participant.dto";
 
@@ -41,10 +40,6 @@ export class QuestionnaireResponseDto extends QuestionnaireBaseDto {
   @Expose()
   createdAt: Date;
 
-  @Type(() => StudyResponseDto)
-  @Expose()
-  study: StudyResponseDto;
-
   @Type(() => ParticipantResponseDto)
   @Expose()
   participant: ParticipantResponseDto;
@@ -57,7 +52,6 @@ export class QuestionnaireDetailResponseDto extends QuestionnaireResponseDto {
 }
 
 export class QuestionnaireCreationDto extends QuestionnaireBaseDto {
-  study: number;
   participant: number;
 }
 export class QuestionnaireMutationDto extends PartialType(QuestionnaireCreationDto) {}

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

@@ -1,6 +1,5 @@
 import { Collection, Entity, Formula, ManyToOne, OneToMany, Property } from "@mikro-orm/core";
 import { BaseEntity } from "../../common/entities/base.entity";
-import { Study } from "../studies/study.entity";
 import { Participant } from "../participants/participant.entity";
 import { Entry } from "../entries/entry.entity";
 
@@ -24,9 +23,6 @@ export class Questionnaire extends BaseEntity {
   @Property()
   completedAt?: Date;
 
-  @ManyToOne()
-  study: Study;
-
   @ManyToOne()
   participant: Participant;
 

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

@@ -52,7 +52,7 @@ export class QuestionnairesService {
       throw e;
     }
 
-    return (await questionnaire.populate(["entries", "entries.carer", "entries.entryLanguages.language", "participant", "study"])).toObject();
+    return (await questionnaire.populate(["entries", "entries.carer", "entries.entryLanguages.language", "participant"])).toObject();
   }
 
   async findAll({
@@ -69,7 +69,7 @@ export class QuestionnairesService {
     return (
       await this.questionnaireRepository.findAll({
         where: { ...(participantId && { participant: participantId }), ...(studyTitle && { study: { title: { $fulltext: studyTitle } } }) },
-        populate: ["study", "participant"],
+        populate: ["participant"],
         orderBy: sortBy && { [sortBy]: sortOrder },
       })
     ).map((questionnaire) => questionnaire.toObject());
@@ -78,7 +78,7 @@ export class QuestionnairesService {
   async findOne(id: number) {
     return (
       await this.questionnaireRepository.findOneOrFail(id, {
-        populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant", "study"],
+        populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant"],
       })
     ).toObject();
   }
@@ -93,7 +93,7 @@ export class QuestionnairesService {
 
   async update(id: number, questionnaireMutationDto: QuestionnaireMutationDto) {
     const questionnaire = await this.questionnaireRepository.findOneOrFail(id, {
-      populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant", "study"],
+      populate: ["entries", "entries.carer", "entries.entryLanguages.language", "participant"],
     });
 
     const prevQuestionnaire = await this.questionnaireRepository.findOne(

apps/backend/src/research/research.module.ts

@@ -15,10 +15,19 @@ import { Entry } from "./entries/entry.entity";
 import { EntryLanguage } from "./entry-languages/entry-language.entity";
 import { Questionnaire } from "./questionnaires/questionnaire.entity";
 import { Study } from "./studies/study.entity";
+import { StudyParticipantsController } from "./study-participants/study-participants.controller";
+import { StudyParticipantsService } from "./study-participants/study-participants.service";
 
 @Module({
   imports: [MikroOrmModule.forFeature([Entry, EntryLanguage, Participant, Questionnaire, Study])],
-  providers: [ParticipantsService, EntriesService, EntryLanguagesService, QuestionnairesService, StudiesService],
-  controllers: [ParticipantsController, EntriesController, QuestionnairesController, EntryLanguagesController, StudiesController],
+  providers: [ParticipantsService, EntriesService, EntryLanguagesService, QuestionnairesService, StudiesService, StudyParticipantsService],
+  controllers: [
+    ParticipantsController,
+    EntriesController,
+    QuestionnairesController,
+    EntryLanguagesController,
+    StudiesController,
+    StudyParticipantsController,
+  ],
 })
 export class ResearchModule {}