@icure/be-fhc-api 0.5.13 → 0.5.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icure/be-fhc-api",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "description": "Typescript version of Freehealth Connector standalone API client",
   "main": "index.js",
   "types": "index.d.ts",

package/x-api/message-x-api.js

@@ -43,14 +43,14 @@ class MessageXApi {
             subject: "Lists request",
             senderReferences: req.commonOutput ? Object.assign(Object.assign(Object.assign({}, (req.commonOutput.inputReference ? { inputReference: req.commonOutput.inputReference } : {})), (req.commonOutput.nipReference ? { nipReference: req.commonOutput.nipReference } : {})), (req.commonOutput.outputReference ? { outputReference: req.commonOutput.outputReference } : {})) : undefined,
         })
-            .then(msg => this.api.createMessage(msg))
+            .then(msg => (0, api_1.retry)(() => this.api.createMessage(msg)))
             .then(msg => {
             return this.documentXApi
                 .newInstance(user, msg, {
                 name: `${msg.subject}_content.json`
             })
-                .then(doc => this.documentXApi.createDocument(doc))
-                .then(doc => this.documentXApi.setClearDocumentAttachment(doc, (0, api_1.ua2ab)((0, api_1.utf8_2ua)(JSON.stringify(req))), ["public.json"]))
+                .then(doc => (0, api_1.retry)(() => this.documentXApi.createDocument(doc)))
+                .then(doc => (0, api_1.retry)(() => this.documentXApi.setClearDocumentAttachment(doc, (0, api_1.ua2ab)((0, api_1.utf8_2ua)(JSON.stringify(req))), ["public.json"])))
                 .then(() => msg);
         });
     }
