podverse-orm 5.1.0-alpha.8 → 5.1.3-alpha.0

package/dist/services/queue/queueResource.d.ts.map

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

package/dist/services/queue/queueResource.js

@@ -9,42 +9,111 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueueResourceService = void 0;
+exports.QueueResourceService = exports.listResourceRelations = void 0;
 // TODO: get rid of "any" in the file 
 /* eslint-disable @typescript-eslint/no-explicit-any */
+const async_mutex_1 = require("async-mutex");
+const podverse_helpers_1 = require("podverse-helpers");
 const typeorm_1 = require("typeorm");
 const queueResource_1 = require("@orm/entities/queue/queueResource");
 const baseManyService_1 = require("@orm/services/base/baseManyService");
 const queue_1 = require("@orm/services/queue/queue");
 const clip_1 = require("../clip");
 const item_1 = require("../item/item");
-const podverse_helpers_1 = require("podverse-helpers");
-const itemChapter_1 = require("../item/itemChapter");
 const itemSoundbite_1 = require("../item/itemSoundbite");
 const QUEUE_LIST_POSITION_INCREMENT = 0.00000001;
+exports.listResourceRelations = [
+    'clip', 'clip.item', 'clip.item.item_about', 'clip.item.item_enclosures', 'clip.item.item_enclosures.item_enclosure_sources', 'clip.item.item_images', 'clip.item.channel', 'clip.item.channel.channel_images',
+    'item', 'item.item_about', 'item.item_enclosures', 'item.item_enclosures.item_enclosure_sources', 'item.item_images', 'item.channel', 'item.channel.channel_images',
+    'item_soundbite', 'item_soundbite.item', 'item_soundbite.item.item_about', 'item_soundbite.item.item_enclosures', 'item_soundbite.item.item_enclosures.item_enclosure_sources', 'item_soundbite.item.item_images', 'item_soundbite.item.channel', 'item_soundbite.item.channel.channel_images'
+];
 class QueueResourceService extends baseManyService_1.BaseManyService {
+    getQueueLock(queue_id_text) {
+        if (!QueueResourceService.queueLocks.has(queue_id_text)) {
+            QueueResourceService.queueLocks.set(queue_id_text, new async_mutex_1.Mutex());
+        }
+        return QueueResourceService.queueLocks.get(queue_id_text);
+    }
     constructor(transactionalEntityManager) {
         super(queueResource_1.QueueResource, 'queue', transactionalEntityManager);
         this.queueService = new queue_1.QueueService(transactionalEntityManager);
         this.clipService = new clip_1.ClipService(transactionalEntityManager);
         this.itemService = new item_1.ItemService();
-        this.itemChapterService = new itemChapter_1.ItemChapterService();
         this.itemSoundbiteService = new itemSoundbite_1.ItemSoundbiteService();
     }
-    getAllByQueueId(queue_id_text) {
+    getAllByAccountAbridged(account_id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const queues = yield this.queueService.getAllPrivate(account_id);
+            if (!queues.length) {
+                throw new Error("No queues found for account.");
+            }
+            const queueIds = queues.map(q => q.id);
+            return this.repositoryRead
+                .createQueryBuilder("qr")
+                .select([
+                "qr.id AS i",
+                "qr.playback_position AS p",
+                "qr.media_file_duration AS d",
+                "qr.completed AS z",
+                "qr.clip_id AS c",
+                "qr.item_id AS t",
+                "qr.item_soundbite_id AS s",
+                "qr.add_by_rss_hash_id AS a"
+            ])
+                .where("qr.queue_id IN (:...queueIds)", { queueIds })
+                .orderBy("qr.list_position", "ASC")
+                .getRawMany();
+        });
+    }
+    getNowPlayingByQueueIdText(queue_id_text) {
         return __awaiter(this, void 0, void 0, function* () {
             const queue = yield this.queueService.getByIdText(queue_id_text);
             if (!queue) {
                 throw new Error("Queue not found.");
             }
             const options = {
-                where: { queue: { id: queue.id } },
+                where: { queue: { id: queue.id }, list_position: (0, typeorm_1.MoreThanOrEqual)(0) },
                 order: { list_position: 'ASC' },
-                relations: ['clip', 'item', 'item_chapter', 'item_soundbite']
+                relations: exports.listResourceRelations
+            };
+            const rows = yield this.repositoryRead.find(options);
+            if (!rows || rows.length === 0) {
+                return null;
+            }
+            const firstRow = rows[0];
+            if (parseFloat(firstRow.list_position) === 0) {
+                return firstRow;
+            }
+            else {
+                firstRow.list_position = '0';
+                yield this.repositoryReadWrite.save(firstRow);
+                return firstRow;
+            }
+        });
+    }
+    getAllUpcomingByQueueIdText(queue_id_text) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const queue = yield this.queueService.getByIdText(queue_id_text);
+            if (!queue) {
+                throw new Error("Queue not found.");
+            }
+            const options = {
+                where: { queue: { id: queue.id }, list_position: (0, typeorm_1.MoreThan)(0) },
+                order: { list_position: 'ASC' },
+                relations: exports.listResourceRelations
             };
             return this.repositoryRead.find(options);
         });
     }
