@earbug/db-models 0.0.33 → 0.0.34

package/dist/AppUser.d.ts

@@ -10,6 +10,7 @@ import type { Notification, NotificationId } from './Notification';
 import type { PlatformUserAlbum, PlatformUserAlbumId } from './PlatformUserAlbum';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { RadioShow, RadioShowId } from './RadioShow';
+import type { RadioShowMedia, RadioShowMediaId } from './RadioShowMedia';
 import type { State, StateId } from './State';
 import type { UserAffinity, UserAffinityId } from './UserAffinity';
 import type { UserArtistAffinity, UserArtistAffinityId } from './UserArtistAffinity';
@@ -185,6 +186,17 @@ export declare class AppUser extends Model<AppUserAttributes, AppUserCreationAtt
     hasRadioShow: Sequelize.HasManyHasAssociationMixin<RadioShow, RadioShowId>;
     hasRadioShows: Sequelize.HasManyHasAssociationsMixin<RadioShow, RadioShowId>;
     countRadioShows: Sequelize.HasManyCountAssociationsMixin;
+    radioShowMedia: RadioShowMedia[];
+    getRadioShowMedia: Sequelize.HasManyGetAssociationsMixin<RadioShowMedia>;
+    setRadioShowMedia: Sequelize.HasManySetAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+    addRadioShowMedium: Sequelize.HasManyAddAssociationMixin<RadioShowMedia, RadioShowMediaId>;
+    addRadioShowMedia: Sequelize.HasManyAddAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+    createRadioShowMedium: Sequelize.HasManyCreateAssociationMixin<RadioShowMedia>;
+    removeRadioShowMedium: Sequelize.HasManyRemoveAssociationMixin<RadioShowMedia, RadioShowMediaId>;
+    removeRadioShowMedia: Sequelize.HasManyRemoveAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+    hasRadioShowMedium: Sequelize.HasManyHasAssociationMixin<RadioShowMedia, RadioShowMediaId>;
+    hasRadioShowMedia: Sequelize.HasManyHasAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+    countRadioShowMedia: Sequelize.HasManyCountAssociationsMixin;
     userAffinities: UserAffinity[];
     getUserAffinities: Sequelize.HasManyGetAssociationsMixin<UserAffinity>;
     setUserAffinities: Sequelize.HasManySetAssociationsMixin<UserAffinity, UserAffinityId>;

package/dist/RadioShowMedia.d.ts

