Skip to content
Snippets Groups Projects
Commit b6fb2df8 authored by vincent.steinman's avatar vincent.steinman Committed by michael.minelli
Browse files

fixed answer to submission but removed URL param

parent 2200cfae
Branches
Tags
No related merge requests found
Pipeline #32714 failed
import { Prisma, SubmissionTag } from '@prisma/client'; import { SubmissionTag } from '@prisma/client';
import db from '../helpers/DatabaseHelper'; import db from '../helpers/DatabaseHelper';
class TagSubmitManager { class TagSubmitManager {
......
...@@ -9,13 +9,6 @@ import SecurityCheckType from '../types/SecurityCheckType'; ...@@ -9,13 +9,6 @@ import SecurityCheckType from '../types/SecurityCheckType';
import SecurityMiddleware from '../middlewares/SecurityMiddleware'; import SecurityMiddleware from '../middlewares/SecurityMiddleware';
import ParamsValidatorMiddleware from '../middlewares/ParamsValidatorMiddleware'; import ParamsValidatorMiddleware from '../middlewares/ParamsValidatorMiddleware';
enum SubmitStatus{
PendingApproval,
Declined,
Approved
}
class TagRoutes implements RoutesManager { class TagRoutes implements RoutesManager {
private readonly tagsValidatorNameType: ExpressValidator.Schema = { private readonly tagsValidatorNameType: ExpressValidator.Schema = {
name: { name: {
...@@ -47,7 +40,7 @@ class TagRoutes implements RoutesManager { ...@@ -47,7 +40,7 @@ class TagRoutes implements RoutesManager {
backend.delete('/tags/:tageName', SecurityMiddleware.check(true, SecurityCheckType.ADMIN), this.deleteTag.bind(this)); backend.delete('/tags/:tageName', SecurityMiddleware.check(true, SecurityCheckType.ADMIN), this.deleteTag.bind(this));
backend.get('/tags/proposals/:state', SecurityMiddleware.check(true, SecurityCheckType.ADMIN), this.getSubmittedTag.bind(this)); backend.get('/tags/proposals/:state', SecurityMiddleware.check(true, SecurityCheckType.ADMIN), this.getSubmittedTag.bind(this));
backend.post('/tags/proposals', SecurityMiddleware.check(true, SecurityCheckType.TEACHING_STAFF), ParamsValidatorMiddleware.validate(this.tagsValidatorNameType), this.SubmitTag.bind(this)); backend.post('/tags/proposals', SecurityMiddleware.check(true, SecurityCheckType.TEACHING_STAFF), ParamsValidatorMiddleware.validate(this.tagsValidatorNameType), this.SubmitTag.bind(this));
backend.patch('/tags/proposals/:tagProposalName', SecurityMiddleware.check(true, SecurityCheckType.ADMIN), ParamsValidatorMiddleware.validate(this.tagsValidatorName), this.validateTag.bind(this)); backend.patch('/tags/proposals', SecurityMiddleware.check(true, SecurityCheckType.ADMIN), ParamsValidatorMiddleware.validate(this.tagsValidatorName), this.validateTag.bind(this));
} }
private async addTag(req: express.Request, res: express.Response) { private async addTag(req: express.Request, res: express.Response) {
...@@ -92,7 +85,6 @@ class TagRoutes implements RoutesManager { ...@@ -92,7 +85,6 @@ class TagRoutes implements RoutesManager {
private async SubmitTag(req: express.Request, res: express.Response) { private async SubmitTag(req: express.Request, res: express.Response) {
const tagName = req.body.name const tagName = req.body.name
const tagType = req.body.type const tagType = req.body.type
const tagState = req.body.state
db.submissionTag.upsert({ db.submissionTag.upsert({
where : { name: tagName }, where : { name: tagName },
...@@ -100,7 +92,7 @@ class TagRoutes implements RoutesManager { ...@@ -100,7 +92,7 @@ class TagRoutes implements RoutesManager {
create: { create: {
name : tagName, name : tagName,
type : tagType, type : tagType,
state : tagState state : "PendingApproval"
} }
}) })
...@@ -112,13 +104,13 @@ class TagRoutes implements RoutesManager { ...@@ -112,13 +104,13 @@ class TagRoutes implements RoutesManager {
private async validateTag(req: express.Request, res: express.Response) { private async validateTag(req: express.Request, res: express.Response) {
const state = req.body.state const state = req.body.state
if(state == SubmitStatus.PendingApproval){ if(state == "PendingApproval"){
return req.session.sendResponse(res, StatusCodes.OK, "Approbation toujours en attente"); return req.session.sendResponse(res, StatusCodes.OK, "Approbation toujours en attente");
} else if (state == SubmitStatus.Declined){ } else if (state == "Declined"){
const detail = req.body.details const detail = req.body.details
return req.session.sendResponse(res, StatusCodes.OK, detail); return req.session.sendResponse(res, StatusCodes.OK, detail);
} else{ } else{
const tagName = req.params.tagProposalName const tagName = req.body.tagProposalName
const tagType = req.body.type const tagType = req.body.type
db.tag.upsert({ db.tag.upsert({
where : { name: tagName }, where : { name: tagName },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment