@earbug/db-models 0.0.14 → 0.0.16

package/models/MerchType.ts

@@ -0,0 +1,89 @@
+import * as Sequelize from 'sequelize';
+import { DataTypes, Model, Optional } from 'sequelize';
+import type { MerchItem, MerchItemId } from './MerchItem';
+import type { MerchOrchestration, MerchOrchestrationId } from './MerchOrchestration';
+
+export interface MerchTypeAttributes {
+  id: string;
+  description: string;
+  createDate: Date;
+  updateDate: Date;
+}
+
+export type MerchTypePk = "id";
+export type MerchTypeId = MerchType[MerchTypePk];
+export type MerchTypeOptionalAttributes = "id" | "createDate" | "updateDate";
+export type MerchTypeCreationAttributes = Optional<MerchTypeAttributes, MerchTypeOptionalAttributes>;
+
+export class MerchType extends Model<MerchTypeAttributes, MerchTypeCreationAttributes> implements MerchTypeAttributes {
+  id!: string;
+  description!: string;
+  createDate!: Date;
+  updateDate!: Date;
+
+  // MerchType hasMany MerchItem via merchTypeId
+  merchItems!: MerchItem[];
+  getMerchItems!: Sequelize.HasManyGetAssociationsMixin<MerchItem>;
+  setMerchItems!: Sequelize.HasManySetAssociationsMixin<MerchItem, MerchItemId>;
+  addMerchItem!: Sequelize.HasManyAddAssociationMixin<MerchItem, MerchItemId>;
+  addMerchItems!: Sequelize.HasManyAddAssociationsMixin<MerchItem, MerchItemId>;
+  createMerchItem!: Sequelize.HasManyCreateAssociationMixin<MerchItem>;
+  removeMerchItem!: Sequelize.HasManyRemoveAssociationMixin<MerchItem, MerchItemId>;
+  removeMerchItems!: Sequelize.HasManyRemoveAssociationsMixin<MerchItem, MerchItemId>;
+  hasMerchItem!: Sequelize.HasManyHasAssociationMixin<MerchItem, MerchItemId>;
+  hasMerchItems!: Sequelize.HasManyHasAssociationsMixin<MerchItem, MerchItemId>;
+  countMerchItems!: Sequelize.HasManyCountAssociationsMixin;
+  // MerchType hasMany MerchOrchestration via merchTypeId
+  merchOrchestrations!: MerchOrchestration[];
+  getMerchOrchestrations!: Sequelize.HasManyGetAssociationsMixin<MerchOrchestration>;
+  setMerchOrchestrations!: Sequelize.HasManySetAssociationsMixin<MerchOrchestration, MerchOrchestrationId>;
+  addMerchOrchestration!: Sequelize.HasManyAddAssociationMixin<MerchOrchestration, MerchOrchestrationId>;
+  addMerchOrchestrations!: Sequelize.HasManyAddAssociationsMixin<MerchOrchestration, MerchOrchestrationId>;
+  createMerchOrchestration!: Sequelize.HasManyCreateAssociationMixin<MerchOrchestration>;
+  removeMerchOrchestration!: Sequelize.HasManyRemoveAssociationMixin<MerchOrchestration, MerchOrchestrationId>;
+  removeMerchOrchestrations!: Sequelize.HasManyRemoveAssociationsMixin<MerchOrchestration, MerchOrchestrationId>;
+  hasMerchOrchestration!: Sequelize.HasManyHasAssociationMixin<MerchOrchestration, MerchOrchestrationId>;
+  hasMerchOrchestrations!: Sequelize.HasManyHasAssociationsMixin<MerchOrchestration, MerchOrchestrationId>;
+  countMerchOrchestrations!: Sequelize.HasManyCountAssociationsMixin;
+
+  static initModel(sequelize: Sequelize.Sequelize): typeof MerchType {
+    return MerchType.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: false
+    },
+    createDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'create_date'
+    },
+    updateDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'update_date'
+    }
+  }, {
+    sequelize,
+    tableName: 'merch_type',
+    schema: 'eb',
+    timestamps: false,
+    indexes: [
+      {
+        name: "merch_type_pkey",
+        unique: true,
+        fields: [
+          { name: "id" },
+        ]
+      },
+    ]
+  });
+  }
+}

package/models/NewsArticle.ts

