@hestia-earth/api 0.24.7 → 0.24.9

package/dist/aggregations/model/model.d.ts

@@ -1,16 +1,17 @@
-import { NodeType } from '@hestia-earth/schema';
 import { BaseModel } from '../../db/model.base';
 import { status, pipelineStatus } from '../../files/model/model';
 export declare class Aggregation extends BaseModel {
+    folder: string;
     filename: string;
     filepath: string;
     validatedAt?: Date;
     status?: status;
     pipelineStatus?: pipelineStatus;
-    readonly nodeType: NodeType;
     readonly productId: string;
     readonly countryId: string;
     readonly startYear: number;
     readonly endYear: number;
 }
-export declare const parseValues: ({ filename }: Pick<Aggregation, 'filename'>) => Pick<Aggregation, 'nodeType' | 'productId' | 'countryId' | 'startYear' | 'endYear'>;
+export declare const defaultAggregationPeriod = 20;
+export declare const aggregationFolderFromFilename: (filename: string) => string;
+export declare const parseAggregationValues: (value: string) => Pick<Aggregation, 'productId' | 'countryId' | 'startYear' | 'endYear'>;

package/dist/aggregations/model/model.js

@@ -15,8 +15,8 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseValues = exports.Aggregation = void 0;
-var schema_1 = require("@hestia-earth/schema");
+exports.parseAggregationValues = exports.aggregationFolderFromFilename = exports.defaultAggregationPeriod = exports.Aggregation = void 0;
+var utils_1 = require("@hestia-earth/utils");
 var model_base_1 = require("../../db/model.base");
 var model_1 = require("../../files/model/model");
 var Aggregation = (function (_super) {
@@ -27,16 +27,25 @@ var Aggregation = (function (_super) {
     return Aggregation;
 }(model_base_1.BaseModel));
 exports.Aggregation = Aggregation;
-var parseValues = function (_a) {
-    var filename = _a.filename;
-    var _b = (0, model_1.filenameWithoutExt)(filename).split('-'), nodeType = _b[0], productId = _b[1], parts = _b.slice(2);
+exports.defaultAggregationPeriod = 20;
+var aggregationFolderFromFilename = function (filename) {
+    var name = (0, model_1.filenameWithoutExt)(filename);
+    var parts = name.split('-');
+    var timestamp = parts.pop();
+    return timestamp.length === 8 ? parts.join('-') : name;
+};
+exports.aggregationFolderFromFilename = aggregationFolderFromFilename;
+var parseAggregationValues = function (value) {
+    var _a = (0, exports.aggregationFolderFromFilename)(value).split('-'), productId = _a[0], parts = _a.slice(1);
+    var countryId = parts.filter(function (v) { return !(0, utils_1.isNumber)(v); }).join('-');
     var endYear = +parts.pop();
+    var lastPart = parts.pop();
+    var startYear = (0, utils_1.isNumber)(lastPart) ? +lastPart : endYear - exports.defaultAggregationPeriod + 1;
     return {
-        nodeType: Object.values(schema_1.NodeType).find(function (v) { return v.toLowerCase() === nodeType.toLowerCase(); }),
         productId: productId,
-        countryId: parts.join('-'),
-        startYear: endYear - 9,
+        countryId: countryId,
+        startYear: startYear,
         endYear: endYear
     };
 };
-exports.parseValues = parseValues;
+exports.parseAggregationValues = parseAggregationValues;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.24.7",
+  "version": "0.24.9",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",