@earbug/db-models 0.0.34 → 0.0.36

package/dist/init-models.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KnexMigrations = exports.JukeboxUserType = exports.JukeboxUser = exports.JukeboxType = exports.JukeboxTerminationCondition = exports.JukeboxStatus = exports.JukeboxSessionGenreAffinity = exports.JukeboxSessionArtistAffinity = exports.JukeboxSession = exports.JukeboxQueueMode = exports.JukeboxQueueEntry = exports.JukeboxInvite = exports.JukeboxCanonGenreRelation = exports.JukeboxAccessType = exports.GuestUser = exports.FeedContentType = exports.FeedConfig = exports.ExternalReference = exports.ConfigParam = exports.CanonTrack = exports.CanonToPlatformTrackRelation = exports.CanonToPlatformGenreRelation = exports.CanonToPlatformArtistRelation = exports.CanonToPlatformAlbumRelation = exports.CanonMemberExternalReferenceRelation = exports.CanonMember = exports.CanonLabelExternalReferenceRelation = exports.CanonLabel = exports.CanonGenreExternalReferenceRelation = exports.CanonGenre = exports.CanonArtistTrackRelation = exports.CanonArtistMemberRelation = exports.CanonArtistImageHarvested = exports.CanonArtistGenreRelation = exports.CanonArtistExternalReferenceRelation = exports.CanonArtistAlbumRelation = exports.CanonArtist = exports.CanonAlbumTrackRelation = exports.CanonAlbumLabelRelation = exports.CanonAlbumImageHarvested = exports.CanonAlbumGenreRelation = exports.CanonAlbumExternalReferenceRelation = exports.CanonAlbum = exports.AppUserPlatformRelation = exports.AppUserFollowRelation = exports.AppUserDevice = exports.AppUser = exports.AffinityTier = exports.AffinityRelationshipType = exports.AccessControlPreference = void 0;
-exports.UserLikes = exports.UserGenreAffinity = exports.UserEngagementFactor = exports.UserContacts = exports.UserComments = exports.UserArtistAffinity = exports.UserAffinity = exports.UnmatchedArtist = exports.UnmatchedAlbum = exports.TrackDeletionReason = exports.State = exports.RadioShowPublishRequests = exports.RadioShowPlacement = exports.RadioShowMedia = exports.RadioShowGenres = exports.RadioShow = exports.PlaybackStatusType = exports.PlaybackStatus = exports.PlatformUserPlaylistTrack = exports.PlatformUserPlaylistGenreAffinity = exports.PlatformUserPlaylistArtistAffinity = exports.PlatformUserPlaylist = exports.PlatformUserAlbumTrack = exports.PlatformUserAlbum = exports.PlatformTrackGenreRelation = exports.PlatformTrack = exports.PlatformGenre = exports.PlatformArtistTrackRelation = exports.PlatformArtistGenreRelation = exports.PlatformArtistAlbumRelation = exports.PlatformArtist = exports.PlatformAlbumTrackRelation = exports.PlatformAlbumGenreRelation = exports.PlatformAlbum = exports.Platform = exports.PauseStatusType = exports.NotificationType = exports.Notification = exports.NewsSite = exports.NewsPlatform = exports.NewsArticle = exports.MetricsEvent = exports.MetricsDaily = exports.MerchType = exports.MerchPlatform = exports.MerchOrchestration = exports.MerchItem = exports.KnexMigrationsLock = void 0;
+exports.UserLikes = exports.UserGenreAffinity = exports.UserEngagementFactor = exports.UserContacts = exports.UserComments = exports.UserBookmarks = exports.UserArtistAffinity = exports.UserAffinity = exports.UnmatchedArtist = exports.UnmatchedAlbum = exports.TrackDeletionReason = exports.State = exports.RadioShowPublishRequests = exports.RadioShowPlacement = exports.RadioShowMedia = exports.RadioShowGenres = exports.RadioShow = exports.PlaybackStatusType = exports.PlaybackStatus = exports.PlatformUserPlaylistTrack = exports.PlatformUserPlaylistGenreAffinity = exports.PlatformUserPlaylistArtistAffinity = exports.PlatformUserPlaylist = exports.PlatformUserAlbumTrack = exports.PlatformUserAlbum = exports.PlatformTrackGenreRelation = exports.PlatformTrack = exports.PlatformGenre = exports.PlatformArtistTrackRelation = exports.PlatformArtistGenreRelation = exports.PlatformArtistAlbumRelation = exports.PlatformArtist = exports.PlatformAlbumTrackRelation = exports.PlatformAlbumGenreRelation = exports.PlatformAlbum = exports.Platform = exports.PauseStatusType = exports.NotificationType = exports.Notification = exports.NewsSite = exports.NewsPlatform = exports.NewsArticle = exports.MetricsEvent = exports.MetricsDaily = exports.MerchType = exports.MerchPlatform = exports.MerchOrchestration = exports.MerchItem = exports.KnexMigrationsLock = void 0;
 exports.initModels = initModels;
 const AccessControlPreference_1 = require("./AccessControlPreference");
 Object.defineProperty(exports, "AccessControlPreference", { enumerable: true, get: function () { return AccessControlPreference_1.AccessControlPreference; } });
@@ -189,6 +189,8 @@ const UserAffinity_1 = require("./UserAffinity");
 Object.defineProperty(exports, "UserAffinity", { enumerable: true, get: function () { return UserAffinity_1.UserAffinity; } });
 const UserArtistAffinity_1 = require("./UserArtistAffinity");
 Object.defineProperty(exports, "UserArtistAffinity", { enumerable: true, get: function () { return UserArtistAffinity_1.UserArtistAffinity; } });
+const UserBookmarks_1 = require("./UserBookmarks");
+Object.defineProperty(exports, "UserBookmarks", { enumerable: true, get: function () { return UserBookmarks_1.UserBookmarks; } });
 const UserComments_1 = require("./UserComments");
 Object.defineProperty(exports, "UserComments", { enumerable: true, get: function () { return UserComments_1.UserComments; } });
 const UserContacts_1 = require("./UserContacts");
@@ -293,6 +295,7 @@ function initModels(sequelize) {
     const UnmatchedArtist = UnmatchedArtist_1.UnmatchedArtist.initModel(sequelize);
     const UserAffinity = UserAffinity_1.UserAffinity.initModel(sequelize);
     const UserArtistAffinity = UserArtistAffinity_1.UserArtistAffinity.initModel(sequelize);
+    const UserBookmarks = UserBookmarks_1.UserBookmarks.initModel(sequelize);
     const UserComments = UserComments_1.UserComments.initModel(sequelize);
     const UserContacts = UserContacts_1.UserContacts.initModel(sequelize);
     const UserEngagementFactor = UserEngagementFactor_1.UserEngagementFactor.initModel(sequelize);
@@ -382,12 +385,12 @@ function initModels(sequelize) {
     AppUser.hasMany(PlatformUserPlaylist, { as: "platformUserPlaylists", foreignKey: "appUserId" });
     RadioShow.belongsTo(AppUser, { as: "creatorUser", foreignKey: "creatorUserId" });
     AppUser.hasMany(RadioShow, { as: "radioShows", foreignKey: "creatorUserId" });
-    RadioShowMedia.belongsTo(AppUser, { as: "manualModerationByUser", foreignKey: "manualModerationByUserId" });
-    AppUser.hasMany(RadioShowMedia, { as: "radioShowMedia", foreignKey: "manualModerationByUserId" });
     UserAffinity.belongsTo(AppUser, { as: "user", foreignKey: "userId" });
     AppUser.hasMany(UserAffinity, { as: "userAffinities", foreignKey: "userId" });
     UserArtistAffinity.belongsTo(AppUser, { as: "user", foreignKey: "userId" });
     AppUser.hasMany(UserArtistAffinity, { as: "userArtistAffinities", foreignKey: "userId" });
+    UserBookmarks.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId" });
+    AppUser.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "appUserId" });
     UserComments.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId" });
     AppUser.hasMany(UserComments, { as: "userComments", foreignKey: "appUserId" });
     UserContacts.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId" });
@@ -498,6 +501,8 @@ function initModels(sequelize) {
     JukeboxSession.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxSessionId" });
     Notification.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId" });
     JukeboxSession.hasMany(Notification, { as: "notifications", foreignKey: "jukeboxSessionId" });
+    UserBookmarks.belongsTo(JukeboxSession, { as: "jukebox", foreignKey: "jukeboxId" });
+    JukeboxSession.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "jukeboxId" });
     UserComments.belongsTo(JukeboxSession, { as: "jukebox", foreignKey: "jukeboxId" });
     JukeboxSession.hasMany(UserComments, { as: "userComments", foreignKey: "jukeboxId" });
     UserLikes.belongsTo(JukeboxSession, { as: "jukebox", foreignKey: "jukeboxId" });
@@ -510,6 +515,8 @@ function initModels(sequelize) {
     JukeboxType.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "typeId" });
     JukeboxUser.belongsTo(JukeboxUserType, { as: "jukeboxUserType", foreignKey: "jukeboxUserTypeId" });
     JukeboxUserType.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxUserTypeId" });