@@ -60,7 +60,7 @@ class MessageXApi {
         _.each(list.acks, ack => {
             const ref = (ack.appliesTo || "").replace("urn:nip:reference:input:", "");
             promAck = promAck
-                .then(() => this.api.findMessagesByTransportGuid(`GMD:OUT:${ref}`, false, undefined, undefined, 100))
+                .then(() => (0, api_1.retry)(() => this.api.findMessagesByTransportGuid(`GMD:OUT:${ref}`, false, undefined, undefined, 100)))
                 .then(parents => {
                 const msgsForHcp = ((parents && parents.rows) || []).filter((p) => p.responsible === hcp.id);
                 if (!msgsForHcp.length) {
@@ -69,15 +69,15 @@ class MessageXApi {
                 const parent = msgsForHcp[0];
                 (parent.metas || (parent.metas = {}))[`tack.${ack.io}`] = ((ack.date && moment(ack.date)) ||
                     moment()).format("YYYYMMDDHHmmss");
-                return this.api.modifyMessage(parent);
+                return (0, api_1.retry)(() => this.api.modifyMessage(parent));
             })
                 .catch(e => {
                 console.log(e.message);
                 return null;
             })
-                .then(() => this.receiptXApi.logSCReceipt(ack, user, hcp.id, "dmg", "listAck", [
+                .then(() => (0, api_1.retry)(() => this.receiptXApi.logSCReceipt(ack, user, hcp.id, "dmg", "listAck", [
                 `nip:pin:valuehash:${ack.valueHash}`
-            ]))
+            ])))
                 .then(receipt => {
                 ack.valueHash && ackHashes.push(ack.valueHash);
                 return receipt;
@@ -118,15 +118,15 @@ class MessageXApi {
             });
             promMsg = promMsg.then(acc => {
                 let ref = (dmgsMsgList.appliesTo || "").replace("urn:nip:reference:input:", "");
-                return this.api
-                    .findMessagesByTransportGuid(`GMD:OUT:${ref}`, false, undefined, undefined, 100)
+                return (0, api_1.retry)(() => this.api
+                    .findMessagesByTransportGuid(`GMD:OUT:${ref}`, false, undefined, undefined, 100))
                     .then(parents => {
                     const msgsForHcp = ((parents && parents.rows) || []).filter((p) => p.responsible === hcp.id);
                     if (!msgsForHcp.length) {
                         throw new Error(`Cannot find parent with ref ${ref}`);
                     }
                     const parentMessage = msgsForHcp[0];
-                    return this.saveMessageInDb(user, "List", dmgsMsgList, hcp, metas, docXApi, dmgsMsgList.date, undefined, parentMessage && parentMessage.id).then(msg => {
+                    return (0, api_1.retry)(() => this.saveMessageInDb(user, "List", dmgsMsgList, hcp, metas, docXApi, dmgsMsgList.date, undefined, parentMessage && parentMessage.id)).then(msg => {
                         dmgsMsgList.valueHash && msgHashes.push(dmgsMsgList.valueHash);
                         acc.push(msg);
                         return acc;
@@ -139,21 +139,19 @@ class MessageXApi {
             });
         });
         _.each(list.closures, closure => {
-            const metas = {
+            const metas = Object.entries({
                 type: "closure",
-                date: (closure.endOfPreviousDmg && moment(closure.endOfPreviousDmg).format("DD/MM/YYYY")) ||
-                    null,
+                date: (closure.endOfPreviousDmg && moment(closure.endOfPreviousDmg).format("DD/MM/YYYY")),
                 closure: "true",
-                endOfPreviousDmg: (closure.endOfPreviousDmg && moment(closure.endOfPreviousDmg).format("DD/MM/YYYY")) ||
-                    null,
-                beginOfNewDmg: (closure.beginOfNewDmg && moment(closure.beginOfNewDmg).format("DD/MM/YYYY")) || null,
+                endOfPreviousDmg: (closure.endOfPreviousDmg && moment(closure.endOfPreviousDmg).format("DD/MM/YYYY")),
+                beginOfNewDmg: (closure.beginOfNewDmg && moment(closure.beginOfNewDmg).format("DD/MM/YYYY")),
                 previousHcp: this.makeHcp(closure.previousHcParty),
                 newHcp: this.makeHcp(closure.newHcParty),
-                ssin: closure.inss || null,
-                firstName: closure.firstName || null,
-                lastName: closure.lastName || null,
-                io: closure.io || null
-            };
+                ssin: closure.inss,
+                firstName: closure.firstName,
+                lastName: closure.lastName,
+                io: closure.io
+            }).reduce((acc, [k, v]) => !!v ? Object.assign(Object.assign({}, acc), { [k]: v }) : acc, {});
             closure.inss && (patsDmgs[closure.inss] || (patsDmgs[closure.inss] = [])).push(metas);
             promMsg = promMsg.then(acc => {
                 return this.saveMessageInDb(user, "Closure", closure, hcp, metas, docXApi, closure.endOfPreviousDmg, closure.inss).then(msg => {
@@ -164,17 +162,17 @@ class MessageXApi {
             });
         });
         _.each(list.extensions, ext => {
-            const metas = {
+            const metas = Object.entries({
                 type: "extension",
-                date: (ext.encounterDate && moment(ext.encounterDate).format("DD/MM/YYYY")) || null,
-                from: (ext.encounterDate && moment(ext.encounterDate).format("DD/MM/YYYY")) || null,
+                date: (ext.encounterDate && moment(ext.encounterDate).format("DD/MM/YYYY")),
+                from: (ext.encounterDate && moment(ext.encounterDate).format("DD/MM/YYYY")),
                 hcp: this.makeHcp(ext.hcParty),
-                claim: ext.claim || null,
-                ssin: ext.inss || null,
-                firstName: ext.firstName || null,
-                lastName: ext.lastName || null,
-                io: ext.io || null
-            };
+                claim: ext.claim,
+                ssin: ext.inss,
+                firstName: ext.firstName,
+                lastName: ext.lastName,
+                io: ext.io
+            }).reduce((acc, [k, v]) => !!v ? Object.assign(Object.assign({}, acc), { [k]: v }) : acc, {});
             ext.inss && (patsDmgs[ext.inss] || (patsDmgs[ext.inss] = [])).push(metas);
             promMsg = promMsg.then(acc => {
                 return this.saveMessageInDb(user, "Extension", ext, hcp, metas, docXApi, ext.encounterDate, ext.inss).then(msg => {
@@ -188,14 +186,14 @@ class MessageXApi {
         return promMsg.then(() => {
             _.chunk(Object.keys(patsDmgs), 100).forEach(ssins => {
                 promPatient = promPatient
-                    .then(() => this.patientApi
+                    .then(() => (0, api_1.retry)(() => this.patientApi
                     .filterPatientsBy(undefined, undefined, 1000, 0, undefined, false, new api_1.FilterChainPatient({
                     filter: new api_1.AbstractFilterPatient({
                         $type: "PatientByHcPartyAndSsinsFilter",
                         healthcarePartyId: parentId || hcp.parentId || hcp.id || user.healthcarePartyId,
                         ssins: ssins
                     })
-                }))
+                })))
                     .then((pats) => Promise.all((pats.rows || []).map(p => {
                     const actions = _.sortBy(patsDmgs[p.ssin], a => moment(a.date, "DD/MM/YYYY").format("YYYYMMDD"));
                     let phcp = (p.patientHealthCareParties || (p.patientHealthCareParties = [])) &&
@@ -309,14 +307,14 @@ class MessageXApi {
                     });
                     return p;
                 }))))
-                    .then(pats => this.patientApi.bulkUpdatePatients(pats || []).catch(() => {
+                    .then(pats => (0, api_1.retry)(() => this.patientApi.bulkUpdatePatients(pats || []).catch(() => {
                     let catchProm = Promise.resolve([]);
                     let newPats = [];
                     (pats || []).forEach((pat) => {
                         catchProm = catchProm.then(() => this.patientApi.modifyPatient(pat).then(p => (newPats = newPats.concat(p))));
                     });
                     return catchProm;
-                }));
+                })));
             });
             return promPatient.then(() => [ackHashes, msgHashes]);
         });
@@ -348,14 +346,14 @@ class MessageXApi {
                 : `${msgName} from IO ${dmgMessage.io}`,
             senderReferences: dmgMessage.commonOutput ? Object.assign(Object.assign(Object.assign({}, (dmgMessage.commonOutput.inputReference ? { inputReference: dmgMessage.commonOutput.inputReference } : {})), (dmgMessage.commonOutput.nipReference ? { nipReference: dmgMessage.commonOutput.nipReference } : {})), (dmgMessage.commonOutput.outputReference ? { outputReference: dmgMessage.commonOutput.outputReference } : {})) : undefined
         })
-            .then(msg => this.api.createMessage(msg))
+            .then(msg => (0, api_1.retry)(() => this.api.createMessage(msg)))
             .then(msg => {
             return docXApi
                 .newInstance(user, msg, {
                 name: `${msg.subject}_content.json`
             })
-                .then(doc => docXApi.createDocument(doc))
-                .then(doc => docXApi.setClearDocumentAttachment(doc, (0, api_1.ua2ab)((0, api_1.utf8_2ua)(JSON.stringify(dmgMessage))), ["public.json"]))
+                .then(doc => (0, api_1.retry)(() => docXApi.createDocument(doc)))
+                .then(doc => (0, api_1.retry)(() => docXApi.setClearDocumentAttachment(doc, (0, api_1.ua2ab)((0, api_1.utf8_2ua)(JSON.stringify(dmgMessage))), ["public.json"])))
                 .then(() => msg);
         });
     }
@@ -751,32 +749,32 @@ class MessageXApi {
                 .then(invoices => {
                 parentMessage.status = (parentMessage.status || 0) | statuses;
                 if (batchErrors.length) {
-                    parentMessage.metas = _.assign(parentMessage.metas || {}, {
+                    parentMessage.metas = Object.entries(_.assign(parentMessage.metas || {}, {
                         errors: _(batchErrors)
                             .map(this.extractErrorMessage)
                             .uniq()
                             .compact()
                             .value()
                             .join("; ")
-                    });
+                    })).reduce((acc, [k, v]) => !!v ? Object.assign(Object.assign({}, acc), { [k]: v }) : acc, {});
                 }
                 if (parsedRecords.et91) {
                     let et91s = parsedRecords.et91;
-                    parentMessage.metas = _.assign(parentMessage.metas || {}, {
+                    parentMessage.metas = Object.entries(_.assign(parentMessage.metas || {}, {
                         paymentReferenceAccount1: _(et91s)
                             .map(et91 => et91.paymentReferenceAccount1)
                             .uniq()
                             .value()
                             .join(", ")
-                    });
+                    })).reduce((acc, [k, v]) => !!v ? Object.assign(Object.assign({}, acc), { [k]: v }) : acc, {});
                 }
                 if (parsedRecords.et92) {
                     let et92 = parsedRecords.et92;
-                    parentMessage.metas = _.assign(parentMessage.metas || {}, {
+                    parentMessage.metas = Object.entries(_.assign(parentMessage.metas || {}, {
                         totalAskedAmount: Number(et92.totalAskedAmount) / 100,
                         totalAcceptedAmount: Number(et92.totalAcceptedAmount) / 100,
                         totalRejectedAmount: Number(et92.totalRejectedAmount) / 100
-                    });
+                    })).reduce((acc, [k, v]) => !!v ? Object.assign(Object.assign({}, acc), { [k]: v }) : acc, {});
                 }
                 return this.api
                     .modifyMessage(parentMessage)
@@ -859,7 +857,7 @@ class MessageXApi {
                             .then(message => this.api.createMessage(Object.assign(message, {
                             sent: sentDate,
                             status: (message.status || 0) | (res.success ? 1 << 7 : 0) /*STATUS_SENT*/,
-                            metas: {
+                            metas: Object.entries({
                                 ioFederationCode: batch.ioFederationCode,
                                 numericalRef: batch.numericalRef,
                                 invoiceMonth: _.padStart("" + batch.invoicingMonth, 2, "0"),
@@ -867,7 +865,7 @@ class MessageXApi {
                                 totalAmount: totalAmount,
                                 fhc_server: fhcServer,
                                 errors: res.error
-                            }
+                            }).reduce((acc, [k, v]) => !!v ? Object.assign(Object.assign({}, acc), { [k]: v }) : acc, {})
                         })))
                             .then((msg) => {
                             if (res.success) {