Skip to content

Commit d9964c7

Browse files
DavidMorenooDavidMorenoo
authored
Merge pull request #56 from codeurjc-students/refactor-code-cleanup-and-format
Refactor code cleanup and format
2 parents 39eab6b + 541f500 commit d9964c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1660
-2042
lines changed

‎LogArtApp/backend/Seeders/dropDatabase.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ const dropDatabase = async () => {
1616
}
1717
};
1818

19-
module.exports = dropDatabase;
19+
module.exports = dropDatabase;

‎LogArtApp/backend/Seeders/seedAdmins.js

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,48 @@
1-
const mongoose = require('mongoose');
2-
const User = require('../models/user.model');
3-
const bcrypt = require('bcrypt');
1+
const mongoose = require("mongoose");
2+
const User = require("../models/user.model");
3+
const bcrypt = require("bcrypt");
44

55
const seedAdmins = async () => {
66
try {
77
const admins = [
88
{
9-
username: 'admin_one',
10-
password: 'admin123',
11-
email: '[email protected]',
12-
firstName: 'Admin',
13-
lastName: 'One',
14-
bio: 'Administrador principal.',
15-
role: 'admin',
9+
username: "admin_one",
10+
password: "admin123",
11+
email: "[email protected]",
12+
firstName: "Admin",
13+
lastName: "One",
14+
bio: "Administrador principal.",
15+
role: "admin",
1616
isVerified: true,
1717
verificationToken: null,
1818
},
1919
{
20-
username: 'admin_two',
21-
password: 'admin123',
22-
email: '[email protected]',
23-
firstName: 'Admin',
24-
lastName: 'Two',
25-
bio: 'Administrador secundario.',
26-
role: 'admin',
20+
username: "admin_two",
21+
password: "admin123",
22+
email: "[email protected]",
23+
firstName: "Admin",
24+
lastName: "Two",
25+
bio: "Administrador secundario.",
26+
role: "admin",
2727
isVerified: true,
2828
verificationToken: null,
2929
},
3030
];
31-
3231
for (const adminData of admins) {
3332
const exist = await User.findOne({ email: adminData.email });
3433
if (!exist) {
3534
const salt = await bcrypt.genSalt(10);
3635
const hashedPassword = await bcrypt.hash(adminData.password, salt);
3736
adminData.password = hashedPassword;
38-
3937
await User.create(adminData);
4038
console.log(`Admin created: ${adminData.email}`);
4139
} else {
4240
console.log(`Admin ${adminData.email} already exists`);
4341
}
4442
}
45-
console.log('Admins seeded successfully');
43+
console.log("Admins seeded successfully");
4644
} catch (error) {
47-
console.error('Error seeding admins:', error);
45+
console.error("Error seeding admins:", error);
4846
process.exit(1);
4947
}
5048
};

‎LogArtApp/backend/Seeders/seedComments.js

+37-32
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,84 @@
1-
const mongoose = require('mongoose');
2-
const Comment = require('../models/comment.model');
3-
const ObjectModel = require('../models/object.model');
4-
const User = require('../models/user.model');
1+
const mongoose = require("mongoose");
2+
const Comment = require("../models/comment.model");
3+
const ObjectModel = require("../models/object.model");
4+
const User = require("../models/user.model");
55

