podverse-orm 5.1.4-alpha.3 → 5.1.5-alpha.0

package/dist/entities/liveItem/liveItem.d.ts

@@ -4,6 +4,7 @@ export declare class LiveItem {
     id: number;
     item: Item;
     live_item_status: LiveItemStatusEnum;
+    live_item_status_id: number;
     start_time: Date;
     end_time?: Date | null;
     chat_web_url?: string | null;

package/dist/entities/liveItem/liveItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liveItem.d.ts","sourceRoot":"","sources":["../../../src/entities/liveItem/liveItem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAkB,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3F,qBACa,QAAQ;IAEnB,EAAE,EAAG,MAAM,CAAC;IAIZ,IAAI,EAAG,IAAI,CAAC;IAIZ,gBAAgB,EAAG,kBAAkB,CAAC;IAGtC,UAAU,EAAG,IAAI,CAAC;IAGlB,QAAQ,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAGvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B"}
+{"version":3,"file":"liveItem.d.ts","sourceRoot":"","sources":["../../../src/entities/liveItem/liveItem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAkB,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3F,qBACa,QAAQ;IAEnB,EAAE,EAAG,MAAM,CAAC;IAIZ,IAAI,EAAG,IAAI,CAAC;IAIZ,gBAAgB,EAAG,kBAAkB,CAAC;IAGtC,mBAAmB,EAAG,MAAM,CAAC;IAG7B,UAAU,EAAG,IAAI,CAAC;IAGlB,QAAQ,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAGvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B"}

package/dist/entities/liveItem/liveItem.js

@@ -30,6 +30,10 @@ __decorate([
     (0, typeorm_1.JoinColumn)({ name: 'live_item_status_id' }),
     __metadata("design:type", Number)
 ], LiveItem.prototype, "live_item_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'live_item_status_id', type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LiveItem.prototype, "live_item_status_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'timestamptz' }),
     __metadata("design:type", Date)

package/dist/services/account/accountFollowingChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accountFollowingChannel.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountFollowingChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAS,eAAe,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE,qBAAa,8BAA+B,SAAQ,eAAe,CAAC,uBAAuB,EAAE,SAAS,CAAC;IACrG,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,cAAc,CAAiB;gBAE3B,0BAA0B,CAAC,EAAE,aAAa;IAMhD,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI,EACxE,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAqBlF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI,EACjF,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC;QAC1D,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,uBAAuB,EAAE,CAAA;KAAE,CAAC;IAqBlD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAoB5F,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAalF"}
+{"version":3,"file":"accountFollowingChannel.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountFollowingChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAS,eAAe,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE,qBAAa,8BAA+B,SAAQ,eAAe,CAAC,uBAAuB,EAAE,SAAS,CAAC;IACrG,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,cAAc,CAAiB;gBAE3B,0BAA0B,CAAC,EAAE,aAAa;IAMhD,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI,EACxE,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAqBlF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI,EACjF,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC;QAC1D,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,uBAAuB,EAAE,CAAA;KAAE,CAAC;IAsBlD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAoB5F,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAalF"}

package/dist/services/account/accountFollowingChannel.js

@@ -41,11 +41,13 @@ class AccountFollowingChannelService extends baseManyService_1.BaseManyService {
             if (!account) {
                 throw new Error("Account not found.");
             }
-            const finalConfig = Object.assign(Object.assign({}, config), (medium_id ? {
-                where: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.where), { channel: {
-                        medium_id: (0, typeorm_1.Equal)(medium_id)
-                    } })
-            } : {}));
+            const where = {
+                account_id: (0, typeorm_1.Equal)(account.id),
+            };
+            if (medium_id) {
+                where['channel'] = { medium_id: (0, typeorm_1.Equal)(medium_id) };
+            }
+            const finalConfig = Object.assign(Object.assign({}, config), { where });
             return this._getAllWithCount(account, finalConfig);
         });
     }

package/dist/services/clip.d.ts

@@ -1,6 +1,7 @@
 import { EntityManager, FindOneOptions, FindManyOptions } from 'typeorm';
 import { Clip } from '@orm/entities/clip';
 import { BaseManyService } from '@orm/services/base/baseManyService';