+    UserBookmarks.belongsTo(MerchItem, { as: "merchItem", foreignKey: "merchItemId" });
+    MerchItem.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "merchItemId" });
     MerchItem.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId" });
     MerchPlatform.hasMany(MerchItem, { as: "merchItems", foreignKey: "merchPlatformId" });
     MerchOrchestration.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId" });
@@ -518,6 +525,8 @@ function initModels(sequelize) {
     MerchType.hasMany(MerchItem, { as: "merchItems", foreignKey: "merchTypeId" });
     MerchOrchestration.belongsTo(MerchType, { as: "merchType", foreignKey: "merchTypeId" });
     MerchType.hasMany(MerchOrchestration, { as: "merchOrchestrations", foreignKey: "merchTypeId" });
+    UserBookmarks.belongsTo(NewsArticle, { as: "newsArticle", foreignKey: "newsArticleId" });
+    NewsArticle.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "newsArticleId" });
     NewsArticle.belongsTo(NewsPlatform, { as: "newsPlatform", foreignKey: "newsPlatformId" });
     NewsPlatform.hasMany(NewsArticle, { as: "newsArticles", foreignKey: "newsPlatformId" });
     Notification.belongsTo(NotificationType, { as: "notificationType", foreignKey: "notificationTypeId" });
@@ -604,6 +613,8 @@ function initModels(sequelize) {
     PlatformUserPlaylist.hasMany(PlatformUserPlaylistGenreAffinity, { as: "platformUserPlaylistGenreAffinities", foreignKey: "platformUserPlaylistId" });
     PlatformUserPlaylistTrack.belongsTo(PlatformUserPlaylist, { as: "platformUserPlaylist", foreignKey: "platformUserPlaylistId" });
     PlatformUserPlaylist.hasMany(PlatformUserPlaylistTrack, { as: "platformUserPlaylistTracks", foreignKey: "platformUserPlaylistId" });
+    UserBookmarks.belongsTo(PlatformUserPlaylist, { as: "playlist", foreignKey: "playlistId" });
+    PlatformUserPlaylist.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "playlistId" });
     UserComments.belongsTo(PlatformUserPlaylist, { as: "playlist", foreignKey: "playlistId" });
     PlatformUserPlaylist.hasMany(UserComments, { as: "userComments", foreignKey: "playlistId" });
     UserLikes.belongsTo(PlatformUserPlaylist, { as: "playlist", foreignKey: "playlistId" });
@@ -618,6 +629,8 @@ function initModels(sequelize) {
     RadioShow.hasMany(RadioShowPlacement, { as: "radioShowPlacements", foreignKey: "radioShowId" });
     RadioShowPublishRequests.belongsTo(RadioShow, { as: "radioShow", foreignKey: "radioShowId" });
     RadioShow.hasMany(RadioShowPublishRequests, { as: "radioShowPublishRequests", foreignKey: "radioShowId" });
+    UserBookmarks.belongsTo(RadioShow, { as: "radioShow", foreignKey: "radioShowId" });
+    RadioShow.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "radioShowId" });
     UserComments.belongsTo(RadioShow, { as: "radioShow", foreignKey: "radioShowId" });
     RadioShow.hasMany(UserComments, { as: "userComments", foreignKey: "radioShowId" });
     UserLikes.belongsTo(RadioShow, { as: "radioShow", foreignKey: "radioShowId" });
@@ -726,6 +739,7 @@ function initModels(sequelize) {
         UnmatchedArtist: UnmatchedArtist,
         UserAffinity: UserAffinity,
         UserArtistAffinity: UserArtistAffinity,
+        UserBookmarks: UserBookmarks,
         UserComments: UserComments,
         UserContacts: UserContacts,
         UserEngagementFactor: UserEngagementFactor,

package/models/AppUser.ts

@@ -10,10 +10,10 @@ import type { Notification, NotificationId } from './Notification';
 import type { PlatformUserAlbum, PlatformUserAlbumId } from './PlatformUserAlbum';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { RadioShow, RadioShowId } from './RadioShow';
-import type { RadioShowMedia, RadioShowMediaId } from './RadioShowMedia';
 import type { State, StateId } from './State';
 import type { UserAffinity, UserAffinityId } from './UserAffinity';
 import type { UserArtistAffinity, UserArtistAffinityId } from './UserArtistAffinity';
+import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
 import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserContacts, UserContactsId } from './UserContacts';
 import type { UserEngagementFactor, UserEngagementFactorId } from './UserEngagementFactor';
@@ -203,18 +203,6 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
   hasRadioShow!: Sequelize.HasManyHasAssociationMixin<RadioShow, RadioShowId>;
   hasRadioShows!: Sequelize.HasManyHasAssociationsMixin<RadioShow, RadioShowId>;
   countRadioShows!: Sequelize.HasManyCountAssociationsMixin;
