Merge pull request #4987 from kiva/add-loanIds-filter-to-live-loan-MA…

…RS-487

feat: add loanId filter

server/live-loan-router.js

@@ -185,6 +185,27 @@ module.exports = function liveLoanRouter(cache) {
 		});
 	});
 
+	// Loan Id URL Router
+	router.use('/lid/:id([0-9]{0,})/url', async (req, res) => {
+		await tracer.trace('live-loan.loanid.redirectToUrl', { resource: req.path }, async () => {
+			await redirectToUrl('loanid', cache, req, res);
+		});
+	});
+
+	// Loan Id IMG Router (Legacy)
+	router.use('/lid/:id([0-9]{0,})/img', async (req, res) => {
+		await tracer.trace('live-loan.loanid.serveImg', { resource: req.path }, async () => {
+			await serveImg('loanid', 'legacy', cache, req, res);
+		});
+	});
+
+	// Loan Id IMG Router (Kiva Classic)
+	router.use('/lid/:id([0-9]{0,})/img2', async (req, res) => {
+		await tracer.trace('live-loan.loanid.serveImg', { resource: req.path }, async () => {
+			await serveImg('loanid', 'classic', cache, req, res);
+		});
+	});
+
 	// 404 any /live-loan/* routes that don't match above
 	router.use((req, res) => {
 		res.sendStatus(404);

server/util/live-loan/live-loan-fetch.js

@@ -5,7 +5,7 @@ const { warn, error } = require('../log');
 const loanCount = 4;
 
 // Which loan properties to fetch
-const loanValues = `values {
+const loanData = `
 	name
 	id
 	activity {
@@ -36,6 +36,10 @@ const loanValues = `values {
 	... on LoanPartner {
 		themes
 	}
+`;
+
+const loanValues = `values {
+	${loanData}
 }`;
 
 // Make a graphql query <request> and return the results found at <resultPath>
@@ -46,6 +50,9 @@ async function fetchLoansFromGraphQL(request, resultPath) {
 			// Ensure no falsy values are included in the returned array
 			return data.filter(x => x);
 		}
+		if (typeof data === 'object' && data !== null) {
+			return [data];
+		}
 		return [];
 	} catch (err) {
 		error(`Error fetching loans: ${err}`, { error: err });
@@ -369,6 +376,24 @@ async function fetchRecommendationsByLegacyFilter(filterString) {
 	);
 }
 
+// Get loans from legacy lend search matching a set of filters
+async function fetchLoanById(loanId) {
+	return fetchLoansFromGraphQL(
+		{
+			query: `query($loanId: Int!) {
+				lend {
+					loan(id: $loanId) {
+						${loanData}
+					}
+				}
+			}`,
+			variables: {
+				loanId: Number(loanId),
+			}
+		},
+		'data.lend.loan'
+	);
+}
 // Export a function that will fetch loans by live-loan type and id
 module.exports = async function fetchLoansByType(type, id) {
 	if (type === 'user') {
@@ -380,5 +405,8 @@ module.exports = async function fetchLoansByType(type, id) {
 		// return fetchRecommendationsByFilter(id);
 		return fetchRecommendationsByLegacyFilter(id);
 	}
+	if (type === 'loanid') {
+		return fetchLoanById(id);
+	}
 	throw new Error('Type must be user, loan, or filter');
 };