+import { MediumEnum } from 'podverse-helpers';
 export type ClipDto = {
     start_time: string;
     end_time?: string | null;
@@ -17,8 +18,10 @@ export declare class ClipService extends BaseManyService<Clip, 'account'> {
     update(account_id: number, clip_id_text: string, dto: ClipDto): Promise<Clip>;
     delete(account_id: number, clip_id_text: string): Promise<void>;
     getByIdText(clip_id_text: string, config?: FindOneOptions<Clip>): Promise<Clip | null>;
-    getMany(options?: FindManyOptions<Clip>): Promise<Clip[]>;
-    getManyAndCount(options?: FindManyOptions<Clip>): Promise<[Clip[], number]>;
+    getManyPublic(medium_id: MediumEnum | null, category_id: number | null, config: FindManyOptions<Clip>): Promise<Clip[]>;
+    getManyByChannels(channel_ids: number[], config: FindManyOptions<Clip>): Promise<[Clip[], number]>;
+    getManyByChannelAndCountPublic(channel_id_text: string, config: FindManyOptions<Clip>): Promise<[Clip[], number]>;
+    getManyByItemAndCountPublic(item_id_text: string, config: FindManyOptions<Clip>): Promise<[Clip[], number]>;
     getManyByAccount(account_id: number): Promise<Clip[]>;
     getRandomClip(medium_id: number): Promise<Clip | null>;
 }

package/dist/services/clip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clip.d.ts","sourceRoot":"","sources":["../../src/services/clip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE,MAAM,MAAM,OAAO,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,qBAAa,WAAY,SAAQ,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC;IAC/D,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,WAAW,CAAc;gBAErB,0BAA0B,CAAC,EAAE,aAAa;IAMhD,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BvD,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC7E,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAStF,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAIzD,eAAe,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAI3E,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IASrD,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;CAa7D"}
+{"version":3,"file":"clip.d.ts","sourceRoot":"","sources":["../../src/services/clip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAa,MAAM,SAAS,CAAC;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AAGlE,MAAM,MAAM,OAAO,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,qBAAa,WAAY,SAAQ,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC;IAC/D,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,WAAW,CAAc;gBAErB,0BAA0B,CAAC,EAAE,aAAa;IAMhD,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BvD,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC7E,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAStF,aAAa,CACjB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,GAC5B,OAAO,CAAC,IAAI,EAAE,CAAC;IAkBZ,iBAAiB,CACrB,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,GAC5B,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAiBtB,8BAA8B,CAClC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,GAC5B,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAiBtB,2BAA2B,CAC/B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,GAC5B,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAiBtB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IASrD,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;CAa7D"}

package/dist/services/clip.js

@@ -10,10 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClipService = void 0;
+const typeorm_1 = require("typeorm");
 const clip_1 = require("@orm/entities/clip");
 const baseManyService_1 = require("@orm/services/base/baseManyService");
 const account_1 = require("@orm/services/account/account");
 const item_1 = require("./item/item");
+const podverse_helpers_1 = require("podverse-helpers");
+const __1 = require("../");
 class ClipService extends baseManyService_1.BaseManyService {
     constructor(transactionalEntityManager) {
         super(clip_1.Clip, 'account', transactionalEntityManager);
@@ -90,14 +93,61 @@ class ClipService extends baseManyService_1.BaseManyService {
             return this.repositoryRead.findOne(options);
         });
     }
-    getMany(options) {
+    getManyPublic(medium_id, category_id, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repositoryRead.find(options);
+            return this.repositoryRead.find(Object.assign({ where: {
+                    sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
+                    item: {
+                        channel: Object.assign(Object.assign({ feed: {
+                                feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
+                            } }, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), (category_id ? { channel_categories: { category_id: (0, typeorm_1.Equal)(category_id) } } : {}))
+                    },
+                } }, config));
         });
     }
-    getManyAndCount(options) {
+    getManyByChannels(channel_ids, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repositoryRead.findAndCount(options);
+            return this.repositoryRead.findAndCount(Object.assign({ where: {
+                    sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
+                    item: {
+                        channel: {
+                            id: (0, typeorm_1.In)(channel_ids),
+                            feed: {
+                                feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
+                            },
+                        }
+                    },
+                } }, config));
+        });
+    }
+    getManyByChannelAndCountPublic(channel_id_text, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.repositoryRead.findAndCount(Object.assign({ where: {
+                    sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
+                    item: {
+                        channel: {
+                            feed: {
+                                feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
+                            },
+                            id_text: channel_id_text
+                        }
+                    },
+                } }, config));
+        });
+    }
+    getManyByItemAndCountPublic(item_id_text, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.repositoryRead.findAndCount(Object.assign({ where: {
+                    sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
+                    item: {
+                        id_text: item_id_text,
+                        channel: {
+                            feed: {
+                                feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
+                            },
+                        }
+                    },
+                } }, config));
         });
     }
     getManyByAccount(account_id) {

package/dist/services/item/item.d.ts

@@ -1,4 +1,4 @@
-import { MediumEnum } from 'podverse-helpers';
+import { LiveItemStatusEnum, MediumEnum } from 'podverse-helpers';
 import { FindManyOptions, FindOptionsRelations, FindOptionsWhere, Repository } from 'typeorm';
 import { Channel } from '@orm/entities/channel/channel';
 import { Item } from '@orm/entities/item/item';
@@ -22,7 +22,7 @@ export declare class ItemService {
     getByIdText(id_text: string, relations?: FindOptionsRelations<Item>): Promise<Item | null>;
     getByIdOrIdText(idOrIdText: string, relations?: FindOptionsRelations<Item>): Promise<Item | null>;
     getRandomItem(medium_id: number): Promise<Item | null>;
-    getMany(config: FindManyOptions<Item>, medium_id: MediumEnum | null, category_id: number | null, itemType: 'normal' | 'live-item'): Promise<Item[]>;
+    getMany(config: FindManyOptions<Item>, medium_id: MediumEnum | null, category_id: number | null, itemType: 'normal' | 'live-item', liveItemType: LiveItemStatusEnum | null): Promise<Item[]>;
     getManyByPodcastGuidAndItemGuid(params: {
         podcast_guid: string;
         item_guid: string;
@@ -45,10 +45,12 @@ export declare class ItemService {
 }
 export type ItemGetManyRelations = 'item_about' | 'item_about.item_itunes_episode_type' | 'item_chat' | 'item_description' | 'item_enclosures' | 'item_enclosures.item_enclosure_integrity' | 'item_enclosures.item_enclosure_sources' | 'item_images' | 'item_persons' | 'item_season' | 'item_season.channel_season' | 'live_item' | 'live_item.live_item_status';
 export declare const itemGetManyRelations: ItemGetManyRelations[];
-export type ItemGetManyRelationsWithChannel = ItemGetManyRelations | 'channel' | 'channel.channel_images';
-export declare const itemGetManyRelationsWithChannel: ItemGetManyRelationsWithChannel[];
 export type SubItemGetManyRelations = 'item' | 'item.item_about' | 'item.item_chat' | 'item.item_description' | 'item.item_enclosures' | 'item.item_enclosures.item_enclosure_integrity' | 'item.item_enclosures.item_enclosure_sources' | 'item.item_images' | 'item.item_persons' | 'item.item_season' | 'item.item_season.channel_season' | 'item.live_item';
 export declare const subItemGetManyRelations: SubItemGetManyRelations[];
+export type ItemGetManyRelationsWithChannel = ItemGetManyRelations | 'channel' | 'channel.channel_images';
+export declare const itemGetManyRelationsWithChannel: ItemGetManyRelationsWithChannel[];
+export type SubItemGetManyRelationsWithChannel = SubItemGetManyRelations | 'item.channel' | 'item.channel.channel_images';
+export declare const subItemGetManyRelationsWithChannel: SubItemGetManyRelationsWithChannel[];
 export declare const itemGetOneRelations: FindOptionsRelations<Item>;
 export {};
 //# sourceMappingURL=item.d.ts.map

package/dist/services/item/item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../../src/services/item/item.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../../src/services/item/item.ts"],"names":[],"mappings":"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"}

package/dist/services/item/item.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.itemGetOneRelations = exports.subItemGetManyRelations = exports.itemGetManyRelationsWithChannel = exports.itemGetManyRelations = exports.ItemService = void 0;
+exports.itemGetOneRelations = exports.subItemGetManyRelationsWithChannel = exports.itemGetManyRelationsWithChannel = exports.subItemGetManyRelations = exports.itemGetManyRelations = exports.ItemService = void 0;
 const typeorm_1 = require("typeorm");
 const item_1 = require("@orm/entities/item/item");
 const applyProperties_1 = require("@orm/lib/applyProperties");
@@ -192,7 +192,7 @@ class ItemService {
             return items[0] || null;
         });
     }
-    getMany(config, medium_id, category_id, itemType) {
+    getMany(config, medium_id, category_id, itemType, liveItemType) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: {
                     channel: Object.assign(Object.assign({ feed: {
@@ -201,9 +201,7 @@ class ItemService {
                     item_flag_status: {
                         id: itemFlagStatus_2.ItemFlagStatusStatusEnum.Active
                     },
-                    live_item: {
-                        id: itemType === 'live-item' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()
-                    }
+                    live_item: Object.assign({ id: itemType === 'live-item' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)() }, (liveItemType ? { live_item_status_id: (0, typeorm_1.Equal)(liveItemType) } : {}))
                 } }));
         });
     }
@@ -440,11 +438,6 @@ exports.itemGetManyRelations = [
     'live_item',
     'live_item.live_item_status'
 ];
-exports.itemGetManyRelationsWithChannel = [
-    ...exports.itemGetManyRelations,
-    'channel',
-    'channel.channel_images'
-];
 exports.subItemGetManyRelations = [
     'item',
     'item.item_about',
@@ -459,6 +452,16 @@ exports.subItemGetManyRelations = [
     'item.item_season.channel_season',
     'item.live_item'
 ];
+exports.itemGetManyRelationsWithChannel = [
+    ...exports.itemGetManyRelations,
+    'channel',
+    'channel.channel_images'
+];
+exports.subItemGetManyRelationsWithChannel = [
+    ...exports.subItemGetManyRelations,
+    'item.channel',
+    'item.channel.channel_images'
+];
 exports.itemGetOneRelations = {
     item_about: true,
     item_chapters_feed: true,

package/dist/services/stats/statsAggregatedChannel.d.ts

@@ -8,9 +8,7 @@ export declare class StatsAggregatedChannelService extends BaseStatsAggregatedSe
     protected getIdFieldName(): string;
     private mergeWhere;
     getMany(config: FindManyOptions<StatsAggregatedChannel>, medium_id: MediumEnum | null, category_id: number | null): Promise<StatsAggregatedChannel[]>;
-    getManyCount(config: FindManyOptions<StatsAggregatedChannel>, medium_id: MediumEnum | null): Promise<number>;
-    getManyByChannels(channel_ids: number[], medium_id: MediumEnum | null, config: FindManyOptions<StatsAggregatedChannel>): Promise<StatsAggregatedChannel[]>;
-    getManyByChannelsCount(channel_ids: number[], medium_id: MediumEnum | null, config: FindManyOptions<StatsAggregatedChannel>): Promise<number>;
+    getManyByChannelsAndCount(channel_ids: number[], config: FindManyOptions<StatsAggregatedChannel>): Promise<[StatsAggregatedChannel[], number]>;
     updateAggregatedStats(channel_id: number, updateAllTime?: boolean): Promise<void>;
     updateAggregatedStatsRolling(channel_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
 }

package/dist/services/stats/statsAggregatedChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statsAggregatedChannel.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAG5F,qBAAa,6BAA8B,SAAQ,0BAA0B,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAC3G,OAAO,CAAC,6BAA6B,CAAgC;;IAOrE,SAAS,CAAC,cAAc,IAAI,MAAM;IAIlC,OAAO,CAAC,UAAU;IAIZ,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,EAC/C,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAY9B,YAAY,CAChB,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,EAC/C,SAAS,EAAE,UAAU,GAAG,IAAI,GAC3B,OAAO,CAAC,MAAM,CAAC;IAYZ,iBAAiB,CACrB,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAC9C,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAY9B,sBAAsB,CAC1B,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAC9C,OAAO,CAAC,MAAM,CAAC;IAYZ,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxH"}
+{"version":3,"file":"statsAggregatedChannel.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAG5F,qBAAa,6BAA8B,SAAQ,0BAA0B,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAC3G,OAAO,CAAC,6BAA6B,CAAgC;;IAOrE,SAAS,CAAC,cAAc,IAAI,MAAM;IAIlC,OAAO,CAAC,UAAU;IAIZ,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,EAC/C,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAY9B,yBAAyB,CAC7B,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAC9C,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAE,MAAM,CAAC,CAAC;IAYxC,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxH"}

package/dist/services/stats/statsAggregatedChannel.js

@@ -35,34 +35,14 @@ class StatsAggregatedChannelService extends baseStatsAggregated_1.BaseStatsAggre
             return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
         });
     }
