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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/dist/entities/liveItem/liveItem.d.ts +1 -0
  2. package/dist/entities/liveItem/liveItem.d.ts.map +1 -1
  3. package/dist/entities/liveItem/liveItem.js +4 -0
  4. package/dist/lib/feedFlagHelpers.d.ts +6 -2
  5. package/dist/lib/feedFlagHelpers.d.ts.map +1 -1
  6. package/dist/lib/feedFlagHelpers.js +2 -2
  7. package/dist/services/account/accountFollowingChannel.d.ts.map +1 -1
  8. package/dist/services/account/accountFollowingChannel.js +7 -5
  9. package/dist/services/channel/channel.d.ts +2 -1
  10. package/dist/services/channel/channel.d.ts.map +1 -1
  11. package/dist/services/channel/channel.js +9 -2
  12. package/dist/services/channel/channelPodroll.d.ts.map +1 -1
  13. package/dist/services/channel/channelPodroll.js +5 -7
  14. package/dist/services/clip.d.ts +5 -2
  15. package/dist/services/clip.d.ts.map +1 -1
  16. package/dist/services/clip.js +54 -4
  17. package/dist/services/item/item.d.ts +8 -2
  18. package/dist/services/item/item.d.ts.map +1 -1
  19. package/dist/services/item/item.js +17 -8
  20. package/dist/services/playlist/playlist.d.ts +1 -1
  21. package/dist/services/playlist/playlist.d.ts.map +1 -1
  22. package/dist/services/playlist/playlist.js +3 -3
  23. package/dist/services/stats/statsAggregatedChannel.d.ts +2 -4
  24. package/dist/services/stats/statsAggregatedChannel.d.ts.map +1 -1
  25. package/dist/services/stats/statsAggregatedChannel.js +13 -17
  26. package/dist/services/stats/statsAggregatedClip.d.ts +4 -2
  27. package/dist/services/stats/statsAggregatedClip.d.ts.map +1 -1
  28. package/dist/services/stats/statsAggregatedClip.js +35 -4
  29. package/dist/services/stats/statsAggregatedItem.d.ts +2 -2
  30. package/dist/services/stats/statsAggregatedItem.d.ts.map +1 -1
  31. package/dist/services/stats/statsAggregatedItem.js +16 -9
  32. package/dist/services/stats/statsAggregatedPlaylist.d.ts +2 -2
  33. package/dist/services/stats/statsAggregatedPlaylist.d.ts.map +1 -1
  34. package/dist/services/stats/statsAggregatedPlaylist.js +2 -2
  35. package/package.json +2 -2
