diff --git a/modules/tasks/repositories/tasks.repository.js b/modules/tasks/repositories/tasks.repository.js
index 4a41ad07a..ceb637da1 100644
--- a/modules/tasks/repositories/tasks.repository.js
+++ b/modules/tasks/repositories/tasks.repository.js
@@ -9,13 +9,7 @@ const Task = mongoose.model('Task');
  * @desc Function to get all task in db
  * @return {Array} All tasks
  */
-exports.list = () => Task.find().sort('-createdAt').exec();
-
-/**
- * @desc Function to get all task of one user in db
- * @return {Array} All tasks
- */
-exports.userlist = (user) => Task.find({ user: user._id }).sort('-createdAt').exec();
+exports.list = (filter) => Task.find(filter).sort('-createdAt').exec();
 
 /**
  * @desc Function to create a task in db
@@ -53,4 +47,6 @@ exports.delete = (task) => Task.deleteOne({ _id: task.id }).exec();
  * @param {Object} task
  * @return {Object} confirmation of delete
  */
-exports.userdelete = (user) => Task.deleteMany({ user: user._id }).exec();
+exports.deleteMany = (filter) => {
+  if (filter) return Task.deleteMany(filter).exec();
+};
diff --git a/modules/tasks/services/tasks.data.service.js b/modules/tasks/services/tasks.data.service.js
index 4f7274b56..5564acb26 100644
--- a/modules/tasks/services/tasks.data.service.js
+++ b/modules/tasks/services/tasks.data.service.js
@@ -8,8 +8,8 @@ const TasksRepository = require('../repositories/tasks.repository');
  * @param {Object} user
  * @return {Promise} user tasks
  */
-exports.userList = async (user) => {
-  const result = await TasksRepository.userlist(user);
+exports.list = async (user) => {
+  const result = await TasksRepository.list({ user: user._id });
   return Promise.resolve(result);
 };
 
@@ -18,7 +18,7 @@ exports.userList = async (user) => {
  * @param {Object} user
  * @return {Promise} confirmation of delete
  */
-exports.userDelete = async (user) => {
-  const result = await TasksRepository.userdelete(user);
+exports.delete = async (user) => {
+  const result = await TasksRepository.deleteMany({ user: user._id });
   return Promise.resolve(result);
 };
diff --git a/modules/users/controllers/users.data.controller.js b/modules/users/controllers/users.data.controller.js
index 912557719..ae4791491 100644
--- a/modules/users/controllers/users.data.controller.js
+++ b/modules/users/controllers/users.data.controller.js
@@ -21,7 +21,7 @@ exports.delete = async (req, res) => {
   try {
     const result = {
       user: await UserService.delete(req.user),
-      tasks: await TaskDataService.userDelete(req.user),
+      tasks: await TaskDataService.delete(req.user),
     };
     result.user.id = req.user.id;
     responses.success(res, 'user and his data were deleted')(result);
@@ -39,7 +39,7 @@ exports.get = async (req, res) => {
   try {
     const result = {
       user: await UserService.get(req.user),
-      tasks: await TaskDataService.userList(req.user),
+      tasks: await TaskDataService.list(req.user),
     };
     responses.success(res, 'user data')(result);
   } catch (err) {
@@ -56,7 +56,7 @@ exports.getMail = async (req, res) => {
   try {
     const result = {
       user: await UserService.get(req.user),
-      tasks: await TaskDataService.userList(req.user),
+      tasks: await TaskDataService.list(req.user),
     };
 
     // send mail