feature: Add project conclusion progression; code: some code refactor

Author: DBarbosaDev

api/controllers/projects.controller.js

@@ -89,13 +89,13 @@ const getProjectTasks = async (req, res) => {
     const projectId = req.params.id;
 
     try {
-        const project = await projectsService.getProjectTasks(userId, projectId, req.body);
+        const projectTasks = await projectsService.getProjectTasks(userId, projectId, req.body);
 
-        if (!project) {
+        if (!projectTasks) {
             return expressResponsesKit.sendError(res, { code: ERROR_CODES_CONSTANTS.PROJECT_NOT_FOUND });
         }
 
-        return expressResponsesKit.sendSuccess(res, project.refTasks || []);
+        return expressResponsesKit.sendSuccess(res, projectTasks || []);
     }
     catch (error) {
         const stackTrace = {};

api/services/projects.service.js

@@ -1,24 +1,25 @@
 const { ERROR_CODES_CONSTANTS } = require('../../framework');
 const ProjectModel = require('../models/projects.model');
 
-const getProjectElementsFiltered = (project) => ({
+const getProjectDetails = (project) => ({
     _id: project._id,
     name: project.name,
-    refTasks: project.refTasks
+    totalTasks: project.refTasks.length,
+    totalFinishedTasks: project.refTasks.filter((task) => task.finishDate).length
 });
 
 const addProject = async (userId, dataObject) => {
     const { name } = dataObject;
 
     const createdProject = await ProjectModel.addProject(userId, { name });
 
-    return getProjectElementsFiltered(createdProject);
+    return getProjectDetails(createdProject);
 };
 
 const getProjects = async (userId) => {
     const projectsList = await ProjectModel.getUserProjects(userId);
 
-    return projectsList.map((project) => getProjectElementsFiltered(project));
+    return projectsList.map((project) => getProjectDetails(project));
 };
 
 const updateProject = async (userId, projectId, dataObject) => {
@@ -38,7 +39,7 @@ const deleteProject = async (userId, projectId) => {
 const getProjectTasks = async (userId, projectId) => {
     const project = await ProjectModel.getUserProject(userId, projectId);
 
-    return project;
+    return project ? project.refTasks : null;
 };
 
 const addProjectTask = async (userId, projectId, dataObject) => {

frontend/directives/project/project.template.html

@@ -1,8 +1,8 @@
 <div flex="100" layout="row" layout-align="space-between center">
     <div flex="100" layout="row" layout-align="start center">
         <md-progress-circular class="progress-circular-indicator" flex="none" md-diameter="55" md-mode="determinate" value="100"></md-progress-circular>
-        <md-progress-circular class="md-avatar" flex="none" md-diameter="55" md-mode="determinate" value="0"></md-progress-circular>
-        <h5 class="progress-circular-text">0%</h5>
+        <md-progress-circular class="md-avatar" flex="none" md-diameter="55" md-mode="determinate" value="{{data.getConclusionPercentage()}}"></md-progress-circular>
+        <h5 class="progress-circular-text">{{data.getConclusionPercentage()}}%</h5>
         <p>{{data.name}}</p>
     </div>
     <div flex="none" layout="row" layout-align="center center">

frontend/models/Project.model.js

@@ -2,10 +2,20 @@
     angular.module('TaskifyApp').service('ProjectModel', ProjectModel);
 
     function ProjectModel() {
-        return function (data = {}) {
+        function Model(data = {}) {
             this.id = data._id;
             this.name = data.name;
             this.tasks = data.refTasks;
+            this.totalFinishedTasks = data.totalFinishedTasks;
+            this.totalTasks = data.totalTasks;
+        }
+
+        Model.prototype = {
+            getConclusionPercentage() {
+                return Math.floor((this.totalFinishedTasks / this.totalTasks) * 100);
+            }
         };
+
+        return Model;
     }
 }());

frontend/views/projects/projects.controller.js

@@ -85,7 +85,9 @@
                     return ProjectsService.createProjectTask((self.selectedProject || {}).id, description)
                         .then((result) => {
                             self.tasksList.push(new TaskModel(result.data.data));
-                            UtilsService.sendToast('Task Criada!');
+                            self.selectedProject.totalTasks += 1;
+
+                            UtilsService.sendToast('Tarefa Criada!');
                         })
                         .catch(() => UtilsService.sendToast('Error on task creation'));
                 });
@@ -103,6 +105,8 @@
             ProjectsService.updateProjectTask(self.selectedProject.id, taskData.id, { isFinished: taskData.isFinished })
                 .then(() => {
                     taskData.isDisabled = false;
+
+                    self.selectedProject.totalFinishedTasks += taskData.isFinished ? 1 : -1;
                 })
                 .catch(() => {
                     taskData.isDisabled = false;