-
Notifications
You must be signed in to change notification settings - Fork 320
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
Kajol-Kumari
merged 4 commits into
HITK-TECH-Community:main
from
shivamgaur99:fix/issue-1021
Jun 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2921fcb
Refactor Resource Form: Create new broadcast upon successful resource…
shivamgaur99 71623f5
Refactor Resource Form: Create new broadcast upon successful resource…
shivamgaur99 7390933
Refactor Resource Form: Create new broadcast upon successful resource…
shivamgaur99 b9363dd
Refactor Resource Form: Create new broadcast upon successful resource…
shivamgaur99 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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({ | ||
// 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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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(); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also removing it from the admin dashboard as we are managing all resources in broadcast section
There was a problem hiding this comment.
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