@@ -1,12 +1,12 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
+import type { AppUser, AppUserId } from './AppUser';
 import type { RadioShow, RadioShowId } from './RadioShow';
 export interface RadioShowMediaAttributes {
     radioShowId: string;
     originalMediaType?: number;
     s3VideoUrl?: string;
     s3AudioUrl: string;
-    approved?: boolean;
     id: string;
     createDate: Date;
     description?: string;
@@ -14,17 +14,22 @@ export interface RadioShowMediaAttributes {
     deleted?: boolean;
     sourceS3Key?: string;
     isAppRecorded?: boolean;
+    automatedModerationApproved?: boolean;
+    automatedModerationRejectionMetadata?: object;
+    automatedModerationDecidedAt?: Date;
+    manualModerationApproved?: boolean;
+    manualModerationDecidedAt?: Date;
+    manualModerationByUserId?: string;
 }
 export type RadioShowMediaPk = "id";
 export type RadioShowMediaId = RadioShowMedia[RadioShowMediaPk];
-export type RadioShowMediaOptionalAttributes = "originalMediaType" | "s3VideoUrl" | "approved" | "id" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded";
+export type RadioShowMediaOptionalAttributes = "originalMediaType" | "s3VideoUrl" | "id" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded" | "automatedModerationApproved" | "automatedModerationRejectionMetadata" | "automatedModerationDecidedAt" | "manualModerationApproved" | "manualModerationDecidedAt" | "manualModerationByUserId";
 export type RadioShowMediaCreationAttributes = Optional<RadioShowMediaAttributes, RadioShowMediaOptionalAttributes>;
 export declare class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMediaCreationAttributes> implements RadioShowMediaAttributes {
     radioShowId: string;
     originalMediaType?: number;
     s3VideoUrl?: string;
     s3AudioUrl: string;
-    approved?: boolean;
     id: string;
     createDate: Date;
     description?: string;
@@ -32,6 +37,16 @@ export declare class RadioShowMedia extends Model<RadioShowMediaAttributes, Radi
     deleted?: boolean;
     sourceS3Key?: string;
     isAppRecorded?: boolean;
+    automatedModerationApproved?: boolean;
+    automatedModerationRejectionMetadata?: object;
+    automatedModerationDecidedAt?: Date;
+    manualModerationApproved?: boolean;
+    manualModerationDecidedAt?: Date;
+    manualModerationByUserId?: string;
+    manualModerationByUser: AppUser;
+    getManualModerationByUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
+    setManualModerationByUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
+    createManualModerationByUser: Sequelize.BelongsToCreateAssociationMixin<AppUser>;
     radioShow: RadioShow;
     getRadioShow: Sequelize.BelongsToGetAssociationMixin<RadioShow>;
     setRadioShow: Sequelize.BelongsToSetAssociationMixin<RadioShow, RadioShowId>;

package/dist/RadioShowMedia.js

@@ -53,10 +53,6 @@ class RadioShowMedia extends sequelize_1.Model {
                 allowNull: false,
                 field: 's3_audio_url'
             },
-            approved: {
-                type: sequelize_1.DataTypes.BOOLEAN,
-                allowNull: true
-            },
             id: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -91,6 +87,40 @@ class RadioShowMedia extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.BOOLEAN,
                 allowNull: true,
                 field: 'is_app_recorded'
+            },
+            automatedModerationApproved: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                allowNull: true,
+                field: 'automated_moderation_approved'
+            },
+            automatedModerationRejectionMetadata: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: true,
+                field: 'automated_moderation_rejection_metadata'
+            },
+            automatedModerationDecidedAt: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: true,
+                field: 'automated_moderation_decided_at'
+            },
+            manualModerationApproved: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                allowNull: true,
+                field: 'manual_moderation_approved'
+            },
+            manualModerationDecidedAt: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: true,
+                field: 'manual_moderation_decided_at'
+            },
+            manualModerationByUserId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'app_user',
+                    key: 'id'
+                },
+                field: 'manual_moderation_by_user_id'
             }
         }, {
             sequelize,

package/dist/init-models.js

@@ -382,6 +382,8 @@ function initModels(sequelize) {
     AppUser.hasMany(PlatformUserPlaylist, { as: "platformUserPlaylists", foreignKey: "appUserId" });
     RadioShow.belongsTo(AppUser, { as: "creatorUser", foreignKey: "creatorUserId" });
     AppUser.hasMany(RadioShow, { as: "radioShows", foreignKey: "creatorUserId" });
+    RadioShowMedia.belongsTo(AppUser, { as: "manualModerationByUser", foreignKey: "manualModerationByUserId" });
+    AppUser.hasMany(RadioShowMedia, { as: "radioShowMedia", foreignKey: "manualModerationByUserId" });
     UserAffinity.belongsTo(AppUser, { as: "user", foreignKey: "userId" });
     AppUser.hasMany(UserAffinity, { as: "userAffinities", foreignKey: "userId" });
     UserArtistAffinity.belongsTo(AppUser, { as: "user", foreignKey: "userId" });

package/models/AppUser.ts

@@ -10,6 +10,7 @@ import type { Notification, NotificationId } from './Notification';
 import type { PlatformUserAlbum, PlatformUserAlbumId } from './PlatformUserAlbum';
 import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUserPlaylist';
 import type { RadioShow, RadioShowId } from './RadioShow';
+import type { RadioShowMedia, RadioShowMediaId } from './RadioShowMedia';
 import type { State, StateId } from './State';
 import type { UserAffinity, UserAffinityId } from './UserAffinity';
 import type { UserArtistAffinity, UserArtistAffinityId } from './UserArtistAffinity';
@@ -202,6 +203,18 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
   hasRadioShow!: Sequelize.HasManyHasAssociationMixin<RadioShow, RadioShowId>;
   hasRadioShows!: Sequelize.HasManyHasAssociationsMixin<RadioShow, RadioShowId>;
   countRadioShows!: Sequelize.HasManyCountAssociationsMixin;
+  // AppUser hasMany RadioShowMedia via manualModerationByUserId
+  radioShowMedia!: RadioShowMedia[];
+  getRadioShowMedia!: Sequelize.HasManyGetAssociationsMixin<RadioShowMedia>;
+  setRadioShowMedia!: Sequelize.HasManySetAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+  addRadioShowMedium!: Sequelize.HasManyAddAssociationMixin<RadioShowMedia, RadioShowMediaId>;
+  addRadioShowMedia!: Sequelize.HasManyAddAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+  createRadioShowMedium!: Sequelize.HasManyCreateAssociationMixin<RadioShowMedia>;
+  removeRadioShowMedium!: Sequelize.HasManyRemoveAssociationMixin<RadioShowMedia, RadioShowMediaId>;
+  removeRadioShowMedia!: Sequelize.HasManyRemoveAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+  hasRadioShowMedium!: Sequelize.HasManyHasAssociationMixin<RadioShowMedia, RadioShowMediaId>;
+  hasRadioShowMedia!: Sequelize.HasManyHasAssociationsMixin<RadioShowMedia, RadioShowMediaId>;
+  countRadioShowMedia!: Sequelize.HasManyCountAssociationsMixin;
   // AppUser hasMany UserAffinity via userId
   userAffinities!: UserAffinity[];
   getUserAffinities!: Sequelize.HasManyGetAssociationsMixin<UserAffinity>;

package/models/RadioShowMedia.ts

@@ -1,5 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
+import type { AppUser, AppUserId } from './AppUser';
 import type { RadioShow, RadioShowId } from './RadioShow';
 
 export interface RadioShowMediaAttributes {
@@ -7,7 +8,6 @@ export interface RadioShowMediaAttributes {
   originalMediaType?: number;
   s3VideoUrl?: string;
   s3AudioUrl: string;
-  approved?: boolean;
   id: string;
   createDate: Date;
   description?: string;
@@ -15,11 +15,17 @@ export interface RadioShowMediaAttributes {
   deleted?: boolean;
   sourceS3Key?: string;
   isAppRecorded?: boolean;
+  automatedModerationApproved?: boolean;
+  automatedModerationRejectionMetadata?: object;
+  automatedModerationDecidedAt?: Date;
+  manualModerationApproved?: boolean;
+  manualModerationDecidedAt?: Date;
+  manualModerationByUserId?: string;
 }
 
 export type RadioShowMediaPk = "id";
 export type RadioShowMediaId = RadioShowMedia[RadioShowMediaPk];
-export type RadioShowMediaOptionalAttributes = "originalMediaType" | "s3VideoUrl" | "approved" | "id" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded";
+export type RadioShowMediaOptionalAttributes = "originalMediaType" | "s3VideoUrl" | "id" | "createDate" | "description" | "cropInstructions" | "deleted" | "sourceS3Key" | "isAppRecorded" | "automatedModerationApproved" | "automatedModerationRejectionMetadata" | "automatedModerationDecidedAt" | "manualModerationApproved" | "manualModerationDecidedAt" | "manualModerationByUserId";
 export type RadioShowMediaCreationAttributes = Optional<RadioShowMediaAttributes, RadioShowMediaOptionalAttributes>;
 
 export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMediaCreationAttributes> implements RadioShowMediaAttributes {
@@ -27,7 +33,6 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
   originalMediaType?: number;
   s3VideoUrl?: string;
   s3AudioUrl!: string;
-  approved?: boolean;
   id!: string;
   createDate!: Date;
   description?: string;
@@ -35,7 +40,18 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
   deleted?: boolean;
   sourceS3Key?: string;
   isAppRecorded?: boolean;
+  automatedModerationApproved?: boolean;
+  automatedModerationRejectionMetadata?: object;
+  automatedModerationDecidedAt?: Date;
+  manualModerationApproved?: boolean;
+  manualModerationDecidedAt?: Date;
+  manualModerationByUserId?: string;
 
+  // RadioShowMedia belongsTo AppUser via manualModerationByUserId
+  manualModerationByUser!: AppUser;
+  getManualModerationByUser!: Sequelize.BelongsToGetAssociationMixin<AppUser>;
+  setManualModerationByUser!: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
+  createManualModerationByUser!: Sequelize.BelongsToCreateAssociationMixin<AppUser>;
   // RadioShowMedia belongsTo RadioShow via radioShowId
   radioShow!: RadioShow;
   getRadioShow!: Sequelize.BelongsToGetAssociationMixin<RadioShow>;
@@ -68,10 +84,6 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
       allowNull: false,
       field: 's3_audio_url'
     },
-    approved: {
-      type: DataTypes.BOOLEAN,
-      allowNull: true
-    },
     id: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -106,6 +118,40 @@ export class RadioShowMedia extends Model<RadioShowMediaAttributes, RadioShowMed
       type: DataTypes.BOOLEAN,
       allowNull: true,
       field: 'is_app_recorded'
+    },
+    automatedModerationApproved: {
+      type: DataTypes.BOOLEAN,
+      allowNull: true,
+      field: 'automated_moderation_approved'
+    },
+    automatedModerationRejectionMetadata: {
+      type: DataTypes.JSONB,
+      allowNull: true,
+      field: 'automated_moderation_rejection_metadata'
+    },
+    automatedModerationDecidedAt: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'automated_moderation_decided_at'
+    },
+    manualModerationApproved: {
+      type: DataTypes.BOOLEAN,
+      allowNull: true,
+      field: 'manual_moderation_approved'
+    },
+    manualModerationDecidedAt: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'manual_moderation_decided_at'
+    },
+    manualModerationByUserId: {
+      type: DataTypes.UUID,
+      allowNull: true,
+      references: {
+        model: 'app_user',
+        key: 'id'
+      },
+      field: 'manual_moderation_by_user_id'
     }
   }, {
     sequelize,

package/models/init-models.ts

@@ -680,6 +680,8 @@ export function initModels(sequelize: Sequelize) {
   AppUser.hasMany(PlatformUserPlaylist, { as: "platformUserPlaylists", foreignKey: "appUserId"});
   RadioShow.belongsTo(AppUser, { as: "creatorUser", foreignKey: "creatorUserId"});
   AppUser.hasMany(RadioShow, { as: "radioShows", foreignKey: "creatorUserId"});
+  RadioShowMedia.belongsTo(AppUser, { as: "manualModerationByUser", foreignKey: "manualModerationByUserId"});
+  AppUser.hasMany(RadioShowMedia, { as: "radioShowMedia", foreignKey: "manualModerationByUserId"});
   UserAffinity.belongsTo(AppUser, { as: "user", foreignKey: "userId"});
   AppUser.hasMany(UserAffinity, { as: "userAffinities", foreignKey: "userId"});
   UserArtistAffinity.belongsTo(AppUser, { as: "user", foreignKey: "userId"});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earbug/db-models",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {