fix(live-loans): handles bugs from fewer loans than asked for being r…

…eturned
kiva · Dec 1, 2021 · e01eb03 · e01eb03
1 parent e712d7a
commit e01eb03
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/server/live-loan-router.js b/server/live-loan-router.js
@@ -19,7 +19,7 @@ async function fetchRecommendedLoans(type, id, cache) {
 	const loanData = await fetchLoansByType(type, id);
 
 	// Set the loan data in memcache, return the loan data
-	if (loanData.length) {
+	if (loanData && loanData.length) {
 		const expires = 10 * 60; // 10 minutes
 		memJsUtils.setToCache(`recommendations-by-${type}-id-${id}`, JSON.stringify(loanData), expires, cache)
 			.catch(err => {
@@ -39,6 +39,10 @@ async function getLoanForRequest(type, cache, req) {
 	const offset = req.params?.offset || 1;
 
 	const loanData = await fetchRecommendedLoans(type, id, cache);
+	// if there are fewer loan results than the offset, return the last result
+	if (offset > loanData.length) {
+		return loanData[loanData.length - 1];
+	}
 	return loanData[offset - 1];
 }
 

diff --git a/server/util/live-loan/live-loan-fetch.js b/server/util/live-loan/live-loan-fetch.js
@@ -38,7 +38,12 @@ async function fetchGraphQL(request, resultPath) {
 			body: JSON.stringify(request),
 		});
 		const result = await response.json();
-		return get(result, resultPath, []);
+		const data = get(result, resultPath, []);
+		if (Array.isArray(data)) {
+			// Ensure no falsy values are included in the returned array
+			return data.filter(x => x);
+		}
+		return [];
 	} catch (err) {
 		log(`Error fetching loans: ${err}`, 'error');
 	}