Implementing bid related functions in cement and sidenor CLIs

apps/cement-cli/index.js

 // COPYRIGHT: FUNDACIÓN TECNALIA RESEARCH & INNOVATION, 2021.
 
-const faker = require("faker")
 const inquirer = require("inquirer")
 
 const {
   createCLIApp,
   loginAndCallAfterwards,
-  promptAssetSelection,
-  STATUSES
+  promptAssetSelection
 } = require("@hypercog/utils")
 
-const bidAsset = async (apiClient, { assetId: paramAssetId, quantity }) => {
-  const assetId =
-    paramAssetId ||
-    (await promptAssetSelection(
-      await apiClient.richQuery({
-        fields: {
-          status: STATUSES.STOCK
-        }
-      })
-    ))
+const bidAsset = async (
+  apiClient,
+  { assetId: paramAssetId, quantity, price }
+) => {
+  const biddableAssets = await apiClient.getBiddableAssets()
 
-  const assetToBid = await apiClient.getAsset(assetId)
-  if (assetToBid.fields.status !== STATUSES.STOCK) {
-    console.error("You can only bid for a slag stock")
-    return
-  }
+  const assetId = paramAssetId || (await promptAssetSelection(biddableAssets))
 
   let chosenQuantity = quantity
   if (!quantity) {
@@ -33,22 +22,25 @@ const bidAsset = async (apiClient, { assetId: paramAssetId, quantity }) => {
       {
         type: "number",
         name: "inputQuantity",
-        message: "Escoge una cantidad"
+        message: "Choose an ammount of slag"
       }
     ])
     chosenQuantity = inputQuantity
   }
 
-  await apiClient.modifyAsset({
-    id: assetId,
-    ...assetToBid,
-    fields: {
-      ...assetToBid.fields,
-      // TODO add bid function to automatically add me!!!
-      bids: [...assetToBid.bids, { who: "me", quantity: chosenQuantity }]
+  let chosenPrice = price
+  if (!quantity) {
+    const { inputPrice } = await inquirer.prompt([
+      {
+        type: "number",
+        name: "inputPrice",
+        message: "Provide the offered price"
+      }
+    ])
+    chosenPrice = inputPrice
   }
-  })
 
+  await apiClient.bidForAsset(assetId, chosenQuantity, chosenPrice)
   console.log("Bid for slag stock", assetId)
 }
 
@@ -56,12 +48,10 @@ const program = createCLIApp()
 
 program
   .command("bid")
-  .description("Pujar por partida de escoria")
-  .option(
-    "--asset-id [value]",
-    "Identificador del montón de escoria por el que pujar"
-  )
-  .option("--quantity [value]", "Cantidad de escoria a obtener")
+  .description("Bid for slag")
+  .option("--asset-id [value]", "Identifier of the slag stock to bid for")
+  .option("--quantity [value]", "Amount of slag you are interested in")
+  .option("--price [value]", "Price offered for the slag")
   .action(loginAndCallAfterwards(bidAsset))
 
 program.parse(process.argv)

apps/sidenor-cli/index.js

 // COPYRIGHT: FUNDACIÓN TECNALIA RESEARCH & INNOVATION, 2021.
 
 const faker = require("faker")
+const inquirer = require("inquirer")
 
 const {
   createCLIApp,
@@ -114,10 +115,10 @@ const sendToStock = async (apiClient, { assetId: paramAssetId }) => {
       {
         id: "newStock",
         type: TYPES.RESIDUO_HIERRO_ACERO,
-        fields: { name: "Nuevo montón", status: STATUSES.STOCK }
+        fields: { name: "New stock", status: STATUSES.STOCK }
       }
     ],
-    "Seleccione el montón al que enviar el cono"
+    "Select the stock where the cone will be merged"
   )
 
   if (!selectedStockId === "newStock") {
@@ -150,36 +151,95 @@ const sendToStock = async (apiClient, { assetId: paramAssetId }) => {
   console.log("Moved to stock", newStockAsset.id)
 }
 
+const bidResponse =
+  action =>
+  async (apiClient, { assetId: paramAssetId, bidder: paramBidder }) => {
+    const assetId =
+      paramAssetId ||
+      (await promptAssetSelection(
+        await apiClient.richQuery({
+          fields: {
+            status: STATUSES.STOCK
+          }
+        })
+      ))
+
+    const assetSelected = await apiClient.getAsset(assetId)
+    if (!assetSelected.fields.bids || assetSelected.fields.bids.length === 0) {
+      console.error(`There are no active bids to be ${action}ed`)
+      return
+    }
+
+    let bidder = paramBidder
+    if (!bidder) {
+      const { inputBidder } = await inquirer.prompt([
+        {
+          type: "list",
+          name: "inputBidder",
+          message: `Select the bidder whose bid will be ${action}ed`,
+          choices: assetSelected.fields.bids.map(b => ({
+            name: `${b.bidder} (quantity: ${b.quantity}, price: ${b.price})`,
+            value: b.bidder
+          }))
+        }
+      ])
+      bidder = inputBidder
+    }
+
+    await apiClient[`${action}Bid`](assetId, bidder)
+    console.log(`Bid from ${bidder} ${action}ed for asset ${assetId}`)
+  }
+
 const program = createCLIApp()
 
 program
   .command("register")
-  .description("Registro inicial de residuo (escoria)")
-  .option("--asset-name <value>", "Nombre del residuo")
+  .description("Initial registration of the slag")
+  .option("--asset-name <value>", "Slag name")
   .action(loginAndCallAfterwards(createAsset))
 
 program
   .command("composition")
-  .description("Medición de composición de la escoria")
+  .description("Provide a slag composition measure")
   .option(
     "--asset-id [value]",
-    "Identificador de la escoria a la que se ha medido la composición"
+    "Identifier of the slag whose composition has been measured"
   )
   .action(loginAndCallAfterwards(editComposition))
 
 program
   .command("to-cone")
-  .description("Enviar escoria al cono")
-  .option("--asset-id [value]", "Identificador de la escoria a llevar a cono")
+  .description("Send slag to cone")
+  .option("--asset-id [value]", "Identifier of the slag to be sent to the cone")
   .action(loginAndCallAfterwards(sendToCone))
 
 program
   .command("to-stock")
-  .description("Enviar escoria del cono al montón")
+  .description("Send slag from cone to stock")
   .option(
     "--asset-id [value]",
-    "Identificador de la escoria a llevar al montón"
+    "Identifier of the slag batch to be merged in the stock"
   )
   .action(loginAndCallAfterwards(sendToStock))
 
+program
+  .command("bid-accept")
+  .description("Accept bid for slag stock")
+  .option("--asset-id [value]", "Identifier of the slag stock")
+  .option(
+    "--bidder [value]",
+    "Identifier of the bidder for the provided slag stock"
+  )
+  .action(loginAndCallAfterwards(bidResponse("accept")))
+
+program
+  .command("bid-reject")
+  .description("Reject bid for slag stock")
+  .option("--asset-id [value]", "Identifier of the slag stock")
+  .option(
+    "--bidder [value]",
+    "Identifier of the bidder for the provided slag stock"
+  )
+  .action(loginAndCallAfterwards(bidResponse("reject")))
+
 program.parse(process.argv)

apps/utils/client.js

+// COPYRIGHT: FUNDACIÓN TECNALIA RESEARCH & INNOVATION, 2021.
+
+const TraceblockApiClient = require("@traceblock/api-client")
+
+class HypercogApiClient extends TraceblockApiClient {
+  constructor(endpoint, network, channel, chaincode) {
+    super(endpoint, network, channel, chaincode)
+  }
+
+  getBiddableAssets() {
+    return this._queryExtractPayload("hypercog-list-bid-assets")
+  }
+
+  bidForAsset(id, quantity, price) {
+    return this._invoke("hypercog-bid-asset", {
+      body: {
+        id,
+        bid: {
+          quantity,
+          price
+        }
+      }
+    })
+  }
+
+  acceptBid(id, bidder) {
+    return this._invoke("hypercog-accept-asset", {
+      body: { id, bidder }
+    })
+  }
+
+  rejectBid(id, bidder) {
+    return this._invoke("hypercog-reject-asset", {
+      body: { id, bidder }
+    })
+  }
+}
+
+module.exports = HypercogApiClient

apps/utils/index.js

+// COPYRIGHT: FUNDACIÓN TECNALIA RESEARCH & INNOVATION, 2021.
+
+const utils = require("./utils")
+const HypercogApiClient = require("./utils")
+
+module.exports = {
+  ...utils,
+  HypercogApiClient
+}

apps/utils/package.json

 {
   "name": "@hypercog/utils",
   "version": "0.0.1",
-  "main": "utils.js",
+  "main": "index.js",
   "dependencies": {
     "@traceblock/api-client": "^0.2.5",
     "commander": "^8.2.0",

apps/utils/utils.js

@@ -3,12 +3,12 @@
 require("dotenv").config()
 
 const { Command, Option } = require("commander")
-const ApiClient = require("@traceblock/api-client")
 
 const inquirer = require("inquirer")
 const faker = require("faker")
 faker.locale = "es"
 
+const HypercogApiClient = require("./client")
 const { version } = require("./package.json")
 
 /*
@@ -87,7 +87,7 @@ const createCLIApp = () => {
 const loginAndCallAfterwards = fn => async (arg1, cmd) => {
   const { api, network, channel, chaincode, user, password } = cmd.parent.opts()
 
-  const apiClient = new ApiClient(api, network, channel, chaincode)
+  const apiClient = new HypercogApiClient(api, network, channel, chaincode)
 
   const [username, organization] = user.split("@")
 
@@ -117,12 +117,9 @@ const createRandomLocation = () => ({
   desc: faker.address.streetAddress()
 })
 
-const promptAssetSelection = async (
-  assets = [],
-  message = "Seleccione el activo"
-) => {
+const promptAssetSelection = async (assets = [], message = "Select asset") => {
   const choices = assets.map(a => ({
-    name: `${a.id} (${a.fields.name}, tipo: ${a.type}, estado: ${a.fields.status})`,
+    name: `${a.id} (${a.fields.name}, type: ${a.type}, status: ${a.fields.status})`,
     value: a
   }))