@earbug/db-models 0.0.6 → 0.0.8

package/models/CanonArtistImageHarvested.ts

@@ -3,28 +3,28 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 
 export interface CanonArtistImageHarvestedAttributes {
-  id: string;
-  canonArtistId: string;
-  priority?: number;
-  url?: string;
   dateHarvested: Date;
   storageKey: string;
   harvestMethod?: string;
+  url?: string;
+  priority?: number;
+  canonArtistId: string;
+  id: string;
 }
 
 export type CanonArtistImageHarvestedPk = "id";
 export type CanonArtistImageHarvestedId = CanonArtistImageHarvested[CanonArtistImageHarvestedPk];
-export type CanonArtistImageHarvestedOptionalAttributes = "id" | "priority" | "url" | "harvestMethod";
+export type CanonArtistImageHarvestedOptionalAttributes = "harvestMethod" | "url" | "priority" | "id";
 export type CanonArtistImageHarvestedCreationAttributes = Optional<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedOptionalAttributes>;
 
 export class CanonArtistImageHarvested extends Model<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedCreationAttributes> implements CanonArtistImageHarvestedAttributes {
-  id!: string;
-  canonArtistId!: string;
-  priority?: number;
-  url?: string;
   dateHarvested!: Date;
   storageKey!: string;
   harvestMethod?: string;
+  url?: string;
+  priority?: number;
+  canonArtistId!: string;
+  id!: string;
 
   // CanonArtistImageHarvested belongsTo CanonArtist via canonArtistId
   canonArtist!: CanonArtist;
@@ -34,30 +34,6 @@ export class CanonArtistImageHarvested extends Model<CanonArtistImageHarvestedAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonArtistImageHarvested {
     return CanonArtistImageHarvested.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    canonArtistId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      references: {
-        model: 'canon_artist',
-        key: 'id'
-      },
-      field: 'canon_artist_id'
-    },
-    priority: {
-      type: DataTypes.DECIMAL,
-      allowNull: true,
-      defaultValue: 0
-    },
-    url: {
-      type: DataTypes.TEXT,
-      allowNull: true
-    },
     dateHarvested: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -72,6 +48,30 @@ export class CanonArtistImageHarvested extends Model<CanonArtistImageHarvestedAt
       type: DataTypes.STRING(255),
       allowNull: true,
       field: 'harvest_method'
+    },
+    url: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    priority: {
+      type: DataTypes.DECIMAL,
+      allowNull: true,
+      defaultValue: 0
+    },
+    canonArtistId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      references: {
+        model: 'canon_artist',
+        key: 'id'
+      },
+      field: 'canon_artist_id'
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
     }
   }, {
     sequelize,

package/models/CanonGenre.ts

@@ -11,26 +11,26 @@ import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 import type { PlatformGenre, PlatformGenreId } from './PlatformGenre';
 
 export interface CanonGenreAttributes {
-  id: string;
   name: string;
   asciiName: string;
   description: string;
   parentGenreId?: string;
+  id: string;
   createDate: Date;
   updateDate: Date;
 }
 
 export type CanonGenrePk = "id";
 export type CanonGenreId = CanonGenre[CanonGenrePk];
-export type CanonGenreOptionalAttributes = "id" | "parentGenreId" | "createDate" | "updateDate";
+export type CanonGenreOptionalAttributes = "parentGenreId" | "id" | "createDate" | "updateDate";
 export type CanonGenreCreationAttributes = Optional<CanonGenreAttributes, CanonGenreOptionalAttributes>;
 
 export class CanonGenre extends Model<CanonGenreAttributes, CanonGenreCreationAttributes> implements CanonGenreAttributes {
-  id!: string;
   name!: string;
   asciiName!: string;
   description!: string;
   parentGenreId?: string;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -145,12 +145,6 @@ export class CanonGenre extends Model<CanonGenreAttributes, CanonGenreCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonGenre {
     return CanonGenre.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false,
@@ -170,6 +164,12 @@ export class CanonGenre extends Model<CanonGenreAttributes, CanonGenreCreationAt
       allowNull: true,
       field: 'parent_genre_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/CanonLabel.ts

@@ -6,9 +6,9 @@ import type { ExternalReference, ExternalReferenceId } from './ExternalReference
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 
 export interface CanonLabelAttributes {
-  id: string;
   name: string;
   asciiName: string;
+  id: string;
   createDate: Date;
   updateDate: Date;
 }
@@ -19,9 +19,9 @@ export type CanonLabelOptionalAttributes = "id" | "createDate" | "updateDate";
 export type CanonLabelCreationAttributes = Optional<CanonLabelAttributes, CanonLabelOptionalAttributes>;
 
 export class CanonLabel extends Model<CanonLabelAttributes, CanonLabelCreationAttributes> implements CanonLabelAttributes {
-  id!: string;
   name!: string;
   asciiName!: string;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -76,12 +76,6 @@ export class CanonLabel extends Model<CanonLabelAttributes, CanonLabelCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonLabel {
     return CanonLabel.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -91,6 +85,12 @@ export class CanonLabel extends Model<CanonLabelAttributes, CanonLabelCreationAt
       allowNull: false,
       field: 'ascii_name'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/CanonMember.ts

@@ -6,9 +6,9 @@ import type { ExternalReference, ExternalReferenceId } from './ExternalReference
 import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 
 export interface CanonMemberAttributes {
-  id: string;
   name?: string;
   asciiName?: string;
+  id: string;
   createDate?: Date;
   updateDate?: Date;
   isPast?: boolean;
@@ -16,13 +16,13 @@ export interface CanonMemberAttributes {
 
 export type CanonMemberPk = "id";
 export type CanonMemberId = CanonMember[CanonMemberPk];
-export type CanonMemberOptionalAttributes = "id" | "name" | "asciiName" | "createDate" | "updateDate" | "isPast";
+export type CanonMemberOptionalAttributes = "name" | "asciiName" | "id" | "createDate" | "updateDate" | "isPast";
 export type CanonMemberCreationAttributes = Optional<CanonMemberAttributes, CanonMemberOptionalAttributes>;
 
 export class CanonMember extends Model<CanonMemberAttributes, CanonMemberCreationAttributes> implements CanonMemberAttributes {
-  id!: string;
   name?: string;
   asciiName?: string;
+  id!: string;
   createDate?: Date;
   updateDate?: Date;
   isPast?: boolean;
@@ -78,12 +78,6 @@ export class CanonMember extends Model<CanonMemberAttributes, CanonMemberCreatio
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonMember {
     return CanonMember.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: true
@@ -93,6 +87,12 @@ export class CanonMember extends Model<CanonMemberAttributes, CanonMemberCreatio
       allowNull: true,
       field: 'ascii_name'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: true,

package/models/CanonMemberExternalReferenceRelation.ts

@@ -4,10 +4,10 @@ import type { CanonMember, CanonMemberId } from './CanonMember';
 import type { ExternalReference, ExternalReferenceId } from './ExternalReference';
 
 export interface CanonMemberExternalReferenceRelationAttributes {
-  id: string;
   canonMemberId: string;
   externalReferenceId: string;
   url: string;
+  id: string;
   createDate: Date;
   updateDate: Date;
 }
@@ -18,10 +18,10 @@ export type CanonMemberExternalReferenceRelationOptionalAttributes = "id" | "cre
 export type CanonMemberExternalReferenceRelationCreationAttributes = Optional<CanonMemberExternalReferenceRelationAttributes, CanonMemberExternalReferenceRelationOptionalAttributes>;
 
 export class CanonMemberExternalReferenceRelation extends Model<CanonMemberExternalReferenceRelationAttributes, CanonMemberExternalReferenceRelationCreationAttributes> implements CanonMemberExternalReferenceRelationAttributes {
-  id!: string;
   canonMemberId!: string;
   externalReferenceId!: string;
   url!: string;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -38,11 +38,6 @@ export class CanonMemberExternalReferenceRelation extends Model<CanonMemberExter
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonMemberExternalReferenceRelation {
     return CanonMemberExternalReferenceRelation.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1')
-    },
     canonMemberId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -67,6 +62,11 @@ export class CanonMemberExternalReferenceRelation extends Model<CanonMemberExter
       type: DataTypes.TEXT,
       allowNull: false
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1')
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/CanonTrack.ts

@@ -1,5 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
+import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
+import type { CanonAlbumTrackRelation, CanonAlbumTrackRelationId } from './CanonAlbumTrackRelation';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { CanonArtistTrackRelation, CanonArtistTrackRelationId } from './CanonArtistTrackRelation';
 import type { CanonToPlatformTrackRelation, CanonToPlatformTrackRelationId } from './CanonToPlatformTrackRelation';
@@ -7,33 +9,57 @@ import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry
 import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
 
 export interface CanonTrackAttributes {
-  id: string;
   name: string;
   asciiName: string;
   explicit: boolean;
   discNumber?: number;
   discTrackNumber?: number;
+  durationMs: number;
+  id: string;
   createDate: Date;
   updateDate: Date;
-  durationMs: number;
 }
 
 export type CanonTrackPk = "id";
 export type CanonTrackId = CanonTrack[CanonTrackPk];
-export type CanonTrackOptionalAttributes = "id" | "discNumber" | "discTrackNumber" | "createDate" | "updateDate";
+export type CanonTrackOptionalAttributes = "discNumber" | "discTrackNumber" | "id" | "createDate" | "updateDate";
 export type CanonTrackCreationAttributes = Optional<CanonTrackAttributes, CanonTrackOptionalAttributes>;
 
 export class CanonTrack extends Model<CanonTrackAttributes, CanonTrackCreationAttributes> implements CanonTrackAttributes {
-  id!: string;
   name!: string;
   asciiName!: string;
   explicit!: boolean;
   discNumber?: number;
   discTrackNumber?: number;
+  durationMs!: number;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
-  durationMs!: number;
 
+  // CanonTrack belongsToMany CanonAlbum via canonTrackId and canonAlbumId
+  canonAlbumIdCanonAlbumCanonAlbumTrackRelations!: CanonAlbum[];
+  getCanonAlbumIdCanonAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyGetAssociationsMixin<CanonAlbum>;
+  setCanonAlbumIdCanonAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManySetAssociationsMixin<CanonAlbum, CanonAlbumId>;
+  addCanonAlbumIdCanonAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyAddAssociationMixin<CanonAlbum, CanonAlbumId>;
+  addCanonAlbumIdCanonAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyAddAssociationsMixin<CanonAlbum, CanonAlbumId>;
+  createCanonAlbumIdCanonAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyCreateAssociationMixin<CanonAlbum>;
+  removeCanonAlbumIdCanonAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyRemoveAssociationMixin<CanonAlbum, CanonAlbumId>;
+  removeCanonAlbumIdCanonAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyRemoveAssociationsMixin<CanonAlbum, CanonAlbumId>;
+  hasCanonAlbumIdCanonAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyHasAssociationMixin<CanonAlbum, CanonAlbumId>;
+  hasCanonAlbumIdCanonAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyHasAssociationsMixin<CanonAlbum, CanonAlbumId>;
+  countCanonAlbumIdCanonAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyCountAssociationsMixin;
+  // CanonTrack hasMany CanonAlbumTrackRelation via canonTrackId
+  canonAlbumTrackRelations!: CanonAlbumTrackRelation[];
+  getCanonAlbumTrackRelations!: Sequelize.HasManyGetAssociationsMixin<CanonAlbumTrackRelation>;
+  setCanonAlbumTrackRelations!: Sequelize.HasManySetAssociationsMixin<CanonAlbumTrackRelation, CanonAlbumTrackRelationId>;
+  addCanonAlbumTrackRelation!: Sequelize.HasManyAddAssociationMixin<CanonAlbumTrackRelation, CanonAlbumTrackRelationId>;
+  addCanonAlbumTrackRelations!: Sequelize.HasManyAddAssociationsMixin<CanonAlbumTrackRelation, CanonAlbumTrackRelationId>;
+  createCanonAlbumTrackRelation!: Sequelize.HasManyCreateAssociationMixin<CanonAlbumTrackRelation>;
+  removeCanonAlbumTrackRelation!: Sequelize.HasManyRemoveAssociationMixin<CanonAlbumTrackRelation, CanonAlbumTrackRelationId>;
+  removeCanonAlbumTrackRelations!: Sequelize.HasManyRemoveAssociationsMixin<CanonAlbumTrackRelation, CanonAlbumTrackRelationId>;
+  hasCanonAlbumTrackRelation!: Sequelize.HasManyHasAssociationMixin<CanonAlbumTrackRelation, CanonAlbumTrackRelationId>;
+  hasCanonAlbumTrackRelations!: Sequelize.HasManyHasAssociationsMixin<CanonAlbumTrackRelation, CanonAlbumTrackRelationId>;
+  countCanonAlbumTrackRelations!: Sequelize.HasManyCountAssociationsMixin;
   // CanonTrack belongsToMany CanonArtist via canonTrackId and canonArtistId
   canonArtistIdCanonArtistCanonArtistTrackRelations!: CanonArtist[];
   getCanonArtistIdCanonArtistCanonArtistTrackRelations!: Sequelize.BelongsToManyGetAssociationsMixin<CanonArtist>;
@@ -97,12 +123,6 @@ export class CanonTrack extends Model<CanonTrackAttributes, CanonTrackCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonTrack {
     return CanonTrack.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -126,6 +146,17 @@ export class CanonTrack extends Model<CanonTrackAttributes, CanonTrackCreationAt
       allowNull: true,
       field: 'disc_track_number'
     },
+    durationMs: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      field: 'duration_ms'
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -137,11 +168,6 @@ export class CanonTrack extends Model<CanonTrackAttributes, CanonTrackCreationAt
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
-    },
-    durationMs: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      field: 'duration_ms'
     }
   }, {
     sequelize,

package/models/ConfigParam.ts

@@ -2,10 +2,10 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 
 export interface ConfigParamAttributes {
-  name: string;
   value?: string;
   createdAt: Date;
   updatedAt: Date;
+  name: string;
 }
 
 export type ConfigParamPk = "name";
@@ -14,19 +14,14 @@ export type ConfigParamOptionalAttributes = "value" | "createdAt" | "updatedAt";
 export type ConfigParamCreationAttributes = Optional<ConfigParamAttributes, ConfigParamOptionalAttributes>;
 
 export class ConfigParam extends Model<ConfigParamAttributes, ConfigParamCreationAttributes> implements ConfigParamAttributes {
-  name!: string;
   value?: string;
   createdAt!: Date;
   updatedAt!: Date;
+  name!: string;
 
 
   static initModel(sequelize: Sequelize.Sequelize): typeof ConfigParam {
     return ConfigParam.init({
-    name: {
-      type: DataTypes.TEXT,
-      allowNull: false,
-      primaryKey: true
-    },
     value: {
       type: DataTypes.TEXT,
       allowNull: true
@@ -42,6 +37,11 @@ export class ConfigParam extends Model<ConfigParamAttributes, ConfigParamCreatio
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
+    },
+    name: {
+      type: DataTypes.TEXT,
+      allowNull: false,
+      primaryKey: true
     }
   }, {
     sequelize,

package/models/ExternalReference.ts

@@ -12,8 +12,8 @@ import type { CanonMemberExternalReferenceRelation, CanonMemberExternalReference
 import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 
 export interface ExternalReferenceAttributes {
-  id: string;
   name: string;
+  id: string;
   createDate: Date;
   updateDate: Date;
 }
@@ -24,8 +24,8 @@ export type ExternalReferenceOptionalAttributes = "id" | "createDate" | "updateD
 export type ExternalReferenceCreationAttributes = Optional<ExternalReferenceAttributes, ExternalReferenceOptionalAttributes>;
 
 export class ExternalReference extends Model<ExternalReferenceAttributes, ExternalReferenceCreationAttributes> implements ExternalReferenceAttributes {
-  id!: string;
   name!: string;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -152,17 +152,17 @@ export class ExternalReference extends Model<ExternalReferenceAttributes, Extern
 
   static initModel(sequelize: Sequelize.Sequelize): typeof ExternalReference {
     return ExternalReference.init({
+    name: {
+      type: DataTypes.TEXT,
+      allowNull: false,
+      unique: "external_reference_un"
+    },
     id: {
       type: DataTypes.UUID,
       allowNull: false,
       defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
       primaryKey: true
     },
-    name: {
-      type: DataTypes.TEXT,
-      allowNull: false,
-      unique: "external_reference_un"
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/JukeboxAccessType.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxAccessTypeAttributes {
-  id: number;
   description: string;
+  id: number;
 }
 
 export type JukeboxAccessTypePk = "id";
@@ -12,8 +12,8 @@ export type JukeboxAccessTypeId = JukeboxAccessType[JukeboxAccessTypePk];
 export type JukeboxAccessTypeCreationAttributes = JukeboxAccessTypeAttributes;
 
 export class JukeboxAccessType extends Model<JukeboxAccessTypeAttributes, JukeboxAccessTypeCreationAttributes> implements JukeboxAccessTypeAttributes {
-  id!: number;
   description!: string;
+  id!: number;
 
   // JukeboxAccessType hasMany JukeboxSession via accessTypeId
   jukeboxSessions!: JukeboxSession[];
@@ -30,16 +30,16 @@ export class JukeboxAccessType extends Model<JukeboxAccessTypeAttributes, Jukebo
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxAccessType {
     return JukeboxAccessType.init({
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: false
+    },
     id: {
       autoIncrement: true,
       autoIncrementIdentity: true,
       type: DataTypes.SMALLINT,
       allowNull: false,
       primaryKey: true
-    },
-    description: {
-      type: DataTypes.TEXT,
-      allowNull: false
     }
   }, {
     sequelize,

package/models/JukeboxCanonGenreRelation.ts

@@ -4,10 +4,10 @@ import type { CanonGenre, CanonGenreId } from './CanonGenre';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxCanonGenreRelationAttributes {
-  id: string;
   jukeboxSessionId: string;
   canonGenreId: string;
   stateId: number;
+  id: string;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -18,10 +18,10 @@ export type JukeboxCanonGenreRelationOptionalAttributes = "id" | "createdAt" | "
 export type JukeboxCanonGenreRelationCreationAttributes = Optional<JukeboxCanonGenreRelationAttributes, JukeboxCanonGenreRelationOptionalAttributes>;
 
 export class JukeboxCanonGenreRelation extends Model<JukeboxCanonGenreRelationAttributes, JukeboxCanonGenreRelationCreationAttributes> implements JukeboxCanonGenreRelationAttributes {
-  id!: string;
   jukeboxSessionId!: string;
   canonGenreId!: string;
   stateId!: number;
+  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -38,12 +38,6 @@ export class JukeboxCanonGenreRelation extends Model<JukeboxCanonGenreRelationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxCanonGenreRelation {
     return JukeboxCanonGenreRelation.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     jukeboxSessionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -69,6 +63,12 @@ export class JukeboxCanonGenreRelation extends Model<JukeboxCanonGenreRelationAt
       allowNull: false,
       field: 'state_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/JukeboxInvite.ts

@@ -4,26 +4,26 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxInviteAttributes {
-  id: string;
   jukeboxSessionId: string;
   inviterUserId: string;
   invitedUserId?: string;
   email?: string;
+  id: string;
   createdAt: Date;
   updatedAt: Date;
 }
 
 export type JukeboxInvitePk = "id";
 export type JukeboxInviteId = JukeboxInvite[JukeboxInvitePk];
-export type JukeboxInviteOptionalAttributes = "id" | "invitedUserId" | "email" | "createdAt" | "updatedAt";
+export type JukeboxInviteOptionalAttributes = "invitedUserId" | "email" | "id" | "createdAt" | "updatedAt";
 export type JukeboxInviteCreationAttributes = Optional<JukeboxInviteAttributes, JukeboxInviteOptionalAttributes>;
 
 export class JukeboxInvite extends Model<JukeboxInviteAttributes, JukeboxInviteCreationAttributes> implements JukeboxInviteAttributes {
-  id!: string;
   jukeboxSessionId!: string;
   inviterUserId!: string;
   invitedUserId?: string;
   email?: string;
+  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -45,12 +45,6 @@ export class JukeboxInvite extends Model<JukeboxInviteAttributes, JukeboxInviteC
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxInvite {
     return JukeboxInvite.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     jukeboxSessionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -82,6 +76,12 @@ export class JukeboxInvite extends Model<JukeboxInviteAttributes, JukeboxInviteC
       type: DataTypes.TEXT,
       allowNull: true
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,