package/dist/entities/liveItem/liveItem.d.ts CHANGED
@@ -4,6 +4,7 @@ export declare class LiveItem {
4
4
  id: number;
5
5
  item: Item;
6
6
  live_item_status: LiveItemStatusEnum;
7
+ live_item_status_id: number;
7
8
  start_time: Date;
8
9
  end_time?: Date | null;
9
10
  chat_web_url?: string | null;
package/dist/entities/liveItem/liveItem.d.ts.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -30,6 +30,10 @@ __decorate([
30
30
  (0, typeorm_1.JoinColumn)({ name: 'live_item_status_id' }),
31
31
  __metadata("design:type", Number)
32
32
  ], LiveItem.prototype, "live_item_status", void 0);
33
+ __decorate([
34
+ (0, typeorm_1.Column)({ name: 'live_item_status_id', type: 'int', nullable: false }),
35
+ __metadata("design:type", Number)
36
+ ], LiveItem.prototype, "live_item_status_id", void 0);
33
37
  __decorate([
34
38
  (0, typeorm_1.Column)({ type: 'timestamptz' }),
35
39
  __metadata("design:type", Date)
package/dist/lib/feedFlagHelpers.d.ts CHANGED
@@ -2,14 +2,18 @@ import { MediumEnum } from "podverse-helpers";
2
2
  type ActiveFeedWhere = {
3
3
  channel_ids: number[] | null;
4
4
  medium_id: MediumEnum | null;
5
+ category_id: number | null;
5
6
  };
6
- export declare function getActiveFeedWhere({ channel_ids, medium_id }: ActiveFeedWhere): {
7
+ export declare function getActiveFeedWhere({ channel_ids, medium_id, category_id }: ActiveFeedWhere): {
7
8
  channel: {
8
9
  feed: {
9
10
  feed_flag_status: import("typeorm").FindOperator<any>;
10
11
  };
11
- id?: import("typeorm").FindOperator<any> | undefined;
12
+ channel_categories?: {
13
+ category_id: import("typeorm").EqualOperator<number>;
14
+ } | undefined;
12
15
  medium_id?: import("typeorm").EqualOperator<MediumEnum> | undefined;
16
+ id?: import("typeorm").FindOperator<any> | undefined;
13
17
  };
14
18
  };
15
19
  export {};
package/dist/lib/feedFlagHelpers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"feedFlagHelpers.d.ts","sourceRoot":"","sources":["../../src/lib/feedFlagHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI9C,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC;CAC9B,CAAA;AAED,wBAAgB,kBAAkB,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,eAAe;;;;;;;;EAU7E"}
1
+ {"version":3,"file":"feedFlagHelpers.d.ts","sourceRoot":"","sources":["../../src/lib/feedFlagHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI9C,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAA;AAED,wBAAgB,kBAAkB,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,eAAe;;;;;;;;;;;EAW1F"}
package/dist/lib/feedFlagHelpers.js CHANGED
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getActiveFeedWhere = getActiveFeedWhere;
4
4
  const typeorm_1 = require("typeorm");
5
5
  const feedFlagStatus_1 = require("@orm/entities/feed/feedFlagStatus");
6
- function getActiveFeedWhere({ channel_ids, medium_id }) {
6
+ function getActiveFeedWhere({ channel_ids, medium_id, category_id }) {
7
7
  return {
8
- channel: Object.assign(Object.assign(Object.assign({}, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), ((channel_ids === null || channel_ids === void 0 ? void 0 : channel_ids.length) ? { id: (0, typeorm_1.In)(channel_ids) } : {})), { feed: {
8
+ channel: Object.assign(Object.assign(Object.assign(Object.assign({}, ((channel_ids === null || channel_ids === void 0 ? void 0 : channel_ids.length) ? { id: (0, typeorm_1.In)(channel_ids) } : {})), (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), (category_id ? { channel_categories: { category_id: (0, typeorm_1.Equal)(category_id) } } : {})), { feed: {
9
9
  feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
10
10
  } })
11
11
  };
package/dist/services/account/accountFollowingChannel.d.ts.map CHANGED
@@ -1 +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"}
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;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 CHANGED
@@ -41,11 +41,13 @@ class AccountFollowingChannelService extends baseManyService_1.BaseManyService {
41
41
  if (!account) {
42
42
  throw new Error("Account not found.");
43
43
  }
44
- const finalConfig = Object.assign(Object.assign({}, config), (medium_id ? {
45
- where: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.where), { channel: {
46
- medium_id: (0, typeorm_1.Equal)(medium_id)
47
- } })
48
- } : {}));
44
+ const where = {
45
+ account_id: (0, typeorm_1.Equal)(account.id),
46
+ };
47
+ if (medium_id) {
48
+ where['channel'] = { medium_id: (0, typeorm_1.Equal)(medium_id) };
49
+ }
50
+ const finalConfig = Object.assign(Object.assign({}, config), { where });
49
51
  return this._getAllWithCount(account, finalConfig);
50
52
  });
51
53
  }
package/dist/services/channel/channel.d.ts CHANGED
@@ -26,8 +26,9 @@ export declare class ChannelService {
26
26
  getByIdText(id_text: string, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
27
27
  getByIdOrIdText(idOrIdText: string, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
28
28
  getByPodcastIndexId(podcast_index_id: number, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
29
- getMany(config: FindManyOptions<Channel>, medium_id: MediumEnum | null, channelWhere?: FindOptionsWhere<Channel>): Promise<Channel[]>;
29
+ getMany(config: FindManyOptions<Channel>, medium_id: MediumEnum | null, category_id: number | null): Promise<Channel[]>;
30
30
  getManyCount(config: FindManyOptions<Channel>): Promise<number>;
31
+ getAllByPodcastGuids(config: FindManyOptions<Channel>, podcast_guids: string[]): Promise<Channel[]>;
31
32
  getOrCreateByFeed(feed: Feed): Promise<Channel>;
32
33
  update(id: number, dto: ChannelDto): Promise<Channel>;
33
34
  }
package/dist/services/channel/channel.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/services/channel/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,gBAAgB,EAAM,UAAU,EAAS,MAAM,SAAS,CAAC;AACzG,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAgB/C,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,SAAS,EAAE,UAAU,CAAA;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,uBAAuB,UAUnC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC,SAAS,GACT,uBAAuB,GACvB,4BAA4B,GAC5B,sBAAsB,GACtB,6BAA6B,GAC7B,wBAAwB,GACxB,mCAAmC,GACnC,yBAAyB,GACzB,0BAA0B,GAC1B,yBAAyB,CAAC;AAE9B,eAAO,MAAM,0BAA0B,EAAE,0BAA0B,EAWlE,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,OAAO,CAoBhE,CAAC;AAiBF,MAAM,MAAM,eAAe,GAAG,cAAc,CAAC;AAE7C,qBAAa,cAAc;IACzB,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACnD,SAAS,CAAC,kBAAkB,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;;IAQzC,uBAAuB,CAC3B,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAChC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAkGpB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOvF,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOpG,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAa3G,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM;IAO3F,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAChC,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,OAAO,EAAE,CAAC;IAaf,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAW/D,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB/C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CAW5D"}
1
+ {"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/services/channel/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,gBAAgB,EAAM,UAAU,EAAS,MAAM,SAAS,CAAC;AACzG,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAgB/C,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,SAAS,EAAE,UAAU,CAAA;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,uBAAuB,UAUnC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC,SAAS,GACT,uBAAuB,GACvB,4BAA4B,GAC5B,sBAAsB,GACtB,6BAA6B,GAC7B,wBAAwB,GACxB,mCAAmC,GACnC,yBAAyB,GACzB,0BAA0B,GAC1B,yBAAyB,CAAC;AAE9B,eAAO,MAAM,0BAA0B,EAAE,0BAA0B,EAWlE,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,OAAO,CAoBhE,CAAC;AAiBF,MAAM,MAAM,eAAe,GAAG,cAAc,CAAC;AAE7C,qBAAa,cAAc;IACzB,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACnD,SAAS,CAAC,kBAAkB,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;;IAQzC,uBAAuB,CAC3B,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAChC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAkGpB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOvF,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOpG,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAa3G,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM;IAO3F,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAChC,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,OAAO,EAAE,CAAC;IAaf,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAW/D,oBAAoB,CACxB,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAChC,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC,OAAO,EAAE,CAAC;IASf,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB/C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CAW5D"}
package/dist/services/channel/channel.js CHANGED
@@ -203,11 +203,11 @@ class ChannelService {
203
203
  });
204
204
  });
205
205
  }
206
- getMany(config, medium_id, channelWhere) {
206
+ getMany(config, medium_id, category_id) {
207
207
  return __awaiter(this, void 0, void 0, function* () {
208
208
  return this.repositoryRead.find(Object.assign({ where: Object.assign(Object.assign({ feed: {
209
209
  feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
210
- } }, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), (channelWhere !== null && channelWhere !== void 0 ? channelWhere : {})) }, config));
210
+ } }, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), (category_id ? { channel_categories: { category_id: (0, typeorm_1.Equal)(category_id) } } : {})) }, config));
211
211
  });
212
212
  }