-    getManyCount(config, medium_id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
-                channel_ids: null,
-                medium_id,
-                category_id: null
-            });
-            return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
-        });
-    }
-    getManyByChannels(channel_ids, medium_id, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
-                channel_ids,
-                medium_id,
-                category_id: null
-            });
-            return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
-        });
-    }
-    getManyByChannelsCount(channel_ids, medium_id, config) {
+    getManyByChannelsAndCount(channel_ids, config) {
         return __awaiter(this, void 0, void 0, function* () {
             const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
                 channel_ids,
-                medium_id,
+                medium_id: null,
                 category_id: null
             });
-            return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
+            return this.repositoryRead.findAndCount(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
         });
     }
     updateAggregatedStats(channel_id_1) {

package/dist/services/stats/statsAggregatedClip.d.ts

@@ -6,8 +6,10 @@ export declare class StatsAggregatedClipService extends BaseStatsAggregatedServi
     private statsTrackEventClipService;
     constructor();
     protected getIdFieldName(): string;
-    getMany(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null): Promise<StatsAggregatedClip[]>;
-    getManyAndCountPublic(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null): Promise<[StatsAggregatedClip[], number]>;
+    getManyPublic(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null, category_id: number | null): Promise<StatsAggregatedClip[]>;
+    getManyAndCountPublic(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null, category_id: number | null): Promise<[StatsAggregatedClip[], number]>;
+    getManyByChannelsAndCountPublic(channel_ids: number[], config: FindManyOptions<StatsAggregatedClip>): Promise<[StatsAggregatedClip[], number]>;
+    getManyByItemAndCountPublic(item_id: number, config: FindManyOptions<StatsAggregatedClip>): Promise<[StatsAggregatedClip[], number]>;
     updateAggregatedStats(clip_id: number, updateAllTime?: boolean): Promise<void>;
     updateAggregatedStatsRolling(clip_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
 }

package/dist/services/stats/statsAggregatedClip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statsAggregatedClip.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedClip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAG1C,qBAAa,0BAA2B,SAAQ,0BAA0B,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrG,OAAO,CAAC,0BAA0B,CAA6B;;IAO/D,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,UAAU,GAAG,IAAI,GAC3B,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAiB3B,qBAAqB,CACzB,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,UAAU,GAAG,IAAI,GAC3B,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE,MAAM,CAAC,CAAC;IAkBrC,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrH"}
+{"version":3,"file":"statsAggregatedClip.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedClip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAG1C,qBAAa,0BAA2B,SAAQ,0BAA0B,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrG,OAAO,CAAC,0BAA0B,CAA6B;;IAO/D,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,aAAa,CACjB,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAkB3B,qBAAqB,CACzB,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE,MAAM,CAAC,CAAC;IAkBrC,+BAA+B,CACnC,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,GAC3C,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE,MAAM,CAAC,CAAC;IAkBrC,2BAA2B,CAC/B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,GAC3C,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE,MAAM,CAAC,CAAC;IAmBrC,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrH"}

package/dist/services/stats/statsAggregatedClip.js

@@ -23,20 +23,21 @@ class StatsAggregatedClipService extends baseStatsAggregated_1.BaseStatsAggregat
     getIdFieldName() {
         return 'clip_id';
     }
-    getMany(config, medium_id) {
+    getManyPublic(config, medium_id, category_id) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.repositoryRead.find(Object.assign({ where: {
                     clip: {
+                        sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
                         item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
                             channel_ids: null,
                             medium_id,
-                            category_id: null
+                            category_id
                         }))
                     }
                 } }, config));
         });
     }
