@earbug/db-models 0.0.6 → 0.0.8

package/dist/PlatformUserPlaylist.js

@@ -29,12 +29,6 @@ const sequelize_1 = require("sequelize");
 class PlatformUserPlaylist extends sequelize_1.Model {
     static initModel(sequelize) {
         return PlatformUserPlaylist.init({
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             appUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -69,16 +63,22 @@ class PlatformUserPlaylist extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: true
             },
-            public: {
-                type: sequelize_1.DataTypes.BOOLEAN,
-                allowNull: true,
-                defaultValue: false
-            },
             snapshotId: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: false,
                 field: 'snapshot_id'
             },
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
+            public: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                allowNull: true,
+                defaultValue: false
+            },
             collaborative: {
                 type: sequelize_1.DataTypes.BOOLEAN,
                 allowNull: false,

package/dist/PlatformUserPlaylistTrack.d.ts

@@ -4,34 +4,34 @@ import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { State, StateId } from './State';
 export interface PlatformUserPlaylistTrackAttributes {
-    id: string;
     platformTrackId: string;
     platformUserPlaylistId: string;
-    trackPosition: number;
     addedDate?: Date;
     addedByPlatformUserId?: string;
+    externalPlaylistTrackId: string;
+    id: string;
+    trackPosition: number;
     isLocal: boolean;
     createDate: Date;
     updateDate: Date;
     stateId: number;
-    externalPlaylistTrackId: string;
 }
 export type PlatformUserPlaylistTrackPk = "id";
 export type PlatformUserPlaylistTrackId = PlatformUserPlaylistTrack[PlatformUserPlaylistTrackPk];
-export type PlatformUserPlaylistTrackOptionalAttributes = "id" | "trackPosition" | "addedDate" | "addedByPlatformUserId" | "createDate" | "updateDate" | "stateId";
+export type PlatformUserPlaylistTrackOptionalAttributes = "addedDate" | "addedByPlatformUserId" | "id" | "trackPosition" | "createDate" | "updateDate" | "stateId";
 export type PlatformUserPlaylistTrackCreationAttributes = Optional<PlatformUserPlaylistTrackAttributes, PlatformUserPlaylistTrackOptionalAttributes>;
 export declare class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAttributes, PlatformUserPlaylistTrackCreationAttributes> implements PlatformUserPlaylistTrackAttributes {
-    id: string;
     platformTrackId: string;
     platformUserPlaylistId: string;
-    trackPosition: number;
     addedDate?: Date;
     addedByPlatformUserId?: string;
+    externalPlaylistTrackId: string;
+    id: string;
+    trackPosition: number;
     isLocal: boolean;
     createDate: Date;
     updateDate: Date;
     stateId: number;
-    externalPlaylistTrackId: string;
     platformTrack: PlatformTrack;
     getPlatformTrack: Sequelize.BelongsToGetAssociationMixin<PlatformTrack>;
     setPlatformTrack: Sequelize.BelongsToSetAssociationMixin<PlatformTrack, PlatformTrackId>;

package/dist/PlatformUserPlaylistTrack.js

@@ -29,12 +29,6 @@ const sequelize_1 = require("sequelize");
 class PlatformUserPlaylistTrack extends sequelize_1.Model {
     static initModel(sequelize) {
         return PlatformUserPlaylistTrack.init({
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             platformTrackId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -55,12 +49,6 @@ class PlatformUserPlaylistTrack extends sequelize_1.Model {
                 unique: "uk_playlist_id_track_id",
                 field: 'platform_user_playlist_id'
             },
-            trackPosition: {
-                type: sequelize_1.DataTypes.INTEGER,
-                allowNull: false,
-                defaultValue: 0,
-                field: 'track_position'
-            },
             addedDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: true,
@@ -71,6 +59,23 @@ class PlatformUserPlaylistTrack extends sequelize_1.Model {
                 allowNull: true,
                 field: 'added_by_platform_user_id'
             },
+            externalPlaylistTrackId: {
+                type: sequelize_1.DataTypes.STRING(255),
+                allowNull: false,
+                field: 'external_playlist_track_id'
+            },
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
+            trackPosition: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0,
+                field: 'track_position'
+            },
             isLocal: {
                 type: sequelize_1.DataTypes.BOOLEAN,
                 allowNull: false,
@@ -98,11 +103,6 @@ class PlatformUserPlaylistTrack extends sequelize_1.Model {
                     key: 'id'
                 },
                 field: 'state_id'
-            },
-            externalPlaylistTrackId: {
-                type: sequelize_1.DataTypes.STRING(255),
-                allowNull: false,
-                field: 'external_playlist_track_id'
             }
         }, {
             sequelize,

package/dist/PlaybackStatus.d.ts

@@ -1,26 +1,14 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 export interface PlaybackStatusAttributes {
-    id: number;
     description: string;
+    id: number;
 }
 export type PlaybackStatusPk = "id";
 export type PlaybackStatusId = PlaybackStatus[PlaybackStatusPk];
 export type PlaybackStatusCreationAttributes = PlaybackStatusAttributes;
 export declare class PlaybackStatus extends Model<PlaybackStatusAttributes, PlaybackStatusCreationAttributes> implements PlaybackStatusAttributes {
-    id: number;
     description: string;
-    jukeboxQueueEntries: JukeboxQueueEntry[];
-    getJukeboxQueueEntries: Sequelize.HasManyGetAssociationsMixin<JukeboxQueueEntry>;
-    setJukeboxQueueEntries: Sequelize.HasManySetAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
-    addJukeboxQueueEntry: Sequelize.HasManyAddAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
-    addJukeboxQueueEntries: Sequelize.HasManyAddAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
-    createJukeboxQueueEntry: Sequelize.HasManyCreateAssociationMixin<JukeboxQueueEntry>;
-    removeJukeboxQueueEntry: Sequelize.HasManyRemoveAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
-    removeJukeboxQueueEntries: Sequelize.HasManyRemoveAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
-    hasJukeboxQueueEntry: Sequelize.HasManyHasAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
-    hasJukeboxQueueEntries: Sequelize.HasManyHasAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
-    countJukeboxQueueEntries: Sequelize.HasManyCountAssociationsMixin;
+    id: number;
     static initModel(sequelize: Sequelize.Sequelize): typeof PlaybackStatus;
 }

package/dist/PlaybackStatus.js

@@ -5,16 +5,16 @@ const sequelize_1 = require("sequelize");
 class PlaybackStatus extends sequelize_1.Model {
     static initModel(sequelize) {
         return PlaybackStatus.init({
+            description: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: false
+            },
             id: {
                 autoIncrement: true,
                 autoIncrementIdentity: true,
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
                 primaryKey: true
-            },
-            description: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: false
             }
         }, {
             sequelize,

package/dist/PlaybackStatusType.d.ts

@@ -1,5 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
+import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 export interface PlaybackStatusTypeAttributes {
     id: number;
     description: string;
@@ -10,5 +11,16 @@ export type PlaybackStatusTypeCreationAttributes = PlaybackStatusTypeAttributes;
 export declare class PlaybackStatusType extends Model<PlaybackStatusTypeAttributes, PlaybackStatusTypeCreationAttributes> implements PlaybackStatusTypeAttributes {
     id: number;
     description: string;
+    jukeboxQueueEntries: JukeboxQueueEntry[];
+    getJukeboxQueueEntries: Sequelize.HasManyGetAssociationsMixin<JukeboxQueueEntry>;
+    setJukeboxQueueEntries: Sequelize.HasManySetAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+    addJukeboxQueueEntry: Sequelize.HasManyAddAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+    addJukeboxQueueEntries: Sequelize.HasManyAddAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+    createJukeboxQueueEntry: Sequelize.HasManyCreateAssociationMixin<JukeboxQueueEntry>;
+    removeJukeboxQueueEntry: Sequelize.HasManyRemoveAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+    removeJukeboxQueueEntries: Sequelize.HasManyRemoveAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+    hasJukeboxQueueEntry: Sequelize.HasManyHasAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+    hasJukeboxQueueEntries: Sequelize.HasManyHasAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+    countJukeboxQueueEntries: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof PlaybackStatusType;
 }

package/dist/State.d.ts

@@ -4,15 +4,15 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './PlatformUserPlaylistTrack';
 export interface StateAttributes {
-    id: number;
     description: string;
+    id: number;
 }
 export type StatePk = "id";
 export type StateId = State[StatePk];
 export type StateCreationAttributes = StateAttributes;
 export declare class State extends Model<StateAttributes, StateCreationAttributes> implements StateAttributes {
-    id: number;
     description: string;
+    id: number;
     appUsers: AppUser[];
     getAppUsers: Sequelize.HasManyGetAssociationsMixin<AppUser>;
     setAppUsers: Sequelize.HasManySetAssociationsMixin<AppUser, AppUserId>;

package/dist/State.js

@@ -5,16 +5,16 @@ const sequelize_1 = require("sequelize");
 class State extends sequelize_1.Model {
     static initModel(sequelize) {
         return State.init({
+            description: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: false
+            },
             id: {
                 autoIncrement: true,
                 autoIncrementIdentity: true,
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
                 primaryKey: true
-            },
-            description: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: false
             }
         }, {
             sequelize,

package/dist/UnmatchedAlbum.d.ts

@@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 export interface UnmatchedAlbumAttributes {
-    id: string;
     platformAlbumId: string;
+    id: string;
     createDate: Date;
 }
 export type UnmatchedAlbumPk = "id";
@@ -11,8 +11,8 @@ export type UnmatchedAlbumId = UnmatchedAlbum[UnmatchedAlbumPk];
 export type UnmatchedAlbumOptionalAttributes = "id" | "createDate";
 export type UnmatchedAlbumCreationAttributes = Optional<UnmatchedAlbumAttributes, UnmatchedAlbumOptionalAttributes>;
 export declare class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlbumCreationAttributes> implements UnmatchedAlbumAttributes {
-    id: string;
     platformAlbumId: string;
+    id: string;
     createDate: Date;
     platformAlbum: PlatformAlbum;
     getPlatformAlbum: Sequelize.BelongsToGetAssociationMixin<PlatformAlbum>;

package/dist/UnmatchedAlbum.js

@@ -29,12 +29,6 @@ const sequelize_1 = require("sequelize");
 class UnmatchedAlbum extends sequelize_1.Model {
     static initModel(sequelize) {
         return UnmatchedAlbum.init({
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             platformAlbumId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -44,6 +38,12 @@ class UnmatchedAlbum extends sequelize_1.Model {
                 },
                 field: 'platform_album_id'
             },
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/UnmatchedArtist.d.ts

@@ -2,9 +2,9 @@ import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { Platform, PlatformId } from './Platform';
 export interface UnmatchedArtistAttributes {
-    id: string;
     platformId: number;
     externalArtistId: number;
+    id: string;
     createDate: Date;
     updateDate: Date;
 }
@@ -13,9 +13,9 @@ export type UnmatchedArtistId = UnmatchedArtist[UnmatchedArtistPk];
 export type UnmatchedArtistOptionalAttributes = "id" | "createDate" | "updateDate";
 export type UnmatchedArtistCreationAttributes = Optional<UnmatchedArtistAttributes, UnmatchedArtistOptionalAttributes>;
 export declare class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedArtistCreationAttributes> implements UnmatchedArtistAttributes {
-    id: string;
     platformId: number;
     externalArtistId: number;
+    id: string;
     createDate: Date;
     updateDate: Date;
     platform: Platform;

package/dist/UnmatchedArtist.js

@@ -29,12 +29,6 @@ const sequelize_1 = require("sequelize");
 class UnmatchedArtist extends sequelize_1.Model {
     static initModel(sequelize) {
         return UnmatchedArtist.init({
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             platformId: {
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
@@ -49,6 +43,12 @@ class UnmatchedArtist extends sequelize_1.Model {
                 allowNull: false,
                 field: 'external_artist_id'
             },
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/UserContacts.d.ts

@@ -3,7 +3,6 @@ import { Model, Optional } from 'sequelize';
 import type { AppUser, AppUserId } from './AppUser';
 export interface UserContactsAttributes {
     appUserId: string;
-    contactId: string;
     contactAppUserId?: string;
     firstName?: string;
     lastName?: string;
@@ -17,14 +16,14 @@ export interface UserContactsAttributes {
     contactPhone3?: string;
     contactPhone3Type?: "mobile" | "work" | "home" | "main";
     active?: boolean;
+    contactId: string;
 }
 export type UserContactsPk = "contactId";
 export type UserContactsId = UserContacts[UserContactsPk];
-export type UserContactsOptionalAttributes = "contactId" | "contactAppUserId" | "firstName" | "lastName" | "contactEmail1" | "contactEmail2" | "contactEmail3" | "contactPhone1" | "contactPhone1Type" | "contactPhone2" | "contactPhone2Type" | "contactPhone3" | "contactPhone3Type" | "active";
+export type UserContactsOptionalAttributes = "contactAppUserId" | "firstName" | "lastName" | "contactEmail1" | "contactEmail2" | "contactEmail3" | "contactPhone1" | "contactPhone1Type" | "contactPhone2" | "contactPhone2Type" | "contactPhone3" | "contactPhone3Type" | "active" | "contactId";
 export type UserContactsCreationAttributes = Optional<UserContactsAttributes, UserContactsOptionalAttributes>;
 export declare class UserContacts extends Model<UserContactsAttributes, UserContactsCreationAttributes> implements UserContactsAttributes {
     appUserId: string;
-    contactId: string;
     contactAppUserId?: string;
     firstName?: string;
     lastName?: string;
@@ -38,6 +37,7 @@ export declare class UserContacts extends Model<UserContactsAttributes, UserCont
     contactPhone3?: string;
     contactPhone3Type?: "mobile" | "work" | "home" | "main";
     active?: boolean;
+    contactId: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;

package/dist/UserContacts.js

@@ -14,13 +14,6 @@ class UserContacts extends sequelize_1.Model {
                 },
                 field: 'app_user_id'
             },
-            contactId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true,
-                field: 'contact_id'
-            },
             contactAppUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: true,
@@ -84,6 +77,13 @@ class UserContacts extends sequelize_1.Model {
             active: {
                 type: sequelize_1.DataTypes.BOOLEAN,
                 allowNull: true
+            },
+            contactId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true,
+                field: 'contact_id'
             }
         }, {
             sequelize,

package/dist/init-models.js

@@ -211,9 +211,10 @@ function initModels(sequelize) {
     const UnmatchedAlbum = UnmatchedAlbum_1.UnmatchedAlbum.initModel(sequelize);
     const UnmatchedArtist = UnmatchedArtist_1.UnmatchedArtist.initModel(sequelize);
     const UserContacts = UserContacts_1.UserContacts.initModel(sequelize);
+    CanonAlbum.belongsToMany(CanonTrack, { as: 'canonTrackIdCanonTracks', through: CanonAlbumTrackRelation, foreignKey: "canonAlbumId", otherKey: "canonTrackId" });
     CanonAlbum.belongsToMany(ExternalReference, { as: 'externalReferenceIdExternalReferences', through: CanonAlbumExternalReferenceRelation, foreignKey: "canonAlbumId", otherKey: "externalReferenceId" });
     CanonAlbum.belongsToMany(PlatformAlbum, { as: 'platformAlbumIdPlatformAlbums', through: CanonToPlatformAlbumRelation, foreignKey: "canonAlbumId", otherKey: "platformAlbumId" });
-    CanonArtist.belongsToMany(CanonTrack, { as: 'canonTrackIdCanonTracks', through: CanonArtistTrackRelation, foreignKey: "canonArtistId", otherKey: "canonTrackId" });
+    CanonArtist.belongsToMany(CanonTrack, { as: 'canonTrackIdCanonTrackCanonArtistTrackRelations', through: CanonArtistTrackRelation, foreignKey: "canonArtistId", otherKey: "canonTrackId" });
     CanonArtist.belongsToMany(PlatformAlbum, { as: 'canonAlbumIdPlatformAlbumCanonArtistAlbumRelations', through: CanonArtistAlbumRelation, foreignKey: "canonArtistId", otherKey: "canonAlbumId" });
     CanonArtist.belongsToMany(PlatformArtist, { as: 'platformArtistIdPlatformArtists', through: CanonToPlatformArtistRelation, foreignKey: "canonArtistId", otherKey: "platformArtistId" });
     CanonGenre.belongsToMany(ExternalReference, { as: 'externalReferenceIdExternalReferenceCanonGenreExternalReferenceRelations', through: CanonGenreExternalReferenceRelation, foreignKey: "canonGenreId", otherKey: "externalReferenceId" });
@@ -224,6 +225,7 @@ function initModels(sequelize) {
     CanonLabel.belongsToMany(PlatformAlbum, { as: 'canonAlbumIdPlatformAlbumCanonAlbumLabelRelations', through: CanonAlbumLabelRelation, foreignKey: "canonLabelId", otherKey: "canonAlbumId" });
     CanonMember.belongsToMany(ExternalReference, { as: 'externalReferenceIdExternalReferenceCanonMemberExternalReferenceRelations', through: CanonMemberExternalReferenceRelation, foreignKey: "canonMemberId", otherKey: "externalReferenceId" });
     CanonMember.belongsToMany(PlatformArtist, { as: 'canonArtistIdPlatformArtistCanonArtistMemberRelations', through: CanonArtistMemberRelation, foreignKey: "canonMemberId", otherKey: "canonArtistId" });
+    CanonTrack.belongsToMany(CanonAlbum, { as: 'canonAlbumIdCanonAlbumCanonAlbumTrackRelations', through: CanonAlbumTrackRelation, foreignKey: "canonTrackId", otherKey: "canonAlbumId" });
     CanonTrack.belongsToMany(CanonArtist, { as: 'canonArtistIdCanonArtistCanonArtistTrackRelations', through: CanonArtistTrackRelation, foreignKey: "canonTrackId", otherKey: "canonArtistId" });
     CanonTrack.belongsToMany(PlatformTrack, { as: 'platformTrackIdPlatformTracks', through: CanonToPlatformTrackRelation, foreignKey: "canonTrackId", otherKey: "platformTrackId" });
     ExternalReference.belongsToMany(CanonAlbum, { as: 'canonAlbumIdCanonAlbums', through: CanonAlbumExternalReferenceRelation, foreignKey: "externalReferenceId", otherKey: "canonAlbumId" });
@@ -237,7 +239,6 @@ function initModels(sequelize) {
     PlatformAlbum.belongsToMany(CanonLabel, { as: 'canonLabelIdCanonLabels', through: CanonAlbumLabelRelation, foreignKey: "canonAlbumId", otherKey: "canonLabelId" });
     PlatformAlbum.belongsToMany(PlatformArtist, { as: 'platformArtistIdPlatformArtistPlatformArtistAlbumRelations', through: PlatformArtistAlbumRelation, foreignKey: "platformAlbumId", otherKey: "platformArtistId" });
     PlatformAlbum.belongsToMany(PlatformGenre, { as: 'platformGenreIdPlatformGenrePlatformAlbumGenreRelations', through: PlatformAlbumGenreRelation, foreignKey: "platformAlbumId", otherKey: "platformGenreId" });
-    PlatformAlbum.belongsToMany(PlatformTrack, { as: 'canonTrackIdPlatformTracks', through: CanonAlbumTrackRelation, foreignKey: "canonAlbumId", otherKey: "canonTrackId" });
     PlatformAlbum.belongsToMany(PlatformTrack, { as: 'platformTrackIdPlatformTrackPlatformAlbumTrackRelations', through: PlatformAlbumTrackRelation, foreignKey: "platformAlbumId", otherKey: "platformTrackId" });
     PlatformArtist.belongsToMany(CanonArtist, { as: 'canonArtistIdCanonArtistCanonToPlatformArtistRelations', through: CanonToPlatformArtistRelation, foreignKey: "platformArtistId", otherKey: "canonArtistId" });
     PlatformArtist.belongsToMany(CanonGenre, { as: 'canonGenreIdCanonGenreCanonArtistGenreRelations', through: CanonArtistGenreRelation, foreignKey: "canonArtistId", otherKey: "canonGenreId" });
@@ -251,7 +252,6 @@ function initModels(sequelize) {
     PlatformGenre.belongsToMany(PlatformArtist, { as: 'platformArtistIdPlatformArtistPlatformArtistGenreRelations', through: PlatformArtistGenreRelation, foreignKey: "platformGenreId", otherKey: "platformArtistId" });
     PlatformGenre.belongsToMany(PlatformTrack, { as: 'platformTrackIdPlatformTrackPlatformTrackGenreRelations', through: PlatformTrackGenreRelation, foreignKey: "platformGenreId", otherKey: "platformTrackId" });
     PlatformTrack.belongsToMany(CanonTrack, { as: 'canonTrackIdCanonTrackCanonToPlatformTrackRelations', through: CanonToPlatformTrackRelation, foreignKey: "platformTrackId", otherKey: "canonTrackId" });
-    PlatformTrack.belongsToMany(PlatformAlbum, { as: 'canonAlbumIdPlatformAlbumCanonAlbumTrackRelations', through: CanonAlbumTrackRelation, foreignKey: "canonTrackId", otherKey: "canonAlbumId" });
     PlatformTrack.belongsToMany(PlatformAlbum, { as: 'platformAlbumIdPlatformAlbumPlatformAlbumTrackRelations', through: PlatformAlbumTrackRelation, foreignKey: "platformTrackId", otherKey: "platformAlbumId" });
     PlatformTrack.belongsToMany(PlatformArtist, { as: 'platformArtistIdPlatformArtistPlatformArtistTrackRelations', through: PlatformArtistTrackRelation, foreignKey: "platformTrackId", otherKey: "platformArtistId" });
     PlatformTrack.belongsToMany(PlatformGenre, { as: 'platformGenreIdPlatformGenrePlatformTrackGenreRelations', through: PlatformTrackGenreRelation, foreignKey: "platformTrackId", otherKey: "platformGenreId" });
@@ -281,6 +281,8 @@ function initModels(sequelize) {
     CanonAlbum.hasMany(CanonAlbumExternalReferenceRelation, { as: "canonAlbumExternalReferenceRelations", foreignKey: "canonAlbumId" });
     CanonAlbumImageHarvested.belongsTo(CanonAlbum, { as: "canonAlbum", foreignKey: "canonAlbumId" });
     CanonAlbum.hasMany(CanonAlbumImageHarvested, { as: "canonAlbumImageHarvesteds", foreignKey: "canonAlbumId" });
+    CanonAlbumTrackRelation.belongsTo(CanonAlbum, { as: "canonAlbum", foreignKey: "canonAlbumId" });
+    CanonAlbum.hasMany(CanonAlbumTrackRelation, { as: "canonAlbumTrackRelations", foreignKey: "canonAlbumId" });
     CanonToPlatformAlbumRelation.belongsTo(CanonAlbum, { as: "canonAlbum", foreignKey: "canonAlbumId" });
     CanonAlbum.hasMany(CanonToPlatformAlbumRelation, { as: "canonToPlatformAlbumRelations", foreignKey: "canonAlbumId" });
     CanonArtistAlbumRelation.belongsTo(CanonArtist, { as: "canonArtist", foreignKey: "canonArtistId" });
@@ -309,6 +311,8 @@ function initModels(sequelize) {
     CanonMember.hasMany(CanonArtistMemberRelation, { as: "canonArtistMemberRelations", foreignKey: "canonMemberId" });
     CanonMemberExternalReferenceRelation.belongsTo(CanonMember, { as: "canonMember", foreignKey: "canonMemberId" });
     CanonMember.hasMany(CanonMemberExternalReferenceRelation, { as: "canonMemberExternalReferenceRelations", foreignKey: "canonMemberId" });
+    CanonAlbumTrackRelation.belongsTo(CanonTrack, { as: "canonTrack", foreignKey: "canonTrackId" });
+    CanonTrack.hasMany(CanonAlbumTrackRelation, { as: "canonAlbumTrackRelations", foreignKey: "canonTrackId" });
     CanonArtistTrackRelation.belongsTo(CanonTrack, { as: "canonTrack", foreignKey: "canonTrackId" });
     CanonTrack.hasMany(CanonArtistTrackRelation, { as: "canonArtistTrackRelations", foreignKey: "canonTrackId" });
     CanonToPlatformTrackRelation.belongsTo(CanonTrack, { as: "canonTrack", foreignKey: "canonTrackId" });
@@ -371,8 +375,6 @@ function initModels(sequelize) {
     PlatformAlbum.hasMany(CanonAlbumGenreRelation, { as: "canonAlbumGenreRelations", foreignKey: "canonAlbumId" });
     CanonAlbumLabelRelation.belongsTo(PlatformAlbum, { as: "canonAlbum", foreignKey: "canonAlbumId" });
     PlatformAlbum.hasMany(CanonAlbumLabelRelation, { as: "canonAlbumLabelRelations", foreignKey: "canonAlbumId" });
-    CanonAlbumTrackRelation.belongsTo(PlatformAlbum, { as: "canonAlbum", foreignKey: "canonAlbumId" });
-    PlatformAlbum.hasMany(CanonAlbumTrackRelation, { as: "canonAlbumTrackRelations", foreignKey: "canonAlbumId" });
     CanonArtistAlbumRelation.belongsTo(PlatformAlbum, { as: "canonAlbum", foreignKey: "canonAlbumId" });
     PlatformAlbum.hasMany(CanonArtistAlbumRelation, { as: "canonArtistAlbumRelations", foreignKey: "canonAlbumId" });
     CanonToPlatformAlbumRelation.belongsTo(PlatformAlbum, { as: "platformAlbum", foreignKey: "platformAlbumId" });
@@ -409,8 +411,6 @@ function initModels(sequelize) {
     PlatformGenre.hasMany(PlatformArtistGenreRelation, { as: "platformArtistGenreRelations", foreignKey: "platformGenreId" });
     PlatformTrackGenreRelation.belongsTo(PlatformGenre, { as: "platformGenre", foreignKey: "platformGenreId" });
     PlatformGenre.hasMany(PlatformTrackGenreRelation, { as: "platformTrackGenreRelations", foreignKey: "platformGenreId" });
-    CanonAlbumTrackRelation.belongsTo(PlatformTrack, { as: "canonTrack", foreignKey: "canonTrackId" });
-    PlatformTrack.hasMany(CanonAlbumTrackRelation, { as: "canonAlbumTrackRelations", foreignKey: "canonTrackId" });
     CanonToPlatformTrackRelation.belongsTo(PlatformTrack, { as: "platformTrack", foreignKey: "platformTrackId" });
     PlatformTrack.hasMany(CanonToPlatformTrackRelation, { as: "canonToPlatformTrackRelations", foreignKey: "platformTrackId" });
     PlatformAlbumTrackRelation.belongsTo(PlatformTrack, { as: "platformTrack", foreignKey: "platformTrackId" });
@@ -427,8 +427,8 @@ function initModels(sequelize) {
     PlatformUserAlbum.hasMany(PlatformUserAlbumTrack, { as: "platformUserAlbumTracks", foreignKey: "platformUserAlbumId" });
     PlatformUserPlaylistTrack.belongsTo(PlatformUserPlaylist, { as: "platformUserPlaylist", foreignKey: "platformUserPlaylistId" });
     PlatformUserPlaylist.hasMany(PlatformUserPlaylistTrack, { as: "platformUserPlaylistTracks", foreignKey: "platformUserPlaylistId" });
-    JukeboxQueueEntry.belongsTo(PlaybackStatus, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId" });
-    PlaybackStatus.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId" });
+    JukeboxQueueEntry.belongsTo(PlaybackStatusType, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId" });
+    PlaybackStatusType.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId" });
     AppUser.belongsTo(State, { as: "state", foreignKey: "stateId" });
     State.hasMany(AppUser, { as: "appUsers", foreignKey: "stateId" });
     PlatformUserPlaylist.belongsTo(State, { as: "state", foreignKey: "stateId" });

package/models/AppUser.ts

@@ -12,13 +12,13 @@ import type { State, StateId } from './State';
 import type { UserContacts, UserContactsId } from './UserContacts';
 
 export interface AppUserAttributes {
-  id: string;
   email: string;
   firstName: string;
+  id: string;
   createDate: Date;
   updateDate: Date;
-  stateId: number;
   syncContacts?: boolean;
+  stateId?: number;
   lastName?: string;
   autoApproveFollowers: boolean;
   lastHarvested?: Date;
@@ -27,17 +27,17 @@ export interface AppUserAttributes {
 
 export type AppUserPk = "id";
 export type AppUserId = AppUser[AppUserPk];
-export type AppUserOptionalAttributes = "id" | "createDate" | "updateDate" | "stateId" | "syncContacts" | "lastName" | "autoApproveFollowers" | "lastHarvested" | "lastHarvestedError";
+export type AppUserOptionalAttributes = "id" | "createDate" | "updateDate" | "syncContacts" | "stateId" | "lastName" | "autoApproveFollowers" | "lastHarvested" | "lastHarvestedError";
 export type AppUserCreationAttributes = Optional<AppUserAttributes, AppUserOptionalAttributes>;
 
 export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes> implements AppUserAttributes {
-  id!: string;
   email!: string;
   firstName!: string;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
-  stateId!: number;
   syncContacts?: boolean;
+  stateId?: number;
   lastName?: string;
   autoApproveFollowers!: boolean;
   lastHarvested?: Date;
@@ -176,12 +176,6 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUser {
     return AppUser.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     email: {
       type: DataTypes.TEXT,
       allowNull: false,
@@ -192,6 +186,12 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
       allowNull: false,
       field: 'first_name'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -204,9 +204,15 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
     },
+    syncContacts: {
+      type: DataTypes.BOOLEAN,
+      allowNull: true,
+      defaultValue: false,
+      field: 'sync_contacts'
+    },
     stateId: {
       type: DataTypes.SMALLINT,
-      allowNull: false,
+      allowNull: true,
       defaultValue: 0,
       references: {
         model: 'state',
@@ -214,12 +220,6 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
       },
       field: 'state_id'
     },
-    syncContacts: {
-      type: DataTypes.BOOLEAN,
-      allowNull: true,
-      defaultValue: false,
-      field: 'sync_contacts'
-    },
     lastName: {
       type: DataTypes.TEXT,
       allowNull: true,