213
213
  getManyCount(config) {
@@ -219,6 +219,13 @@ class ChannelService {
219
219
  } }, config));
220
220
  });
221
221
  }
222
+ getAllByPodcastGuids(config, podcast_guids) {
223
+ return __awaiter(this, void 0, void 0, function* () {
224
+ return this.repositoryRead.find(Object.assign({ where: {
225
+ podcast_guid: (0, typeorm_1.In)(podcast_guids)
226
+ } }, config));
227
+ });
228
+ }
222
229
  getOrCreateByFeed(feed) {
223
230
  return __awaiter(this, void 0, void 0, function* () {
224
231
  let channel = yield this.repositoryRead.findOne({
package/dist/services/channel/channelPodroll.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"channelPodroll.d.ts","sourceRoot":"","sources":["../../../src/services/channel/channelPodroll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAM,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAGnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAE1F,KAAK,iBAAiB,GAAG,MAAM,CAAA;AAE/B,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC;gBACtE,0BAA0B,CAAC,EAAE,aAAa;IAIhD,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAIrD,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;IAIzE,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,kBAAkB,CAAC,4BAA4B,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA0BhG,eAAe,CAAC,4BAA4B,EAAE,wBAAwB,EAAE;IA8BxE,oBAAoB,CAAC,UAAU,EAAE,MAAM;;;;CAoC9C"}
1
+ {"version":3,"file":"channelPodroll.d.ts","sourceRoot":"","sources":["../../../src/services/channel/channelPodroll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAGnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAE1F,KAAK,iBAAiB,GAAG,MAAM,CAAA;AAE/B,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC;gBACtE,0BAA0B,CAAC,EAAE,aAAa;IAIhD,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAIrD,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;IAIzE,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,kBAAkB,CAAC,4BAA4B,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA0BhG,eAAe,CAAC,4BAA4B,EAAE,wBAAwB,EAAE;IA8BxE,oBAAoB,CAAC,UAAU,EAAE,MAAM;;;;CAoC9C"}
package/dist/services/channel/channelPodroll.js CHANGED
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.ChannelPodrollService = void 0;
13
- const typeorm_1 = require("typeorm");
14
13
  const channelPodroll_1 = require("@orm/entities/channel/channelPodroll");
15
14
  const baseOneService_1 = require("@orm/services/base/baseOneService");
16
15
  const channel_1 = require("./channel");
@@ -53,12 +52,11 @@ class ChannelPodrollService extends baseOneService_1.BaseOneService {
53
52
  feed_guids.push(channel_podroll_remote_item.feed_guid);
54
53
  }
55
54
  }
56
- const medium = null;
57
- const podrollChannels = yield channelService.getMany({
58
- relations: ['channel_images']
59
- }, medium, {
60
- podcast_guid: (0, typeorm_1.In)(feed_guids)
61
- });
55
+ const podrollChannels = yield channelService.getAllByPodcastGuids({
56
+ relations: [
57
+ 'channel_images'
58
+ ]
59
+ }, feed_guids);
62
60
  return podrollChannels;
63
61
  });
64
62
  }
package/dist/services/clip.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { EntityManager, FindOneOptions, FindManyOptions } from 'typeorm';
2
2
  import { Clip } from '@orm/entities/clip';
3
3
  import { BaseManyService } from '@orm/services/base/baseManyService';
4
+ import { MediumEnum } from 'podverse-helpers';
4
5
  export type ClipDto = {
5
6
  start_time: string;
6
7
  end_time?: string | null;
@@ -17,8 +18,10 @@ export declare class ClipService extends BaseManyService<Clip, 'account'> {
17
18
  update(account_id: number, clip_id_text: string, dto: ClipDto): Promise<Clip>;
18
19
  delete(account_id: number, clip_id_text: string): Promise<void>;
19
20
  getByIdText(clip_id_text: string, config?: FindOneOptions<Clip>): Promise<Clip | null>;
20
- getMany(options?: FindManyOptions<Clip>): Promise<Clip[]>;
21
- getManyAndCount(options?: FindManyOptions<Clip>): Promise<[Clip[], number]>;
21
+ getManyPublic(medium_id: MediumEnum | null, category_id: number | null, config: FindManyOptions<Clip>): Promise<Clip[]>;
22
+ getManyByChannels(channel_ids: number[], config: FindManyOptions<Clip>): Promise<[Clip[], number]>;
23
+ getManyByChannelAndCountPublic(channel_id_text: string, config: FindManyOptions<Clip>): Promise<[Clip[], number]>;
24
+ getManyByItemAndCountPublic(item_id_text: string, config: FindManyOptions<Clip>): Promise<[Clip[], number]>;
22
25
  getManyByAccount(account_id: number): Promise<Clip[]>;
23
26
  getRandomClip(medium_id: number): Promise<Clip | null>;
24
27
  }
package/dist/services/clip.d.ts.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -10,10 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.ClipService = void 0;
13
+ const typeorm_1 = require("typeorm");
13
14
  const clip_1 = require("@orm/entities/clip");
14
15
  const baseManyService_1 = require("@orm/services/base/baseManyService");
15
16
  const account_1 = require("@orm/services/account/account");
16
17
  const item_1 = require("./item/item");
18
+ const podverse_helpers_1 = require("podverse-helpers");
19
+ const __1 = require("../");
17
20
  class ClipService extends baseManyService_1.BaseManyService {
18
21
  constructor(transactionalEntityManager) {
19
22
  super(clip_1.Clip, 'account', transactionalEntityManager);
@@ -90,14 +93,61 @@ class ClipService extends baseManyService_1.BaseManyService {
90
93
  return this.repositoryRead.findOne(options);
91
94
  });
92
95
  }
93
- getMany(options) {
96
+ getManyPublic(medium_id, category_id, config) {
94
97
  return __awaiter(this, void 0, void 0, function* () {
95
- return this.repositoryRead.find(options);
98
+ return this.repositoryRead.find(Object.assign({ where: {
99
+ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
100
+ item: {
101
+ channel: Object.assign(Object.assign({ feed: {
102
+ feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
103
+ } }, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), (category_id ? { channel_categories: { category_id: (0, typeorm_1.Equal)(category_id) } } : {}))
104
+ },
105
+ } }, config));
96
106
  });
97
107
  }
98
- getManyAndCount(options) {
108
+ getManyByChannels(channel_ids, config) {
99
109
  return __awaiter(this, void 0, void 0, function* () {
100
- return this.repositoryRead.findAndCount(options);
110
+ return this.repositoryRead.findAndCount(Object.assign({ where: {
111
+ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
112
+ item: {
113
+ channel: {
114
+ id: (0, typeorm_1.In)(channel_ids),
115
+ feed: {
116
+ feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
117
+ },
118
+ }
119
+ },
120
+ } }, config));
121
+ });
122
+ }
123
+ getManyByChannelAndCountPublic(channel_id_text, config) {
124
+ return __awaiter(this, void 0, void 0, function* () {
125
+ return this.repositoryRead.findAndCount(Object.assign({ where: {
126
+ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
127
+ item: {
128
+ channel: {
129
+ feed: {
130
+ feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
131
+ },
132
+ id_text: channel_id_text
133
+ }
134
+ },
135
+ } }, config));
136
+ });
137
+ }
138
+ getManyByItemAndCountPublic(item_id_text, config) {
139
+ return __awaiter(this, void 0, void 0, function* () {
140
+ return this.repositoryRead.findAndCount(Object.assign({ where: {
141
+ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
142
+ item: {
143
+ id_text: item_id_text,
144
+ channel: {
145
+ feed: {
146
+ feed_flag_status: (0, typeorm_1.In)([__1.FeedFlagStatusStatusEnum.Active, __1.FeedFlagStatusStatusEnum.AlwaysParse])
147
+ },
148
+ }
149
+ },
150
+ } }, config));
101
151
  });
102
152
  }
103
153
  getManyByAccount(account_id) {
package/dist/services/item/item.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { LiveItemStatusEnum, MediumEnum } from 'podverse-helpers';
1
2
  import { FindManyOptions, FindOptionsRelations, FindOptionsWhere, Repository } from 'typeorm';
2
3
  import { Channel } from '@orm/entities/channel/channel';
3
4
  import { Item } from '@orm/entities/item/item';
@@ -21,7 +22,7 @@ export declare class ItemService {
21
22
  getByIdText(id_text: string, relations?: FindOptionsRelations<Item>): Promise<Item | null>;
22
23
  getByIdOrIdText(idOrIdText: string, relations?: FindOptionsRelations<Item>): Promise<Item | null>;
23
24
  getRandomItem(medium_id: number): Promise<Item | null>;
24
- getMany(config: FindManyOptions<Item>, itemType: 'normal' | 'live-item'): Promise<Item[]>;
25
+ getMany(config: FindManyOptions<Item>, medium_id: MediumEnum | null, category_id: number | null, itemType: 'normal' | 'live-item', liveItemType: LiveItemStatusEnum | null): Promise<Item[]>;
25
26
  getManyByPodcastGuidAndItemGuid(params: {
26
27
  podcast_guid: string;
27
28
  item_guid: string;
@@ -42,9 +43,14 @@ export declare class ItemService {
42
43
  delete(id: number): Promise<void>;
43
44
  deleteMany(ids: number[]): Promise<void>;
44
45
  }
45
- export declare const itemGetManyRelations: string[];
46
+ 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';
47
+ export declare const itemGetManyRelations: ItemGetManyRelations[];
46
48
  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';
47
49
  export declare const subItemGetManyRelations: SubItemGetManyRelations[];
50
+ export type ItemGetManyRelationsWithChannel = ItemGetManyRelations | 'channel' | 'channel.channel_images';
51
+ export declare const itemGetManyRelationsWithChannel: ItemGetManyRelationsWithChannel[];
52
+ export type SubItemGetManyRelationsWithChannel = SubItemGetManyRelations | 'item.channel' | 'item.channel.channel_images';
53
+ export declare const subItemGetManyRelationsWithChannel: SubItemGetManyRelationsWithChannel[];
48
54
  export declare const itemGetOneRelations: FindOptionsRelations<Item>;
49
55
  export {};
50
56
  //# sourceMappingURL=item.d.ts.map
package/dist/services/item/item.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../../src/services/item/item.ts"],"names":[],"mappings":"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"}
1
+ {"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 CHANGED
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.itemGetOneRelations = exports.subItemGetManyRelations = exports.itemGetManyRelations = exports.ItemService = void 0;
12
+ exports.itemGetOneRelations = exports.subItemGetManyRelationsWithChannel = exports.itemGetManyRelationsWithChannel = exports.subItemGetManyRelations = exports.itemGetManyRelations = exports.ItemService = void 0;
13
13
  const typeorm_1 = require("typeorm");
14
14
  const item_1 = require("@orm/entities/item/item");
15
15
  const applyProperties_1 = require("@orm/lib/applyProperties");
@@ -192,17 +192,16 @@ class ItemService {
192
192
  return items[0] || null;
193
193
  });
194
194
  }
195
- getMany(config, itemType) {
195
+ getMany(config, medium_id, category_id, itemType, liveItemType) {
196
196
  return __awaiter(this, void 0, void 0, function* () {
197
197
  return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: {
198
- channel: {
199
- feed: {
198
+ channel: Object.assign(Object.assign({ feed: {
200
199
  feed_flag_status: (0, typeorm_1.In)([1, 2])
201
- }
200
+ } }, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), (category_id ? { channel_categories: { category_id: (0, typeorm_1.Equal)(category_id) } } : {})),
201
+ item_flag_status: {
202
+ id: itemFlagStatus_2.ItemFlagStatusStatusEnum.Active
202
203
  },
203
- live_item: {
204
- id: itemType === 'live-item' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()
205
- }
204
+ 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) } : {}))
206
205
  } }));
207
206
  });
208
207
  }
@@ -453,6 +452,16 @@ exports.subItemGetManyRelations = [
453
452
  'item.item_season.channel_season',
454
453
  'item.live_item'
455
454
  ];
455
+ exports.itemGetManyRelationsWithChannel = [
456
+ ...exports.itemGetManyRelations,
457
+ 'channel',
458
+ 'channel.channel_images'
459
+ ];
460
+ exports.subItemGetManyRelationsWithChannel = [
461
+ ...exports.subItemGetManyRelations,
462
+ 'item.channel',
463
+ 'item.channel.channel_images'
464
+ ];
456
465
  exports.itemGetOneRelations = {
457
466
  item_about: true,
458
467
  item_chapters_feed: true,
package/dist/services/playlist/playlist.d.ts CHANGED
@@ -18,7 +18,7 @@ export declare class PlaylistService extends BaseManyService<Playlist, 'account'
18
18
  delete(account_id: number, playlist_id_text: string): Promise<void>;
19
19
  getByIdText(playlist_id_text: string, options?: FindOneOptions<Playlist>): Promise<Playlist | null>;
20
20
  getManyPublic(options?: FindManyOptions<Playlist>): Promise<Playlist[]>;
21
- getManyPrivate(account_id: number, options?: FindManyOptions<Playlist>): Promise<[Playlist[], number]>;
21
+ getManyPrivate(account_id: number, medium_id: MediumEnum | null, options?: FindManyOptions<Playlist>): Promise<[Playlist[], number]>;
22
22
  getOnePublic(playlist_id_text: string, options?: FindOneOptions<Playlist>): Promise<Playlist | null>;
23
23
  getOnePrivate(account_id_text: string, playlist_id_text: string, options?: FindOneOptions<Playlist>): Promise<Playlist | null>;
24
24
  getAllFavoritesPrivate(account_id: number): Promise<Playlist[]>;
package/dist/services/playlist/playlist.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"playlist.d.ts","sourceRoot":"","sources":["../../../src/services/playlist/playlist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAO,MAAM,SAAS,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,UAAU,CAAC;IACtB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC;IACvE,OAAO,CAAC,cAAc,CAAiB;gBAE3B,0BAA0B,CAAC,EAAE,aAAa;IAKhD,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAW/D,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAezF,6BAA6B,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAa1E,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnE,WAAW,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAOnG,aAAa,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUvE,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAE;IAYvG,YAAY,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAYpG,aAAa,CAAC,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAY9H,sBAAsB,CAAC,UAAU,EAAE,MAAM;CAsBhD"}
1
+ {"version":3,"file":"playlist.d.ts","sourceRoot":"","sources":["../../../src/services/playlist/playlist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAS,eAAe,EAAE,cAAc,EAAO,MAAM,SAAS,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,UAAU,CAAC;IACtB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC;IACvE,OAAO,CAAC,cAAc,CAAiB;gBAE3B,0BAA0B,CAAC,EAAE,aAAa;IAKhD,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAW/D,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAezF,6BAA6B,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAa1E,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnE,WAAW,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAOnG,aAAa,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUvE,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAClC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAE;IAa3B,YAAY,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAYpG,aAAa,CAAC,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAY9H,sBAAsB,CAAC,UAAU,EAAE,MAAM;CAsBhD"}
package/dist/services/playlist/playlist.js CHANGED
@@ -77,11 +77,11 @@ class PlaylistService extends baseManyService_1.BaseManyService {
77
77
  return this.repositoryRead.find(Object.assign({ where: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.where), { sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public }) }, options));
78
78
  });
79
79
  }
80
- getManyPrivate(account_id, options) {
80
+ getManyPrivate(account_id, medium_id, options) {
81
81
  return __awaiter(this, void 0, void 0, function* () {
82
- return this.repositoryRead.findAndCount(Object.assign(Object.assign({}, options), { where: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.where), { account: {
82
+ return this.repositoryRead.findAndCount(Object.assign(Object.assign({}, options), { where: Object.assign(Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.where), { account: {
83
83
  id: account_id
84
- } }) }));
84
+ } }), (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})) }));
85
85
  });
