@earbug/db-models 0.0.51 → 0.0.53

package/dist/GuestUser.d.ts

@@ -3,8 +3,6 @@ import { Model, Optional } from 'sequelize';
 import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 import type { Versus, VersusId } from './Versus';
-import type { VersusCoCreator, VersusCoCreatorId } from './VersusCoCreator';
-import type { VersusOption, VersusOptionId } from './VersusOption';
 export interface GuestUserAttributes {
     jukeboxSessionId?: string;
     firstName: string;
@@ -39,28 +37,6 @@ export declare class GuestUser extends Model<GuestUserAttributes, GuestUserCreat
     hasJukeboxQueueEntry: Sequelize.HasManyHasAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
     hasJukeboxQueueEntries: Sequelize.HasManyHasAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
     countJukeboxQueueEntries: Sequelize.HasManyCountAssociationsMixin;
-    versusCoCreators: VersusCoCreator[];
-    getVersusCoCreators: Sequelize.HasManyGetAssociationsMixin<VersusCoCreator>;
-    setVersusCoCreators: Sequelize.HasManySetAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    addVersusCoCreator: Sequelize.HasManyAddAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-    addVersusCoCreators: Sequelize.HasManyAddAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    createVersusCoCreator: Sequelize.HasManyCreateAssociationMixin<VersusCoCreator>;
-    removeVersusCoCreator: Sequelize.HasManyRemoveAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-    removeVersusCoCreators: Sequelize.HasManyRemoveAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    hasVersusCoCreator: Sequelize.HasManyHasAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-    hasVersusCoCreators: Sequelize.HasManyHasAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    countVersusCoCreators: Sequelize.HasManyCountAssociationsMixin;
-    versusOptions: VersusOption[];
-    getVersusOptions: Sequelize.HasManyGetAssociationsMixin<VersusOption>;
-    setVersusOptions: Sequelize.HasManySetAssociationsMixin<VersusOption, VersusOptionId>;
-    addVersusOption: Sequelize.HasManyAddAssociationMixin<VersusOption, VersusOptionId>;
-    addVersusOptions: Sequelize.HasManyAddAssociationsMixin<VersusOption, VersusOptionId>;
-    createVersusOption: Sequelize.HasManyCreateAssociationMixin<VersusOption>;
-    removeVersusOption: Sequelize.HasManyRemoveAssociationMixin<VersusOption, VersusOptionId>;
-    removeVersusOptions: Sequelize.HasManyRemoveAssociationsMixin<VersusOption, VersusOptionId>;
-    hasVersusOption: Sequelize.HasManyHasAssociationMixin<VersusOption, VersusOptionId>;
-    hasVersusOptions: Sequelize.HasManyHasAssociationsMixin<VersusOption, VersusOptionId>;
-    countVersusOptions: Sequelize.HasManyCountAssociationsMixin;
     jukeboxSession: JukeboxSession;
     getJukeboxSession: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
     setJukeboxSession: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;

package/dist/MerchItem.d.ts

@@ -4,6 +4,8 @@ import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { MerchPlatform, MerchPlatformId } from './MerchPlatform';
 import type { MerchType, MerchTypeId } from './MerchType';
 import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
+import type { UserComments, UserCommentsId } from './UserComments';
+import type { UserLikes, UserLikesId } from './UserLikes';
 export interface MerchItemAttributes {
     canonArtistId: string;
     merchTypeId: string;
@@ -50,6 +52,28 @@ export declare class MerchItem extends Model<MerchItemAttributes, MerchItemCreat
     hasUserBookmark: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
     hasUserBookmarks: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
     countUserBookmarks: Sequelize.HasManyCountAssociationsMixin;
+    userComments: UserComments[];
+    getUserComments: Sequelize.HasManyGetAssociationsMixin<UserComments>;
+    setUserComments: Sequelize.HasManySetAssociationsMixin<UserComments, UserCommentsId>;
+    addUserComment: Sequelize.HasManyAddAssociationMixin<UserComments, UserCommentsId>;
+    addUserComments: Sequelize.HasManyAddAssociationsMixin<UserComments, UserCommentsId>;
+    createUserComment: Sequelize.HasManyCreateAssociationMixin<UserComments>;
+    removeUserComment: Sequelize.HasManyRemoveAssociationMixin<UserComments, UserCommentsId>;
+    removeUserComments: Sequelize.HasManyRemoveAssociationsMixin<UserComments, UserCommentsId>;
+    hasUserComment: Sequelize.HasManyHasAssociationMixin<UserComments, UserCommentsId>;
+    hasUserComments: Sequelize.HasManyHasAssociationsMixin<UserComments, UserCommentsId>;
+    countUserComments: Sequelize.HasManyCountAssociationsMixin;
+    userLikes: UserLikes[];
+    getUserLikes: Sequelize.HasManyGetAssociationsMixin<UserLikes>;
+    setUserLikes: Sequelize.HasManySetAssociationsMixin<UserLikes, UserLikesId>;
+    addUserLike: Sequelize.HasManyAddAssociationMixin<UserLikes, UserLikesId>;
+    addUserLikes: Sequelize.HasManyAddAssociationsMixin<UserLikes, UserLikesId>;
+    createUserLike: Sequelize.HasManyCreateAssociationMixin<UserLikes>;
+    removeUserLike: Sequelize.HasManyRemoveAssociationMixin<UserLikes, UserLikesId>;
+    removeUserLikes: Sequelize.HasManyRemoveAssociationsMixin<UserLikes, UserLikesId>;
+    hasUserLike: Sequelize.HasManyHasAssociationMixin<UserLikes, UserLikesId>;
+    hasUserLikes: Sequelize.HasManyHasAssociationsMixin<UserLikes, UserLikesId>;
+    countUserLikes: Sequelize.HasManyCountAssociationsMixin;
     merchPlatform: MerchPlatform;
     getMerchPlatform: Sequelize.BelongsToGetAssociationMixin<MerchPlatform>;
     setMerchPlatform: Sequelize.BelongsToSetAssociationMixin<MerchPlatform, MerchPlatformId>;

package/dist/NewsArticle.d.ts

@@ -3,6 +3,8 @@ import { Model, Optional } from 'sequelize';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { NewsPlatform, NewsPlatformId } from './NewsPlatform';
 import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
+import type { UserComments, UserCommentsId } from './UserComments';
+import type { UserLikes, UserLikesId } from './UserLikes';
 export interface NewsArticleAttributes {
     id: string;
     canonArtistId: string;
@@ -45,6 +47,28 @@ export declare class NewsArticle extends Model<NewsArticleAttributes, NewsArticl
     hasUserBookmark: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
     hasUserBookmarks: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
     countUserBookmarks: Sequelize.HasManyCountAssociationsMixin;
+    userComments: UserComments[];
+    getUserComments: Sequelize.HasManyGetAssociationsMixin<UserComments>;
+    setUserComments: Sequelize.HasManySetAssociationsMixin<UserComments, UserCommentsId>;
+    addUserComment: Sequelize.HasManyAddAssociationMixin<UserComments, UserCommentsId>;
+    addUserComments: Sequelize.HasManyAddAssociationsMixin<UserComments, UserCommentsId>;
+    createUserComment: Sequelize.HasManyCreateAssociationMixin<UserComments>;
+    removeUserComment: Sequelize.HasManyRemoveAssociationMixin<UserComments, UserCommentsId>;
+    removeUserComments: Sequelize.HasManyRemoveAssociationsMixin<UserComments, UserCommentsId>;
+    hasUserComment: Sequelize.HasManyHasAssociationMixin<UserComments, UserCommentsId>;
+    hasUserComments: Sequelize.HasManyHasAssociationsMixin<UserComments, UserCommentsId>;
+    countUserComments: Sequelize.HasManyCountAssociationsMixin;
+    userLikes: UserLikes[];
+    getUserLikes: Sequelize.HasManyGetAssociationsMixin<UserLikes>;
+    setUserLikes: Sequelize.HasManySetAssociationsMixin<UserLikes, UserLikesId>;
+    addUserLike: Sequelize.HasManyAddAssociationMixin<UserLikes, UserLikesId>;
+    addUserLikes: Sequelize.HasManyAddAssociationsMixin<UserLikes, UserLikesId>;
+    createUserLike: Sequelize.HasManyCreateAssociationMixin<UserLikes>;
+    removeUserLike: Sequelize.HasManyRemoveAssociationMixin<UserLikes, UserLikesId>;
+    removeUserLikes: Sequelize.HasManyRemoveAssociationsMixin<UserLikes, UserLikesId>;
+    hasUserLike: Sequelize.HasManyHasAssociationMixin<UserLikes, UserLikesId>;
+    hasUserLikes: Sequelize.HasManyHasAssociationsMixin<UserLikes, UserLikesId>;
+    countUserLikes: Sequelize.HasManyCountAssociationsMixin;
     newsPlatform: NewsPlatform;
     getNewsPlatform: Sequelize.BelongsToGetAssociationMixin<NewsPlatform>;
     setNewsPlatform: Sequelize.BelongsToSetAssociationMixin<NewsPlatform, NewsPlatformId>;

package/dist/UserComments.d.ts

@@ -2,6 +2,8 @@ import * as Sequelize from 'sequelize';
 import { 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';
 import type { UserAbuseReports, UserAbuseReportsId } from './UserAbuseReports';
@@ -20,10 +22,12 @@ export interface UserCommentsAttributes {
     moderationScore?: number;
     moderationLevel?: string;
     strippedUrls?: object;
+    newsArticleId?: string;
+    merchItemId?: string;
 }
 export type UserCommentsPk = "id";
 export type UserCommentsId = UserComments[UserCommentsPk];
-export type UserCommentsOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "replyCommentId" | "createDate" | "updateDate" | "modifiedComment" | "moderationScore" | "moderationLevel" | "strippedUrls";
+export type UserCommentsOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "replyCommentId" | "createDate" | "updateDate" | "modifiedComment" | "moderationScore" | "moderationLevel" | "strippedUrls" | "newsArticleId" | "merchItemId";
 export type UserCommentsCreationAttributes = Optional<UserCommentsAttributes, UserCommentsOptionalAttributes>;
 export declare class UserComments extends Model<UserCommentsAttributes, UserCommentsCreationAttributes> implements UserCommentsAttributes {
     appUserId: string;
@@ -40,6 +44,8 @@ export declare class UserComments extends Model<UserCommentsAttributes, UserComm
     moderationScore?: number;
     moderationLevel?: string;
     strippedUrls?: object;
+    newsArticleId?: string;
+    merchItemId?: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
@@ -48,6 +54,14 @@ export declare class UserComments extends Model<UserCommentsAttributes, UserComm
     getJukebox: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
     setJukebox: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;
     createJukebox: Sequelize.BelongsToCreateAssociationMixin<JukeboxSession>;
+    merchItem: MerchItem;
+    getMerchItem: Sequelize.BelongsToGetAssociationMixin<MerchItem>;
+    setMerchItem: Sequelize.BelongsToSetAssociationMixin<MerchItem, MerchItemId>;
+    createMerchItem: Sequelize.BelongsToCreateAssociationMixin<MerchItem>;
+    newsArticle: NewsArticle;
+    getNewsArticle: Sequelize.BelongsToGetAssociationMixin<NewsArticle>;
+    setNewsArticle: Sequelize.BelongsToSetAssociationMixin<NewsArticle, NewsArticleId>;
+    createNewsArticle: Sequelize.BelongsToCreateAssociationMixin<NewsArticle>;
     playlist: PlatformUserPlaylist;
     getPlaylist: Sequelize.BelongsToGetAssociationMixin<PlatformUserPlaylist>;
     setPlaylist: Sequelize.BelongsToSetAssociationMixin<PlatformUserPlaylist, PlatformUserPlaylistId>;

package/dist/UserComments.js

@@ -120,6 +120,24 @@ class UserComments extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: true,
                 field: 'stripped_urls'
+            },
+            newsArticleId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'news_article',
+                    key: 'id'
+                },
+                field: 'news_article_id'
+            },
+            merchItemId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'merch_item',
+                    key: 'id'
+                },
+                field: 'merch_item_id'
             }
         }, {
             sequelize,
@@ -133,6 +151,18 @@ class UserComments extends sequelize_1.Model {
                         { name: "jukebox_id" },
                     ]
                 },
