From c7cfa862056a254512e9106aae1befe3b18d5bb7 Mon Sep 17 00:00:00 2001 From: Charlie Humphreys Date: Sat, 25 Jun 2022 00:43:47 -0500 Subject: [PATCH] remove migration in favor of as-edited approach --- client/homebrew/editor/editor.jsx | 5 ++++- server/app.js | 3 ++- server/googleActions.js | 1 - server/homebrew.api.js | 1 - server/homebrew.model.js | 20 -------------------- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index fd9f850d3..f881886ba 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -299,7 +299,10 @@ const Editor = createClass({ style={{ display: 'none' }} rerenderParent={this.rerenderParent} /> ; } diff --git a/server/app.js b/server/app.js index 95a861375..45699eb14 100644 --- a/server/app.js +++ b/server/app.js @@ -176,7 +176,8 @@ app.get('/user/:username', async (req, res, next)=>{ 'editId', 'createdAt', 'updatedAt', - 'lastViewed' + 'lastViewed', + 'tags' ]; let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields) diff --git a/server/googleActions.js b/server/googleActions.js index 5d9e43b71..7b86a34c1 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -124,7 +124,6 @@ const GoogleActions = { title : file.properties.title, description : file.description, views : parseInt(file.properties.views), - tags : '', published : file.properties.published ? file.properties.published == 'true' : false, systems : [], thumbnail : file.properties.thumbnail diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 59d358ef2..4af232b4c 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -180,7 +180,6 @@ const updateBrew = async (req, res)=>{ let afterSave = async ()=>true; brew.text = mergeBrewText(brew); - brew.tags = updateBrew.tags; if(brew.googleId && removeFromGoogle) { // If the google id exists and we're removing it from google, set afterSave to delete the google brew and mark the brew's google id as undefined diff --git a/server/homebrew.model.js b/server/homebrew.model.js index bd415a903..a514e3fd8 100644 --- a/server/homebrew.model.js +++ b/server/homebrew.model.js @@ -68,26 +68,6 @@ HomebrewSchema.statics.getByUser = function(username, allowAccess=false, fields= const Homebrew = mongoose.model('Homebrew', HomebrewSchema); -if(process.env.MIGRATE === 'true') { - Homebrew.count({ tags: '' }, async (err, count)=>{ - if(!err) { - if(count > 0) { - Homebrew.updateMany({ tags: '' }, { tags: [] }, { multi: true }, function(err, data) { - if(!err) { - console.log('Successfully updated all brews to new schema definition'); - } else { - console.log('An error occurred while updating brews to the new schema', err); - } - }); - } else { - console.log('No brews to update'); - } - } else { - console.log('An error occurred while counting brews with the old schema', err); - } - }); -} - module.exports = { schema : HomebrewSchema, model : Homebrew,