Add new Filler List pivot table + DB migration

chrisbenincasa · Jan 26, 2024 · e1c6ac6 · e1c6ac6
1 parent 23aeaa3
commit e1c6ac6
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 4 deletions.
diff --git a/server/dao/entities/FillerListContent.ts b/server/dao/entities/FillerListContent.ts
@@ -0,0 +1,25 @@
+import {
+  Entity,
+  ManyToOne,
+  PrimaryKeyProp,
+  Property,
+  Rel,
+  Unique,
+} from '@mikro-orm/core';
+import { FillerShow } from './FillerShow.js';
+import { Program } from './Program.js';
+
+@Entity({ tableName: 'filler_show_content' }) // Original entity was called FillerShow - we want to replace the pivot table
+@Unique({ properties: ['fillerList', 'content', 'index'] })
+export class FillerListContent {
+  @ManyToOne({ primary: true, name: 'filler_show_uuid' })
+  fillerList!: Rel<FillerShow>;
+
+  @ManyToOne({ primary: true, name: 'program_uuid' })
+  content!: Rel<Program>;
+
+  @Property()
+  index!: number;
+
+  [PrimaryKeyProp]?: ['fillerList', 'content'];
+}
diff --git a/server/dao/entities/FillerShow.ts b/server/dao/entities/FillerShow.ts
@@ -2,13 +2,14 @@ import { Collection, Entity, ManyToMany, Property } from '@mikro-orm/core';
 import { BaseEntity } from './BaseEntity.js';
 import { Channel } from './Channel.js';
 import { Program } from './Program.js';
+import { FillerListContent } from './FillerListContent.js';
 
 @Entity()
 export class FillerShow extends BaseEntity {
   @Property()
   name!: string;
 
-  @ManyToMany(() => Program, 'fillerShows', { owner: true })
+  @ManyToMany({ entity: () => Program, pivotEntity: () => FillerListContent })
   content = new Collection<Program>(this);
 
   @ManyToMany({ entity: () => Channel, mappedBy: (channel) => channel.fillers })

diff --git a/server/dao/entities/Program.ts b/server/dao/entities/Program.ts
@@ -125,8 +125,10 @@ export class Program extends BaseEntity {
   })
   customShows = new Collection<CustomShow>(this);
 
-  @ManyToMany(() => FillerShow, (fillerShow) => fillerShow.content, {
+  @ManyToMany({
+    entity: () => FillerShow,
     eager: false,
+    mappedBy: (e) => e.content,
   })
   fillerShows = new Collection<FillerShow>(this);
 

diff --git a/server/migrations/.snapshot-db.db.json b/server/migrations/.snapshot-db.db.json
@@ -937,6 +937,15 @@
           "primary": false,
           "nullable": false,
           "mappedType": "text"
+        },
+        "index": {
+          "name": "index",
+          "type": "integer",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "integer"
         }
       },
       "name": "filler_show_content",
@@ -961,6 +970,18 @@
           "primary": false,
           "unique": false
         },
+        {
+          "keyName": "filler_show_content_filler_show_uuid_program_uuid_index_unique",
+          "columnNames": [
+            "filler_show_uuid",
+            "program_uuid",
+            "index"
+          ],
+          "composite": true,
+          "constraint": true,
+          "primary": false,
+          "unique": true
+        },
         {
           "keyName": "primary",
           "columnNames": [
@@ -985,7 +1006,6 @@
             "uuid"
           ],
           "referencedTableName": "filler_show",
-          "deleteRule": "cascade",
           "updateRule": "cascade"
         },
         "filler_show_content_program_uuid_foreign": {
@@ -998,7 +1018,6 @@
             "uuid"
           ],
           "referencedTableName": "program",
-          "deleteRule": "cascade",
           "updateRule": "cascade"
         }
       },

diff --git a/server/migrations/Migration20240126165808.ts b/server/migrations/Migration20240126165808.ts
@@ -0,0 +1,14 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20240126165808 extends Migration {
+  async up(): Promise<void> {
+    this.addSql(
+      'alter table `filler_show_content` add column `index` integer not null constraint `filler_show_content_filler_show_uuid_foreign` references `filler_show` (`uuid`) on update cascade constraint `filler_show_content_program_uuid_foreign` references `program` (`uuid`) on update cascade;',
+    );
+    this.addSql(
+      'create unique index `filler_show_content_filler_show_uuid_program_uuid_index_unique` on `filler_show_content` (`filler_show_uuid`, `program_uuid`, `index`);',
+    );
+
+    // We're not going to add index values since these tables should be empty at the moment anyway
+  }
+}