Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Resource Form: Create new broadcast upon successful resource form submission #1031

Merged
merged 4 commits into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions backend/app/routes/resources/@validationSchema/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
const Joi = require('joi');

const ResourcesValidationSchema = Joi.object().keys({
name: Joi.string().trim().required().min(3),
email: Joi.string().trim().email().required(),
url: Joi.string().trim().required().min(10),
description: Joi.string().trim().required().min(5),
trustLevel: Joi.number().integer().required(),
expiryDate: Joi.date().required(),
additionalInfo: Joi.string().trim().min(5),
// const ResourcesValidationSchema = Joi.object().keys({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove the commented code as it won't be needed anymore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, also, we don't need resource model as we are using brodcast model and previous backend code addresource, get resource , deleteResource: should i remove it or skip that?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove it as it will just redundant code after this change

Copy link
Contributor Author

@shivamgaur99 shivamgaur99 Jun 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

also removing it from the admin dashboard as we are managing all resources in broadcast section

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, that should be fine

// name: Joi.string().trim().required().min(3),
// email: Joi.string().trim().email().required(),
// url: Joi.string().trim().required().min(10),
// description: Joi.string().trim().required().min(5),
// trustLevel: Joi.number().integer().required(),
// expiryDate: Joi.date().required(),
// additionalInfo: Joi.string().trim().min(5),
// });

// module.exports = ResourcesValidationSchema;


const postResourceValidationSchema = Joi.object().keys({
title: Joi.string().required(),
content: Joi.string().required(),
link: Joi.string().uri().required(),
expiresOn: Joi.date()
.min(new Date(new Date() - 100000))
.required(),
imageUrl: Joi.array().min(1).items(Joi.string().uri()).required(),
tags: Joi.array().min(1).items(Joi.string()).required(),
});

module.exports = ResourcesValidationSchema;
module.exports = postResourceValidationSchema;
9 changes: 4 additions & 5 deletions backend/app/routes/resources/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
const router = require('express').Router({ mergeParams: true });
const addaResource = require('./addResource');
const postResource = require('./postResource');
const deleteResource = require('./deleteResource');
const getResource = require('./getResource');
const validation = require('../../../helpers/middlewares/validation');
const ResourcesValidationSchema = require('./@validationSchema');
const postResourceValidationSchema = require('./@validationSchema');
const { authMiddleware } = require('../../../helpers/middlewares/auth');

router.post('/', validation(ResourcesValidationSchema), addaResource);

// Route for deleting a resource
// adding resouce in broadcast schema
router.post('/', validation(postResourceValidationSchema), postResource);
router.delete('/deleteResource', deleteResource);
router.get('/getresources', authMiddleware, getResource);
module.exports = router;
21 changes: 21 additions & 0 deletions backend/app/routes/resources/postResource.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const to = require('await-to-js').default;
const Broadcast = require('../../models/Broadcast');
const { ErrorHandler } = require('../../../helpers/error');
const constants = require('../../../constants');

module.exports = async (req, res, next) => {
const [err, { _id }] = await to(Broadcast.create({ ...req.body }));
if (err) {
const error = new ErrorHandler(constants.ERRORS.DATABASE, {
statusCode: 500,
message: 'Mongo Error: Insertion Failed',
errStack: err,
});
return next(error);
}
res.status(200).send({
message: 'Resource added successfully',
id: _id,
});
return next();
};
3 changes: 2 additions & 1 deletion frontend/src/common/constants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const POST_SUCCUSS = "Successfully Post data!";
const POST_SUCCESS = "Successfully Post data!";
const POST_FAIL = "Unable to post data!";
const GET_SUCCESS = "Successfully get data!";
const GET_FAIL = "Unable to get data!";
Expand All @@ -7,4 +8,4 @@ const PATCH_FAIL = "Unable to Update data!";
const DELETE_SUCCESS = "Successfully Delete data!";
const DELETE_FAIL = "Unable to delete data!";

export { POST_SUCCUSS, POST_FAIL, GET_SUCCESS, GET_FAIL, PATCH_SUCCESS, PATCH_FAIL, DELETE_SUCCESS, DELETE_FAIL };
export { POST_SUCCUSS, POST_SUCCESS, POST_FAIL, GET_SUCCESS, GET_FAIL, PATCH_SUCCESS, PATCH_FAIL, DELETE_SUCCESS, DELETE_FAIL };
Loading
Loading