+    getHistoryResourcesByQueueIdText(queue_id_text, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const queue = yield this.queueService.getByIdText(queue_id_text);
+            if (!queue) {
+                throw new Error("Queue not found.");
+            }
+            return this.repositoryRead.findAndCount(Object.assign({ where: { queue: { id: queue.id }, list_position: (0, typeorm_1.LessThan)(0) }, order: { list_position: 'DESC' }, relations: exports.listResourceRelations }, options));
+        });
+    }
     getItemsByQueueIdTextAndPosition(queue_id_text, position) {
         return __awaiter(this, void 0, void 0, function* () {
             const queue = yield this.queueService.getByIdText(queue_id_text);
@@ -98,11 +167,12 @@ class QueueResourceService extends baseManyService_1.BaseManyService {
             }
             const { firstQueued, lastQueued } = yield this.getFirstAndLastQueuedItemsByQueueIdText(queue_id_text);
             const list_position = calculatePosition(firstQueued, lastQueued);
+            const resourceKeyId = `${resourceKey}_id`;
             const finalDto = {
-                [resourceKey]: resource,
+                [resourceKeyId]: resource.id,
                 list_position
             };
-            return this._update(queue, ['queue', resourceKey], finalDto);
+            return this._update(queue, [resourceKeyId], finalDto);
         });
     }
     addResourceToQueueHelper(queue_id_text, resource_id_text, resourceService, resourceKey, calculatePosition) {
@@ -139,40 +209,99 @@ class QueueResourceService extends baseManyService_1.BaseManyService {
             });
         });
     }
