@earbug/db-models 0.0.60 → 0.0.63

package/models/UserLikes.ts

@@ -8,11 +8,11 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 import type { RadioShow, RadioShowId } from './RadioShow';
 
 export interface UserLikesAttributes {
+  id: string;
   appUserId: string;
   jukeboxId?: string;
   playlistId?: string;
   radioShowId?: string;
-  id: string;
   createDate: Date;
   updateDate: Date;
   merchItemId?: string;
@@ -21,15 +21,15 @@ export interface UserLikesAttributes {
 
 export type UserLikesPk = "id";
 export type UserLikesId = UserLikes[UserLikesPk];
-export type UserLikesOptionalAttributes = "jukeboxId" | "playlistId" | "radioShowId" | "id" | "createDate" | "updateDate" | "merchItemId" | "newsArticleId";
+export type UserLikesOptionalAttributes = "id" | "jukeboxId" | "playlistId" | "radioShowId" | "createDate" | "updateDate" | "merchItemId" | "newsArticleId";
 export type UserLikesCreationAttributes = Optional<UserLikesAttributes, UserLikesOptionalAttributes>;
 
 export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttributes> implements UserLikesAttributes {
+  id!: string;
   appUserId!: string;
   jukeboxId?: string;
   playlistId?: string;
   radioShowId?: string;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
   merchItemId?: string;
@@ -68,6 +68,12 @@ export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttri
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserLikes {
     return UserLikes.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -104,12 +110,6 @@ export class UserLikes extends Model<UserLikesAttributes, UserLikesCreationAttri
       },
       field: 'radio_show_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UserMessages.ts

@@ -4,34 +4,34 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { UserAbuseReports, UserAbuseReportsId } from './UserAbuseReports';
 
 export interface UserMessagesAttributes {
+  id: string;
   senderId: string;
   recipientId: string;
   message: string;
-  replyMessageId?: string;
-  id: string;
   hasBeenRead: boolean;
   hasBeenEdited: boolean;
   hasDeletedBySender: boolean;
   hasDeletedByReceiver: boolean;
+  replyMessageId?: string;
   createDate: Date;
   updateDate: Date;
 }
 
 export type UserMessagesPk = "id";
 export type UserMessagesId = UserMessages[UserMessagesPk];
-export type UserMessagesOptionalAttributes = "replyMessageId" | "id" | "createDate" | "updateDate";
+export type UserMessagesOptionalAttributes = "id" | "replyMessageId" | "createDate" | "updateDate";
 export type UserMessagesCreationAttributes = Optional<UserMessagesAttributes, UserMessagesOptionalAttributes>;
 
 export class UserMessages extends Model<UserMessagesAttributes, UserMessagesCreationAttributes> implements UserMessagesAttributes {
+  id!: string;
   senderId!: string;
   recipientId!: string;
   message!: string;
-  replyMessageId?: string;
-  id!: string;
   hasBeenRead!: boolean;
   hasBeenEdited!: boolean;
   hasDeletedBySender!: boolean;
   hasDeletedByReceiver!: boolean;
+  replyMessageId?: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -65,6 +65,12 @@ export class UserMessages extends Model<UserMessagesAttributes, UserMessagesCrea
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserMessages {
     return UserMessages.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     senderId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -87,21 +93,6 @@ export class UserMessages extends Model<UserMessagesAttributes, UserMessagesCrea
       type: DataTypes.STRING(1000),
       allowNull: false
     },
-    replyMessageId: {
-      type: DataTypes.UUID,
-      allowNull: true,
-      references: {
-        model: 'user_messages',
-        key: 'id'
-      },
-      field: 'reply_message_id'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     hasBeenRead: {
       type: DataTypes.BOOLEAN,
       allowNull: false,
@@ -126,6 +117,15 @@ export class UserMessages extends Model<UserMessagesAttributes, UserMessagesCrea
       defaultValue: false,
       field: 'has_deleted_by_receiver'
     },
+    replyMessageId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'user_messages',
+        key: 'id'
+      },
+      field: 'reply_message_id'
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/Versus.ts

@@ -22,6 +22,7 @@ import type { VersusVote, VersusVoteId } from './VersusVote';
 import type { VersusVotingMode, VersusVotingModeId } from './VersusVotingMode';
 
 export interface VersusAttributes {
+  id: string;
   versusQuestionId: string;
   canonTrackId?: string;
   platformTrackId?: string;
@@ -40,9 +41,8 @@ export interface VersusAttributes {
   startsAt?: Date;
   endsAt?: Date;
   creatorUserId: string;
-  publishedAt?: Date;
-  id: string;
   publishRequested: boolean;
+  publishedAt?: Date;
   deleted: boolean;
   createdAt: Date;
   updatedAt: Date;
@@ -50,10 +50,11 @@ export interface VersusAttributes {
 
 export type VersusPk = "id";
 export type VersusId = Versus[VersusPk];
-export type VersusOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "canonGenreId" | "themeText" | "versusEndVoteThresholdId" | "versusEndTimerDurationId" | "startsAt" | "endsAt" | "publishedAt" | "id" | "createdAt" | "updatedAt";
+export type VersusOptionalAttributes = "id" | "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "canonGenreId" | "themeText" | "versusEndVoteThresholdId" | "versusEndTimerDurationId" | "startsAt" | "endsAt" | "publishedAt" | "createdAt" | "updatedAt";
 export type VersusCreationAttributes = Optional<VersusAttributes, VersusOptionalAttributes>;
 
 export class Versus extends Model<VersusAttributes, VersusCreationAttributes> implements VersusAttributes {
+  id!: string;
   versusQuestionId!: string;
   canonTrackId?: string;
   platformTrackId?: string;
@@ -72,9 +73,8 @@ export class Versus extends Model<VersusAttributes, VersusCreationAttributes> im
   startsAt?: Date;
   endsAt?: Date;
   creatorUserId!: string;
-  publishedAt?: Date;
-  id!: string;
   publishRequested!: boolean;
+  publishedAt?: Date;
   deleted!: boolean;
   createdAt!: Date;
   updatedAt!: Date;
@@ -217,6 +217,12 @@ export class Versus extends Model<VersusAttributes, VersusCreationAttributes> im
 
   static initModel(sequelize: Sequelize.Sequelize): typeof Versus {
     return Versus.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     versusQuestionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -367,23 +373,17 @@ export class Versus extends Model<VersusAttributes, VersusCreationAttributes> im
       },
       field: 'creator_user_id'
     },
-    publishedAt: {
-      type: DataTypes.DATE,
-      allowNull: true,
-      field: 'published_at'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     publishRequested: {
       type: DataTypes.BOOLEAN,
       allowNull: false,
       defaultValue: false,
       field: 'publish_requested'
     },
+    publishedAt: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'published_at'
+    },
     deleted: {
       type: DataTypes.BOOLEAN,
       allowNull: false,

package/models/VersusCoCreator.ts

@@ -4,11 +4,11 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { Versus, VersusId } from './Versus';
 
 export interface VersusCoCreatorAttributes {
-  versusId: string;
   id: string;
+  versusId: string;
+  appUserId: string;
   createdAt: Date;
   updatedAt: Date;
-  appUserId: string;
 }
 
 export type VersusCoCreatorPk = "id";
@@ -17,11 +17,11 @@ export type VersusCoCreatorOptionalAttributes = "id" | "createdAt" | "updatedAt"
 export type VersusCoCreatorCreationAttributes = Optional<VersusCoCreatorAttributes, VersusCoCreatorOptionalAttributes>;
 
 export class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCreatorCreationAttributes> implements VersusCoCreatorAttributes {
-  versusId!: string;
   id!: string;
+  versusId!: string;
+  appUserId!: string;
   createdAt!: Date;
   updatedAt!: Date;
-  appUserId!: string;
 
   // VersusCoCreator belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -36,6 +36,12 @@ export class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCr
 
   static initModel(sequelize: Sequelize.Sequelize): typeof VersusCoCreator {
     return VersusCoCreator.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     versusId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -45,11 +51,14 @@ export class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCr
       },
       field: 'versus_id'
     },
-    id: {
+    appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
+      references: {
+        model: 'app_user',
+        key: 'id'
+      },
+      field: 'app_user_id'
     },
     createdAt: {
       type: DataTypes.DATE,
@@ -62,15 +71,6 @@ 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,

package/models/VersusOption.ts

@@ -11,6 +11,7 @@ import type { Versus, VersusId } from './Versus';
 import type { VersusEntityKind, VersusEntityKindId } from './VersusEntityKind';
 
 export interface VersusOptionAttributes {
+  id: string;
   versusId: string;
   entityKindId: number;
   sortOrder: number;
@@ -22,7 +23,6 @@ export interface VersusOptionAttributes {
   platformArtistId?: string;
   voteScore?: number;
   resultsScore?: number;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
   deleted: boolean;
@@ -31,10 +31,11 @@ export interface VersusOptionAttributes {
 
 export type VersusOptionPk = "id";
 export type VersusOptionId = VersusOption[VersusOptionPk];
-export type VersusOptionOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "id" | "createdAt" | "updatedAt" | "appUserId";
+export type VersusOptionOptionalAttributes = "id" | "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "createdAt" | "updatedAt" | "appUserId";
 export type VersusOptionCreationAttributes = Optional<VersusOptionAttributes, VersusOptionOptionalAttributes>;
 
 export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCreationAttributes> implements VersusOptionAttributes {
+  id!: string;
   versusId!: string;
   entityKindId!: number;
   sortOrder!: number;
@@ -46,7 +47,6 @@ export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCrea
   platformArtistId?: string;
   voteScore?: number;
   resultsScore?: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
   deleted!: boolean;
@@ -100,6 +100,12 @@ export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCrea
 
   static initModel(sequelize: Sequelize.Sequelize): typeof VersusOption {
     return VersusOption.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     versusId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -187,12 +193,6 @@ export class VersusOption extends Model<VersusOptionAttributes, VersusOptionCrea
       allowNull: true,
       field: 'results_score'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/VersusPublishIssue.ts

@@ -7,29 +7,29 @@ import type { Versus, VersusId } from './Versus';
 import type { VersusEntityKind, VersusEntityKindId } from './VersusEntityKind';
 
 export interface VersusPublishIssueAttributes {
+  id: string;
   versusId: string;
   entityKindId: number;
   platformTrackId?: string;
   platformAlbumId?: string;
   platformArtistId?: string;
   detail?: string;
-  id: string;
   createdAt: Date;
 }
 
 export type VersusPublishIssuePk = "id";
 export type VersusPublishIssueId = VersusPublishIssue[VersusPublishIssuePk];
-export type VersusPublishIssueOptionalAttributes = "platformTrackId" | "platformAlbumId" | "platformArtistId" | "detail" | "id" | "createdAt";
+export type VersusPublishIssueOptionalAttributes = "id" | "platformTrackId" | "platformAlbumId" | "platformArtistId" | "detail" | "createdAt";
 export type VersusPublishIssueCreationAttributes = Optional<VersusPublishIssueAttributes, VersusPublishIssueOptionalAttributes>;
 
 export class VersusPublishIssue extends Model<VersusPublishIssueAttributes, VersusPublishIssueCreationAttributes> implements VersusPublishIssueAttributes {
+  id!: string;
   versusId!: string;
   entityKindId!: number;
   platformTrackId?: string;
   platformAlbumId?: string;
   platformArtistId?: string;
   detail?: string;
-  id!: string;
   createdAt!: Date;
 
   // VersusPublishIssue belongsTo PlatformAlbum via platformAlbumId
@@ -60,6 +60,12 @@ export class VersusPublishIssue extends Model<VersusPublishIssueAttributes, Vers
 
   static initModel(sequelize: Sequelize.Sequelize): typeof VersusPublishIssue {
     return VersusPublishIssue.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     versusId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -109,12 +115,6 @@ export class VersusPublishIssue extends Model<VersusPublishIssueAttributes, Vers
       type: DataTypes.TEXT,
       allowNull: true
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/VersusQuestion.ts

@@ -5,10 +5,10 @@ import type { VersusQuestionVariableType, VersusQuestionVariableTypeId } from '.
 import type { VersusVotingListType, VersusVotingListTypeId } from './VersusVotingListType';
 
 export interface VersusQuestionAttributes {
+  id: string;
   questionTemplate: string;
   questionVariableTypeId: number;
   votingListTypeId: number;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -19,10 +19,10 @@ export type VersusQuestionOptionalAttributes = "id" | "createdAt" | "updatedAt";
 export type VersusQuestionCreationAttributes = Optional<VersusQuestionAttributes, VersusQuestionOptionalAttributes>;
 
 export class VersusQuestion extends Model<VersusQuestionAttributes, VersusQuestionCreationAttributes> implements VersusQuestionAttributes {
+  id!: string;
   questionTemplate!: string;
   questionVariableTypeId!: number;
   votingListTypeId!: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -51,6 +51,12 @@ export class VersusQuestion extends Model<VersusQuestionAttributes, VersusQuesti
 
   static initModel(sequelize: Sequelize.Sequelize): typeof VersusQuestion {
     return VersusQuestion.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     questionTemplate: {
       type: DataTypes.TEXT,
       allowNull: false,
@@ -74,12 +80,6 @@ export class VersusQuestion extends Model<VersusQuestionAttributes, VersusQuesti
       },
       field: 'voting_list_type_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/VersusVote.ts

@@ -4,9 +4,9 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { Versus, VersusId } from './Versus';
 
 export interface VersusVoteAttributes {
+  id: string;
   versusId: string;
   appUserId: string;
-  id: string;
   createdAt: Date;
 }
 
@@ -16,9 +16,9 @@ export type VersusVoteOptionalAttributes = "id" | "createdAt";
 export type VersusVoteCreationAttributes = Optional<VersusVoteAttributes, VersusVoteOptionalAttributes>;
 
 export class VersusVote extends Model<VersusVoteAttributes, VersusVoteCreationAttributes> implements VersusVoteAttributes {
+  id!: string;
   versusId!: string;
   appUserId!: string;
-  id!: string;
   createdAt!: Date;
 
   // VersusVote belongsTo AppUser via appUserId
@@ -34,6 +34,12 @@ export class VersusVote extends Model<VersusVoteAttributes, VersusVoteCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof VersusVote {
     return VersusVote.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     versusId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -54,12 +60,6 @@ export class VersusVote extends Model<VersusVoteAttributes, VersusVoteCreationAt
       unique: "uq_versus_vote_versus_app_user",
       field: 'app_user_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,