From ed68514b8fa5209f8a421c0038648ad550ac641c Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Wed, 16 Aug 2017 12:23:02 -0700
Subject: [PATCH] updated serve's get process to use local resolve

---
 controllers/serveController.js | 64 ++++++++++++++++------------------
 helpers/serveHelpers.js        | 26 +++++++++++---
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/controllers/serveController.js b/controllers/serveController.js
index c08c5736..fe1ed0a6 100644
--- a/controllers/serveController.js
+++ b/controllers/serveController.js
@@ -1,8 +1,7 @@
 const lbryApi = require('../helpers/lbryApi.js');
 const db = require('../models');
 const logger = require('winston');
-const isFreeClaim = require('../helpers/functions/isFreeClaim.js');
-const { getTopFreeClaim, getFullClaimIdFromShortId } = require('../helpers/serveHelpers.js');
+const { getTopFreeClaim, getFullClaimIdFromShortId, resolveAgainstClaimTable } = require('../helpers/serveHelpers.js');
 
 function checkForLocalAssetByClaimId (claimId, name) {
   return new Promise((resolve, reject) => {
@@ -39,43 +38,42 @@ function getAssetByClaimId (fullClaimId, name) {
     // 1. check locally for claim
     checkForLocalAssetByClaimId(fullClaimId, name)
     .then(dataValues => {
-      // 2. if a result was found, return the result
+      // if a result was found, return early with the result
       if (dataValues) {
         logger.debug('found a local file for this name and claimId');
-        resolve(dataValues);
-      // 2. if not found locally, make a get request
-      } else {
-        logger.debug('no local file for this name and claimId');
-        // 3. resolve the claim
-        lbryApi.resolveUri(`${name}#${fullClaimId}`)  // USE A LOCAL RESOLVE HERE
-        .then(resolveResult => {
-          logger.debug('resolve result >> ', resolveResult);
-          // if the claim is free...
-          if (resolveResult.claim && isFreeClaim(resolveResult.claim)) {
-            // get the claim
-            lbryApi.getClaim(`${name}#${fullClaimId}`)
-            .then(getResult => {
-              logger.debug('getResult >>', getResult);
-              let fileInfo = formatGetResultsToFileInfo(getResult);
-              fileInfo['address'] = resolveResult.claim.address;
-              fileInfo['height'] = resolveResult.claim.height;
-              // insert a record in the File table
-              db.File.create(fileInfo);
-              // resolve the promise
-              resolve(fileInfo);
-            })
-            .catch(error => {
-              reject(error);
-            });
-          // if not, resolve with no claims
-          } else {
-            resolve(null);
-          }
+        return resolve(dataValues);
+      }
+      logger.debug('no local file found for this name and claimId');
+      // 2. if no local claim, resolve and get the claim
+      resolveAgainstClaimTable(name, fullClaimId)
+      .then(resolveResult => {
+        logger.debug('resolve result >> ', resolveResult);
+        // if no result, return early (claim doesn't exist or isn't free)
+        if (!resolveResult) {
+          return resolve(null);
+        }
+        let fileRecord = {};
+        // get the claim
+        lbryApi.getClaim(`${name}#${fullClaimId}`)
+        .then(getResult => {
+          logger.debug('getResult >>', getResult);
+          fileRecord = formatGetResultsToFileInfo(getResult);
+          fileRecord['address'] = (resolveResult.address || 0);
+          fileRecord['height'] = resolveResult.height;
+          // insert a record in the File table & Update Claim table
+          return db.File.create(fileRecord);
+        })
+        .then(fileRecordResults => {
+          logger.debug('File record successfully updated');
+          resolve(fileRecord);
         })
         .catch(error => {
           reject(error);
         });
-      }
+      })
+      .catch(error => {
+        reject(error);
+      });
     })
     .catch(error => {
       reject(error);
diff --git a/helpers/serveHelpers.js b/helpers/serveHelpers.js
index b971a129..188cf915 100644
--- a/helpers/serveHelpers.js
+++ b/helpers/serveHelpers.js
@@ -127,9 +127,9 @@ module.exports = {
       });
     });
   },
-  getAllFreeClaims (claimName) {
+  getAllFreeClaims (name) {
     return new Promise((resolve, reject) => {
-      db.sequelize.query(`SELECT * FROM Claim WHERE name = '${claimName}' ORDER BY amount DESC, height ASC`, { type: db.sequelize.QueryTypes.SELECT })
+      db.sequelize.query(`SELECT * FROM Claim WHERE name = '${name}' ORDER BY amount DESC, height ASC`, { type: db.sequelize.QueryTypes.SELECT })
       .then(result => {
         switch (result.length) {
           case 0:
@@ -143,9 +143,9 @@ module.exports = {
       });
     });
   },
-  getTopFreeClaim (claimName) {
+  getTopFreeClaim (name) {
     return new Promise((resolve, reject) => {
-      db.sequelize.query(`SELECT * FROM Claim WHERE name = '${claimName}' ORDER BY amount DESC, height ASC LIMIT 1`, { type: db.sequelize.QueryTypes.SELECT })
+      db.sequelize.query(`SELECT * FROM Claim WHERE name = '${name}' ORDER BY amount DESC, height ASC LIMIT 1`, { type: db.sequelize.QueryTypes.SELECT })
       .then(result => {
         switch (result.length) {
           case 0:
@@ -159,4 +159,22 @@ module.exports = {
       });
     });
   },
+  resolveAgainstClaimTable (name, claimId) {
+    return new Promise((resolve, reject) => {
+      db.sequelize.query(`SELECT * FROM Claim WHERE name = '${name}' AND claimId = '${claimId}'`, { type: db.sequelize.QueryTypes.SELECT })
+      .then(result => {
+        switch (result.length) {
+          case 0:
+            return resolve(null);
+          case 1:
+            return resolve(result[0]);
+          default:
+            return new Error('more than one entry matches that name and claimID');
+        }
+      })
+      .catch(error => {
+        reject(error);
+      });
+    });
+  },
 };