-    addResourceToNowPlaying(queue_id_text, resource_id_text, resourceService, resourceKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const queue = yield this.queueService.getByIdText(queue_id_text);
-            if (!queue) {
+    addResourceToNowPlaying(queue_id_text_1, resource_id_text_1, resourceService_1, resourceKey_1) {
+        return __awaiter(this, arguments, void 0, function* (queue_id_text, resource_id_text, resourceService, resourceKey, params = {}) {
+            const lock = this.getQueueLock(queue_id_text);
+            return lock.runExclusive(() => __awaiter(this, void 0, void 0, function* () {
+                return yield this.repositoryReadWrite.manager.transaction((manager) => __awaiter(this, void 0, void 0, function* () {
+                    return this._addResourceToNowPlayingTransactional(manager, queue_id_text, resource_id_text, resourceService, resourceKey, params);
+                }));
+            }));
+        });
+    }
+    _addResourceToNowPlayingTransactional(manager_1, queue_id_text_1, resource_id_text_1, resourceService_1, resourceKey_1) {
+        return __awaiter(this, arguments, void 0, function* (manager, queue_id_text, resource_id_text, resourceService, resourceKey, params = {}) {
+            const queue = yield manager.findOne('Queue', { where: { id_text: queue_id_text } });
+            if (!queue)
                 throw new Error("Queue not found.");
-            }
             const resource = yield resourceService.getByIdText(resource_id_text);
-            if (!resource) {
+            if (!resource)
                 throw new Error(`${resourceKey} not found.`);
+            const epsilon = 1e-21;
+            const existingNowPlaying = yield manager.findOne(queueResource_1.QueueResource, {
+                where: { queue: { id: queue.id }, list_position: (0, typeorm_1.Between)(-epsilon, epsilon) }
+            });
+            if (existingNowPlaying &&
+                existingNowPlaying[`${resourceKey}_id`] === resource.id &&
+                existingNowPlaying.list_position === params.playback_position) {
+                return existingNowPlaying;
             }
-            const finalDto = {
-                [resourceKey]: resource,
-                list_position: '0'
-            };
-            return this._update(queue, ['queue', resourceKey], finalDto);
+            if (existingNowPlaying && resource.id !== existingNowPlaying.id) {
+                yield this.moveQueueResourceToHistoryByIdTransactional(manager, queue_id_text, existingNowPlaying.id);
+            }
+            let queueResource = yield manager.findOne(queueResource_1.QueueResource, {
+                where: { queue: { id: queue.id }, [`${resourceKey}_id`]: resource.id }
+            });
+            if (!queueResource) {
+                queueResource = manager.create(queueResource_1.QueueResource, Object.assign({ queue, [`${resourceKey}`]: resource, list_position: '0' }, params));
+            }
+            else {
+                Object.assign(queueResource, Object.assign({ [`${resourceKey}`]: resource, list_position: '0' }, params));
+            }
+            return yield manager.save(queueResource);
         });
     }
-    addResourceToHistory(queue_id_text, resource_id_text, resourceService, resourceKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const queue = yield this.queueService.getByIdText(queue_id_text);
-            if (!queue) {
+    moveQueueResourceToHistoryByIdTransactional(manager_1, queue_id_text_1, queue_resource_id_1) {
+        return __awaiter(this, arguments, void 0, function* (manager, queue_id_text, queue_resource_id, params = {}) {
+            const queue = yield manager.findOne('Queue', { where: { id_text: queue_id_text } });
+            if (!queue)
                 throw new Error("Queue not found.");
-            }
-            const resource = yield resourceService.getByIdText(resource_id_text);
-            if (!resource) {
-                throw new Error(`${resourceKey} not found.`);
-            }
-            const mostRecentHistoryItem = yield this.getMostRecentHistoryItemByQueueIdText(queue_id_text);
-            const newPosition = mostRecentHistoryItem ? parseFloat(mostRecentHistoryItem.list_position) + QUEUE_LIST_POSITION_INCREMENT : -1;
-            const finalDto = {
-                [resourceKey]: resource,
-                list_position: newPosition.toString()
-            };
-            return this._update(queue, ['queue', resourceKey], finalDto);
+            const queueResource = yield manager.findOne(queueResource_1.QueueResource, {
+                where: { queue: { id: queue.id }, id: queue_resource_id }
+            });
+            if (!queueResource)
+                throw new Error("QueueResource not found.");
+            const mostRecentHistoryItem = yield manager.findOne(queueResource_1.QueueResource, {
+                where: { queue: { id: queue.id }, list_position: (0, typeorm_1.LessThan)(0) },
+                order: { list_position: 'DESC' }
+            });
+            const newPosition = mostRecentHistoryItem
+                ? parseFloat(mostRecentHistoryItem.list_position) + QUEUE_LIST_POSITION_INCREMENT
+                : -1;
+            Object.assign(queueResource, Object.assign(Object.assign({}, params), { list_position: newPosition.toString() }));
+            return yield manager.save(queueResource);
+        });
+    }
+    addResourceToHistory(queue_id_text, resource_id_text, resourceService, resourceKey, params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lock = this.getQueueLock(queue_id_text);
+            return lock.runExclusive(() => __awaiter(this, void 0, void 0, function* () {
+                return yield this.repositoryReadWrite.manager.transaction((manager) => __awaiter(this, void 0, void 0, function* () {
+                    const queue = yield manager.findOne('Queue', { where: { id_text: queue_id_text } });
+                    if (!queue)
+                        throw new Error("Queue not found.");
+                    const resource = yield resourceService.getByIdText(resource_id_text);
+                    if (!resource)
+                        throw new Error(`${resourceKey} not found.`);
+                    const mostRecentHistoryItem = yield manager.findOne(queueResource_1.QueueResource, {
+                        where: { queue: { id: queue.id }, list_position: (0, typeorm_1.LessThan)(0) },
+                        order: { list_position: 'DESC' }
+                    });
+                    const newPosition = mostRecentHistoryItem
+                        ? parseFloat(mostRecentHistoryItem.list_position) + QUEUE_LIST_POSITION_INCREMENT
+                        : -1;
+                    let queueResource = yield manager.findOne(queueResource_1.QueueResource, {
+                        where: { queue: { id: queue.id }, [`${resourceKey}_id`]: resource.id }
+                    });
+                    if (!queueResource) {
+                        queueResource = manager.create(queueResource_1.QueueResource, Object.assign({ queue, [`${resourceKey}`]: resource, list_position: newPosition.toString() }, params));
+                    }
+                    else {
+                        Object.assign(queueResource, Object.assign({ [`${resourceKey}`]: resource, list_position: newPosition.toString() }, params));
+                    }
+                    return yield manager.save(queueResource);
+                }));
+            }));
         });
     }
     removeResourceFromQueue(queue_id_text, resource_id_text, resourceService, resourceKey) {
@@ -203,14 +332,14 @@ class QueueResourceService extends baseManyService_1.BaseManyService {
             return this.addResourceToQueueBetween(queue_id_text, clip_id_text, this.clipService, 'clip', position1, position2);
         });
     }