-  // AppUser hasMany RadioShowMedia via manualModerationByUserId
-  radioShowMedia!: RadioShowMedia[];
-  getRadioShowMedia!: Sequelize.HasManyGetAssociationsMixin<RadioShowMedia>;
-  setRadioShowMedia!: Sequelize.HasManySetAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
-  addRadioShowMedium!: Sequelize.HasManyAddAssociationMixin<RadioShowMedia, RadioShowMediaId>;
-  addRadioShowMedia!: Sequelize.HasManyAddAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
-  createRadioShowMedium!: Sequelize.HasManyCreateAssociationMixin<RadioShowMedia>;
-  removeRadioShowMedium!: Sequelize.HasManyRemoveAssociationMixin<RadioShowMedia, RadioShowMediaId>;
-  removeRadioShowMedia!: Sequelize.HasManyRemoveAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
-  hasRadioShowMedium!: Sequelize.HasManyHasAssociationMixin<RadioShowMedia, RadioShowMediaId>;
-  hasRadioShowMedia!: Sequelize.HasManyHasAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
-  countRadioShowMedia!: Sequelize.HasManyCountAssociationsMixin;
   // AppUser hasMany UserAffinity via userId
   userAffinities!: UserAffinity[];
   getUserAffinities!: Sequelize.HasManyGetAssociationsMixin<UserAffinity>;
@@ -239,6 +227,18 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
   hasUserArtistAffinity!: Sequelize.HasManyHasAssociationMixin<UserArtistAffinity, UserArtistAffinityId>;
   hasUserArtistAffinities!: Sequelize.HasManyHasAssociationsMixin<UserArtistAffinity, UserArtistAffinityId>;
   countUserArtistAffinities!: Sequelize.HasManyCountAssociationsMixin;
+  // AppUser hasMany UserBookmarks via appUserId
+  userBookmarks!: UserBookmarks[];
+  getUserBookmarks!: Sequelize.HasManyGetAssociationsMixin<UserBookmarks>;
+  setUserBookmarks!: Sequelize.HasManySetAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmark!: Sequelize.HasManyAddAssociationMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmarks!: Sequelize.HasManyAddAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  createUserBookmark!: Sequelize.HasManyCreateAssociationMixin<UserBookmarks>;
+  removeUserBookmark!: Sequelize.HasManyRemoveAssociationMixin<UserBookmarks, UserBookmarksId>;
+  removeUserBookmarks!: Sequelize.HasManyRemoveAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
   // AppUser hasMany UserComments via appUserId
   userComments!: UserComments[];
   getUserComments!: Sequelize.HasManyGetAssociationsMixin<UserComments>;

package/models/JukeboxSession.ts

@@ -13,6 +13,7 @@ import type { JukeboxTerminationCondition, JukeboxTerminationConditionId } from
 import type { JukeboxType, JukeboxTypeId } from './JukeboxType';
 import type { JukeboxUser, JukeboxUserId } from './JukeboxUser';
 import type { Notification, NotificationId } from './Notification';
+import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
 import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserLikes, UserLikesId } from './UserLikes';
 
@@ -156,6 +157,18 @@ export class JukeboxSession extends Model<JukeboxSessionAttributes, JukeboxSessi
   hasNotification!: Sequelize.HasManyHasAssociationMixin<Notification, NotificationId>;
   hasNotifications!: Sequelize.HasManyHasAssociationsMixin<Notification, NotificationId>;
   countNotifications!: Sequelize.HasManyCountAssociationsMixin;
+  // JukeboxSession hasMany UserBookmarks via jukeboxId
+  userBookmarks!: UserBookmarks[];
+  getUserBookmarks!: Sequelize.HasManyGetAssociationsMixin<UserBookmarks>;
+  setUserBookmarks!: Sequelize.HasManySetAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmark!: Sequelize.HasManyAddAssociationMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmarks!: Sequelize.HasManyAddAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  createUserBookmark!: Sequelize.HasManyCreateAssociationMixin<UserBookmarks>;
+  removeUserBookmark!: Sequelize.HasManyRemoveAssociationMixin<UserBookmarks, UserBookmarksId>;
+  removeUserBookmarks!: Sequelize.HasManyRemoveAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
   // JukeboxSession hasMany UserComments via jukeboxId
   userComments!: UserComments[];
   getUserComments!: Sequelize.HasManyGetAssociationsMixin<UserComments>;

package/models/MerchItem.ts

@@ -3,6 +3,7 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { MerchPlatform, MerchPlatformId } from './MerchPlatform';
 import type { MerchType, MerchTypeId } from './MerchType';
