@earbug/db-models 0.0.60 → 0.0.63

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 = "name" | "asciiName" | "id" | "createDate" | "updateDate" | "isPast";
+export type CanonMemberOptionalAttributes = "id" | "name" | "asciiName" | "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,6 +78,12 @@ 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
@@ -87,12 +93,6 @@ 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,6 +38,11 @@ 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,
@@ -62,11 +67,6 @@ 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

@@ -12,32 +12,32 @@ import type { Versus, VersusId } from './Versus';
 import type { VersusOption, VersusOptionId } from './VersusOption';
 
 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 = "discNumber" | "discTrackNumber" | "id" | "createDate" | "updateDate";
+export type CanonTrackOptionalAttributes = "id" | "discNumber" | "discTrackNumber" | "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[];
@@ -162,6 +162,12 @@ 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
@@ -185,17 +191,6 @@ 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,
@@ -207,6 +202,11 @@ 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,14 +14,19 @@ 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
@@ -37,11 +42,6 @@ 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 {
-  name: string;
   id: string;
+  name: 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 {
-  name!: string;
   id!: string;
+  name!: 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/FeedContentType.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { UserEngagementFactor, UserEngagementFactorId } from './UserEngagementFactor';
 
 export interface FeedContentTypeAttributes {
-  name: string;
   id: string;
+  name: string;
   mixPercentage: number;
   affinityMixHigh: number;
   affinityMixMedium: number;
@@ -21,8 +21,8 @@ export type FeedContentTypeOptionalAttributes = "id" | "mixPercentage" | "affini
 export type FeedContentTypeCreationAttributes = Optional<FeedContentTypeAttributes, FeedContentTypeOptionalAttributes>;
 
 export class FeedContentType extends Model<FeedContentTypeAttributes, FeedContentTypeCreationAttributes> implements FeedContentTypeAttributes {
-  name!: string;
   id!: string;
+  name!: string;
   mixPercentage!: number;
   affinityMixHigh!: number;
   affinityMixMedium!: number;
@@ -47,16 +47,16 @@ export class FeedContentType extends Model<FeedContentTypeAttributes, FeedConten
 
   static initModel(sequelize: Sequelize.Sequelize): typeof FeedContentType {
     return FeedContentType.init({
-    name: {
-      type: DataTypes.STRING(50),
-      allowNull: false
-    },
     id: {
       type: DataTypes.UUID,
       allowNull: false,
       defaultValue: DataTypes.UUIDV4,
       primaryKey: true
     },
+    name: {
+      type: DataTypes.STRING(50),
+      allowNull: false
+    },
     mixPercentage: {
       type: DataTypes.DECIMAL,
       allowNull: false,

package/models/GuestUser.ts

@@ -5,11 +5,11 @@ import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 import type { Versus, VersusId } from './Versus';
 
 export interface GuestUserAttributes {
-  jukeboxSessionId?: string;
+  id: string;
   firstName: string;
   lastName?: string;
+  jukeboxSessionId?: string;
   ipAddress?: string;
-  id: string;
   createDate: Date;
   updateDate: Date;
   versusId?: string;
@@ -17,15 +17,15 @@ export interface GuestUserAttributes {
 
 export type GuestUserPk = "id";
 export type GuestUserId = GuestUser[GuestUserPk];
-export type GuestUserOptionalAttributes = "jukeboxSessionId" | "lastName" | "ipAddress" | "id" | "createDate" | "updateDate" | "versusId";
+export type GuestUserOptionalAttributes = "id" | "lastName" | "jukeboxSessionId" | "ipAddress" | "createDate" | "updateDate" | "versusId";
 export type GuestUserCreationAttributes = Optional<GuestUserAttributes, GuestUserOptionalAttributes>;
 
 export class GuestUser extends Model<GuestUserAttributes, GuestUserCreationAttributes> implements GuestUserAttributes {
-  jukeboxSessionId?: string;
+  id!: string;
   firstName!: string;
   lastName?: string;
+  jukeboxSessionId?: string;
   ipAddress?: string;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
   versusId?: string;
@@ -55,14 +55,11 @@ export class GuestUser extends Model<GuestUserAttributes, GuestUserCreationAttri
 
   static initModel(sequelize: Sequelize.Sequelize): typeof GuestUser {
     return GuestUser.init({
-    jukeboxSessionId: {
+    id: {
       type: DataTypes.UUID,
-      allowNull: true,
-      references: {
-        model: 'jukebox_session',
-        key: 'id'
-      },
-      field: 'jukebox_session_id'
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
     },
     firstName: {
       type: DataTypes.TEXT,
@@ -74,17 +71,20 @@ export class GuestUser extends Model<GuestUserAttributes, GuestUserCreationAttri
       allowNull: true,
       field: 'last_name'
     },
+    jukeboxSessionId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'jukebox_session',
+        key: 'id'
+      },
+      field: 'jukebox_session_id'
+    },
     ipAddress: {
       type: DataTypes.TEXT,
       allowNull: true,
       field: 'ip_address'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     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 {
-  description: string;
   id: number;
+  description: string;
 }
 
 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 {
-  description!: string;
   id!: number;
+  description!: string;
 
   // 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,6 +38,12 @@ 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,
@@ -63,12 +69,6 @@ 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 = "invitedUserId" | "email" | "id" | "createdAt" | "updatedAt";
+export type JukeboxInviteOptionalAttributes = "id" | "invitedUserId" | "email" | "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,6 +45,12 @@ 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,
@@ -76,12 +82,6 @@ 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,

package/models/JukeboxQueueEntry.ts

@@ -10,17 +10,17 @@ import type { PlaybackStatusType, PlaybackStatusTypeId } from './PlaybackStatusT
 import type { TrackDeletionReason, TrackDeletionReasonId } from './TrackDeletionReason';
 
 export interface JukeboxQueueEntryAttributes {
+  id: string;
   jukeboxSessionId: string;
+  trackId?: string;
   playbackPriority?: number;
-  playbackStarted?: Date;
-  id: string;
+  trackAddedUserId?: string;
   createdAt: Date;
   updatedAt: Date;
   setOrder: number;
   trackDeletionReasonId: number;
   playbackStatusTypeId: number;
-  trackId?: string;
-  trackAddedUserId?: string;
+  playbackStarted?: Date;
   trackThumbsUp?: string[];
   trackThumbsDown?: string[];
   platformTrackId?: string;
@@ -29,21 +29,21 @@ export interface JukeboxQueueEntryAttributes {
 
 export type JukeboxQueueEntryPk = "id";
 export type JukeboxQueueEntryId = JukeboxQueueEntry[JukeboxQueueEntryPk];
-export type JukeboxQueueEntryOptionalAttributes = "playbackPriority" | "playbackStarted" | "id" | "createdAt" | "updatedAt" | "setOrder" | "trackDeletionReasonId" | "playbackStatusTypeId" | "trackId" | "trackAddedUserId" | "trackThumbsUp" | "trackThumbsDown" | "platformTrackId" | "trackAddedGuestUserId";
+export type JukeboxQueueEntryOptionalAttributes = "id" | "trackId" | "playbackPriority" | "trackAddedUserId" | "createdAt" | "updatedAt" | "setOrder" | "trackDeletionReasonId" | "playbackStatusTypeId" | "playbackStarted" | "trackThumbsUp" | "trackThumbsDown" | "platformTrackId" | "trackAddedGuestUserId";
 export type JukeboxQueueEntryCreationAttributes = Optional<JukeboxQueueEntryAttributes, JukeboxQueueEntryOptionalAttributes>;
 
 export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, JukeboxQueueEntryCreationAttributes> implements JukeboxQueueEntryAttributes {
+  id!: string;
   jukeboxSessionId!: string;
+  trackId?: string;
   playbackPriority?: number;
-  playbackStarted?: Date;
-  id!: string;
+  trackAddedUserId?: string;
   createdAt!: Date;
   updatedAt!: Date;
   setOrder!: number;
   trackDeletionReasonId!: number;
   playbackStatusTypeId!: number;
-  trackId?: string;
-  trackAddedUserId?: string;
+  playbackStarted?: Date;
   trackThumbsUp?: string[];
   trackThumbsDown?: string[];
   platformTrackId?: string;
@@ -99,6 +99,12 @@ export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, Jukebo
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxQueueEntry {
     return JukeboxQueueEntry.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     jukeboxSessionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -108,21 +114,28 @@ export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, Jukebo
       },
       field: 'jukebox_session_id'
     },
+    trackId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'canon_track',
+        key: 'id'
+      },
+      field: 'track_id'
+    },
     playbackPriority: {
       type: DataTypes.DECIMAL,
       allowNull: true,
       field: 'playback_priority'
     },
-    playbackStarted: {
-      type: DataTypes.DATE,
-      allowNull: true,
-      field: 'playback_started'
-    },
-    id: {
+    trackAddedUserId: {
       type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
+      allowNull: true,
+      references: {
+        model: 'app_user',
+        key: 'id'
+      },
+      field: 'track_added_user_id'
     },
     createdAt: {
       type: DataTypes.DATE,
@@ -162,23 +175,10 @@ export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, Jukebo
       },
       field: 'playback_status_type_id'
     },
-    trackId: {
-      type: DataTypes.UUID,
-      allowNull: true,
-      references: {
-        model: 'canon_track',
-        key: 'id'
-      },
-      field: 'track_id'
-    },
-    trackAddedUserId: {
-      type: DataTypes.UUID,
+    playbackStarted: {
+      type: DataTypes.DATE,
       allowNull: true,
-      references: {
-        model: 'app_user',
-        key: 'id'
-      },
-      field: 'track_added_user_id'
+      field: 'playback_started'
     },
     trackThumbsUp: {
       type: DataTypes.ARRAY(DataTypes.UUID),