Skip to content

Commit 6f09c73

Browse files
Work in progress. Parse query string. Relates > #25
1 parent 29dd074 commit 6f09c73

File tree

7 files changed

+34
-59
lines changed

7 files changed

+34
-59
lines changed

package-lock.json

+15-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"node-sass-middleware": "^0.11.0",
3636
"pg": "^7.4.3",
3737
"pg-promise": "^8.4.6",
38+
"query-string": "^6.1.0",
3839
"querystring": "^0.2.0",
3940
"sequelize": "^4.38.0",
4041
"serve-favicon": "^2.5.0"

src/controllers/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ router.get('/welcome', welcome.get);
1515
router.get('/background', background.get);
1616
router.get('/resources', resources.get);
1717
router.get('/more-info', moreinfo.get);
18-
router.get('/results', results.get);
18+
router.get('/results', results.post); //used to be results.get
1919

2020
// trigger 500 error for testing
2121

src/controllers/results.js

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1+
const queries = require('../model/index')
2+
const queryString = require('query-string');
3+
4+
exports.post = (req, response) => {
5+
var queryObj = queryString.parseUrl(req.url).query;
6+
var backgroundArr = queryObj.bg.split(",");
7+
var resourceArr = queryObj.rsc.split(",");
8+
console.log("bg Arr is", backgroundArr, "rsc Arr is", resourceArr);
9+
const demo_tags = [];
10+
}
11+
12+
// Old code:
13+
/*
114
exports.get = (req, res) => {
215
res.render('results', {
316
layout: 'scrollable'
417
});
5-
}
18+
}
19+
*/

src/model/getData.js

-53
Original file line numberDiff line numberDiff line change
@@ -20,56 +20,3 @@ const getResource = inputArray => {
2020
};
2121
module.exports = getResource;
2222

23-
console.log("HERE");
24-
25-
// getResource(['age', 'disability', 'gender'])
26-
// .then(res => console.log(res.rows))
27-
// .catch(err => console.log(err))
28-
const resultArr = getResource(["age", "disability", "gender"])
29-
.then(res => {
30-
var resultArr = res.rows;
31-
var newAns = resultArr.reduce(reducer);
32-
console.log("HELLO", newAns);
33-
})
34-
.catch(err => console.log(err));
35-
36-
////////
37-
38-
//myArray.reduce(reducer)
39-
// var myarr = [1, 2, 3];
40-
// const reducer = (accumulator, currentvalue) => {
41-
// return accumulator + currentvalue;
42-
// };
43-
44-
// var sum = myarr.reduce(reducer);
45-
// console.log(sum);
46-
var accumulator = []; //empty array to start with
47-
const reducer = (accumulator, currentvalue) => {
48-
// accumulator.forEach(function(element) {
49-
// if (element.resource_id == currentvalue.resource_id) {
50-
// //if one of the relevance is direct set our result's relevance to direct
51-
// if (element.relevance == "direct" || currentvalue.relevance == "direct") {
52-
// element.relevane = "direct";
53-
// }
54-
// } else {
55-
// //populate new resouce in our result array
56-
// accumulator.push(currentvalue);
57-
// }
58-
// });
59-
for (let i = 0; i < accumulator.length; i++) {
60-
if (accumulator[i].resource_id == currentvalue.resource_id) {
61-
if (
62-
accumulator[i].relevance == "direct" ||
63-
currentvalue.relevance == "direct"
64-
) {
65-
accumulator[i].relevance = "direct";
66-
}
67-
} else {
68-
//populate new resouce in our result array
69-
accumulator.push(currentvalue);
70-
}
71-
}
72-
};
73-
74-
//var newAns = resultArr.reduce(reducer);
75-
//console.log("HELLO", newAns);

src/model/get_resource_detail.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const db = require("../database/db_connection");
22

33
const getResourceDetail = resourceId => {
44
return new Promise((resolve, reject) => {
5-
db.query(`SELECT * from resource WHERE id ='${resourceId}' `)
5+
db.query(`SELECT * from resource WHERE resource_id ='${resourceId}' `)
66
.then(res => resolve(res))
77
.catch(err => reject(err));
88
});

src/model/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const getDemoTagId = require("./get_demo_tag_id");
22
const getResourceDetail = require("./get_resource_detail");
3-
const getResource = require("./getResource");
3+
const getResource = require("./getData");
44

55
module.exports = {
66
getDemoTagId: getDemoTagId,

0 commit comments

Comments
 (0)