+                {
+                    name: "idx_user_comments_merch_item",
+                    fields: [
+                        { name: "merch_item_id" },
+                    ]
+                },
+                {
+                    name: "idx_user_comments_news_article",
+                    fields: [
+                        { name: "news_article_id" },
+                    ]
+                },
                 {
                     name: "idx_user_comments_playlist",
                     fields: [

package/dist/UserLikes.d.ts

@@ -2,6 +2,8 @@ import * as Sequelize from 'sequelize';
 import { 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 UserLikesAttributes {
@@ -12,10 +14,12 @@ export interface UserLikesAttributes {
     id: string;
     createDate: Date;
     updateDate: Date;
+    merchItemId?: string;
+    newsArticleId?: string;
 }
 export type UserLikesPk = "id";
 export type UserLikesId = UserLikes[UserLikesPk];
-export type UserLikesOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "createDate" | "updateDate";
+export type UserLikesOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "createDate" | "updateDate" | "merchItemId" | "newsArticleId";
 export type UserLikesCreationAttributes = Optional<UserLikesAttributes, UserLikesOptionalAttributes>;
 export declare class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttributes> implements UserLikesAttributes {
     appUserId: string;
@@ -25,6 +29,8 @@ export declare class UserLikes extends Model<UserLikesAttributes, UserLikesCreat
     id: string;
     createDate: Date;
     updateDate: Date;
+    merchItemId?: string;
+    newsArticleId?: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
@@ -33,6 +39,14 @@ export declare class UserLikes extends Model<UserLikesAttributes, UserLikesCreat
     getJukebox: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
     setJukebox: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;
     createJukebox: Sequelize.BelongsToCreateAssociationMixin<JukeboxSession>;
+    merchItem: MerchItem;
+    getMerchItem: Sequelize.BelongsToGetAssociationMixin<MerchItem>;
+    setMerchItem: Sequelize.BelongsToSetAssociationMixin<MerchItem, MerchItemId>;
+    createMerchItem: Sequelize.BelongsToCreateAssociationMixin<MerchItem>;
+    newsArticle: NewsArticle;
+    getNewsArticle: Sequelize.BelongsToGetAssociationMixin<NewsArticle>;
+    setNewsArticle: Sequelize.BelongsToSetAssociationMixin<NewsArticle, NewsArticleId>;
+    createNewsArticle: Sequelize.BelongsToCreateAssociationMixin<NewsArticle>;
     playlist: PlatformUserPlaylist;
     getPlaylist: Sequelize.BelongsToGetAssociationMixin<PlatformUserPlaylist>;
     setPlaylist: Sequelize.BelongsToSetAssociationMixin<PlatformUserPlaylist, PlatformUserPlaylistId>;

package/dist/UserLikes.js

@@ -82,6 +82,24 @@ class UserLikes extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
                 field: 'update_date'
+            },
+            merchItemId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'merch_item',
+                    key: 'id'
+                },
+                field: 'merch_item_id'
+            },
+            newsArticleId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'news_article',
+                    key: 'id'
+                },
+                field: 'news_article_id'
             }
         }, {
             sequelize,
@@ -95,6 +113,18 @@ class UserLikes extends sequelize_1.Model {
                         { name: "jukebox_id" },
                     ]
                 },