+import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
 
 export interface MerchItemAttributes {
   canonArtistId: string;
@@ -43,6 +44,18 @@ export class MerchItem extends Model<MerchItemAttributes, MerchItemCreationAttri
   getCanonArtist!: Sequelize.BelongsToGetAssociationMixin<CanonArtist>;
   setCanonArtist!: Sequelize.BelongsToSetAssociationMixin<CanonArtist, CanonArtistId>;
   createCanonArtist!: Sequelize.BelongsToCreateAssociationMixin<CanonArtist>;
+  // MerchItem hasMany UserBookmarks via merchItemId
+  userBookmarks!: UserBookmarks[];
+  getUserBookmarks!: Sequelize.HasManyGetAssociationsMixin<UserBookmarks>;
+  setUserBookmarks!: Sequelize.HasManySetAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmark!: Sequelize.HasManyAddAssociationMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmarks!: Sequelize.HasManyAddAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  createUserBookmark!: Sequelize.HasManyCreateAssociationMixin<UserBookmarks>;
+  removeUserBookmark!: Sequelize.HasManyRemoveAssociationMixin<UserBookmarks, UserBookmarksId>;
+  removeUserBookmarks!: Sequelize.HasManyRemoveAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
   // MerchItem belongsTo MerchPlatform via merchPlatformId
   merchPlatform!: MerchPlatform;
   getMerchPlatform!: Sequelize.BelongsToGetAssociationMixin<MerchPlatform>;

package/models/NewsArticle.ts

@@ -2,6 +2,7 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { NewsPlatform, NewsPlatformId } from './NewsPlatform';
+import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
 
 export interface NewsArticleAttributes {
   id: string;
@@ -38,6 +39,18 @@ export class NewsArticle extends Model<NewsArticleAttributes, NewsArticleCreatio
   getCanonArtist!: Sequelize.BelongsToGetAssociationMixin<CanonArtist>;
   setCanonArtist!: Sequelize.BelongsToSetAssociationMixin<CanonArtist, CanonArtistId>;
   createCanonArtist!: Sequelize.BelongsToCreateAssociationMixin<CanonArtist>;
+  // NewsArticle hasMany UserBookmarks via newsArticleId
+  userBookmarks!: UserBookmarks[];
+  getUserBookmarks!: Sequelize.HasManyGetAssociationsMixin<UserBookmarks>;
+  setUserBookmarks!: Sequelize.HasManySetAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmark!: Sequelize.HasManyAddAssociationMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmarks!: Sequelize.HasManyAddAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  createUserBookmark!: Sequelize.HasManyCreateAssociationMixin<UserBookmarks>;
+  removeUserBookmark!: Sequelize.HasManyRemoveAssociationMixin<UserBookmarks, UserBookmarksId>;
+  removeUserBookmarks!: Sequelize.HasManyRemoveAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
   // NewsArticle belongsTo NewsPlatform via newsPlatformId
   newsPlatform!: NewsPlatform;
   getNewsPlatform!: Sequelize.BelongsToGetAssociationMixin<NewsPlatform>;

package/models/PlatformUserPlaylist.ts

@@ -6,6 +6,7 @@ import type { PlatformUserPlaylistArtistAffinity, PlatformUserPlaylistArtistAffi
 import type { PlatformUserPlaylistGenreAffinity, PlatformUserPlaylistGenreAffinityId } from './PlatformUserPlaylistGenreAffinity';
 import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './PlatformUserPlaylistTrack';
 import type { State, StateId } from './State';
+import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
 import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserLikes, UserLikesId } from './UserLikes';
 
@@ -91,6 +92,18 @@ export class PlatformUserPlaylist extends Model<PlatformUserPlaylistAttributes,
   hasPlatformUserPlaylistTrack!: Sequelize.HasManyHasAssociationMixin<PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId>;
   hasPlatformUserPlaylistTracks!: Sequelize.HasManyHasAssociationsMixin<PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId>;
   countPlatformUserPlaylistTracks!: Sequelize.HasManyCountAssociationsMixin;
+  // PlatformUserPlaylist hasMany UserBookmarks via playlistId
+  userBookmarks!: UserBookmarks[];
+  getUserBookmarks!: Sequelize.HasManyGetAssociationsMixin<UserBookmarks>;
+  setUserBookmarks!: Sequelize.HasManySetAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmark!: Sequelize.HasManyAddAssociationMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmarks!: Sequelize.HasManyAddAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  createUserBookmark!: Sequelize.HasManyCreateAssociationMixin<UserBookmarks>;
+  removeUserBookmark!: Sequelize.HasManyRemoveAssociationMixin<UserBookmarks, UserBookmarksId>;
+  removeUserBookmarks!: Sequelize.HasManyRemoveAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
   // PlatformUserPlaylist hasMany UserComments via playlistId
   userComments!: UserComments[];
   getUserComments!: Sequelize.HasManyGetAssociationsMixin<UserComments>;

package/models/RadioShow.ts

@@ -5,6 +5,7 @@ import type { RadioShowGenres, RadioShowGenresId } from './RadioShowGenres';
 import type { RadioShowMedia, RadioShowMediaId } from './RadioShowMedia';
 import type { RadioShowPlacement, RadioShowPlacementId } from './RadioShowPlacement';
 import type { RadioShowPublishRequests, RadioShowPublishRequestsId } from './RadioShowPublishRequests';
+import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
 import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserLikes, UserLikesId } from './UserLikes';
 
@@ -87,6 +88,18 @@ export class RadioShow extends Model<RadioShowAttributes, RadioShowCreationAttri
   hasRadioShowPublishRequest!: Sequelize.HasManyHasAssociationMixin<RadioShowPublishRequests, RadioShowPublishRequestsId>;
   hasRadioShowPublishRequests!: Sequelize.HasManyHasAssociationsMixin<RadioShowPublishRequests, RadioShowPublishRequestsId>;
   countRadioShowPublishRequests!: Sequelize.HasManyCountAssociationsMixin;
+  // RadioShow hasMany UserBookmarks via radioShowId
+  userBookmarks!: UserBookmarks[];
+  getUserBookmarks!: Sequelize.HasManyGetAssociationsMixin<UserBookmarks>;
+  setUserBookmarks!: Sequelize.HasManySetAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmark!: Sequelize.HasManyAddAssociationMixin<UserBookmarks, UserBookmarksId>;
+  addUserBookmarks!: Sequelize.HasManyAddAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  createUserBookmark!: Sequelize.HasManyCreateAssociationMixin<UserBookmarks>;
+  removeUserBookmark!: Sequelize.HasManyRemoveAssociationMixin<UserBookmarks, UserBookmarksId>;
+  removeUserBookmarks!: Sequelize.HasManyRemoveAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
+  hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
+  countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
   // RadioShow hasMany UserComments via radioShowId
   userComments!: UserComments[];
   getUserComments!: Sequelize.HasManyGetAssociationsMixin<UserComments>;

package/models/RadioShowMedia.ts

@@ -1,6 +1,5 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
-import type { AppUser, AppUserId } from './AppUser';
 import type { RadioShow, RadioShowId } from './RadioShow';
 
 export interface RadioShowMediaAttributes {
@@ -20,12 +19,12 @@ export interface RadioShowMediaAttributes {
   automatedModerationDecidedAt?: Date;
   manualModerationApproved?: boolean;
   manualModerationDecidedAt?: Date;
-  manualModerationByUserId?: string;
+  manualModerationBy?: string;
 }
 
 export type RadioShowMediaPk = "id";
 export type RadioShowMediaId = RadioShowMedia[RadioShowMediaPk];
-export type RadioShowMediaOptionalAttributes = "originalMediaType" | "s3VideoUrl" | "id" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded" | "automatedModerationApproved" | "automatedModerationRejectionMetadata" | "automatedModerationDecidedAt" | "manualModerationApproved" | "manualModerationDecidedAt" | "manualModerationByUserId";
+export type RadioShowMediaOptionalAttributes = "originalMediaType" | "s3VideoUrl" | "id" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded" | "automatedModerationApproved" | "automatedModerationRejectionMetadata" | "automatedModerationDecidedAt" | "manualModerationApproved" | "manualModerationDecidedAt" | "manualModerationBy";
 export type RadioShowMediaCreationAttributes = Optional<RadioShowMediaAttributes, RadioShowMediaOptionalAttributes>;
 
 export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMediaCreationAttributes> implements RadioShowMediaAttributes {
@@ -45,13 +44,8 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
   automatedModerationDecidedAt?: Date;
   manualModerationApproved?: boolean;
   manualModerationDecidedAt?: Date;
-  manualModerationByUserId?: string;
+  manualModerationBy?: string;
 
-  // RadioShowMedia belongsTo AppUser via manualModerationByUserId
-  manualModerationByUser!: AppUser;
-  getManualModerationByUser!: Sequelize.BelongsToGetAssociationMixin<AppUser>;
-  setManualModerationByUser!: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
-  createManualModerationByUser!: Sequelize.BelongsToCreateAssociationMixin<AppUser>;
   // RadioShowMedia belongsTo RadioShow via radioShowId
   radioShow!: RadioShow;
   getRadioShow!: Sequelize.BelongsToGetAssociationMixin<RadioShow>;
@@ -144,14 +138,10 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
       allowNull: true,
       field: 'manual_moderation_decided_at'
     },
-    manualModerationByUserId: {
-      type: DataTypes.UUID,
+    manualModerationBy: {
+      type: DataTypes.TEXT,
       allowNull: true,
-      references: {
-        model: 'app_user',
-        key: 'id'
-      },
-      field: 'manual_moderation_by_user_id'
+      field: 'manual_moderation_by'
     }
   }, {
     sequelize,

package/models/UserBookmarks.ts

@@ -0,0 +1,235 @@
+import * as Sequelize from 'sequelize';
+import { DataTypes, Model, Optional } from 'sequelize';
+import type { AppUser, AppUserId } from './AppUser';
+import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
+import type { MerchItem, MerchItemId } from './MerchItem';
+import type { NewsArticle, NewsArticleId } from './NewsArticle';
+import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
+import type { RadioShow, RadioShowId } from './RadioShow';
+
+export interface UserBookmarksAttributes {
+  appUserId: string;
+  jukeboxId?: string;
+  playlistId?: string;
+  radioShowId?: string;
+  merchItemId?: string;
+  newsArticleId?: string;
+  id: string;
+  createDate: Date;
+  updateDate: Date;
+}
+
+export type UserBookmarksPk = "id";
+export type UserBookmarksId = UserBookmarks[UserBookmarksPk];
+export type UserBookmarksOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "merchItemId" | "newsArticleId" | "id" | "createDate" | "updateDate";
+export type UserBookmarksCreationAttributes = Optional<UserBookmarksAttributes, UserBookmarksOptionalAttributes>;
+
+export class UserBookmarks extends Model<UserBookmarksAttributes, UserBookmarksCreationAttributes> implements UserBookmarksAttributes {
+  appUserId!: string;
+  jukeboxId?: string;
+  playlistId?: string;
+  radioShowId?: string;
+  merchItemId?: string;
+  newsArticleId?: string;
+  id!: string;
+  createDate!: Date;
+  updateDate!: Date;
+
+  // UserBookmarks belongsTo AppUser via appUserId
+  appUser!: AppUser;
+  getAppUser!: Sequelize.BelongsToGetAssociationMixin<AppUser>;
+  setAppUser!: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
+  createAppUser!: Sequelize.BelongsToCreateAssociationMixin<AppUser>;
+  // UserBookmarks belongsTo JukeboxSession via jukeboxId
+  jukebox!: JukeboxSession;
+  getJukebox!: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
+  setJukebox!: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;
+  createJukebox!: Sequelize.BelongsToCreateAssociationMixin<JukeboxSession>;
+  // UserBookmarks belongsTo MerchItem via merchItemId
+  merchItem!: MerchItem;
+  getMerchItem!: Sequelize.BelongsToGetAssociationMixin<MerchItem>;
+  setMerchItem!: Sequelize.BelongsToSetAssociationMixin<MerchItem, MerchItemId>;
+  createMerchItem!: Sequelize.BelongsToCreateAssociationMixin<MerchItem>;
+  // UserBookmarks belongsTo NewsArticle via newsArticleId
+  newsArticle!: NewsArticle;
+  getNewsArticle!: Sequelize.BelongsToGetAssociationMixin<NewsArticle>;
+  setNewsArticle!: Sequelize.BelongsToSetAssociationMixin<NewsArticle, NewsArticleId>;
+  createNewsArticle!: Sequelize.BelongsToCreateAssociationMixin<NewsArticle>;
+  // UserBookmarks belongsTo PlatformUserPlaylist via playlistId
+  playlist!: PlatformUserPlaylist;
+  getPlaylist!: Sequelize.BelongsToGetAssociationMixin<PlatformUserPlaylist>;
+  setPlaylist!: Sequelize.BelongsToSetAssociationMixin<PlatformUserPlaylist, PlatformUserPlaylistId>;
+  createPlaylist!: Sequelize.BelongsToCreateAssociationMixin<PlatformUserPlaylist>;
+  // UserBookmarks belongsTo RadioShow via radioShowId
+  radioShow!: RadioShow;
+  getRadioShow!: Sequelize.BelongsToGetAssociationMixin<RadioShow>;
+  setRadioShow!: Sequelize.BelongsToSetAssociationMixin<RadioShow, RadioShowId>;
+  createRadioShow!: Sequelize.BelongsToCreateAssociationMixin<RadioShow>;
+
+  static initModel(sequelize: Sequelize.Sequelize): typeof UserBookmarks {
+    return UserBookmarks.init({
+    appUserId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      references: {
+        model: 'app_user',
+        key: 'id'
+      },
+      field: 'app_user_id'
+    },
+    jukeboxId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'jukebox_session',
+        key: 'id'
+      },
+      field: 'jukebox_id'
+    },
+    playlistId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'platform_user_playlist',
+        key: 'id'
+      },
+      field: 'playlist_id'
+    },
+    radioShowId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'radio_show',
+        key: 'id'
+      },
+      field: 'radio_show_id'
+    },
+    merchItemId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'merch_item',
+        key: 'id'
+      },
+      field: 'merch_item_id'
+    },
+    newsArticleId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'news_article',
+        key: 'id'
+      },
+      field: 'news_article_id'
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
+    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: 'user_bookmarks',
+    schema: 'eb',
+    timestamps: false,
+    indexes: [
+      {
+        name: "idx_user_bookmarks_jukebox",
+        fields: [
+          { name: "jukebox_id" },
+        ]
+      },
+      {
+        name: "idx_user_bookmarks_merch_item",
+        fields: [
+          { name: "merch_item_id" },
+        ]
+      },
+      {
+        name: "idx_user_bookmarks_news_article",
+        fields: [
+          { name: "news_article_id" },
+        ]
+      },
+      {
+        name: "idx_user_bookmarks_playlist",
+        fields: [
+          { name: "playlist_id" },
+        ]
+      },
+      {
+        name: "idx_user_bookmarks_radio_show",
+        fields: [
+          { name: "radio_show_id" },
+        ]
+      },
+      {
+        name: "idx_user_bookmarks_user",
+        fields: [
+          { name: "app_user_id" },
+        ]
+      },
+      {
+        name: "uq_user_bookmarks_user_jukebox",
+        unique: true,
+        fields: [
+          { name: "app_user_id" },
+          { name: "jukebox_id" },
+        ]
+      },
+      {
+        name: "uq_user_bookmarks_user_merch_item",
+        unique: true,
+        fields: [
+          { name: "app_user_id" },
+          { name: "merch_item_id" },
+        ]
+      },
+      {
+        name: "uq_user_bookmarks_user_news_article",
+        unique: true,
+        fields: [
+          { name: "app_user_id" },
+          { name: "news_article_id" },
+        ]
+      },
+      {
+        name: "uq_user_bookmarks_user_playlist",
+        unique: true,
+        fields: [
+          { name: "app_user_id" },
+          { name: "playlist_id" },
+        ]
+      },
+      {
+        name: "uq_user_bookmarks_user_radio_show",
+        unique: true,
+        fields: [
+          { name: "app_user_id" },
+          { name: "radio_show_id" },
+        ]
+      },
+      {
+        name: "user_bookmarks_pkey",
+        unique: true,
+        fields: [
+          { name: "id" },
+        ]
+      },
+    ]
+  });
+  }
+}

