@earbug/db-models 0.0.7 → 0.0.9

package/dist/init-models.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlatformAlbumGenreRelation = exports.PlatformAlbum = exports.Platform = exports.PauseStatusType = exports.NewsSite = exports.MetricsEvent = exports.MetricsDaily = exports.KnexMigrationsLock = exports.KnexMigrations = exports.JukeboxUserType = exports.JukeboxUser = exports.JukeboxType = exports.JukeboxTerminationCondition = exports.JukeboxStatus = exports.JukeboxSession = exports.JukeboxQueueMode = exports.JukeboxQueueEntry = exports.JukeboxInvite = exports.JukeboxCanonGenreRelation = exports.JukeboxAccessType = exports.ExternalReference = exports.ConfigParam = exports.CanonTrack = exports.CanonToPlatformTrackRelation = exports.CanonToPlatformGenreRelation = exports.CanonToPlatformArtistRelation = exports.CanonToPlatformAlbumRelation = exports.CanonMemberExternalReferenceRelation = exports.CanonMember = exports.CanonLabelExternalReferenceRelation = exports.CanonLabel = exports.CanonGenreExternalReferenceRelation = exports.CanonGenre = exports.CanonArtistTrackRelation = exports.CanonArtistMemberRelation = exports.CanonArtistImageHarvested = exports.CanonArtistGenreRelation = exports.CanonArtistExternalReferenceRelation = exports.CanonArtistAlbumRelation = exports.CanonArtist = exports.CanonAlbumTrackRelation = exports.CanonAlbumLabelRelation = exports.CanonAlbumImageHarvested = exports.CanonAlbumGenreRelation = exports.CanonAlbumExternalReferenceRelation = exports.CanonAlbum = exports.AppUserPlatformRelation = exports.AppUserFollowRelation = exports.AppUserDevice = exports.AppUser = void 0;
-exports.UserContacts = exports.UnmatchedArtist = exports.UnmatchedAlbum = exports.TrackDeletionReason = exports.State = exports.PlaybackStatusType = exports.PlaybackStatus = exports.PlatformUserPlaylistTrack = exports.PlatformUserPlaylist = exports.PlatformUserAlbumTrack = exports.PlatformUserAlbum = exports.PlatformTrackGenreRelation = exports.PlatformTrack = exports.PlatformGenre = exports.PlatformArtistTrackRelation = exports.PlatformArtistGenreRelation = exports.PlatformArtistAlbumRelation = exports.PlatformArtist = exports.PlatformAlbumTrackRelation = void 0;
+exports.Platform = exports.PauseStatusType = exports.NotificationType = exports.Notification = exports.NewsSite = exports.MetricsEvent = exports.MetricsDaily = exports.KnexMigrationsLock = exports.KnexMigrations = exports.JukeboxUserType = exports.JukeboxUser = exports.JukeboxType = exports.JukeboxTerminationCondition = exports.JukeboxStatus = exports.JukeboxSession = exports.JukeboxQueueMode = exports.JukeboxQueueEntry = exports.JukeboxInvite = exports.JukeboxCanonGenreRelation = exports.JukeboxAccessType = exports.ExternalReference = exports.ConfigParam = exports.CanonTrack = exports.CanonToPlatformTrackRelation = exports.CanonToPlatformGenreRelation = exports.CanonToPlatformArtistRelation = exports.CanonToPlatformAlbumRelation = exports.CanonMemberExternalReferenceRelation = exports.CanonMember = exports.CanonLabelExternalReferenceRelation = exports.CanonLabel = exports.CanonGenreExternalReferenceRelation = exports.CanonGenre = exports.CanonArtistTrackRelation = exports.CanonArtistMemberRelation = exports.CanonArtistImageHarvested = exports.CanonArtistGenreRelation = exports.CanonArtistExternalReferenceRelation = exports.CanonArtistAlbumRelation = exports.CanonArtist = exports.CanonAlbumTrackRelation = exports.CanonAlbumLabelRelation = exports.CanonAlbumImageHarvested = exports.CanonAlbumGenreRelation = exports.CanonAlbumExternalReferenceRelation = exports.CanonAlbum = exports.AppUserPlatformRelation = exports.AppUserFollowRelation = exports.AppUserDevice = exports.AppUser = void 0;
+exports.UserContacts = exports.UnmatchedArtist = exports.UnmatchedAlbum = exports.TrackDeletionReason = exports.State = exports.PlaybackStatusType = exports.PlaybackStatus = exports.PlatformUserPlaylistTrack = exports.PlatformUserPlaylist = exports.PlatformUserAlbumTrack = exports.PlatformUserAlbum = exports.PlatformTrackGenreRelation = exports.PlatformTrack = exports.PlatformGenre = exports.PlatformArtistTrackRelation = exports.PlatformArtistGenreRelation = exports.PlatformArtistAlbumRelation = exports.PlatformArtist = exports.PlatformAlbumTrackRelation = exports.PlatformAlbumGenreRelation = exports.PlatformAlbum = void 0;
 exports.initModels = initModels;
 const AppUser_1 = require("./AppUser");
 Object.defineProperty(exports, "AppUser", { enumerable: true, get: function () { return AppUser_1.AppUser; } });
