From 764f4d4b6fcd8d5df155631c90fe1df20c4a5c35 Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Wed, 8 Aug 2018 11:39:35 -0700
Subject: [PATCH] updated Claim model to return proper error if no matching
 claim id found

---
 .../assets/serveByIdentifierAndClaim/index.js | 11 +++++++++-
 server/controllers/utils/getClaimId.js        | 22 ++++++-------------
 server/models/claim.js                        |  7 +++---
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/server/controllers/assets/serveByIdentifierAndClaim/index.js b/server/controllers/assets/serveByIdentifierAndClaim/index.js
index 521974a0..4e4d66b1 100644
--- a/server/controllers/assets/serveByIdentifierAndClaim/index.js
+++ b/server/controllers/assets/serveByIdentifierAndClaim/index.js
@@ -36,7 +36,16 @@ const serverByIdentifierAndClaim = (req, res) => {
       [claimId, claimName] = flipClaimNameAndId(claimId, claimName);
     }
 
-    logger.debug('serve request:', { headers, ip, originalUrl, params });
+    logger.debug('serve request:', {
+      headers,
+      ip,
+      originalUrl,
+      params,
+      channelName,
+      channelClaimId,
+      claimName,
+      claimId,
+    });
 
     getClaimIdAndServeAsset(channelName, channelClaimId, claimName, claimId, originalUrl, ip, res);
 
diff --git a/server/controllers/utils/getClaimId.js b/server/controllers/utils/getClaimId.js
index f692bd2e..d3cdbb54 100644
--- a/server/controllers/utils/getClaimId.js
+++ b/server/controllers/utils/getClaimId.js
@@ -3,27 +3,19 @@ const logger = require('winston');
 const db = require('../../models/index');
 
 const getClaimIdByChannel = (channelName, channelClaimId, claimName) => {
-  return new Promise((resolve, reject) => {
-    db.Certificate
-      .getLongChannelId(channelName, channelClaimId)
-      .then(longChannelId => {
-        return db.Claim.getClaimIdByLongChannelId(longChannelId, claimName);
-      })
-      .then(longClaimId => {
-        resolve(longClaimId);
-      })
-      .catch(error => {
-        reject(error);
-      });
-  });
+  logger.debug(`getClaimIdByChannel(${channelName}, ${channelClaimId}, ${claimName})`);
+  return db.Certificate
+    .getLongChannelId(channelName, channelClaimId)
+    .then(longChannelId => {
+      return db.Claim.getClaimIdByLongChannelId(longChannelId, claimName);
+    });
 };
 
 const getClaimId = (channelName, channelClaimId, name, claimId) => {
+  logger.debug(`getClaimId: ${channelName}, ${channelClaimId}, ${name}, ${claimId})`);
   if (channelName) {
-    logger.debug(`getClaimIdByChannel(${channelName}, ${channelClaimId}, ${name})`);
     return getClaimIdByChannel(channelName, channelClaimId, name);
   } else {
-    logger.debug(`db.Claim.getLongClaimId(${name}, ${claimId})`);
     return db.Claim.getLongClaimId(name, claimId);
   }
 };
diff --git a/server/models/claim.js b/server/models/claim.js
index 08bd7c6b..1763ac84 100644
--- a/server/models/claim.js
+++ b/server/models/claim.js
@@ -260,11 +260,11 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
         .then(result => {
           switch (result.length) {
             case 0:
-              return resolve(null);
+              return reject(NO_CLAIM);
             case 1:
               return resolve(result[0].claimId);
             default:
-              logger.error(`${result.length} records found for "${claimName}" in channel "${channelClaimId}"`);
+              logger.warn(`${result.length} records found for "${claimName}" in channel "${channelClaimId}"`);
               return resolve(result[0].claimId);
           }
         })
@@ -344,7 +344,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
   };
 
   Claim.getLongClaimId = function (claimName, claimId) {
-    // logger.debug(`getLongClaimId(${claimName}, ${claimId})`);
+    logger.debug(`getLongClaimId(${claimName}, ${claimId})`);
     if (isLongClaimId(claimId)) {
       return this.validateLongClaimId(claimName, claimId);
     } else if (isShortClaimId(claimId)) {
@@ -379,6 +379,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
   };
 
   Claim.getOutpoint = function (name, claimId) {
+    logger.debug(`finding outpoint for ${name}#${claimId}`);
     return this
       .findAll({
         where     : { name, claimId },