podverse-orm 5.1.4-alpha.1 → 5.1.4-alpha.3

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 (41) hide show
  1. package/dist/entities/channel/channel.d.ts +0 -1
  2. package/dist/entities/channel/channel.d.ts.map +1 -1
  3. package/dist/entities/channel/channel.js +0 -4
  4. package/dist/entities/feed/feed.d.ts +1 -0
  5. package/dist/entities/feed/feed.d.ts.map +1 -1
  6. package/dist/entities/feed/feed.js +4 -0
  7. package/dist/lib/feedFlagHelpers.d.ts +12 -1
  8. package/dist/lib/feedFlagHelpers.d.ts.map +1 -1
  9. package/dist/lib/feedFlagHelpers.js +3 -3
  10. package/dist/services/account/accountFollowingChannel.d.ts +3 -2
  11. package/dist/services/account/accountFollowingChannel.d.ts.map +1 -1
  12. package/dist/services/account/accountFollowingChannel.js +15 -4
  13. package/dist/services/account/accountFollowingPlaylist.d.ts +1 -1
  14. package/dist/services/account/accountFollowingPlaylist.d.ts.map +1 -1
  15. package/dist/services/channel/channel.d.ts +4 -8
  16. package/dist/services/channel/channel.d.ts.map +1 -1
  17. package/dist/services/channel/channel.js +20 -18
  18. package/dist/services/channel/channelPodroll.d.ts.map +1 -1
  19. package/dist/services/channel/channelPodroll.js +5 -6
  20. package/dist/services/feed/feed.d.ts +4 -4
  21. package/dist/services/feed/feed.d.ts.map +1 -1
  22. package/dist/services/feed/feed.js +10 -25
  23. package/dist/services/item/item.d.ts +6 -2
  24. package/dist/services/item/item.d.ts.map +1 -1
  25. package/dist/services/item/item.js +11 -5
  26. package/dist/services/playlist/playlist.d.ts +1 -1
  27. package/dist/services/playlist/playlist.d.ts.map +1 -1
  28. package/dist/services/playlist/playlist.js +3 -3
  29. package/dist/services/stats/statsAggregatedChannel.d.ts +5 -4
  30. package/dist/services/stats/statsAggregatedChannel.d.ts.map +1 -1
  31. package/dist/services/stats/statsAggregatedChannel.js +24 -8
  32. package/dist/services/stats/statsAggregatedClip.d.ts +3 -2
  33. package/dist/services/stats/statsAggregatedClip.d.ts.map +1 -1
  34. package/dist/services/stats/statsAggregatedClip.js +13 -5
  35. package/dist/services/stats/statsAggregatedItem.d.ts +3 -2
  36. package/dist/services/stats/statsAggregatedItem.d.ts.map +1 -1
  37. package/dist/services/stats/statsAggregatedItem.js +17 -4
  38. package/dist/services/stats/statsAggregatedPlaylist.d.ts +2 -2
  39. package/dist/services/stats/statsAggregatedPlaylist.d.ts.map +1 -1
  40. package/dist/services/stats/statsAggregatedPlaylist.js +2 -2
  41. package/package.json +2 -2