@@ -49,7 +49,7 @@ export class NewsArticle extends Model<NewsArticleAttributes, NewsArticleCreatio
     id: {
       type: DataTypes.UUID,
       allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v4'),
+      defaultValue: DataTypes.UUIDV4,
       primaryKey: true
     },
     canonArtistId: {
@@ -71,20 +71,20 @@ export class NewsArticle extends Model<NewsArticleAttributes, NewsArticleCreatio
       field: 'news_platform_id'
     },
     title: {
-      type: DataTypes.CITEXT,
+      type: DataTypes.TEXT,
       allowNull: false
     },
     description: {
-      type: DataTypes.CITEXT,
+      type: DataTypes.TEXT,
       allowNull: false
     },
     articleUrl: {
-      type: DataTypes.CITEXT,
+      type: DataTypes.TEXT,
       allowNull: false,
       field: 'article_url'
     },
     photoUrl: {
-      type: DataTypes.CITEXT,
+      type: DataTypes.TEXT,
       allowNull: false,
       field: 'photo_url'
     },
@@ -123,4 +123,3 @@ export class NewsArticle extends Model<NewsArticleAttributes, NewsArticleCreatio
   });
   }
 }
-

package/models/NewsPlatform.ts

@@ -38,11 +38,11 @@ export class NewsPlatform extends Model<NewsPlatformAttributes, NewsPlatformCrea
     id: {
       type: DataTypes.UUID,
       allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v4'),
+      defaultValue: DataTypes.UUIDV4,
       primaryKey: true
     },
     name: {
-      type: DataTypes.CITEXT,
+      type: DataTypes.TEXT,
       allowNull: false
     },
     createDate: {
@@ -74,4 +74,3 @@ export class NewsPlatform extends Model<NewsPlatformAttributes, NewsPlatformCrea
   });
   }
 }
-

package/models/PlatformTrack.ts

@@ -2,6 +2,7 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonToPlatformTrackRelation, CanonToPlatformTrackRelationId } from './CanonToPlatformTrackRelation';
 import type { CanonTrack, CanonTrackId } from './CanonTrack';
+import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 import type { Platform, PlatformId } from './Platform';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformAlbumTrackRelation, PlatformAlbumTrackRelationId } from './PlatformAlbumTrackRelation';
@@ -79,6 +80,18 @@ export class PlatformTrack extends Model<PlatformTrackAttributes, PlatformTrackC
   hasCanonTrackIdCanonTrackCanonToPlatformTrackRelation!: Sequelize.BelongsToManyHasAssociationMixin<CanonTrack, CanonTrackId>;
   hasCanonTrackIdCanonTrackCanonToPlatformTrackRelations!: Sequelize.BelongsToManyHasAssociationsMixin<CanonTrack, CanonTrackId>;
   countCanonTrackIdCanonTrackCanonToPlatformTrackRelations!: Sequelize.BelongsToManyCountAssociationsMixin;
+  // PlatformTrack hasMany JukeboxQueueEntry via platformTrackId
+  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;
   // PlatformTrack belongsToMany PlatformAlbum via platformTrackId and platformAlbumId
   platformAlbumIdPlatformAlbumPlatformAlbumTrackRelations!: PlatformAlbum[];
   getPlatformAlbumIdPlatformAlbumPlatformAlbumTrackRelations!: Sequelize.BelongsToManyGetAssociationsMixin<PlatformAlbum>;

package/models/RadioShow.ts

