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
e3c8c0ec
Commit
e3c8c0ec
authored
Jan 15, 2022
by
Inès Yeterian
Browse files
Options
Downloads
Patches
Plain Diff
trying
parent
6c0795ac
No related branches found
No related tags found
1 merge request
!4
Url/year/title
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
backend/routes/routesToucan.js
+21
-6
21 additions, 6 deletions
backend/routes/routesToucan.js
backend/utils/schema.js
+9
-1
9 additions, 1 deletion
backend/utils/schema.js
with
30 additions
and
7 deletions
backend/routes/routesToucan.js
+
21
−
6
View file @
e3c8c0ec
...
...
@@ -3,13 +3,27 @@ var fs = require("fs");
var
path
=
require
(
"
path
"
);
var
{
celebrate
}
=
require
(
"
celebrate
"
);
var
{
newToucan
,
validId
,
validGet
,
validTitle
}
=
require
(
"
../utils/schema
"
);
var
{
newToucan
,
validId
,
validGet
,
validTitle
,
validURL
}
=
require
(
"
../utils/schema
"
);
var
env
=
require
(
"
../.env
"
);
var
isLogged
=
require
(
"
../utils/authentification
"
);
var
upload
=
require
(
"
../utils/fileSaver
"
);
var
Toucan
=
require
(
"
../models/modelToucan
"
);
var
router
=
express
.
Router
();
let
urltoucans
=
Toucan
.
aggregate
([
{
$addFields
:
{
titlelc
:
{
$split
:
[{
$toLower
:
"
$title
"
},
"
"
]}}},
{
$addFields
:{
year
:{
$dateToString
:
{
format
:
"
%Y
"
,
date
:
"
$date
"
}}}},
{
$addFields
:
{
titlelcnospace
:
{
$reduce
:
{
input
:
"
$titlelc
"
,
initialValue
:
""
,
in
:
{
$concat
:
[
"
$$value
"
,
"
$$this
"
]}}}
}},
{
$addFields
:
{
urlId
:
{
$concat
:[
"
$titlelcnospace
"
,
"
-
"
,
"
$year
"
]}}},
{
$unset
:[
"
titlelc
"
,
"
year
"
,
"
titlelcnospace
"
,
"
title
"
,
"
date
"
]},
]);
router
.
route
(
"
/toucans
"
)
/**
* Une route qui renvoie un json avec tous les toucans, si limit est défini et vaut n, on renvoie les n derniers toucans
...
...
@@ -124,14 +138,15 @@ router.route("/img/:id")
}
});
router
.
route
(
"
/pdf/:
title
"
)
.
get
(
celebrate
({
params
:
valid
Title
}),
function
(
req
,
res
)
{
T
oucan
.
findOne
({
title
:
req
.
params
.
title
},
(
err
,
data
)
=>
{
router
.
route
(
"
/pdf/:
url
"
)
.
get
(
celebrate
({
params
:
valid
URL
}),
function
(
req
,
res
)
{
urlt
oucan
s
.
findOne
({
urlID
:
req
.
params
.
url
},
(
err
,
data
)
=>
{
if
(
err
)
{
res
.
end
(
500
);
return
;
}
else
if
(
!
data
)
{
res
.
status
(
404
).
send
(
"
Toucan non trouvée
"
);
}
else
if
(
!
data
)
{
res
.
status
(
404
).
send
(
"
Toucan non trouvé
"
);
return
;
}
const
id
=
data
.
_id
;
...
...
This diff is collapsed.
Click to expand it.
backend/utils/schema.js
+
9
−
1
View file @
e3c8c0ec
...
...
@@ -13,11 +13,19 @@ var validTitle = Joi.object({
.
regex
(
/^
[
a-zA-Z0-9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ._
\s
'-
]{1,60}
$/
)
//Autorise la plupart des acents
.
required
(),
});
var
validId
=
Joi
.
object
({
id
:
Joi
.
string
().
hex
().
length
(
24
).
required
()});
var
validGet
=
Joi
.
object
({
limit
:
Joi
.
number
().
integer
(),
before
:
Joi
.
date
().
timestamp
(),
after
:
Joi
.
date
().
timestamp
()
});
module
.
exports
=
{
newToucan
,
validTitle
,
validId
,
validGet
};
\ No newline at end of file
var
validURL
=
Joi
.
object
({
title
:
Joi
.
string
()
.
regex
(
/^
[
a-z0-9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœ._'-
]{1,60}\d{4}
$/
)
//
.
required
(),
});
module
.
exports
=
{
newToucan
,
validTitle
,
validId
,
validURL
,
validGet
};
\ No newline at end of file
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