refactor: better v2 API error messages (#866)

ArkEcosystem · Aug 15, 2018 · 6f8986c · 6f8986c
1 parent c3e0d5d
commit 6f8986c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 13 deletions.
diff --git a/packages/core-api/lib/versions/2/handlers/blocks.js b/packages/core-api/lib/versions/2/handlers/blocks.js
@@ -36,6 +36,10 @@ exports.show = {
   async handler (request, h) {
     const block = await database.blocks.findById(request.params.id)
 
+    if (!block) {
+      return Boom.notFound('Block not found')
+    }
+
     return utils.respondWithResource(request, block, 'block')
   },
   options: {
@@ -56,7 +60,7 @@ exports.transactions = {
     const block = await database.blocks.findById(request.params.id)
 
     if (!block) {
-      return Boom.notFound()
+      return Boom.notFound('Block not found')
     }
 
     const transactions = await database.transactions.findAllByBlock(block.id, utils.paginate(request))

diff --git a/packages/core-api/lib/versions/2/handlers/delegates.js b/packages/core-api/lib/versions/2/handlers/delegates.js
@@ -38,7 +38,7 @@ exports.show = {
     const delegate = await database.delegates.findById(request.params.id)
 
     if (!delegate) {
-      return Boom.notFound()
+      return Boom.notFound('Delegate not found')
     }
 
     return utils.respondWithResource(request, delegate, 'delegate')
@@ -84,7 +84,7 @@ exports.blocks = {
     const delegate = await database.delegates.findById(request.params.id)
 
     if (!delegate) {
-      return Boom.notFound()
+      return Boom.notFound('Delegate not found')
     }
 
     const blocks = await database.blocks.findAllByGenerator(delegate.publicKey, utils.paginate(request))
@@ -109,7 +109,7 @@ exports.voters = {
     const delegate = await database.delegates.findById(request.params.id)
 
     if (!delegate) {
-      return Boom.notFound()
+      return Boom.notFound('Delegate not found')
     }
 
     const wallets = await database.wallets.findAllByVote(delegate.publicKey, utils.paginate(request))
@@ -134,7 +134,7 @@ exports.voterBalances = {
     const delegate = await database.delegates.findById(request.params.id)
 
     if (!delegate) {
-      return Boom.notFound()
+      return Boom.notFound('Delegate not found')
     }
 
     const wallets = await database.wallets

diff --git a/packages/core-api/lib/versions/2/handlers/peers.js b/packages/core-api/lib/versions/2/handlers/peers.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const Boom = require('boom')
 const blockchain = require('@arkecosystem/core-container').resolvePlugin('blockchain')
 const utils = require('../utils')
 const schema = require('../schema/peers')
@@ -51,8 +52,13 @@ exports.show = {
    */
   async handler (request, h) {
     const peers = await blockchain.p2p.getPeers()
+    const peer = peers.find(p => p.ip === request.params.ip)
 
-    return utils.respondWithResource(request, peers.find(p => p.ip === request.params.ip), 'peer')
+    if (!peer) {
+      return Boom.notFound('Peer not found')
+    }
+
+    return utils.respondWithResource(request, peer, 'peer')
   },
   options: {
     validate: schema.show

diff --git a/packages/core-api/lib/versions/2/handlers/transactions.js b/packages/core-api/lib/versions/2/handlers/transactions.js
@@ -105,7 +105,7 @@ exports.show = {
     const transaction = await database.transactions.findById(request.params.id)
 
     if (!transaction) {
-      return Boom.notFound()
+      return Boom.notFound('Transaction not found')
     }
 
     return utils.respondWithResource(request, transaction, 'transaction')
@@ -158,7 +158,7 @@ exports.showUnconfirmed = {
     let transaction = await transactionPool.getTransaction(request.params.id)
 
     if (!transaction) {
-      return Boom.notFound()
+      return Boom.notFound('Transaction not found')
     }
 
     transaction = { serialized: transaction.serialized.toString('hex') }

diff --git a/packages/core-api/lib/versions/2/handlers/votes.js b/packages/core-api/lib/versions/2/handlers/votes.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const Boom = require('boom')
 const { TRANSACTION_TYPES } = require('@arkecosystem/crypto').constants
 const database = require('@arkecosystem/core-container').resolvePlugin('database')
 const utils = require('../utils')
@@ -36,6 +37,10 @@ exports.show = {
   async handler (request, h) {
     const transaction = await database.transactions.findByTypeAndId(TRANSACTION_TYPES.VOTE, request.params.id)
 
+    if (!transaction) {
+      return Boom.notFound('Vote not found')
+    }
+
     return utils.respondWithResource(request, transaction, 'transaction')
   },
   options: {

diff --git a/packages/core-api/lib/versions/2/handlers/wallets.js b/packages/core-api/lib/versions/2/handlers/wallets.js
@@ -53,7 +53,7 @@ exports.show = {
     const wallet = await database.wallets.findById(request.params.id)
 
     if (!wallet) {
-      return Boom.notFound()
+      return Boom.notFound('Wallet not found')
     }
 
     return utils.respondWithResource(request, wallet, 'wallet')
@@ -76,7 +76,7 @@ exports.transactions = {
     const wallet = await database.wallets.findById(request.params.id)
 
     if (!wallet) {
-      return Boom.notFound()
+      return Boom.notFound('Wallet not found')
     }
 
     const transactions = await database.transactions.findAllByWallet(
@@ -106,7 +106,7 @@ exports.transactionsSent = {
     const wallet = await database.wallets.findById(request.params.id)
 
     if (!wallet) {
-      return Boom.notFound()
+      return Boom.notFound('Wallet not found')
     }
 
     const transactions = await database.transactions.findAllBySender(
@@ -136,7 +136,7 @@ exports.transactionsReceived = {
     const wallet = await database.wallets.findById(request.params.id)
 
     if (!wallet) {
-      return Boom.notFound()
+      return Boom.notFound('Wallet not found')
     }
 
     const transactions = await database.transactions.findAllByRecipient(
@@ -166,7 +166,7 @@ exports.votes = {
     const wallet = await database.wallets.findById(request.params.id)
 
     if (!wallet) {
-      return Boom.notFound()
+      return Boom.notFound('Wallet not found')
     }
 
     const transactions = await database.transactions.allVotesBySender(