@earbug/db-models 0.0.60 → 0.0.63

package/models/AffinityRelationshipType.ts

@@ -3,10 +3,10 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { UserAffinity, UserAffinityId } from './UserAffinity';
 
 export interface AffinityRelationshipTypeAttributes {
+  id: string;
   name: string;
   category: string;
   tier: string;
-  id: string;
   createDate?: Date;
   updateDate?: Date;
 }
@@ -17,10 +17,10 @@ export type AffinityRelationshipTypeOptionalAttributes = "id" | "createDate" | "
 export type AffinityRelationshipTypeCreationAttributes = Optional<AffinityRelationshipTypeAttributes, AffinityRelationshipTypeOptionalAttributes>;
 
 export class AffinityRelationshipType extends Model<AffinityRelationshipTypeAttributes, AffinityRelationshipTypeCreationAttributes> implements AffinityRelationshipTypeAttributes {
+  id!: string;
   name!: string;
   category!: string;
   tier!: string;
-  id!: string;
   createDate?: Date;
   updateDate?: Date;
 
@@ -39,6 +39,12 @@ export class AffinityRelationshipType extends Model<AffinityRelationshipTypeAttr
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AffinityRelationshipType {
     return AffinityRelationshipType.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     name: {
       type: DataTypes.STRING(50),
       allowNull: false,
@@ -52,12 +58,6 @@ export class AffinityRelationshipType extends Model<AffinityRelationshipTypeAttr
       type: DataTypes.STRING(20),
       allowNull: false
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: true,

package/models/AppUser.ts

@@ -27,9 +27,9 @@ import type { VersusOption, VersusOptionId } from './VersusOption';
 import type { VersusVote, VersusVoteId } from './VersusVote';
 
 export interface AppUserAttributes {
-  firstName: string;
-  email?: string;
   id: string;
+  email?: string;
+  firstName: string;
   createDate: Date;
   updateDate: Date;
   syncContacts?: boolean;
@@ -54,13 +54,13 @@ export interface AppUserAttributes {
 
 export type AppUserPk = "id";
 export type AppUserId = AppUser[AppUserPk];
-export type AppUserOptionalAttributes = "email" | "id" | "createDate" | "updateDate" | "syncContacts" | "stateId" | "lastName" | "autoApproveFollowers" | "lastHarvested" | "lastHarvestedError" | "earbugAccessControlPreference" | "unsubscribeAll" | "unsubscribeBiweeklyEmail" | "unsubscribeFollowingNotifications" | "unsubscribeInterestNotifications" | "unsubscribeFunNotifications" | "hardBounce" | "softBounce1" | "softBounce2" | "softBounce3" | "bio";
+export type AppUserOptionalAttributes = "id" | "email" | "createDate" | "updateDate" | "syncContacts" | "stateId" | "lastName" | "autoApproveFollowers" | "lastHarvested" | "lastHarvestedError" | "earbugAccessControlPreference" | "unsubscribeAll" | "unsubscribeBiweeklyEmail" | "unsubscribeFollowingNotifications" | "unsubscribeInterestNotifications" | "unsubscribeFunNotifications" | "hardBounce" | "softBounce1" | "softBounce2" | "softBounce3" | "bio";
 export type AppUserCreationAttributes = Optional<AppUserAttributes, AppUserOptionalAttributes>;
 
 export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes> implements AppUserAttributes {
-  firstName!: string;
-  email?: string;
   id!: string;
+  email?: string;
+  firstName!: string;
   createDate!: Date;
   updateDate!: Date;
   syncContacts?: boolean;
@@ -419,21 +419,21 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUser {
     return AppUser.init({
-    firstName: {
-      type: DataTypes.TEXT,
+    id: {
+      type: DataTypes.UUID,
       allowNull: false,
-      field: 'first_name'
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
     },
     email: {
       type: DataTypes.TEXT,
       allowNull: true,
       unique: "uk_app_user_email"
     },
-    id: {
-      type: DataTypes.UUID,
+    firstName: {
+      type: DataTypes.TEXT,
       allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
+      field: 'first_name'
     },
     createDate: {
       type: DataTypes.DATE,

package/models/AppUserDevice.ts

@@ -4,10 +4,10 @@ import type { AppUser, AppUserId } from './AppUser';
 
 export interface AppUserDeviceAttributes {
   id: string;
-  createdAt: Date;
   appUserId: string;
   devicePlatformId: number;
   endpointArn: string;
+  createdAt: Date;
   platformApplicationArn?: string;
 }
 
@@ -18,10 +18,10 @@ export type AppUserDeviceCreationAttributes = Optional<AppUserDeviceAttributes,
 
 export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceCreationAttributes> implements AppUserDeviceAttributes {
   id!: string;
-  createdAt!: Date;
   appUserId!: string;
   devicePlatformId!: number;
   endpointArn!: string;
+  createdAt!: Date;
   platformApplicationArn?: string;
 
   // AppUserDevice belongsTo AppUser via appUserId
@@ -38,12 +38,6 @@ export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceC
       defaultValue: DataTypes.UUIDV4,
       primaryKey: true
     },
-    createdAt: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'created_at'
-    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -64,6 +58,12 @@ export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceC
       unique: "unique_app_user_device_endpoint_arn",
       field: 'endpoint_arn'
     },
+    createdAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'created_at'
+    },
     platformApplicationArn: {
       type: DataTypes.TEXT,
       allowNull: true,

package/models/AppUserDeviceClassicBackup20260906.ts

@@ -0,0 +1,66 @@
+import * as Sequelize from 'sequelize';
+import { DataTypes, Model, Optional } from 'sequelize';
+
+export interface AppUserDeviceClassicBackup20260906Attributes {
+  id?: string;
+  appUserId?: string;
+  devicePlatformId?: number;
+  endpointArn?: string;
+  createdAt?: Date;
+  platformApplicationArn?: string;
+}
+
+export type AppUserDeviceClassicBackup20260906Pk = "id";
+export type AppUserDeviceClassicBackup20260906Id = AppUserDeviceClassicBackup20260906[AppUserDeviceClassicBackup20260906Pk];
+export type AppUserDeviceClassicBackup20260906OptionalAttributes = "id" | "appUserId" | "devicePlatformId" | "endpointArn" | "createdAt" | "platformApplicationArn";
+export type AppUserDeviceClassicBackup20260906CreationAttributes = Optional<AppUserDeviceClassicBackup20260906Attributes, AppUserDeviceClassicBackup20260906OptionalAttributes>;
+
+export class AppUserDeviceClassicBackup20260906 extends Model<AppUserDeviceClassicBackup20260906Attributes, AppUserDeviceClassicBackup20260906CreationAttributes> implements AppUserDeviceClassicBackup20260906Attributes {
+  id?: string;
+  appUserId?: string;
+  devicePlatformId?: number;
+  endpointArn?: string;
+  createdAt?: Date;
+  platformApplicationArn?: string;
+
+
+  static initModel(sequelize: Sequelize.Sequelize): typeof AppUserDeviceClassicBackup20260906 {
+    return AppUserDeviceClassicBackup20260906.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      primaryKey: true
+    },
+    appUserId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      field: 'app_user_id'
+    },
+    devicePlatformId: {
+      type: DataTypes.SMALLINT,
+      allowNull: true,
+      field: 'device_platform_id'
+    },
+    endpointArn: {
+      type: DataTypes.TEXT,
+      allowNull: true,
+      field: 'endpoint_arn'
+    },
+    createdAt: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'created_at'
+    },
+    platformApplicationArn: {
+      type: DataTypes.TEXT,
+      allowNull: true,
+      field: 'platform_application_arn'
+    }
+  }, {
+    sequelize,
+    tableName: 'app_user_device_classic_backup_20260906',
+    schema: 'eb',
+    timestamps: false
+  });
+  }
+}

package/models/AppUserFollowRelation.ts

@@ -3,28 +3,28 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { AppUser, AppUserId } from './AppUser';
 
 export interface AppUserFollowRelationAttributes {
+  id: string;
   appUserId: string;
   followingAppUserId: string;
   stateId: number;
   isBlocked: boolean;
   createdAt: Date;
   updatedAt: Date;
-  id: string;
 }
 
 export type AppUserFollowRelationPk = "id";
 export type AppUserFollowRelationId = AppUserFollowRelation[AppUserFollowRelationPk];
-export type AppUserFollowRelationOptionalAttributes = "stateId" | "createdAt" | "updatedAt" | "id";
+export type AppUserFollowRelationOptionalAttributes = "id" | "stateId" | "createdAt" | "updatedAt";
 export type AppUserFollowRelationCreationAttributes = Optional<AppUserFollowRelationAttributes, AppUserFollowRelationOptionalAttributes>;
 
 export class AppUserFollowRelation extends Model<AppUserFollowRelationAttributes, AppUserFollowRelationCreationAttributes> implements AppUserFollowRelationAttributes {
+  id!: string;
   appUserId!: string;
   followingAppUserId!: string;
   stateId!: number;
   isBlocked!: boolean;
   createdAt!: Date;
   updatedAt!: Date;
-  id!: string;
 
   // AppUserFollowRelation belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -39,6 +39,12 @@ export class AppUserFollowRelation extends Model<AppUserFollowRelationAttributes
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUserFollowRelation {
     return AppUserFollowRelation.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -82,12 +88,6 @@ export class AppUserFollowRelation extends Model<AppUserFollowRelationAttributes
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
     }
   }, {
     sequelize,

package/models/AppUserPlatformRelation.ts

@@ -4,36 +4,36 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { Platform, PlatformId } from './Platform';
 
 export interface AppUserPlatformRelationAttributes {
+  id: string;
   appUserId: string;
   platformId: number;
-  externalUserId: string;
-  accessToken: string;
-  refreshToken?: string;
-  expirationDate: Date;
-  countryCode: string;
-  id: string;
+  externalUserId?: string;
   createDate: Date;
   updateDate: Date;
+  accessToken?: string;
+  refreshToken?: string;
+  expirationDate: Date;
   stateId: number;
+  countryCode: string;
 }
 
 export type AppUserPlatformRelationPk = "id";
 export type AppUserPlatformRelationId = AppUserPlatformRelation[AppUserPlatformRelationPk];
-export type AppUserPlatformRelationOptionalAttributes = "refreshToken" | "id" | "createDate" | "updateDate" | "stateId";
+export type AppUserPlatformRelationOptionalAttributes = "id" | "externalUserId" | "createDate" | "updateDate" | "accessToken" | "refreshToken" | "stateId";
 export type AppUserPlatformRelationCreationAttributes = Optional<AppUserPlatformRelationAttributes, AppUserPlatformRelationOptionalAttributes>;
 
 export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttributes, AppUserPlatformRelationCreationAttributes> implements AppUserPlatformRelationAttributes {
+  id!: string;
   appUserId!: string;
   platformId!: number;
-  externalUserId!: string;
-  accessToken!: string;
-  refreshToken?: string;
-  expirationDate!: Date;
-  countryCode!: string;
-  id!: string;
+  externalUserId?: string;
   createDate!: Date;
   updateDate!: Date;
+  accessToken?: string;
+  refreshToken?: string;
+  expirationDate!: Date;
   stateId!: number;
+  countryCode!: string;
 
   // AppUserPlatformRelation belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -48,6 +48,12 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUserPlatformRelation {
     return AppUserPlatformRelation.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -69,12 +75,24 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
     },
     externalUserId: {
       type: DataTypes.TEXT,
-      allowNull: false,
+      allowNull: true,
       field: 'external_user_id'
     },
+    createDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'create_date'
+    },
+    updateDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'update_date'
+    },
     accessToken: {
       type: DataTypes.STRING,
-      allowNull: false,
+      allowNull: true,
       field: 'access_token'
     },
     refreshToken: {
@@ -87,34 +105,16 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
       allowNull: false,
       field: 'expiration_date'
     },
-    countryCode: {
-      type: DataTypes.STRING(2),
-      allowNull: false,
-      field: 'country_code'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
-    createDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'create_date'
-    },
-    updateDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'update_date'
-    },
     stateId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
       defaultValue: 0,
       field: 'state_id'
+    },
+    countryCode: {
+      type: DataTypes.STRING(2),
+      allowNull: false,
+      field: 'country_code'
     }
   }, {
     sequelize,

package/models/CanonAlbum.ts

@@ -10,36 +10,36 @@ import type { Versus, VersusId } from './Versus';
 import type { VersusOption, VersusOptionId } from './VersusOption';
 
 export interface CanonAlbumAttributes {
+  id: string;
   name: string;
   asciiName: string;
   releaseDate?: string;
   noOfDisc?: number;
-  description?: string;
-  id: string;
   createDate: Date;
   updateDate: Date;
   hasPhoto?: boolean;
   hasThumbnailPhoto?: boolean;
+  description?: string;
   images?: object;
   lastImageHarvestAttempt?: Date;
 }
 
 export type CanonAlbumPk = "id";
 export type CanonAlbumId = CanonAlbum[CanonAlbumPk];
-export type CanonAlbumOptionalAttributes = "releaseDate" | "noOfDisc" | "description" | "id" | "createDate" | "updateDate" | "hasPhoto" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt";
+export type CanonAlbumOptionalAttributes = "id" | "releaseDate" | "noOfDisc" | "createDate" | "updateDate" | "hasPhoto" | "hasThumbnailPhoto" | "description" | "images" | "lastImageHarvestAttempt";
 export type CanonAlbumCreationAttributes = Optional<CanonAlbumAttributes, CanonAlbumOptionalAttributes>;
 
 export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAttributes> implements CanonAlbumAttributes {
+  id!: string;
   name!: string;
   asciiName!: string;
   releaseDate?: string;
   noOfDisc?: number;
-  description?: string;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
   hasPhoto?: boolean;
   hasThumbnailPhoto?: boolean;
+  description?: string;
   images?: object;
   lastImageHarvestAttempt?: Date;
 
@@ -142,6 +142,12 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbum {
     return CanonAlbum.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -161,16 +167,6 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
       allowNull: true,
       field: 'no_of_disc'
     },
-    description: {
-      type: DataTypes.TEXT,
-      allowNull: true
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -195,6 +191,10 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
       defaultValue: false,
       field: 'has_thumbnail_photo'
     },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
     images: {
       type: DataTypes.JSONB,
       allowNull: true

package/models/CanonArtist.ts

@@ -16,10 +16,10 @@ import type { Versus, VersusId } from './Versus';
 import type { VersusOption, VersusOptionId } from './VersusOption';
 
 export interface CanonArtistAttributes {
+  id: string;
   name: string;
   asciiName: string;
   description?: string;
-  id: string;
   hasPhoto: boolean;
   createDate: Date;
   updateDate: Date;
@@ -28,22 +28,22 @@ export interface CanonArtistAttributes {
   lastImageHarvestAttempt?: Date;
   merchHarvestDay?: number;
   newsHarvestDay?: number;
+  popularityRank?: number;
   lastGenreHarvestAttempt?: Date;
   genreHarvestCount: number;
-  popularityRank?: number;
   popularityScore: number;
 }
 
 export type CanonArtistPk = "id";
 export type CanonArtistId = CanonArtist[CanonArtistPk];
-export type CanonArtistOptionalAttributes = "description" | "id" | "createDate" | "updateDate" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt" | "merchHarvestDay" | "newsHarvestDay" | "lastGenreHarvestAttempt" | "genreHarvestCount" | "popularityRank" | "popularityScore";
+export type CanonArtistOptionalAttributes = "id" | "description" | "createDate" | "updateDate" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt" | "merchHarvestDay" | "newsHarvestDay" | "popularityRank" | "lastGenreHarvestAttempt" | "genreHarvestCount" | "popularityScore";
 export type CanonArtistCreationAttributes = Optional<CanonArtistAttributes, CanonArtistOptionalAttributes>;
 
 export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreationAttributes> implements CanonArtistAttributes {
+  id!: string;
   name!: string;
   asciiName!: string;
   description?: string;
-  id!: string;
   hasPhoto!: boolean;
   createDate!: Date;
   updateDate!: Date;
@@ -52,9 +52,9 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
   lastImageHarvestAttempt?: Date;
   merchHarvestDay?: number;
   newsHarvestDay?: number;
+  popularityRank?: number;
   lastGenreHarvestAttempt?: Date;
   genreHarvestCount!: number;
-  popularityRank?: number;
   popularityScore!: number;
 
   // CanonArtist hasMany CanonArtistAlbumRelation via canonArtistId
@@ -228,6 +228,12 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonArtist {
     return CanonArtist.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -241,12 +247,6 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
       type: DataTypes.TEXT,
       allowNull: true
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     hasPhoto: {
       type: DataTypes.BOOLEAN,
       allowNull: false,
@@ -290,6 +290,11 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
       allowNull: true,
       field: 'news_harvest_day'
     },
+    popularityRank: {
+      type: DataTypes.INTEGER,
+      allowNull: true,
+      field: 'popularity_rank'
+    },
     lastGenreHarvestAttempt: {
       type: DataTypes.DATE,
       allowNull: true,
@@ -301,11 +306,6 @@ export class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreatio
       defaultValue: 0,
       field: 'genre_harvest_count'
     },
-    popularityRank: {
-      type: DataTypes.INTEGER,
-      allowNull: true,
-      field: 'popularity_rank'
-    },
     popularityScore: {
       type: DataTypes.INTEGER,
       allowNull: false,

package/models/CanonGenre.ts

@@ -16,26 +16,26 @@ import type { UserGenreAffinity, UserGenreAffinityId } from './UserGenreAffinity
 import type { Versus, VersusId } from './Versus';
 
 export interface CanonGenreAttributes {
+  id: string;
   name: string;
   asciiName: string;
   description: string;
   parentGenreId?: string;
-  id: string;
   createDate: Date;
   updateDate: Date;
 }
 
 export type CanonGenrePk = "id";
 export type CanonGenreId = CanonGenre[CanonGenrePk];
-export type CanonGenreOptionalAttributes = "parentGenreId" | "id" | "createDate" | "updateDate";
+export type CanonGenreOptionalAttributes = "id" | "parentGenreId" | "createDate" | "updateDate";
 export type CanonGenreCreationAttributes = Optional<CanonGenreAttributes, CanonGenreOptionalAttributes>;
 
 export class CanonGenre extends Model<CanonGenreAttributes, CanonGenreCreationAttributes> implements CanonGenreAttributes {
+  id!: string;
   name!: string;
   asciiName!: string;
   description!: string;
   parentGenreId?: string;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -210,6 +210,12 @@ export class CanonGenre extends Model<CanonGenreAttributes, CanonGenreCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonGenre {
     return CanonGenre.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false,
@@ -229,12 +235,6 @@ export class CanonGenre extends Model<CanonGenreAttributes, CanonGenreCreationAt
       allowNull: true,
       field: 'parent_genre_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/CanonLabel.ts

@@ -6,9 +6,9 @@ import type { ExternalReference, ExternalReferenceId } from './ExternalReference
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 
 export interface CanonLabelAttributes {
+  id: string;
   name: string;
   asciiName: string;
-  id: string;
   createDate: Date;
   updateDate: Date;
 }
@@ -19,9 +19,9 @@ export type CanonLabelOptionalAttributes = "id" | "createDate" | "updateDate";
 export type CanonLabelCreationAttributes = Optional<CanonLabelAttributes, CanonLabelOptionalAttributes>;
 
 export class CanonLabel extends Model<CanonLabelAttributes, CanonLabelCreationAttributes> implements CanonLabelAttributes {
+  id!: string;
   name!: string;
   asciiName!: string;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -76,6 +76,12 @@ export class CanonLabel extends Model<CanonLabelAttributes, CanonLabelCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonLabel {
     return CanonLabel.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -85,12 +91,6 @@ export class CanonLabel extends Model<CanonLabelAttributes, CanonLabelCreationAt
       allowNull: false,
       field: 'ascii_name'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,