From 54c2b999322c5880796302bfdb147c337a149270 Mon Sep 17 00:00:00 2001
From: KyleRessLiere <55935877+KyleRessLiere@users.noreply.github.com>
Date: Sat, 22 Feb 2020 10:02:09 -0500
Subject: [PATCH] update contract

---
 .../digibank/application/getPaper.js          | 100 ++++++++++++++++++
 .../magnetocorp/contract/lib/papercontract.js |  17 ++-
 .../magnetocorp/contract/package.json         |   2 +-
 3 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 commercial-paper/organization/digibank/application/getPaper.js

diff --git a/commercial-paper/organization/digibank/application/getPaper.js b/commercial-paper/organization/digibank/application/getPaper.js
new file mode 100644
index 00000000..f400dcd2
--- /dev/null
+++ b/commercial-paper/organization/digibank/application/getPaper.js
@@ -0,0 +1,100 @@
+/*
+SPDX-License-Identifier: Apache-2.0
+*/
+/*
+ * This application has 6 basic steps:
+ * 1. Select an identity from a wallet
+ * 2. Connect to network gateway
+ * 3. Access PaperNet network
+ * 4. Construct request to query a commercial paper
+ * 5. Submit transaction
+ * 6. Process response
+ */
+'use strict';
+// Bring key classes into scope, most importantly Fabric SDK network class
+const fs = require('fs');
+const yaml = require('js-yaml');
+const { FileSystemWallet, Gateway } = require('fabric-network');
+const CommercialPaper = require('../contract/lib/paper.js');
+// A wallet stores a collection of identities for use
+const wallet = new FileSystemWallet('../identity/user/balaji/wallet');
+// Main program function
+async function main() {
+    // A gateway defines the peers used to access Fabric networks
+    const gateway = new Gateway();
+
+    // Main try/catch block
+    try {
+        // Specify userName for network access
+        // const userName = 'isabella.issuer@magnetocorp.com';
+        const userName = 'Admin@org1.example.com';
+        // Load connection profile; will be used to locate a gateway 
+        let connectionProfile = yaml.safeLoad(fs.readFileSync('../gateway/networkConnection.yaml', 'utf8'));
+        // Set connection options; identity and wallet
+        let connectionOptions = {
+            identity: userName,
+            wallet: wallet,
+            discovery: { enabled:false, asLocalhost: true }
+        };
+
+        // Connect to gateway using application specified parameters
+        console.log('Connect to Fabric gateway.');
+        await gateway.connect(connectionProfile, connectionOptions);
+
+        // Access PaperNet network
+        console.log('Use network channel: mychannel.');
+        const network = await gateway.getNetwork('mychannel');
+
+        // Get addressability to commercial paper contract
+        console.log('Use org.papernet.commercialpaper smart contract.');
+        const contract = await network.getContract('papercontract', 'org.papernet.commercialpaper');
+
+        // get commercial paper
+        console.log('Submit commercial paper getPaper transaction.');
+        const getPaperResponse = await contract.evaluateTransaction('getPaper', 'MagnetoCorp', '00001');
+
+        // process response
+        console.log('Process getPaper transaction response.');
+        let paperJSON = JSON.parse(getPaperResponse);
+        let paper = CommercialPaper.createInstance(paperJSON.issuer, paperJSON.paperNumber, paperJSON.issueDateTime, paperJSON.maturityDateTime, paperJSON.faceValue);
+        paper.setOwner(paperJSON.owner);
+        paper.currentState = paperJSON.currentState;
+
+        // let paper = CommercialPaper.fromBuffer(getPaperResponse);
+        let paperState = 'Unknown';
+        if(paper.isIssued()) {
+            paperState = 'ISSUED';
+        } else if(paper.isTrading()){
+            paperState = 'TRADING';
+        } else if(paper.isRedeemed()){
+            paperState = 'REDEEMED';
+        }
+
+        console.log(` +--------- Paper Retrieved ---------+ `);
+        console.log(` | Paper number: "${paper.paperNumber}"`);
+        console.log(` | Paper is owned by: "${paper.owner}"`);
+        console.log(` | Paper is currently: "${paperState}"`);
+        console.log(` | Paper face value: "${paper.faceValue}"`);
+        console.log(` | Paper is issued by: "${paper.issuer}"`);
+        console.log(` | Paper issue on: "${paper.issueDateTime}"`);
+        console.log(` | Paper matures on: "${paper.maturityDateTime}"`);
+        console.log(` +-----------------------------------+ `);
+        console.log('Transaction complete.');
+
+        //console.log('Transaction complete.' + JSON.stringify(paper));
+    } catch (error) {
+        console.log(`Error processing transaction. ${error}`);
+        console.log(error.stack);
+    } finally {
+        // Disconnect from the gateway
+        console.log('Disconnect from Fabric gateway.')
+        gateway.disconnect();
+    }
+}
+main().then(() => {
+    console.log('getPaper program complete.');
+}).catch((e) => {
+    console.log('getPaper program exception.');
+    console.log(e);
+    console.log(e.stack);
+    process.exit(-1);
\ No newline at end of file
diff --git a/commercial-paper/organization/magnetocorp/contract/lib/papercontract.js b/commercial-paper/organization/magnetocorp/contract/lib/papercontract.js
index 5286ccf0..812e6933 100644
--- a/commercial-paper/organization/magnetocorp/contract/lib/papercontract.js
+++ b/commercial-paper/organization/magnetocorp/contract/lib/papercontract.js
@@ -51,7 +51,22 @@ class CommercialPaperContract extends Contract {
         // It could be where data migration is performed, if necessary
         console.log('Instantiate the contract');
     }
-
+/**
+* Get commercial paper
+* @param {Context} ctx the transaction context
+* @param {String} issuer commercial paper issuer
+* @param {Integer} paperNumber paper number for this issuer
+*/
+async getPaper(ctx, issuer, paperNumber) {
+    try {
+      console.log('getPaper for: ' + issuer + ' ' + paperNumber);
+      let paperKey = CommercialPaper.makeKey([issuer, paperNumber]);
+      let paper = await ctx.paperList.getPaper(paperKey);
+      return paper;
+    } catch(e) {
+      throw new Error('Paper: ' + paperNumber + 'absentfor' + issuer);
+    }
+  }
     /**
      * Issue commercial paper
      *
diff --git a/commercial-paper/organization/magnetocorp/contract/package.json b/commercial-paper/organization/magnetocorp/contract/package.json
index 2c4a6449..1005bf46 100644
--- a/commercial-paper/organization/magnetocorp/contract/package.json
+++ b/commercial-paper/organization/magnetocorp/contract/package.json
@@ -1,6 +1,6 @@
 {
     "name": "papernet-js",
-    "version": "0.0.1",
+    "version": "0.0.4",
     "description": "Papernet Contract",
     "main": "index.js",
     "engines": {