-    getManyAndCountPublic(config, medium_id) {
+    getManyAndCountPublic(config, medium_id, category_id) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.repositoryRead.findAndCount(Object.assign({ where: {
                     clip: {
@@ -44,6 +45,34 @@ class StatsAggregatedClipService extends baseStatsAggregated_1.BaseStatsAggregat
                         item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
                             channel_ids: null,
                             medium_id,
+                            category_id
+                        }))
+                    }
+                } }, config));
+        });
+    }
+    getManyByChannelsAndCountPublic(channel_ids, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.repositoryRead.findAndCount(Object.assign({ where: {
+                    clip: {
+                        sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
+                        item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
+                            channel_ids,
+                            medium_id: null,
+                            category_id: null
+                        }))
+                    }
+                } }, config));
+        });
+    }
+    getManyByItemAndCountPublic(item_id, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.repositoryRead.findAndCount(Object.assign({ where: {
+                    clip: {
+                        sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
+                        item: Object.assign({ id: item_id }, (0, feedFlagHelpers_1.getActiveFeedWhere)({
+                            channel_ids: null,
+                            medium_id: null,
                             category_id: null
                         }))
                     }

package/dist/services/stats/statsAggregatedItem.d.ts

@@ -7,7 +7,7 @@ export declare class StatsAggregatedItemService extends BaseStatsAggregatedServi
     constructor();
     protected getIdFieldName(): string;
     getMany(config: FindManyOptions<StatsAggregatedItem>, medium_id: MediumEnum | null, category_id: number | null, itemType: 'normal' | 'live-item'): Promise<StatsAggregatedItem[]>;
-    getManyByChannels(config: FindManyOptions<StatsAggregatedItem>, channel_ids: number[], medium_id: MediumEnum | null, itemType: 'normal' | 'live-item'): Promise<StatsAggregatedItem[]>;
+    getManyByChannelsAndCount(config: FindManyOptions<StatsAggregatedItem>, channel_ids: number[], itemType: 'normal' | 'live-item'): Promise<[StatsAggregatedItem[], number]>;
     updateAggregatedStats(item_id: number, updateAllTime?: boolean): Promise<void>;
     updateAggregatedStatsRolling(item_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
 }

package/dist/services/stats/statsAggregatedItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statsAggregatedItem.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAe,MAAM,SAAS,CAAC;AAGvD,qBAAa,0BAA2B,SAAQ,0BAA0B,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrG,OAAO,CAAC,0BAA0B,CAA6B;;IAO/D,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAC/B,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAkB3B,iBAAiB,CACrB,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAC/B,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAkB3B,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrH"}
+{"version":3,"file":"statsAggregatedItem.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAe,MAAM,SAAS,CAAC;AAGvD,qBAAa,0BAA2B,SAAQ,0BAA0B,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrG,OAAO,CAAC,0BAA0B,CAA6B;;IAO/D,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAC/B,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAkB3B,yBAAyB,CAC7B,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,WAAW,EAAE,MAAM,EAAE,EACrB,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAC/B,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE,MAAM,CAAC,CAAC;IAkBrC,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrH"}

package/dist/services/stats/statsAggregatedItem.js

@@ -36,12 +36,12 @@ class StatsAggregatedItemService extends baseStatsAggregated_1.BaseStatsAggregat
                 } }, config));
         });
     }
-    getManyByChannels(config, channel_ids, medium_id, itemType) {
+    getManyByChannelsAndCount(config, channel_ids, itemType) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repositoryRead.find(Object.assign({ where: {
+            return this.repositoryRead.findAndCount(Object.assign({ where: {
                     item: Object.assign(Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
                         channel_ids,
-                        medium_id,
+                        medium_id: null,
                         category_id: null
                     })), { live_item: {
                             id: itemType === 'live-item' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-orm",
-  "version": "5.1.4-alpha.3",
+  "version": "5.1.5-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "module-alias": "^2.2.3",
     "nanoid": "^5.1.6",
     "pg": "^8.16.3",
-    "podverse-helpers": "^5.1.4-alpha.6",
+    "podverse-helpers": "^5.1.5-alpha.0",
     "typeorm": "^0.3.26",
     "typeorm-naming-strategies": "^4.1.0"
   },