Completed: consumePrescription, updatePrescription and deletePrescrip…

…tion. Added: patient in showPrescription, bug fixed newPrescription
the-chain · Aug 13, 2019 · ccd05bd · ccd05bd
1 parent 23bb0f2
commit ccd05bd
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 9 deletions.
diff --git a/api/controllers/services/secure-rec/prescription/delete.js b/api/controllers/services/secure-rec/prescription/delete.js
@@ -1,3 +1,6 @@
+const fabric = require('../../../../../fabric-api/chaincodeTransactions');
+const ursa = require('../../../../../crypto/keys');
+
 module.exports = {
 
     friendlyName: 'Secure Rec delete prescription',
@@ -14,6 +17,14 @@ module.exports = {
         invalid: {
             responseType: 'bad-combo',
             description: 'Los parámetros proporcionados son inválidos.'
+        },
+        fabric: {
+            responseType: 'fabric-error',
+            description: 'Error Hyperledger Fabric' 
+        },
+        internalError: {
+            responseType: 'internal-error',
+            description: 'Error changing password'
         }
     },
 
@@ -22,11 +33,18 @@ module.exports = {
         if ( inputs.hash === undefined )
             return exits.invalid();
 
-        console.log(inputs.hash);
+        let owner = this.req.session.auth, pubKey = await ursa.getPublicKey(owner.privateKey), result, Args;
+        try{
+            Args = [pubKey, inputs.hash];
+            result = await fabric.invokeTransaction('mychannel','Org1MSP','secureRec', 'deletePrescription', Args);
+        }catch(err){
+            return exits.fabric();
+        }
 
         return exits.success({
             success: true,
             message: 'Deleted prescription',
+            hash: result.hash
         });
 
     }

diff --git a/api/controllers/services/secure-rec/prescription/edit-patient.js b/api/controllers/services/secure-rec/prescription/edit-patient.js
@@ -1,3 +1,6 @@
+const fabric = require('../../../../../fabric-api/chaincodeTransactions');
+const ursa = require('../../../../../crypto/keys');
+
 module.exports = {
 
     friendlyName: 'Secure Rec edit prescription patient',
@@ -27,22 +30,46 @@ module.exports = {
         invalid: {
             responseType: 'bad-combo',
             description: 'Los parámetros proporcionados son inválidos.'
+        },
+        fabric: {
+            responseType: 'fabric-error',
+            description: 'Error Hyperledger Fabric' 
+        },
+        internalError: {
+            responseType: 'internal-error',
+            description: 'Error changing password'
         }
     },
 
     fn: async function (inputs, exits) {
 
         if (inputs.hash === undefined || inputs.pharmacy === undefined || inputs.pharmacy === '' || inputs.selfPayment === undefined)
             return exits.invalid();
-
-        console.log(inputs.hash);
-        console.log(inputs.pharmacy);
-        console.log(inputs.selfPayment);
-        console.log(inputs.insurance);
+
+        let owner = this.req.session.auth, pubKey = await ursa.getPublicKey(owner.privateKey);
+        let provider;
+        let result, Args;
+        try{
+            provider = await User.findOne({ emailAddress: inputs.pharmacy});
+            if ( inputs.selfPayment ) {
+                Args = [pubKey, provider.publicKey, "", inputs.hash];
+            }else{
+                let insurance = await User.findOne({ emailAddress: inputs.insurance});
+                Args = [pubKey, provider.publicKey, insurance.publicKey, inputs.hash];
+            }
+        }catch(err){
+            return exits.internalError();
+        }
+        try {
+            result = await fabric.invokeTransaction('mychannel','Org1MSP','secureRec', 'updatePrescription', Args);
+        }catch(err){
+            return exits.fabric();
+        }
 
         return exits.success({
             success: true,
             message: 'Edit prescription',
+            hash: result.hash
         });
 
     }

diff --git a/api/controllers/services/secure-rec/prescription/edit-provider.js b/api/controllers/services/secure-rec/prescription/edit-provider.js
@@ -1,3 +1,6 @@
+const fabric = require('../../../../../fabric-api/chaincodeTransactions');
+const ursa = require('../../../../../crypto/keys');
+
 module.exports = {
 
     friendlyName: 'Secure Rec edit prescription',
@@ -14,6 +17,14 @@ module.exports = {
         invalid: {
             responseType: 'bad-combo',
             description: 'Los parámetros proporcionados son inválidos.'
+        },
+        fabric: {
+            responseType: 'fabric-error',
+            description: 'Error Hyperledger Fabric' 
+        },
+        internalError: {
+            responseType: 'internal-error',
+            description: 'Error changing password'
         }
     },
 
@@ -22,11 +33,17 @@ module.exports = {
         if ( inputs.hash === undefined )
             return exits.invalid();
 
-        console.log(inputs.hash);
-
+        let owner = this.req.session.auth, pubKey = await ursa.getPublicKey(owner.privateKey), result, Args;
+        try{
+            Args = [pubKey, inputs.hash];
+            result = await fabric.invokeTransaction('mychannel','Org1MSP','secureRec', 'consumePrescription', Args);
+        }catch(err){
+            return exits.fabric();
+        }    
         return exits.success({
             success: true,
             message: 'Edit prescription',
+            hash: result.hash
         });
 
     }

diff --git a/api/controllers/services/secure-rec/prescription/show.js b/api/controllers/services/secure-rec/prescription/show.js
@@ -77,6 +77,7 @@ module.exports = {
               status: result.prescriptions[i].status,
               description: data.description,
               doctor: doctor.emailAddress,
+              patient: patient.emailAddress,
               insurance: insurance,
               provider: provider,
               ipfsHash: data.hashFile,
@@ -90,7 +91,6 @@ module.exports = {
             } else if ( prescription.status === 'DELETED' ){
               prescriptions.push(prescription);
             }
-            console.log(prescription);
           }
         }
         if (user.type == 'patient'){