@cumulus/message 16.1.1 → 16.1.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.
- package/Granules.d.ts +2 -1
- package/Granules.d.ts.map +1 -1
- package/Granules.js +7 -1
- package/Granules.js.map +1 -1
- package/package.json +7 -7
- package/src/Granules.ts +9 -1
- package/tsconfig.tsbuildinfo +1 -1
package/Granules.d.ts
CHANGED
|
@@ -77,7 +77,8 @@ export declare const getGranuleTimeToArchive: ({ post_to_cmr_duration, }?: {
|
|
|
77
77
|
*/
|
|
78
78
|
export declare const getGranuleProcessingTimeInfo: (processingTimeInfo?: ExecutionProcessingTimes) => ExecutionProcessingTimes | {};
|
|
79
79
|
/**
|
|
80
|
-
* Get granule temporal information from argument
|
|
80
|
+
* Get granule temporal information from argument, directly from CMR
|
|
81
|
+
* file or from granule object.
|
|
81
82
|
*
|
|
82
83
|
* Converts temporal information timestamps to a standardized ISO string
|
|
83
84
|
* format for compatibility across database systems.
|
package/Granules.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Granules.d.ts","sourceRoot":"","sources":["src/Granules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Granules.d.ts","sourceRoot":"","sources":["src/Granules.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EACL,UAAU,EACV,aAAa,EACb,mBAAmB,EACnB,cAAc,EACf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,UAAU,0BAA2B,SAAQ,OAAO,CAAC,IAAI;IACvD,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,OAAO,CAAA;KACtB,CAAA;CACF;AAED,UAAU,mBAAoB,SAAQ,OAAO,CAAC,cAAc;IAC1D,IAAI,EAAE,0BAA0B,CAAC;IACjC,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KACpB,CAAA;CACF;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,YACpB,mBAAmB,KAC3B,OAAO,EAAqC,CAAC;AAEhD;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,YACpB,mBAAmB,KAC3B,OAAmD,CAAC;AAEvD;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,mBACX,QAAQ,cAAc,WAC7B,cAAc,KACtB,QAAQ,cAAc,GAAG,aAAiD,CAAC;AAE9E;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,YACvB,mBAAmB,YACS,CAAC;AAExC;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,kBAAkB,OAAO,EAAE,KAAQ,MAMtE,CAAC;AAEF,eAAO,MAAM,0BAA0B;;YAEA,CAAC;AAExC,eAAO,MAAM,uBAAuB;;YAEE,CAAC;AA6BvC;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,wBAClB,wBAAwB,KAC5C,wBAAwB,GAAG,EAQ7B,CAAC;AAWF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,yBAAyB;aAK3B,cAAc;;cAEb,aAAa;MACrB,QAAQ,mBAAmB,GAAG,EAAE,CAenC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB;aAoB1B,cAAc;;kBAET,MAAM;;;;YAIZ,aAAa;;eAEV,MAAM;;;eAGN,MAAM;cACP,aAAa;;cAEb,MAAM;mBACD,MAAM;sBACH,MAAM;mBACT,MAAM;MACnB,QAAQ,UAAU,CAyDrB,CAAC"}
|
package/Granules.js
CHANGED
|
@@ -11,10 +11,12 @@ exports.generateGranuleApiRecord = exports.getGranuleCmrTemporalInfo = exports.g
|
|
|
11
11
|
* @example
|
|
12
12
|
* const Granules = require('@cumulus/message/Granules');
|
|
13
13
|
*/
|
|
14
|
+
const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
|
|
14
15
|
const isInteger_1 = __importDefault(require("lodash/isInteger"));
|
|
15
16
|
const isUndefined_1 = __importDefault(require("lodash/isUndefined"));
|
|
16
17
|
const mapValues_1 = __importDefault(require("lodash/mapValues"));
|
|
17
18
|
const omitBy_1 = __importDefault(require("lodash/omitBy"));
|
|
19
|
+
const pick_1 = __importDefault(require("lodash/pick"));
|
|
18
20
|
const errors_1 = require("@cumulus/errors");
|
|
19
21
|
/**
|
|
20
22
|
* Get granules from payload?.granules of a workflow message.
|
|
@@ -124,7 +126,8 @@ function isGranuleTemporalInfo(info = {}) {
|
|
|
124
126
|
&& info?.lastUpdateDateTime !== undefined;
|
|
125
127
|
}
|
|
126
128
|
/**
|
|
127
|
-
* Get granule temporal information from argument
|
|
129
|
+
* Get granule temporal information from argument, directly from CMR
|
|
130
|
+
* file or from granule object.
|
|
128
131
|
*
|
|
129
132
|
* Converts temporal information timestamps to a standardized ISO string
|
|
130
133
|
* format for compatibility across database systems.
|
|
@@ -141,6 +144,9 @@ const getGranuleCmrTemporalInfo = async ({ granule, cmrTemporalInfo, cmrUtils, }
|
|
|
141
144
|
const temporalInfo = isGranuleTemporalInfo(cmrTemporalInfo)
|
|
142
145
|
? { ...cmrTemporalInfo }
|
|
143
146
|
: await cmrUtils.getGranuleTemporalInfo(granule);
|
|
147
|
+
if ((0, isEmpty_1.default)(temporalInfo)) {
|
|
148
|
+
return (0, pick_1.default)(granule, ['beginningDateTime', 'endingDateTime', 'productionDateTime', 'lastUpdateDateTime']);
|
|
149
|
+
}
|
|
144
150
|
return (0, mapValues_1.default)(temporalInfo, convertDateToISOStringPreservingNull);
|
|
145
151
|
};
|
|
146
152
|
exports.getGranuleCmrTemporalInfo = getGranuleCmrTemporalInfo;
|
package/Granules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Granules.js","sourceRoot":"","sources":["src/Granules.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AAEb;;;;;;GAMG;AAEH,iEAAyC;AACzC,qEAA6C;AAC7C,iEAAyC;AACzC,2DAAmC;
|
|
1
|
+
{"version":3,"file":"Granules.js","sourceRoot":"","sources":["src/Granules.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cumulus/message",
|
|
3
|
-
"version": "16.1.
|
|
3
|
+
"version": "16.1.3",
|
|
4
4
|
"description": "Utilities for building and parsing Cumulus messages",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"GIBS",
|
|
@@ -39,11 +39,11 @@
|
|
|
39
39
|
"author": "Cumulus Authors",
|
|
40
40
|
"license": "Apache-2.0",
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@cumulus/aws-client": "16.1.
|
|
43
|
-
"@cumulus/common": "16.1.
|
|
44
|
-
"@cumulus/errors": "16.1.
|
|
45
|
-
"@cumulus/logger": "16.1.
|
|
46
|
-
"@cumulus/types": "16.1.
|
|
42
|
+
"@cumulus/aws-client": "16.1.3",
|
|
43
|
+
"@cumulus/common": "16.1.3",
|
|
44
|
+
"@cumulus/errors": "16.1.3",
|
|
45
|
+
"@cumulus/logger": "16.1.3",
|
|
46
|
+
"@cumulus/types": "16.1.3",
|
|
47
47
|
"jsonpath-plus": "^3.0.0",
|
|
48
48
|
"lodash": "^4.17.21",
|
|
49
49
|
"uuid": "^8.2.0"
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@types/uuid": "^8.0.0"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "2cadd0bf948a60b9b291dceccf5d31c5f7bca24a"
|
|
55
55
|
}
|
package/src/Granules.ts
CHANGED
|
@@ -8,10 +8,12 @@
|
|
|
8
8
|
* const Granules = require('@cumulus/message/Granules');
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
|
+
import isEmpty from 'lodash/isEmpty';
|
|
11
12
|
import isInteger from 'lodash/isInteger';
|
|
12
13
|
import isUndefined from 'lodash/isUndefined';
|
|
13
14
|
import mapValues from 'lodash/mapValues';
|
|
14
15
|
import omitBy from 'lodash/omitBy';
|
|
16
|
+
import pick from 'lodash/pick';
|
|
15
17
|
|
|
16
18
|
import { CumulusMessageError } from '@cumulus/errors';
|
|
17
19
|
import { Message } from '@cumulus/types';
|
|
@@ -171,7 +173,8 @@ function isGranuleTemporalInfo(
|
|
|
171
173
|
}
|
|
172
174
|
|
|
173
175
|
/**
|
|
174
|
-
* Get granule temporal information from argument
|
|
176
|
+
* Get granule temporal information from argument, directly from CMR
|
|
177
|
+
* file or from granule object.
|
|
175
178
|
*
|
|
176
179
|
* Converts temporal information timestamps to a standardized ISO string
|
|
177
180
|
* format for compatibility across database systems.
|
|
@@ -196,6 +199,11 @@ export const getGranuleCmrTemporalInfo = async ({
|
|
|
196
199
|
const temporalInfo = isGranuleTemporalInfo(cmrTemporalInfo)
|
|
197
200
|
? { ...cmrTemporalInfo }
|
|
198
201
|
: await cmrUtils.getGranuleTemporalInfo(granule);
|
|
202
|
+
|
|
203
|
+
if (isEmpty(temporalInfo)) {
|
|
204
|
+
return pick(granule, ['beginningDateTime', 'endingDateTime', 'productionDateTime', 'lastUpdateDateTime']);
|
|
205
|
+
}
|
|
206
|
+
|
|
199
207
|
return mapValues(
|
|
200
208
|
temporalInfo,
|
|
201
209
|
convertDateToISOStringPreservingNull
|