+                {
+                    name: "idx_user_likes_merch_item",
+                    fields: [
+                        { name: "merch_item_id" },
+                    ]
+                },
+                {
+                    name: "idx_user_likes_news_article",
+                    fields: [
+                        { name: "news_article_id" },
+                    ]
+                },
                 {
                     name: "idx_user_likes_playlist",
                     fields: [
@@ -121,6 +151,22 @@ class UserLikes extends sequelize_1.Model {
                         { name: "jukebox_id" },
                     ]
                 },
+                {
+                    name: "uq_user_likes_user_merch_item",
+                    unique: true,
+                    fields: [
+                        { name: "app_user_id" },
+                        { name: "merch_item_id" },
+                    ]
+                },
+                {
+                    name: "uq_user_likes_user_news_article",
+                    unique: true,
+                    fields: [
+                        { name: "app_user_id" },
+                        { name: "news_article_id" },
+                    ]
+                },
                 {
                     name: "uq_user_likes_user_playlist",
                     unique: true,

package/dist/VersusCoCreator.d.ts

@@ -1,37 +1,28 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { AppUser, AppUserId } from './AppUser';
-import type { GuestUser, GuestUserId } from './GuestUser';
 import type { Versus, VersusId } from './Versus';
 export interface VersusCoCreatorAttributes {
     versusId: string;
-    appUserId?: string;
-    guestUserId?: string;
-    invitedEmail?: string;
     id: string;
     createdAt: Date;
     updatedAt: Date;
+    appUserId: string;
 }
 export type VersusCoCreatorPk = "id";
 export type VersusCoCreatorId = VersusCoCreator[VersusCoCreatorPk];
-export type VersusCoCreatorOptionalAttributes = "appUserId" | "guestUserId" | "invitedEmail" | "id" | "createdAt" | "updatedAt";
+export type VersusCoCreatorOptionalAttributes = "id" | "createdAt" | "updatedAt";
 export type VersusCoCreatorCreationAttributes = Optional<VersusCoCreatorAttributes, VersusCoCreatorOptionalAttributes>;
 export declare class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCreatorCreationAttributes> implements VersusCoCreatorAttributes {
     versusId: string;
-    appUserId?: string;
-    guestUserId?: string;
-    invitedEmail?: string;
     id: string;
     createdAt: Date;
     updatedAt: Date;
+    appUserId: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
     createAppUser: Sequelize.BelongsToCreateAssociationMixin<AppUser>;
-    guestUser: GuestUser;
-    getGuestUser: Sequelize.BelongsToGetAssociationMixin<GuestUser>;
-    setGuestUser: Sequelize.BelongsToSetAssociationMixin<GuestUser, GuestUserId>;
-    createGuestUser: Sequelize.BelongsToCreateAssociationMixin<GuestUser>;
     versu: Versus;
     getVersu: Sequelize.BelongsToGetAssociationMixin<Versus>;
     setVersu: Sequelize.BelongsToSetAssociationMixin<Versus, VersusId>;

package/dist/VersusCoCreator.js

@@ -38,29 +38,6 @@ class VersusCoCreator extends sequelize_1.Model {
                 },
                 field: 'versus_id'
             },
-            appUserId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: true,
-                references: {
-                    model: 'app_user',
-                    key: 'id'
-                },
-                field: 'app_user_id'
-            },
-            guestUserId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: true,
-                references: {
-                    model: 'guest_user',
-                    key: 'id'
-                },
-                field: 'guest_user_id'
-            },
-            invitedEmail: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: true,
-                field: 'invited_email'
-            },
             id: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -78,6 +55,15 @@ class VersusCoCreator extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
                 field: 'updated_at'
