@earbug/db-models 0.0.60 → 0.0.63

package/models/State.ts

@@ -5,8 +5,8 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './PlatformUserPlaylistTrack';
 
 export interface StateAttributes {
-  description: string;
   id: number;
+  description: string;
 }
 
 export type StatePk = "id";
@@ -14,8 +14,8 @@ export type StateId = State[StatePk];
 export type StateCreationAttributes = StateAttributes;
 
 export class State extends Model<StateAttributes, StateCreationAttributes> implements StateAttributes {
-  description!: string;
   id!: number;
+  description!: string;
 
   // State hasMany AppUser via stateId
   appUsers!: AppUser[];
@@ -56,16 +56,16 @@ export class State extends Model<StateAttributes, StateCreationAttributes> imple
 
   static initModel(sequelize: Sequelize.Sequelize): typeof State {
     return State.init({
-    description: {
-      type: DataTypes.TEXT,
-      allowNull: false
-    },
     id: {
       autoIncrement: true,
       autoIncrementIdentity: true,
       type: DataTypes.SMALLINT,
       allowNull: false,
       primaryKey: true
+    },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: false
     }
   }, {
     sequelize,

package/models/UnmatchedAlbum.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 
 export interface UnmatchedAlbumAttributes {
-  platformAlbumId: string;
   id: string;
+  platformAlbumId: string;
   createDate: Date;
 }
 
@@ -14,8 +14,8 @@ export type UnmatchedAlbumOptionalAttributes = "id" | "createDate";
 export type UnmatchedAlbumCreationAttributes = Optional<UnmatchedAlbumAttributes, UnmatchedAlbumOptionalAttributes>;
 
 export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlbumCreationAttributes> implements UnmatchedAlbumAttributes {
-  platformAlbumId!: string;
   id!: string;
+  platformAlbumId!: string;
   createDate!: Date;
 
   // UnmatchedAlbum belongsTo PlatformAlbum via platformAlbumId
@@ -26,6 +26,12 @@ export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlb
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UnmatchedAlbum {
     return UnmatchedAlbum.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     platformAlbumId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -35,12 +41,6 @@ export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlb
       },
       field: 'platform_album_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UnmatchedArtist.ts

@@ -3,9 +3,9 @@ import { DataTypes, 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;
 }
@@ -16,9 +16,9 @@ export type UnmatchedArtistOptionalAttributes = "id" | "createDate" | "updateDat
 export type UnmatchedArtistCreationAttributes = Optional<UnmatchedArtistAttributes, UnmatchedArtistOptionalAttributes>;
 
 export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedArtistCreationAttributes> implements UnmatchedArtistAttributes {
+  id!: string;
   platformId!: number;
   externalArtistId!: number;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -30,6 +30,12 @@ export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedA
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UnmatchedArtist {
     return UnmatchedArtist.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     platformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -44,12 +50,6 @@ export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedA
       allowNull: false,
       field: 'external_artist_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UserAbuseReports.ts

@@ -9,7 +9,10 @@ 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;
@@ -18,18 +21,18 @@ 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 class UserAbuseReports extends Model<UserAbuseReportsAttributes, UserAbuseReportsCreationAttributes> implements UserAbuseReportsAttributes {
+  id!: string;
   reporterUserId!: string;
+  reportDate!: Date;
+  updateDate!: Date;
   jukeboxId?: string;
   jukeboxChatMessageId?: string;
   radioShowId?: string;
@@ -38,9 +41,6 @@ export class UserAbuseReports extends Model<UserAbuseReportsAttributes, UserAbus
   versusThemeTextId?: string;
   commentId?: string;
   directMessageId?: string;
-  id!: string;
-  reportDate!: Date;
-  updateDate!: Date;
 
   // UserAbuseReports belongsTo AppUser via reporterUserId
   reporterUser!: AppUser;
@@ -80,6 +80,12 @@ export class UserAbuseReports extends Model<UserAbuseReportsAttributes, UserAbus
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserAbuseReports {
     return UserAbuseReports.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     reporterUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -89,6 +95,18 @@ export class UserAbuseReports extends Model<UserAbuseReportsAttributes, UserAbus
       },
       field: 'reporter_user_id'
     },
+    reportDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'report_date'
+    },
+    updateDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'update_date'
+    },
     jukeboxId: {
       type: DataTypes.UUID,
       allowNull: true,
@@ -152,24 +170,6 @@ export class UserAbuseReports extends Model<UserAbuseReportsAttributes, UserAbus
         key: 'id'
       },
       field: 'direct_message_id'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    reportDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'report_date'
-    },
-    updateDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'update_date'
     }
   }, {
     sequelize,

package/models/UserAffinity.ts

@@ -4,10 +4,10 @@ import type { AffinityRelationshipType, AffinityRelationshipTypeId } from './Aff
 import type { AppUser, AppUserId } from './AppUser';
 
 export interface UserAffinityAttributes {
+  id: string;
   userId: string;
   affinityRelationshipTypeId: string;
   relatedId: string;
-  id: string;
   createDate?: Date;
   updateDate?: Date;
 }
@@ -18,10 +18,10 @@ export type UserAffinityOptionalAttributes = "id" | "createDate" | "updateDate";
 export type UserAffinityCreationAttributes = Optional<UserAffinityAttributes, UserAffinityOptionalAttributes>;
 
 export class UserAffinity extends Model<UserAffinityAttributes, UserAffinityCreationAttributes> implements UserAffinityAttributes {
+  id!: string;
   userId!: string;
   affinityRelationshipTypeId!: string;
   relatedId!: string;
-  id!: string;
   createDate?: Date;
   updateDate?: Date;
 
@@ -38,6 +38,12 @@ export class UserAffinity extends Model<UserAffinityAttributes, UserAffinityCrea
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserAffinity {
     return UserAffinity.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     userId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -64,12 +70,6 @@ export class UserAffinity extends Model<UserAffinityAttributes, UserAffinityCrea
       unique: "user_affinity_user_id_affinity_relationship_type_id_related_id_",
       field: 'related_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: true,

package/models/UserArtistAffinity.ts

@@ -5,11 +5,11 @@ 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;
 }
@@ -20,11 +20,11 @@ export type UserArtistAffinityOptionalAttributes = "id" | "createdAt" | "updated
 export type UserArtistAffinityCreationAttributes = Optional<UserArtistAffinityAttributes, UserArtistAffinityOptionalAttributes>;
 
 export class UserArtistAffinity extends Model<UserArtistAffinityAttributes, UserArtistAffinityCreationAttributes> implements UserArtistAffinityAttributes {
+  id!: string;
   userId!: string;
   canonArtistId!: string;
   affinityTierId!: number;
   rank!: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -46,6 +46,12 @@ export class UserArtistAffinity extends Model<UserArtistAffinityAttributes, User
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserArtistAffinity {
     return UserArtistAffinity.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     userId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -79,12 +85,6 @@ export class UserArtistAffinity extends Model<UserArtistAffinityAttributes, User
       type: DataTypes.INTEGER,
       allowNull: false
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UserBookmarks.ts

@@ -8,30 +8,30 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 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 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;
 
@@ -68,6 +68,12 @@ export class UserBookmarks extends Model<UserBookmarksAttributes, UserBookmarksC
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserBookmarks {
     return UserBookmarks.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -122,12 +128,6 @@ export class UserBookmarks extends Model<UserBookmarksAttributes, UserBookmarksC
       },
       field: 'news_article_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UserComments.ts

@@ -9,12 +9,12 @@ 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;
@@ -23,22 +23,22 @@ 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 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;
@@ -47,8 +47,8 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
   moderationScore?: number;
   moderationLevel?: string;
   strippedUrls?: object;
-  newsArticleId?: string;
   merchItemId?: string;
+  newsArticleId?: string;
 
   // UserComments belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -100,6 +100,12 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserComments {
     return UserComments.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -140,12 +146,6 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
       type: DataTypes.STRING(1000),
       allowNull: false
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     replyCommentId: {
       type: DataTypes.UUID,
       allowNull: true,
@@ -192,23 +192,23 @@ export class UserComments extends Model<UserCommentsAttributes, UserCommentsCrea
       allowNull: true,
       field: 'stripped_urls'
     },
-    newsArticleId: {
+    merchItemId: {
       type: DataTypes.UUID,
       allowNull: true,
       references: {
-        model: 'news_article',
+        model: 'merch_item',
         key: 'id'
       },
-      field: 'news_article_id'
+      field: 'merch_item_id'
     },
-    merchItemId: {
+    newsArticleId: {
       type: DataTypes.UUID,
       allowNull: true,
       references: {
-        model: 'merch_item',
+        model: 'news_article',
         key: 'id'
       },
-      field: 'merch_item_id'
+      field: 'news_article_id'
     }
   }, {
     sequelize,

package/models/UserContacts.ts

@@ -4,6 +4,7 @@ import type { AppUser, AppUserId } from './AppUser';
 
 export interface UserContactsAttributes {
   appUserId: string;
+  contactId: string;
   contactAppUserId?: string;
   firstName?: string;
   lastName?: string;
@@ -17,16 +18,16 @@ export interface UserContactsAttributes {
   contactPhone3?: string;
   contactPhone3Type?: "mobile" | "work" | "home" | "main";
   active?: boolean;
-  contactId: string;
 }
 
 export type UserContactsPk = "contactId";
 export type UserContactsId = UserContacts[UserContactsPk];
-export type UserContactsOptionalAttributes = "contactAppUserId" | "firstName" | "lastName" | "contactEmail1" | "contactEmail2" | "contactEmail3" | "contactPhone1" | "contactPhone1Type" | "contactPhone2" | "contactPhone2Type" | "contactPhone3" | "contactPhone3Type" | "active" | "contactId";
+export type UserContactsOptionalAttributes = "contactId" | "contactAppUserId" | "firstName" | "lastName" | "contactEmail1" | "contactEmail2" | "contactEmail3" | "contactPhone1" | "contactPhone1Type" | "contactPhone2" | "contactPhone2Type" | "contactPhone3" | "contactPhone3Type" | "active";
 export type UserContactsCreationAttributes = Optional<UserContactsAttributes, UserContactsOptionalAttributes>;
 
 export class UserContacts extends Model<UserContactsAttributes, UserContactsCreationAttributes> implements UserContactsAttributes {
   appUserId!: string;
+  contactId!: string;
   contactAppUserId?: string;
   firstName?: string;
   lastName?: string;
@@ -40,7 +41,6 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
   contactPhone3?: string;
   contactPhone3Type?: "mobile" | "work" | "home" | "main";
   active?: boolean;
-  contactId!: string;
 
   // UserContacts belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -59,6 +59,13 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
       },
       field: 'app_user_id'
     },
+    contactId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true,
+      field: 'contact_id'
+    },
     contactAppUserId: {
       type: DataTypes.UUID,
       allowNull: true,
@@ -122,13 +129,6 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
     active: {
       type: DataTypes.BOOLEAN,
       allowNull: true
-    },
-    contactId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true,
-      field: 'contact_id'
     }
   }, {
     sequelize,

package/models/UserEngagementFactor.ts

@@ -4,9 +4,9 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { FeedContentType, FeedContentTypeId } from './FeedContentType';
 
 export interface UserEngagementFactorAttributes {
+  id: string;
   userId: string;
   contentTypeId: string;
-  id: string;
   engagementFactor: number;
   createDate?: Date;
   updateDate?: Date;
@@ -18,9 +18,9 @@ export type UserEngagementFactorOptionalAttributes = "id" | "engagementFactor" |
 export type UserEngagementFactorCreationAttributes = Optional<UserEngagementFactorAttributes, UserEngagementFactorOptionalAttributes>;
 
 export class UserEngagementFactor extends Model<UserEngagementFactorAttributes, UserEngagementFactorCreationAttributes> implements UserEngagementFactorAttributes {
+  id!: string;
   userId!: string;
   contentTypeId!: string;
-  id!: string;
   engagementFactor!: number;
   createDate?: Date;
   updateDate?: Date;
@@ -38,6 +38,12 @@ export class UserEngagementFactor extends Model<UserEngagementFactorAttributes,
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserEngagementFactor {
     return UserEngagementFactor.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     userId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -58,12 +64,6 @@ export class UserEngagementFactor extends Model<UserEngagementFactorAttributes,
       unique: "user_engagement_factor_user_id_content_type_id_unique",
       field: 'content_type_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     engagementFactor: {
       type: DataTypes.DECIMAL,
       allowNull: false,

package/models/UserGenreAffinity.ts

@@ -5,11 +5,11 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { CanonGenre, CanonGenreId } from './CanonGenre';
 
 export interface UserGenreAffinityAttributes {
+  id: string;
   userId: string;
   canonGenreId: string;
   affinityTierId: number;
   rank: number;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -20,11 +20,11 @@ export type UserGenreAffinityOptionalAttributes = "id" | "createdAt" | "updatedA
 export type UserGenreAffinityCreationAttributes = Optional<UserGenreAffinityAttributes, UserGenreAffinityOptionalAttributes>;
 
 export class UserGenreAffinity extends Model<UserGenreAffinityAttributes, UserGenreAffinityCreationAttributes> implements UserGenreAffinityAttributes {
+  id!: string;
   userId!: string;
   canonGenreId!: string;
   affinityTierId!: number;
   rank!: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -46,6 +46,12 @@ export class UserGenreAffinity extends Model<UserGenreAffinityAttributes, UserGe
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UserGenreAffinity {
     return UserGenreAffinity.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     userId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -79,12 +85,6 @@ export class UserGenreAffinity extends Model<UserGenreAffinityAttributes, UserGe
       type: DataTypes.INTEGER,
       allowNull: false
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,