@openhealth/oht-custom-parser-lib 0.2.62 → 0.2.63
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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ErrorMessage } from '../types/error.types';
|
|
2
|
-
import { DataImportFileUpload, DataImportFileUploadStatus, Sex } from "../types/oht.types";
|
|
2
|
+
import { DataImportFileUpload, DataImportFileUploadStatus, DigitizationStatus, PipelineStep, Sex } from "../types/oht.types";
|
|
3
3
|
import dayjs from 'dayjs';
|
|
4
4
|
import { TransformationRulesChains } from "../types/custom-parser.types";
|
|
5
5
|
declare function getPatientAge(documentDate?: Date, patientBirthdate?: Date): number | null;
|
|
@@ -18,12 +18,23 @@ export interface FileUploadFilter {
|
|
|
18
18
|
search: string;
|
|
19
19
|
}
|
|
20
20
|
declare function queryFileUploadsWithFilters(filters: FileUploadFilter[], ohtCoreApiKey: string): Promise<DataImportFileUpload[]>;
|
|
21
|
+
/**
|
|
22
|
+
* Digitalization update fields matching the Go struct DigitalizationUpdateRequest
|
|
23
|
+
* All fields are optional except status (which is required in the digitalization object)
|
|
24
|
+
*/
|
|
25
|
+
interface DigitalizationUpdateFields {
|
|
26
|
+
status?: DigitizationStatus;
|
|
27
|
+
pipelineStep?: PipelineStep;
|
|
28
|
+
pipelineStepPercentageCompleted?: number;
|
|
29
|
+
pipelineStepData?: string;
|
|
30
|
+
pipelineVersion?: string | Record<string, any>;
|
|
31
|
+
timestamp?: string | dayjs.Dayjs;
|
|
32
|
+
lastUpdated?: dayjs.Dayjs;
|
|
33
|
+
}
|
|
21
34
|
declare function postFileUploadSetStatus(payload: {
|
|
22
35
|
status: DataImportFileUploadStatus;
|
|
23
|
-
digitalization
|
|
24
|
-
|
|
25
|
-
lastUpdated: dayjs.Dayjs;
|
|
26
|
-
};
|
|
36
|
+
digitalization?: DigitalizationUpdateFields;
|
|
37
|
+
rejectReason?: string;
|
|
27
38
|
}, fileUploadId: string, filename: string, ohtCoreApiKey: string): Promise<DataImportFileUpload>;
|
|
28
39
|
declare function getPartnerTransformationRules(partnerId: string, labKeys: string[], ohtCoreApiKey: string): Promise<TransformationRulesChains>;
|
|
29
40
|
export { parseExternalPatientId, parseGender, isPatientAgeValid, getPatientAge, handleRejection, queryFileUploadsWithFilters, postFileUploadSetStatus, getPartnerTransformationRules, };
|
|
@@ -76,7 +76,42 @@ async function queryFileUploadsWithFilters(filters, ohtCoreApiKey) {
|
|
|
76
76
|
async function postFileUploadSetStatus(payload, fileUploadId, filename, ohtCoreApiKey) {
|
|
77
77
|
const OHT_CORE_URL = process.env.OHT_CORE_URL;
|
|
78
78
|
const ohtCoreFileUploadSetStatusUrl = `${OHT_CORE_URL}/v1/file-uploads/status/set/${fileUploadId}`;
|
|
79
|
-
|
|
79
|
+
// Format the payload, converting dayjs objects to ISO strings
|
|
80
|
+
const formattedPayload = {
|
|
81
|
+
status: payload.status,
|
|
82
|
+
...(payload.rejectReason && { rejectReason: payload.rejectReason }),
|
|
83
|
+
};
|
|
84
|
+
// Format digitalization object if provided
|
|
85
|
+
if (payload.digitalization) {
|
|
86
|
+
const digitalization = {};
|
|
87
|
+
if (payload.digitalization.status !== undefined) {
|
|
88
|
+
digitalization.status = payload.digitalization.status;
|
|
89
|
+
}
|
|
90
|
+
if (payload.digitalization.pipelineStep !== undefined) {
|
|
91
|
+
digitalization.pipelineStep = payload.digitalization.pipelineStep;
|
|
92
|
+
}
|
|
93
|
+
if (payload.digitalization.pipelineStepPercentageCompleted !== undefined) {
|
|
94
|
+
digitalization.pipelineStepPercentageCompleted = payload.digitalization.pipelineStepPercentageCompleted;
|
|
95
|
+
}
|
|
96
|
+
if (payload.digitalization.pipelineStepData !== undefined) {
|
|
97
|
+
digitalization.pipelineStepData = payload.digitalization.pipelineStepData;
|
|
98
|
+
}
|
|
99
|
+
if (payload.digitalization.pipelineVersion !== undefined) {
|
|
100
|
+
digitalization.pipelineVersion = payload.digitalization.pipelineVersion;
|
|
101
|
+
}
|
|
102
|
+
// Handle timestamp - convert dayjs to ISO string, or use provided string
|
|
103
|
+
if (payload.digitalization.timestamp !== undefined) {
|
|
104
|
+
digitalization.timestamp = typeof payload.digitalization.timestamp === 'string'
|
|
105
|
+
? payload.digitalization.timestamp
|
|
106
|
+
: payload.digitalization.timestamp.toISOString();
|
|
107
|
+
}
|
|
108
|
+
else if (payload.digitalization.lastUpdated !== undefined) {
|
|
109
|
+
// Backward compatibility: convert lastUpdated to timestamp
|
|
110
|
+
digitalization.timestamp = payload.digitalization.lastUpdated.toISOString();
|
|
111
|
+
}
|
|
112
|
+
formattedPayload.digitalization = digitalization;
|
|
113
|
+
}
|
|
114
|
+
const processingResponse = await (0, apiUtils_1.makeApiCallWithRetry)('post', ohtCoreFileUploadSetStatusUrl, formattedPayload, ohtCoreApiKey);
|
|
80
115
|
logger.info({ resp: processingResponse?.data }, `Resp: POST status: ${payload.status} /file-uploads/${fileUploadId}, filename: ${filename}`);
|
|
81
116
|
return processingResponse?.data;
|
|
82
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auxiliaryFunctions.service.js","sourceRoot":"","sources":["../../service/auxiliaryFunctions.service.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"auxiliaryFunctions.service.js","sourceRoot":"","sources":["../../service/auxiliaryFunctions.service.ts"],"names":[],"mappings":"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"}
|