Revisión de logs en MS perinatal

Author: MarianoCampetella

sip-plus-perinatal/logger/msSipPlusPerinatal.ts

@@ -7,8 +7,9 @@ logs = mongoose.createConnection(logDatabase.log.host, logDatabase.log.options);
 export const msSipPlusPerinatalLog = new Logger({
     connection: logs,
     type: 'msSipPlusPerinatal',
-    module: 'msSipPlusPerinatal',
+    module: 'perinatal',
     application: 'andes',
     bucketBy: 'h',
-    bucketSize: 100
+    bucketSize: 100,
+    expiredAt: '3 M'
 });

sip-plus-perinatal/package-lock.json

@@ -15,37 +15,48 @@ mongoose.connect(MONGO_HOST, { useUnifiedTopology: true, useNewUrlParser: true }
 export async function getMatching(tipoMatch = null) {
     const tipo: string = tipoMatch || 'paciente';
     const source = `andes:${tipo}`;
+
     try {
         const dataMapped = await QueryMapping.find({ source, target: "sip+" });
+        const results = dataMapped
+            .map(elemMap => createDataMap(elemMap, tipo))
+            .filter(Boolean);
+
+        return results;
+    } catch (error) {
+        log.error('getMatching:error', source, error, fakeRequest);
+        return [];
+    }
+}
+
+function createDataMap(elemMap: any, tipo: string): IPerinatal | null {
 
-        return dataMapped.map(elemMap => {
-            try {
-                let sipPlus = {
-                    code: elemMap['targetValue']['code'],
-                    type: elemMap['targetValue']['type']
-                }
-                const key = (tipo.includes('snomed')) ? elemMap['sourceValue']['key'] : elemMap['sourceValue'];
-
-                let dataMap: IPerinatal = { key, sipPlus, tipoMatch };
-                // si el tipo de mapeo contiene conceptos Snomed, entonces se obtienen sus datos
-                if (tipo.includes('snomed')) {
-                    dataMap.concepto = elemMap['sourceValue']['concepto'];
-                    if (elemMap['sourceValue']['valor']) {
-                        dataMap.sipPlus.valor = elemMap['targetValue']['valor'];
-                    }
-                    if (elemMap['targetValue']['extra']) {
-                        dataMap.sipPlus.extra = elemMap['targetValue']['extra'];
-                    }
-                }
-                return dataMap;
-            } catch (error) {
-                log.error('getMatching:error', { dataMapped, source}, error, fakeRequest);
-                return null;
+    try {
+        const sipPlus = {
+            code: elemMap['targetValue']['code'],
+            type: elemMap['targetValue']['type']
+        };
+
+        const key = tipo.includes('snomed')
+            ? elemMap['sourceValue']['key']
+            : elemMap['sourceValue'];
+
+        const dataMap: IPerinatal = { key, sipPlus, tipoMatch: tipo };
+
+        if (tipo.includes('snomed')) {
+            dataMap.concepto = elemMap['sourceValue']['concepto'];
+
+            if (elemMap['sourceValue']['valor']) {
+                dataMap.sipPlus.valor = elemMap['targetValue']['valor'];
             }
-        });
 
+            if (elemMap['targetValue']['extra']) {
+                dataMap.sipPlus.extra = elemMap['targetValue']['extra'];
+            }
+        }
+        return dataMap;
     } catch (error) {
-        log.error('getMatching:error',source, error, fakeRequest);
+        log.error('createDataMap:error', { elemMap, tipo }, error, fakeRequest);
+        return null;
     }
-    return [];
 }

sip-plus-perinatal/service/matchPerinatal.ts

@@ -12,17 +12,14 @@ export async function getOrganizacionAndes(idOrganizacion) {
             Authorization: `JWT ${ANDES_KEY}`
         }
     };
+
     try {
-        let response = await fetch(url, options);
-        try {
-            const responseJson = await response.json();
-            return responseJson[0] || null;
-        } catch (error) {
-            log.error('getOrganizacionAndes:error', { idOrganizacion, options, response }, error, fakeRequest);
-        }
-    }
-    catch (error) {
+        const response = await fetch(url, options);
+        const responseJson = await response.json();
+        return responseJson[0] || null;
+    } catch (error) {
         log.error('getOrganizacionAndes:error', { idOrganizacion, options }, error, fakeRequest);
+        return null;
     }
 
 }

