@openhealth/oht-custom-parser-lib 0.2.9 → 0.2.10
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.
|
@@ -102,20 +102,13 @@ async function postDataImportFileUploadToCore(dataImportFileUpload, rejectedStat
|
|
|
102
102
|
}, ohtCoreApiKey);
|
|
103
103
|
logger.info({ response: initialResponse }, `Resp: PATCH status: ${patchStatus} ${ohtCoreFileUploadUrl}, filename: ${filename}`);
|
|
104
104
|
if (isReportParsedCorrectly && rejectedStatus === undefined) {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
return null;
|
|
110
|
-
}
|
|
111
|
-
else {
|
|
112
|
-
return await (0, auxiliaryFunctions_service_1.postFileUploadSetStatus)({ status: oht_types_1.DataImportFileUploadStatus.READY, digitalization: { status: 'DONE', lastUpdated: dayjs_1.default.utc() } }, dataImportFileUpload.id, filename, ohtCoreApiKey);
|
|
113
|
-
}
|
|
105
|
+
if (dataImportFileUpload?.labOrderId?.length > 0) {
|
|
106
|
+
// deprecate any previous fileUpload with same labOrderId and update current to READY
|
|
107
|
+
await makeApiCallWithRetry('post', ohtCoreUpdateFileUploadUrl, {}, ohtCoreApiKey);
|
|
108
|
+
return null;
|
|
114
109
|
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
logger.error({ resp: errorDetail }, `ERROR: POST status: READY /status/set/${dataImportFileUpload.id}, filename: ${filename}`);
|
|
118
|
-
throw error;
|
|
110
|
+
else {
|
|
111
|
+
return await (0, auxiliaryFunctions_service_1.postFileUploadSetStatus)({ status: oht_types_1.DataImportFileUploadStatus.READY, digitalization: { status: 'DONE', lastUpdated: dayjs_1.default.utc() } }, dataImportFileUpload.id, filename, ohtCoreApiKey);
|
|
119
112
|
}
|
|
120
113
|
}
|
|
121
114
|
logger.warn({
|
|
@@ -127,7 +120,7 @@ async function postDataImportFileUploadToCore(dataImportFileUpload, rejectedStat
|
|
|
127
120
|
}
|
|
128
121
|
catch (error) {
|
|
129
122
|
const errorDetail = parseErrorObj(error);
|
|
130
|
-
logger.error({ resp: errorDetail }, `ERROR:
|
|
123
|
+
logger.error({ patchStatus, resp: errorDetail }, `ERROR: on report generation url:${ohtCoreFileUploadUrl} filename: ${filename}`);
|
|
131
124
|
// set digitalization error
|
|
132
125
|
await makeApiCallWithRetry('patch', ohtCoreDigitalizationUrl, {
|
|
133
126
|
status: oht_types_1.DigitizationStatus.ERROR,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportCreator.service.js","sourceRoot":"","sources":["../../service/reportCreator.service.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"reportCreator.service.js","sourceRoot":"","sources":["../../service/reportCreator.service.ts"],"names":[],"mappings":"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"}
|