+            },
+            appUserId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'app_user',
+                    key: 'id'
+                },
+                field: 'app_user_id'
             }
         }, {
             sequelize,
@@ -92,15 +78,17 @@ class VersusCoCreator extends sequelize_1.Model {
                     ]
                 },
                 {
-                    name: "idx_versus_co_creator_guest_user",
+                    name: "idx_versus_co_creator_versus",
                     fields: [
-                        { name: "guest_user_id" },
+                        { name: "versus_id" },
                     ]
                 },
                 {
-                    name: "idx_versus_co_creator_versus",
+                    name: "uk_versus_co_creator_versus_app_user",
+                    unique: true,
                     fields: [
                         { name: "versus_id" },
+                        { name: "app_user_id" },
                     ]
                 },
                 {

package/dist/VersusOption.d.ts

@@ -4,7 +4,6 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { CanonTrack, CanonTrackId } from './CanonTrack';
-import type { GuestUser, GuestUserId } from './GuestUser';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
@@ -27,11 +26,10 @@ export interface VersusOptionAttributes {
     updatedAt: Date;
     deleted: boolean;
     appUserId?: string;
-    guestUserId?: string;
 }
 export type VersusOptionPk = "id";
 export type VersusOptionId = VersusOption[VersusOptionPk];
-export type VersusOptionOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "id" | "createdAt" | "updatedAt" | "appUserId" | "guestUserId";
+export type VersusOptionOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "id" | "createdAt" | "updatedAt" | "appUserId";
 export type VersusOptionCreationAttributes = Optional<VersusOptionAttributes, VersusOptionOptionalAttributes>;
 export declare class VersusOption extends Model<VersusOptionAttributes, VersusOptionCreationAttributes> implements VersusOptionAttributes {
     versusId: string;
@@ -50,7 +48,6 @@ export declare class VersusOption extends Model<VersusOptionAttributes, VersusOp
     updatedAt: Date;
     deleted: boolean;
     appUserId?: string;
-    guestUserId?: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
@@ -67,10 +64,6 @@ export declare class VersusOption extends Model<VersusOptionAttributes, VersusOp
     getCanonTrack: Sequelize.BelongsToGetAssociationMixin<CanonTrack>;
     setCanonTrack: Sequelize.BelongsToSetAssociationMixin<CanonTrack, CanonTrackId>;
     createCanonTrack: Sequelize.BelongsToCreateAssociationMixin<CanonTrack>;
-    guestUser: GuestUser;
-    getGuestUser: Sequelize.BelongsToGetAssociationMixin<GuestUser>;
-    setGuestUser: Sequelize.BelongsToSetAssociationMixin<GuestUser, GuestUserId>;
-    createGuestUser: Sequelize.BelongsToCreateAssociationMixin<GuestUser>;
     platformAlbum: PlatformAlbum;
     getPlatformAlbum: Sequelize.BelongsToGetAssociationMixin<PlatformAlbum>;
     setPlatformAlbum: Sequelize.BelongsToSetAssociationMixin<PlatformAlbum, PlatformAlbumId>;

package/dist/VersusOption.js

@@ -147,15 +147,6 @@ class VersusOption extends sequelize_1.Model {
                     key: 'id'
                 },
                 field: 'app_user_id'
-            },
-            guestUserId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: true,
-                references: {
-                    model: 'guest_user',
-                    key: 'id'
-                },
-                field: 'guest_user_id'
             }
         }, {
             sequelize,

package/dist/init-models.js

@@ -549,10 +549,6 @@ function initModels(sequelize) {
     FeedContentType.hasMany(UserEngagementFactor, { as: "userEngagementFactors", foreignKey: "contentTypeId" });
     JukeboxQueueEntry.belongsTo(GuestUser, { as: "trackAddedGuestUser", foreignKey: "trackAddedGuestUserId" });
     GuestUser.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "trackAddedGuestUserId" });
-    VersusCoCreator.belongsTo(GuestUser, { as: "guestUser", foreignKey: "guestUserId" });
-    GuestUser.hasMany(VersusCoCreator, { as: "versusCoCreators", foreignKey: "guestUserId" });
-    VersusOption.belongsTo(GuestUser, { as: "guestUser", foreignKey: "guestUserId" });
-    GuestUser.hasMany(VersusOption, { as: "versusOptions", foreignKey: "guestUserId" });
     JukeboxSession.belongsTo(JukeboxAccessType, { as: "accessType", foreignKey: "accessTypeId" });
     JukeboxAccessType.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "accessTypeId" });
     JukeboxUser.belongsTo(JukeboxQueueEntry, { as: "pausedQueueEntry", foreignKey: "pausedQueueEntryId" });
@@ -593,6 +589,10 @@ function initModels(sequelize) {
     JukeboxUserType.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxUserTypeId" });
     UserBookmarks.belongsTo(MerchItem, { as: "merchItem", foreignKey: "merchItemId" });
     MerchItem.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "merchItemId" });
+    UserComments.belongsTo(MerchItem, { as: "merchItem", foreignKey: "merchItemId" });
+    MerchItem.hasMany(UserComments, { as: "userComments", foreignKey: "merchItemId" });
+    UserLikes.belongsTo(MerchItem, { as: "merchItem", foreignKey: "merchItemId" });
+    MerchItem.hasMany(UserLikes, { as: "userLikes", foreignKey: "merchItemId" });
     MerchItem.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId" });
     MerchPlatform.hasMany(MerchItem, { as: "merchItems", foreignKey: "merchPlatformId" });
     MerchOrchestration.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId" });
@@ -603,6 +603,10 @@ function initModels(sequelize) {
     MerchType.hasMany(MerchOrchestration, { as: "merchOrchestrations", foreignKey: "merchTypeId" });
     UserBookmarks.belongsTo(NewsArticle, { as: "newsArticle", foreignKey: "newsArticleId" });
     NewsArticle.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "newsArticleId" });
+    UserComments.belongsTo(NewsArticle, { as: "newsArticle", foreignKey: "newsArticleId" });
+    NewsArticle.hasMany(UserComments, { as: "userComments", foreignKey: "newsArticleId" });
+    UserLikes.belongsTo(NewsArticle, { as: "newsArticle", foreignKey: "newsArticleId" });
+    NewsArticle.hasMany(UserLikes, { as: "userLikes", foreignKey: "newsArticleId" });
     NewsArticle.belongsTo(NewsPlatform, { as: "newsPlatform", foreignKey: "newsPlatformId" });
     NewsPlatform.hasMany(NewsArticle, { as: "newsArticles", foreignKey: "newsPlatformId" });
     Notification.belongsTo(NotificationType, { as: "notificationType", foreignKey: "notificationTypeId" });

package/models/GuestUser.ts