@@ -138,6 +138,12 @@ export class RadioShow extends Model<RadioShowAttributes, RadioShowCreationAttri
     schema: 'eb',
     timestamps: false,
     indexes: [
+      {
+        name: "idx_radio_show_creator",
+        fields: [
+          { name: "creator_user_id" },
+        ]
+      },
       {
         name: "radio_show_pkey",
         unique: true,

package/models/RadioShowGenres.ts

@@ -8,11 +8,12 @@ export interface RadioShowGenresAttributes {
   radioShowId: string;
   title: string;
   id: string;
+  seqNum?: number;
 }
 
 export type RadioShowGenresPk = "id";
 export type RadioShowGenresId = RadioShowGenres[RadioShowGenresPk];
-export type RadioShowGenresOptionalAttributes = "id";
+export type RadioShowGenresOptionalAttributes = "id" | "seqNum";
 export type RadioShowGenresCreationAttributes = Optional<RadioShowGenresAttributes, RadioShowGenresOptionalAttributes>;
 
 export class RadioShowGenres extends Model<RadioShowGenresAttributes, RadioShowGenresCreationAttributes> implements RadioShowGenresAttributes {
@@ -20,6 +21,7 @@ export class RadioShowGenres extends Model<RadioShowGenresAttributes, RadioShowG
   radioShowId!: string;
   title!: string;
   id!: string;
+  seqNum?: number;
 
   // RadioShowGenres belongsTo CanonGenre via canonGenreId
   canonGenre!: CanonGenre;
@@ -41,6 +43,7 @@ export class RadioShowGenres extends Model<RadioShowGenresAttributes, RadioShowG
         model: 'canon_genre',
         key: 'id'
       },
+      unique: "uq_radio_show_genre_unique",
       field: 'canon_genre_id'
     },
     radioShowId: {
@@ -50,6 +53,7 @@ export class RadioShowGenres extends Model<RadioShowGenresAttributes, RadioShowG
         model: 'radio_show',
         key: 'id'
       },
+      unique: "uq_radio_show_genre_unique",
       field: 'radio_show_id'
     },
     title: {
@@ -61,6 +65,12 @@ export class RadioShowGenres extends Model<RadioShowGenresAttributes, RadioShowG
       allowNull: false,
       defaultValue: DataTypes.UUIDV4,
       primaryKey: true
+    },
+    seqNum: {
+      type: DataTypes.SMALLINT,
+      allowNull: true,
+      unique: "uq_radio_show_genre_seq_unique",
+      field: 'seq_num'
     }
   }, {
     sequelize,
@@ -75,6 +85,22 @@ export class RadioShowGenres extends Model<RadioShowGenresAttributes, RadioShowG
           { name: "id" },
         ]
       },
+      {
+        name: "uq_radio_show_genre_seq_unique",
+        unique: true,
+        fields: [
+          { name: "radio_show_id" },
+          { name: "seq_num" },
+        ]
+      },
+      {
+        name: "uq_radio_show_genre_unique",
+        unique: true,
+        fields: [
+          { name: "radio_show_id" },
+          { name: "canon_genre_id" },
+        ]
+      },
     ]
   });
   }

package/models/init-models.ts

@@ -61,6 +61,8 @@ import { ConfigParam as _ConfigParam } from "./ConfigParam";
 import type { ConfigParamAttributes, ConfigParamCreationAttributes } from "./ConfigParam";
 import { ExternalReference as _ExternalReference } from "./ExternalReference";
 import type { ExternalReferenceAttributes, ExternalReferenceCreationAttributes } from "./ExternalReference";
+import { GuestUser as _GuestUser } from "./GuestUser";
+import type { GuestUserAttributes, GuestUserCreationAttributes } from "./GuestUser";
 import { JukeboxAccessType as _JukeboxAccessType } from "./JukeboxAccessType";
 import type { JukeboxAccessTypeAttributes, JukeboxAccessTypeCreationAttributes } from "./JukeboxAccessType";
 import { JukeboxCanonGenreRelation as _JukeboxCanonGenreRelation } from "./JukeboxCanonGenreRelation";
@@ -87,10 +89,22 @@ import { KnexMigrations as _KnexMigrations } from "./KnexMigrations";
 import type { KnexMigrationsAttributes, KnexMigrationsCreationAttributes } from "./KnexMigrations";
 import { KnexMigrationsLock as _KnexMigrationsLock } from "./KnexMigrationsLock";
 import type { KnexMigrationsLockAttributes, KnexMigrationsLockCreationAttributes } from "./KnexMigrationsLock";
+import { MerchItem as _MerchItem } from "./MerchItem";
+import type { MerchItemAttributes, MerchItemCreationAttributes } from "./MerchItem";
+import { MerchOrchestration as _MerchOrchestration } from "./MerchOrchestration";
+import type { MerchOrchestrationAttributes, MerchOrchestrationCreationAttributes } from "./MerchOrchestration";
+import { MerchPlatform as _MerchPlatform } from "./MerchPlatform";
+import type { MerchPlatformAttributes, MerchPlatformCreationAttributes } from "./MerchPlatform";
+import { MerchType as _MerchType } from "./MerchType";
+import type { MerchTypeAttributes, MerchTypeCreationAttributes } from "./MerchType";
 import { MetricsDaily as _MetricsDaily } from "./MetricsDaily";
 import type { MetricsDailyAttributes, MetricsDailyCreationAttributes } from "./MetricsDaily";
 import { MetricsEvent as _MetricsEvent } from "./MetricsEvent";
 import type { MetricsEventAttributes, MetricsEventCreationAttributes } from "./MetricsEvent";