-    addClipToNowPlaying(queue_id_text, clip_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToNowPlaying(queue_id_text, clip_id_text, this.clipService, 'clip');
+    addClipToNowPlaying(queue_id_text_1, clip_id_text_1) {
+        return __awaiter(this, arguments, void 0, function* (queue_id_text, clip_id_text, params = {}) {
+            return this.addResourceToNowPlaying(queue_id_text, clip_id_text, this.clipService, 'clip', params);
         });
     }
-    addClipToHistory(queue_id_text, clip_id_text) {
+    addClipToHistory(queue_id_text, clip_id_text, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToHistory(queue_id_text, clip_id_text, this.clipService, 'clip');
+            return this.addResourceToHistory(queue_id_text, clip_id_text, this.clipService, 'clip', params);
         });
     }
     removeClipFromQueue(queue_id_text, clip_id_text) {
@@ -233,14 +362,14 @@ class QueueResourceService extends baseManyService_1.BaseManyService {
             return this.addResourceToQueueBetween(queue_id_text, item_id_text, this.itemService, 'item', position1, position2);
         });
     }
-    addItemToNowPlaying(queue_id_text, item_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToNowPlaying(queue_id_text, item_id_text, this.itemService, 'item');
+    addItemToNowPlaying(queue_id_text_1, item_id_text_1) {
+        return __awaiter(this, arguments, void 0, function* (queue_id_text, item_id_text, params = {}) {
+            return this.addResourceToNowPlaying(queue_id_text, item_id_text, this.itemService, 'item', params);
         });
     }
-    addItemToHistory(queue_id_text, item_id_text) {
+    addItemToHistory(queue_id_text, item_id_text, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToHistory(queue_id_text, item_id_text, this.itemService, 'item');
+            return this.addResourceToHistory(queue_id_text, item_id_text, this.itemService, 'item', params);
         });
     }
     removeItemFromQueue(queue_id_text, item_id_text) {
@@ -248,36 +377,6 @@ class QueueResourceService extends baseManyService_1.BaseManyService {
             return this.removeResourceFromQueue(queue_id_text, item_id_text, this.itemService, 'item');
         });
     }