86
86
  }
87
87
  getOnePublic(playlist_id_text, options) {
package/dist/services/stats/statsAggregatedChannel.d.ts CHANGED
@@ -7,10 +7,8 @@ export declare class StatsAggregatedChannelService extends BaseStatsAggregatedSe
7
7
  constructor();
8
8
  protected getIdFieldName(): string;
9
9
  private mergeWhere;
10
- getMany(config: FindManyOptions<StatsAggregatedChannel>, medium_id: MediumEnum | null): Promise<StatsAggregatedChannel[]>;
11
- getManyCount(config: FindManyOptions<StatsAggregatedChannel>, medium_id: MediumEnum | null): Promise<number>;
12
- getManyByChannels(channel_ids: number[], medium_id: MediumEnum | null, config: FindManyOptions<StatsAggregatedChannel>): Promise<StatsAggregatedChannel[]>;
13
- getManyByChannelsCount(channel_ids: number[], medium_id: MediumEnum | null, config: FindManyOptions<StatsAggregatedChannel>): Promise<number>;
10
+ getMany(config: FindManyOptions<StatsAggregatedChannel>, medium_id: MediumEnum | null, category_id: number | null): Promise<StatsAggregatedChannel[]>;
11
+ getManyByChannelsAndCount(channel_ids: number[], config: FindManyOptions<StatsAggregatedChannel>): Promise<[StatsAggregatedChannel[], number]>;
14
12
  updateAggregatedStats(channel_id: number, updateAllTime?: boolean): Promise<void>;
15
13
  updateAggregatedStatsRolling(channel_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
16
14
  }
package/dist/services/stats/statsAggregatedChannel.d.ts.map CHANGED
@@ -1 +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,GAC3B,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAQ9B,YAAY,CAChB,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,EAC/C,SAAS,EAAE,UAAU,GAAG,IAAI,GAC3B,OAAO,CAAC,MAAM,CAAC;IAQZ,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;IAQ9B,sBAAsB,CAC1B,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAC9C,OAAO,CAAC,MAAM,CAAC;IAQZ,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"}
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,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 CHANGED
@@ -25,28 +25,24 @@ class StatsAggregatedChannelService extends baseStatsAggregated_1.BaseStatsAggre
25
25
  mergeWhere(feedWhere, configWhere) {
26
26
  return Object.assign(Object.assign({}, (feedWhere || {})), (configWhere || {}));
27
27
  }
28
- getMany(config, medium_id) {
28
+ getMany(config, medium_id, category_id) {
29
29
  return __awaiter(this, void 0, void 0, function* () {
30
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({ channel_ids: null, medium_id });
30
+ const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
31
+ channel_ids: null,
32
+ medium_id,
33
+ category_id
34
+ });
31
35
  return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
32
36
  });
33
37
  }
