Skip to content

Commit 0594732

Browse files
Merge pull request #724 from PierreBrisorgueil/master
refactor(tasks, users): rework data provacy management example ♻️
2 parents 755804a + 0b281ca commit 0594732

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

modules/tasks/repositories/tasks.repository.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@ const Task = mongoose.model('Task');
99
* @desc Function to get all task in db
1010
* @return {Array} All tasks
1111
*/
12-
exports.list = () => Task.find().sort('-createdAt').exec();
13-
14-
/**
15-
* @desc Function to get all task of one user in db
16-
* @return {Array} All tasks
17-
*/
18-
exports.userlist = (user) => Task.find({ user: user._id }).sort('-createdAt').exec();
12+
exports.list = (filter) => Task.find(filter).sort('-createdAt').exec();
1913

2014
/**
2115
* @desc Function to create a task in db
@@ -53,4 +47,6 @@ exports.delete = (task) => Task.deleteOne({ _id: task.id }).exec();
5347
* @param {Object} task
5448
* @return {Object} confirmation of delete
5549
*/
56-
exports.userdelete = (user) => Task.deleteMany({ user: user._id }).exec();
50+
exports.deleteMany = (filter) => {
51+
if (filter) return Task.deleteMany(filter).exec();
52+
};

modules/tasks/services/tasks.data.service.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ const TasksRepository = require('../repositories/tasks.repository');
88
* @param {Object} user
99
* @return {Promise} user tasks
1010
*/
11-
exports.userList = async (user) => {
12-
const result = await TasksRepository.userlist(user);
11+
exports.list = async (user) => {
12+
const result = await TasksRepository.list({ user: user._id });
1313
return Promise.resolve(result);
1414
};
1515

@@ -18,7 +18,7 @@ exports.userList = async (user) => {
1818
* @param {Object} user
1919
* @return {Promise} confirmation of delete
2020
*/
21-
exports.userDelete = async (user) => {
22-
const result = await TasksRepository.userdelete(user);
21+
exports.delete = async (user) => {
22+
const result = await TasksRepository.deleteMany({ user: user._id });
2323
return Promise.resolve(result);
2424
};

modules/users/controllers/users.data.controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ exports.delete = async (req, res) => {
2121
try {
2222
const result = {
2323
user: await UserService.delete(req.user),
24-
tasks: await TaskDataService.userDelete(req.user),
24+
tasks: await TaskDataService.delete(req.user),
2525
};
2626
result.user.id = req.user.id;
2727
responses.success(res, 'user and his data were deleted')(result);
@@ -39,7 +39,7 @@ exports.get = async (req, res) => {
3939
try {
4040
const result = {
4141
user: await UserService.get(req.user),
42-
tasks: await TaskDataService.userList(req.user),
42+
tasks: await TaskDataService.list(req.user),
4343
};
4444
responses.success(res, 'user data')(result);
4545
} catch (err) {
@@ -56,7 +56,7 @@ exports.getMail = async (req, res) => {
5656
try {
5757
const result = {
5858
user: await UserService.get(req.user),
59-
tasks: await TaskDataService.userList(req.user),
59+
tasks: await TaskDataService.list(req.user),
6060
};
6161

6262
// send mail

0 commit comments

Comments
 (0)