From e7e6f31c96c00f69fec797d45cf70055872f3b60 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 23 Feb 2022 15:23:37 -0800
Subject: [PATCH] Got webhooks Order creation working

---
 bin/server.js           |  4 ++--
 config/env/common.js    |  1 +
 src/adapters/wallet.js  |  3 +--
 src/adapters/webhook.js |  6 ++----
 src/use-cases/offer.js  | 10 ++++++++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bin/server.js b/bin/server.js
index 79d766c..c3a64db 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -94,13 +94,13 @@ class Server {
       try {
         try {
           // Delete an old webhook if it exists.
-          await webhookLib.deleteWebhook('http://localhost:5700/order')
+          await webhookLib.deleteWebhook(`http://localhost:${config.port}/order`)
         } catch (err) {
           /* exit quietly */
           // console.log('err deleting webhook: ', err)
         }
 
-        await webhookLib.createWebhook('http://localhost:5700/order')
+        await webhookLib.createWebhook(`http://localhost:${config.port}/order`)
         console.log('Webhook created')
       } catch (error) {
         console.log('Webhook cant be created')
diff --git a/config/env/common.js b/config/env/common.js
index 8021ca9..a105ac1 100644
--- a/config/env/common.js
+++ b/config/env/common.js
@@ -82,6 +82,7 @@ module.exports = {
   webhookService: process.env.WEBHOOKSERVICE
     ? process.env.WEBHOOKSERVICE
     : 'http://localhost:5010/webhook', // P2WDB.
+  p2wdbAppId: process.env.APP_ID ? process.env.APP_ID : 'bch-dex-test556',
 
   // IPFS Ports
   ipfsTcpPort: process.env.IPFS_TCP_PORT ? process.env.IPFS_TCP_PORT : 4001,
diff --git a/src/adapters/wallet.js b/src/adapters/wallet.js
index 594ae00..b431caf 100644
--- a/src/adapters/wallet.js
+++ b/src/adapters/wallet.js
@@ -216,8 +216,7 @@ class WalletAdapter {
           `Token UTXO of with ID of ${P2WDB_TOKEN_ID} and quantity greater than ${PROOF_OF_BURN_QTY} could not be found in wallet.`
         )
       }
-
-      console.log(`tokenUtxo: ${JSON.stringify(tokenUtxo, null, 2)}`)
+      // console.log(`tokenUtxo: ${JSON.stringify(tokenUtxo, null, 2)}`)
 
       const result = await this.bchWallet.burnTokens(
         PROOF_OF_BURN_QTY,
diff --git a/src/adapters/webhook.js b/src/adapters/webhook.js
index 489b4e8..2a918fe 100644
--- a/src/adapters/webhook.js
+++ b/src/adapters/webhook.js
@@ -7,8 +7,6 @@ const axios = require('axios')
 
 let _this
 
-const APPID = 'swapTest555'
-
 class WebHook {
   constructor () {
     _this = this
@@ -26,7 +24,7 @@ class WebHook {
       const endpoint = _this.config.webhookService
 
       const obj = {
-        appId: APPID,
+        appId: this.config.p2wdbAppId,
         url
       }
 
@@ -49,7 +47,7 @@ class WebHook {
       const endpoint = _this.config.webhookService
 
       const obj = {
-        appId: APPID,
+        appId: this.config.p2wdbAppId,
         url
       }
 
diff --git a/src/use-cases/offer.js b/src/use-cases/offer.js
index 6ef4103..0b26410 100644
--- a/src/use-cases/offer.js
+++ b/src/use-cases/offer.js
@@ -1,6 +1,11 @@
-const { wlogger } = require('../adapters/wlogger')
+/*
+  Offer use-case library.
+*/
 
+// Local libraries
+const { wlogger } = require('../adapters/wlogger')
 const OfferEntity = require('../entities/offer')
+const config = require('../../config')
 
 class OfferLib {
   constructor (localConfig = {}) {
@@ -16,6 +21,7 @@ class OfferLib {
     this.offerEntity = new OfferEntity()
     this.OfferModel = this.adapters.localdb.Offer
     this.bch = this.adapters.bch
+    this.config = config
   }
 
   // Create a new offer model and add it to the Mongo database.
@@ -57,7 +63,7 @@ class OfferLib {
         txid,
         signature,
         message,
-        appId: 'bch-dex-test556',
+        appId: this.config.p2wdbAppId,
         data: offerEntity
       }