34
- getManyCount(config, medium_id) {
38
+ getManyByChannelsAndCount(channel_ids, config) {
35
39
  return __awaiter(this, void 0, void 0, function* () {
36
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({ channel_ids: null, medium_id });
37
- return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
38
- });
39
- }
40
- getManyByChannels(channel_ids, medium_id, config) {
41
- return __awaiter(this, void 0, void 0, function* () {
42
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({ channel_ids, medium_id });
43
- return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
44
- });
45
- }
46
- getManyByChannelsCount(channel_ids, medium_id, config) {
47
- return __awaiter(this, void 0, void 0, function* () {
48
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({ channel_ids, medium_id });
49
- return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
40
+ const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
41
+ channel_ids,
42
+ medium_id: null,
43
+ category_id: null
44
+ });
45
+ return this.repositoryRead.findAndCount(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
50
46
  });
51
47
  }
52
48
  updateAggregatedStats(channel_id_1) {
package/dist/services/stats/statsAggregatedClip.d.ts CHANGED
@@ -6,8 +6,10 @@ export declare class StatsAggregatedClipService extends BaseStatsAggregatedServi
6
6
  private statsTrackEventClipService;
7
7
  constructor();
8
8
  protected getIdFieldName(): string;
9
- getMany(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null): Promise<StatsAggregatedClip[]>;
10
- getManyAndCountPublic(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null): Promise<[StatsAggregatedClip[], number]>;
9
+ getManyPublic(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null, category_id: number | null): Promise<StatsAggregatedClip[]>;
10
+ getManyAndCountPublic(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null, category_id: number | null): Promise<[StatsAggregatedClip[], number]>;
11
+ getManyByChannelsAndCountPublic(channel_ids: number[], config: FindManyOptions<StatsAggregatedClip>): Promise<[StatsAggregatedClip[], number]>;
12
+ getManyByItemAndCountPublic(item_id: number, config: FindManyOptions<StatsAggregatedClip>): Promise<[StatsAggregatedClip[], number]>;
11
13
  updateAggregatedStats(clip_id: number, updateAllTime?: boolean): Promise<void>;
12
14
  updateAggregatedStatsRolling(clip_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
13
15
  }
package/dist/services/stats/statsAggregatedClip.d.ts.map CHANGED
@@ -1 +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;IAgB3B,qBAAqB,CACzB,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,EAC5C,SAAS,EAAE,UAAU,GAAG,IAAI,GAC3B,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE,MAAM,CAAC,CAAC;IAiBrC,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"}
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,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 CHANGED
@@ -23,26 +23,57 @@ class StatsAggregatedClipService extends baseStatsAggregated_1.BaseStatsAggregat
23
23
  getIdFieldName() {
24
24
  return 'clip_id';
25
25
  }
26
- getMany(config, medium_id) {
26
+ getManyPublic(config, medium_id, category_id) {
27
27
  return __awaiter(this, void 0, void 0, function* () {
28
28
  return this.repositoryRead.find(Object.assign({ where: {
29
29
  clip: {
30
+ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
30
31
  item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
31
32
  channel_ids: null,
32
- medium_id
33
+ medium_id,
34
+ category_id
33
35
  }))
34
36
  }
35
37
  } }, config));
36
38
  });