+import { NewsArticle as _NewsArticle } from "./NewsArticle";
+import type { NewsArticleAttributes, NewsArticleCreationAttributes } from "./NewsArticle";
+import { NewsPlatform as _NewsPlatform } from "./NewsPlatform";
+import type { NewsPlatformAttributes, NewsPlatformCreationAttributes } from "./NewsPlatform";
 import { NewsSite as _NewsSite } from "./NewsSite";
 import type { NewsSiteAttributes, NewsSiteCreationAttributes } from "./NewsSite";
 import { Notification as _Notification } from "./Notification";
@@ -186,6 +200,7 @@ export {
   _CanonTrack as CanonTrack,
   _ConfigParam as ConfigParam,
   _ExternalReference as ExternalReference,
+  _GuestUser as GuestUser,
   _JukeboxAccessType as JukeboxAccessType,
   _JukeboxCanonGenreRelation as JukeboxCanonGenreRelation,
   _JukeboxInvite as JukeboxInvite,
@@ -199,8 +214,14 @@ export {
   _JukeboxUserType as JukeboxUserType,
   _KnexMigrations as KnexMigrations,
   _KnexMigrationsLock as KnexMigrationsLock,
+  _MerchItem as MerchItem,
+  _MerchOrchestration as MerchOrchestration,
+  _MerchPlatform as MerchPlatform,
+  _MerchType as MerchType,
   _MetricsDaily as MetricsDaily,
   _MetricsEvent as MetricsEvent,
+  _NewsArticle as NewsArticle,
+  _NewsPlatform as NewsPlatform,
   _NewsSite as NewsSite,
   _Notification as Notification,
   _NotificationType as NotificationType,
@@ -297,6 +318,8 @@ export type {
   ConfigParamCreationAttributes,
   ExternalReferenceAttributes,
   ExternalReferenceCreationAttributes,
+  GuestUserAttributes,
+  GuestUserCreationAttributes,
   JukeboxAccessTypeAttributes,
   JukeboxAccessTypeCreationAttributes,
   JukeboxCanonGenreRelationAttributes,
@@ -323,10 +346,22 @@ export type {
   KnexMigrationsCreationAttributes,
   KnexMigrationsLockAttributes,
   KnexMigrationsLockCreationAttributes,
+  MerchItemAttributes,
+  MerchItemCreationAttributes,
+  MerchOrchestrationAttributes,
+  MerchOrchestrationCreationAttributes,
+  MerchPlatformAttributes,
+  MerchPlatformCreationAttributes,
+  MerchTypeAttributes,
+  MerchTypeCreationAttributes,
   MetricsDailyAttributes,
   MetricsDailyCreationAttributes,
   MetricsEventAttributes,
   MetricsEventCreationAttributes,
+  NewsArticleAttributes,
+  NewsArticleCreationAttributes,
+  NewsPlatformAttributes,
+  NewsPlatformCreationAttributes,
   NewsSiteAttributes,
   NewsSiteCreationAttributes,
   NotificationAttributes,
@@ -423,6 +458,7 @@ export function initModels(sequelize: Sequelize) {
   const CanonTrack = _CanonTrack.initModel(sequelize);
   const ConfigParam = _ConfigParam.initModel(sequelize);
   const ExternalReference = _ExternalReference.initModel(sequelize);
+  const GuestUser = _GuestUser.initModel(sequelize);
   const JukeboxAccessType = _JukeboxAccessType.initModel(sequelize);
   const JukeboxCanonGenreRelation = _JukeboxCanonGenreRelation.initModel(sequelize);
   const JukeboxInvite = _JukeboxInvite.initModel(sequelize);
@@ -436,8 +472,14 @@ export function initModels(sequelize: Sequelize) {
   const JukeboxUserType = _JukeboxUserType.initModel(sequelize);
   const KnexMigrations = _KnexMigrations.initModel(sequelize);
   const KnexMigrationsLock = _KnexMigrationsLock.initModel(sequelize);
+  const MerchItem = _MerchItem.initModel(sequelize);
+  const MerchOrchestration = _MerchOrchestration.initModel(sequelize);
+  const MerchPlatform = _MerchPlatform.initModel(sequelize);
+  const MerchType = _MerchType.initModel(sequelize);
   const MetricsDaily = _MetricsDaily.initModel(sequelize);
   const MetricsEvent = _MetricsEvent.initModel(sequelize);
+  const NewsArticle = _NewsArticle.initModel(sequelize);
+  const NewsPlatform = _NewsPlatform.initModel(sequelize);
   const NewsSite = _NewsSite.initModel(sequelize);
   const Notification = _Notification.initModel(sequelize);
   const NotificationType = _NotificationType.initModel(sequelize);
@@ -558,6 +600,12 @@ export function initModels(sequelize: Sequelize) {
   CanonArtist.hasMany(CanonArtistTrackRelation, { as: "canonArtistTrackRelations", foreignKey: "canonArtistId"});
   CanonToPlatformArtistRelation.belongsTo(CanonArtist, { as: "canonArtist", foreignKey: "canonArtistId"});
   CanonArtist.hasMany(CanonToPlatformArtistRelation, { as: "canonToPlatformArtistRelations", foreignKey: "canonArtistId"});
+  MerchItem.belongsTo(CanonArtist, { as: "canonArtist", foreignKey: "canonArtistId"});
+  CanonArtist.hasMany(MerchItem, { as: "merchItems", foreignKey: "canonArtistId"});
+  MerchOrchestration.belongsTo(CanonArtist, { as: "canonArtist", foreignKey: "canonArtistId"});
+  CanonArtist.hasMany(MerchOrchestration, { as: "merchOrchestrations", foreignKey: "canonArtistId"});
+  NewsArticle.belongsTo(CanonArtist, { as: "canonArtist", foreignKey: "canonArtistId"});
+  CanonArtist.hasMany(NewsArticle, { as: "newsArticles", foreignKey: "canonArtistId"});
   CanonAlbumGenreRelation.belongsTo(CanonGenre, { as: "canonGenre", foreignKey: "canonGenreId"});
   CanonGenre.hasMany(CanonAlbumGenreRelation, { as: "canonAlbumGenreRelations", foreignKey: "canonGenreId"});
   CanonArtistGenreRelation.belongsTo(CanonGenre, { as: "canonGenre", foreignKey: "canonGenreId"});
@@ -598,12 +646,16 @@ export function initModels(sequelize: Sequelize) {
   ExternalReference.hasMany(CanonLabelExternalReferenceRelation, { as: "canonLabelExternalReferenceRelations", foreignKey: "externalReferenceId"});
   CanonMemberExternalReferenceRelation.belongsTo(ExternalReference, { as: "externalReference", foreignKey: "externalReferenceId"});
   ExternalReference.hasMany(CanonMemberExternalReferenceRelation, { as: "canonMemberExternalReferenceRelations", foreignKey: "externalReferenceId"});
+  JukeboxQueueEntry.belongsTo(GuestUser, { as: "trackAddedGuestUser", foreignKey: "trackAddedGuestUserId"});
+  GuestUser.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "trackAddedGuestUserId"});
   JukeboxSession.belongsTo(JukeboxAccessType, { as: "accessType", foreignKey: "accessTypeId"});
   JukeboxAccessType.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "accessTypeId"});
   JukeboxUser.belongsTo(JukeboxQueueEntry, { as: "pausedQueueEntry", foreignKey: "pausedQueueEntryId"});
   JukeboxQueueEntry.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "pausedQueueEntryId"});
   JukeboxSession.belongsTo(JukeboxQueueMode, { as: "jukeboxQueueMode", foreignKey: "jukeboxQueueModeId"});
   JukeboxQueueMode.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "jukeboxQueueModeId"});