sip-plus-perinatal/service/organizacion.ts

@@ -13,20 +13,24 @@ export async function getPaciente(idPaciente) {
         }
     };
     try {
-        let response = await fetch(url, options);
-        try {
-            const responseJson = await response.json();
-            if (responseJson._id) {
-                return responseJson;
-            } else {
-                return null;
-            }
-        }catch (error) {
-            log.error('getPaciente:error', { idPaciente, options, response }, error, fakeRequest);
+        const response = await fetch(url, options);
+
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status} - ${response.statusText}`);
         }
-    }
-    catch (error) {
-        log.error('getPaciente:error', { idPaciente, options }, error, fakeRequest);
+
+        const responseJson = await response.json();
+
+        return responseJson?._id ? responseJson : null;
+
+    } catch (error) {
+        log.error(
+            'getPaciente:error',
+            { idPaciente, options, url },
+            error,
+            fakeRequest
+        );
+        return null;
     }
 
 }

sip-plus-perinatal/service/paciente.ts

@@ -31,37 +31,37 @@ const options = (method = 'GET', body = null) => {
 
 export async function getPacienteSP(paciente: any) {
     const documento = paciente.documento || '';
-    if (documento) {
-        try {
-            let response = await fetch(`${url}${documento}`, options('GET'));
-            try {
-                if (response.status >= 200 && response.status < 300) {
-                    let responseJson = await response.json();
-
-                    const keyResponse = Object.keys(responseJson).length || null;
-                    if (keyResponse) {
-                        return { paciente: responseJson };
-                    }
-                    else {
-                        return { paciente: null };
-
-                    }
-                }
-                if (response.status === 404) {
-                    // paciente no encontrado
-                    return { paciente: null };
+    if (!documento) {
+        return { paciente: null };
+    }
 
-                }
-            } catch (error) {
-                log.error('getPacienteSP:error', { paciente, response }, error, fakeRequest);
-                return null;
+    try {
+        const response = await fetch(`${url}${documento}`, options('GET'));
+
+        if (!response.ok) {
+            if (response.status === 404) {
+                // Paciente no encontrado
+                return { paciente: null };
             }
 
-        } catch (error) {
-            log.error('getPacienteSP:error', { paciente }, error, fakeRequest);
+            throw new Error(`HTTP ${response.status}`);
         }
+
+        const responseJson = await response.json();
+
+        return responseJson && Object.keys(responseJson).length
+            ? { paciente: responseJson }
+            : { paciente: null };
+
+    } catch (error) {
+        log.error(
+            'getPacienteSP:error',
+            { documento, url },
+            error,
+            fakeRequest
+        );
+        return { paciente: null };
     }
-    return null;
 }
 
 export async function postPacienteSP(documento: string = '', pacienteSP) {
@@ -70,19 +70,18 @@ export async function postPacienteSP(documento: string = '', pacienteSP) {
             const body = JSON.stringify(pacienteSP);
             let optionsPost: any = options('POST', body);
             let response: any = await fetch(`${url}${documento}`, optionsPost);
-            try {
-                if (response.status >= 200 && response.status < 300) {
-                    return { paciente: optionsPost.body };
-                }
+
+            if (!response.ok) {
                 if (response.status === 404) {
-                    // paciente no encontrado
+                    // Paciente no encontrado
                     return { paciente: null };
                 }
-            } catch (error) {
-                log.error('postPacienteSP:error', { pacienteSP, response }, error, fakeRequest);
-                return null;
+
+                throw new Error(`HTTP ${response.status}`);
             }
 
+            return { paciente: optionsPost.body };
+
         } catch (error) {
             log.error('postPacienteSP:error', { pacienteSP }, error, fakeRequest);
         }