37
39
  }
38
- getManyAndCountPublic(config, medium_id) {
40
+ getManyAndCountPublic(config, medium_id, category_id) {
39
41
  return __awaiter(this, void 0, void 0, function* () {
40
42
  return this.repositoryRead.findAndCount(Object.assign({ where: {
41
43
  clip: {
42
44
  sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
43
45
  item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
44
46
  channel_ids: null,
45
- medium_id
47
+ medium_id,
48
+ category_id
49
+ }))
50
+ }
51
+ } }, config));
52
+ });
53
+ }
54
+ getManyByChannelsAndCountPublic(channel_ids, config) {
55
+ return __awaiter(this, void 0, void 0, function* () {
56
+ return this.repositoryRead.findAndCount(Object.assign({ where: {
57
+ clip: {
58
+ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
59
+ item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
60
+ channel_ids,
61
+ medium_id: null,
62
+ category_id: null
63
+ }))
64
+ }
65
+ } }, config));
66
+ });
67
+ }
68
+ getManyByItemAndCountPublic(item_id, config) {
69
+ return __awaiter(this, void 0, void 0, function* () {
70
+ return this.repositoryRead.findAndCount(Object.assign({ where: {
71
+ clip: {
72
+ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
73
+ item: Object.assign({ id: item_id }, (0, feedFlagHelpers_1.getActiveFeedWhere)({
74
+ channel_ids: null,
75
+ medium_id: null,
76
+ category_id: null
46
77
  }))
47
78
  }
48
79
  } }, config));
package/dist/services/stats/statsAggregatedItem.d.ts CHANGED
@@ -6,8 +6,8 @@ export declare class StatsAggregatedItemService extends BaseStatsAggregatedServi
6
6
  private statsTrackEventItemService;
7
7
  constructor();
8
8
  protected getIdFieldName(): string;
9
- getMany(config: FindManyOptions<StatsAggregatedItem>, medium_id: MediumEnum | null): Promise<StatsAggregatedItem[]>;
10
- getManyByChannels(channel_ids: number[], medium_id: MediumEnum | null, config: FindManyOptions<StatsAggregatedItem>): Promise<StatsAggregatedItem[]>;
9
+ getMany(config: FindManyOptions<StatsAggregatedItem>, medium_id: MediumEnum | null, category_id: number | null, itemType: 'normal' | 'live-item'): Promise<StatsAggregatedItem[]>;
10
+ getManyByChannelsAndCount(config: FindManyOptions<StatsAggregatedItem>, channel_ids: number[], itemType: 'normal' | 'live-item'): Promise<[StatsAggregatedItem[], number]>;
11
11
  updateAggregatedStats(item_id: number, updateAllTime?: boolean): Promise<void>;
12
12
  updateAggregatedStatsRolling(item_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
13
13
  }
package/dist/services/stats/statsAggregatedItem.d.ts.map CHANGED
@@ -1 +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;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;IAc3B,iBAAiB,CACrB,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,GAC3C,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAc3B,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"}
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,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 CHANGED
@@ -13,6 +13,7 @@ exports.StatsAggregatedItemService = void 0;
13
13
  const statsAggregatedItem_1 = require("@orm/entities/stats/statsAggregatedItem");
14
14
  const statsTrackEventItem_1 = require("./statsTrackEventItem");
15
15
  const baseStatsAggregated_1 = require("./baseStatsAggregated");
16
+ const typeorm_1 = require("typeorm");
16
17
  const feedFlagHelpers_1 = require("@orm/lib/feedFlagHelpers");
17
18
  class StatsAggregatedItemService extends baseStatsAggregated_1.BaseStatsAggregatedService {
18
19
  constructor() {
@@ -22,23 +23,29 @@ class StatsAggregatedItemService extends baseStatsAggregated_1.BaseStatsAggregat
22
23
  getIdFieldName() {
23
24
  return 'item_id';
24
25
  }
25
- getMany(config, medium_id) {
26
+ getMany(config, medium_id, category_id, itemType) {
26
27
  return __awaiter(this, void 0, void 0, function* () {
27
28
  return this.repositoryRead.find(Object.assign({ where: {
28
- item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
29
+ item: Object.assign(Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
29
30
  channel_ids: null,
30
- medium_id
31
- }))
31
+ medium_id,
32
+ category_id
33
+ })), { live_item: {
34
+ id: itemType === 'live-item' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()
35
+ } })
32
36
  } }, config));
33
37
  });
34
38
  }