+  GuestUser.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId"});
+  JukeboxSession.hasMany(GuestUser, { as: "guestUsers", foreignKey: "jukeboxSessionId"});
   JukeboxCanonGenreRelation.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId"});
   JukeboxSession.hasMany(JukeboxCanonGenreRelation, { as: "jukeboxCanonGenreRelations", foreignKey: "jukeboxSessionId"});
   JukeboxInvite.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId"});
@@ -622,6 +674,16 @@ 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"});
+  MerchItem.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId"});
+  MerchPlatform.hasMany(MerchItem, { as: "merchItems", foreignKey: "merchPlatformId"});
+  MerchOrchestration.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId"});
+  MerchPlatform.hasMany(MerchOrchestration, { as: "merchOrchestrations", foreignKey: "merchPlatformId"});
+  MerchItem.belongsTo(MerchType, { as: "merchType", foreignKey: "merchTypeId"});
+  MerchType.hasMany(MerchItem, { as: "merchItems", foreignKey: "merchTypeId"});
+  MerchOrchestration.belongsTo(MerchType, { as: "merchType", foreignKey: "merchTypeId"});
+  MerchType.hasMany(MerchOrchestration, { as: "merchOrchestrations", foreignKey: "merchTypeId"});
+  NewsArticle.belongsTo(NewsPlatform, { as: "newsPlatform", foreignKey: "newsPlatformId"});
+  NewsPlatform.hasMany(NewsArticle, { as: "newsArticles", foreignKey: "newsPlatformId"});
   Notification.belongsTo(NotificationType, { as: "notificationType", foreignKey: "notificationTypeId"});
   NotificationType.hasMany(Notification, { as: "notifications", foreignKey: "notificationTypeId"});
   JukeboxUser.belongsTo(PauseStatusType, { as: "pauseStatusType", foreignKey: "pauseStatusTypeId"});