66
const seedComments = async () => {
77
try {
88
const objects = await ObjectModel.find({});
9-
const users = await User.find({ role: 'user' });
10-
const admins = await User.find({ role: 'admin' });
11-
9+
const users = await User.find({ role: "user" });
10+
const admins = await User.find({ role: "admin" });
1211
if (objects.length === 0 || users.length === 0 || admins.length === 0) {
13-
console.log('Ensure that objects and users are seeded before seeding comments.');
12+
console.log(
13+
"Ensure that objects and users are seeded before seeding comments."
14+
);
1415
return;
1516
}
16-
1717
const comments = [
1818
{
19-
content: '¡Me encantó este libro!',
20-
object: objects.find(o => o.name === 'Cien Años de Soledad')._id,
19+
content: "¡Me encantó este libro!",
20+
object: objects.find((o) => o.name === "Cien Años de Soledad")._id,
2121
user: users[0]._id,
2222
},
2323
{
24-
content: 'Bohemian Rhapsody es una obra maestra.',
25-
object: objects.find(o => o.name === 'Bohemian Rhapsody')._id,
24+
content: "Bohemian Rhapsody es una obra maestra.",
25+
object: objects.find((o) => o.name === "Bohemian Rhapsody")._id,
2626
user: users[1]._id,
2727
},
2828
{
29-
content: 'The Legend of Zelda siempre me ha fascinado.',
30-
object: objects.find(o => o.name === 'The Legend of Zelda')._id,
29+
content: "The Legend of Zelda siempre me ha fascinado.",
30+
object: objects.find((o) => o.name === "The Legend of Zelda")._id,
3131
user: users[0]._id,
3232
},
3333
{
34-
content: '¡Controla tu lenguage!',
35-
object: objects.find(o => o.name === 'The Legend of Zelda')._id,
34+
content: "¡Controla tu lenguage!",
35+
object: objects.find((o) => o.name === "The Legend of Zelda")._id,
3636
user: admins[0]._id,
3737
},
3838
{
39-
content: 'Intenta respetar las normas de la comunidad.',
40-
object: objects.find(o => o.name === 'Bohemian Rhapsody')._id,
39+
content: "Intenta respetar las normas de la comunidad.",
40+
object: objects.find((o) => o.name === "Bohemian Rhapsody")._id,
4141
user: admins[1]._id,
4242
},
4343
{
44-
content: '¡Perdón!',
45-
object: objects.find(o => o.name === 'The Legend of Zelda')._id,
44+
content: "¡Perdón!",
45+
object: objects.find((o) => o.name === "The Legend of Zelda")._id,
4646
user: users[0]._id,
4747
},
4848
{
49-
content: 'Este es un aviso para que no lo olvides.',
50-
object: objects.find(o => o.name === 'Cien Años de Soledad')._id,
49+
content: "Este es un aviso para que no lo olvides.",
50+
object: objects.find((o) => o.name === "Cien Años de Soledad")._id,
5151
user: admins[0]._id,
5252
},
5353
{
54-
content: '¡Soy admin, y me encanta este juego!',
55-
object: objects.find(o => o.name === 'The Legend of Zelda 2')._id,
54+
content: "¡Soy admin, y me encanta este juego!",
55+
object: objects.find((o) => o.name === "The Legend of Zelda 2")._id,
5656
user: admins[0]._id,
5757
},
5858
{
59-
content: '¡Me encantó este juego!',
60-
object: objects.find(o => o.name === 'The Legend of Zelda 3')._id,
59+
content: "¡Me encantó este juego!",
60+
object: objects.find((o) => o.name === "The Legend of Zelda 3")._id,
6161
user: admins[1]._id,
6262
},
6363
];
64-
6564
for (const commentData of comments) {
66-
const exist = await Comment.findOne({ content: commentData.content, object: commentData.object, user: commentData.user });
65+
const exist = await Comment.findOne({
66+
content: commentData.content,
67+
object: commentData.object,
68+
user: commentData.user,
69+
});
6770
if (!exist) {
6871
await Comment.create(commentData);
6972
console.log(`Comment created for object ID: ${commentData.object}`);
7073
} else {
71-
console.log(`Comment for object ID: ${commentData.object} already exists`);
74+
console.log(
75+
`Comment for object ID: ${commentData.object} already exists`
76+
);
7277
}
7378
}
74-
console.log('Comments seeded successfully');
79+
console.log("Comments seeded successfully");
7580
} catch (error) {
76-
console.error('Error seeding comments:', error);
81+
console.error("Error seeding comments:", error);
7782
process.exit(1);
7883
}
7984
};

‎LogArtApp/backend/Seeders/seedDB.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
const mongoose = require('mongoose');
2-
3-
const seedDisciplines = require('./seedDisciplines');
4-
const seedUsers = require('./seedUsers');
5-
const seedAdmins = require('./seedAdmins');
6-
const seedObjects = require('./seedObjects');
7-
const seedComments = require('./seedComments');
8-
const dropDatabase = require('./dropDatabase');
1+
const mongoose = require("mongoose");
2+
const seedDisciplines = require("./seedDisciplines");
3+
const seedUsers = require("./seedUsers");
4+
const seedAdmins = require("./seedAdmins");
5+
const seedObjects = require("./seedObjects");
6+
const seedComments = require("./seedComments");
7+
const dropDatabase = require("./dropDatabase");
98