35
- getManyByChannels(channel_ids, medium_id, config) {
39
+ getManyByChannelsAndCount(config, channel_ids, itemType) {
36
40
  return __awaiter(this, void 0, void 0, function* () {
37
- return this.repositoryRead.find(Object.assign({ where: {
38
- item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
41
+ return this.repositoryRead.findAndCount(Object.assign({ where: {
42
+ item: Object.assign(Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
39
43
  channel_ids,
40
- medium_id
41
- }))
44
+ medium_id: null,
45
+ category_id: null
46
+ })), { live_item: {
47
+ id: itemType === 'live-item' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()
48
+ } })
42
49
  } }, config));
43
50
  });
44
51
  }
package/dist/services/stats/statsAggregatedPlaylist.d.ts CHANGED
@@ -8,8 +8,8 @@ export declare class StatsAggregatedPlaylistService extends BaseStatsAggregatedS
8
8
  protected getIdFieldName(): string;
9
9
  getMany(config: FindManyOptions<StatsAggregatedPlaylist>): Promise<StatsAggregatedPlaylist[]>;
10
10
  getManyCount(config: FindManyOptions<StatsAggregatedPlaylist>): Promise<number>;
11
- getManyPublic(config: FindManyOptions<StatsAggregatedPlaylist>, medium_id?: MediumEnum): Promise<StatsAggregatedPlaylist[]>;
12
- getManyPrivate(config: FindManyOptions<StatsAggregatedPlaylist>, account_id: number, medium_id?: MediumEnum): Promise<[StatsAggregatedPlaylist[], number]>;
11
+ getManyPublic(config: FindManyOptions<StatsAggregatedPlaylist>, medium_id: MediumEnum | null): Promise<StatsAggregatedPlaylist[]>;
12
+ getManyPrivate(config: FindManyOptions<StatsAggregatedPlaylist>, account_id: number, medium_id: MediumEnum | null): Promise<[StatsAggregatedPlaylist[], number]>;
13
13
  getManyPrivateByPlaylists(playlist_ids: number[], config: FindManyOptions<StatsAggregatedPlaylist>): Promise<[StatsAggregatedPlaylist[], number]>;