-    addItemChapterToQueueNext(queue_id_text, item_chapter_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToQueueNext(queue_id_text, item_chapter_id_text, this.itemChapterService, 'item_chapter');
-        });
-    }
-    addItemChapterToQueueLast(queue_id_text, item_chapter_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToQueueLast(queue_id_text, item_chapter_id_text, this.itemChapterService, 'item_chapter');
-        });
-    }
-    addItemChapterToQueueBetween(queue_id_text, item_chapter_id_text, position1, position2) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToQueueBetween(queue_id_text, item_chapter_id_text, this.itemChapterService, 'item_chapter', position1, position2);
-        });
-    }
-    addItemChapterToNowPlaying(queue_id_text, item_chapter_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToNowPlaying(queue_id_text, item_chapter_id_text, this.itemChapterService, 'item_chapter');
-        });
-    }
-    addItemChapterToHistory(queue_id_text, item_chapter_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToHistory(queue_id_text, item_chapter_id_text, this.itemChapterService, 'item_chapter');
-        });
-    }
-    removeItemChapterFromQueue(queue_id_text, item_chapter_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.removeResourceFromQueue(queue_id_text, item_chapter_id_text, this.itemChapterService, 'item_chapter');
-        });
-    }
     addItemSoundbiteToQueueNext(queue_id_text, item_soundbite_id_text) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.addResourceToQueueNext(queue_id_text, item_soundbite_id_text, this.itemSoundbiteService, 'item_soundbite');
@@ -293,14 +392,14 @@ class QueueResourceService extends baseManyService_1.BaseManyService {
             return this.addResourceToQueueBetween(queue_id_text, item_soundbite_id_text, this.itemSoundbiteService, 'item_soundbite', position1, position2);
         });
     }
-    addItemSoundbiteToNowPlaying(queue_id_text, item_soundbite_id_text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToNowPlaying(queue_id_text, item_soundbite_id_text, this.itemSoundbiteService, 'item_soundbite');
+    addItemSoundbiteToNowPlaying(queue_id_text_1, item_soundbite_id_text_1) {
+        return __awaiter(this, arguments, void 0, function* (queue_id_text, item_soundbite_id_text, params = {}) {
+            return this.addResourceToNowPlaying(queue_id_text, item_soundbite_id_text, this.itemSoundbiteService, 'item_soundbite', params);
         });
     }
-    addItemSoundbiteToHistory(queue_id_text, item_soundbite_id_text) {
+    addItemSoundbiteToHistory(queue_id_text, item_soundbite_id_text, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.addResourceToHistory(queue_id_text, item_soundbite_id_text, this.itemSoundbiteService, 'item_soundbite');
+            return this.addResourceToHistory(queue_id_text, item_soundbite_id_text, this.itemSoundbiteService, 'item_soundbite', params);
         });
     }
     removeItemSoundbiteFromQueue(queue_id_text, item_soundbite_id_text) {
@@ -401,26 +500,6 @@ class QueueResourceService extends baseManyService_1.BaseManyService {
             return this._delete(queue, { add_by_rss_hash_id });
         });
     }
-    getResourcesByParams(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const whereClause = {};
-            if (params.clip_id) {
-                whereClause.clip = { id: params.clip_id };
-            }
-            if (params.item_id) {
-                whereClause.item = { id: params.item_id };
-            }
-            if (params.item_chapter_id) {
-                whereClause.item_chapter = { id: params.item_chapter_id };
-            }
-            if (params.item_soundbite_id) {
-                whereClause.item_soundbite = { id: params.item_soundbite_id };
-            }
-            return this.repositoryRead.find({
-                where: whereClause,
-                relations: ['clip', 'item', 'item_chapter', 'item_soundbite', 'queue']
-            });
-        });
-    }
 }
 exports.QueueResourceService = QueueResourceService;
+QueueResourceService.queueLocks = new Map();

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