@@ -95,6 +95,10 @@ const MetricsEvent_1 = require("./MetricsEvent");
 Object.defineProperty(exports, "MetricsEvent", { enumerable: true, get: function () { return MetricsEvent_1.MetricsEvent; } });
 const NewsSite_1 = require("./NewsSite");
 Object.defineProperty(exports, "NewsSite", { enumerable: true, get: function () { return NewsSite_1.NewsSite; } });
+const Notification_1 = require("./Notification");
+Object.defineProperty(exports, "Notification", { enumerable: true, get: function () { return Notification_1.Notification; } });
+const NotificationType_1 = require("./NotificationType");
+Object.defineProperty(exports, "NotificationType", { enumerable: true, get: function () { return NotificationType_1.NotificationType; } });
 const PauseStatusType_1 = require("./PauseStatusType");
 Object.defineProperty(exports, "PauseStatusType", { enumerable: true, get: function () { return PauseStatusType_1.PauseStatusType; } });
 const Platform_1 = require("./Platform");
@@ -188,6 +192,8 @@ function initModels(sequelize) {
     const MetricsDaily = MetricsDaily_1.MetricsDaily.initModel(sequelize);
     const MetricsEvent = MetricsEvent_1.MetricsEvent.initModel(sequelize);
     const NewsSite = NewsSite_1.NewsSite.initModel(sequelize);
+    const Notification = Notification_1.Notification.initModel(sequelize);
+    const NotificationType = NotificationType_1.NotificationType.initModel(sequelize);
     const PauseStatusType = PauseStatusType_1.PauseStatusType.initModel(sequelize);
     const Platform = Platform_1.Platform.initModel(sequelize);
     const PlatformAlbum = PlatformAlbum_1.PlatformAlbum.initModel(sequelize);
@@ -271,6 +277,10 @@ function initModels(sequelize) {
     AppUser.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "trackAddedUserId" });
     JukeboxUser.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId" });
     AppUser.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "appUserId" });
+    Notification.belongsTo(AppUser, { as: "sourceUser", foreignKey: "sourceUserId" });
+    AppUser.hasMany(Notification, { as: "notifications", foreignKey: "sourceUserId" });
+    Notification.belongsTo(AppUser, { as: "targetUser", foreignKey: "targetUserId" });
+    AppUser.hasMany(Notification, { as: "targetUserNotifications", foreignKey: "targetUserId" });
     PlatformUserAlbum.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId" });
     AppUser.hasMany(PlatformUserAlbum, { as: "platformUserAlbums", foreignKey: "appUserId" });
     PlatformUserPlaylist.belongsTo(AppUser, { as: "appUser", foreignKey: "appUserId" });
@@ -343,6 +353,8 @@ function initModels(sequelize) {
     JukeboxSession.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "jukeboxSessionId" });
     JukeboxUser.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId" });
     JukeboxSession.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxSessionId" });
+    Notification.belongsTo(JukeboxSession, { as: "jukeboxSession", foreignKey: "jukeboxSessionId" });
+    JukeboxSession.hasMany(Notification, { as: "notifications", foreignKey: "jukeboxSessionId" });
     JukeboxSession.belongsTo(JukeboxStatus, { as: "jukeboxStatus", foreignKey: "jukeboxStatusId" });
     JukeboxStatus.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "jukeboxStatusId" });
     JukeboxSession.belongsTo(JukeboxTerminationCondition, { as: "terminationCondition", foreignKey: "terminationConditionId" });
