From 4d1caf0b8a440558b898db3a3aeb402ac2d50b43 Mon Sep 17 00:00:00 2001 From: Adam Buckingham Date: Mon, 20 May 2024 10:59:26 -0400 Subject: [PATCH] Adding RFQs to solicitation query --- server/certs/cert_location.txt | 1 + server/config/config.js | 2 +- server/routes/auth.routes.js | 8 ++++++++ server/routes/noticeType.routes.js | 2 +- server/routes/prediction.routes.js | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 server/certs/cert_location.txt diff --git a/server/certs/cert_location.txt b/server/certs/cert_location.txt new file mode 100644 index 00000000..7c70af4f --- /dev/null +++ b/server/certs/cert_location.txt @@ -0,0 +1 @@ +Place holder for where the certs will be when deployed. \ No newline at end of file diff --git a/server/config/config.js b/server/config/config.js index eeeb61e0..5a4620b5 100644 --- a/server/config/config.js +++ b/server/config/config.js @@ -318,7 +318,7 @@ module.exports = { "ENERGY, DEPARTMENT OF":"Department of Energy", "MILLENNIUM CHALLENGE CORPORATION":"Millennium Challenge Corporation" }, - VisibleNoticeTypes : ['Solicitation', 'Combined Synopsis/Solicitation'], + VisibleNoticeTypes : ['Solicitation', 'Combined Synopsis/Solicitation', 'RFQ'], //"minPredictionCutoffDate" : "2020-02-01T00:00:00.000Z", "predictionCutoffDays" : 60, "updatePredictionTableMaxRunTime" : 10, diff --git a/server/routes/auth.routes.js b/server/routes/auth.routes.js index 870bde7a..aa886753 100644 --- a/server/routes/auth.routes.js +++ b/server/routes/auth.routes.js @@ -101,9 +101,17 @@ function updateUser(login_gov_data, user) { } } +function capitalize(s) +{ + return s[0].toUpperCase() + s.slice(1); +} + function createUser(loginGovUser) { let now = new Date() let date = (now.getMonth() + 1) + "-" + now.getDate() + "-" + now.getFullYear() + + //console.log("Login.gov user:", loginGovUser) + let user_data = { 'firstName': loginGovUser.given_name || null, 'lastName': loginGovUser.family_name || null, diff --git a/server/routes/noticeType.routes.js b/server/routes/noticeType.routes.js index 0955f9d9..7cc6088b 100644 --- a/server/routes/noticeType.routes.js +++ b/server/routes/noticeType.routes.js @@ -16,7 +16,7 @@ module.exports = { getNoticeTypes : function(req, res) { return res.status(200).send( - configuration.getConfig("VisibleNoticeTypes", ['Solicitation', 'Combined Synopsis/Solicitation']) + configuration.getConfig("VisibleNoticeTypes", ['Solicitation', 'Combined Synopsis/Solicitation', 'RFQ']) ) // diff --git a/server/routes/prediction.routes.js b/server/routes/prediction.routes.js index da856f73..2cb92442 100644 --- a/server/routes/prediction.routes.js +++ b/server/routes/prediction.routes.js @@ -383,7 +383,7 @@ async function getPredictions (filter, user) { } // filter to allowed notice types - let types = configuration.getConfig("VisibleNoticeTypes", ['Solicitation', 'Combined Synopsis/Solicitation']) + let types = configuration.getConfig("VisibleNoticeTypes", ['Solicitation', 'Combined Synopsis/Solicitation', 'RFQ']) attributes.where = { noticeType: {