From db9a703def0ac6455f24b5ad8903d44c3b4112ce Mon Sep 17 00:00:00 2001 From: josephmwells Date: Mon, 3 Aug 2020 11:40:48 -0700 Subject: [PATCH 1/2] Add character limit to sketch name on the back end #568 --- server/controllers/project.controller/createProject.js | 3 ++- server/models/project.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/controllers/project.controller/createProject.js b/server/controllers/project.controller/createProject.js index e4040268..3c12fd37 100644 --- a/server/controllers/project.controller/createProject.js +++ b/server/controllers/project.controller/createProject.js @@ -8,8 +8,9 @@ export default function createProject(req, res) { projectValues = Object.assign(projectValues, req.body); + // TODO: Error handling to match spec function sendFailure() { - res.json({ success: false }); + res.status(422).json({ success: false }); } function populateUserData(newProject) { diff --git a/server/models/project.js b/server/models/project.js index bf8c992e..98f83d92 100644 --- a/server/models/project.js +++ b/server/models/project.js @@ -29,7 +29,7 @@ fileSchema.set('toJSON', { const projectSchema = new Schema( { - name: { type: String, default: "Hello p5.js, it's the server" }, + name: { type: String, default: "Hello p5.js, it's the server", maxlength: 256 }, user: { type: Schema.Types.ObjectId, ref: 'User' }, serveSecure: { type: Boolean, default: false }, files: { type: [fileSchema] }, From 76bcf9cb097285495b2a8c22a68cc7f06e0c0d2f Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Mon, 3 Aug 2020 16:42:28 -0400 Subject: [PATCH 2/2] [#1529] Send status codes, run validator --- server/controllers/project.controller.js | 7 ++++--- server/controllers/project.controller/createProject.js | 3 +-- server/models/project.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/controllers/project.controller.js b/server/controllers/project.controller.js index 7f118c23..2a83aa6a 100644 --- a/server/controllers/project.controller.js +++ b/server/controllers/project.controller.js @@ -30,14 +30,15 @@ export function updateProject(req, res) { $set: req.body }, { - new: true + new: true, + runValidators: true } ) .populate('user', 'username') .exec((updateProjectErr, updatedProject) => { if (updateProjectErr) { console.log(updateProjectErr); - res.json({ success: false }); + res.status(400).json({ success: false }); return; } if (req.body.files && updatedProject.files.length !== req.body.files.length) { @@ -50,7 +51,7 @@ export function updateProject(req, res) { updatedProject.save((innerErr, savedProject) => { if (innerErr) { console.log(innerErr); - res.json({ success: false }); + res.status(400).json({ success: false }); return; } res.json(savedProject); diff --git a/server/controllers/project.controller/createProject.js b/server/controllers/project.controller/createProject.js index 3c12fd37..74529c0d 100644 --- a/server/controllers/project.controller/createProject.js +++ b/server/controllers/project.controller/createProject.js @@ -8,9 +8,8 @@ export default function createProject(req, res) { projectValues = Object.assign(projectValues, req.body); - // TODO: Error handling to match spec function sendFailure() { - res.status(422).json({ success: false }); + res.status(400).json({ success: false }); } function populateUserData(newProject) { diff --git a/server/models/project.js b/server/models/project.js index 98f83d92..3581e998 100644 --- a/server/models/project.js +++ b/server/models/project.js @@ -29,7 +29,7 @@ fileSchema.set('toJSON', { const projectSchema = new Schema( { - name: { type: String, default: "Hello p5.js, it's the server", maxlength: 256 }, + name: { type: String, default: "Hello p5.js, it's the server", maxlength: 128 }, user: { type: Schema.Types.ObjectId, ref: 'User' }, serveSecure: { type: Boolean, default: false }, files: { type: [fileSchema] },