@earbug/db-models 0.0.7 → 0.0.9

package/models/JukeboxQueueEntry.ts

@@ -4,42 +4,42 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { CanonTrack, CanonTrackId } from './CanonTrack';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 import type { JukeboxUser, JukeboxUserId } from './JukeboxUser';
-import type { PlaybackStatus, PlaybackStatusId } from './PlaybackStatus';
+import type { PlaybackStatusType, PlaybackStatusTypeId } from './PlaybackStatusType';
 import type { TrackDeletionReason, TrackDeletionReasonId } from './TrackDeletionReason';
 
 export interface JukeboxQueueEntryAttributes {
-  id: string;
   jukeboxSessionId: string;
   trackId: string;
   playbackPriority?: number;
   trackAddedUserId: string;
+  playbackStarted?: Date;
+  id: string;
   createdAt: Date;
   updatedAt: Date;
   setOrder: number;
   trackDeletionReasonId: number;
   playbackStatusTypeId: number;
-  playbackStarted?: Date;
   trackThumbsUp?: string[];
   trackThumbsDown?: string[];
 }
 
 export type JukeboxQueueEntryPk = "id";
 export type JukeboxQueueEntryId = JukeboxQueueEntry[JukeboxQueueEntryPk];
-export type JukeboxQueueEntryOptionalAttributes = "id" | "playbackPriority" | "createdAt" | "updatedAt" | "setOrder" | "trackDeletionReasonId" | "playbackStatusTypeId" | "playbackStarted" | "trackThumbsUp" | "trackThumbsDown";
+export type JukeboxQueueEntryOptionalAttributes = "playbackPriority" | "playbackStarted" | "id" | "createdAt" | "updatedAt" | "setOrder" | "trackDeletionReasonId" | "playbackStatusTypeId" | "trackThumbsUp" | "trackThumbsDown";
 export type JukeboxQueueEntryCreationAttributes = Optional<JukeboxQueueEntryAttributes, JukeboxQueueEntryOptionalAttributes>;
 
 export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, JukeboxQueueEntryCreationAttributes> implements JukeboxQueueEntryAttributes {
-  id!: string;
   jukeboxSessionId!: string;
   trackId!: string;
   playbackPriority?: number;
   trackAddedUserId!: string;
+  playbackStarted?: Date;
+  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
   setOrder!: number;
   trackDeletionReasonId!: number;
   playbackStatusTypeId!: number;
-  playbackStarted?: Date;
   trackThumbsUp?: string[];
   trackThumbsDown?: string[];
 
@@ -70,11 +70,11 @@ export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, Jukebo
   getJukeboxSession!: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
   setJukeboxSession!: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;
   createJukeboxSession!: Sequelize.BelongsToCreateAssociationMixin<JukeboxSession>;
-  // JukeboxQueueEntry belongsTo PlaybackStatus via playbackStatusTypeId
-  playbackStatusType!: PlaybackStatus;
-  getPlaybackStatusType!: Sequelize.BelongsToGetAssociationMixin<PlaybackStatus>;
-  setPlaybackStatusType!: Sequelize.BelongsToSetAssociationMixin<PlaybackStatus, PlaybackStatusId>;
-  createPlaybackStatusType!: Sequelize.BelongsToCreateAssociationMixin<PlaybackStatus>;
+  // JukeboxQueueEntry belongsTo PlaybackStatusType via playbackStatusTypeId
+  playbackStatusType!: PlaybackStatusType;
+  getPlaybackStatusType!: Sequelize.BelongsToGetAssociationMixin<PlaybackStatusType>;
+  setPlaybackStatusType!: Sequelize.BelongsToSetAssociationMixin<PlaybackStatusType, PlaybackStatusTypeId>;
+  createPlaybackStatusType!: Sequelize.BelongsToCreateAssociationMixin<PlaybackStatusType>;
   // JukeboxQueueEntry belongsTo TrackDeletionReason via trackDeletionReasonId
   trackDeletionReason!: TrackDeletionReason;
   getTrackDeletionReason!: Sequelize.BelongsToGetAssociationMixin<TrackDeletionReason>;
@@ -83,12 +83,6 @@ export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, Jukebo
 
   static initModel(sequelize: Sequelize.Sequelize): typeof JukeboxQueueEntry {
     return JukeboxQueueEntry.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     jukeboxSessionId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -121,6 +115,17 @@ export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, Jukebo
       },
       field: 'track_added_user_id'
     },
