@earbug/db-models 0.0.59 → 0.0.62

package/dist/RadioShowMedia.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class RadioShowMedia extends sequelize_1.Model {
     static initModel(sequelize) {
         return RadioShowMedia.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             radioShowId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -53,12 +59,6 @@ class RadioShowMedia extends sequelize_1.Model {
                 allowNull: false,
                 field: 's3_audio_url'
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/RadioShowPlacement.d.ts

@@ -3,27 +3,27 @@ import { Model, Optional } from 'sequelize';
 import type { CanonTrack, CanonTrackId } from './CanonTrack';
 import type { RadioShow, RadioShowId } from './RadioShow';
 export interface RadioShowPlacementAttributes {
+    id: string;
     radioShowId: string;
     canonTrackId?: string;
     radioShowMediaId?: string;
     seqNum: number;
     startTime?: string;
     endTime?: string;
-    id: string;
     deleted?: boolean;
 }
 export type RadioShowPlacementPk = "id";
 export type RadioShowPlacementId = RadioShowPlacement[RadioShowPlacementPk];
-export type RadioShowPlacementOptionalAttributes = "canonTrackId" | "radioShowMediaId" | "startTime" | "endTime" | "id" | "deleted";
+export type RadioShowPlacementOptionalAttributes = "id" | "canonTrackId" | "radioShowMediaId" | "startTime" | "endTime" | "deleted";
 export type RadioShowPlacementCreationAttributes = Optional<RadioShowPlacementAttributes, RadioShowPlacementOptionalAttributes>;
 export declare class RadioShowPlacement extends Model<RadioShowPlacementAttributes, RadioShowPlacementCreationAttributes> implements RadioShowPlacementAttributes {
+    id: string;
     radioShowId: string;
     canonTrackId?: string;
     radioShowMediaId?: string;
     seqNum: number;
     startTime?: string;
     endTime?: string;
-    id: string;
     deleted?: boolean;
     canonTrack: CanonTrack;
     getCanonTrack: Sequelize.BelongsToGetAssociationMixin<CanonTrack>;

package/dist/RadioShowPlacement.js

@@ -5,6 +5,12 @@ const sequelize_1 = require("sequelize");
 class RadioShowPlacement extends sequelize_1.Model {
     static initModel(sequelize) {
         return RadioShowPlacement.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             radioShowId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -43,12 +49,6 @@ class RadioShowPlacement extends sequelize_1.Model {
                 allowNull: true,
                 field: 'end_time'
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
             deleted: {
                 type: sequelize_1.DataTypes.BOOLEAN,
                 allowNull: true

package/dist/RadioShowPublishRequests.d.ts

@@ -2,20 +2,20 @@ import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { RadioShow, RadioShowId } from './RadioShow';
 export interface RadioShowPublishRequestsAttributes {
+    id: string;
     radioShowId: string;
     approved?: boolean;
-    id: string;
     createDate: Date;
     updateDate: Date;
 }
 export type RadioShowPublishRequestsPk = "id";
 export type RadioShowPublishRequestsId = RadioShowPublishRequests[RadioShowPublishRequestsPk];
-export type RadioShowPublishRequestsOptionalAttributes = "approved" | "id" | "createDate" | "updateDate";
+export type RadioShowPublishRequestsOptionalAttributes = "id" | "approved" | "createDate" | "updateDate";
 export type RadioShowPublishRequestsCreationAttributes = Optional<RadioShowPublishRequestsAttributes, RadioShowPublishRequestsOptionalAttributes>;
 export declare class RadioShowPublishRequests extends Model<RadioShowPublishRequestsAttributes, RadioShowPublishRequestsCreationAttributes> implements RadioShowPublishRequestsAttributes {
+    id: string;
     radioShowId: string;
     approved?: boolean;
-    id: string;
     createDate: Date;
     updateDate: Date;
     radioShow: RadioShow;

package/dist/RadioShowPublishRequests.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class RadioShowPublishRequests extends sequelize_1.Model {
     static initModel(sequelize) {
         return RadioShowPublishRequests.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             radioShowId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -42,12 +48,6 @@ class RadioShowPublishRequests extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.BOOLEAN,
                 allowNull: true
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/State.d.ts

@@ -4,15 +4,15 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './PlatformUserPlaylistTrack';
 export interface StateAttributes {
-    description: string;
     id: number;
+    description: string;
 }
 export type StatePk = "id";
 export type StateId = State[StatePk];
 export type StateCreationAttributes = StateAttributes;
 export declare class State extends Model<StateAttributes, StateCreationAttributes> implements StateAttributes {
-    description: string;
     id: number;
+    description: string;
     appUsers: AppUser[];
     getAppUsers: Sequelize.HasManyGetAssociationsMixin<AppUser>;
     setAppUsers: Sequelize.HasManySetAssociationsMixin<AppUser, AppUserId>;

package/dist/State.js

@@ -5,16 +5,16 @@ const sequelize_1 = require("sequelize");
 class State extends sequelize_1.Model {
     static initModel(sequelize) {
         return State.init({
-            description: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: false
-            },
             id: {
                 autoIncrement: true,
                 autoIncrementIdentity: true,
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
                 primaryKey: true
+            },
+            description: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: false
             }
         }, {
             sequelize,

package/dist/UnmatchedAlbum.d.ts

@@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 export interface UnmatchedAlbumAttributes {
-    platformAlbumId: string;
     id: string;
+    platformAlbumId: string;
     createDate: Date;
 }
 export type UnmatchedAlbumPk = "id";
@@ -11,8 +11,8 @@ export type UnmatchedAlbumId = UnmatchedAlbum[UnmatchedAlbumPk];
 export type UnmatchedAlbumOptionalAttributes = "id" | "createDate";
 export type UnmatchedAlbumCreationAttributes = Optional<UnmatchedAlbumAttributes, UnmatchedAlbumOptionalAttributes>;
 export declare class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlbumCreationAttributes> implements UnmatchedAlbumAttributes {
-    platformAlbumId: string;
     id: string;
+    platformAlbumId: string;
     createDate: Date;
     platformAlbum: PlatformAlbum;
     getPlatformAlbum: Sequelize.BelongsToGetAssociationMixin<PlatformAlbum>;

package/dist/UnmatchedAlbum.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class UnmatchedAlbum extends sequelize_1.Model {
     static initModel(sequelize) {
         return UnmatchedAlbum.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             platformAlbumId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -38,12 +44,6 @@ class UnmatchedAlbum extends sequelize_1.Model {
                 },
                 field: 'platform_album_id'
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/UnmatchedArtist.d.ts

@@ -2,9 +2,9 @@ import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { Platform, PlatformId } from './Platform';
 export interface UnmatchedArtistAttributes {
+    id: string;
     platformId: number;
     externalArtistId: number;
-    id: string;
     createDate: Date;
     updateDate: Date;
 }
@@ -13,9 +13,9 @@ export type UnmatchedArtistId = UnmatchedArtist[UnmatchedArtistPk];
 export type UnmatchedArtistOptionalAttributes = "id" | "createDate" | "updateDate";
 export type UnmatchedArtistCreationAttributes = Optional<UnmatchedArtistAttributes, UnmatchedArtistOptionalAttributes>;
 export declare class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedArtistCreationAttributes> implements UnmatchedArtistAttributes {
+    id: string;
     platformId: number;
     externalArtistId: number;
-    id: string;
     createDate: Date;
     updateDate: Date;
     platform: Platform;

package/dist/UnmatchedArtist.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class UnmatchedArtist extends sequelize_1.Model {
     static initModel(sequelize) {
         return UnmatchedArtist.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             platformId: {
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
@@ -43,12 +49,6 @@ class UnmatchedArtist extends sequelize_1.Model {
                 allowNull: false,
                 field: 'external_artist_id'
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/UserAbuseReports.d.ts

@@ -8,7 +8,10 @@ import type { RadioShowMedia, RadioShowMediaId } from './RadioShowMedia';
 import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserMessages, UserMessagesId } from './UserMessages';
 export interface UserAbuseReportsAttributes {
+    id: string;
     reporterUserId: string;
+    reportDate: Date;
+    updateDate: Date;
     jukeboxId?: string;
     jukeboxChatMessageId?: string;
     radioShowId?: string;
@@ -17,16 +20,16 @@ export interface UserAbuseReportsAttributes {
     versusThemeTextId?: string;
     commentId?: string;
     directMessageId?: string;
-    id: string;
-    reportDate: Date;
-    updateDate: Date;
 }
 export type UserAbuseReportsPk = "id";
 export type UserAbuseReportsId = UserAbuseReports[UserAbuseReportsPk];
-export type UserAbuseReportsOptionalAttributes = "jukeboxId" | "jukeboxChatMessageId" | "radioShowId" | "radioShowMediaId" | "playlistId" | "versusThemeTextId" | "commentId" | "directMessageId" | "id" | "reportDate" | "updateDate";
+export type UserAbuseReportsOptionalAttributes = "id" | "reportDate" | "updateDate" | "jukeboxId" | "jukeboxChatMessageId" | "radioShowId" | "radioShowMediaId" | "playlistId" | "versusThemeTextId" | "commentId" | "directMessageId";
 export type UserAbuseReportsCreationAttributes = Optional<UserAbuseReportsAttributes, UserAbuseReportsOptionalAttributes>;
 export declare class UserAbuseReports extends Model<UserAbuseReportsAttributes, UserAbuseReportsCreationAttributes> implements UserAbuseReportsAttributes {
+    id: string;
     reporterUserId: string;
+    reportDate: Date;
+    updateDate: Date;
     jukeboxId?: string;
     jukeboxChatMessageId?: string;
     radioShowId?: string;
@@ -35,9 +38,6 @@ export declare class UserAbuseReports extends Model<UserAbuseReportsAttributes,
     versusThemeTextId?: string;
     commentId?: string;
     directMessageId?: string;
-    id: string;
-    reportDate: Date;
-    updateDate: Date;
     reporterUser: AppUser;
     getReporterUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setReporterUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;

package/dist/UserAbuseReports.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class UserAbuseReports extends sequelize_1.Model {
     static initModel(sequelize) {
         return UserAbuseReports.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             reporterUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -38,6 +44,18 @@ class UserAbuseReports extends sequelize_1.Model {
                 },
                 field: 'reporter_user_id'
             },
+            reportDate: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+                field: 'report_date'
+            },
+            updateDate: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+                field: 'update_date'
+            },
             jukeboxId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: true,
@@ -101,24 +119,6 @@ class UserAbuseReports extends sequelize_1.Model {
                     key: 'id'
                 },
                 field: 'direct_message_id'
-            },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
-            reportDate: {
-                type: sequelize_1.DataTypes.DATE,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-                field: 'report_date'
-            },
-            updateDate: {
-                type: sequelize_1.DataTypes.DATE,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-                field: 'update_date'
             }
         }, {
             sequelize,

package/dist/UserAffinity.d.ts

@@ -3,10 +3,10 @@ import { Model, Optional } from 'sequelize';
 import type { AffinityRelationshipType, AffinityRelationshipTypeId } from './AffinityRelationshipType';
 import type { AppUser, AppUserId } from './AppUser';
 export interface UserAffinityAttributes {
+    id: string;
     userId: string;
     affinityRelationshipTypeId: string;
     relatedId: string;
-    id: string;
     createDate?: Date;
     updateDate?: Date;
 }
@@ -15,10 +15,10 @@ export type UserAffinityId = UserAffinity[UserAffinityPk];
 export type UserAffinityOptionalAttributes = "id" | "createDate" | "updateDate";
 export type UserAffinityCreationAttributes = Optional<UserAffinityAttributes, UserAffinityOptionalAttributes>;
 export declare class UserAffinity extends Model<UserAffinityAttributes, UserAffinityCreationAttributes> implements UserAffinityAttributes {
+    id: string;
     userId: string;
     affinityRelationshipTypeId: string;
     relatedId: string;
-    id: string;
     createDate?: Date;
     updateDate?: Date;
     affinityRelationshipType: AffinityRelationshipType;

package/dist/UserAffinity.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class UserAffinity extends sequelize_1.Model {
     static initModel(sequelize) {
         return UserAffinity.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             userId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -55,12 +61,6 @@ class UserAffinity extends sequelize_1.Model {
                 unique: "user_affinity_user_id_affinity_relationship_type_id_related_id_",
                 field: 'related_id'
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: true,

package/dist/UserArtistAffinity.d.ts

@@ -4,11 +4,11 @@ import type { AffinityTier, AffinityTierId } from './AffinityTier';
 import type { AppUser, AppUserId } from './AppUser';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 export interface UserArtistAffinityAttributes {
+    id: string;
     userId: string;
     canonArtistId: string;
     affinityTierId: number;
     rank: number;
-    id: string;
     createdAt: Date;
     updatedAt: Date;
 }
@@ -17,11 +17,11 @@ export type UserArtistAffinityId = UserArtistAffinity[UserArtistAffinityPk];
 export type UserArtistAffinityOptionalAttributes = "id" | "createdAt" | "updatedAt";
 export type UserArtistAffinityCreationAttributes = Optional<UserArtistAffinityAttributes, UserArtistAffinityOptionalAttributes>;
 export declare class UserArtistAffinity extends Model<UserArtistAffinityAttributes, UserArtistAffinityCreationAttributes> implements UserArtistAffinityAttributes {
+    id: string;
     userId: string;
     canonArtistId: string;
     affinityTierId: number;
     rank: number;
-    id: string;
     createdAt: Date;
     updatedAt: Date;
     affinityTier: AffinityTier;

package/dist/UserArtistAffinity.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class UserArtistAffinity extends sequelize_1.Model {
     static initModel(sequelize) {
         return UserArtistAffinity.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             userId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -62,12 +68,6 @@ class UserArtistAffinity extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
             createdAt: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/UserBookmarks.d.ts

@@ -7,28 +7,28 @@ import type { NewsArticle, NewsArticleId } from './NewsArticle';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { RadioShow, RadioShowId } from './RadioShow';
 export interface UserBookmarksAttributes {
+    id: string;
     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 UserBookmarksOptionalAttributes = "id" | "jukeboxId" | "playlistId" | "radioShowId" | "merchItemId" | "newsArticleId" | "createDate" | "updateDate";
 export type UserBookmarksCreationAttributes = Optional<UserBookmarksAttributes, UserBookmarksOptionalAttributes>;
 export declare class UserBookmarks extends Model<UserBookmarksAttributes, UserBookmarksCreationAttributes> implements UserBookmarksAttributes {
+    id: string;
     appUserId: string;
     jukeboxId?: string;
     playlistId?: string;
     radioShowId?: string;
     merchItemId?: string;
     newsArticleId?: string;
-    id: string;
     createDate: Date;
     updateDate: Date;
     appUser: AppUser;

package/dist/UserBookmarks.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class UserBookmarks extends sequelize_1.Model {
     static initModel(sequelize) {
         return UserBookmarks.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             appUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -83,12 +89,6 @@ class UserBookmarks extends sequelize_1.Model {
                 },
                 field: 'news_article_id'
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,

package/dist/UserComments.d.ts

@@ -8,12 +8,12 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 import type { RadioShow, RadioShowId } from './RadioShow';
 import type { UserAbuseReports, UserAbuseReportsId } from './UserAbuseReports';
 export interface UserCommentsAttributes {
+    id: string;
     appUserId: string;
     jukeboxId?: string;
     playlistId?: string;
     radioShowId?: string;
     comment: string;
-    id: string;
     replyCommentId?: string;
     deleted: boolean;
     createDate: Date;
@@ -22,20 +22,20 @@ export interface UserCommentsAttributes {
     moderationScore?: number;
     moderationLevel?: string;
     strippedUrls?: object;
-    newsArticleId?: string;
     merchItemId?: string;
+    newsArticleId?: string;
 }
 export type UserCommentsPk = "id";
 export type UserCommentsId = UserComments[UserCommentsPk];
-export type UserCommentsOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "replyCommentId" | "createDate" | "updateDate" | "modifiedComment" | "moderationScore" | "moderationLevel" | "strippedUrls" | "newsArticleId" | "merchItemId";
+export type UserCommentsOptionalAttributes = "id" | "jukeboxId" | "playlistId" | "radioShowId" | "replyCommentId" | "createDate" | "updateDate" | "modifiedComment" | "moderationScore" | "moderationLevel" | "strippedUrls" | "merchItemId" | "newsArticleId";
 export type UserCommentsCreationAttributes = Optional<UserCommentsAttributes, UserCommentsOptionalAttributes>;
 export declare class UserComments extends Model<UserCommentsAttributes, UserCommentsCreationAttributes> implements UserCommentsAttributes {
+    id: string;
     appUserId: string;
     jukeboxId?: string;
     playlistId?: string;
     radioShowId?: string;
     comment: string;
-    id: string;
     replyCommentId?: string;
     deleted: boolean;
     createDate: Date;
@@ -44,8 +44,8 @@ export declare class UserComments extends Model<UserCommentsAttributes, UserComm
     moderationScore?: number;
     moderationLevel?: string;
     strippedUrls?: object;
-    newsArticleId?: string;
     merchItemId?: string;
+    newsArticleId?: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;

package/dist/UserComments.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class UserComments extends sequelize_1.Model {
     static initModel(sequelize) {
         return UserComments.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             appUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -69,12 +75,6 @@ class UserComments extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.STRING(1000),
                 allowNull: false
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
             replyCommentId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: true,
@@ -121,23 +121,23 @@ class UserComments extends sequelize_1.Model {
                 allowNull: true,
                 field: 'stripped_urls'
             },
-            newsArticleId: {
+            merchItemId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: true,
                 references: {
-                    model: 'news_article',
+                    model: 'merch_item',
                     key: 'id'
                 },
-                field: 'news_article_id'
+                field: 'merch_item_id'
             },
-            merchItemId: {
+            newsArticleId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: true,
                 references: {
-                    model: 'merch_item',
+                    model: 'news_article',
                     key: 'id'
                 },
-                field: 'merch_item_id'
+                field: 'news_article_id'
             }
         }, {
             sequelize,