@earbug/db-models 0.0.7 → 0.0.9

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,

package/models/PlatformUserPlaylistTrack.ts

@@ -5,36 +5,36 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 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 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;
 
   // PlatformUserPlaylistTrack belongsTo PlatformTrack via platformTrackId
   platformTrack!: PlatformTrack;
@@ -54,12 +54,6 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserPlaylistTrack {
     return PlatformUserPlaylistTrack.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformTrackId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -80,12 +74,6 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
       unique: "uk_playlist_id_track_id",
       field: 'platform_user_playlist_id'
     },
-    trackPosition: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      defaultValue: 0,
-      field: 'track_position'
-    },
     addedDate: {
       type: DataTypes.DATE,
       allowNull: true,
@@ -96,6 +84,23 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
       allowNull: true,
       field: 'added_by_platform_user_id'
     },
+    externalPlaylistTrackId: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+      field: 'external_playlist_track_id'
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
+    trackPosition: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: 0,
+      field: 'track_position'
+    },
     isLocal: {
       type: DataTypes.BOOLEAN,
       allowNull: false,
@@ -123,11 +128,6 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
         key: 'id'
       },
       field: 'state_id'
-    },
-    externalPlaylistTrackId: {
-      type: DataTypes.STRING(255),
-      allowNull: false,
-      field: 'external_playlist_track_id'
     }
   }, {
     sequelize,

package/models/PlaybackStatus.ts

@@ -1,10 +1,9 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
-import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 
 export interface PlaybackStatusAttributes {
-  id: number;
   description: string;
+  id: number;
 }
 
 export type PlaybackStatusPk = "id";
@@ -12,34 +11,22 @@ export type PlaybackStatusId = PlaybackStatus[PlaybackStatusPk];
 export type PlaybackStatusCreationAttributes = PlaybackStatusAttributes;
 
 export class PlaybackStatus extends Model<PlaybackStatusAttributes, PlaybackStatusCreationAttributes> implements PlaybackStatusAttributes {
-  id!: number;
   description!: string;
+  id!: number;
 
-  // PlaybackStatus hasMany JukeboxQueueEntry via playbackStatusTypeId
-  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 PlaybackStatus {
     return PlaybackStatus.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/PlaybackStatusType.ts

@@ -1,5 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
+import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 
 export interface PlaybackStatusTypeAttributes {
   id: number;
@@ -14,6 +15,18 @@ export class PlaybackStatusType extends Model<PlaybackStatusTypeAttributes, Play
   id!: number;
   description!: string;
 
+  // PlaybackStatusType hasMany JukeboxQueueEntry via playbackStatusTypeId
+  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 {
     return PlaybackStatusType.init({

package/models/State.ts

@@ -5,8 +5,8 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './PlatformUserPlaylistTrack';
 
 export interface StateAttributes {
-  id: number;
   description: string;
+  id: number;
 }
 
 export type StatePk = "id";
@@ -14,8 +14,8 @@ export type StateId = State[StatePk];
 export type StateCreationAttributes = StateAttributes;
 
 export class State extends Model<StateAttributes, StateCreationAttributes> implements StateAttributes {
-  id!: number;
   description!: string;
+  id!: number;
 
   // State hasMany AppUser via stateId
   appUsers!: AppUser[];
@@ -56,16 +56,16 @@ export class State extends Model<StateAttributes, StateCreationAttributes> imple
 
   static initModel(sequelize: Sequelize.Sequelize): typeof State {
     return State.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/UnmatchedAlbum.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 
 export interface UnmatchedAlbumAttributes {
-  id: string;
   platformAlbumId: string;
+  id: string;
   createDate: Date;
 }
 
@@ -14,8 +14,8 @@ export type UnmatchedAlbumOptionalAttributes = "id" | "createDate";
 export type UnmatchedAlbumCreationAttributes = Optional<UnmatchedAlbumAttributes, UnmatchedAlbumOptionalAttributes>;
 
 export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlbumCreationAttributes> implements UnmatchedAlbumAttributes {
-  id!: string;
   platformAlbumId!: string;
+  id!: string;
   createDate!: Date;
 
   // UnmatchedAlbum belongsTo PlatformAlbum via platformAlbumId
@@ -26,12 +26,6 @@ export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlb
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UnmatchedAlbum {
     return UnmatchedAlbum.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformAlbumId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -41,6 +35,12 @@ export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlb
       },
       field: 'platform_album_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UnmatchedArtist.ts

@@ -3,9 +3,9 @@ import { DataTypes, 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;
 }
@@ -16,9 +16,9 @@ export type UnmatchedArtistOptionalAttributes = "id" | "createDate" | "updateDat
 export type UnmatchedArtistCreationAttributes = Optional<UnmatchedArtistAttributes, UnmatchedArtistOptionalAttributes>;
 
 export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedArtistCreationAttributes> implements UnmatchedArtistAttributes {
-  id!: string;
   platformId!: number;
   externalArtistId!: number;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -30,12 +30,6 @@ export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedA
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UnmatchedArtist {
     return UnmatchedArtist.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -50,6 +44,12 @@ export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedA
       allowNull: false,
       field: 'external_artist_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UserContacts.ts

@@ -4,7 +4,6 @@ import type { AppUser, AppUserId } from './AppUser';
 
 export interface UserContactsAttributes {
   appUserId: string;
-  contactId: string;
   contactAppUserId?: string;
   firstName?: string;
   lastName?: string;
@@ -18,16 +17,16 @@ 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 class UserContacts extends Model<UserContactsAttributes, UserContactsCreationAttributes> implements UserContactsAttributes {
   appUserId!: string;
-  contactId!: string;
   contactAppUserId?: string;
   firstName?: string;
   lastName?: string;
@@ -41,6 +40,7 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
   contactPhone3?: string;
   contactPhone3Type?: "mobile" | "work" | "home" | "main";
   active?: boolean;
+  contactId!: string;
 
   // UserContacts belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -59,13 +59,6 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
       },
       field: 'app_user_id'
     },
-    contactId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true,
-      field: 'contact_id'
-    },
     contactAppUserId: {
       type: DataTypes.UUID,
       allowNull: true,
@@ -129,6 +122,13 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
     active: {
       type: DataTypes.BOOLEAN,
       allowNull: true
+    },
+    contactId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true,
+      field: 'contact_id'
     }
   }, {
     sequelize,

package/models/init-models.ts

@@ -91,6 +91,10 @@ import { MetricsEvent as _MetricsEvent } from "./MetricsEvent";
 import type { MetricsEventAttributes, MetricsEventCreationAttributes } from "./MetricsEvent";
 import { NewsSite as _NewsSite } from "./NewsSite";
 import type { NewsSiteAttributes, NewsSiteCreationAttributes } from "./NewsSite";
+import { Notification as _Notification } from "./Notification";
+import type { NotificationAttributes, NotificationCreationAttributes } from "./Notification";
+import { NotificationType as _NotificationType } from "./NotificationType";
+import type { NotificationTypeAttributes, NotificationTypeCreationAttributes } from "./NotificationType";
 import { PauseStatusType as _PauseStatusType } from "./PauseStatusType";
 import type { PauseStatusTypeAttributes, PauseStatusTypeCreationAttributes } from "./PauseStatusType";
 import { Platform as _Platform } from "./Platform";
@@ -185,6 +189,8 @@ export {
   _MetricsDaily as MetricsDaily,
   _MetricsEvent as MetricsEvent,
   _NewsSite as NewsSite,
+  _Notification as Notification,
+  _NotificationType as NotificationType,
   _PauseStatusType as PauseStatusType,
   _Platform as Platform,
   _PlatformAlbum as PlatformAlbum,
@@ -303,6 +309,10 @@ export type {
   MetricsEventCreationAttributes,
   NewsSiteAttributes,
   NewsSiteCreationAttributes,
+  NotificationAttributes,
+  NotificationCreationAttributes,
+  NotificationTypeAttributes,
+  NotificationTypeCreationAttributes,
   PauseStatusTypeAttributes,
   PauseStatusTypeCreationAttributes,
   PlatformAttributes,
@@ -398,6 +408,8 @@ export function initModels(sequelize: Sequelize) {
   const MetricsDaily = _MetricsDaily.initModel(sequelize);
   const MetricsEvent = _MetricsEvent.initModel(sequelize);
   const NewsSite = _NewsSite.initModel(sequelize);
+  const Notification = _Notification.initModel(sequelize);
+  const NotificationType = _NotificationType.initModel(sequelize);
   const PauseStatusType = _PauseStatusType.initModel(sequelize);
   const Platform = _Platform.initModel(sequelize);
   const PlatformAlbum = _PlatformAlbum.initModel(sequelize);
@@ -482,6 +494,10 @@ export function initModels(sequelize: Sequelize) {
   AppUser.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "trackAddedUserId"});
   JukeboxUser.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId"});
   AppUser.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "appUserId"});
+  Notification.belongsTo(AppUser, { as: "sourceUser", foreignKey: "sourceUserId"});
+  AppUser.hasMany(Notification, { as: "notifications", foreignKey: "sourceUserId"});
+  Notification.belongsTo(AppUser, { as: "targetUser", foreignKey: "targetUserId"});
+  AppUser.hasMany(Notification, { as: "targetUserNotifications", foreignKey: "targetUserId"});
   PlatformUserAlbum.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId"});
   AppUser.hasMany(PlatformUserAlbum, { as: "platformUserAlbums", foreignKey: "appUserId"});
   PlatformUserPlaylist.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId"});
@@ -554,6 +570,8 @@ export function initModels(sequelize: Sequelize) {
   JukeboxSession.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "jukeboxSessionId"});
   JukeboxUser.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId"});
   JukeboxSession.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxSessionId"});
+  Notification.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId"});
+  JukeboxSession.hasMany(Notification, { as: "notifications", foreignKey: "jukeboxSessionId"});
   JukeboxSession.belongsTo(JukeboxStatus, { as: "jukeboxStatus", foreignKey: "jukeboxStatusId"});
   JukeboxStatus.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "jukeboxStatusId"});
   JukeboxSession.belongsTo(JukeboxTerminationCondition, { as: "terminationCondition", foreignKey: "terminationConditionId"});
@@ -562,6 +580,8 @@ export function initModels(sequelize: Sequelize) {
   JukeboxType.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "typeId"});
   JukeboxUser.belongsTo(JukeboxUserType, { as: "jukeboxUserType", foreignKey: "jukeboxUserTypeId"});
   JukeboxUserType.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxUserTypeId"});
+  Notification.belongsTo(NotificationType, { as: "notificationType", foreignKey: "notificationTypeId"});
+  NotificationType.hasMany(Notification, { as: "notifications", foreignKey: "notificationTypeId"});
   JukeboxUser.belongsTo(PauseStatusType, { as: "pauseStatusType", foreignKey: "pauseStatusTypeId"});
   PauseStatusType.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "pauseStatusTypeId"});
   AppUserPlatformRelation.belongsTo(Platform, { as: "platform", foreignKey: "platformId"});
@@ -638,8 +658,8 @@ export function initModels(sequelize: 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"});
@@ -696,6 +716,8 @@ export function initModels(sequelize: Sequelize) {
     MetricsDaily: MetricsDaily,
     MetricsEvent: MetricsEvent,
     NewsSite: NewsSite,
+    Notification: Notification,
+    NotificationType: NotificationType,
     PauseStatusType: PauseStatusType,
     Platform: Platform,
     PlatformAlbum: PlatformAlbum,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earbug/db-models",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "main": "dist/init-models.js",
   "types": "dist/init-models.d.ts",
   "scripts": {