@@ -351,6 +363,8 @@ function initModels(sequelize) {
     JukeboxType.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "typeId" });
     JukeboxUser.belongsTo(JukeboxUserType, { as: "jukeboxUserType", foreignKey: "jukeboxUserTypeId" });
     JukeboxUserType.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "jukeboxUserTypeId" });
+    Notification.belongsTo(NotificationType, { as: "notificationType", foreignKey: "notificationTypeId" });
+    NotificationType.hasMany(Notification, { as: "notifications", foreignKey: "notificationTypeId" });
     JukeboxUser.belongsTo(PauseStatusType, { as: "pauseStatusType", foreignKey: "pauseStatusTypeId" });
     PauseStatusType.hasMany(JukeboxUser, { as: "jukeboxUsers", foreignKey: "pauseStatusTypeId" });
     AppUserPlatformRelation.belongsTo(Platform, { as: "platform", foreignKey: "platformId" });
@@ -427,8 +441,8 @@ function initModels(sequelize) {
     PlatformUserAlbum.hasMany(PlatformUserAlbumTrack, { as: "platformUserAlbumTracks", foreignKey: "platformUserAlbumId" });
     PlatformUserPlaylistTrack.belongsTo(PlatformUserPlaylist, { as: "platformUserPlaylist", foreignKey: "platformUserPlaylistId" });
     PlatformUserPlaylist.hasMany(PlatformUserPlaylistTrack, { as: "platformUserPlaylistTracks", foreignKey: "platformUserPlaylistId" });
-    JukeboxQueueEntry.belongsTo(PlaybackStatus, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId" });
-    PlaybackStatus.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId" });
+    JukeboxQueueEntry.belongsTo(PlaybackStatusType, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId" });
+    PlaybackStatusType.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId" });
     AppUser.belongsTo(State, { as: "state", foreignKey: "stateId" });
     State.hasMany(AppUser, { as: "appUsers", foreignKey: "stateId" });
     PlatformUserPlaylist.belongsTo(State, { as: "state", foreignKey: "stateId" });
@@ -484,6 +498,8 @@ function initModels(sequelize) {
         MetricsDaily: MetricsDaily,
         MetricsEvent: MetricsEvent,
         NewsSite: NewsSite,
+        Notification: Notification,
+        NotificationType: NotificationType,
         PauseStatusType: PauseStatusType,
         Platform: Platform,
         PlatformAlbum: PlatformAlbum,

package/models/AppUser.ts

@@ -6,19 +6,20 @@ import type { AppUserPlatformRelation, AppUserPlatformRelationCreationAttributes
 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;
@@ -27,17 +28,17 @@ 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 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;
@@ -132,6 +133,30 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
   hasJukeboxUser!: Sequelize.HasManyHasAssociationMixin<JukeboxUser, JukeboxUserId>;
   hasJukeboxUsers!: Sequelize.HasManyHasAssociationsMixin<JukeboxUser, JukeboxUserId>;
   countJukeboxUsers!: Sequelize.HasManyCountAssociationsMixin;
+  // AppUser hasMany Notification via sourceUserId
+  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;
+  // AppUser hasMany Notification via targetUserId
+  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;
   // AppUser hasMany PlatformUserAlbum via appUserId
   platformUserAlbums!: PlatformUserAlbum[];
   getPlatformUserAlbums!: Sequelize.HasManyGetAssociationsMixin<PlatformUserAlbum>;
@@ -176,12 +201,6 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUser {
     return AppUser.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     email: {
       type: DataTypes.TEXT,
       allowNull: false,
@@ -192,6 +211,12 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
       allowNull: false,
       field: 'first_name'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -204,9 +229,15 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'update_date'
     },
+    syncContacts: {
+      type: DataTypes.BOOLEAN,
+      allowNull: true,
+      defaultValue: false,
+      field: 'sync_contacts'
+    },
     stateId: {
       type: DataTypes.SMALLINT,
-      allowNull: false,
+      allowNull: true,
       defaultValue: 0,
       references: {
         model: 'state',
@@ -214,12 +245,6 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
       },
       field: 'state_id'
     },
-    syncContacts: {
-      type: DataTypes.BOOLEAN,
-      allowNull: true,
-      defaultValue: false,
-      field: 'sync_contacts'
-    },
     lastName: {
       type: DataTypes.TEXT,
       allowNull: true,

package/models/AppUserDevice.ts

@@ -4,10 +4,10 @@ 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";
@@ -17,10 +17,10 @@ export type AppUserDeviceCreationAttributes = Optional<AppUserDeviceAttributes,
 
 export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceCreationAttributes> implements AppUserDeviceAttributes {
   id!: string;
+  createdAt!: Date;
   appUserId!: string;
-  platformId!: number;
+  devicePlatformId!: number;
   endpointArn!: string;
-  createdAt!: Date;
 
   // AppUserDevice belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -36,6 +36,12 @@ export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceC
       defaultValue: DataTypes.UUIDV4,
       primaryKey: true
     },
+    createdAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'created_at'
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -45,22 +51,16 @@ export class AppUserDevice extends Model<AppUserDeviceAttributes, AppUserDeviceC
       },
       field: 'app_user_id'
     },
-    platformId: {
+    devicePlatformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
-      field: 'platform_id'
+      field: 'device_platform_id'
     },
     endpointArn: {
       type: DataTypes.TEXT,
       allowNull: false,
       unique: "unique_app_user_device_endpoint_arn",
       field: 'endpoint_arn'
-    },
-    createdAt: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'created_at'
     }
   }, {
     sequelize,

package/models/AppUserFollowRelation.ts

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

package/models/AppUserPlatformRelation.ts

@@ -4,35 +4,35 @@ 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 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;
 
   // AppUserPlatformRelation belongsTo AppUser via appUserId
@@ -48,12 +48,6 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
 
   static initModel(sequelize: Sequelize.Sequelize): typeof AppUserPlatformRelation {
     return AppUserPlatformRelation.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -78,18 +72,6 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
       allowNull: false,
       field: 'external_user_id'
     },
-    createDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'create_date'
-    },
-    updateDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'update_date'
-    },
     accessToken: {
       type: DataTypes.STRING,
       allowNull: false,
@@ -110,6 +92,24 @@ export class AppUserPlatformRelation extends Model<AppUserPlatformRelationAttrib
       allowNull: false,
       field: 'country_code'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
+    createDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'create_date'
+    },
+    updateDate: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'update_date'
+    },
     stateId: {
       type: DataTypes.SMALLINT,
       allowNull: false,

package/models/CanonAlbum.ts

@@ -9,36 +9,36 @@ 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 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;
 
@@ -129,12 +129,6 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbum {
     return CanonAlbum.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     name: {
       type: DataTypes.TEXT,
       allowNull: false
@@ -154,6 +148,16 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
       allowNull: true,
       field: 'no_of_disc'
     },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -178,10 +182,6 @@ export class CanonAlbum extends Model<CanonAlbumAttributes, CanonAlbumCreationAt
       defaultValue: false,
       field: 'has_thumbnail_photo'
     },
-    description: {
-      type: DataTypes.TEXT,
-      allowNull: true
-    },
     images: {
       type: DataTypes.JSONB,
       allowNull: true

package/models/CanonAlbumImageHarvested.ts

@@ -3,28 +3,28 @@ import { DataTypes, 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 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;
 
   // CanonAlbumImageHarvested belongsTo CanonAlbum via canonAlbumId
   canonAlbum!: CanonAlbum;
@@ -34,31 +34,6 @@ export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttr
 
   static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbumImageHarvested {
     return CanonAlbumImageHarvested.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    canonAlbumId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      references: {
-        model: 'canon_album',
-        key: 'id'
-      },
-      field: 'canon_album_id'
-    },
-    priority: {
-      type: DataTypes.DECIMAL,
-      allowNull: true,
-      defaultValue: 0
-    },
-    url: {
-      type: DataTypes.TEXT,
-      allowNull: true,
-      unique: "canon_album_image_harvested_url_unique"
-    },
     dateHarvested: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -73,6 +48,30 @@ export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttr
       type: DataTypes.STRING(255),
       allowNull: true,
       field: 'harvest_method'
+    },
+    priority: {
+      type: DataTypes.DECIMAL,
+      allowNull: true,
+      defaultValue: 0
+    },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
+    url: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    canonAlbumId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      references: {
+        model: 'canon_album',
+        key: 'id'
+      },
+      field: 'canon_album_id'
     }
   }, {
     sequelize,
@@ -93,13 +92,6 @@ export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttr
           { name: "id" },
         ]
       },
-      {
-        name: "canon_album_image_harvested_url_unique",
-        unique: true,
-        fields: [
-          { name: "url" },
-        ]
-      },
     ]
   });
   }