@@ -3,8 +3,6 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 import type { Versus, VersusId } from './Versus';
-import type { VersusCoCreator, VersusCoCreatorId } from './VersusCoCreator';
-import type { VersusOption, VersusOptionId } from './VersusOption';
 
 export interface GuestUserAttributes {
   jukeboxSessionId?: string;
@@ -44,30 +42,6 @@ export class GuestUser extends Model<GuestUserAttributes, GuestUserCreationAttri
   hasJukeboxQueueEntry!: Sequelize.HasManyHasAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
   hasJukeboxQueueEntries!: Sequelize.HasManyHasAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
   countJukeboxQueueEntries!: Sequelize.HasManyCountAssociationsMixin;
-  // GuestUser hasMany VersusCoCreator via guestUserId
-  versusCoCreators!: VersusCoCreator[];
-  getVersusCoCreators!: Sequelize.HasManyGetAssociationsMixin<VersusCoCreator>;
-  setVersusCoCreators!: Sequelize.HasManySetAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-  addVersusCoCreator!: Sequelize.HasManyAddAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-  addVersusCoCreators!: Sequelize.HasManyAddAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-  createVersusCoCreator!: Sequelize.HasManyCreateAssociationMixin<VersusCoCreator>;
-  removeVersusCoCreator!: Sequelize.HasManyRemoveAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-  removeVersusCoCreators!: Sequelize.HasManyRemoveAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-  hasVersusCoCreator!: Sequelize.HasManyHasAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-  hasVersusCoCreators!: Sequelize.HasManyHasAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-  countVersusCoCreators!: Sequelize.HasManyCountAssociationsMixin;
-  // GuestUser hasMany VersusOption via guestUserId
-  versusOptions!: VersusOption[];
-  getVersusOptions!: Sequelize.HasManyGetAssociationsMixin<VersusOption>;
-  setVersusOptions!: Sequelize.HasManySetAssociationsMixin<VersusOption, VersusOptionId>;
-  addVersusOption!: Sequelize.HasManyAddAssociationMixin<VersusOption, VersusOptionId>;
-  addVersusOptions!: Sequelize.HasManyAddAssociationsMixin<VersusOption, VersusOptionId>;
-  createVersusOption!: Sequelize.HasManyCreateAssociationMixin<VersusOption>;
-  removeVersusOption!: Sequelize.HasManyRemoveAssociationMixin<VersusOption, VersusOptionId>;
-  removeVersusOptions!: Sequelize.HasManyRemoveAssociationsMixin<VersusOption, VersusOptionId>;
-  hasVersusOption!: Sequelize.HasManyHasAssociationMixin<VersusOption, VersusOptionId>;
-  hasVersusOptions!: Sequelize.HasManyHasAssociationsMixin<VersusOption, VersusOptionId>;
-  countVersusOptions!: Sequelize.HasManyCountAssociationsMixin;
   // GuestUser belongsTo JukeboxSession via jukeboxSessionId
   jukeboxSession!: JukeboxSession;
   getJukeboxSession!: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;

package/models/MerchItem.ts

@@ -4,6 +4,8 @@ import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { MerchPlatform, MerchPlatformId } from './MerchPlatform';
 import type { MerchType, MerchTypeId } from './MerchType';
 import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
+import type { UserComments, UserCommentsId } from './UserComments';
+import type { UserLikes, UserLikesId } from './UserLikes';
 
 export interface MerchItemAttributes {
   canonArtistId: string;
@@ -56,6 +58,30 @@ export class MerchItem extends Model<MerchItemAttributes, MerchItemCreationAttri
   hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
   hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
   countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
+  // MerchItem hasMany UserComments via merchItemId
+  userComments!: UserComments[];
+  getUserComments!: Sequelize.HasManyGetAssociationsMixin<UserComments>;
+  setUserComments!: Sequelize.HasManySetAssociationsMixin<UserComments, UserCommentsId>;
+  addUserComment!: Sequelize.HasManyAddAssociationMixin<UserComments, UserCommentsId>;
+  addUserComments!: Sequelize.HasManyAddAssociationsMixin<UserComments, UserCommentsId>;
+  createUserComment!: Sequelize.HasManyCreateAssociationMixin<UserComments>;
+  removeUserComment!: Sequelize.HasManyRemoveAssociationMixin<UserComments, UserCommentsId>;
+  removeUserComments!: Sequelize.HasManyRemoveAssociationsMixin<UserComments, UserCommentsId>;
+  hasUserComment!: Sequelize.HasManyHasAssociationMixin<UserComments, UserCommentsId>;
+  hasUserComments!: Sequelize.HasManyHasAssociationsMixin<UserComments, UserCommentsId>;
+  countUserComments!: Sequelize.HasManyCountAssociationsMixin;
+  // MerchItem hasMany UserLikes via merchItemId
+  userLikes!: UserLikes[];
+  getUserLikes!: Sequelize.HasManyGetAssociationsMixin<UserLikes>;
+  setUserLikes!: Sequelize.HasManySetAssociationsMixin<UserLikes, UserLikesId>;
+  addUserLike!: Sequelize.HasManyAddAssociationMixin<UserLikes, UserLikesId>;
+  addUserLikes!: Sequelize.HasManyAddAssociationsMixin<UserLikes, UserLikesId>;
+  createUserLike!: Sequelize.HasManyCreateAssociationMixin<UserLikes>;
+  removeUserLike!: Sequelize.HasManyRemoveAssociationMixin<UserLikes, UserLikesId>;
+  removeUserLikes!: Sequelize.HasManyRemoveAssociationsMixin<UserLikes, UserLikesId>;
+  hasUserLike!: Sequelize.HasManyHasAssociationMixin<UserLikes, UserLikesId>;
+  hasUserLikes!: Sequelize.HasManyHasAssociationsMixin<UserLikes, UserLikesId>;
+  countUserLikes!: Sequelize.HasManyCountAssociationsMixin;
   // MerchItem belongsTo MerchPlatform via merchPlatformId
   merchPlatform!: MerchPlatform;
   getMerchPlatform!: Sequelize.BelongsToGetAssociationMixin<MerchPlatform>;

package/models/NewsArticle.ts

@@ -3,6 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { NewsPlatform, NewsPlatformId } from './NewsPlatform';
 import type { UserBookmarks, UserBookmarksId } from './UserBookmarks';
+import type { UserComments, UserCommentsId } from './UserComments';
+import type { UserLikes, UserLikesId } from './UserLikes';
 
 export interface NewsArticleAttributes {
   id: string;
@@ -51,6 +53,30 @@ export class NewsArticle extends Model<NewsArticleAttributes, NewsArticleCreatio
   hasUserBookmark!: Sequelize.HasManyHasAssociationMixin<UserBookmarks, UserBookmarksId>;
   hasUserBookmarks!: Sequelize.HasManyHasAssociationsMixin<UserBookmarks, UserBookmarksId>;
   countUserBookmarks!: Sequelize.HasManyCountAssociationsMixin;
+  // NewsArticle hasMany UserComments via newsArticleId
+  userComments!: UserComments[];
+  getUserComments!: Sequelize.HasManyGetAssociationsMixin<UserComments>;
+  setUserComments!: Sequelize.HasManySetAssociationsMixin<UserComments, UserCommentsId>;
+  addUserComment!: Sequelize.HasManyAddAssociationMixin<UserComments, UserCommentsId>;
+  addUserComments!: Sequelize.HasManyAddAssociationsMixin<UserComments, UserCommentsId>;
+  createUserComment!: Sequelize.HasManyCreateAssociationMixin<UserComments>;
+  removeUserComment!: Sequelize.HasManyRemoveAssociationMixin<UserComments, UserCommentsId>;
+  removeUserComments!: Sequelize.HasManyRemoveAssociationsMixin<UserComments, UserCommentsId>;
+  hasUserComment!: Sequelize.HasManyHasAssociationMixin<UserComments, UserCommentsId>;
+  hasUserComments!: Sequelize.HasManyHasAssociationsMixin<UserComments, UserCommentsId>;
+  countUserComments!: Sequelize.HasManyCountAssociationsMixin;
+  // NewsArticle hasMany UserLikes via newsArticleId
+  userLikes!: UserLikes[];
+  getUserLikes!: Sequelize.HasManyGetAssociationsMixin<UserLikes>;
+  setUserLikes!: Sequelize.HasManySetAssociationsMixin<UserLikes, UserLikesId>;
+  addUserLike!: Sequelize.HasManyAddAssociationMixin<UserLikes, UserLikesId>;
+  addUserLikes!: Sequelize.HasManyAddAssociationsMixin<UserLikes, UserLikesId>;
+  createUserLike!: Sequelize.HasManyCreateAssociationMixin<UserLikes>;
+  removeUserLike!: Sequelize.HasManyRemoveAssociationMixin<UserLikes, UserLikesId>;
+  removeUserLikes!: Sequelize.HasManyRemoveAssociationsMixin<UserLikes, UserLikesId>;
+  hasUserLike!: Sequelize.HasManyHasAssociationMixin<UserLikes, UserLikesId>;
+  hasUserLikes!: Sequelize.HasManyHasAssociationsMixin<UserLikes, UserLikesId>;
+  countUserLikes!: Sequelize.HasManyCountAssociationsMixin;
   // NewsArticle belongsTo NewsPlatform via newsPlatformId
   newsPlatform!: NewsPlatform;
   getNewsPlatform!: Sequelize.BelongsToGetAssociationMixin<NewsPlatform>;

package/models/UserComments.ts

@@ -2,6 +2,8 @@ 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';
 import type { UserAbuseReports, UserAbuseReportsId } from './UserAbuseReports';
@@ -21,11 +23,13 @@ export interface UserCommentsAttributes {
   moderationScore?: number;
   moderationLevel?: string;
   strippedUrls?: object;
+  newsArticleId?: string;
+  merchItemId?: string;
 }
 
 export type UserCommentsPk = "id";
 export type UserCommentsId = UserComments[UserCommentsPk];
-export type UserCommentsOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "replyCommentId" | "createDate" | "updateDate" | "modifiedComment" | "moderationScore" | "moderationLevel" | "strippedUrls";
+export type UserCommentsOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "replyCommentId" | "createDate" | "updateDate" | "modifiedComment" | "moderationScore" | "moderationLevel" | "strippedUrls" | "newsArticleId" | "merchItemId";
 export type UserCommentsCreationAttributes = Optional<UserCommentsAttributes, UserCommentsOptionalAttributes>;
 
 export class UserComments extends Model<UserCommentsAttributes, UserCommentsCreationAttributes> implements UserCommentsAttributes {
@@ -43,6 +47,8 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
   moderationScore?: number;
   moderationLevel?: string;
   strippedUrls?: object;
+  newsArticleId?: string;
+  merchItemId?: string;
 
   // UserComments belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -54,6 +60,16 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
   getJukebox!: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
   setJukebox!: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;
   createJukebox!: Sequelize.BelongsToCreateAssociationMixin<JukeboxSession>;
+  // UserComments belongsTo MerchItem via merchItemId
+  merchItem!: MerchItem;
+  getMerchItem!: Sequelize.BelongsToGetAssociationMixin<MerchItem>;
+  setMerchItem!: Sequelize.BelongsToSetAssociationMixin<MerchItem, MerchItemId>;
+  createMerchItem!: Sequelize.BelongsToCreateAssociationMixin<MerchItem>;
+  // UserComments belongsTo NewsArticle via newsArticleId
+  newsArticle!: NewsArticle;
+  getNewsArticle!: Sequelize.BelongsToGetAssociationMixin<NewsArticle>;
+  setNewsArticle!: Sequelize.BelongsToSetAssociationMixin<NewsArticle, NewsArticleId>;
+  createNewsArticle!: Sequelize.BelongsToCreateAssociationMixin<NewsArticle>;
   // UserComments belongsTo PlatformUserPlaylist via playlistId
   playlist!: PlatformUserPlaylist;
   getPlaylist!: Sequelize.BelongsToGetAssociationMixin<PlatformUserPlaylist>;
@@ -175,6 +191,24 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
       type: DataTypes.JSONB,
       allowNull: true,
       field: 'stripped_urls'
+    },
+    newsArticleId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'news_article',
+        key: 'id'
+      },
+      field: 'news_article_id'
+    },
+    merchItemId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'merch_item',
+        key: 'id'
+      },
+      field: 'merch_item_id'
     }
   }, {
     sequelize,
@@ -188,6 +222,18 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
           { name: "jukebox_id" },
         ]
       },
