Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
API Toucan
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Damien Armillon
API Toucan
Commits
9e90ed6e
Commit
9e90ed6e
authored
6 years ago
by
Damien
Browse files
Options
Downloads
Patches
Plain Diff
Améliore la validation de création de toucan
parent
a1927779
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
backend/routes/routesToucan.js
+25
-22
25 additions, 22 deletions
backend/routes/routesToucan.js
backend/utils/schema.js
+3
-1
3 additions, 1 deletion
backend/utils/schema.js
with
28 additions
and
23 deletions
backend/routes/routesToucan.js
+
25
−
22
View file @
9e90ed6e
...
...
@@ -29,6 +29,9 @@ router.route("/toucans")
upload
.
fields
([{
name
:
"
toucan
"
,
maxCount
:
1
},
{
name
:
"
cover
"
,
maxCount
:
1
}]),
celebrate
({
body
:
newToucan
}),
function
(
req
,
res
)
{
if
(
req
.
files
.
length
!=
2
){
res
.
status
(
400
).
send
(
"
Il manque un fichier
"
);
}
else
{
var
toucan
=
new
Toucan
(
req
.
body
);
var
id
=
(
toucan
.
_id
).
toString
();
var
index
;
...
...
@@ -45,12 +48,12 @@ router.route("/toucans")
}
toucan
.
save
(
function
(
err
)
{
if
(
err
)
{
res
.
send
(
err
);
res
.
status
(
400
)
.
send
(
err
);
}
else
{
res
.
send
({
message
:
"
Toucan ajouté !
"
,
id
:
id
});
}
});
});
}
});
// Renvoie le pdf du toucan avec l'id donné
router
.
route
(
"
/pdf/:id
"
)
.
get
(
celebrate
({
params
:
validId
}),
function
(
req
,
res
)
{
...
...
@@ -84,7 +87,7 @@ router.route("/delete/:id")
Toucan
.
deleteOne
({
_id
:
req
.
params
.
id
},
function
(
err
)
{
if
(
err
)
{
res
.
send
(
err
);
res
.
send
(
500
).
send
(
err
);
}
else
{
// Si on a supprimée l'entrée, on supprime le pdf
var
pdfPath
=
path
.
format
({
dir
:
env
.
savedExtensions
[
1
].
path
,
...
...
@@ -93,7 +96,7 @@ router.route("/delete/:id")
});
fs
.
unlink
(
pdfPath
,
(
err
)
=>
{
if
(
err
)
{
res
.
send
(
err
);
res
.
status
(
500
).
send
(
err
);
}
else
{
// Si on a supprimé le pdf on supprime l'image
var
imgPath
=
path
.
join
(
env
.
savedExtensions
[
0
].
path
,
"
/
"
,
req
.
params
.
id
);
env
.
savedExtensions
[
0
].
extensions
.
forEach
(
ext
=>
{
...
...
@@ -101,7 +104,7 @@ router.route("/delete/:id")
imgPath
=
imgPath
+
ext
;
fs
.
unlink
(
imgPath
,
(
err
)
=>
{
if
(
err
)
{
res
.
send
(
err
);
res
.
status
(
500
).
send
(
err
);
}
else
{
res
.
send
(
"
Toucan supprimé
"
);
}
...
...
This diff is collapsed.
Click to expand it.
backend/utils/schema.js
+
3
−
1
View file @
9e90ed6e
var
{
Joi
}
=
require
(
"
celebrate
"
);
var
newToucan
=
Joi
.
object
({
title
:
Joi
.
string
().
alphanum
().
required
(),
title
:
Joi
.
string
()
.
regex
(
/^
[
a-zA-Z0-9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ._
\s
-
]{1,60}
$/
)
//Autorise la plupart des acents
.
required
(),
date
:
Joi
.
date
().
required
()
});
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment