changes to WorkingGroup table (#244)

#217

---------

Co-authored-by: Barbara Krautgartner <barbara.krautgartner@oeaw.ac.at>

Author: vronk

prisma/dbml/schema.dbml

@@ -68,6 +68,7 @@ Table event_reports {
   report reports [not null]
   createdAt DateTime [default: `now()`, not null]
   updatedAt DateTime [not null]
+  WGReport wgreports [not null]
 }
 
 Table institutions {
@@ -287,8 +288,42 @@ Table working_groups {
   name String [not null]
   startDate DateTime
   chairs contributions [not null]
+  member_tracking String
+  mailing_list String
   createdAt DateTime [default: `now()`, not null]
   updatedAt DateTime [not null]
+  WGReport wgreports [not null]
+  WGEventDetail WGEventDetail
+  wGEventDetailId String
+}
+
+Table wgreports {
+  id String [pk]
+  comments Json
+  numberMebmers Int
+  status ReportStatus [not null, default: 'draft']
+  year Int [not null]
+  narrativeReport String [not null]
+  facultativeQuestions String [not null]
+  workingGroupId String
+  workingGroup working_groups
+  eventReport event_reports
+  createdAt DateTime [default: `now()`, not null]
+  updatedAt DateTime [not null]
+  eventReportId String
+
+  indexes {
+    (workingGroupId, year) [unique]
+  }
+}
+
+Table WGEventDetail {
+  id String [pk]
+  eventTitle String [not null]
+  eventLink String [not null]
+  working_groups working_groups [not null]
+  eventDate DateTime
+  eventRole String [not null]
 }
 
 Table users {
@@ -528,6 +563,12 @@ Ref: service_reports.serviceId > services.id [delete: Cascade]
 
 Ref: service_kpis.serviceReportId > service_reports.id [delete: Cascade]
 
+Ref: working_groups.wGEventDetailId > WGEventDetail.id
+
+Ref: wgreports.workingGroupId > working_groups.id
+
+Ref: wgreports.eventReportId > event_reports.id
+
 Ref: users.countryId > countries.id
 
 Ref: sessions.userId > users.id [delete: Cascade]

prisma/migrations/20250718131054_add_working_group_related_fields_and_tables/migration.sql

@@ -0,0 +1,47 @@
+-- AlterTable
+ALTER TABLE "working_groups" ADD COLUMN     "mailing_list" TEXT,
+ADD COLUMN     "member_tracking" TEXT,
+ADD COLUMN     "wGEventDetailId" UUID;
+
+-- CreateTable
+CREATE TABLE "wgreports" (
+    "id" UUID NOT NULL,
+    "comments" JSONB,
+    "numberMebmers" INTEGER,
+    "status" "ReportStatus" NOT NULL DEFAULT 'draft',
+    "year" INTEGER NOT NULL,
+    "narrativeReport" TEXT NOT NULL,
+    "facultativeQuestions" TEXT NOT NULL,
+    "working_group_id" UUID,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL,
+    "eventReportId" UUID,
+
+    CONSTRAINT "wgreports_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "WGEventDetail" (
+    "id" UUID NOT NULL,
+    "eventTitle" TEXT NOT NULL,
+    "eventLink" TEXT NOT NULL,
+    "eventDate" TIMESTAMP(3),
+    "eventRole" TEXT NOT NULL,
+
+    CONSTRAINT "WGEventDetail_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "wgreports_year_idx" ON "wgreports"("year");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "wgreports_working_group_id_year_key" ON "wgreports"("working_group_id", "year");
+
+-- AddForeignKey
+ALTER TABLE "working_groups" ADD CONSTRAINT "working_groups_wGEventDetailId_fkey" FOREIGN KEY ("wGEventDetailId") REFERENCES "WGEventDetail"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "wgreports" ADD CONSTRAINT "wgreports_working_group_id_fkey" FOREIGN KEY ("working_group_id") REFERENCES "working_groups"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "wgreports" ADD CONSTRAINT "wgreports_eventReportId_fkey" FOREIGN KEY ("eventReportId") REFERENCES "event_reports"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/schema.prisma

@@ -127,8 +127,9 @@ model EventReport {
 
   report Report @relation(fields: [reportId], references: [id], onDelete: Cascade)
 
-  createdAt DateTime @default(now()) @map(name: "created_at")
-  updatedAt DateTime @updatedAt @map(name: "updated_at")
+  createdAt DateTime   @default(now()) @map(name: "created_at")
+  updatedAt DateTime   @updatedAt @map(name: "updated_at")
+  WGReport  WGReport[]
 
   @@map(name: "event_reports")
 }
@@ -560,14 +561,56 @@ model WorkingGroup {
   name      String
   startDate DateTime? @map(name: "start_date")
 
-  chairs Contribution[]
+  chairs          Contribution[]
+  member_tracking String? // describe how you keep track of the WG members, e.g. via mailing list?
+  mailing_list    String? // If you use a mailing list for the WG communication, provide here.
 
-  createdAt DateTime @default(now()) @map(name: "created_at")
-  updatedAt DateTime @updatedAt @map(name: "updated_at")
+  createdAt       DateTime       @default(now()) @map(name: "created_at")
+  updatedAt       DateTime       @updatedAt @map(name: "updated_at")
+  WGReport        WGReport[]
+  WGEventDetail   WGEventDetail? @relation(fields: [wGEventDetailId], references: [id])
+  wGEventDetailId String?        @db.Uuid
 
   @@map(name: "working_groups")
 }
 
+model WGReport {
+  id String @id @default(uuid()) @db.Uuid
+
+  comments      Json?
+  numberMebmers Int?
+  status        ReportStatus @default(draft)
+  year          Int
+
+  narrativeReport      String // this should allow a long rich text
+  facultativeQuestions String // this should allow a long rich text
+
+  workingGroupId String?       @map(name: "working_group_id") @db.Uuid
+  workingGroup   WorkingGroup? @relation(fields: [workingGroupId], references: [id])
+
+  eventReport EventReport? @relation(fields: [eventReportId], references: [id])
+
+  createdAt     DateTime @default(now()) @map(name: "created_at")
+  updatedAt     DateTime @updatedAt @map(name: "updated_at")
+  eventReportId String?  @db.Uuid
+
+  @@unique([workingGroupId, year])
+  @@index(fields: [year])
+  @@map(name: "wgreports")
+}
+
+model WGEventDetail {
+  id String @id @default(uuid()) @db.Uuid
+
+  eventTitle     String
+  eventLink      String // URL
+  working_groups WorkingGroup[] // multiple WGs can organise one event
+
+  eventDate DateTime? // not finally decided yet, if necessary.
+
+  eventRole String // role of WG in the organisation of the event (something like organiser, presenter ...) - enum not final yet
+}
+
 // -------------------------------------------------------------------------------------------------
 
 enum UserRole {