@@ -686,6 +748,8 @@ export function initModels(sequelize: Sequelize) {
   PlatformGenre.hasMany(PlatformTrackGenreRelation, { as: "platformTrackGenreRelations", foreignKey: "platformGenreId"});
   CanonToPlatformTrackRelation.belongsTo(PlatformTrack, { as: "platformTrack", foreignKey: "platformTrackId"});
   PlatformTrack.hasMany(CanonToPlatformTrackRelation, { as: "canonToPlatformTrackRelations", foreignKey: "platformTrackId"});
+  JukeboxQueueEntry.belongsTo(PlatformTrack, { as: "platformTrack", foreignKey: "platformTrackId"});
+  PlatformTrack.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "platformTrackId"});
   PlatformAlbumTrackRelation.belongsTo(PlatformTrack, { as: "platformTrack", foreignKey: "platformTrackId"});
   PlatformTrack.hasMany(PlatformAlbumTrackRelation, { as: "platformAlbumTrackRelations", foreignKey: "platformTrackId"});
   PlatformArtistTrackRelation.belongsTo(PlatformTrack, { as: "platformTrack", foreignKey: "platformTrackId"});
@@ -700,8 +764,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(PlaybackStatusType, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId"});
-  PlaybackStatusType.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId"});
+  JukeboxQueueEntry.belongsTo(PlaybackStatus, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId"});
+  PlaybackStatus.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId"});
   RadioShowGenres.belongsTo(RadioShow, { as: "radioShow", foreignKey: "radioShowId"});
   RadioShow.hasMany(RadioShowGenres, { as: "radioShowGenres", foreignKey: "radioShowId"});
   RadioShowMedia.belongsTo(RadioShow, { as: "radioShow", foreignKey: "radioShowId"});
@@ -751,6 +815,7 @@ export function initModels(sequelize: Sequelize) {
     CanonTrack: CanonTrack,
     ConfigParam: ConfigParam,
     ExternalReference: ExternalReference,
+    GuestUser: GuestUser,
     JukeboxAccessType: JukeboxAccessType,
     JukeboxCanonGenreRelation: JukeboxCanonGenreRelation,
     JukeboxInvite: JukeboxInvite,
@@ -764,8 +829,14 @@ export function initModels(sequelize: Sequelize) {
     JukeboxUserType: JukeboxUserType,
     KnexMigrations: KnexMigrations,
     KnexMigrationsLock: KnexMigrationsLock,
+    MerchItem: MerchItem,
+    MerchOrchestration: MerchOrchestration,
+    MerchPlatform: MerchPlatform,
+    MerchType: MerchType,
     MetricsDaily: MetricsDaily,
     MetricsEvent: MetricsEvent,
+    NewsArticle: NewsArticle,
+    NewsPlatform: NewsPlatform,
     NewsSite: NewsSite,
     Notification: Notification,
     NotificationType: NotificationType,

package/package.json

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

package/.env

@@ -1,5 +0,0 @@
-PG_HOST=localhost
-PG_PORT=6432
-PG_USER=postgres
-PG_PASSWORD=
-PG_DATABASE=earbug_live