+      {
+        name: "idx_user_comments_merch_item",
+        fields: [
+          { name: "merch_item_id" },
+        ]
+      },
+      {
+        name: "idx_user_comments_news_article",
+        fields: [
+          { name: "news_article_id" },
+        ]
+      },
       {
         name: "idx_user_comments_playlist",
         fields: [

package/models/UserLikes.ts

@@ -2,6 +2,8 @@ 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';
 
@@ -13,11 +15,13 @@ export interface UserLikesAttributes {
   id: string;
   createDate: Date;
   updateDate: Date;
+  merchItemId?: string;
+  newsArticleId?: string;
 }
 
 export type UserLikesPk = "id";
 export type UserLikesId = UserLikes[UserLikesPk];
-export type UserLikesOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "createDate" | "updateDate";
+export type UserLikesOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "createDate" | "updateDate" | "merchItemId" | "newsArticleId";
 export type UserLikesCreationAttributes = Optional<UserLikesAttributes, UserLikesOptionalAttributes>;
 
 export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttributes> implements UserLikesAttributes {
@@ -28,6 +32,8 @@ export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttri
   id!: string;
   createDate!: Date;
   updateDate!: Date;
+  merchItemId?: string;
+  newsArticleId?: string;
 
   // UserLikes belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -39,6 +45,16 @@ export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttri
   getJukebox!: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
   setJukebox!: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;
   createJukebox!: Sequelize.BelongsToCreateAssociationMixin<JukeboxSession>;
+  // UserLikes belongsTo MerchItem via merchItemId
+  merchItem!: MerchItem;
+  getMerchItem!: Sequelize.BelongsToGetAssociationMixin<MerchItem>;
+  setMerchItem!: Sequelize.BelongsToSetAssociationMixin<MerchItem, MerchItemId>;
+  createMerchItem!: Sequelize.BelongsToCreateAssociationMixin<MerchItem>;
+  // UserLikes belongsTo NewsArticle via newsArticleId
+  newsArticle!: NewsArticle;
+  getNewsArticle!: Sequelize.BelongsToGetAssociationMixin<NewsArticle>;
+  setNewsArticle!: Sequelize.BelongsToSetAssociationMixin<NewsArticle, NewsArticleId>;
+  createNewsArticle!: Sequelize.BelongsToCreateAssociationMixin<NewsArticle>;
   // UserLikes belongsTo PlatformUserPlaylist via playlistId
   playlist!: PlatformUserPlaylist;
   getPlaylist!: Sequelize.BelongsToGetAssociationMixin<PlatformUserPlaylist>;
@@ -105,6 +121,24 @@ export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttri
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
+    },
+    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'
     }
   }, {
     sequelize,
@@ -118,6 +152,18 @@ export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttri
           { name: "jukebox_id" },
         ]
       },
