podverse-orm 5.1.26-alpha.0 → 5.1.28-alpha.0

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

@@ -1 +1 @@
-{"version":3,"file":"playlist.d.ts","sourceRoot":"","sources":["../../../src/services/playlist/playlist.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,sBAAsB,EACnE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC/C,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,eAAe,EAAE,sBAAsB,GAAG,IAAI,EAC9C,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAClC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAE;IAe3B,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"}
+{"version":3,"file":"playlist.d.ts","sourceRoot":"","sources":["../../../src/services/playlist/playlist.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,sBAAsB,EACnE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC/C,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,eAAe,EAAE,sBAAsB,GAAG,IAAI,EAC9C,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAClC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAE;IAe3B,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;IAuBzC,8BAA8B,CAClC,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAClC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;IAY1B,oCAAoC,CACxC,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,GAClC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;CAYjC"}

package/dist/services/playlist/playlist.js

@@ -118,5 +118,19 @@ class PlaylistService extends baseManyService_1.BaseManyService {
             return this.repositoryRead.find(options);
         });
     }
+    getManyByAccountIdTextAndCount(account_id_text, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.repositoryRead.findAndCount(Object.assign(Object.assign({}, options), { where: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.where), { account: {
+                        id_text: account_id_text
+                    } }) }));
+        });
+    }
+    getManyByAccountIdTextPublicAndCount(account_id_text, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.repositoryRead.findAndCount(Object.assign(Object.assign({}, options), { where: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.where), { account: {
+                        id_text: account_id_text
+                    }, sharable_status_id: podverse_helpers_1.SharableStatusEnum.Public }) }));
+        });
+    }
 }
 exports.PlaylistService = PlaylistService;

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

@@ -1,9 +1,13 @@
+import { FindManyOptions } from 'typeorm';
 import { StatsAggregatedAccount } from '@orm/entities/stats/statsAggregatedAccount';
 import { BaseStatsAggregatedService, UpdateHistoricalOptions } from './baseStatsAggregated';
 export declare class StatsAggregatedAccountService extends BaseStatsAggregatedService<StatsAggregatedAccount, number> {
     private statsTrackEventAccountService;
     constructor();
     protected getIdFieldName(): string;
+    private mergeWhere;
+    getMany(config: FindManyOptions<StatsAggregatedAccount>, profileType: 'global' | 'subscribed'): Promise<StatsAggregatedAccount[]>;
+    getManyByAccountsAndCount(account_ids: number[], config: FindManyOptions<StatsAggregatedAccount>, profileType: 'global' | 'subscribed'): Promise<[StatsAggregatedAccount[], number]>;
     updateAggregatedStats(account_id: number, updateAllTime?: boolean): Promise<void>;
     updateAggregatedStatsRolling(account_id: number, updateHistoricalOptions: UpdateHistoricalOptions): Promise<void>;
 }

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":"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"}
+{"version":3,"file":"statsAggregatedAccount.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsAggregatedAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAmB,MAAM,SAAS,CAAC;AAC3D,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;IAIlC,OAAO,CAAC,UAAU;IAIZ,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,EAC/C,WAAW,EAAE,QAAQ,GAAG,YAAY,GACnC,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAgB9B,yBAAyB,CAC7B,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,eAAe,CAAC,sBAAsB,CAAC,EAC/C,WAAW,EAAE,QAAQ,GAAG,YAAY,GACnC,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAE,MAAM,CAAC,CAAC;IAiBxC,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,6 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatsAggregatedAccountService = void 0;
+const podverse_helpers_1 = require("podverse-helpers");
+const typeorm_1 = require("typeorm");
 const statsAggregatedAccount_1 = require("@orm/entities/stats/statsAggregatedAccount");
 const statsTrackEventAccount_1 = require("./statsTrackEventAccount");
 const baseStatsAggregated_1 = require("./baseStatsAggregated");
@@ -21,6 +23,38 @@ class StatsAggregatedAccountService extends baseStatsAggregated_1.BaseStatsAggre
     getIdFieldName() {
         return 'tracked_account_id';
     }
+    mergeWhere(profileWhere, configWhere) {
+        return Object.assign(Object.assign({}, (profileWhere || {})), (configWhere || {}));
+    }
+    getMany(config, profileType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sharableStatusIds = (0, podverse_helpers_1.getSharableStatusIdsForProfileType)(profileType);
+            const profileWhere = {
+                tracked_account: {
+                    sharable_status: { id: (0, typeorm_1.In)(sharableStatusIds) },
+                    account_profile: {
+                        display_name: (0, typeorm_1.Not)((0, typeorm_1.IsNull)())
+                    }
+                }
+            };
+            return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: this.mergeWhere(profileWhere, config.where) }));
+        });
+    }
+    getManyByAccountsAndCount(account_ids, config, profileType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sharableStatusIds = (0, podverse_helpers_1.getSharableStatusIdsForProfileType)(profileType);
+            const profileWhere = {
+                tracked_account_id: (0, typeorm_1.In)(account_ids),
+                tracked_account: {
+                    sharable_status: { id: (0, typeorm_1.In)(sharableStatusIds) },
+                    account_profile: {
+                        display_name: (0, typeorm_1.Not)((0, typeorm_1.IsNull)())
+                    }
+                }
+            };
+            return this.repositoryRead.findAndCount(Object.assign(Object.assign({}, config), { where: this.mergeWhere(profileWhere, config.where) }));
+        });
+    }
     updateAggregatedStats(account_id_1) {
         return __awaiter(this, arguments, void 0, function* (account_id, updateAllTime = false) {
             yield this._updateAggregatedStats(account_id, this.statsTrackEventAccountService, updateAllTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-orm",
-  "version": "5.1.26-alpha.0",
+  "version": "5.1.28-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "module-alias": "^2.2.3",
     "nanoid": "^5.1.6",
     "pg": "^8.16.3",
-    "podverse-helpers": "^5.1.26-alpha.0",
+    "podverse-helpers": "^5.1.28-alpha.0",
     "typeorm": "^0.3.26",
     "typeorm-naming-strategies": "^4.1.0"
   },
@@ -36,8 +36,5 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.44.0"
-  },
-  "overrides": {
-    "diff": "^8.0.3"
   }
 }