@earbug/db-models 0.0.7 → 0.0.9

package/dist/AppUser.d.ts

@@ -6,18 +6,19 @@ import type { AppUserPlatformRelation, AppUserPlatformRelationId } from './AppUs
 import type { JukeboxInvite, JukeboxInviteId } from './JukeboxInvite';
 import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 import type { JukeboxUser, JukeboxUserId } from './JukeboxUser';
+import type { Notification, NotificationId } from './Notification';
 import type { PlatformUserAlbum, PlatformUserAlbumId } from './PlatformUserAlbum';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { State, StateId } from './State';
 import type { UserContacts, UserContactsId } from './UserContacts';
 export interface AppUserAttributes {
-    id: string;
     email: string;
     firstName: string;
+    id: string;
     createDate: Date;
     updateDate: Date;
-    stateId: number;
     syncContacts?: boolean;
+    stateId?: number;
     lastName?: string;
     autoApproveFollowers: boolean;
     lastHarvested?: Date;
@@ -25,16 +26,16 @@ export interface AppUserAttributes {
 }
 export type AppUserPk = "id";
 export type AppUserId = AppUser[AppUserPk];
-export type AppUserOptionalAttributes = "id" | "createDate" | "updateDate" | "stateId" | "syncContacts" | "lastName" | "autoApproveFollowers" | "lastHarvested" | "lastHarvestedError";
+export type AppUserOptionalAttributes = "id" | "createDate" | "updateDate" | "syncContacts" | "stateId" | "lastName" | "autoApproveFollowers" | "lastHarvested" | "lastHarvestedError";
 export type AppUserCreationAttributes = Optional<AppUserAttributes, AppUserOptionalAttributes>;
 export declare class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes> implements AppUserAttributes {
-    id: string;
     email: string;
     firstName: string;
+    id: string;
     createDate: Date;
     updateDate: Date;
-    stateId: number;
     syncContacts?: boolean;
+    stateId?: number;
     lastName?: string;
     autoApproveFollowers: boolean;
     lastHarvested?: Date;
@@ -120,6 +121,28 @@ export declare class AppUser extends Model<AppUserAttributes, AppUserCreationAtt
     hasJukeboxUser: Sequelize.HasManyHasAssociationMixin<JukeboxUser, JukeboxUserId>;
     hasJukeboxUsers: Sequelize.HasManyHasAssociationsMixin<JukeboxUser, JukeboxUserId>;
     countJukeboxUsers: Sequelize.HasManyCountAssociationsMixin;
+    notifications: Notification[];
+    getNotifications: Sequelize.HasManyGetAssociationsMixin<Notification>;
+    setNotifications: Sequelize.HasManySetAssociationsMixin<Notification, NotificationId>;
+    addNotification: Sequelize.HasManyAddAssociationMixin<Notification, NotificationId>;
+    addNotifications: Sequelize.HasManyAddAssociationsMixin<Notification, NotificationId>;
+    createNotification: Sequelize.HasManyCreateAssociationMixin<Notification>;
+    removeNotification: Sequelize.HasManyRemoveAssociationMixin<Notification, NotificationId>;
+    removeNotifications: Sequelize.HasManyRemoveAssociationsMixin<Notification, NotificationId>;
+    hasNotification: Sequelize.HasManyHasAssociationMixin<Notification, NotificationId>;
+    hasNotifications: Sequelize.HasManyHasAssociationsMixin<Notification, NotificationId>;
+    countNotifications: Sequelize.HasManyCountAssociationsMixin;
+    targetUserNotifications: Notification[];
+    getTargetUserNotifications: Sequelize.HasManyGetAssociationsMixin<Notification>;
+    setTargetUserNotifications: Sequelize.HasManySetAssociationsMixin<Notification, NotificationId>;
+    addTargetUserNotification: Sequelize.HasManyAddAssociationMixin<Notification, NotificationId>;
+    addTargetUserNotifications: Sequelize.HasManyAddAssociationsMixin<Notification, NotificationId>;
+    createTargetUserNotification: Sequelize.HasManyCreateAssociationMixin<Notification>;
+    removeTargetUserNotification: Sequelize.HasManyRemoveAssociationMixin<Notification, NotificationId>;
+    removeTargetUserNotifications: Sequelize.HasManyRemoveAssociationsMixin<Notification, NotificationId>;
+    hasTargetUserNotification: Sequelize.HasManyHasAssociationMixin<Notification, NotificationId>;
+    hasTargetUserNotifications: Sequelize.HasManyHasAssociationsMixin<Notification, NotificationId>;
+    countTargetUserNotifications: Sequelize.HasManyCountAssociationsMixin;
     platformUserAlbums: PlatformUserAlbum[];
     getPlatformUserAlbums: Sequelize.HasManyGetAssociationsMixin<PlatformUserAlbum>;
     setPlatformUserAlbums: Sequelize.HasManySetAssociationsMixin<PlatformUserAlbum, PlatformUserAlbumId>;

package/dist/AppUser.js

@@ -29,12 +29,6 @@ const sequelize_1 = require("sequelize");
 class AppUser extends sequelize_1.Model {
     static initModel(sequelize) {
         return AppUser.init({
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-                primaryKey: true
-            },
             email: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: false,
@@ -45,6 +39,12 @@ class AppUser extends sequelize_1.Model {
                 allowNull: false,
                 field: 'first_name'
             },
+            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,
@@ -57,9 +57,15 @@ class AppUser extends sequelize_1.Model {
                 defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
                 field: 'update_date'
             },
+            syncContacts: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                allowNull: true,
+                defaultValue: false,
+                field: 'sync_contacts'
+            },
             stateId: {
                 type: sequelize_1.DataTypes.SMALLINT,
-                allowNull: false,
+                allowNull: true,
                 defaultValue: 0,
                 references: {
                     model: 'state',
@@ -67,12 +73,6 @@ class AppUser extends sequelize_1.Model {
                 },
                 field: 'state_id'
             },
-            syncContacts: {
-                type: sequelize_1.DataTypes.BOOLEAN,
-                allowNull: true,
-                defaultValue: false,
-                field: 'sync_contacts'
-            },
             lastName: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: true,

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;
-    platformId: number;
+    devicePlatformId: number;
     endpointArn: string;
-    createdAt: Date;
 }
 export type AppUserDevicePk = "id";
 export type AppUserDeviceId = AppUserDevice[AppUserDevicePk];
@@ -14,10 +14,10 @@ export type AppUserDeviceOptionalAttributes = "id" | "createdAt";
 export type AppUserDeviceCreationAttributes = Optional<AppUserDeviceAttributes, AppUserDeviceOptionalAttributes>;
 export declare class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceCreationAttributes> implements AppUserDeviceAttributes {
     id: string;
+    createdAt: Date;
     appUserId: string;
-    platformId: number;
+    devicePlatformId: number;
     endpointArn: string;
-    createdAt: Date;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;

package/dist/AppUserDevice.js

@@ -35,6 +35,12 @@ 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,
@@ -44,22 +50,16 @@ class AppUserDevice extends sequelize_1.Model {
                 },
                 field: 'app_user_id'
             },
-            platformId: {
+            devicePlatformId: {
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
-                field: 'platform_id'
+                field: 'device_platform_id'
             },
             endpointArn: {
                 type: sequelize_1.DataTypes.TEXT,
                 allowNull: false,
                 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'
             }
         }, {
             sequelize,

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 = "id" | "stateId" | "createdAt" | "updatedAt";
+export type AppUserFollowRelationOptionalAttributes = "stateId" | "createdAt" | "updatedAt" | "id";
 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,12 +29,6 @@ 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,
@@ -78,6 +72,12 @@ 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,33 +3,33 @@ 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;
-    createDate: Date;
-    updateDate: Date;
     accessToken: string;
     refreshToken?: string;
     expirationDate: Date;
     countryCode: string;
+    id: string;
+    createDate: Date;
+    updateDate: Date;
     stateId: number;
 }
 export type AppUserPlatformRelationPk = "id";
 export type AppUserPlatformRelationId = AppUserPlatformRelation[AppUserPlatformRelationPk];
-export type AppUserPlatformRelationOptionalAttributes = "id" | "createDate" | "updateDate" | "refreshToken" | "stateId";
+export type AppUserPlatformRelationOptionalAttributes = "refreshToken" | "id" | "createDate" | "updateDate" | "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;
-    createDate: Date;
-    updateDate: Date;
     accessToken: string;
     refreshToken?: string;
     expirationDate: Date;
     countryCode: string;
+    id: string;
+    createDate: Date;
+    updateDate: Date;
     stateId: number;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;

package/dist/AppUserPlatformRelation.js

@@ -29,12 +29,6 @@ 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,
@@ -59,18 +53,6 @@ class AppUserPlatformRelation extends sequelize_1.Model {
                 allowNull: false,
                 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,
@@ -91,6 +73,24 @@ class AppUserPlatformRelation extends sequelize_1.Model {
                 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,

package/dist/CanonAlbum.d.ts

@@ -8,34 +8,34 @@ import type { CanonTrack, CanonTrackId } from './CanonTrack';
 import type { ExternalReference, ExternalReferenceId } from './ExternalReference';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 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 = "id" | "releaseDate" | "noOfDisc" | "createDate" | "updateDate" | "hasPhoto" | "hasThumbnailPhoto" | "description" | "images" | "lastImageHarvestAttempt";
+export type CanonAlbumOptionalAttributes = "releaseDate" | "noOfDisc" | "description" | "id" | "createDate" | "updateDate" | "hasPhoto" | "hasThumbnailPhoto" | "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,12 +29,6 @@ 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
@@ -54,6 +48,16 @@ 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,
@@ -78,10 +82,6 @@ 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/CanonAlbumImageHarvested.d.ts

@@ -2,26 +2,26 @@ import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
 export interface CanonAlbumImageHarvestedAttributes {
-    id: string;
-    canonAlbumId: string;
-    priority?: number;
-    url?: string;
     dateHarvested: Date;
     storageKey: string;
     harvestMethod?: string;
+    priority?: number;
+    id: string;
+    url?: string;
+    canonAlbumId: string;
 }
 export type CanonAlbumImageHarvestedPk = "id";
 export type CanonAlbumImageHarvestedId = CanonAlbumImageHarvested[CanonAlbumImageHarvestedPk];
-export type CanonAlbumImageHarvestedOptionalAttributes = "id" | "priority" | "url" | "harvestMethod";
+export type CanonAlbumImageHarvestedOptionalAttributes = "harvestMethod" | "priority" | "id" | "url";
 export type CanonAlbumImageHarvestedCreationAttributes = Optional<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedOptionalAttributes>;
 export declare class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedCreationAttributes> implements CanonAlbumImageHarvestedAttributes {
-    id: string;
-    canonAlbumId: string;
-    priority?: number;
-    url?: string;
     dateHarvested: Date;
     storageKey: string;
     harvestMethod?: string;
+    priority?: number;
+    id: string;
+    url?: string;
+    canonAlbumId: string;
     canonAlbum: CanonAlbum;
     getCanonAlbum: Sequelize.BelongsToGetAssociationMixin<CanonAlbum>;
     setCanonAlbum: Sequelize.BelongsToSetAssociationMixin<CanonAlbum, CanonAlbumId>;

package/dist/CanonAlbumImageHarvested.js

@@ -5,31 +5,6 @@ const sequelize_1 = require("sequelize");
 class CanonAlbumImageHarvested extends sequelize_1.Model {
     static initModel(sequelize) {
         return CanonAlbumImageHarvested.init({
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
-            canonAlbumId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                references: {
-                    model: 'canon_album',
-                    key: 'id'
-                },
-                field: 'canon_album_id'
-            },
-            priority: {
-                type: sequelize_1.DataTypes.DECIMAL,
-                allowNull: true,
-                defaultValue: 0
-            },
-            url: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: true,
-                unique: "canon_album_image_harvested_url_unique"
-            },
             dateHarvested: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: false,
@@ -44,6 +19,30 @@ class CanonAlbumImageHarvested extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.STRING(255),
                 allowNull: true,
                 field: 'harvest_method'
+            },
+            priority: {
+                type: sequelize_1.DataTypes.DECIMAL,
+                allowNull: true,
+                defaultValue: 0
+            },
+            id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.UUIDV4,
+                primaryKey: true
+            },
+            url: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: true
+            },
+            canonAlbumId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'canon_album',
+                    key: 'id'
+                },
+                field: 'canon_album_id'
             }
         }, {
             sequelize,
@@ -64,13 +63,6 @@ class CanonAlbumImageHarvested extends sequelize_1.Model {
                         { name: "id" },
                     ]
                 },
-                {
-                    name: "canon_album_image_harvested_url_unique",
-                    unique: true,
-                    fields: [
-                        { name: "url" },
-                    ]
-                },
             ]
         });
     }

package/dist/CanonArtist.d.ts

@@ -8,10 +8,10 @@ import type { CanonTrack, CanonTrackId } from './CanonTrack';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 export interface CanonArtistAttributes {
-    id: string;
     name: string;
     asciiName: string;
     description?: string;
+    id: string;
     hasPhoto: boolean;
     createDate: Date;
     updateDate: Date;
@@ -21,13 +21,13 @@ export interface CanonArtistAttributes {
 }
 export type CanonArtistPk = "id";
 export type CanonArtistId = CanonArtist[CanonArtistPk];
-export type CanonArtistOptionalAttributes = "id" | "description" | "createDate" | "updateDate" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt";
+export type CanonArtistOptionalAttributes = "description" | "id" | "createDate" | "updateDate" | "hasThumbnailPhoto" | "images" | "lastImageHarvestAttempt";
 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;

package/dist/CanonArtist.js

@@ -29,12 +29,6 @@ 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
@@ -48,6 +42,12 @@ 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,

package/dist/CanonArtistImageHarvested.d.ts

@@ -2,26 +2,26 @@ import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 export interface CanonArtistImageHarvestedAttributes {
-    id: string;
-    canonArtistId: string;
-    priority?: number;
-    url?: string;
     dateHarvested: Date;
     storageKey: string;
     harvestMethod?: string;
+    url?: string;
+    priority?: number;
+    canonArtistId: string;
+    id: string;
 }
 export type CanonArtistImageHarvestedPk = "id";
 export type CanonArtistImageHarvestedId = CanonArtistImageHarvested[CanonArtistImageHarvestedPk];
-export type CanonArtistImageHarvestedOptionalAttributes = "id" | "priority" | "url" | "harvestMethod";
+export type CanonArtistImageHarvestedOptionalAttributes = "harvestMethod" | "url" | "priority" | "id";
 export type CanonArtistImageHarvestedCreationAttributes = Optional<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedOptionalAttributes>;
 export declare class CanonArtistImageHarvested extends Model<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedCreationAttributes> implements CanonArtistImageHarvestedAttributes {
-    id: string;
-    canonArtistId: string;
-    priority?: number;
-    url?: string;
     dateHarvested: Date;
     storageKey: string;
     harvestMethod?: string;
+    url?: string;
+    priority?: number;
+    canonArtistId: string;
+    id: string;
     canonArtist: CanonArtist;
     getCanonArtist: Sequelize.BelongsToGetAssociationMixin<CanonArtist>;
     setCanonArtist: Sequelize.BelongsToSetAssociationMixin<CanonArtist, CanonArtistId>;