@earbug/db-models 0.0.60 → 0.0.63

package/models/JukeboxQueueMode.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxQueueModeAttributes {
-  description: string;
   id: number;
+  description: string;
 }
 
 export type JukeboxQueueModePk = "id";
@@ -12,8 +12,8 @@ export type JukeboxQueueModeId = JukeboxQueueMode[JukeboxQueueModePk];
 export type JukeboxQueueModeCreationAttributes = JukeboxQueueModeAttributes;
 
 export class JukeboxQueueMode extends Model<JukeboxQueueModeAttributes, JukeboxQueueModeCreationAttributes> implements JukeboxQueueModeAttributes {
-  description!: string;
   id!: number;
+  description!: string;
 
   // JukeboxQueueMode hasMany JukeboxSession via jukeboxQueueModeId
   jukeboxSessions!: JukeboxSession[];
@@ -30,16 +30,16 @@ export class JukeboxQueueMode extends Model<JukeboxQueueModeAttributes, JukeboxQ
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxQueueMode {
     return JukeboxQueueMode.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/JukeboxSession.ts

@@ -19,38 +19,38 @@ import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserLikes, UserLikesId } from './UserLikes';
 
 export interface JukeboxSessionAttributes {
+  id: string;
   typeId: number;
   accessTypeId: number;
   terminationConditionId: number;
   jukeboxQueueModeId: number;
-  trackQueue?: string[];
-  stateMachineArn?: string;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
-  description?: string;
   jukeboxStatusId: number;
+  trackQueue?: string[];
+  description?: string;
+  stateMachineArn?: string;
   durationMs: number;
   pausedAt?: Date;
 }
 
 export type JukeboxSessionPk = "id";
 export type JukeboxSessionId = JukeboxSession[JukeboxSessionPk];
-export type JukeboxSessionOptionalAttributes = "trackQueue" | "stateMachineArn" | "id" | "createdAt" | "updatedAt" | "description" | "jukeboxStatusId" | "durationMs" | "pausedAt";
+export type JukeboxSessionOptionalAttributes = "id" | "createdAt" | "updatedAt" | "jukeboxStatusId" | "trackQueue" | "description" | "stateMachineArn" | "durationMs" | "pausedAt";
 export type JukeboxSessionCreationAttributes = Optional<JukeboxSessionAttributes, JukeboxSessionOptionalAttributes>;
 
 export class JukeboxSession extends Model<JukeboxSessionAttributes, JukeboxSessionCreationAttributes> implements JukeboxSessionAttributes {
+  id!: string;
   typeId!: number;
   accessTypeId!: number;
   terminationConditionId!: number;
   jukeboxQueueModeId!: number;
-  trackQueue?: string[];
-  stateMachineArn?: string;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
-  description?: string;
   jukeboxStatusId!: number;
+  trackQueue?: string[];
+  description?: string;
+  stateMachineArn?: string;
   durationMs!: number;
   pausedAt?: Date;
 
@@ -226,6 +226,12 @@ export class JukeboxSession extends Model<JukeboxSessionAttributes, JukeboxSessi
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxSession {
     return JukeboxSession.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     typeId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -262,22 +268,6 @@ export class JukeboxSession extends Model<JukeboxSessionAttributes, JukeboxSessi
       },
       field: 'jukebox_queue_mode_id'
     },
-    trackQueue: {
-      type: DataTypes.ARRAY(DataTypes.TEXT),
-      allowNull: true,
-      field: 'track_queue'
-    },
-    stateMachineArn: {
-      type: DataTypes.STRING(255),
-      allowNull: true,
-      field: 'state_machine_arn'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -290,10 +280,6 @@ export class JukeboxSession extends Model<JukeboxSessionAttributes, JukeboxSessi
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
     },
-    description: {
-      type: DataTypes.STRING(512),
-      allowNull: true
-    },
     jukeboxStatusId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -304,6 +290,20 @@ export class JukeboxSession extends Model<JukeboxSessionAttributes, JukeboxSessi
       },
       field: 'jukebox_status_id'
     },
