From 541109e7b1b3d9a51d8c7e3ca3deb0c17d23a815 Mon Sep 17 00:00:00 2001 From: Victor Losada Hernandez Date: Sat, 28 Jan 2023 11:47:26 +0100 Subject: [PATCH 1/3] fix created, updated published last viewed --- server/app.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index 61dbbc21a..9f4550778 100644 --- a/server/app.js +++ b/server/app.js @@ -294,7 +294,12 @@ app.get('/edit/:id', asyncHandler(getBrew('edit')), (req, res, next)=>{ app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{ sanitizeBrew(req.brew, 'share'); splitTextStyleAndMetadata(req.brew); - req.brew.views = 0; + req.brew.published = false; + req.brew.createdAt = clock.now; + req.brew.updatedAt = clock.now; + req.brew.views = 1; + req.brew.lastViewed = clock.now; + req.brew.title = `CLONE - ${req.brew.title}`; req.ogMeta = { ...defaultMetaTags, From f628e1a5aea855fbcb27e60023ff0ae15c1953c9 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 30 Jan 2023 17:08:19 -0500 Subject: [PATCH 2/3] Use DEFAULT_BREW values instead of setting them here --- server/app.js | 16 +++++++++------- server/brewDefaults.js | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/server/app.js b/server/app.js index 9f4550778..59aac2d9b 100644 --- a/server/app.js +++ b/server/app.js @@ -294,13 +294,15 @@ app.get('/edit/:id', asyncHandler(getBrew('edit')), (req, res, next)=>{ app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{ sanitizeBrew(req.brew, 'share'); splitTextStyleAndMetadata(req.brew); - req.brew.published = false; - req.brew.createdAt = clock.now; - req.brew.updatedAt = clock.now; - req.brew.views = 1; - req.brew.lastViewed = clock.now; - - req.brew.title = `CLONE - ${req.brew.title}`; + const brew = { + shareId : req.brew.shareId, + title : `CLONE - ${req.brew.title}`, + text : req.brew.text, + style : req.brew.style, + renderer : req.brew.renderer, + theme : req.brew.theme + }; + req.brew = _.defaults(brew, DEFAULT_BREW); req.ogMeta = { ...defaultMetaTags, title : 'New', diff --git a/server/brewDefaults.js b/server/brewDefaults.js index 092f7070a..30798cea7 100644 --- a/server/brewDefaults.js +++ b/server/brewDefaults.js @@ -16,6 +16,7 @@ const DEFAULT_BREW = { tags : [], systems : [], thumbnail : '', + views : 0, published : false, pageCount : 1, gDrive : false, From 4260f5197c392149a34eb39b911a990232a5ee2b Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 30 Jan 2023 17:15:33 -0500 Subject: [PATCH 3/3] Update specs to expect a `views` prop from default brew --- server/homebrew.api.spec.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/homebrew.api.spec.js b/server/homebrew.api.spec.js index 71d9bdcc7..22f80155c 100644 --- a/server/homebrew.api.spec.js +++ b/server/homebrew.api.spec.js @@ -71,7 +71,8 @@ describe('Tests for api', ()=>{ lastViewed : new Date(), version : 1, pageCount : 1, - textBin : '' + textBin : '', + views : 0 }; googleBrew = { ...hbBrew, @@ -261,7 +262,8 @@ If you believe you should have access to this brew, ask the file owner to invite gDrive : false, style : undefined, trashed : false, - updatedAt : undefined + updatedAt : undefined, + views : 0 }); expect(next).toHaveBeenCalled(); expect(api.getId).toHaveBeenCalledWith(req); @@ -452,7 +454,8 @@ brew`); thumbnail : '', title : 'asdf', trashed : false, - updatedAt : undefined + updatedAt : undefined, + views : 0 }); }); @@ -510,7 +513,8 @@ brew`); thumbnail : '', title : 'asdf', trashed : false, - updatedAt : undefined + updatedAt : undefined, + views : 0 }); });