@earbug/db-models 0.0.60 → 0.0.62

package/dist/AffinityRelationshipType.d.ts

@@ -2,10 +2,10 @@ import * as Sequelize from 'sequelize';
 import { 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;
 }
@@ -14,10 +14,10 @@ export type AffinityRelationshipTypeId = AffinityRelationshipType[AffinityRelati
 export type AffinityRelationshipTypeOptionalAttributes = "id" | "createDate" | "updateDate";
 export type AffinityRelationshipTypeCreationAttributes = Optional<AffinityRelationshipTypeAttributes, AffinityRelationshipTypeOptionalAttributes>;
 export declare class AffinityRelationshipType extends Model<AffinityRelationshipTypeAttributes, AffinityRelationshipTypeCreationAttributes> implements AffinityRelationshipTypeAttributes {
+    id: string;
     name: string;
     category: string;
     tier: string;
-    id: string;
     createDate?: Date;
     updateDate?: Date;
     userAffinities: UserAffinity[];

package/dist/AffinityRelationshipType.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class AffinityRelationshipType extends sequelize_1.Model {
     static initModel(sequelize) {
         return AffinityRelationshipType.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             name: {
                 type: sequelize_1.DataTypes.STRING(50),
                 allowNull: false,
@@ -42,12 +48,6 @@ class AffinityRelationshipType extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.STRING(20),
                 allowNull: false
             },
-            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/AppUser.d.ts

@@ -26,9 +26,9 @@ import type { VersusCoCreator, VersusCoCreatorId } from './VersusCoCreator';
 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;
@@ -52,12 +52,12 @@ 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 declare class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes> implements AppUserAttributes {
-    firstName: string;
-    email?: string;
     id: string;
+    email?: string;
+    firstName: string;
     createDate: Date;
     updateDate: Date;
     syncContacts?: boolean;

package/dist/AppUser.js

@@ -29,21 +29,21 @@ const sequelize_1 = require("sequelize");
 class AppUser extends sequelize_1.Model {
     static initModel(sequelize) {
         return AppUser.init({
-            firstName: {
-                type: sequelize_1.DataTypes.TEXT,
+            id: {
+                type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
-                field: 'first_name'
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
             },
             email: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: true,
                 unique: "uk_app_user_email"
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
+            firstName: {
+                type: sequelize_1.DataTypes.TEXT,
                 allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
+                field: 'first_name'
             },
             createDate: {
                 type: sequelize_1.DataTypes.DATE,

package/dist/AppUserDevice.d.ts

@@ -3,10 +3,10 @@ import { Model, Optional } from 'sequelize';
 import type { AppUser, AppUserId } from './AppUser';
 export interface AppUserDeviceAttributes {
     id: string;
-    createdAt: Date;
     appUserId: string;
     devicePlatformId: number;
     endpointArn: string;
+    createdAt: Date;
     platformApplicationArn?: string;
 }
 export type AppUserDevicePk = "id";
@@ -15,10 +15,10 @@ export type AppUserDeviceOptionalAttributes = "id" | "createdAt" | "platformAppl
 export type AppUserDeviceCreationAttributes = Optional<AppUserDeviceAttributes, AppUserDeviceOptionalAttributes>;
 export declare class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceCreationAttributes> implements AppUserDeviceAttributes {
     id: string;
-    createdAt: Date;
     appUserId: string;
     devicePlatformId: number;
     endpointArn: string;
+    createdAt: Date;
     platformApplicationArn?: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;

package/dist/AppUserDevice.js

@@ -35,12 +35,6 @@ class AppUserDevice extends sequelize_1.Model {
                 defaultValue: sequelize_1.DataTypes.UUIDV4,
                 primaryKey: true
             },
-            createdAt: {
-                type: sequelize_1.DataTypes.DATE,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-                field: 'created_at'
-            },
             appUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -61,6 +55,12 @@ class AppUserDevice extends sequelize_1.Model {
                 unique: "unique_app_user_device_endpoint_arn",
                 field: 'endpoint_arn'
             },
+            createdAt: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+                field: 'created_at'
+            },
             platformApplicationArn: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: true,

package/dist/AppUserDeviceClassicBackup20260906.d.ts

@@ -0,0 +1,23 @@
+import * as Sequelize from 'sequelize';
+import { 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 declare 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;
+}

package/dist/AppUserDeviceClassicBackup20260906.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppUserDeviceClassicBackup20260906 = void 0;
+const sequelize_1 = require("sequelize");
+class AppUserDeviceClassicBackup20260906 extends sequelize_1.Model {
+    static initModel(sequelize) {
+        return AppUserDeviceClassicBackup20260906.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                primaryKey: true
+            },
+            appUserId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                field: 'app_user_id'
+            },
+            devicePlatformId: {
+                type: sequelize_1.DataTypes.SMALLINT,
+                allowNull: true,
+                field: 'device_platform_id'
+            },
+            endpointArn: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: true,
+                field: 'endpoint_arn'
+            },
+            createdAt: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: true,
+                field: 'created_at'
+            },
+            platformApplicationArn: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: true,
+                field: 'platform_application_arn'
+            }
+        }, {
+            sequelize,
+            tableName: 'app_user_device_classic_backup_20260906',
+            schema: 'eb',
+            timestamps: false
+        });
+    }
+}
+exports.AppUserDeviceClassicBackup20260906 = AppUserDeviceClassicBackup20260906;

package/dist/AppUserFollowRelation.d.ts

@@ -2,26 +2,26 @@ import * as Sequelize from 'sequelize';
 import { 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 declare class AppUserFollowRelation extends Model<AppUserFollowRelationAttributes, AppUserFollowRelationCreationAttributes> implements AppUserFollowRelationAttributes {
+    id: string;
     appUserId: string;
     followingAppUserId: string;
     stateId: number;
     isBlocked: boolean;
     createdAt: Date;
     updatedAt: Date;
-    id: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;

package/dist/AppUserFollowRelation.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class AppUserFollowRelation extends sequelize_1.Model {
     static initModel(sequelize) {
         return AppUserFollowRelation.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
             appUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -72,12 +78,6 @@ class AppUserFollowRelation extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
                 field: 'updated_at'
-            },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
             }
         }, {
             sequelize,

package/dist/AppUserPlatformRelation.d.ts

@@ -3,34 +3,34 @@ import { Model, Optional } from 'sequelize';
 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 declare 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;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;

package/dist/AppUserPlatformRelation.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class AppUserPlatformRelation extends sequelize_1.Model {
     static initModel(sequelize) {
         return AppUserPlatformRelation.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             appUserId: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -50,12 +56,24 @@ class AppUserPlatformRelation extends sequelize_1.Model {
             },
             externalUserId: {
                 type: sequelize_1.DataTypes.TEXT,
-                allowNull: false,
+                allowNull: true,
                 field: 'external_user_id'
             },
+            createDate: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+                field: 'create_date'
+            },
+            updateDate: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+                field: 'update_date'
+            },
             accessToken: {
                 type: sequelize_1.DataTypes.STRING,
-                allowNull: false,
+                allowNull: true,
                 field: 'access_token'
             },
             refreshToken: {
@@ -68,34 +86,16 @@ class AppUserPlatformRelation extends sequelize_1.Model {
                 allowNull: false,
                 field: 'expiration_date'
             },
-            countryCode: {
-                type: sequelize_1.DataTypes.STRING(2),
-                allowNull: false,
-                field: 'country_code'
-            },
-            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,
-                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-                field: 'create_date'
-            },
-            updateDate: {
-                type: sequelize_1.DataTypes.DATE,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-                field: 'update_date'
-            },
             stateId: {
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
                 defaultValue: 0,
                 field: 'state_id'
+            },
+            countryCode: {
+                type: sequelize_1.DataTypes.STRING(2),
+                allowNull: false,
+                field: 'country_code'
             }
         }, {
             sequelize,

package/dist/CanonAlbum.d.ts

@@ -9,34 +9,34 @@ import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 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 declare 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;
     canonAlbumExternalReferenceRelations: CanonAlbumExternalReferenceRelation[];

package/dist/CanonAlbum.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class CanonAlbum extends sequelize_1.Model {
     static initModel(sequelize) {
         return CanonAlbum.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             name: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: false
@@ -48,16 +54,6 @@ class CanonAlbum extends sequelize_1.Model {
                 allowNull: true,
                 field: 'no_of_disc'
             },
-            description: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: true
-            },
-            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,
@@ -82,6 +78,10 @@ class CanonAlbum extends sequelize_1.Model {
                 defaultValue: false,
                 field: 'has_thumbnail_photo'
             },
+            description: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: true
+            },
             images: {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: true

package/dist/CanonArtist.d.ts

@@ -15,10 +15,10 @@ import type { UserArtistAffinity, UserArtistAffinityId } from './UserArtistAffin
 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;
@@ -27,20 +27,20 @@ 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 declare class CanonArtist extends Model<CanonArtistAttributes, CanonArtistCreationAttributes> implements CanonArtistAttributes {
+    id: string;
     name: string;
     asciiName: string;
     description?: string;
-    id: string;
     hasPhoto: boolean;
     createDate: Date;
     updateDate: Date;
@@ -49,9 +49,9 @@ export declare class CanonArtist extends Model<CanonArtistAttributes, CanonArtis
     lastImageHarvestAttempt?: Date;
     merchHarvestDay?: number;
     newsHarvestDay?: number;
+    popularityRank?: number;
     lastGenreHarvestAttempt?: Date;
     genreHarvestCount: number;
-    popularityRank?: number;
     popularityScore: number;
     canonArtistAlbumRelations: CanonArtistAlbumRelation[];
     getCanonArtistAlbumRelations: Sequelize.HasManyGetAssociationsMixin<CanonArtistAlbumRelation>;

package/dist/CanonArtist.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class CanonArtist extends sequelize_1.Model {
     static initModel(sequelize) {
         return CanonArtist.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             name: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: false
@@ -42,12 +48,6 @@ class CanonArtist extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: true
             },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             hasPhoto: {
                 type: sequelize_1.DataTypes.BOOLEAN,
                 allowNull: false,
@@ -91,6 +91,11 @@ class CanonArtist extends sequelize_1.Model {
                 allowNull: true,
                 field: 'news_harvest_day'
             },
+            popularityRank: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: true,
+                field: 'popularity_rank'
+            },
             lastGenreHarvestAttempt: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: true,
@@ -102,11 +107,6 @@ class CanonArtist extends sequelize_1.Model {
                 defaultValue: 0,
                 field: 'genre_harvest_count'
             },
-            popularityRank: {
-                type: sequelize_1.DataTypes.INTEGER,
-                allowNull: true,
-                field: 'popularity_rank'
-            },
             popularityScore: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,

package/dist/CanonGenre.d.ts

@@ -15,24 +15,24 @@ import type { RadioShowGenres, RadioShowGenresId } from './RadioShowGenres';
 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 declare class CanonGenre extends Model<CanonGenreAttributes, CanonGenreCreationAttributes> implements CanonGenreAttributes {
+    id: string;
     name: string;
     asciiName: string;
     description: string;
     parentGenreId?: string;
-    id: string;
     createDate: Date;
     updateDate: Date;
     canonAlbumGenreRelations: CanonAlbumGenreRelation[];

package/dist/CanonGenre.js

@@ -29,6 +29,12 @@ const sequelize_1 = require("sequelize");
 class CanonGenre extends sequelize_1.Model {
     static initModel(sequelize) {
         return CanonGenre.init({
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+                primaryKey: true
+            },
             name: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: false,
@@ -48,12 +54,6 @@ class CanonGenre extends sequelize_1.Model {
                 allowNull: true,
                 field: 'parent_genre_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,