package/models/UserComments.ts

@@ -16,11 +16,15 @@ export interface UserCommentsAttributes {
   deleted: boolean;
   createDate: Date;
   updateDate: Date;
+  modifiedComment?: string;
+  moderationScore?: number;
+  moderationLevel?: string;
+  strippedUrls?: object;
 }
 
 export type UserCommentsPk = "id";
 export type UserCommentsId = UserComments[UserCommentsPk];
-export type UserCommentsOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "replyCommentId" | "createDate" | "updateDate";
+export type UserCommentsOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "replyCommentId" | "createDate" | "updateDate" | "modifiedComment" | "moderationScore" | "moderationLevel" | "strippedUrls";
 export type UserCommentsCreationAttributes = Optional<UserCommentsAttributes, UserCommentsOptionalAttributes>;
 
 export class UserComments extends Model<UserCommentsAttributes, UserCommentsCreationAttributes> implements UserCommentsAttributes {
@@ -34,6 +38,10 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
   deleted!: boolean;
   createDate!: Date;
   updateDate!: Date;
+  modifiedComment?: string;
+  moderationScore?: number;
+  moderationLevel?: string;
+  strippedUrls?: object;
 
   // UserComments belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -134,6 +142,26 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
+    },
+    modifiedComment: {
+      type: DataTypes.STRING(1000),
+      allowNull: true,
+      field: 'modified_comment'
+    },
+    moderationScore: {
+      type: DataTypes.DECIMAL,
+      allowNull: true,
+      field: 'moderation_score'
+    },
+    moderationLevel: {
+      type: DataTypes.STRING(10),
+      allowNull: true,
+      field: 'moderation_level'
+    },
+    strippedUrls: {
+      type: DataTypes.JSONB,
+      allowNull: true,
+      field: 'stripped_urls'
     }
   }, {
     sequelize,