Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CaCaoCritics
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
Bilel El Yaagoubi
CaCaoCritics
Commits
8b463bc8
Commit
8b463bc8
authored
3 years ago
by
Bilel El Yaagoubi
Browse files
Options
Downloads
Plain Diff
Merge branch 'keywords' into 'master'
Add keywords, main_actor and director See merge request
!16
parents
8e92863c
83d74ba7
Branches
Branches containing commit
No related tags found
1 merge request
!16
Add keywords, main_actor and director
Pipeline
#42582
passed
3 years ago
Stage: lint
Stage: build
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
backend/models/movie.js
+3
-1
3 additions, 1 deletion
backend/models/movie.js
backend/package-lock.json
+108
-0
108 additions, 0 deletions
backend/package-lock.json
backend/package.json
+1
-0
1 addition, 0 deletions
backend/package.json
backend/populate.js
+16
-2
16 additions, 2 deletions
backend/populate.js
with
128 additions
and
3 deletions
backend/models/movie.js
+
3
−
1
View file @
8b463bc8
...
@@ -16,7 +16,9 @@ const MovieSchema = new mongoose.Schema(
...
@@ -16,7 +16,9 @@ const MovieSchema = new mongoose.Schema(
video
:
{
type
:
Boolean
},
video
:
{
type
:
Boolean
},
vote_average
:
{
type
:
Number
},
vote_average
:
{
type
:
Number
},
vote_count
:
{
type
:
Number
},
vote_count
:
{
type
:
Number
},
cast
:
{
type
:
Array
},
director
:
{
type
:
String
},
main_actor
:
{
type
:
String
},
keywords
:
{
type
:
Array
},
},
},
{
{
toJSON
:
{
virtuals
:
true
},
// So `res.json()` and other `JSON.stringify()` functions include virtuals
toJSON
:
{
virtuals
:
true
},
// So `res.json()` and other `JSON.stringify()` functions include virtuals
...
...
This diff is collapsed.
Click to expand it.
backend/package-lock.json
+
108
−
0
View file @
8b463bc8
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
"name"
:
"centrale-ei-web-backend"
,
"name"
:
"centrale-ei-web-backend"
,
"version"
:
"0.1.0"
,
"version"
:
"0.1.0"
,
"dependencies"
:
{
"dependencies"
:
{
"axios"
:
"^0.27.2"
,
"cors"
:
"^2.8.5"
,
"cors"
:
"^2.8.5"
,
"dotenv-cli"
:
"^5.1.0"
,
"dotenv-cli"
:
"^5.1.0"
,
"express"
:
"^4.18.1"
,
"express"
:
"^4.18.1"
,
...
@@ -214,6 +215,20 @@
...
@@ -214,6 +215,20 @@
"resolved"
:
"https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
,
"integrity"
:
"sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
"integrity"
:
"sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
},
},
"node_modules/asynckit"
:
{
"version"
:
"0.4.0"
,
"resolved"
:
"https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
,
"integrity"
:
"sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"node_modules/axios"
:
{
"version"
:
"0.27.2"
,
"resolved"
:
"https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
,
"integrity"
:
"sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="
,
"dependencies"
:
{
"follow-redirects"
:
"^1.14.9"
,
"form-data"
:
"^4.0.0"
}
},
"node_modules/balanced-match"
:
{
"node_modules/balanced-match"
:
{
"version"
:
"1.0.2"
,
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
,
"resolved"
:
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
,
...
@@ -561,6 +576,17 @@
...
@@ -561,6 +576,17 @@
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
"dev"
:
true
},
},
"node_modules/combined-stream"
:
{
"version"
:
"1.0.8"
,
"resolved"
:
"https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
,
"integrity"
:
"sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
,
"dependencies"
:
{
"delayed-stream"
:
"~1.0.0"
},
"engines"
:
{
"node"
:
">= 0.8"
}
},
"node_modules/concat-map"
:
{
"node_modules/concat-map"
:
{
"version"
:
"0.0.1"
,
"version"
:
"0.0.1"
,
"resolved"
:
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
,
...
@@ -699,6 +725,14 @@
...
@@ -699,6 +725,14 @@
"integrity"
:
"sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
,
"integrity"
:
"sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
,
"dev"
:
true
"dev"
:
true
},
},
"node_modules/delayed-stream"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
,
"integrity"
:
"sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
,
"engines"
:
{
"node"
:
">=0.4.0"
}
},
"node_modules/denque"
:
{
"node_modules/denque"
:
{
"version"
:
"2.0.1"
,
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"
,
...
@@ -1187,6 +1221,38 @@
...
@@ -1187,6 +1221,38 @@
"integrity"
:
"sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
,
"integrity"
:
"sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
,
"dev"
:
true
"dev"
:
true
},
},
"node_modules/follow-redirects"
:
{
"version"
:
"1.15.1"
,
"resolved"
:
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"
,
"integrity"
:
"sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
,
"funding"
:
[
{
"type"
:
"individual"
,
"url"
:
"https://github.com/sponsors/RubenVerborgh"
}
],
"engines"
:
{
"node"
:
">=4.0"
},
"peerDependenciesMeta"
:
{
"debug"
:
{
"optional"
:
true
}
}
},
"node_modules/form-data"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
,
"integrity"
:
"sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="
,
"dependencies"
:
{
"asynckit"
:
"^0.4.0"
,
"combined-stream"
:
"^1.0.8"
,
"mime-types"
:
"^2.1.12"
},
"engines"
:
{
"node"
:
">= 6"
}
},
"node_modules/forwarded"
:
{
"node_modules/forwarded"
:
{
"version"
:
"0.2.0"
,
"version"
:
"0.2.0"
,
"resolved"
:
"https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
,
...
@@ -3197,6 +3263,20 @@
...
@@ -3197,6 +3263,20 @@
"resolved"
:
"https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
,
"integrity"
:
"sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
"integrity"
:
"sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
},
},
"asynckit"
:
{
"version"
:
"0.4.0"
,
"resolved"
:
"https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
,
"integrity"
:
"sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"axios"
:
{
"version"
:
"0.27.2"
,
"resolved"
:
"https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
,
"integrity"
:
"sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="
,
"requires"
:
{
"follow-redirects"
:
"^1.14.9"
,
"form-data"
:
"^4.0.0"
}
},
"balanced-match"
:
{
"balanced-match"
:
{
"version"
:
"1.0.2"
,
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
,
"resolved"
:
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
,
...
@@ -3446,6 +3526,14 @@
...
@@ -3446,6 +3526,14 @@
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
"dev"
:
true
},
},
"combined-stream"
:
{
"version"
:
"1.0.8"
,
"resolved"
:
"https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
,
"integrity"
:
"sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
,
"requires"
:
{
"delayed-stream"
:
"~1.0.0"
}
},
"concat-map"
:
{
"concat-map"
:
{
"version"
:
"0.0.1"
,
"version"
:
"0.0.1"
,
"resolved"
:
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
,
...
@@ -3549,6 +3637,11 @@
...
@@ -3549,6 +3637,11 @@
"integrity"
:
"sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
,
"integrity"
:
"sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
,
"dev"
:
true
"dev"
:
true
},
},
"delayed-stream"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
,
"integrity"
:
"sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
},
"denque"
:
{
"denque"
:
{
"version"
:
"2.0.1"
,
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"
,
...
@@ -3929,6 +4022,21 @@
...
@@ -3929,6 +4022,21 @@
"integrity"
:
"sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
,
"integrity"
:
"sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
,
"dev"
:
true
"dev"
:
true
},
},
"follow-redirects"
:
{
"version"
:
"1.15.1"
,
"resolved"
:
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"
,
"integrity"
:
"sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
},
"form-data"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
,
"integrity"
:
"sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="
,
"requires"
:
{
"asynckit"
:
"^0.4.0"
,
"combined-stream"
:
"^1.0.8"
,
"mime-types"
:
"^2.1.12"
}
},
"forwarded"
:
{
"forwarded"
:
{
"version"
:
"0.2.0"
,
"version"
:
"0.2.0"
,
"resolved"
:
"https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
,
...
...
This diff is collapsed.
Click to expand it.
backend/package.json
+
1
−
0
View file @
8b463bc8
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
"format"
:
"eslint . --fix"
"format"
:
"eslint . --fix"
},
},
"dependencies"
:
{
"dependencies"
:
{
"axios"
:
"^0.27.2"
,
"cors"
:
"^2.8.5"
,
"cors"
:
"^2.8.5"
,
"dotenv-cli"
:
"^5.1.0"
,
"dotenv-cli"
:
"^5.1.0"
,
"express"
:
"^4.18.1"
,
"express"
:
"^4.18.1"
,
...
...
This diff is collapsed.
Click to expand it.
backend/populate.js
+
16
−
2
View file @
8b463bc8
...
@@ -28,6 +28,18 @@ async function populateMovies(movies) {
...
@@ -28,6 +28,18 @@ async function populateMovies(movies) {
movie
.
id
+
movie
.
id
+
`/credits?api_key=522d421671cf75c2cba341597d86403a`
`/credits?api_key=522d421671cf75c2cba341597d86403a`
);
);
const
keywordsFetch
=
await
axios
.
get
(
`https://api.themoviedb.org/3/movie/`
+
movie
.
id
+
`/keywords?api_key=522d421671cf75c2cba341597d86403a`
);
const
keywords
=
keywordsFetch
.
data
.
keywords
.
map
(
function
(
e
)
{
return
e
.
name
;
});
const
Director
=
castFetch
.
data
.
crew
.
filter
(
(
person
)
=>
person
.
job
==
"
Director
"
)[
0
].
name
;
const
mainActor
=
castFetch
.
data
.
cast
[
0
][
"
name
"
];
const
newMovie
=
await
new
MovieModel
({
const
newMovie
=
await
new
MovieModel
({
// Movie attributes
// Movie attributes
adult
:
movie
.
adult
,
adult
:
movie
.
adult
,
...
@@ -44,7 +56,9 @@ async function populateMovies(movies) {
...
@@ -44,7 +56,9 @@ async function populateMovies(movies) {
video
:
movie
.
video
,
video
:
movie
.
video
,
vote_average
:
movie
.
vote_average
,
vote_average
:
movie
.
vote_average
,
vote_count
:
movie
.
vote_count
,
vote_count
:
movie
.
vote_count
,
cast
:
castFetch
.
data
.
cast
,
director
:
Director
,
main_actor
:
mainActor
,
keywords
:
keywords
,
});
});
// Create a new movie instance
// Create a new movie instance
...
@@ -134,7 +148,7 @@ async function populate(N) {
...
@@ -134,7 +148,7 @@ async function populate(N) {
await
client
.
disconnect
();
await
client
.
disconnect
();
}
}
populate
(
300
)
populate
(
15
)
.
then
(()
=>
{
.
then
(()
=>
{
console
.
log
(
"
All done !
"
);
console
.
log
(
"
All done !
"
);
})
})
...
...
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