109
const seedDB = async () => {
1110
try {
@@ -15,9 +14,8 @@ const seedDB = async () => {
1514
await seedAdmins();
1615
await seedObjects();
1716
await seedComments();
18-
1917
} catch (error) {
20-
console.error('Error seeding the database:', error);
18+
console.error("Error seeding the database:", error);
2119
process.exit(1);
2220
}
2321
};

‎LogArtApp/backend/Seeders/seedDisciplines.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
const mongoose = require('mongoose');
2-
const Discipline = require('../models/discipline.model');
1+
const mongoose = require("mongoose");
2+
const Discipline = require("../models/discipline.model");
33

44
const seedDisciplines = async () => {
55
try {
66
const disciplines = [
7-
{ name: 'Libros', description: 'Libros que has leído' },
8-
{ name: 'Canciones', description: 'Canciones que has escuchado' },
9-
{ name: 'Videojuegos', description: 'Videojuegos que has jugado' },
7+
{ name: "Libros", description: "Libros que has leído" },
8+
{ name: "Canciones", description: "Canciones que has escuchado" },
9+
{ name: "Videojuegos", description: "Videojuegos que has jugado" },
1010
];
11-
1211
for (const discipline of disciplines) {
1312
const exist = await Discipline.findOne({ name: discipline.name });
1413
if (!exist) {
@@ -18,9 +17,9 @@ const seedDisciplines = async () => {
1817
console.log(`Discipline ${discipline.name} already exists`);
1918
}
2019
}
21-
console.log('Disciplines seeded successfully');
20+
console.log("Disciplines seeded successfully");
2221
} catch (error) {
23-
console.error('Error seeding disciplines:', error);
22+
console.error("Error seeding disciplines:", error);
2423
process.exit(1);
2524
}
2625
};

‎LogArtApp/backend/Seeders/seedObjects.js

+31-32
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,56 @@
1-
const mongoose = require('mongoose');
2-
const ObjectModel = require('../models/object.model');
3-
const Discipline = require('../models/discipline.model');
4-
const User = require('../models/user.model');
1+
const mongoose = require("mongoose");
2+
const ObjectModel = require("../models/object.model");
3+
const Discipline = require("../models/discipline.model");
4+
const User = require("../models/user.model");
55

66
const seedObjects = async () => {
77
try {
88
const disciplines = await Discipline.find({});
9-
const users = await User.find({ role: 'user' });
10-
const admins = await User.find({ role: 'admin' });
11-
9+
const users = await User.find({ role: "user" });
10+
const admins = await User.find({ role: "admin" });
1211
if (disciplines.length === 0 || users.length === 0) {
13-
console.log('Ensure that disciplines and users are seeded before seeding objects.');
12+
console.log(
13+
"Ensure that disciplines and users are seeded before seeding objects."
14+
);
1415
return;
1516
}
16-
1717
const objects = [
1818
{
19-
name: 'Cien Años de Soledad',
20-
description: 'Una novela clásica de Gabriel García Márquez.',
21-
imageUrl: 'public/images/objects/cien_años.jpg',
22-
discipline: disciplines.find(d => d.name === 'Libros')._id,
19+
name: "Cien Años de Soledad",
20+
description: "Una novela clásica de Gabriel García Márquez.",
21+
imageUrl: "public/images/objects/cien_años.jpg",
22+
discipline: disciplines.find((d) => d.name === "Libros")._id,
2323
createdBy: users[0]._id,
2424
},
2525
{
26-
name: 'Bohemian Rhapsody',
27-
description: 'Canción icónica de Queen.',
28-
imageUrl: 'public/images/objects/bohemian_rhapsody.jpg',
29-
discipline: disciplines.find(d => d.name === 'Canciones')._id,
26+
name: "Bohemian Rhapsody",
27+
description: "Canción icónica de Queen.",
28+
imageUrl: "public/images/objects/bohemian_rhapsody.jpg",
29+
discipline: disciplines.find((d) => d.name === "Canciones")._id,
3030
createdBy: users[1]._id,
3131
},
3232
{
33-
name: 'The Legend of Zelda',
34-
description: 'Un famoso videojuego de aventura.',
35-
imageUrl: 'public/images/objects/zelda.jpg',
36-
discipline: disciplines.find(d => d.name === 'Videojuegos')._id,
33+
name: "The Legend of Zelda",
34+
description: "Un famoso videojuego de aventura.",
35+
imageUrl: "public/images/objects/zelda.jpg",
36+
discipline: disciplines.find((d) => d.name === "Videojuegos")._id,
3737
createdBy: users[0]._id,
3838
},
3939
{
40-
name: 'The Legend of Zelda 2',
41-
description: 'Un famoso videojuego de aventura.',
42-
imageUrl: 'public/images/objects/zelda.jpg',
43-
discipline: disciplines.find(d => d.name === 'Videojuegos')._id,
40+
name: "The Legend of Zelda 2",
41+
description: "Un famoso videojuego de aventura.",
42+
imageUrl: "public/images/objects/zelda.jpg",
43+
discipline: disciplines.find((d) => d.name === "Videojuegos")._id,
4444
createdBy: admins[0]._id,
4545
},
4646
{
47-
name: 'The Legend of Zelda 3',
48-
description: 'Un famoso videojuego de aventura.',
49-
imageUrl: 'public/images/objects/zelda.jpg',
50-
discipline: disciplines.find(d => d.name === 'Videojuegos')._id,
47+
name: "The Legend of Zelda 3",
48+
description: "Un famoso videojuego de aventura.",
49+
imageUrl: "public/images/objects/zelda.jpg",
50+
discipline: disciplines.find((d) => d.name === "Videojuegos")._id,
5151
createdBy: admins[1]._id,
5252
},
5353
];
54-
5554
for (const objectData of objects) {
5655
const exist = await ObjectModel.findOne({ name: objectData.name });
5756
if (!exist) {
@@ -61,9 +60,9 @@ const seedObjects = async () => {
6160
console.log(`Object ${objectData.name} already exists`);
6261
}
6362
}
64-
console.log('Objects seeded successfully');
63+
console.log("Objects seeded successfully");
6564
} catch (error) {
66-
console.error('Error seeding objects:', error);
65+
console.error("Error seeding objects:", error);
6766
process.exit(1);
6867
}
6968
};

0 commit comments

Comments
 (0)