@earbug/db-models 0.0.60 → 0.0.63

package/models/PlatformUserAlbum.ts

@@ -6,11 +6,11 @@ import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformUserAlbumTrack, PlatformUserAlbumTrackId } from './PlatformUserAlbumTrack';
 
 export interface PlatformUserAlbumAttributes {
+  id: string;
   appUserId: string;
   platformId: number;
   externalUserAlbumId: string;
   platformAlbumId: string;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
   stateId: number;
@@ -22,11 +22,11 @@ export type PlatformUserAlbumOptionalAttributes = "id" | "createdAt" | "updatedA
 export type PlatformUserAlbumCreationAttributes = Optional<PlatformUserAlbumAttributes, PlatformUserAlbumOptionalAttributes>;
 
 export class PlatformUserAlbum extends Model<PlatformUserAlbumAttributes, PlatformUserAlbumCreationAttributes> implements PlatformUserAlbumAttributes {
+  id!: string;
   appUserId!: string;
   platformId!: number;
   externalUserAlbumId!: string;
   platformAlbumId!: string;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
   stateId!: number;
@@ -61,6 +61,12 @@ export class PlatformUserAlbum extends Model<PlatformUserAlbumAttributes, Platfo
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserAlbum {
     return PlatformUserAlbum.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -95,12 +101,6 @@ export class PlatformUserAlbum extends Model<PlatformUserAlbumAttributes, Platfo
       unique: "platform_user_album_app_user_id_platform_album_id_unique",
       field: 'platform_album_id'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/PlatformUserAlbumTrack.ts

@@ -5,14 +5,14 @@ import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
 import type { PlatformUserAlbum, PlatformUserAlbumId } from './PlatformUserAlbum';
 
 export interface PlatformUserAlbumTrackAttributes {
+  id: string;
   platformUserAlbumId: string;
   platformId: number;
   externalUserAlbumTrackId: string;
   platformTrackId: string;
-  stateId: number;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
+  stateId: number;
 }
 
 export type PlatformUserAlbumTrackPk = "id";
@@ -21,14 +21,14 @@ export type PlatformUserAlbumTrackOptionalAttributes = "id" | "createdAt" | "upd
 export type PlatformUserAlbumTrackCreationAttributes = Optional<PlatformUserAlbumTrackAttributes, PlatformUserAlbumTrackOptionalAttributes>;
 
 export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttributes, PlatformUserAlbumTrackCreationAttributes> implements PlatformUserAlbumTrackAttributes {
+  id!: string;
   platformUserAlbumId!: string;
   platformId!: number;
   externalUserAlbumTrackId!: string;
   platformTrackId!: string;
-  stateId!: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
+  stateId!: number;
 
   // PlatformUserAlbumTrack belongsTo Platform via platformId
   platform!: Platform;
@@ -48,6 +48,12 @@ export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttribut
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserAlbumTrack {
     return PlatformUserAlbumTrack.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     platformUserAlbumId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -82,17 +88,6 @@ export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttribut
       unique: "platform_user_album_track_platform_user_album_id_platform_track",
       field: 'platform_track_id'
     },
-    stateId: {
-      type: DataTypes.SMALLINT,
-      allowNull: false,
-      field: 'state_id'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,
@@ -104,6 +99,11 @@ export class PlatformUserAlbumTrack extends Model<PlatformUserAlbumTrackAttribut
       allowNull: false,
       defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       field: 'updated_at'
+    },
+    stateId: {
+      type: DataTypes.SMALLINT,
+      allowNull: false,
+      field: 'state_id'
     }
   }, {
     sequelize,

package/models/PlatformUserPlaylist.ts

@@ -12,14 +12,14 @@ import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserLikes, UserLikesId } from './UserLikes';
 
 export interface PlatformUserPlaylistAttributes {
+  id: string;
   appUserId: string;
   platformId: number;
   externalPlaylistId: string;
   name: string;
   description?: string;
-  snapshotId: string;
-  id: string;
   public?: boolean;
+  snapshotId: string;
   collaborative: boolean;
   createDate: Date;
   updateDate: Date;
@@ -29,18 +29,18 @@ export interface PlatformUserPlaylistAttributes {
 
 export type PlatformUserPlaylistPk = "id";
 export type PlatformUserPlaylistId = PlatformUserPlaylist[PlatformUserPlaylistPk];
-export type PlatformUserPlaylistOptionalAttributes = "description" | "id" | "public" | "createDate" | "updateDate" | "stateId" | "earbugAccessControlPreference";
+export type PlatformUserPlaylistOptionalAttributes = "id" | "description" | "public" | "createDate" | "updateDate" | "stateId" | "earbugAccessControlPreference";
 export type PlatformUserPlaylistCreationAttributes = Optional<PlatformUserPlaylistAttributes, PlatformUserPlaylistOptionalAttributes>;
 
 export class PlatformUserPlaylist extends Model<PlatformUserPlaylistAttributes, PlatformUserPlaylistCreationAttributes> implements PlatformUserPlaylistAttributes {
+  id!: string;
   appUserId!: string;
   platformId!: number;
   externalPlaylistId!: string;
   name!: string;
   description?: string;
-  snapshotId!: string;
-  id!: string;
   public?: boolean;
+  snapshotId!: string;
   collaborative!: boolean;
   createDate!: Date;
   updateDate!: Date;
@@ -149,6 +149,12 @@ export class PlatformUserPlaylist extends Model<PlatformUserPlaylistAttributes,
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserPlaylist {
     return PlatformUserPlaylist.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     appUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -183,22 +189,16 @@ export class PlatformUserPlaylist extends Model<PlatformUserPlaylistAttributes,
       type: DataTypes.TEXT,
       allowNull: true
     },
-    snapshotId: {
-      type: DataTypes.TEXT,
-      allowNull: false,
-      field: 'snapshot_id'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     public: {
       type: DataTypes.BOOLEAN,
       allowNull: true,
       defaultValue: false
     },
+    snapshotId: {
+      type: DataTypes.TEXT,
+      allowNull: false,
+      field: 'snapshot_id'
+    },
     collaborative: {
       type: DataTypes.BOOLEAN,
       allowNull: false,

package/models/PlatformUserPlaylistArtistAffinity.ts

@@ -6,12 +6,12 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 
 export interface PlatformUserPlaylistArtistAffinityAttributes {
   id: string;
-  createdAt: Date;
-  updatedAt: Date;
   platformUserPlaylistId: string;
   canonArtistId: string;
   affinityTierId: number;
   rank: number;
+  createdAt: Date;
+  updatedAt: Date;
 }
 
 export type PlatformUserPlaylistArtistAffinityPk = "id";
@@ -21,12 +21,12 @@ export type PlatformUserPlaylistArtistAffinityCreationAttributes = Optional<Plat
 
 export class PlatformUserPlaylistArtistAffinity extends Model<PlatformUserPlaylistArtistAffinityAttributes, PlatformUserPlaylistArtistAffinityCreationAttributes> implements PlatformUserPlaylistArtistAffinityAttributes {
   id!: string;
-  createdAt!: Date;
-  updatedAt!: Date;
   platformUserPlaylistId!: string;
   canonArtistId!: string;
   affinityTierId!: number;
   rank!: number;
+  createdAt!: Date;
+  updatedAt!: Date;
 
   // PlatformUserPlaylistArtistAffinity belongsTo AffinityTier via affinityTierId
   affinityTier!: AffinityTier;
@@ -52,18 +52,6 @@ export class PlatformUserPlaylistArtistAffinity extends Model<PlatformUserPlayli
       defaultValue: DataTypes.UUIDV4,
       primaryKey: true
     },
-    createdAt: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'created_at'
-    },
-    updatedAt: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
-      field: 'updated_at'
-    },
     platformUserPlaylistId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -96,6 +84,18 @@ export class PlatformUserPlaylistArtistAffinity extends Model<PlatformUserPlayli
     rank: {
       type: DataTypes.INTEGER,
       allowNull: false
+    },
+    createdAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'created_at'
+    },
+    updatedAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'updated_at'
     }
   }, {
     sequelize,

package/models/PlatformUserPlaylistGenreAffinity.ts

@@ -5,11 +5,11 @@ import type { CanonGenre, CanonGenreId } from './CanonGenre';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 
 export interface PlatformUserPlaylistGenreAffinityAttributes {
+  id: string;
   platformUserPlaylistId: string;
   canonGenreId: string;
   affinityTierId: number;
   rank: number;
-  id: string;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -20,11 +20,11 @@ export type PlatformUserPlaylistGenreAffinityOptionalAttributes = "id" | "create
 export type PlatformUserPlaylistGenreAffinityCreationAttributes = Optional<PlatformUserPlaylistGenreAffinityAttributes, PlatformUserPlaylistGenreAffinityOptionalAttributes>;
 
 export class PlatformUserPlaylistGenreAffinity extends Model<PlatformUserPlaylistGenreAffinityAttributes, PlatformUserPlaylistGenreAffinityCreationAttributes> implements PlatformUserPlaylistGenreAffinityAttributes {
+  id!: string;
   platformUserPlaylistId!: string;
   canonGenreId!: string;
   affinityTierId!: number;
   rank!: number;
-  id!: string;
   createdAt!: Date;
   updatedAt!: Date;
 
@@ -46,6 +46,12 @@ export class PlatformUserPlaylistGenreAffinity extends Model<PlatformUserPlaylis
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserPlaylistGenreAffinity {
     return PlatformUserPlaylistGenreAffinity.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     platformUserPlaylistId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -79,12 +85,6 @@ export class PlatformUserPlaylistGenreAffinity extends Model<PlatformUserPlaylis
       type: DataTypes.INTEGER,
       allowNull: false
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createdAt: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/PlatformUserPlaylistTrack.ts

@@ -5,36 +5,36 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 import type { State, StateId } from './State';
 
 export interface PlatformUserPlaylistTrackAttributes {
+  id: string;
   platformTrackId: string;
   platformUserPlaylistId: string;
+  trackPosition: number;
   addedDate?: Date;
   addedByPlatformUserId?: string;
-  externalPlaylistTrackId: string;
-  id: string;
-  trackPosition: number;
   isLocal: boolean;
   createDate: Date;
   updateDate: Date;
   stateId: number;
+  externalPlaylistTrackId: string;
 }
 
 export type PlatformUserPlaylistTrackPk = "id";
 export type PlatformUserPlaylistTrackId = PlatformUserPlaylistTrack[PlatformUserPlaylistTrackPk];
-export type PlatformUserPlaylistTrackOptionalAttributes = "addedDate" | "addedByPlatformUserId" | "id" | "trackPosition" | "createDate" | "updateDate" | "stateId";
+export type PlatformUserPlaylistTrackOptionalAttributes = "id" | "trackPosition" | "addedDate" | "addedByPlatformUserId" | "createDate" | "updateDate" | "stateId";
 export type PlatformUserPlaylistTrackCreationAttributes = Optional<PlatformUserPlaylistTrackAttributes, PlatformUserPlaylistTrackOptionalAttributes>;
 
 export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAttributes, PlatformUserPlaylistTrackCreationAttributes> implements PlatformUserPlaylistTrackAttributes {
+  id!: string;
   platformTrackId!: string;
   platformUserPlaylistId!: string;
+  trackPosition!: number;
   addedDate?: Date;
   addedByPlatformUserId?: string;
-  externalPlaylistTrackId!: string;
-  id!: string;
-  trackPosition!: number;
   isLocal!: boolean;
   createDate!: Date;
   updateDate!: Date;
   stateId!: number;
+  externalPlaylistTrackId!: string;
 
   // PlatformUserPlaylistTrack belongsTo PlatformTrack via platformTrackId
   platformTrack!: PlatformTrack;
@@ -54,6 +54,12 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlatformUserPlaylistTrack {
     return PlatformUserPlaylistTrack.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     platformTrackId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -74,6 +80,12 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
       unique: "uk_playlist_id_track_id",
       field: 'platform_user_playlist_id'
     },
+    trackPosition: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: 0,
+      field: 'track_position'
+    },
     addedDate: {
       type: DataTypes.DATE,
       allowNull: true,
@@ -84,23 +96,6 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
       allowNull: true,
       field: 'added_by_platform_user_id'
     },
-    externalPlaylistTrackId: {
-      type: DataTypes.STRING(255),
-      allowNull: false,
-      field: 'external_playlist_track_id'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
-    trackPosition: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      defaultValue: 0,
-      field: 'track_position'
-    },
     isLocal: {
       type: DataTypes.BOOLEAN,
       allowNull: false,
@@ -128,6 +123,11 @@ export class PlatformUserPlaylistTrack extends Model<PlatformUserPlaylistTrackAt
         key: 'id'
       },
       field: 'state_id'
+    },
+    externalPlaylistTrackId: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+      field: 'external_playlist_track_id'
     }
   }, {
     sequelize,

package/models/PlaybackStatus.ts

@@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
 
 export interface PlaybackStatusAttributes {
-  description: string;
   id: number;
+  description: string;
 }
 
 export type PlaybackStatusPk = "id";
@@ -11,22 +11,22 @@ export type PlaybackStatusId = PlaybackStatus[PlaybackStatusPk];
 export type PlaybackStatusCreationAttributes = PlaybackStatusAttributes;
 
 export class PlaybackStatus extends Model<PlaybackStatusAttributes, PlaybackStatusCreationAttributes> implements PlaybackStatusAttributes {
-  description!: string;
   id!: number;
+  description!: string;
 
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlaybackStatus {
     return PlaybackStatus.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/RadioShow.ts

@@ -11,28 +11,28 @@ import type { UserComments, UserCommentsId } from './UserComments';
 import type { UserLikes, UserLikesId } from './UserLikes';
 
 export interface RadioShowAttributes {
+  id: string;
   creatorUserId: string;
   scheduledRelease?: Date;
   title: string;
   description?: string;
   deleted?: boolean;
-  id: string;
   createDate: Date;
   updateDate: Date;
 }
 
 export type RadioShowPk = "id";
 export type RadioShowId = RadioShow[RadioShowPk];
-export type RadioShowOptionalAttributes = "scheduledRelease" | "description" | "deleted" | "id" | "createDate" | "updateDate";
+export type RadioShowOptionalAttributes = "id" | "scheduledRelease" | "description" | "deleted" | "createDate" | "updateDate";
 export type RadioShowCreationAttributes = Optional<RadioShowAttributes, RadioShowOptionalAttributes>;
 
 export class RadioShow extends Model<RadioShowAttributes, RadioShowCreationAttributes> implements RadioShowAttributes {
+  id!: string;
   creatorUserId!: string;
   scheduledRelease?: Date;
   title!: string;
   description?: string;
   deleted?: boolean;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -140,6 +140,12 @@ export class RadioShow extends Model<RadioShowAttributes, RadioShowCreationAttri
 
   static initModel(sequelize: Sequelize.Sequelize): typeof RadioShow {
     return RadioShow.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     creatorUserId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -166,12 +172,6 @@ export class RadioShow extends Model<RadioShowAttributes, RadioShowCreationAttri
       type: DataTypes.BOOLEAN,
       allowNull: true
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/RadioShowMedia.ts

@@ -4,11 +4,11 @@ import type { RadioShow, RadioShowId } from './RadioShow';
 import type { UserAbuseReports, UserAbuseReportsId } from './UserAbuseReports';
 
 export interface RadioShowMediaAttributes {
+  id: string;
   radioShowId: string;
   originalMediaType?: number;
   s3VideoUrl?: string;
   s3AudioUrl: string;
-  id: string;
   createDate: Date;
   description?: string;
   cropInstructions?: string;
@@ -25,15 +25,15 @@ export interface RadioShowMediaAttributes {
 
 export type RadioShowMediaPk = "id";
 export type RadioShowMediaId = RadioShowMedia[RadioShowMediaPk];
-export type RadioShowMediaOptionalAttributes = "originalMediaType" | "s3VideoUrl" | "id" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded" | "automatedModerationApproved" | "automatedModerationRejectionMetadata" | "automatedModerationDecidedAt" | "manualModerationApproved" | "manualModerationDecidedAt" | "manualModerationBy";
+export type RadioShowMediaOptionalAttributes = "id" | "originalMediaType" | "s3VideoUrl" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded" | "automatedModerationApproved" | "automatedModerationRejectionMetadata" | "automatedModerationDecidedAt" | "manualModerationApproved" | "manualModerationDecidedAt" | "manualModerationBy";
 export type RadioShowMediaCreationAttributes = Optional<RadioShowMediaAttributes, RadioShowMediaOptionalAttributes>;
 
 export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMediaCreationAttributes> implements RadioShowMediaAttributes {
+  id!: string;
   radioShowId!: string;
   originalMediaType?: number;
   s3VideoUrl?: string;
   s3AudioUrl!: string;
-  id!: string;
   createDate!: Date;
   description?: string;
   cropInstructions?: string;
@@ -67,6 +67,12 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
 
   static initModel(sequelize: Sequelize.Sequelize): typeof RadioShowMedia {
     return RadioShowMedia.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     radioShowId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -91,12 +97,6 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
       allowNull: false,
       field: 's3_audio_url'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/RadioShowPlacement.ts

@@ -4,29 +4,29 @@ import type { CanonTrack, CanonTrackId } from './CanonTrack';
 import type { RadioShow, RadioShowId } from './RadioShow';
 
 export interface RadioShowPlacementAttributes {
+  id: string;
   radioShowId: string;
   canonTrackId?: string;
   radioShowMediaId?: string;
   seqNum: number;
   startTime?: string;
   endTime?: string;
-  id: string;
   deleted?: boolean;
 }
 
 export type RadioShowPlacementPk = "id";
 export type RadioShowPlacementId = RadioShowPlacement[RadioShowPlacementPk];
-export type RadioShowPlacementOptionalAttributes = "canonTrackId" | "radioShowMediaId" | "startTime" | "endTime" | "id" | "deleted";
+export type RadioShowPlacementOptionalAttributes = "id" | "canonTrackId" | "radioShowMediaId" | "startTime" | "endTime" | "deleted";
 export type RadioShowPlacementCreationAttributes = Optional<RadioShowPlacementAttributes, RadioShowPlacementOptionalAttributes>;
 
 export class RadioShowPlacement extends Model<RadioShowPlacementAttributes, RadioShowPlacementCreationAttributes> implements RadioShowPlacementAttributes {
+  id!: string;
   radioShowId!: string;
   canonTrackId?: string;
   radioShowMediaId?: string;
   seqNum!: number;
   startTime?: string;
   endTime?: string;
-  id!: string;
   deleted?: boolean;
 
   // RadioShowPlacement belongsTo CanonTrack via canonTrackId
@@ -42,6 +42,12 @@ export class RadioShowPlacement extends Model<RadioShowPlacementAttributes, Radi
 
   static initModel(sequelize: Sequelize.Sequelize): typeof RadioShowPlacement {
     return RadioShowPlacement.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     radioShowId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -80,12 +86,6 @@ export class RadioShowPlacement extends Model<RadioShowPlacementAttributes, Radi
       allowNull: true,
       field: 'end_time'
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     deleted: {
       type: DataTypes.BOOLEAN,
       allowNull: true

package/models/RadioShowPublishRequests.ts

@@ -3,22 +3,22 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { RadioShow, RadioShowId } from './RadioShow';
 
 export interface RadioShowPublishRequestsAttributes {
+  id: string;
   radioShowId: string;
   approved?: boolean;
-  id: string;
   createDate: Date;
   updateDate: Date;
 }
 
 export type RadioShowPublishRequestsPk = "id";
 export type RadioShowPublishRequestsId = RadioShowPublishRequests[RadioShowPublishRequestsPk];
-export type RadioShowPublishRequestsOptionalAttributes = "approved" | "id" | "createDate" | "updateDate";
+export type RadioShowPublishRequestsOptionalAttributes = "id" | "approved" | "createDate" | "updateDate";
 export type RadioShowPublishRequestsCreationAttributes = Optional<RadioShowPublishRequestsAttributes, RadioShowPublishRequestsOptionalAttributes>;
 
 export class RadioShowPublishRequests extends Model<RadioShowPublishRequestsAttributes, RadioShowPublishRequestsCreationAttributes> implements RadioShowPublishRequestsAttributes {
+  id!: string;
   radioShowId!: string;
   approved?: boolean;
-  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -30,6 +30,12 @@ export class RadioShowPublishRequests extends Model<RadioShowPublishRequestsAttr
 
   static initModel(sequelize: Sequelize.Sequelize): typeof RadioShowPublishRequests {
     return RadioShowPublishRequests.init({
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
     radioShowId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -43,12 +49,6 @@ export class RadioShowPublishRequests extends Model<RadioShowPublishRequestsAttr
       type: DataTypes.BOOLEAN,
       allowNull: true
     },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,