+      {
+        name: "idx_user_likes_merch_item",
+        fields: [
+          { name: "merch_item_id" },
+        ]
+      },
+      {
+        name: "idx_user_likes_news_article",
+        fields: [
+          { name: "news_article_id" },
+        ]
+      },
       {
         name: "idx_user_likes_playlist",
         fields: [
@@ -144,6 +190,22 @@ export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttri
           { name: "jukebox_id" },
         ]
       },
+      {
+        name: "uq_user_likes_user_merch_item",
+        unique: true,
+        fields: [
+          { name: "app_user_id" },
+          { name: "merch_item_id" },
+        ]
+      },
+      {
+        name: "uq_user_likes_user_news_article",
+        unique: true,
+        fields: [
+          { name: "app_user_id" },
+          { name: "news_article_id" },
+        ]
+      },
       {
         name: "uq_user_likes_user_playlist",
         unique: true,

package/models/VersusCoCreator.ts

@@ -1,43 +1,33 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 import type { AppUser, AppUserId } from './AppUser';
-import type { GuestUser, GuestUserId } from './GuestUser';
 import type { Versus, VersusId } from './Versus';
 
 export interface VersusCoCreatorAttributes {
   versusId: string;
-  appUserId?: string;
-  guestUserId?: string;
-  invitedEmail?: string;
   id: string;
   createdAt: Date;
   updatedAt: Date;
+  appUserId: string;
 }
 
 export type VersusCoCreatorPk = "id";
 export type VersusCoCreatorId = VersusCoCreator[VersusCoCreatorPk];
-export type VersusCoCreatorOptionalAttributes = "appUserId" | "guestUserId" | "invitedEmail" | "id" | "createdAt" | "updatedAt";
+export type VersusCoCreatorOptionalAttributes = "id" | "createdAt" | "updatedAt";
 export type VersusCoCreatorCreationAttributes = Optional<VersusCoCreatorAttributes, VersusCoCreatorOptionalAttributes>;
 
 export class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCreatorCreationAttributes> implements VersusCoCreatorAttributes {
   versusId!: string;
-  appUserId?: string;
-  guestUserId?: string;
-  invitedEmail?: string;
   id!: string;
   createdAt!: Date;
   updatedAt!: Date;
+  appUserId!: string;
 
   // VersusCoCreator belongsTo AppUser via appUserId
   appUser!: AppUser;
   getAppUser!: Sequelize.BelongsToGetAssociationMixin<AppUser>;
   setAppUser!: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
   createAppUser!: Sequelize.BelongsToCreateAssociationMixin<AppUser>;
-  // VersusCoCreator belongsTo GuestUser via guestUserId
-  guestUser!: GuestUser;
-  getGuestUser!: Sequelize.BelongsToGetAssociationMixin<GuestUser>;
-  setGuestUser!: Sequelize.BelongsToSetAssociationMixin<GuestUser, GuestUserId>;
-  createGuestUser!: Sequelize.BelongsToCreateAssociationMixin<GuestUser>;
   // VersusCoCreator belongsTo Versus via versusId
   versu!: Versus;
   getVersu!: Sequelize.BelongsToGetAssociationMixin<Versus>;
@@ -55,29 +45,6 @@ export class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCr
       },
       field: 'versus_id'
     },
