@earbug/db-models 0.0.6 → 0.0.8

package/models/AppUserDevice.ts

@@ -4,10 +4,10 @@ import type { AppUser, AppUserId } from './AppUser';
 
 export interface AppUserDeviceAttributes {
   id: string;
+  createdAt: Date;
   appUserId: string;
-  platformId: number;
+  devicePlatformId: number;
   endpointArn: string;
-  createdAt: Date;
 }
 
 export type AppUserDevicePk = "id";
@@ -17,10 +17,10 @@ export type AppUserDeviceCreationAttributes = Optional<AppUserDeviceAttributes,
 
 export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceCreationAttributes> implements AppUserDeviceAttributes {
   id!: string;
+  createdAt!: Date;
   appUserId!: string;
-  platformId!: number;
+  devicePlatformId!: number;
   endpointArn!: string;
-  createdAt!: Date;
 
   // AppUserDevice belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -36,6 +36,12 @@ export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceC
       defaultValue: DataTypes.UUIDV4,
       primaryKey: true
     },
+    createdAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'created_at'
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -45,22 +51,16 @@ export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceC
       },
       field: 'app_user_id'
     },
-    platformId: {
+    devicePlatformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
-      field: 'platform_id'
+      field: 'device_platform_id'
     },
     endpointArn: {
       type: DataTypes.TEXT,
       allowNull: false,
       unique: "unique_app_user_device_endpoint_arn",
       field: 'endpoint_arn'
-    },
-    createdAt: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'created_at'
     }
   }, {
     sequelize,

package/models/AppUserFollowRelation.ts

@@ -3,28 +3,28 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { AppUser, AppUserId } from './AppUser';
 
 export interface AppUserFollowRelationAttributes {
-  id: string;
   appUserId: string;
   followingAppUserId: string;
   stateId: number;
   isBlocked: boolean;
   createdAt: Date;
   updatedAt: Date;
+  id: string;
 }
 
 export type AppUserFollowRelationPk = "id";
 export type AppUserFollowRelationId = AppUserFollowRelation[AppUserFollowRelationPk];
-export type AppUserFollowRelationOptionalAttributes = "id" | "stateId" | "createdAt" | "updatedAt";
+export type AppUserFollowRelationOptionalAttributes = "stateId" | "createdAt" | "updatedAt" | "id";
 export type AppUserFollowRelationCreationAttributes = Optional<AppUserFollowRelationAttributes, AppUserFollowRelationOptionalAttributes>;
 
 export class AppUserFollowRelation extends Model<AppUserFollowRelationAttributes, AppUserFollowRelationCreationAttributes> implements AppUserFollowRelationAttributes {
-  id!: string;
   appUserId!: string;
   followingAppUserId!: string;
   stateId!: number;
   isBlocked!: boolean;
   createdAt!: Date;
   updatedAt!: Date;
+  id!: string;
 
   // AppUserFollowRelation belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -39,12 +39,6 @@ export class AppUserFollowRelation extends Model<AppUserFollowRelationAttributes
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUserFollowRelation {
     return AppUserFollowRelation.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -88,6 +82,12 @@ export class AppUserFollowRelation extends Model<AppUserFollowRelationAttributes
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
     }
   }, {
     sequelize,

package/models/AppUserPlatformRelation.ts

@@ -4,35 +4,35 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { Platform, PlatformId } from './Platform';
 
 export interface AppUserPlatformRelationAttributes {
-  id: string;
   appUserId: string;
   platformId: number;
   externalUserId: string;
-  createDate: Date;
-  updateDate: Date;
   accessToken: string;
   refreshToken?: string;
   expirationDate: Date;
   countryCode: string;
+  id: string;
+  createDate: Date;
+  updateDate: Date;
   stateId: number;
 }
 
 export type AppUserPlatformRelationPk = "id";
 export type AppUserPlatformRelationId = AppUserPlatformRelation[AppUserPlatformRelationPk];
-export type AppUserPlatformRelationOptionalAttributes = "id" | "createDate" | "updateDate" | "refreshToken" | "stateId";
+export type AppUserPlatformRelationOptionalAttributes = "refreshToken" | "id" | "createDate" | "updateDate" | "stateId";
 export type AppUserPlatformRelationCreationAttributes = Optional<AppUserPlatformRelationAttributes, AppUserPlatformRelationOptionalAttributes>;
 
 export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttributes, AppUserPlatformRelationCreationAttributes> implements AppUserPlatformRelationAttributes {
-  id!: string;
   appUserId!: string;
   platformId!: number;
   externalUserId!: string;
-  createDate!: Date;
-  updateDate!: Date;
   accessToken!: string;
   refreshToken?: string;
   expirationDate!: Date;
   countryCode!: string;
+  id!: string;
+  createDate!: Date;
+  updateDate!: Date;
   stateId!: number;
 
   // AppUserPlatformRelation belongsTo AppUser via appUserId
@@ -48,12 +48,6 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUserPlatformRelation {
     return AppUserPlatformRelation.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -78,18 +72,6 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
       allowNull: false,
       field: 'external_user_id'
     },
-    createDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'create_date'
-    },
-    updateDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'update_date'
-    },
     accessToken: {
       type: DataTypes.STRING,
       allowNull: false,
@@ -110,6 +92,24 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
       allowNull: false,
       field: 'country_code'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
+    createDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'create_date'
+    },
+    updateDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'update_date'
+    },
     stateId: {
       type: DataTypes.SMALLINT,
       allowNull: false,

package/models/CanonAlbum.ts

@@ -2,41 +2,43 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonAlbumExternalReferenceRelation, CanonAlbumExternalReferenceRelationId } from './CanonAlbumExternalReferenceRelation';
 import type { CanonAlbumImageHarvested, CanonAlbumImageHarvestedId } from './CanonAlbumImageHarvested';
+import type { CanonAlbumTrackRelation, CanonAlbumTrackRelationId } from './CanonAlbumTrackRelation';
 import type { CanonToPlatformAlbumRelation, CanonToPlatformAlbumRelationId } from './CanonToPlatformAlbumRelation';
+import type { CanonTrack, CanonTrackId } from './CanonTrack';
 import type { ExternalReference, ExternalReferenceId } from './ExternalReference';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 
 export interface CanonAlbumAttributes {
-  id: string;
   name: string;
   asciiName: string;
   releaseDate?: string;
   noOfDisc?: number;
+  description?: string;
+  id: string;
   createDate: Date;
   updateDate: Date;
   hasPhoto?: boolean;
   hasThumbnailPhoto?: boolean;
-  description?: string;
   images?: object;
   lastImageHarvestAttempt?: Date;
 }
 
 export type CanonAlbumPk = "id";
 export type CanonAlbumId = CanonAlbum[CanonAlbumPk];
-export type CanonAlbumOptionalAttributes = "id" | "releaseDate" | "noOfDisc" | "createDate" | "updateDate" | "hasPhoto" | "hasThumbnailPhoto" | "description" | "images" | "lastImageHarvestAttempt";
+export type CanonAlbumOptionalAttributes = "releaseDate" | "noOfDisc" | "description" | "id" | "createDate" | "updateDate" | "hasPhoto" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt";
 export type CanonAlbumCreationAttributes = Optional<CanonAlbumAttributes, CanonAlbumOptionalAttributes>;
 
 export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAttributes> implements CanonAlbumAttributes {
-  id!: string;
   name!: string;
   asciiName!: string;
   releaseDate?: string;
   noOfDisc?: number;
+  description?: string;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
   hasPhoto?: boolean;
   hasThumbnailPhoto?: boolean;
-  description?: string;
   images?: object;
   lastImageHarvestAttempt?: Date;
 
@@ -64,6 +66,18 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
   hasCanonAlbumImageHarvested!: Sequelize.HasManyHasAssociationMixin<CanonAlbumImageHarvested, CanonAlbumImageHarvestedId>;
   hasCanonAlbumImageHarvesteds!: Sequelize.HasManyHasAssociationsMixin<CanonAlbumImageHarvested, CanonAlbumImageHarvestedId>;
   countCanonAlbumImageHarvesteds!: Sequelize.HasManyCountAssociationsMixin;
+  // CanonAlbum hasMany CanonAlbumTrackRelation via canonAlbumId
+  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;
   // CanonAlbum hasMany CanonToPlatformAlbumRelation via canonAlbumId
   canonToPlatformAlbumRelations!: CanonToPlatformAlbumRelation[];
   getCanonToPlatformAlbumRelations!: Sequelize.HasManyGetAssociationsMixin<CanonToPlatformAlbumRelation>;
@@ -76,6 +90,18 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
   hasCanonToPlatformAlbumRelation!: Sequelize.HasManyHasAssociationMixin<CanonToPlatformAlbumRelation, CanonToPlatformAlbumRelationId>;
   hasCanonToPlatformAlbumRelations!: Sequelize.HasManyHasAssociationsMixin<CanonToPlatformAlbumRelation, CanonToPlatformAlbumRelationId>;
   countCanonToPlatformAlbumRelations!: Sequelize.HasManyCountAssociationsMixin;
+  // CanonAlbum belongsToMany CanonTrack via canonAlbumId and canonTrackId
+  canonTrackIdCanonTracks!: CanonTrack[];
+  getCanonTrackIdCanonTracks!: Sequelize.BelongsToManyGetAssociationsMixin<CanonTrack>;
+  setCanonTrackIdCanonTracks!: Sequelize.BelongsToManySetAssociationsMixin<CanonTrack, CanonTrackId>;
+  addCanonTrackIdCanonTrack!: Sequelize.BelongsToManyAddAssociationMixin<CanonTrack, CanonTrackId>;
+  addCanonTrackIdCanonTracks!: Sequelize.BelongsToManyAddAssociationsMixin<CanonTrack, CanonTrackId>;
+  createCanonTrackIdCanonTrack!: Sequelize.BelongsToManyCreateAssociationMixin<CanonTrack>;
+  removeCanonTrackIdCanonTrack!: Sequelize.BelongsToManyRemoveAssociationMixin<CanonTrack, CanonTrackId>;
+  removeCanonTrackIdCanonTracks!: Sequelize.BelongsToManyRemoveAssociationsMixin<CanonTrack, CanonTrackId>;
+  hasCanonTrackIdCanonTrack!: Sequelize.BelongsToManyHasAssociationMixin<CanonTrack, CanonTrackId>;
+  hasCanonTrackIdCanonTracks!: Sequelize.BelongsToManyHasAssociationsMixin<CanonTrack, CanonTrackId>;
+  countCanonTrackIdCanonTracks!: Sequelize.BelongsToManyCountAssociationsMixin;
   // CanonAlbum belongsToMany ExternalReference via canonAlbumId and externalReferenceId
   externalReferenceIdExternalReferences!: ExternalReference[];
   getExternalReferenceIdExternalReferences!: Sequelize.BelongsToManyGetAssociationsMixin<ExternalReference>;
@@ -103,12 +129,6 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbum {
     return CanonAlbum.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -128,6 +148,16 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
       allowNull: true,
       field: 'no_of_disc'
     },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -152,10 +182,6 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
       defaultValue: false,
       field: 'has_thumbnail_photo'
     },
-    description: {
-      type: DataTypes.TEXT,
-      allowNull: true
-    },
     images: {
       type: DataTypes.JSONB,
       allowNull: true

package/models/CanonAlbumImageHarvested.ts

@@ -3,28 +3,28 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
 
 export interface CanonAlbumImageHarvestedAttributes {
-  id: string;
-  canonAlbumId: string;
-  priority?: number;
-  url?: string;
   dateHarvested: Date;
   storageKey: string;
   harvestMethod?: string;
+  priority?: number;
+  id: string;
+  url?: string;
+  canonAlbumId: string;
 }
 
 export type CanonAlbumImageHarvestedPk = "id";
 export type CanonAlbumImageHarvestedId = CanonAlbumImageHarvested[CanonAlbumImageHarvestedPk];
-export type CanonAlbumImageHarvestedOptionalAttributes = "id" | "priority" | "url" | "harvestMethod";
+export type CanonAlbumImageHarvestedOptionalAttributes = "harvestMethod" | "priority" | "id" | "url";
 export type CanonAlbumImageHarvestedCreationAttributes = Optional<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedOptionalAttributes>;
 
 export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedCreationAttributes> implements CanonAlbumImageHarvestedAttributes {
-  id!: string;
-  canonAlbumId!: string;
-  priority?: number;
-  url?: string;
   dateHarvested!: Date;
   storageKey!: string;
   harvestMethod?: string;
+  priority?: number;
+  id!: string;
+  url?: string;
+  canonAlbumId!: string;
 
   // CanonAlbumImageHarvested belongsTo CanonAlbum via canonAlbumId
   canonAlbum!: CanonAlbum;
@@ -34,31 +34,6 @@ export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttr
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbumImageHarvested {
     return CanonAlbumImageHarvested.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    canonAlbumId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      references: {
-        model: 'canon_album',
-        key: 'id'
-      },
-      field: 'canon_album_id'
-    },
-    priority: {
-      type: DataTypes.DECIMAL,
-      allowNull: true,
-      defaultValue: 0
-    },
-    url: {
-      type: DataTypes.TEXT,
-      allowNull: true,
-      unique: "canon_album_image_harvested_url_unique"
-    },
     dateHarvested: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -73,6 +48,30 @@ export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttr
       type: DataTypes.STRING(255),
       allowNull: true,
       field: 'harvest_method'
+    },
+    priority: {
+      type: DataTypes.DECIMAL,
+      allowNull: true,
+      defaultValue: 0
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
+    url: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    canonAlbumId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      references: {
+        model: 'canon_album',
+        key: 'id'
+      },
+      field: 'canon_album_id'
     }
   }, {
     sequelize,
@@ -93,13 +92,6 @@ export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttr
           { name: "id" },
         ]
       },
-      {
-        name: "canon_album_image_harvested_url_unique",
-        unique: true,
-        fields: [
-          { name: "url" },
-        ]
-      },
     ]
   });
   }

package/models/CanonAlbumTrackRelation.ts

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
-import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
-import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
+import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
+import type { CanonTrack, CanonTrackId } from './CanonTrack';
 
 export interface CanonAlbumTrackRelationAttributes {
   canonAlbumId: string;
@@ -21,16 +21,16 @@ export class CanonAlbumTrackRelation extends Model<CanonAlbumTrackRelationAttrib
   createDate!: Date;
   updateDate!: Date;
 
-  // CanonAlbumTrackRelation belongsTo PlatformAlbum via canonAlbumId
-  canonAlbum!: PlatformAlbum;
-  getCanonAlbum!: Sequelize.BelongsToGetAssociationMixin<PlatformAlbum>;
-  setCanonAlbum!: Sequelize.BelongsToSetAssociationMixin<PlatformAlbum, PlatformAlbumId>;
-  createCanonAlbum!: Sequelize.BelongsToCreateAssociationMixin<PlatformAlbum>;
-  // CanonAlbumTrackRelation belongsTo PlatformTrack via canonTrackId
-  canonTrack!: PlatformTrack;
-  getCanonTrack!: Sequelize.BelongsToGetAssociationMixin<PlatformTrack>;
-  setCanonTrack!: Sequelize.BelongsToSetAssociationMixin<PlatformTrack, PlatformTrackId>;
-  createCanonTrack!: Sequelize.BelongsToCreateAssociationMixin<PlatformTrack>;
+  // CanonAlbumTrackRelation belongsTo CanonAlbum via canonAlbumId
+  canonAlbum!: CanonAlbum;
+  getCanonAlbum!: Sequelize.BelongsToGetAssociationMixin<CanonAlbum>;
+  setCanonAlbum!: Sequelize.BelongsToSetAssociationMixin<CanonAlbum, CanonAlbumId>;
+  createCanonAlbum!: Sequelize.BelongsToCreateAssociationMixin<CanonAlbum>;
+  // CanonAlbumTrackRelation belongsTo CanonTrack via canonTrackId
+  canonTrack!: CanonTrack;
+  getCanonTrack!: Sequelize.BelongsToGetAssociationMixin<CanonTrack>;
+  setCanonTrack!: Sequelize.BelongsToSetAssociationMixin<CanonTrack, CanonTrackId>;
+  createCanonTrack!: Sequelize.BelongsToCreateAssociationMixin<CanonTrack>;
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbumTrackRelation {
     return CanonAlbumTrackRelation.init({
@@ -39,7 +39,7 @@ export class CanonAlbumTrackRelation extends Model<CanonAlbumTrackRelationAttrib
       allowNull: false,
       primaryKey: true,
       references: {
-        model: 'platform_album',
+        model: 'canon_album',
         key: 'id'
       },
       field: 'canon_album_id'
@@ -49,7 +49,7 @@ export class CanonAlbumTrackRelation extends Model<CanonAlbumTrackRelationAttrib
       allowNull: false,
       primaryKey: true,
       references: {
-        model: 'platform_track',
+        model: 'canon_track',
         key: 'id'
       },
       field: 'canon_track_id'

package/models/CanonArtist.ts

@@ -9,10 +9,10 @@ import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 
 export interface CanonArtistAttributes {
-  id: string;
   name: string;
   asciiName: string;
   description?: string;
+  id: string;
   hasPhoto: boolean;
   createDate: Date;
   updateDate: Date;
@@ -23,14 +23,14 @@ export interface CanonArtistAttributes {
 
 export type CanonArtistPk = "id";
 export type CanonArtistId = CanonArtist[CanonArtistPk];
-export type CanonArtistOptionalAttributes = "id" | "description" | "createDate" | "updateDate" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt";
+export type CanonArtistOptionalAttributes = "description" | "id" | "createDate" | "updateDate" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt";
 export type CanonArtistCreationAttributes = Optional<CanonArtistAttributes, CanonArtistOptionalAttributes>;
 
 export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreationAttributes> implements CanonArtistAttributes {
-  id!: string;
   name!: string;
   asciiName!: string;
   description?: string;
+  id!: string;
   hasPhoto!: boolean;
   createDate!: Date;
   updateDate!: Date;
@@ -87,17 +87,17 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
   hasCanonToPlatformArtistRelations!: Sequelize.HasManyHasAssociationsMixin<CanonToPlatformArtistRelation, CanonToPlatformArtistRelationId>;
   countCanonToPlatformArtistRelations!: Sequelize.HasManyCountAssociationsMixin;
   // CanonArtist belongsToMany CanonTrack via canonArtistId and canonTrackId
-  canonTrackIdCanonTracks!: CanonTrack[];
-  getCanonTrackIdCanonTracks!: Sequelize.BelongsToManyGetAssociationsMixin<CanonTrack>;
-  setCanonTrackIdCanonTracks!: Sequelize.BelongsToManySetAssociationsMixin<CanonTrack, CanonTrackId>;
-  addCanonTrackIdCanonTrack!: Sequelize.BelongsToManyAddAssociationMixin<CanonTrack, CanonTrackId>;
-  addCanonTrackIdCanonTracks!: Sequelize.BelongsToManyAddAssociationsMixin<CanonTrack, CanonTrackId>;
-  createCanonTrackIdCanonTrack!: Sequelize.BelongsToManyCreateAssociationMixin<CanonTrack>;
-  removeCanonTrackIdCanonTrack!: Sequelize.BelongsToManyRemoveAssociationMixin<CanonTrack, CanonTrackId>;
-  removeCanonTrackIdCanonTracks!: Sequelize.BelongsToManyRemoveAssociationsMixin<CanonTrack, CanonTrackId>;
-  hasCanonTrackIdCanonTrack!: Sequelize.BelongsToManyHasAssociationMixin<CanonTrack, CanonTrackId>;
-  hasCanonTrackIdCanonTracks!: Sequelize.BelongsToManyHasAssociationsMixin<CanonTrack, CanonTrackId>;
-  countCanonTrackIdCanonTracks!: Sequelize.BelongsToManyCountAssociationsMixin;
+  canonTrackIdCanonTrackCanonArtistTrackRelations!: CanonTrack[];
+  getCanonTrackIdCanonTrackCanonArtistTrackRelations!: Sequelize.BelongsToManyGetAssociationsMixin<CanonTrack>;
+  setCanonTrackIdCanonTrackCanonArtistTrackRelations!: Sequelize.BelongsToManySetAssociationsMixin<CanonTrack, CanonTrackId>;
+  addCanonTrackIdCanonTrackCanonArtistTrackRelation!: Sequelize.BelongsToManyAddAssociationMixin<CanonTrack, CanonTrackId>;
+  addCanonTrackIdCanonTrackCanonArtistTrackRelations!: Sequelize.BelongsToManyAddAssociationsMixin<CanonTrack, CanonTrackId>;
+  createCanonTrackIdCanonTrackCanonArtistTrackRelation!: Sequelize.BelongsToManyCreateAssociationMixin<CanonTrack>;
+  removeCanonTrackIdCanonTrackCanonArtistTrackRelation!: Sequelize.BelongsToManyRemoveAssociationMixin<CanonTrack, CanonTrackId>;
+  removeCanonTrackIdCanonTrackCanonArtistTrackRelations!: Sequelize.BelongsToManyRemoveAssociationsMixin<CanonTrack, CanonTrackId>;
+  hasCanonTrackIdCanonTrackCanonArtistTrackRelation!: Sequelize.BelongsToManyHasAssociationMixin<CanonTrack, CanonTrackId>;
+  hasCanonTrackIdCanonTrackCanonArtistTrackRelations!: Sequelize.BelongsToManyHasAssociationsMixin<CanonTrack, CanonTrackId>;
+  countCanonTrackIdCanonTrackCanonArtistTrackRelations!: Sequelize.BelongsToManyCountAssociationsMixin;
   // CanonArtist belongsToMany PlatformAlbum via canonArtistId and canonAlbumId
   canonAlbumIdPlatformAlbumCanonArtistAlbumRelations!: PlatformAlbum[];
   getCanonAlbumIdPlatformAlbumCanonArtistAlbumRelations!: Sequelize.BelongsToManyGetAssociationsMixin<PlatformAlbum>;
@@ -125,12 +125,6 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonArtist {
     return CanonArtist.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -144,6 +138,12 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
       type: DataTypes.TEXT,
       allowNull: true
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     hasPhoto: {
       type: DataTypes.BOOLEAN,
       allowNull: false,