+    trackQueue: {
+      type: DataTypes.ARRAY(DataTypes.TEXT),
+      allowNull: true,
+      field: 'track_queue'
+    },
+    description: {
+      type: DataTypes.STRING(512),
+      allowNull: true
+    },
+    stateMachineArn: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+      field: 'state_machine_arn'
+    },
     durationMs: {
       type: DataTypes.INTEGER,
       allowNull: false,

package/models/JukeboxSessionArtistAffinity.ts

@@ -5,11 +5,11 @@ import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxSessionArtistAffinityAttributes {
+  id: string;
   jukeboxSessionId: string;
   canonArtistId: string;
   affinityTierId: number;
   rank: number;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -20,11 +20,11 @@ export type JukeboxSessionArtistAffinityOptionalAttributes = "id" | "createdAt"
 export type JukeboxSessionArtistAffinityCreationAttributes = Optional<JukeboxSessionArtistAffinityAttributes, JukeboxSessionArtistAffinityOptionalAttributes>;
 
 export class JukeboxSessionArtistAffinity extends Model<JukeboxSessionArtistAffinityAttributes, JukeboxSessionArtistAffinityCreationAttributes> implements JukeboxSessionArtistAffinityAttributes {
+  id!: string;
   jukeboxSessionId!: string;
   canonArtistId!: string;
   affinityTierId!: number;
   rank!: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -46,6 +46,12 @@ export class JukeboxSessionArtistAffinity extends Model<JukeboxSessionArtistAffi
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxSessionArtistAffinity {
     return JukeboxSessionArtistAffinity.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     jukeboxSessionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -79,12 +85,6 @@ export class JukeboxSessionArtistAffinity extends Model<JukeboxSessionArtistAffi
       type: DataTypes.INTEGER,
       allowNull: false
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/JukeboxSessionGenreAffinity.ts

@@ -5,11 +5,11 @@ import type { CanonGenre, CanonGenreId } from './CanonGenre';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxSessionGenreAffinityAttributes {
+  id: string;
   jukeboxSessionId: string;
   canonGenreId: string;
   affinityTierId: number;
   rank: number;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -20,11 +20,11 @@ export type JukeboxSessionGenreAffinityOptionalAttributes = "id" | "createdAt" |
 export type JukeboxSessionGenreAffinityCreationAttributes = Optional<JukeboxSessionGenreAffinityAttributes, JukeboxSessionGenreAffinityOptionalAttributes>;
 
 export class JukeboxSessionGenreAffinity extends Model<JukeboxSessionGenreAffinityAttributes, JukeboxSessionGenreAffinityCreationAttributes> implements JukeboxSessionGenreAffinityAttributes {
+  id!: string;
   jukeboxSessionId!: string;
   canonGenreId!: string;
   affinityTierId!: number;
   rank!: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -46,6 +46,12 @@ export class JukeboxSessionGenreAffinity extends Model<JukeboxSessionGenreAffini
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxSessionGenreAffinity {
     return JukeboxSessionGenreAffinity.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     jukeboxSessionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -79,12 +85,6 @@ export class JukeboxSessionGenreAffinity extends Model<JukeboxSessionGenreAffini
       type: DataTypes.INTEGER,
       allowNull: false
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/JukeboxTerminationCondition.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxTerminationConditionAttributes {
-  description: string;
   id: number;
+  description: string;
 }
 
 export type JukeboxTerminationConditionPk = "id";
@@ -12,8 +12,8 @@ export type JukeboxTerminationConditionId = JukeboxTerminationCondition[JukeboxT
 export type JukeboxTerminationConditionCreationAttributes = JukeboxTerminationConditionAttributes;
 
 export class JukeboxTerminationCondition extends Model<JukeboxTerminationConditionAttributes, JukeboxTerminationConditionCreationAttributes> implements JukeboxTerminationConditionAttributes {
-  description!: string;
   id!: number;
+  description!: string;
 
   // JukeboxTerminationCondition hasMany JukeboxSession via terminationConditionId
   jukeboxSessions!: JukeboxSession[];
@@ -30,16 +30,16 @@ export class JukeboxTerminationCondition extends Model<JukeboxTerminationConditi
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxTerminationCondition {
     return JukeboxTerminationCondition.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/JukeboxType.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxTypeAttributes {
-  description: string;
   id: number;
+  description: string;
 }
 
 export type JukeboxTypePk = "id";
@@ -12,8 +12,8 @@ export type JukeboxTypeId = JukeboxType[JukeboxTypePk];
 export type JukeboxTypeCreationAttributes = JukeboxTypeAttributes;
 
 export class JukeboxType extends Model<JukeboxTypeAttributes, JukeboxTypeCreationAttributes> implements JukeboxTypeAttributes {
-  description!: string;
   id!: number;
+  description!: string;
 
   // JukeboxType hasMany JukeboxSession via typeId
   jukeboxSessions!: JukeboxSession[];
@@ -30,16 +30,16 @@ export class JukeboxType extends Model<JukeboxTypeAttributes, JukeboxTypeCreatio
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxType {
     return JukeboxType.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/JukeboxUser.ts

@@ -7,34 +7,34 @@ import type { JukeboxUserType, JukeboxUserTypeId } from './JukeboxUserType';
 import type { PauseStatusType, PauseStatusTypeId } from './PauseStatusType';
 
 export interface JukeboxUserAttributes {
+  id: string;
   jukeboxSessionId: string;
   appUserId: string;
-  exitDate?: Date;
-  pausedQueueEntryId?: string;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
   enterDate: Date;
+  exitDate?: Date;
   jukeboxUserTypeId: number;
   pauseStatusTypeId: number;
+  pausedQueueEntryId?: string;
 }
 
 export type JukeboxUserPk = "id";
 export type JukeboxUserId = JukeboxUser[JukeboxUserPk];
-export type JukeboxUserOptionalAttributes = "exitDate" | "pausedQueueEntryId" | "id" | "createdAt" | "updatedAt" | "enterDate" | "jukeboxUserTypeId" | "pauseStatusTypeId";
+export type JukeboxUserOptionalAttributes = "id" | "createdAt" | "updatedAt" | "enterDate" | "exitDate" | "jukeboxUserTypeId" | "pauseStatusTypeId" | "pausedQueueEntryId";
 export type JukeboxUserCreationAttributes = Optional<JukeboxUserAttributes, JukeboxUserOptionalAttributes>;
 
 export class JukeboxUser extends Model<JukeboxUserAttributes, JukeboxUserCreationAttributes> implements JukeboxUserAttributes {
+  id!: string;
   jukeboxSessionId!: string;
   appUserId!: string;
-  exitDate?: Date;
-  pausedQueueEntryId?: string;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
   enterDate!: Date;
+  exitDate?: Date;
   jukeboxUserTypeId!: number;
   pauseStatusTypeId!: number;
+  pausedQueueEntryId?: string;
 
   // JukeboxUser belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -64,6 +64,12 @@ export class JukeboxUser extends Model<JukeboxUserAttributes, JukeboxUserCreatio
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxUser {
     return JukeboxUser.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     jukeboxSessionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -84,26 +90,6 @@ export class JukeboxUser extends Model<JukeboxUserAttributes, JukeboxUserCreatio
       unique: "unique_jukebox_user_id",
       field: 'app_user_id'
     },
-    exitDate: {
-      type: DataTypes.DATE,
-      allowNull: true,
-      field: 'exit_date'
-    },
-    pausedQueueEntryId: {
-      type: DataTypes.UUID,
-      allowNull: true,
-      references: {
-        model: 'jukebox_queue_entry',
-        key: 'id'
-      },
-      field: 'paused_queue_entry_id'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -122,6 +108,11 @@ export class JukeboxUser extends Model<JukeboxUserAttributes, JukeboxUserCreatio
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'enter_date'
     },
+    exitDate: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'exit_date'
+    },
     jukeboxUserTypeId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -141,6 +132,15 @@ export class JukeboxUser extends Model<JukeboxUserAttributes, JukeboxUserCreatio
         key: 'id'
       },
       field: 'pause_status_type_id'
+    },
+    pausedQueueEntryId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'jukebox_queue_entry',
+        key: 'id'
+      },
+      field: 'paused_queue_entry_id'
     }
   }, {
     sequelize,

package/models/KnexMigrations.ts

@@ -2,26 +2,32 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 
 export interface KnexMigrationsAttributes {
+  id: number;
   name?: string;
   batch?: number;
   migrationTime?: Date;
-  id: number;
 }
 
 export type KnexMigrationsPk = "id";
 export type KnexMigrationsId = KnexMigrations[KnexMigrationsPk];
-export type KnexMigrationsOptionalAttributes = "name" | "batch" | "migrationTime" | "id";
+export type KnexMigrationsOptionalAttributes = "id" | "name" | "batch" | "migrationTime";
 export type KnexMigrationsCreationAttributes = Optional<KnexMigrationsAttributes, KnexMigrationsOptionalAttributes>;
 
 export class KnexMigrations extends Model<KnexMigrationsAttributes, KnexMigrationsCreationAttributes> implements KnexMigrationsAttributes {
+  id!: number;
   name?: string;
   batch?: number;
   migrationTime?: Date;
-  id!: number;
 
 
   static initModel(sequelize: Sequelize.Sequelize): typeof KnexMigrations {
     return KnexMigrations.init({
+    id: {
+      autoIncrement: true,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true
+    },
     name: {
       type: DataTypes.STRING(255),
       allowNull: true
@@ -34,12 +40,6 @@ export class KnexMigrations extends Model<KnexMigrationsAttributes, KnexMigratio
       type: DataTypes.DATE,
       allowNull: true,
       field: 'migration_time'
-    },
-    id: {
-      autoIncrement: true,
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      primaryKey: true
     }
   }, {
     sequelize,

package/models/KnexMigrationsLock.ts

@@ -2,32 +2,32 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 
 export interface KnexMigrationsLockAttributes {
-  isLocked?: number;
   index: number;
+  isLocked?: number;
 }
 
 export type KnexMigrationsLockPk = "index";
 export type KnexMigrationsLockId = KnexMigrationsLock[KnexMigrationsLockPk];
-export type KnexMigrationsLockOptionalAttributes = "isLocked" | "index";
+export type KnexMigrationsLockOptionalAttributes = "index" | "isLocked";
 export type KnexMigrationsLockCreationAttributes = Optional<KnexMigrationsLockAttributes, KnexMigrationsLockOptionalAttributes>;
 
 export class KnexMigrationsLock extends Model<KnexMigrationsLockAttributes, KnexMigrationsLockCreationAttributes> implements KnexMigrationsLockAttributes {
-  isLocked?: number;
   index!: number;
+  isLocked?: number;
 
 
   static initModel(sequelize: Sequelize.Sequelize): typeof KnexMigrationsLock {
     return KnexMigrationsLock.init({
-    isLocked: {
-      type: DataTypes.INTEGER,
-      allowNull: true,
-      field: 'is_locked'
-    },
     index: {
       autoIncrement: true,
       type: DataTypes.INTEGER,
       allowNull: false,
       primaryKey: true
+    },
+    isLocked: {
+      type: DataTypes.INTEGER,
+      allowNull: true,
+      field: 'is_locked'
     }
   }, {
     sequelize,

package/models/MerchItem.ts

@@ -8,6 +8,7 @@ import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserLikes, UserLikesId } from './UserLikes';
 
 export interface MerchItemAttributes {
+  id: string;
   canonArtistId: string;
   merchTypeId: string;
   merchPlatformId: string;
@@ -16,7 +17,6 @@ export interface MerchItemAttributes {
   description: string;
   photo?: string;
   popularity?: number;
-  id: string;
   inactive?: boolean;
   createDate: Date;
   updateDate: Date;
@@ -24,10 +24,11 @@ export interface MerchItemAttributes {
 
 export type MerchItemPk = "id";
 export type MerchItemId = MerchItem[MerchItemPk];
-export type MerchItemOptionalAttributes = "photo" | "popularity" | "id" | "inactive" | "createDate" | "updateDate";
+export type MerchItemOptionalAttributes = "id" | "photo" | "popularity" | "inactive" | "createDate" | "updateDate";
 export type MerchItemCreationAttributes = Optional<MerchItemAttributes, MerchItemOptionalAttributes>;
 
 export class MerchItem extends Model<MerchItemAttributes, MerchItemCreationAttributes> implements MerchItemAttributes {
+  id!: string;
   canonArtistId!: string;
   merchTypeId!: string;
   merchPlatformId!: string;
@@ -36,7 +37,6 @@ export class MerchItem extends Model<MerchItemAttributes, MerchItemCreationAttri
   description!: string;
   photo?: string;
   popularity?: number;
-  id!: string;
   inactive?: boolean;
   createDate!: Date;
   updateDate!: Date;
@@ -95,6 +95,12 @@ export class MerchItem extends Model<MerchItemAttributes, MerchItemCreationAttri
 
   static initModel(sequelize: Sequelize.Sequelize): typeof MerchItem {
     return MerchItem.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     canonArtistId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -143,12 +149,6 @@ export class MerchItem extends Model<MerchItemAttributes, MerchItemCreationAttri
       type: DataTypes.SMALLINT,
       allowNull: true
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     inactive: {
       type: DataTypes.BOOLEAN,
       allowNull: true,

package/models/MerchOrchestration.ts

@@ -5,28 +5,28 @@ import type { MerchPlatform, MerchPlatformId } from './MerchPlatform';
 import type { MerchType, MerchTypeId } from './MerchType';
 
 export interface MerchOrchestrationAttributes {
+  id: string;
   canonArtistId: string;
   merchTypeId: string;
   merchPlatformId: string;
   errorMessage?: string;
   lastHarvestDate?: Date;
-  id: string;
   createDate: Date;
   updateDate: Date;
 }
 
 export type MerchOrchestrationPk = "id";
 export type MerchOrchestrationId = MerchOrchestration[MerchOrchestrationPk];
-export type MerchOrchestrationOptionalAttributes = "errorMessage" | "lastHarvestDate" | "id" | "createDate" | "updateDate";
+export type MerchOrchestrationOptionalAttributes = "id" | "errorMessage" | "lastHarvestDate" | "createDate" | "updateDate";
 export type MerchOrchestrationCreationAttributes = Optional<MerchOrchestrationAttributes, MerchOrchestrationOptionalAttributes>;
 
 export class MerchOrchestration extends Model<MerchOrchestrationAttributes, MerchOrchestrationCreationAttributes> implements MerchOrchestrationAttributes {
+  id!: string;
   canonArtistId!: string;
   merchTypeId!: string;
   merchPlatformId!: string;
   errorMessage?: string;
   lastHarvestDate?: Date;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -48,6 +48,12 @@ export class MerchOrchestration extends Model<MerchOrchestrationAttributes, Merc
 
   static initModel(sequelize: Sequelize.Sequelize): typeof MerchOrchestration {
     return MerchOrchestration.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     canonArtistId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -85,12 +91,6 @@ export class MerchOrchestration extends Model<MerchOrchestrationAttributes, Merc
       allowNull: true,
       field: 'last_harvest_date'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,