@@ -1,4 +1,4 @@
-import { Repository, ObjectLiteral } from 'typeorm';
+import { Repository, ObjectLiteral, EntityTarget } from 'typeorm';
 export type UpdateHistoricalOptions = {
     daily: boolean;
     weekly: boolean;
@@ -24,9 +24,30 @@ interface BaseAggregatedStats extends ObjectLiteral {
     month_1_count?: number;
     all_time_count?: number;
 }
+export declare const STATS_AGGREGATED_SELECT_ALL: {
+    id: boolean;
+    day_current_count: boolean;
+    day_1_count: boolean;
+    day_2_count: boolean;
+    day_3_count: boolean;
+    day_4_count: boolean;
+    day_5_count: boolean;
+    day_6_count: boolean;
+    day_7_count: boolean;
+    day_8_count: boolean;
+    week_current_count: boolean;
+    week_1_count: boolean;
+    week_2_count: boolean;
+    week_3_count: boolean;
+    week_4_count: boolean;
+    month_current_count: boolean;
+    month_1_count: boolean;
+    all_time_count: boolean;
+};
 export declare abstract class BaseStatsAggregatedService<T extends BaseAggregatedStats, ID> {
+    protected repositoryRead: Repository<T>;
     protected repositoryReadWrite: Repository<T>;
-    constructor(repository: Repository<T>);
+    constructor(entity: EntityTarget<T>);
     protected abstract getIdFieldName(): string;
     _updateAggregatedStats(entity_id: ID, statsTrackEventService: any, updateAllTime?: boolean): Promise<void>;
     _updateAggregatedStatsRolling(entity_id: ID, statsTrackEventService: any, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"baseStatsAggregated.d.ts","sourceRoot":"","sources":["../../../src/services/stats/baseStatsAggregated.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAoB,MAAM,SAAS,CAAC;AAGtE,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAA;AAED,UAAU,mBAAoB,SAAQ,aAAa;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,8BAAsB,0BAA0B,CAAC,CAAC,SAAS,mBAAmB,EAAE,EAAE;IAChF,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;gBAEjC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;IAIrC,SAAS,CAAC,QAAQ,CAAC,cAAc,IAAI,MAAM;IAGrC,sBAAsB,CAAC,SAAS,EAAE,EAAE,EAAE,sBAAsB,EAAE,GAAG,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjH,6BAA6B,CAAC,SAAS,EAAE,EAAE,EAAE,sBAAsB,EAAE,GAAG,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAkEjJ"}
+{"version":3,"file":"baseStatsAggregated.d.ts","sourceRoot":"","sources":["../../../src/services/stats/baseStatsAggregated.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAoB,YAAY,EAAE,MAAM,SAAS,CAAC;AAIpF,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAA;AAED,UAAU,mBAAoB,SAAQ,aAAa;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;CAmBvC,CAAC;AAEF,8BAAsB,0BAA0B,CAAC,CAAC,SAAS,mBAAmB,EAAE,EAAE;IAChF,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxC,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;gBAEjC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAKnC,SAAS,CAAC,QAAQ,CAAC,cAAc,IAAI,MAAM;IAGrC,sBAAsB,CAAC,SAAS,EAAE,EAAE,EAAE,sBAAsB,EAAE,GAAG,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjH,6BAA6B,CAAC,SAAS,EAAE,EAAE,EAAE,sBAAsB,EAAE,GAAG,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAkEjJ"}

package/dist/services/stats/baseStatsAggregated.js

@@ -9,11 +9,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseStatsAggregatedService = void 0;
+exports.BaseStatsAggregatedService = exports.STATS_AGGREGATED_SELECT_ALL = void 0;
 const podverse_helpers_1 = require("podverse-helpers");
+const db_1 = require("@orm/db");
+exports.STATS_AGGREGATED_SELECT_ALL = {
+    id: true,
+    day_current_count: true,
+    day_1_count: true,
+    day_2_count: true,
+    day_3_count: true,
+    day_4_count: true,
+    day_5_count: true,
+    day_6_count: true,
+    day_7_count: true,
+    day_8_count: true,
+    week_current_count: true,
+    week_1_count: true,
+    week_2_count: true,
+    week_3_count: true,
+    week_4_count: true,
+    month_current_count: true,
+    month_1_count: true,
+    all_time_count: true
+};
 class BaseStatsAggregatedService {
-    constructor(repository) {
-        this.repositoryReadWrite = repository;
+    constructor(entity) {
+        this.repositoryRead = db_1.AppDataSourceRead.getRepository(entity);
+        this.repositoryReadWrite = db_1.AppDataSourceReadWrite.getRepository(entity);
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _updateAggregatedStats(entity_id_1, statsTrackEventService_1) {
@@ -23,7 +45,7 @@ class BaseStatsAggregatedService {
             const eventCountWeek = yield statsTrackEventService._getCountWithinTimeFrame(entity_id, podverse_helpers_1.TIME_CONSTANTS.ONE_WEEK_IN_MINUTES);
             const eventCountMonth = yield statsTrackEventService._getCountWithinTimeFrame(entity_id, podverse_helpers_1.TIME_CONSTANTS.ONE_MONTH_IN_MINUTES);
             const idFieldName = this.getIdFieldName();
-            let aggregatedStats = yield this.repositoryReadWrite.findOne({ where: { [idFieldName]: entity_id } });
+            let aggregatedStats = yield this.repositoryRead.findOne({ where: { [idFieldName]: entity_id } });
             if (!aggregatedStats) {
                 aggregatedStats = this.repositoryReadWrite.create({ [idFieldName]: entity_id });
             }
@@ -42,7 +64,7 @@ class BaseStatsAggregatedService {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
             const eventCount = yield statsTrackEventService._getCountWithinTimeFrame(entity_id, podverse_helpers_1.TIME_CONSTANTS.ONE_DAY_IN_MINUTES);
             const idFieldName = this.getIdFieldName();
-            let aggregatedStats = yield this.repositoryReadWrite.findOne({ where: { [idFieldName]: entity_id } });
+            let aggregatedStats = yield this.repositoryRead.findOne({ where: { [idFieldName]: entity_id } });
             if (!aggregatedStats) {
                 aggregatedStats = this.repositoryReadWrite.create({ [idFieldName]: entity_id });
             }

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

@@ -1 +1 @@
-{"version":3,"file":"statsAggregatedAccount.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAE5F,qBAAa,6BAA8B,SAAQ,0BAA0B,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAC3G,OAAO,CAAC,6BAA6B,CAAgC;;IAOrE,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxH"}
+{"version":3,"file":"statsAggregatedAccount.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAE5F,qBAAa,6BAA8B,SAAQ,0BAA0B,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAC3G,OAAO,CAAC,6BAA6B,CAAgC;;IAOrE,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,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/statsAggregatedAccount.js

@@ -10,13 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatsAggregatedAccountService = void 0;
-const db_1 = require("@orm/db");
 const statsAggregatedAccount_1 = require("@orm/entities/stats/statsAggregatedAccount");
 const statsTrackEventAccount_1 = require("./statsTrackEventAccount");
 const baseStatsAggregated_1 = require("./baseStatsAggregated");
 class StatsAggregatedAccountService extends baseStatsAggregated_1.BaseStatsAggregatedService {
     constructor() {
-        super(db_1.AppDataSourceReadWrite.getRepository(statsAggregatedAccount_1.StatsAggregatedAccount));
+        super(statsAggregatedAccount_1.StatsAggregatedAccount);
         this.statsTrackEventAccountService = new statsTrackEventAccount_1.StatsTrackEventAccountService();
     }
     getIdFieldName() {

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

@@ -1,9 +1,15 @@
+import { FindManyOptions } from 'typeorm';
 import { StatsAggregatedChannel } from '@orm/entities/stats/statsAggregatedChannel';
 import { BaseStatsAggregatedService, UpdateHistoricalOptions } from './baseStatsAggregated';
 export declare class StatsAggregatedChannelService extends BaseStatsAggregatedService<StatsAggregatedChannel, number> {
     private statsTrackEventChannelService;
     constructor();
     protected getIdFieldName(): string;
+    private mergeWhere;
+    getMany(config: FindManyOptions<StatsAggregatedChannel>): Promise<StatsAggregatedChannel[]>;
+    getManyCount(config: FindManyOptions<StatsAggregatedChannel>): Promise<number>;
+    getManyByChannels(channel_ids: number[], config: FindManyOptions<StatsAggregatedChannel>): Promise<StatsAggregatedChannel[]>;
+    getManyByChannelsCount(channel_ids: number[], config: FindManyOptions<StatsAggregatedChannel>): Promise<number>;
     updateAggregatedStats(channel_id: number, updateAllTime?: boolean): Promise<void>;
     updateAggregatedStatsRolling(channel_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"statsAggregatedChannel.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedChannel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAE5F,qBAAa,6BAA8B,SAAQ,0BAA0B,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAC3G,OAAO,CAAC,6BAA6B,CAAgC;;IAOrE,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxH"}
+{"version":3,"file":"statsAggregatedChannel.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,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"}

package/dist/services/stats/statsAggregatedChannel.js

@@ -10,18 +10,45 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatsAggregatedChannelService = void 0;
-const db_1 = require("@orm/db");
 const statsAggregatedChannel_1 = require("@orm/entities/stats/statsAggregatedChannel");
 const statsTrackEventChannel_1 = require("./statsTrackEventChannel");
 const baseStatsAggregated_1 = require("./baseStatsAggregated");
+const feedFlagHelpers_1 = require("@orm/lib/feedFlagHelpers");
 class StatsAggregatedChannelService extends baseStatsAggregated_1.BaseStatsAggregatedService {
     constructor() {
-        super(db_1.AppDataSourceReadWrite.getRepository(statsAggregatedChannel_1.StatsAggregatedChannel));
+        super(statsAggregatedChannel_1.StatsAggregatedChannel);
         this.statsTrackEventChannelService = new statsTrackEventChannel_1.StatsTrackEventChannelService();
     }
     getIdFieldName() {
         return 'channel_id';
     }
+    mergeWhere(feedWhere, configWhere) {
+        return Object.assign(Object.assign({}, (feedWhere || {})), (configWhere || {}));
+    }
+    getMany(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)();
+            return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
+        });
+    }
+    getManyCount(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)();
+            return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
+        });
+    }
+    getManyByChannels(channel_ids, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)(channel_ids);
+            return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
+        });
+    }
+    getManyByChannelsCount(channel_ids, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const feedWhere = (0, feedFlagHelpers_1.getActiveFeedWhere)(channel_ids);
+            return this.repositoryRead.count(Object.assign(Object.assign({}, config), { where: this.mergeWhere(feedWhere, config.where) }));
+        });
+    }
     updateAggregatedStats(channel_id_1) {
         return __awaiter(this, arguments, void 0, function* (channel_id, updateAllTime = false) {
             yield this._updateAggregatedStats(channel_id, this.statsTrackEventChannelService, updateAllTime);

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

@@ -1,9 +1,12 @@
 import { StatsAggregatedClip } from '@orm/entities/stats/statsAggregatedClip';
 import { BaseStatsAggregatedService, UpdateHistoricalOptions } from './baseStatsAggregated';
+import { FindManyOptions } from 'typeorm';
 export declare class StatsAggregatedClipService extends BaseStatsAggregatedService<StatsAggregatedClip, number> {
     private statsTrackEventClipService;
     constructor();
     protected getIdFieldName(): string;
+    getMany(config: FindManyOptions<StatsAggregatedClip>): Promise<StatsAggregatedClip[]>;
+    getManyAndCountPublic(config: FindManyOptions<StatsAggregatedClip>): Promise<[StatsAggregatedClip[], number]>;
     updateAggregatedStats(clip_id: number, updateAllTime?: boolean): Promise<void>;
     updateAggregatedStatsRolling(clip_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"statsAggregatedClip.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedClip.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAE5F,qBAAa,0BAA2B,SAAQ,0BAA0B,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrG,OAAO,CAAC,0BAA0B,CAA6B;;IAO/D,SAAS,CAAC,cAAc,IAAI,MAAM;IAI5B,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrH"}
+{"version":3,"file":"statsAggregatedClip.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedClip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,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"}