From 5a2e3754fc2aa59f918342b9324063cf4c24d395 Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Thu, 9 Dec 2021 13:53:52 +0000 Subject: [PATCH 1/9] MAS-252 Added Id to error message --- cms/models/Item.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/models/Item.js b/cms/models/Item.js index b60af1b0..7db0741d 100644 --- a/cms/models/Item.js +++ b/cms/models/Item.js @@ -191,8 +191,8 @@ Item.schema.post("save", async function(doc, next) { .select(Item.fullResponseFields.join(" ")) .exec(); } catch (err) { - logger.error("An error occurred finding item: ", err.message); - return next(new Error(`An error occurred finding item: ${err.message}`)); + logger.error(`An error occurred finding item: ${err.message}. Looking for item ${doc._id}`); + return next(new Error(`An error occurred finding item: ${err.message}. Looking for item ${doc._id}`)); } const contentpath = process.env.CONTENT_PATH; From 4761c989288a0150ed31c2159f0dcd420104a0a6 Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Thu, 9 Dec 2021 15:57:37 +0000 Subject: [PATCH 2/9] MAS-252 Update npm --- cms/models/Item.js | 10 ++++++++-- cms/package-lock.json | 15 ++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/cms/models/Item.js b/cms/models/Item.js index 7db0741d..c572054e 100644 --- a/cms/models/Item.js +++ b/cms/models/Item.js @@ -191,8 +191,14 @@ Item.schema.post("save", async function(doc, next) { .select(Item.fullResponseFields.join(" ")) .exec(); } catch (err) { - logger.error(`An error occurred finding item: ${err.message}. Looking for item ${doc._id}`); - return next(new Error(`An error occurred finding item: ${err.message}. Looking for item ${doc._id}`)); + logger.error( + `An error occurred finding item: ${err.message}. Looking for item ${doc._id}` + ); + return next( + new Error( + `An error occurred finding item: ${err.message}. Looking for item ${doc._id}` + ) + ); } const contentpath = process.env.CONTENT_PATH; diff --git a/cms/package-lock.json b/cms/package-lock.json index 2a9697c5..40030a87 100644 --- a/cms/package-lock.json +++ b/cms/package-lock.json @@ -2778,7 +2778,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -5356,7 +5357,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -7312,7 +7314,8 @@ }, "y18n": { "version": "4.0.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, "yargs": { @@ -7335,7 +7338,8 @@ }, "yargs-parser": { "version": "13.1.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -13120,7 +13124,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, From 31c1d7f186abe8887f8a4c5a6941d908bb4d671a Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Fri, 10 Dec 2021 16:21:06 +0000 Subject: [PATCH 3/9] MAS-252 Removed fields from post save --- cms/models/Item.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cms/models/Item.js b/cms/models/Item.js index c572054e..267ed8bd 100644 --- a/cms/models/Item.js +++ b/cms/models/Item.js @@ -185,10 +185,10 @@ Item.schema.post("save", async function(doc, next) { item = await keystone .list("Item") .model.findById(doc._id) - .populate("source") - .populate("evidenceType") - .populate("specialities") - .select(Item.fullResponseFields.join(" ")) + // .populate("source") + // .populate("evidenceType") + // .populate("specialities") + // .select(Item.fullResponseFields.join(" ")) .exec(); } catch (err) { logger.error( From 735ac93ff5711a5bf653160ab17fdd250a2e8662 Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Fri, 10 Dec 2021 16:45:57 +0000 Subject: [PATCH 4/9] MAS-252 Added fields back into hook with exception of sources --- cms/models/Item.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/models/Item.js b/cms/models/Item.js index 267ed8bd..5fe7601b 100644 --- a/cms/models/Item.js +++ b/cms/models/Item.js @@ -186,9 +186,9 @@ Item.schema.post("save", async function(doc, next) { .list("Item") .model.findById(doc._id) // .populate("source") - // .populate("evidenceType") - // .populate("specialities") - // .select(Item.fullResponseFields.join(" ")) + .populate("evidenceType") + .populate("specialities") + .select(Item.fullResponseFields.join(" ")) .exec(); } catch (err) { logger.error( From 678e9bfb8c21b66eca386dce6aedcef02a139846 Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Thu, 13 Jan 2022 16:32:32 +0000 Subject: [PATCH 5/9] MAS-252 Uncommented Populate(Source --- cms/models/Item.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/models/Item.js b/cms/models/Item.js index 5fe7601b..c572054e 100644 --- a/cms/models/Item.js +++ b/cms/models/Item.js @@ -185,7 +185,7 @@ Item.schema.post("save", async function(doc, next) { item = await keystone .list("Item") .model.findById(doc._id) - // .populate("source") + .populate("source") .populate("evidenceType") .populate("specialities") .select(Item.fullResponseFields.join(" ")) From 0415f38be06cd8cc7b497b08746a4be8260385aa Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Fri, 14 Jan 2022 11:54:37 +0000 Subject: [PATCH 6/9] MAS-252 Upgraded Amazon.Lambda.AspNetCoreServer --- lambda/MAS/MAS.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda/MAS/MAS.csproj b/lambda/MAS/MAS.csproj index 089a7c1b..d304528e 100644 --- a/lambda/MAS/MAS.csproj +++ b/lambda/MAS/MAS.csproj @@ -18,7 +18,7 @@ - + From 66d6113ead4c14d14ca7e5d4906eb24c57ef1418 Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Fri, 14 Jan 2022 12:09:05 +0000 Subject: [PATCH 7/9] MAS-252 Downgrade Amazon.Lambda.AspNetCoreServer --- lambda/MAS/MAS.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda/MAS/MAS.csproj b/lambda/MAS/MAS.csproj index d304528e..089a7c1b 100644 --- a/lambda/MAS/MAS.csproj +++ b/lambda/MAS/MAS.csproj @@ -18,7 +18,7 @@ - + From e786e2f745c9faca99fbf9dbac6d37acf3a6ee18 Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Tue, 18 Jan 2022 13:04:05 +0000 Subject: [PATCH 8/9] MAS-252 Added test logging --- lambda/MAS/Services/StaticWebsiteService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/lambda/MAS/Services/StaticWebsiteService.cs b/lambda/MAS/Services/StaticWebsiteService.cs index 83b80d7d..dc31419a 100644 --- a/lambda/MAS/Services/StaticWebsiteService.cs +++ b/lambda/MAS/Services/StaticWebsiteService.cs @@ -88,6 +88,7 @@ private async Task WriteFileAsync(StaticContentRequest item) else request.ContentBody = item.ContentBody; + _logger.LogDebug("TESTING THE LOGS !!!!!!!!!!!!!!!!!!!!!!!!!"); var response = await _amazonS3.PutObjectAsync(request); return response; From cad66a61e4fffd72a6d737ef7c2893c309146507 Mon Sep 17 00:00:00 2001 From: Sue Garner Date: Thu, 20 Jan 2022 11:38:09 +0000 Subject: [PATCH 9/9] MAS-252 Added timings round list items api call --- cms/routes/api/items.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cms/routes/api/items.js b/cms/routes/api/items.js index ebe573ee..92d4d366 100644 --- a/cms/routes/api/items.js +++ b/cms/routes/api/items.js @@ -100,6 +100,7 @@ exports.daily = async function(req, res) { * /api/items/month/2020-01 */ exports.month = async function(req, res) { + const start = Date.now(); const dateStr = req.params.date, date = moment(dateStr, "YYYY-M", true); @@ -130,6 +131,8 @@ exports.month = async function(req, res) { const obj = _.map(items, _.partialRight(_.pick, Items.fullResponseFields)); res.json(obj); + const millis = Date.now() - start; + console.log(`seconds elapsed = ${Math.floor(millis / 1000)}`); }; /**