@phenyxhealth/importer 1.1.14 → 1.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenyxhealth/importer",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "type": "module",
   "description": "Imports a Phenyx-compatible JSON file with patients into a PhenyxHealth instance.",
   "publishConfig": {

package/src/scripts/clearPatients.js

@@ -1,17 +1,18 @@
-import ApiInstance from '../services/phenyxSdkInstance.js';
-import { login } from '../controllers/login.js';
+import { PhenyxSDK } from '@phenyxhealth/sdk';
 
 const clearPatients = async (config) => {
-    await login(config);
-    
-    const allPatients = await ApiInstance.getPatients();
+    const { apiUrl: apiHost, apiUser: user, apiPwd: password } = config;
+    const api = new PhenyxSDK();
+    await api.login({ apiHost, user, password });
+
+    const allPatients = await api.getPatients();
     const allPatientsIds = allPatients.map(p => p.id);
 
     for (const patientId of allPatientsIds) {
         console.log(`Deleting patient ${patientId}`);
-        await ApiInstance.deletePatient(patientId);
+        await api.deletePatient(patientId);
     }
-    
+
     console.log('All patients deleted');
 };
 

package/src/scripts/importer.js

@@ -1,11 +1,11 @@
 import path from 'path';
 import { loadJson } from '@dmbejar/json-files';
-import { checkGlobals, beSureDoctorExists, beSureLinacsExists } from '@phenyxhealth/sdk';
-import ApiInstance from '../services/phenyxSdkInstance.js';
-import { login } from '../controllers/login.js';
+import { PhenyxSDK, checkGlobals, beSureDoctorExists, beSureLinacsExists } from '@phenyxhealth/sdk';
 import { getListFromField } from '../utils/text.js';
 
 const importer = async (config) => {
+    const ApiInstance = new PhenyxSDK();
+
     // Config
     ApiInstance.showLogs(config.showLogs);
 
@@ -28,7 +28,8 @@ const importer = async (config) => {
     }
 
     console.log('\nLogin...');
-    await login(config);
+    const { apiUrl: apiHost, apiUser: user, apiPwd: password } = config;
+    await ApiInstance.login({ apiHost, user, password });
 
     // check globals
     console.log('\nVerifying globals...');
@@ -168,8 +169,6 @@ const importer = async (config) => {
                 sendingDepartment: ApiInstance.getSendingDepartmentIdByName(registration.sendingDepartment),
             },
             consultation: {
-                // Hay que eliminar cei, la correcta es cie
-                cei: ApiInstance.getCie10ByCode(consultation.cie10).id, // <-- Borrar esta línea
                 cie: ApiInstance.getCie10ByCode(consultation.cie10).id,
                 tnm: consultation.tnm,
                 estadio: consultation.stage,
@@ -294,7 +293,7 @@ const importer = async (config) => {
                 confirmedLinac: linacs.find(linac => linac.name === dosimetry.confirmedLinac)?.id || '',
                 treatmentTechnique: ApiInstance.getGlobalInfoElementId(ApiInstance.globalTypes.treatmentTechnique, treatmentDefinition.treatmentTechnique),
                 tentativeTreatmentStart: treatmentDelivery.tentativeTreatmentStartDate,
-                confirmedTreatmentStart: treatmentDelivery.confirmedTreatmentStartingDate,
+                confirmedTreatmentStart: treatmentDelivery.confirmedTreatmentStartDate,
                 numberOfCompleteSessions: treatmentDelivery.completedSessions || 0,
                 numberOfPendingSessions: treatmentDelivery.totalSessions
                     ? treatmentDelivery.totalSessions - (treatmentDelivery.completedSessions || 0)

package/src/controllers/login.js

@@ -1,15 +0,0 @@
-import ApiInstance from '../services/phenyxSdkInstance.js';
-
-const login = (config) => {
-    const {
-        apiUrl: apiHost,
-        apiUser: user,
-        apiPwd: password,
-    } = config;
-
-    return ApiInstance.login({ apiHost, user, password });
-};
-
-export {
-    login,
-};

package/src/services/phenyxSdkInstance.js

@@ -1,5 +0,0 @@
-import { PhenyxSDK } from '@phenyxhealth/sdk';
-
-const phenyxSdkInstance = new PhenyxSDK();
-
-export default phenyxSdkInstance;