14
14
  updateAggregatedStats(playlist_id: number, updateAllTime?: boolean): Promise<void>;
15
15
  updateAggregatedStatsRolling(playlist_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
package/dist/services/stats/statsAggregatedPlaylist.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"statsAggregatedPlaylist.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedPlaylist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAM,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAEtF,OAAO,EAAE,0BAA0B,EAA+B,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEzH,qBAAa,8BAA+B,SAAQ,0BAA0B,CAAC,uBAAuB,EAAE,MAAM,CAAC;IAC7G,OAAO,CAAC,8BAA8B,CAAiC;;IAOvE,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAI7F,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/E,aAAa,CACjB,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAChD,SAAS,CAAC,EAAE,UAAU,GACrB,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAmC/B,cAAc,CAClB,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAChD,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,UAAU,GACrB,OAAO,CAAC,CAAC,uBAAuB,EAAE,EAAE,MAAM,CAAC,CAAC;IAmCzC,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,CAAC,uBAAuB,EAAE,EAAE,MAAM,CAAC,CAAC;IAYjJ,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzF,4BAA4B,CAAC,WAAW,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzH"}
1
+ {"version":3,"file":"statsAggregatedPlaylist.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedPlaylist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAS,eAAe,EAAM,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAEtF,OAAO,EAAE,0BAA0B,EAA+B,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEzH,qBAAa,8BAA+B,SAAQ,0BAA0B,CAAC,uBAAuB,EAAE,MAAM,CAAC;IAC7G,OAAO,CAAC,8BAA8B,CAAiC;;IAOvE,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAI7F,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/E,aAAa,CACjB,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAChD,SAAS,EAAE,UAAU,GAAG,IAAI,GAC3B,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAmC/B,cAAc,CAClB,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAChD,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,UAAU,GAAG,IAAI,GAC3B,OAAO,CAAC,CAAC,uBAAuB,EAAE,EAAE,MAAM,CAAC,CAAC;IAmCzC,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,CAAC,uBAAuB,EAAE,EAAE,MAAM,CAAC,CAAC;IAYjJ,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzF,4BAA4B,CAAC,WAAW,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzH"}
package/dist/services/stats/statsAggregatedPlaylist.js CHANGED
@@ -48,7 +48,7 @@ class StatsAggregatedPlaylistService extends baseStatsAggregated_1.BaseStatsAggr
48
48
  }
49
49
  }
50
50
  } }), where: {
51
- playlist: Object.assign({ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public }, (medium_id ? { medium_id } : {}))
51
+ playlist: Object.assign({ sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public }, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {}))
52
52
  }, relations: [
53
53
  'playlist',
54
54
  'playlist.account',
@@ -73,7 +73,7 @@ class StatsAggregatedPlaylistService extends baseStatsAggregated_1.BaseStatsAggr
73
73
  }
74
74
  }
75
75
  } }), where: {
76
- playlist: Object.assign(Object.assign({}, (medium_id ? { medium_id } : {})), (account_id ? { account: { id: account_id } } : {}))
76
+ playlist: Object.assign(Object.assign({}, (medium_id ? { medium_id: (0, typeorm_1.Equal)(medium_id) } : {})), (account_id ? { account: { id: (0, typeorm_1.Equal)(account_id) } } : {}))
77
77
  }, relations: [
78
78
  'playlist',
79
79
  'playlist.account',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "podverse-orm",
3
- "version": "5.1.4-alpha.2",
3
+ "version": "5.1.5-alpha.0",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
21
21
  "module-alias": "^2.2.3",
22
22
  "nanoid": "^5.1.6",
23
23
  "pg": "^8.16.3",
24
- "podverse-helpers": "^5.1.4-alpha.2",
24
+ "podverse-helpers": "^5.1.5-alpha.0",
25
25
  "typeorm": "^0.3.26",
26
26
  "typeorm-naming-strategies": "^4.1.0"
27
27
  },