+    playbackStarted: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'playback_started'
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -154,16 +159,11 @@ export class JukeboxQueueEntry extends Model<JukeboxQueueEntryAttributes, Jukebo
       allowNull: false,
       defaultValue: 0,
       references: {
-        model: 'playback_status',
+        model: 'playback_status_type',
         key: 'id'
       },
       field: 'playback_status_type_id'
     },
-    playbackStarted: {
-      type: DataTypes.DATE,
-      allowNull: true,
-      field: 'playback_started'
-    },
     trackThumbsUp: {
       type: DataTypes.ARRAY(DataTypes.UUID),
       allowNull: true,

package/models/JukeboxQueueMode.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxQueueModeAttributes {
-  id: number;
   description: string;
+  id: number;
 }
 
 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 {
-  id!: number;
   description!: string;
+  id!: number;
 
   // 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

@@ -9,39 +9,40 @@ import type { JukeboxStatus, JukeboxStatusId } from './JukeboxStatus';
 import type { JukeboxTerminationCondition, JukeboxTerminationConditionId } from './JukeboxTerminationCondition';
 import type { JukeboxType, JukeboxTypeId } from './JukeboxType';
 import type { JukeboxUser, JukeboxUserId } from './JukeboxUser';
+import type { Notification, NotificationId } from './Notification';
 
 export interface JukeboxSessionAttributes {
-  id: string;
   typeId: number;
   accessTypeId: number;
   terminationConditionId: number;
   jukeboxQueueModeId: number;
+  trackQueue?: string[];
+  stateMachineArn?: string;
+  id: string;
   createdAt: Date;
   updatedAt: Date;
-  jukeboxStatusId: number;
-  trackQueue?: string[];
   description?: string;
-  stateMachineArn?: string;
+  jukeboxStatusId: number;
   durationMs: number;
 }
 
 export type JukeboxSessionPk = "id";
 export type JukeboxSessionId = JukeboxSession[JukeboxSessionPk];
-export type JukeboxSessionOptionalAttributes = "id" | "createdAt" | "updatedAt" | "jukeboxStatusId" | "trackQueue" | "description" | "stateMachineArn" | "durationMs";
+export type JukeboxSessionOptionalAttributes = "trackQueue" | "stateMachineArn" | "id" | "createdAt" | "updatedAt" | "description" | "jukeboxStatusId" | "durationMs";
 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;
-  jukeboxStatusId!: number;
-  trackQueue?: string[];
   description?: string;
-  stateMachineArn?: string;
+  jukeboxStatusId!: number;
   durationMs!: number;
 
   // JukeboxSession belongsTo JukeboxAccessType via accessTypeId
@@ -102,6 +103,18 @@ export class JukeboxSession extends Model<JukeboxSessionAttributes, JukeboxSessi
   hasJukeboxUser!: Sequelize.HasManyHasAssociationMixin<JukeboxUser, JukeboxUserId>;
   hasJukeboxUsers!: Sequelize.HasManyHasAssociationsMixin<JukeboxUser, JukeboxUserId>;
   countJukeboxUsers!: Sequelize.HasManyCountAssociationsMixin;
+  // JukeboxSession hasMany Notification via jukeboxSessionId
+  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;
   // JukeboxSession belongsTo JukeboxStatus via jukeboxStatusId
   jukeboxStatus!: JukeboxStatus;
   getJukeboxStatus!: Sequelize.BelongsToGetAssociationMixin<JukeboxStatus>;
@@ -120,12 +133,6 @@ 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,
@@ -162,6 +169,22 @@ 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,
@@ -174,6 +197,10 @@ 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,
@@ -184,20 +211,6 @@ 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/JukeboxTerminationCondition.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 
 export interface JukeboxTerminationConditionAttributes {
-  id: number;
   description: string;
+  id: number;
 }
 
 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 {
-  id!: number;
   description!: string;
+  id!: number;
 
   // 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 {
-  id: number;
   description: string;
+  id: number;
 }
 
 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 {
-  id!: number;
   description!: string;
+  id!: number;
 
   // 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 = "id" | "createdAt" | "updatedAt" | "enterDate" | "exitDate" | "jukeboxUserTypeId" | "pauseStatusTypeId" | "pausedQueueEntryId";
+export type JukeboxUserOptionalAttributes = "exitDate" | "pausedQueueEntryId" | "id" | "createdAt" | "updatedAt" | "enterDate" | "jukeboxUserTypeId" | "pauseStatusTypeId";
 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,12 +64,6 @@ 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,
@@ -90,6 +84,26 @@ 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,
@@ -108,11 +122,6 @@ 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,
@@ -132,15 +141,6 @@ 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,32 +2,26 @@ 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 = "id" | "name" | "batch" | "migrationTime";
+export type KnexMigrationsOptionalAttributes = "name" | "batch" | "migrationTime" | "id";
 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
@@ -40,6 +34,12 @@ 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 {
-  index: number;
   isLocked?: number;
+  index: number;
 }
 
 export type KnexMigrationsLockPk = "index";
 export type KnexMigrationsLockId = KnexMigrationsLock[KnexMigrationsLockPk];
-export type KnexMigrationsLockOptionalAttributes = "index" | "isLocked";
+export type KnexMigrationsLockOptionalAttributes = "isLocked" | "index";
 export type KnexMigrationsLockCreationAttributes = Optional<KnexMigrationsLockAttributes, KnexMigrationsLockOptionalAttributes>;
 
 export class KnexMigrationsLock extends Model<KnexMigrationsLockAttributes, KnexMigrationsLockCreationAttributes> implements KnexMigrationsLockAttributes {
-  index!: number;
   isLocked?: number;
+  index!: 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/MetricsDaily.ts

@@ -4,20 +4,20 @@ import { DataTypes, Model, Optional } from 'sequelize';
 export interface MetricsDailyAttributes {
   day?: string;
   eventType: string;
+  metrics?: object;
   createdAt: Date;
   updatedAt: Date;
-  metrics?: object;
 }
 
-export type MetricsDailyOptionalAttributes = "day" | "createdAt" | "updatedAt" | "metrics";
+export type MetricsDailyOptionalAttributes = "day" | "metrics" | "createdAt" | "updatedAt";
 export type MetricsDailyCreationAttributes = Optional<MetricsDailyAttributes, MetricsDailyOptionalAttributes>;
 
 export class MetricsDaily extends Model<MetricsDailyAttributes, MetricsDailyCreationAttributes> implements MetricsDailyAttributes {
   day?: string;
   eventType!: string;
+  metrics?: object;
   createdAt!: Date;
   updatedAt!: Date;
-  metrics?: object;
 
 
   static initModel(sequelize: Sequelize.Sequelize): typeof MetricsDaily {
@@ -31,6 +31,10 @@ export class MetricsDaily extends Model<MetricsDailyAttributes, MetricsDailyCrea
       allowNull: false,
       field: 'event_type'
     },
+    metrics: {
+      type: DataTypes.JSONB,
+      allowNull: true
+    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -42,10 +46,6 @@ export class MetricsDaily extends Model<MetricsDailyAttributes, MetricsDailyCrea
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
-    },
-    metrics: {
-      type: DataTypes.JSONB,
-      allowNull: true
     }
   }, {
     sequelize,

package/models/NewsSite.ts

@@ -2,34 +2,28 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 
 export interface NewsSiteAttributes {
-  id: number;
   name: string;
   domain?: string;
   scrapingBaseUrl: string;
+  id: number;
   active?: boolean;
 }
 
 export type NewsSitePk = "id";
 export type NewsSiteId = NewsSite[NewsSitePk];
-export type NewsSiteOptionalAttributes = "id" | "domain" | "active";
+export type NewsSiteOptionalAttributes = "domain" | "id" | "active";
 export type NewsSiteCreationAttributes = Optional<NewsSiteAttributes, NewsSiteOptionalAttributes>;
 
 export class NewsSite extends Model<NewsSiteAttributes, NewsSiteCreationAttributes> implements NewsSiteAttributes {
-  id!: number;
   name!: string;
   domain?: string;
   scrapingBaseUrl!: string;
+  id!: number;
   active?: boolean;
 
 
   static initModel(sequelize: Sequelize.Sequelize): typeof NewsSite {
     return NewsSite.init({
-    id: {
-      autoIncrement: true,
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      primaryKey: true
-    },
     name: {
       type: DataTypes.STRING(255),
       allowNull: false,
@@ -44,6 +38,12 @@ export class NewsSite extends Model<NewsSiteAttributes, NewsSiteCreationAttribut
       allowNull: false,
       field: 'scraping_base_url'
     },
+    id: {
+      autoIncrement: true,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true
+    },
     active: {
       type: DataTypes.BOOLEAN,
       allowNull: true,