-    appUserId: {
-      type: DataTypes.UUID,
-      allowNull: true,
-      references: {
-        model: 'app_user',
-        key: 'id'
-      },
-      field: 'app_user_id'
-    },
-    guestUserId: {
-      type: DataTypes.UUID,
-      allowNull: true,
-      references: {
-        model: 'guest_user',
-        key: 'id'
-      },
-      field: 'guest_user_id'
-    },
-    invitedEmail: {
-      type: DataTypes.TEXT,
-      allowNull: true,
-      field: 'invited_email'
-    },
     id: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -95,6 +62,15 @@ export class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCr
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
+    },
+    appUserId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      references: {
+        model: 'app_user',
+        key: 'id'
+      },
+      field: 'app_user_id'
     }
   }, {
     sequelize,
@@ -109,15 +85,17 @@ export class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCr
         ]
       },
       {
-        name: "idx_versus_co_creator_guest_user",
+        name: "idx_versus_co_creator_versus",
         fields: [
-          { name: "guest_user_id" },
+          { name: "versus_id" },
         ]
       },
       {
-        name: "idx_versus_co_creator_versus",
+        name: "uk_versus_co_creator_versus_app_user",
+        unique: true,
         fields: [
           { name: "versus_id" },
+          { name: "app_user_id" },
         ]
       },
       {

package/models/VersusOption.ts

@@ -4,7 +4,6 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { CanonTrack, CanonTrackId } from './CanonTrack';
-import type { GuestUser, GuestUserId } from './GuestUser';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
@@ -28,12 +27,11 @@ export interface VersusOptionAttributes {
   updatedAt: Date;
   deleted: boolean;
   appUserId?: string;
-  guestUserId?: string;
 }
 
 export type VersusOptionPk = "id";
 export type VersusOptionId = VersusOption[VersusOptionPk];
-export type VersusOptionOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "id" | "createdAt" | "updatedAt" | "appUserId" | "guestUserId";
+export type VersusOptionOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "id" | "createdAt" | "updatedAt" | "appUserId";
 export type VersusOptionCreationAttributes = Optional<VersusOptionAttributes, VersusOptionOptionalAttributes>;
 
 export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCreationAttributes> implements VersusOptionAttributes {
@@ -53,7 +51,6 @@ export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCrea
   updatedAt!: Date;
   deleted!: boolean;
   appUserId?: string;
-  guestUserId?: string;
 
   // VersusOption belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -75,11 +72,6 @@ export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCrea
   getCanonTrack!: Sequelize.BelongsToGetAssociationMixin<CanonTrack>;
   setCanonTrack!: Sequelize.BelongsToSetAssociationMixin<CanonTrack, CanonTrackId>;
   createCanonTrack!: Sequelize.BelongsToCreateAssociationMixin<CanonTrack>;
-  // VersusOption belongsTo GuestUser via guestUserId
-  guestUser!: GuestUser;
-  getGuestUser!: Sequelize.BelongsToGetAssociationMixin<GuestUser>;
-  setGuestUser!: Sequelize.BelongsToSetAssociationMixin<GuestUser, GuestUserId>;
-  createGuestUser!: Sequelize.BelongsToCreateAssociationMixin<GuestUser>;
   // VersusOption belongsTo PlatformAlbum via platformAlbumId
   platformAlbum!: PlatformAlbum;
   getPlatformAlbum!: Sequelize.BelongsToGetAssociationMixin<PlatformAlbum>;
@@ -226,15 +218,6 @@ export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCrea
         key: 'id'
       },
       field: 'app_user_id'
-    },
-    guestUserId: {
-      type: DataTypes.UUID,
-      allowNull: true,
-      references: {
-        model: 'guest_user',
-        key: 'id'
-      },
-      field: 'guest_user_id'
     }
   }, {
     sequelize,

package/models/init-models.ts

@@ -894,10 +894,6 @@ export function initModels(sequelize: Sequelize) {
   FeedContentType.hasMany(UserEngagementFactor, { as: "userEngagementFactors", foreignKey: "contentTypeId"});
   JukeboxQueueEntry.belongsTo(GuestUser, { as: "trackAddedGuestUser", foreignKey: "trackAddedGuestUserId"});
   GuestUser.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "trackAddedGuestUserId"});
-  VersusCoCreator.belongsTo(GuestUser, { as: "guestUser", foreignKey: "guestUserId"});
-  GuestUser.hasMany(VersusCoCreator, { as: "versusCoCreators", foreignKey: "guestUserId"});
-  VersusOption.belongsTo(GuestUser, { as: "guestUser", foreignKey: "guestUserId"});
-  GuestUser.hasMany(VersusOption, { as: "versusOptions", foreignKey: "guestUserId"});
   JukeboxSession.belongsTo(JukeboxAccessType, { as: "accessType", foreignKey: "accessTypeId"});
   JukeboxAccessType.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "accessTypeId"});
   JukeboxUser.belongsTo(JukeboxQueueEntry, { as: "pausedQueueEntry", foreignKey: "pausedQueueEntryId"});
@@ -938,6 +934,10 @@ export function initModels(sequelize: Sequelize) {
   JukeboxUserType.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxUserTypeId"});
   UserBookmarks.belongsTo(MerchItem, { as: "merchItem", foreignKey: "merchItemId"});
   MerchItem.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "merchItemId"});
+  UserComments.belongsTo(MerchItem, { as: "merchItem", foreignKey: "merchItemId"});
+  MerchItem.hasMany(UserComments, { as: "userComments", foreignKey: "merchItemId"});
+  UserLikes.belongsTo(MerchItem, { as: "merchItem", foreignKey: "merchItemId"});
+  MerchItem.hasMany(UserLikes, { as: "userLikes", foreignKey: "merchItemId"});
   MerchItem.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId"});
   MerchPlatform.hasMany(MerchItem, { as: "merchItems", foreignKey: "merchPlatformId"});
   MerchOrchestration.belongsTo(MerchPlatform, { as: "merchPlatform", foreignKey: "merchPlatformId"});
@@ -948,6 +948,10 @@ export function initModels(sequelize: Sequelize) {
   MerchType.hasMany(MerchOrchestration, { as: "merchOrchestrations", foreignKey: "merchTypeId"});
   UserBookmarks.belongsTo(NewsArticle, { as: "newsArticle", foreignKey: "newsArticleId"});
   NewsArticle.hasMany(UserBookmarks, { as: "userBookmarks", foreignKey: "newsArticleId"});
+  UserComments.belongsTo(NewsArticle, { as: "newsArticle", foreignKey: "newsArticleId"});
+  NewsArticle.hasMany(UserComments, { as: "userComments", foreignKey: "newsArticleId"});
+  UserLikes.belongsTo(NewsArticle, { as: "newsArticle", foreignKey: "newsArticleId"});
+  NewsArticle.hasMany(UserLikes, { as: "userLikes", foreignKey: "newsArticleId"});
   NewsArticle.belongsTo(NewsPlatform, { as: "newsPlatform", foreignKey: "newsPlatformId"});
   NewsPlatform.hasMany(NewsArticle, { as: "newsArticles", foreignKey: "newsPlatformId"});
   Notification.belongsTo(NotificationType, { as: "notificationType", foreignKey: "notificationTypeId"});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earbug/db-models",
-  "version": "0.0.51",
+  "version": "0.0.53",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {