@earbug/db-models 0.0.6 → 0.0.8

package/models/Platform.ts

@@ -11,10 +11,10 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 import type { UnmatchedArtist, UnmatchedArtistId } from './UnmatchedArtist';
 
 export interface PlatformAttributes {
-  id: number;
   name: string;
   createDate: Date;
   updateDate: Date;
+  id: number;
 }
 
 export type PlatformPk = "id";
@@ -23,10 +23,10 @@ export type PlatformOptionalAttributes = "createDate" | "updateDate";
 export type PlatformCreationAttributes = Optional<PlatformAttributes, PlatformOptionalAttributes>;
 
 export class Platform extends Model<PlatformAttributes, PlatformCreationAttributes> implements PlatformAttributes {
-  id!: number;
   name!: string;
   createDate!: Date;
   updateDate!: Date;
+  id!: number;
 
   // Platform hasMany AppUserPlatformRelation via platformId
   appUserPlatformRelations!: AppUserPlatformRelation[];
@@ -139,13 +139,6 @@ export class Platform extends Model<PlatformAttributes, PlatformCreationAttribut
 
   static initModel(sequelize: Sequelize.Sequelize): typeof Platform {
     return Platform.init({
-    id: {
-      autoIncrement: true,
-      autoIncrementIdentity: true,
-      type: DataTypes.SMALLINT,
-      allowNull: false,
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false,
@@ -162,6 +155,13 @@ export class Platform extends Model<PlatformAttributes, PlatformCreationAttribut
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
+    },
+    id: {
+      autoIncrement: true,
+      autoIncrementIdentity: true,
+      type: DataTypes.SMALLINT,
+      allowNull: false,
+      primaryKey: true
     }
   }, {
     sequelize,

package/models/PlatformAlbum.ts

@@ -3,7 +3,6 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
 import type { CanonAlbumGenreRelation, CanonAlbumGenreRelationId } from './CanonAlbumGenreRelation';
 import type { CanonAlbumLabelRelation, CanonAlbumLabelRelationId } from './CanonAlbumLabelRelation';
-import type { CanonAlbumTrackRelation, CanonAlbumTrackRelationId } from './CanonAlbumTrackRelation';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { CanonArtistAlbumRelation, CanonArtistAlbumRelationId } from './CanonArtistAlbumRelation';
 import type { CanonGenre, CanonGenreId } from './CanonGenre';
@@ -20,7 +19,6 @@ import type { PlatformUserAlbum, PlatformUserAlbumId } from './PlatformUserAlbum
 import type { UnmatchedAlbum, UnmatchedAlbumId } from './UnmatchedAlbum';
 
 export interface PlatformAlbumAttributes {
-  id: string;
   platformId: number;
   externalAlbumId: string;
   name: string;
@@ -29,20 +27,20 @@ export interface PlatformAlbumAttributes {
   releaseDate?: string;
   popularity?: number;
   recordLabel?: string;
+  images?: object;
+  id: string;
   createDate: Date;
   updateDate: Date;
-  images?: object;
   lastHarvestDate?: Date;
   lastHarvestLog?: string;
 }
 
 export type PlatformAlbumPk = "id";
 export type PlatformAlbumId = PlatformAlbum[PlatformAlbumPk];
-export type PlatformAlbumOptionalAttributes = "id" | "albumType" | "releaseDate" | "popularity" | "recordLabel" | "createDate" | "updateDate" | "images" | "lastHarvestDate" | "lastHarvestLog";
+export type PlatformAlbumOptionalAttributes = "albumType" | "releaseDate" | "popularity" | "recordLabel" | "images" | "id" | "createDate" | "updateDate" | "lastHarvestDate" | "lastHarvestLog";
 export type PlatformAlbumCreationAttributes = Optional<PlatformAlbumAttributes, PlatformAlbumOptionalAttributes>;
 
 export class PlatformAlbum extends Model<PlatformAlbumAttributes, PlatformAlbumCreationAttributes> implements PlatformAlbumAttributes {
-  id!: string;
   platformId!: number;
   externalAlbumId!: string;
   name!: string;
@@ -51,9 +49,10 @@ export class PlatformAlbum extends Model<PlatformAlbumAttributes, PlatformAlbumC
   releaseDate?: string;
   popularity?: number;
   recordLabel?: string;
+  images?: object;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
-  images?: object;
   lastHarvestDate?: Date;
   lastHarvestLog?: string;
 
@@ -98,18 +97,6 @@ export class PlatformAlbum extends Model<PlatformAlbumAttributes, PlatformAlbumC
   hasCanonAlbumLabelRelation!: Sequelize.HasManyHasAssociationMixin<CanonAlbumLabelRelation, CanonAlbumLabelRelationId>;
   hasCanonAlbumLabelRelations!: Sequelize.HasManyHasAssociationsMixin<CanonAlbumLabelRelation, CanonAlbumLabelRelationId>;
   countCanonAlbumLabelRelations!: Sequelize.HasManyCountAssociationsMixin;
-  // PlatformAlbum 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;
   // PlatformAlbum belongsToMany CanonArtist via canonAlbumId and canonArtistId
   canonArtistIdCanonArtists!: CanonArtist[];
   getCanonArtistIdCanonArtists!: Sequelize.BelongsToManyGetAssociationsMixin<CanonArtist>;
@@ -230,18 +217,6 @@ export class PlatformAlbum extends Model<PlatformAlbumAttributes, PlatformAlbumC
   hasPlatformGenreIdPlatformGenrePlatformAlbumGenreRelation!: Sequelize.BelongsToManyHasAssociationMixin<PlatformGenre, PlatformGenreId>;
   hasPlatformGenreIdPlatformGenrePlatformAlbumGenreRelations!: Sequelize.BelongsToManyHasAssociationsMixin<PlatformGenre, PlatformGenreId>;
   countPlatformGenreIdPlatformGenrePlatformAlbumGenreRelations!: Sequelize.BelongsToManyCountAssociationsMixin;
-  // PlatformAlbum belongsToMany PlatformTrack via canonAlbumId and canonTrackId
-  canonTrackIdPlatformTracks!: PlatformTrack[];
-  getCanonTrackIdPlatformTracks!: Sequelize.BelongsToManyGetAssociationsMixin<PlatformTrack>;
-  setCanonTrackIdPlatformTracks!: Sequelize.BelongsToManySetAssociationsMixin<PlatformTrack, PlatformTrackId>;
-  addCanonTrackIdPlatformTrack!: Sequelize.BelongsToManyAddAssociationMixin<PlatformTrack, PlatformTrackId>;
-  addCanonTrackIdPlatformTracks!: Sequelize.BelongsToManyAddAssociationsMixin<PlatformTrack, PlatformTrackId>;
-  createCanonTrackIdPlatformTrack!: Sequelize.BelongsToManyCreateAssociationMixin<PlatformTrack>;
-  removeCanonTrackIdPlatformTrack!: Sequelize.BelongsToManyRemoveAssociationMixin<PlatformTrack, PlatformTrackId>;
-  removeCanonTrackIdPlatformTracks!: Sequelize.BelongsToManyRemoveAssociationsMixin<PlatformTrack, PlatformTrackId>;
-  hasCanonTrackIdPlatformTrack!: Sequelize.BelongsToManyHasAssociationMixin<PlatformTrack, PlatformTrackId>;
-  hasCanonTrackIdPlatformTracks!: Sequelize.BelongsToManyHasAssociationsMixin<PlatformTrack, PlatformTrackId>;
-  countCanonTrackIdPlatformTracks!: Sequelize.BelongsToManyCountAssociationsMixin;
   // PlatformAlbum belongsToMany PlatformTrack via platformAlbumId and platformTrackId
   platformTrackIdPlatformTrackPlatformAlbumTrackRelations!: PlatformTrack[];
   getPlatformTrackIdPlatformTrackPlatformAlbumTrackRelations!: Sequelize.BelongsToManyGetAssociationsMixin<PlatformTrack>;
@@ -281,12 +256,6 @@ export class PlatformAlbum extends Model<PlatformAlbumAttributes, PlatformAlbumC
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformAlbum {
     return PlatformAlbum.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -331,6 +300,16 @@ export class PlatformAlbum extends Model<PlatformAlbumAttributes, PlatformAlbumC
       allowNull: true,
       field: 'record_label'
     },
+    images: {
+      type: DataTypes.JSONB,
+      allowNull: true
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -343,10 +322,6 @@ export class PlatformAlbum extends Model<PlatformAlbumAttributes, PlatformAlbumC
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
     },
-    images: {
-      type: DataTypes.JSONB,
-      allowNull: true
-    },
     lastHarvestDate: {
       type: DataTypes.DATE,
       allowNull: true,

package/models/PlatformArtist.ts

@@ -17,15 +17,15 @@ import type { PlatformGenre, PlatformGenreId } from './PlatformGenre';
 import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
 
 export interface PlatformArtistAttributes {
-  id: string;
   externalArtistId: string;
   platformId: number;
   name: string;
   asciiName: string;
   externalUri?: string;
+  genres?: string[];
+  id: string;
   createDate: Date;
   updateDate: Date;
-  genres?: string[];
   lastHarvestDate?: Date;
   lastHarvestLog?: string;
   images?: object;
@@ -33,19 +33,19 @@ export interface PlatformArtistAttributes {
 
 export type PlatformArtistPk = "id";
 export type PlatformArtistId = PlatformArtist[PlatformArtistPk];
-export type PlatformArtistOptionalAttributes = "id" | "externalUri" | "createDate" | "updateDate" | "genres" | "lastHarvestDate" | "lastHarvestLog" | "images";
+export type PlatformArtistOptionalAttributes = "externalUri" | "genres" | "id" | "createDate" | "updateDate" | "lastHarvestDate" | "lastHarvestLog" | "images";
 export type PlatformArtistCreationAttributes = Optional<PlatformArtistAttributes, PlatformArtistOptionalAttributes>;
 
 export class PlatformArtist extends Model<PlatformArtistAttributes, PlatformArtistCreationAttributes> implements PlatformArtistAttributes {
-  id!: string;
   externalArtistId!: string;
   platformId!: number;
   name!: string;
   asciiName!: string;
   externalUri?: string;
+  genres?: string[];
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
-  genres?: string[];
   lastHarvestDate?: Date;
   lastHarvestLog?: string;
   images?: object;
@@ -226,12 +226,6 @@ export class PlatformArtist extends Model<PlatformArtistAttributes, PlatformArti
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformArtist {
     return PlatformArtist.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     externalArtistId: {
       type: DataTypes.TEXT,
       allowNull: false,
@@ -262,6 +256,16 @@ export class PlatformArtist extends Model<PlatformArtistAttributes, PlatformArti
       allowNull: true,
       field: 'external_uri'
     },
+    genres: {
+      type: DataTypes.ARRAY(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,
@@ -274,10 +278,6 @@ export class PlatformArtist extends Model<PlatformArtistAttributes, PlatformArti
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
     },
-    genres: {
-      type: DataTypes.ARRAY(DataTypes.TEXT),
-      allowNull: true
-    },
     lastHarvestDate: {
       type: DataTypes.DATE,
       allowNull: true,

package/models/PlatformGenre.ts

@@ -11,9 +11,9 @@ import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
 import type { PlatformTrackGenreRelation, PlatformTrackGenreRelationId } from './PlatformTrackGenreRelation';
 
 export interface PlatformGenreAttributes {
-  id: string;
   platformId: number;
   name: string;
+  id: string;
   createDate: Date;
   updateDate: Date;
 }
@@ -24,9 +24,9 @@ export type PlatformGenreOptionalAttributes = "id" | "createDate" | "updateDate"
 export type PlatformGenreCreationAttributes = Optional<PlatformGenreAttributes, PlatformGenreOptionalAttributes>;
 
 export class PlatformGenre extends Model<PlatformGenreAttributes, PlatformGenreCreationAttributes> implements PlatformGenreAttributes {
-  id!: string;
   platformId!: number;
   name!: string;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -134,12 +134,6 @@ export class PlatformGenre extends Model<PlatformGenreAttributes, PlatformGenreC
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformGenre {
     return PlatformGenre.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -155,6 +149,12 @@ export class PlatformGenre extends Model<PlatformGenreAttributes, PlatformGenreC
       allowNull: false,
       unique: "platform_genre_name_pkey"
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/PlatformTrack.ts

@@ -1,6 +1,5 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
-import type { CanonAlbumTrackRelation, CanonAlbumTrackRelationId } from './CanonAlbumTrackRelation';
 import type { CanonToPlatformTrackRelation, CanonToPlatformTrackRelationId } from './CanonToPlatformTrackRelation';
 import type { CanonTrack, CanonTrackId } from './CanonTrack';
 import type { Platform, PlatformId } from './Platform';
@@ -14,7 +13,6 @@ import type { PlatformUserAlbumTrack, PlatformUserAlbumTrackId } from './Platfor
 import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './PlatformUserPlaylistTrack';
 
 export interface PlatformTrackAttributes {
-  id: string;
   platformId: number;
   externalTrackId: string;
   name: string;
@@ -24,6 +22,7 @@ export interface PlatformTrackAttributes {
   popularity?: number;
   discNumber?: number;
   discTrackNumber?: number;
+  id: string;
   createDate: Date;
   updateDate: Date;
   lastHarvestDate?: Date;
@@ -32,11 +31,10 @@ export interface PlatformTrackAttributes {
 
 export type PlatformTrackPk = "id";
 export type PlatformTrackId = PlatformTrack[PlatformTrackPk];
-export type PlatformTrackOptionalAttributes = "id" | "explicit" | "popularity" | "discNumber" | "discTrackNumber" | "createDate" | "updateDate" | "lastHarvestDate" | "lastHarvestLog";
+export type PlatformTrackOptionalAttributes = "explicit" | "popularity" | "discNumber" | "discTrackNumber" | "id" | "createDate" | "updateDate" | "lastHarvestDate" | "lastHarvestLog";
 export type PlatformTrackCreationAttributes = Optional<PlatformTrackAttributes, PlatformTrackOptionalAttributes>;
 
 export class PlatformTrack extends Model<PlatformTrackAttributes, PlatformTrackCreationAttributes> implements PlatformTrackAttributes {
-  id!: string;
   platformId!: number;
   externalTrackId!: string;
   name!: string;
@@ -46,6 +44,7 @@ export class PlatformTrack extends Model<PlatformTrackAttributes, PlatformTrackC
   popularity?: number;
   discNumber?: number;
   discTrackNumber?: number;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
   lastHarvestDate?: Date;
@@ -56,18 +55,6 @@ export class PlatformTrack extends Model<PlatformTrackAttributes, PlatformTrackC
   getPlatform!: Sequelize.BelongsToGetAssociationMixin<Platform>;
   setPlatform!: Sequelize.BelongsToSetAssociationMixin<Platform, PlatformId>;
   createPlatform!: Sequelize.BelongsToCreateAssociationMixin<Platform>;
-  // PlatformTrack 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;
   // PlatformTrack hasMany CanonToPlatformTrackRelation via platformTrackId
   canonToPlatformTrackRelations!: CanonToPlatformTrackRelation[];
   getCanonToPlatformTrackRelations!: Sequelize.HasManyGetAssociationsMixin<CanonToPlatformTrackRelation>;
@@ -92,18 +79,6 @@ export class PlatformTrack extends Model<PlatformTrackAttributes, PlatformTrackC
   hasCanonTrackIdCanonTrackCanonToPlatformTrackRelation!: Sequelize.BelongsToManyHasAssociationMixin<CanonTrack, CanonTrackId>;
   hasCanonTrackIdCanonTrackCanonToPlatformTrackRelations!: Sequelize.BelongsToManyHasAssociationsMixin<CanonTrack, CanonTrackId>;
   countCanonTrackIdCanonTrackCanonToPlatformTrackRelations!: Sequelize.BelongsToManyCountAssociationsMixin;
-  // PlatformTrack belongsToMany PlatformAlbum via canonTrackId and canonAlbumId
-  canonAlbumIdPlatformAlbumCanonAlbumTrackRelations!: PlatformAlbum[];
-  getCanonAlbumIdPlatformAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyGetAssociationsMixin<PlatformAlbum>;
-  setCanonAlbumIdPlatformAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManySetAssociationsMixin<PlatformAlbum, PlatformAlbumId>;
-  addCanonAlbumIdPlatformAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyAddAssociationMixin<PlatformAlbum, PlatformAlbumId>;
-  addCanonAlbumIdPlatformAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyAddAssociationsMixin<PlatformAlbum, PlatformAlbumId>;
-  createCanonAlbumIdPlatformAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyCreateAssociationMixin<PlatformAlbum>;
-  removeCanonAlbumIdPlatformAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyRemoveAssociationMixin<PlatformAlbum, PlatformAlbumId>;
-  removeCanonAlbumIdPlatformAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyRemoveAssociationsMixin<PlatformAlbum, PlatformAlbumId>;
-  hasCanonAlbumIdPlatformAlbumCanonAlbumTrackRelation!: Sequelize.BelongsToManyHasAssociationMixin<PlatformAlbum, PlatformAlbumId>;
-  hasCanonAlbumIdPlatformAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyHasAssociationsMixin<PlatformAlbum, PlatformAlbumId>;
-  countCanonAlbumIdPlatformAlbumCanonAlbumTrackRelations!: Sequelize.BelongsToManyCountAssociationsMixin;
   // PlatformTrack belongsToMany PlatformAlbum via platformTrackId and platformAlbumId
   platformAlbumIdPlatformAlbumPlatformAlbumTrackRelations!: PlatformAlbum[];
   getPlatformAlbumIdPlatformAlbumPlatformAlbumTrackRelations!: Sequelize.BelongsToManyGetAssociationsMixin<PlatformAlbum>;
@@ -203,12 +178,6 @@ export class PlatformTrack extends Model<PlatformTrackAttributes, PlatformTrackC
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformTrack {
     return PlatformTrack.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -257,6 +226,12 @@ export class PlatformTrack extends Model<PlatformTrackAttributes, PlatformTrackC
       allowNull: true,
       field: 'disc_track_number'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/PlatformUserAlbum.ts

@@ -6,11 +6,11 @@ import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformUserAlbumTrack, PlatformUserAlbumTrackId } from './PlatformUserAlbumTrack';
 
 export interface PlatformUserAlbumAttributes {
-  id: string;
   appUserId: string;
   platformId: number;
   externalUserAlbumId: string;
   platformAlbumId: string;
+  id: string;
   createdAt: Date;
   updatedAt: Date;
   stateId: number;
@@ -22,11 +22,11 @@ export type PlatformUserAlbumOptionalAttributes = "id" | "createdAt" | "updatedA
 export type PlatformUserAlbumCreationAttributes = Optional<PlatformUserAlbumAttributes, PlatformUserAlbumOptionalAttributes>;
 
 export class PlatformUserAlbum extends Model<PlatformUserAlbumAttributes, PlatformUserAlbumCreationAttributes> implements PlatformUserAlbumAttributes {
-  id!: string;
   appUserId!: string;
   platformId!: number;
   externalUserAlbumId!: string;
   platformAlbumId!: string;
+  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
   stateId!: number;
@@ -61,12 +61,6 @@ export class PlatformUserAlbum extends Model<PlatformUserAlbumAttributes, Platfo
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserAlbum {
     return PlatformUserAlbum.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -101,6 +95,12 @@ export class PlatformUserAlbum extends Model<PlatformUserAlbumAttributes, Platfo
       unique: "platform_user_album_app_user_id_platform_album_id_unique",
       field: 'platform_album_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/PlatformUserAlbumTrack.ts

@@ -5,14 +5,14 @@ import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
 import type { PlatformUserAlbum, PlatformUserAlbumId } from './PlatformUserAlbum';
 
 export interface PlatformUserAlbumTrackAttributes {
-  id: string;
   platformUserAlbumId: string;
   platformId: number;
   externalUserAlbumTrackId: string;
   platformTrackId: string;
+  stateId: number;
+  id: string;
   createdAt: Date;
   updatedAt: Date;
-  stateId: number;
 }
 
 export type PlatformUserAlbumTrackPk = "id";
@@ -21,14 +21,14 @@ export type PlatformUserAlbumTrackOptionalAttributes = "id" | "createdAt" | "upd
 export type PlatformUserAlbumTrackCreationAttributes = Optional<PlatformUserAlbumTrackAttributes, PlatformUserAlbumTrackOptionalAttributes>;
 
 export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttributes, PlatformUserAlbumTrackCreationAttributes> implements PlatformUserAlbumTrackAttributes {
-  id!: string;
   platformUserAlbumId!: string;
   platformId!: number;
   externalUserAlbumTrackId!: string;
   platformTrackId!: string;
+  stateId!: number;
+  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
-  stateId!: number;
 
   // PlatformUserAlbumTrack belongsTo Platform via platformId
   platform!: Platform;
@@ -48,12 +48,6 @@ export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttribut
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserAlbumTrack {
     return PlatformUserAlbumTrack.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     platformUserAlbumId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -88,6 +82,17 @@ export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttribut
       unique: "platform_user_album_track_platform_user_album_id_platform_track",
       field: 'platform_track_id'
     },
+    stateId: {
+      type: DataTypes.SMALLINT,
+      allowNull: false,
+      field: 'state_id'
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -99,11 +104,6 @@ export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttribut
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
-    },
-    stateId: {
-      type: DataTypes.SMALLINT,
-      allowNull: false,
-      field: 'state_id'
     }
   }, {
     sequelize,

package/models/PlatformUserPlaylist.ts

@@ -6,14 +6,14 @@ import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './P
 import type { State, StateId } from './State';
 
 export interface PlatformUserPlaylistAttributes {
-  id: string;
   appUserId: string;
   platformId: number;
   externalPlaylistId: string;
   name: string;
   description?: string;
-  public?: boolean;
   snapshotId: string;
+  id: string;
+  public?: boolean;
   collaborative: boolean;
   createDate: Date;
   updateDate: Date;
@@ -22,18 +22,18 @@ export interface PlatformUserPlaylistAttributes {
 
 export type PlatformUserPlaylistPk = "id";
 export type PlatformUserPlaylistId = PlatformUserPlaylist[PlatformUserPlaylistPk];
-export type PlatformUserPlaylistOptionalAttributes = "id" | "description" | "public" | "createDate" | "updateDate" | "stateId";
+export type PlatformUserPlaylistOptionalAttributes = "description" | "id" | "public" | "createDate" | "updateDate" | "stateId";
 export type PlatformUserPlaylistCreationAttributes = Optional<PlatformUserPlaylistAttributes, PlatformUserPlaylistOptionalAttributes>;
 
 export class PlatformUserPlaylist extends Model<PlatformUserPlaylistAttributes, PlatformUserPlaylistCreationAttributes> implements PlatformUserPlaylistAttributes {
-  id!: string;
   appUserId!: string;
   platformId!: number;
   externalPlaylistId!: string;
   name!: string;
   description?: string;
-  public?: boolean;
   snapshotId!: string;
+  id!: string;
+  public?: boolean;
   collaborative!: boolean;
   createDate!: Date;
   updateDate!: Date;
@@ -69,12 +69,6 @@ export class PlatformUserPlaylist extends Model<PlatformUserPlaylistAttributes,
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserPlaylist {
     return PlatformUserPlaylist.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -109,16 +103,22 @@ export class PlatformUserPlaylist extends Model<PlatformUserPlaylistAttributes,
       type: DataTypes.TEXT,
       allowNull: true
     },
-    public: {
-      type: DataTypes.BOOLEAN,
-      allowNull: true,
-      defaultValue: false
-    },
     snapshotId: {
       type: DataTypes.TEXT,
       allowNull: false,
       field: 'snapshot_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
+    public: {
+      type: DataTypes.BOOLEAN,
+      allowNull: true,
+      defaultValue: false
+    },
     collaborative: {
       type: DataTypes.BOOLEAN,
       allowNull: false,