package/dist/entities/channel/channel.d.ts CHANGED
@@ -25,7 +25,6 @@ export declare class Channel {
25
25
  slug: string | null;
26
26
  feed: Feed;
27
27
  feed_id: number;
28
- podcast_index_id: number;
29
28
  podcast_guid: string | null;
30
29
  title: string | null;
31
30
  sortable_title: string | null;
package/dist/entities/channel/channel.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/entities/channel/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,qBAIa,OAAO;IAElB,EAAE,EAAG,MAAM,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAGjB,IAAI,EAAG,MAAM,GAAG,IAAI,CAAC;IAIrB,IAAI,EAAG,IAAI,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAGjB,gBAAgB,EAAG,MAAM,CAAC;IAG1B,YAAY,EAAG,MAAM,GAAG,IAAI,CAAC;IAG7B,KAAK,EAAG,MAAM,GAAG,IAAI,CAAC;IAGtB,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;IAI/B,MAAM,EAAG,UAAU,CAAC;IAGpB,SAAS,EAAG,MAAM,CAAC;IAGnB,uBAAuB,EAAG,OAAO,CAAC;IAGlC,qBAAqB,EAAG,OAAO,CAAC;IAGhC,aAAa,EAAG,YAAY,CAAC;IAG7B,kBAAkB,EAAG,eAAe,EAAE,CAAC;IAGvC,YAAY,EAAG,WAAW,CAAC;IAG3B,mBAAmB,EAAG,kBAAkB,CAAC;IAGzC,gBAAgB,EAAG,cAAc,EAAE,CAAC;IAGpC,cAAc,EAAG,YAAY,EAAE,CAAC;IAGhC,yBAAyB,EAAG,uBAAuB,CAAC;IAGpD,eAAe,EAAG,cAAc,CAAC;IAGjC,gBAAgB,EAAG,eAAe,CAAC;IAGnC,eAAe,EAAG,aAAa,EAAE,CAAC;IAGlC,eAAe,EAAG,cAAc,CAAC;IAGjC,iBAAiB,EAAG,gBAAgB,CAAC;IAGrC,oBAAoB,EAAG,iBAAiB,EAAE,CAAC;IAG3C,eAAe,EAAG,aAAa,EAAE,CAAC;IAGlC,wBAAwB,EAAG,qBAAqB,EAAE,CAAC;IAGnD,gBAAgB,EAAG,cAAc,EAAE,CAAC;IAGpC,YAAY,EAAG,UAAU,EAAE,CAAC;IAG5B,cAAc,EAAG,YAAY,EAAE,CAAC;IAGhC,KAAK,EAAG,IAAI,EAAE,CAAC;IAGf,cAAc;IAMd,eAAe;CAKhB"}
1
+ {"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/entities/channel/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,qBAIa,OAAO;IAElB,EAAE,EAAG,MAAM,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAGjB,IAAI,EAAG,MAAM,GAAG,IAAI,CAAC;IAIrB,IAAI,EAAG,IAAI,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAGjB,YAAY,EAAG,MAAM,GAAG,IAAI,CAAC;IAG7B,KAAK,EAAG,MAAM,GAAG,IAAI,CAAC;IAGtB,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;IAI/B,MAAM,EAAG,UAAU,CAAC;IAGpB,SAAS,EAAG,MAAM,CAAC;IAGnB,uBAAuB,EAAG,OAAO,CAAC;IAGlC,qBAAqB,EAAG,OAAO,CAAC;IAGhC,aAAa,EAAG,YAAY,CAAC;IAG7B,kBAAkB,EAAG,eAAe,EAAE,CAAC;IAGvC,YAAY,EAAG,WAAW,CAAC;IAG3B,mBAAmB,EAAG,kBAAkB,CAAC;IAGzC,gBAAgB,EAAG,cAAc,EAAE,CAAC;IAGpC,cAAc,EAAG,YAAY,EAAE,CAAC;IAGhC,yBAAyB,EAAG,uBAAuB,CAAC;IAGpD,eAAe,EAAG,cAAc,CAAC;IAGjC,gBAAgB,EAAG,eAAe,CAAC;IAGnC,eAAe,EAAG,aAAa,EAAE,CAAC;IAGlC,eAAe,EAAG,cAAc,CAAC;IAGjC,iBAAiB,EAAG,gBAAgB,CAAC;IAGrC,oBAAoB,EAAG,iBAAiB,EAAE,CAAC;IAG3C,eAAe,EAAG,aAAa,EAAE,CAAC;IAGlC,wBAAwB,EAAG,qBAAqB,EAAE,CAAC;IAGnD,gBAAgB,EAAG,cAAc,EAAE,CAAC;IAGpC,YAAY,EAAG,UAAU,EAAE,CAAC;IAG5B,cAAc,EAAG,YAAY,EAAE,CAAC;IAGhC,KAAK,EAAG,IAAI,EAAE,CAAC;IAGf,cAAc;IAMd,eAAe;CAKhB"}
package/dist/entities/channel/channel.js CHANGED
@@ -66,10 +66,6 @@ __decorate([
66
66
  (0, typeorm_1.Column)({ type: 'int', nullable: false }),
67
67
  __metadata("design:type", Number)
68
68
  ], Channel.prototype, "feed_id", void 0);
69
- __decorate([
70
- (0, typeorm_1.Column)({ type: 'int', unique: true }),
71
- __metadata("design:type", Number)
72
- ], Channel.prototype, "podcast_index_id", void 0);
73
69
  __decorate([
74
70
  (0, typeorm_1.Column)({ type: 'uuid', nullable: true }),
75
71
  __metadata("design:type", Object)
package/dist/entities/feed/feed.d.ts CHANGED
@@ -4,6 +4,7 @@ import { FeedLog } from './feedLog';
4
4
  export declare class Feed {
5
5
  id: number;
6
6
  url: string;
7
+ podcast_index_id: number;
7
8
  feed_flag_status: FeedFlagStatus;
8
9
  feed_log: FeedLog;
9
10
  is_parsing: Date | null;
package/dist/entities/feed/feed.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"feed.d.ts","sourceRoot":"","sources":["../../../src/entities/feed/feed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBACa,IAAI;IAEf,EAAE,EAAG,MAAM,CAAC;IAGZ,GAAG,EAAG,MAAM,CAAC;IAIb,gBAAgB,EAAG,cAAc,CAAC;IAGlC,QAAQ,EAAG,OAAO,CAAC;IAGnB,UAAU,EAAG,IAAI,GAAG,IAAI,CAAC;IAGzB,gBAAgB,EAAG,MAAM,CAAC;IAG1B,qBAAqB,EAAG,MAAM,GAAG,IAAI,CAAC;IAGtC,YAAY,EAAG,MAAM,GAAG,IAAI,CAAC;IAG7B,OAAO,EAAG,OAAO,CAAC;IAGlB,UAAU,EAAG,IAAI,CAAC;IAGlB,UAAU,EAAG,IAAI,CAAC;CACnB"}
1
+ {"version":3,"file":"feed.d.ts","sourceRoot":"","sources":["../../../src/entities/feed/feed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBACa,IAAI;IAEf,EAAE,EAAG,MAAM,CAAC;IAGZ,GAAG,EAAG,MAAM,CAAC;IAGb,gBAAgB,EAAG,MAAM,CAAC;IAI1B,gBAAgB,EAAG,cAAc,CAAC;IAGlC,QAAQ,EAAG,OAAO,CAAC;IAGnB,UAAU,EAAG,IAAI,GAAG,IAAI,CAAC;IAGzB,gBAAgB,EAAG,MAAM,CAAC;IAG1B,qBAAqB,EAAG,MAAM,GAAG,IAAI,CAAC;IAGtC,YAAY,EAAG,MAAM,GAAG,IAAI,CAAC;IAG7B,OAAO,EAAG,OAAO,CAAC;IAGlB,UAAU,EAAG,IAAI,CAAC;IAGlB,UAAU,EAAG,IAAI,CAAC;CACnB"}
package/dist/entities/feed/feed.js CHANGED
@@ -26,6 +26,10 @@ __decorate([
26
26
  (0, typeorm_1.Column)({ type: 'varchar', unique: true, length: podverse_helpers_1.DATABASE_CONSTANTS.varchar_url }),
27
27
  __metadata("design:type", String)
28
28
  ], Feed.prototype, "url", void 0);
29
+ __decorate([
30
+ (0, typeorm_1.Column)({ type: 'int', unique: true }),
31
+ __metadata("design:type", Number)
32
+ ], Feed.prototype, "podcast_index_id", void 0);
29
33
  __decorate([
30
34
  (0, typeorm_1.ManyToOne)(() => feedFlagStatus_1.FeedFlagStatus, feed_flag_status => feed_flag_status.id),
31
35
  (0, typeorm_1.JoinColumn)({ name: 'feed_flag_status_id' }),
package/dist/lib/feedFlagHelpers.d.ts CHANGED
@@ -1,9 +1,20 @@
1
- export declare function getActiveFeedWhere(channel_ids?: number[]): {
1
+ import { MediumEnum } from "podverse-helpers";
2
+ type ActiveFeedWhere = {
3
+ channel_ids: number[] | null;
4
+ medium_id: MediumEnum | null;
5
+ category_id: number | null;
6
+ };
7
+ export declare function getActiveFeedWhere({ channel_ids, medium_id, category_id }: ActiveFeedWhere): {
2
8
  channel: {
3
9
  feed: {
4
10
  feed_flag_status: import("typeorm").FindOperator<any>;
5
11
  };
12
+ channel_categories?: {
13
+ category_id: import("typeorm").EqualOperator<number>;
14
+ } | undefined;
15
+ medium_id?: import("typeorm").EqualOperator<MediumEnum> | undefined;
6
16
  id?: import("typeorm").FindOperator<any> | undefined;
7
17
  };
8
18
  };
19
+ export {};
9
20
  //# sourceMappingURL=feedFlagHelpers.d.ts.map
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":"AAGA,wBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;;;;;;;EASxD"}
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
@@ -1,11 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getActiveFeedWhere = getActiveFeedWhere;
4
- const feedFlagStatus_1 = require("@orm/entities/feed/feedFlagStatus");
5
4
  const typeorm_1 = require("typeorm");
6
- function getActiveFeedWhere(channel_ids) {
5
+ const feedFlagStatus_1 = require("@orm/entities/feed/feedFlagStatus");
6
+ function getActiveFeedWhere({ channel_ids, medium_id, category_id }) {
7
7
  return {
8
- channel: Object.assign(Object.assign({}, ((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 CHANGED
@@ -1,3 +1,4 @@
1
+ import { MediumEnum } from 'podverse-helpers';
1
2
  import { EntityManager, FindManyOptions } from 'typeorm';
2
3
  import { AccountFollowingChannel } from '@orm/entities/account/accountFollowingChannel';
3
4
  import { BaseManyService } from '@orm/services/base/baseManyService';
@@ -5,8 +6,8 @@ export declare class AccountFollowingChannelService extends BaseManyService<Acco
5
6
  private accountService;
6
7
  private channelService;
7
8
  constructor(transactionalEntityManager?: EntityManager);
8
- getFollowedChannels(account_id: number, config?: FindManyOptions<AccountFollowingChannel>): Promise<AccountFollowingChannel[]>;
9
- getFollowedChannelsWithCount(account_id: number, config?: FindManyOptions<AccountFollowingChannel>): Promise<{
9
+ getFollowedChannels(account_id: number, medium_id: MediumEnum | null, config?: FindManyOptions<AccountFollowingChannel>): Promise<AccountFollowingChannel[]>;
10
+ getFollowedChannelsWithCount(account_id: number, medium_id: MediumEnum | null, config?: FindManyOptions<AccountFollowingChannel>): Promise<{
10
11
  count: number;
11
12
  results: AccountFollowingChannel[];
12
13
  }>;
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,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACzD,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,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAS9H,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,uBAAuB,EAAE,CAAA;KAAE,CAAC;IASnK,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;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"}
package/dist/services/account/accountFollowingChannel.js CHANGED
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.AccountFollowingChannelService = void 0;
13
+ const typeorm_1 = require("typeorm");
13
14
  const accountFollowingChannel_1 = require("@orm/entities/account/accountFollowingChannel");
14
15
  const baseManyService_1 = require("@orm/services/base/baseManyService");
15
16
  const account_1 = require("@orm/services/account/account");
@@ -20,22 +21,32 @@ class AccountFollowingChannelService extends baseManyService_1.BaseManyService {
20
21
  this.accountService = new account_1.AccountService();
21
22
  this.channelService = new channel_1.ChannelService();
22
23
  }
23
- getFollowedChannels(account_id, config) {
24
+ getFollowedChannels(account_id, medium_id, config) {
24
25
  return __awaiter(this, void 0, void 0, function* () {
25
26
  const account = yield this.accountService.get(account_id);
26
27
  if (!account) {
27
28
  throw new Error("Account not found.");
28
29
  }
29
- return this._getAll(account, config);
30
+ const finalConfig = Object.assign(Object.assign({}, config), (medium_id ? {
31
+ where: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.where), { channel: {
32
+ medium_id: (0, typeorm_1.Equal)(medium_id)
33
+ } })
34
+ } : {}));
35
+ return this._getAll(account, finalConfig);
30
36
  });
31
37
  }
32
- getFollowedChannelsWithCount(account_id, config) {
38
+ getFollowedChannelsWithCount(account_id, medium_id, config) {
33
39
  return __awaiter(this, void 0, void 0, function* () {
34
40
  const account = yield this.accountService.get(account_id);
35
41
  if (!account) {
36
42
  throw new Error("Account not found.");
37
43
  }
38
- return this._getAllWithCount(account, config);
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
+ } : {}));
49
+ return this._getAllWithCount(account, finalConfig);
39
50
  });
40
51
  }
41
52
  followChannel(account_id, channel_id_text) {
package/dist/services/account/accountFollowingPlaylist.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare class AccountFollowingPlaylistService extends BaseManyService<Acc
6
6
  private playlistService;
7
7
  constructor(transactionalEntityManager?: EntityManager);
8
8
  getFollowedPlaylistsPrivate(account_id: number, config?: FindManyOptions<AccountFollowingPlaylist>): Promise<AccountFollowingPlaylist[]>;
9
- getFollowedPlaylistsPrivateWithCount(account_id: number, medium_id?: number, config?: FindManyOptions<AccountFollowingPlaylist>): Promise<[AccountFollowingPlaylist[], number]>;
9
+ getFollowedPlaylistsPrivateWithCount(account_id: number, medium_id: number | null, config?: FindManyOptions<AccountFollowingPlaylist>): Promise<[AccountFollowingPlaylist[], number]>;
10
10
  getFollowedPlaylistsPublic(account_id: number, config?: FindManyOptions<AccountFollowingPlaylist>): Promise<AccountFollowingPlaylist[]>;
11
11
  followPlaylist(account_id: number, playlist_id_text: string): Promise<AccountFollowingPlaylist>;
12
12
  unfollowPlaylist(account_id: number, playlist_id_text: string): Promise<void>;
package/dist/services/account/accountFollowingPlaylist.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"accountFollowingPlaylist.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountFollowingPlaylist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAO,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAKrE,qBAAa,+BAAgC,SAAQ,eAAe,CAAC,wBAAwB,EAAE,SAAS,CAAC;IACvG,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAAkB;gBAE7B,0BAA0B,CAAC,EAAE,aAAa;IAMhD,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IASxI,oCAAoC,CACxC,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAChD,OAAO,CAAC,CAAC,wBAAwB,EAAE,EAAE,MAAM,CAAC,CAAC;IAgB3C,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAoBvI,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAoB/F,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAapF"}
1
+ {"version":3,"file":"accountFollowingPlaylist.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountFollowingPlaylist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAO,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAKrE,qBAAa,+BAAgC,SAAQ,eAAe,CAAC,wBAAwB,EAAE,SAAS,CAAC;IACvG,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAAkB;gBAE7B,0BAA0B,CAAC,EAAE,aAAa;IAMhD,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IASxI,oCAAoC,CACxC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAChD,OAAO,CAAC,CAAC,wBAAwB,EAAE,EAAE,MAAM,CAAC,CAAC;IAgB3C,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAoBvI,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAoB/F,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAapF"}
package/dist/services/channel/channel.d.ts CHANGED
@@ -2,10 +2,6 @@ import { MediumEnum } from 'podverse-helpers';
2
2
  import { FindManyOptions, FindOptionsRelations, FindOptionsWhere, Repository } from 'typeorm';
3
3
  import { Channel } from '@orm/entities/channel/channel';
4
4
  import { Feed } from '@orm/entities/feed/feed';
5
- type ChannelInitializeDto = {
6
- feed: Feed;
7
- podcast_index_id: number;
8
- };
9
5
  type ChannelDto = {
10
6
  slug?: string | null;
11
7
  podcast_guid?: string | null;
@@ -15,7 +11,7 @@ type ChannelDto = {
15
11
  has_podcast_index_value?: boolean;
16
12
  has_value_time_splits?: boolean;
17
13
  };
18
- export declare const channelGetManyRelations: Array<keyof Channel>;
14
+ export declare const channelGetManyRelations: string[];
19
15
  export type SubChannelGetManyRelations = 'channel' | 'channel.channel_about' | 'channel.channel_categories' | 'channel.channel_chat' | 'channel.channel_description' | 'channel.channel_images' | 'channel.channel_internal_settings' | 'channel.channel_license' | 'channel.channel_location' | 'channel.channel_persons';
20
16
  export declare const subChannelGetManyRelations: SubChannelGetManyRelations[];
21
17
  export declare const channelGetOneRelations: FindOptionsRelations<Channel>;
@@ -30,11 +26,11 @@ export declare class ChannelService {
30
26
  getByIdText(id_text: string, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
31
27
  getByIdOrIdText(idOrIdText: string, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
32
28
  getByPodcastIndexId(podcast_index_id: number, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
33
- getMany(config: FindManyOptions<Channel>, channelWhere?: FindOptionsWhere<Channel>): Promise<Channel[]>;
29
+ getMany(config: FindManyOptions<Channel>, medium_id: MediumEnum | null, category_id: number | null): Promise<Channel[]>;
34
30
  getManyCount(config: FindManyOptions<Channel>): Promise<number>;
35
- getOrCreateByPodcastIndexId(dto: ChannelInitializeDto): Promise<Channel>;
31
+ getAllByPodcastGuids(config: FindManyOptions<Channel>, podcast_guids: string[]): Promise<Channel[]>;
32
+ getOrCreateByFeed(feed: Feed): Promise<Channel>;
36
33
  update(id: number, dto: ChannelDto): Promise<Channel>;
37
- updatePodcastIndexId(id: number, podcast_index_id: number): Promise<Channel>;
38
34
  }
39
35
  export {};
40
36
  //# sourceMappingURL=channel.d.ts.map
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":"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"}
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
@@ -197,14 +197,17 @@ class ChannelService {
197
197
  }
198
198
  getByPodcastIndexId(podcast_index_id_1) {
199
199
  return __awaiter(this, arguments, void 0, function* (podcast_index_id, relations = {}) {
200
- return this.repositoryRead.findOne({ where: { podcast_index_id }, relations });
200
+ return this.repositoryRead.findOne({
201
+ where: { feed: { podcast_index_id } },
202
+ relations
203
+ });
201
204
  });
202
205
  }
203
- getMany(config, channelWhere) {
206
+ getMany(config, medium_id, category_id) {
204
207
  return __awaiter(this, void 0, void 0, function* () {
205
- return this.repositoryRead.find(Object.assign({ where: Object.assign({ feed: {
208
+ return this.repositoryRead.find(Object.assign({ where: Object.assign(Object.assign({ feed: {
206
209
  feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
207
- } }, (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));
208
211
  });
209
212
  }
210
213
  getManyCount(config) {
@@ -216,13 +219,22 @@ class ChannelService {
216
219
  } }, config));
217
220
  });
218
221
  }
219
- getOrCreateByPodcastIndexId(dto) {
222
+ getAllByPodcastGuids(config, podcast_guids) {
220
223
  return __awaiter(this, void 0, void 0, function* () {
221
- let channel = yield this.getByPodcastIndexId(dto.podcast_index_id);
224
+ return this.repositoryRead.find(Object.assign({ where: {
225
+ podcast_guid: (0, typeorm_1.In)(podcast_guids)
226
+ } }, config));
227
+ });
228
+ }
229
+ getOrCreateByFeed(feed) {
230
+ return __awaiter(this, void 0, void 0, function* () {
231
+ let channel = yield this.repositoryRead.findOne({
232
+ where: { feed_id: feed.id }
233
+ });
222
234
  if (!channel) {
223
235
  channel = new channel_1.Channel();
224
- channel.feed_id = dto.feed.id;
225
- channel.podcast_index_id = dto.podcast_index_id;
236
+ channel.feed = feed;
237
+ channel.feed_id = feed.id;
226
238
  channel.medium_id = podverse_helpers_1.MediumEnum.Podcast; // default to podcast. This will be overridden after channel is parsed.
227
239
  channel.medium = podverse_helpers_1.MediumEnum.Podcast; // default to podcast. This will be overridden after channel is parsed.
228
240
  channel = yield this.repositoryReadWrite.save(channel);
@@ -240,15 +252,5 @@ class ChannelService {
240
252
  return this.repositoryReadWrite.save(channel);
241
253
  });
242
254
  }
243
- updatePodcastIndexId(id, podcast_index_id) {
244
- return __awaiter(this, void 0, void 0, function* () {
245
- let channel = yield this.get(id);
246
- if (!channel) {
247
- channel = new channel_1.Channel();
248
- }
249
- channel = (0, applyProperties_1.applyProperties)(channel, { podcast_index_id });
250
- return this.repositoryReadWrite.save(channel);
251
- });
252
- }
253
255
  }
254
256
  exports.ChannelService = ChannelService;
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;IAuBhG,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,11 +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 podrollChannels = yield channelService.getMany({
57
- relations: ['channel_images']
58
- }, {
59
- podcast_guid: (0, typeorm_1.In)(feed_guids)
60
- });
55
+ const podrollChannels = yield channelService.getAllByPodcastGuids({
56
+ relations: [
57
+ 'channel_images'
58
+ ]
59
+ }, feed_guids);
61
60
  return podrollChannels;
62
61
  });
63
62
  }
package/dist/services/feed/feed.d.ts CHANGED
@@ -17,14 +17,14 @@ export declare class FeedService {
17
17
  get(id: number): Promise<Feed | null>;
18
18
  getAll(): Promise<Feed[]>;
19
19
  getByPodcastGuid(podcast_guid: string): Promise<Feed | null>;
20
- getByUrl(url: string): Promise<Feed | null>;
21
- getByUrlAndPodcastIndexId({ url, podcast_index_id }: {
20
+ getByUrl({ url }: {
22
21
  url: string;
23
- podcast_index_id: number;
24
22
  }): Promise<Feed | null>;
25
- getByPodcastIndexId({ podcast_index_id }: {
23
+ getByUrlAndPodcastIndexId({ url, podcast_index_id }: {
24
+ url: string;
26
25
  podcast_index_id: number;
27
26
  }): Promise<Feed | null>;
27
+ getByPodcastIndexId(podcast_index_id: number): Promise<Feed | null>;
28
28
  getOrCreate({ url, podcast_index_id }: FeedCreateDto): Promise<Feed>;
29
29
  create({ url, podcast_index_id }: FeedCreateDto): Promise<Feed>;
30
30
  update(id: number, dto: FeedUpdateDto): Promise<Feed>;
package/dist/services/feed/feed.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"feed.d.ts","sourceRoot":"","sources":["../../../src/services/feed/feed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAO7E,KAAK,aAAa,GAAG;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B,CAAA;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,mBAAmB,CAA8C;IAEnE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAOrC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAMzB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW5D,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IA0B3C,yBAAyB,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAYrH,mBAAmB,CAAC,EAAE,gBAAgB,EAAE,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAY7F,WAAW,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAapE,MAAM,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B/D,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAYrD,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;CAYjG"}
1
+ {"version":3,"file":"feed.d.ts","sourceRoot":"","sources":["../../../src/services/feed/feed.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAI7E,KAAK,aAAa,GAAG;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B,CAAA;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,mBAAmB,CAA8C;IAEnE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAOrC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAMzB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW5D,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAwBxD,yBAAyB,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE;QACzD,GAAG,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAU1D,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IASnE,WAAW,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAapE,MAAM,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/D,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAYrD,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;CAYjG"}
package/dist/services/feed/feed.js CHANGED
@@ -10,14 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.FeedService = void 0;
13
- const typeorm_1 = require("typeorm");
14
13
  const db_1 = require("@orm/db");
15
14
  const feed_1 = require("@orm/entities/feed/feed");
16
15
  const feedFlagStatus_1 = require("@orm/entities/feed/feedFlagStatus");
17
- const channel_1 = require("@orm/services/channel/channel");
18
16
  const feedFlagStatus_2 = require("./feedFlagStatus");
19
17
  const applyProperties_1 = require("@orm/lib/applyProperties");
20
- const channelService = new channel_1.ChannelService();
21
18
  class FeedService {
22
19
  constructor() {
23
20
  this.repositoryRead = db_1.AppDataSourceRead.getRepository(feed_1.Feed);
@@ -50,15 +47,14 @@ class FeedService {
50
47
  });
51
48
  });
52
49
  }
53
- getByUrl(url) {
54
- return __awaiter(this, void 0, void 0, function* () {
50
+ getByUrl(_a) {
51
+ return __awaiter(this, arguments, void 0, function* ({ url }) {
55
52
  const base = url.replace(/^https?:\/\//i, '');
56
53
  const httpsUrl = `https://${base}`;
57
54
  const httpUrl = `http://${base}`;
58
55
  const httpsFeed = yield this.repositoryRead.findOne({
59
56
  where: {
60
- url: httpsUrl,
61
- feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
57
+ url: httpsUrl
62
58
  },
63
59
  relations: ['channel', 'feed_flag_status', 'feed_log'],
64
60
  });
@@ -66,8 +62,7 @@ class FeedService {
66
62
  return httpsFeed;
67
63
  const httpFeed = yield this.repositoryRead.findOne({
68
64
  where: {
69
- url: httpUrl,
70
- feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
65
+ url: httpUrl
71
66
  },
72
67
  relations: ['channel', 'feed_flag_status', 'feed_log'],
73
68
  });
@@ -81,22 +76,17 @@ class FeedService {
81
76
  return this.repositoryRead.findOne({
82
77
  where: {
83
78
  url,
84
- channel: {
85
- podcast_index_id
86
- }
79
+ podcast_index_id
87
80
  },
88
81
  relations: ['channel', 'feed_flag_status', 'feed_log'],
89
82
  });
90
83
  });
91
84
  }
92
- getByPodcastIndexId(_a) {
93
- return __awaiter(this, arguments, void 0, function* ({ podcast_index_id }) {
85
+ getByPodcastIndexId(podcast_index_id) {
86
+ return __awaiter(this, void 0, void 0, function* () {
94
87
  return this.repositoryRead.findOne({
95
88
  where: {
96
- channel: {
97
- podcast_index_id
98
- },
99
- feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
89
+ podcast_index_id
100
90
  },
101
91
  relations: ['channel', 'feed_flag_status', 'feed_log'],
102
92
  });
@@ -118,6 +108,7 @@ class FeedService {
118
108
  return __awaiter(this, arguments, void 0, function* ({ url, podcast_index_id }) {
119
109
  const feed = new feed_1.Feed();
120
110
  feed.url = url;
111
+ feed.podcast_index_id = podcast_index_id;
121
112
  const feedFlagStatusService = new feedFlagStatus_2.FeedFlagStatusService();
122
113
  const feed_flag_status = yield feedFlagStatusService.get(feedFlagStatus_1.FeedFlagStatusStatusEnum.Active);
123
114
  if (!feed_flag_status) {
@@ -129,13 +120,7 @@ class FeedService {
129
120
  feed.is_parsing = null;
130
121
  feed.parsing_priority = 0;
131
122
  feed.container_id = '';
132
- const newFeed = yield this.repositoryReadWrite.save(feed);
133
- const channel = yield channelService.getOrCreateByPodcastIndexId({
134
- feed: newFeed,
135
- podcast_index_id
136
- });
137
- newFeed.channel = channel;
138
- return this.repositoryReadWrite.save(newFeed);
123
+ return this.repositoryReadWrite.save(feed);
139
124
  });
140
125
  }
141
126
  update(id, dto) {
package/dist/services/item/item.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { 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'): Promise<Item[]>;
25
26
  getManyByPodcastGuidAndItemGuid(params: {
26
27
  podcast_guid: string;
27
28
  item_guid: string;
@@ -42,7 +43,10 @@ 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[];
48
+ export type ItemGetManyRelationsWithChannel = ItemGetManyRelations | 'channel' | 'channel.channel_images';
49
+ export declare const itemGetManyRelationsWithChannel: ItemGetManyRelationsWithChannel[];
46
50
  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
51
  export declare const subItemGetManyRelations: SubItemGetManyRelations[];
48
52
  export declare const itemGetOneRelations: FindOptionsRelations<Item>;
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":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,gBAAgB,EAC7C,UAAU,EACrB,MAAM,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAoB/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAA;IACrB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,CAAA;AASD,qBAAa,WAAW;IACtB,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;;IAO1C,oBAAoB,CACxB,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC7B,SAAS,EAAE,oBAAoB,CAAC,IAAI,CAAC,GACpC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAqHjB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,IAAI,CAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAQjF,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,IAAI,CAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAQ9F,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,IAAI,CAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAarG,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAatD,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,EAC7B,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAC/B,OAAO,CAAC,IAAI,EAAE,CAAC;IAqBZ,+BAA+B,CAAC,MAAM,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAmBxI,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAchE,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAS/D,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IASrF,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAalG,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAa1H,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAepF,wBAAwB,CAC5B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GAAG,UAAU,GAC5B,OAAO,CAAC,IAAI,EAAE,CAAC;IAuCZ,4BAA4B,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAehG,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAexF,6BAA6B,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAepG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BpG,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1F,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,mBAAmB,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAenG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAK/C;AAED,MAAM,MAAM,oBAAoB,GAC5B,YAAY,GACZ,qCAAqC,GACrC,WAAW,GACX,kBAAkB,GAClB,iBAAiB,GACjB,0CAA0C,GAC1C,wCAAwC,GACxC,aAAa,GACb,cAAc,GACd,aAAa,GACb,4BAA4B,GAC5B,WAAW,GACX,4BAA4B,CAAC;AAEjC,eAAO,MAAM,oBAAoB,EAAE,oBAAoB,EActD,CAAC;AAEF,MAAM,MAAM,+BAA+B,GACvC,oBAAoB,GACpB,SAAS,GACT,wBAAwB,CAAC;AAE7B,eAAO,MAAM,+BAA+B,EAAE,+BAA+B,EAI5E,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B,MAAM,GACN,iBAAiB,GACjB,gBAAgB,GAChB,uBAAuB,GACvB,sBAAsB,GACtB,+CAA+C,GAC/C,6CAA6C,GAC7C,kBAAkB,GAClB,mBAAmB,GACnB,kBAAkB,GAClB,iCAAiC,GACjC,gBAAgB,CAAC;AAErB,eAAO,MAAM,uBAAuB,EAAE,uBAAuB,EAa5D,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,oBAAoB,CAAC,IAAI,CAmB1D,CAAC"}
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.subItemGetManyRelations = exports.itemGetManyRelationsWithChannel = 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,13 +192,14 @@ class ItemService {
192
192
  return items[0] || null;
193
193
  });
194
194
  }
195
- getMany(config, itemType) {
195
+ getMany(config, medium_id, category_id, itemType) {
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
204
  live_item: {
204
205
  id: itemType === 'live-item' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()
@@ -439,6 +440,11 @@ exports.itemGetManyRelations = [
439
440
  'live_item',
440
441
  'live_item.live_item_status'
441
442
  ];
443
+ exports.itemGetManyRelationsWithChannel = [
444
+ ...exports.itemGetManyRelations,
445
+ 'channel',
446
+ 'channel.channel_images'
447
+ ];
442
448
  exports.subItemGetManyRelations = [
443
449
  'item',
444
450
  'item.item_about',
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
@@ -1,3 +1,4 @@
1
+ import { MediumEnum } from 'podverse-helpers';
1
2
  import { FindManyOptions } from 'typeorm';
2
3
  import { StatsAggregatedChannel } from '@orm/entities/stats/statsAggregatedChannel';
3
4
  import { BaseStatsAggregatedService, UpdateHistoricalOptions } from './baseStatsAggregated';
@@ -6,10 +7,10 @@ export declare class StatsAggregatedChannelService extends BaseStatsAggregatedSe
6
7
  constructor();
7
8
  protected getIdFieldName(): string;
8
9
  private mergeWhere;
9
- getMany(config: FindManyOptions<StatsAggregatedChannel>): Promise<StatsAggregatedChannel[]>;
10
- getManyCount(config: FindManyOptions<StatsAggregatedChannel>): Promise<number>;
11
- getManyByChannels(channel_ids: number[], config: FindManyOptions<StatsAggregatedChannel>): Promise<StatsAggregatedChannel[]>;
12
- getManyByChannelsCount(channel_ids: number[], config: FindManyOptions<StatsAggregatedChannel>): Promise<number>;
10
+ getMany(config: FindManyOptions<StatsAggregatedChannel>, medium_id: MediumEnum | null, category_id: number | 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>;
13
14
  updateAggregatedStats(channel_id: number, updateAllTime?: boolean): Promise<void>;
14
15
  updateAggregatedStatsRolling(channel_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
15
16
  }
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,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,CAAC,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAQ3F,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ9E,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAQ5H,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ/G,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,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"}
package/dist/services/stats/statsAggregatedChannel.js CHANGED
@@ -25,27 +25,43 @@ 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) {
28
+ getMany(config, medium_id, category_id) {
29
29
  return __awaiter(this, void 0, void 0, function* () {
30
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)();
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) {
38
+ getManyCount(config, medium_id) {
35
39
  return __awaiter(this, void 0, void 0, function* () {
36
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)();
40
+ const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
41
+ channel_ids: null,
42
+ medium_id,
43
+ category_id: null
44
+ });
37
45
  return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
38
46
  });
39
47
  }
40
- getManyByChannels(channel_ids, config) {
48
+ getManyByChannels(channel_ids, medium_id, config) {
41
49
  return __awaiter(this, void 0, void 0, function* () {
42
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)(channel_ids);
50
+ const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
51
+ channel_ids,
52
+ medium_id,
53
+ category_id: null
54
+ });
43
55
  return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
44
56
  });
45
57
  }
46
- getManyByChannelsCount(channel_ids, config) {
58
+ getManyByChannelsCount(channel_ids, medium_id, config) {
47
59
  return __awaiter(this, void 0, void 0, function* () {
48
- const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)(channel_ids);
60
+ const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)({
61
+ channel_ids,
62
+ medium_id,
63
+ category_id: null
64
+ });
49
65
  return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
50
66
  });
51
67
  }
package/dist/services/stats/statsAggregatedClip.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { MediumEnum } from 'podverse-helpers';
1
2
  import { StatsAggregatedClip } from '@orm/entities/stats/statsAggregatedClip';
2
3
  import { BaseStatsAggregatedService, UpdateHistoricalOptions } from './baseStatsAggregated';
3
4
  import { FindManyOptions } from 'typeorm';
@@ -5,8 +6,8 @@ export declare class StatsAggregatedClipService extends BaseStatsAggregatedServi
5
6
  private statsTrackEventClipService;
6
7
  constructor();
7
8
  protected getIdFieldName(): string;
8
- getMany(config: FindManyOptions<StatsAggregatedClip>): Promise<StatsAggregatedClip[]>;
9
- getManyAndCountPublic(config: FindManyOptions<StatsAggregatedClip>): Promise<[StatsAggregatedClip[], number]>;
9
+ getMany(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null): Promise<StatsAggregatedClip[]>;
10
+ getManyAndCountPublic(config: FindManyOptions<StatsAggregatedClip>, medium_id: MediumEnum | null): Promise<[StatsAggregatedClip[], number]>;
10
11
  updateAggregatedStats(clip_id: number, updateAllTime?: boolean): Promise<void>;
11
12
  updateAggregatedStatsRolling(clip_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
12
13
  }
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,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI1C,qBAAa,0BAA2B,SAAQ,0BAA0B,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrG,OAAO,CAAC,0BAA0B,CAA6B;;IAO/D,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAarF,qBAAqB,CAAC,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE,MAAM,CAAC,CAAC;IAc7G,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,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"}
package/dist/services/stats/statsAggregatedClip.js CHANGED
@@ -10,11 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.StatsAggregatedClipService = void 0;
13
+ const podverse_helpers_1 = require("podverse-helpers");
13
14
  const statsAggregatedClip_1 = require("@orm/entities/stats/statsAggregatedClip");
14
15
  const statsTrackEventClip_1 = require("./statsTrackEventClip");
15
16
  const baseStatsAggregated_1 = require("./baseStatsAggregated");
16
17
  const feedFlagHelpers_1 = require("@orm/lib/feedFlagHelpers");
17
- const podverse_helpers_1 = require("podverse-helpers");
18
18
  class StatsAggregatedClipService extends baseStatsAggregated_1.BaseStatsAggregatedService {
19
19
  constructor() {
20
20
  super(statsAggregatedClip_1.StatsAggregatedClip);
@@ -23,21 +23,29 @@ class StatsAggregatedClipService extends baseStatsAggregated_1.BaseStatsAggregat
23
23
  getIdFieldName() {
24
24
  return 'clip_id';
25
25
  }
26
- getMany(config) {
26
+ getMany(config, medium_id) {
27
27
  return __awaiter(this, void 0, void 0, function* () {
28
28
  return this.repositoryRead.find(Object.assign({ where: {
29
29
  clip: {
30
- item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)())
30
+ item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
31
+ channel_ids: null,
32
+ medium_id,
33
+ category_id: null
34
+ }))
31
35
  }
32
36
  } }, config));
33
37
  });
34
38
  }
35
- getManyAndCountPublic(config) {
39
+ getManyAndCountPublic(config, medium_id) {
36
40
  return __awaiter(this, void 0, void 0, function* () {
37
41
  return this.repositoryRead.findAndCount(Object.assign({ where: {
38
42
  clip: {
39
43
  sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public,
40
- item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)())
44
+ item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
45
+ channel_ids: null,
46
+ medium_id,
47
+ category_id: null
48
+ }))
41
49
  }
42
50
  } }, config));
43
51
  });
package/dist/services/stats/statsAggregatedItem.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { MediumEnum } from 'podverse-helpers';
1
2
  import { StatsAggregatedItem } from '@orm/entities/stats/statsAggregatedItem';
2
3
  import { BaseStatsAggregatedService, UpdateHistoricalOptions } from './baseStatsAggregated';
3
4
  import { FindManyOptions } from 'typeorm';
@@ -5,8 +6,8 @@ export declare class StatsAggregatedItemService extends BaseStatsAggregatedServi
5
6
  private statsTrackEventItemService;
6
7
  constructor();
7
8
  protected getIdFieldName(): string;
8
- getMany(config: FindManyOptions<StatsAggregatedItem>): Promise<StatsAggregatedItem[]>;
9
- getManyByChannels(channel_ids: number[], 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
+ getManyByChannels(config: FindManyOptions<StatsAggregatedItem>, channel_ids: number[], medium_id: MediumEnum | null, itemType: 'normal' | 'live-item'): Promise<StatsAggregatedItem[]>;
10
11
  updateAggregatedStats(item_id: number, updateAllTime?: boolean): Promise<void>;
11
12
  updateAggregatedStatsRolling(item_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
12
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,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,CAAC,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAWrF,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAWtH,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,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"}
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,17 +23,29 @@ class StatsAggregatedItemService extends baseStatsAggregated_1.BaseStatsAggregat
22
23
  getIdFieldName() {
23
24
  return 'item_id';
24
25
  }
25
- getMany(config) {
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)({
30
+ channel_ids: null,
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
+ } })
29
36
  } }, config));
30
37
  });
31
38
  }
32
- getManyByChannels(channel_ids, config) {
39
+ getManyByChannels(config, channel_ids, medium_id, itemType) {
33
40
  return __awaiter(this, void 0, void 0, function* () {
34
41
  return this.repositoryRead.find(Object.assign({ where: {
35
- item: Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)(channel_ids))
42
+ item: Object.assign(Object.assign({}, (0, feedFlagHelpers_1.getActiveFeedWhere)({
43
+ channel_ids,
44
+ medium_id,
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
+ } })
36
49
  } }, config));
37
50
  });
38
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.1",
3
+ "version": "5.1.4-alpha.3",
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.1",
24
+ "podverse-helpers": "^5.1.4-alpha.6",
25
25
  "typeorm": "^0.3.26",
26
26
  "typeorm-naming-strategies": "^4.1.0"
27
27
  },