Merge pull request #964 from Aditya3034/feat/delete-milestone

Feat(milestone-card):Added delete functionality
Worktez · Jun 19, 2023 · 8acaf9c · 8acaf9c
2 parents a67a986 + 8f9dd04
commit 8acaf9c
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 50 deletions.
diff --git a/functions/model/milestone/lib.js b/functions/model/milestone/lib.js
@@ -73,7 +73,7 @@ exports.getMilestoneData = function(orgDomain, milestoneId) {
  * @return {any}
  */
 exports.getAllMilestonesData = function(orgDomain, teamId="") {
-  let query = db.collection("Organizations").doc(orgDomain).collection("Milestones");
+  let query = db.collection("Organizations").doc(orgDomain).collection("Milestones").where("MilestoneStatus", "!=", "Deleted");
   if (teamId != "") {
     query = query.where("TeamId", "==", teamId);
   }

diff --git a/functions/model/milestone/milestone.js b/functions/model/milestone/milestone.js
@@ -22,6 +22,7 @@ const { getAllMilestones } = require("../milestone/tark/getAllMilestones");
 const { getMilestone } = require("../milestone/tark/getMilestone");
 const { editMilestone } = require("../milestone/tark/editMilestone");
 const { addTaskToMilestone } = require("../milestone/tark/addTask");
+const { deleteMilestone } = require("../milestone/tark/deleteMilestone");
 
 /**
  * Description
@@ -78,6 +79,17 @@ fastify.post("/addTask", (req, res) => {
   addTaskToMilestone(req, res);
 });
 
+/**
+ * Description
+ * @param {any} "/addTask"
+ * @param {any} req
+ * @param {any} res
+ * @returns {any}
+ */
+fastify.post("/deleteMilestone", (req, res) => {
+  deleteMilestone(req, res);
+});
+
 /**
  * Description
  * @param {any} req

diff --git a/functions/model/milestone/tark/deleteMilestone.js b/functions/model/milestone/tark/deleteMilestone.js
@@ -0,0 +1,52 @@
+/* eslint-disable linebreak-style */
+/* eslint-disable object-curly-spacing */
+/* eslint-disable eol-last */
+/* eslint-disable max-len */
+
+/** *********************************************************
+ * Copyright (C) 2022
+ * Worktez
+ * Author : Aditya Khedekar <aditya3034@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the MIT License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the MIT License for more details.
+ ***********************************************************/
+
+const { getMilestoneData, updateMilestone } = require("../lib");
+
+exports.deleteMilestone = function(request, response) {
+  const milestoneID = request.body.data.MilestoneId;
+  const orgDomain = request.body.data.OrganizationDomain;
+  let result;
+  let status = 200;
+
+  const promise = getMilestoneData(orgDomain, milestoneID).then((mDoc) => {
+    if (mDoc) {
+      const updateJson = {
+        MilestoneStatus: "Deleted",
+      };
+      updateMilestone(updateJson, orgDomain, milestoneID);
+      result = { data: "Milestone deleted Successfully" };
+      console.log("Milestone deleted Successfully");
+    } else {
+      status = 500;
+      result = { data: "Milestone: Milestone doesn't exist" };
+      console.log("Milestone: Milestone doesn't exist");
+    }
+  }).catch((error) => {
+    status = 500;
+    console.log("Error: ", error);
+  }); return Promise.all(promise).then(() => {
+    return response.status(status).send(result);
+  })
+      .catch((error) => {
+        result = { data: error };
+        console.error("Error deleting Milestone", error);
+        return response.status(status).send(result);
+      });
+};
diff --git a/src/app/body/milestone/milestone-card/milestone-card.component.css b/src/app/body/milestone/milestone-card/milestone-card.component.css
@@ -72,6 +72,7 @@
     width:1rem;
     height:1rem; 
     border-radius: 50px;
+    margin-top: 5px;
 }
 
 .milestone{

diff --git a/src/app/body/milestone/milestone-card/milestone-card.component.html b/src/app/body/milestone/milestone-card/milestone-card.component.html
@@ -11,57 +11,65 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the MIT License for more details.
  ***********************************************************/ -->
-    <div class="card p-3" (click)="getMilestoneDetails(milestone.MilestoneId)">
-      <div class="milestone d-flex justify-content-between">
-        <span class="heading py-2" >
-          <span class="headId px-2">
-            {{milestone.MilestoneId}}
-          </span>
-          <span>
-            {{milestone.Title}}
-          </span>
-        </span>
-        <div id="milColor" [ngStyle]="{'background-color': color}"></div>
+<div class="card p-3" id="milestoneCard" *ngIf="milestone.MilestoneStatus != 'Deleted'">
+  <div class="milestone d-flex justify-content-between">
+    <span class="heading py-2">
+      <span class="headId px-2">
+        {{milestone.MilestoneId}}
+      </span>
+      <span>
+        {{milestone.Title}}
+      </span>
+    </span>
+    <div id="milColor" [ngStyle]="{'background-color': color}"></div>
+    <div class="col">
+      <mat-icon fontSet="material-icons-outlined" class="align-middle" title="Delete Milestone" type="button"
+        (click)="deleteMilestone(milestone.MilestoneId)">
+        delete
+      </mat-icon>
+    </div>
+  </div>
+  <div (click)="getMilestoneDetails(milestone.MilestoneId)">
+    <div class="row py-2">
+      <div class="col">
+        <mat-icon fontSet="material-icons-outlined" class="align-middle mr-2">
+          toc
+        </mat-icon>
+        <span class="align-middle"> {{milestone.Description}}</span>
       </div>
-      <div class="row py-2">
-        <div class="col">
-            <mat-icon fontSet="material-icons-outlined" class="align-middle mr-2">
-              toc
-            </mat-icon>
-            <span class="align-middle"> {{milestone.Description}}</span>
-        </div>
+    </div>
+    <div class="row py-2">
+      <div class="col-md-3 col-4">
+        <span class="teamId">
+          <mat-icon fontSet="material-icons-outlined" class="align-middle mr-2">
+            groups_3
+          </mat-icon><span class="align-middle ">{{milestone.TeamId}}</span>
+        </span>
       </div>
-      <div class="row py-2">
-        <div class="col-md-3 col-4">
-          <span class="teamId">
-            <mat-icon fontSet="material-icons-outlined" class="align-middle mr-2">
-              groups_3
-            </mat-icon><span class="align-middle ">{{milestone.TeamId}}</span>
-          </span>
-        </div>
-        <div class="col-md-9 col-8">
-          <span class="teamId">
-            Status:<span> {{milestone.MilestoneStatus}}</span>
-          </span>
-        </div>
+      <div class="col-md-9 col-8">
+        <span class="teamId">
+          Status:<span> {{milestone.MilestoneStatus}}</span>
+        </span>
       </div>
-      <div class="row py-2">
-        <div class="col"id="dateAlign">
-          <span type="button" class="btn align-bottom p-0 m-0" id="StartDate">
-              <mat-icon fontSet="material-icons-outlined" class="align-middle">
-                date_range
-              </mat-icon>
-              Start Date: <span id="sprintStartDate">{{ milestone.StartDate }}</span> 
-          </span>
-        </div>
+    </div>
+    <div class="row py-2">
+      <div class="col" id="dateAlign">
+        <span type="button" class="btn align-bottom p-0 m-0" id="StartDate">
+          <mat-icon fontSet="material-icons-outlined" class="align-middle">
+            date_range
+          </mat-icon>
+          Start Date: <span id="sprintStartDate">{{ milestone.StartDate }}</span>
+        </span>
       </div>
-      <div class="row py-2">
-        <div class="col"id="dateAlign">
-          <span type="button" class="btn align-bottom p-0 m-0" id="EndDate">
-            <mat-icon fontSet="material-icons-outlined" class="align-middle">date_range
-            </mat-icon>
-            End Date: <span id="sprintStartDate">{{ milestone.EndDate }}</span> 
+    </div>
+    <div class="row py-2">
+      <div class="col"id="dateAlign">
+        <span type="button" class="btn align-bottom p-0 m-0" id="EndDate">
+          <mat-icon fontSet="material-icons-outlined" class="align-middle">date_range
+          </mat-icon>
+          End Date: <span id="sprintStartDate">{{ milestone.EndDate }}</span>
         </span>
-        </div>
       </div>
     </div>
+  </div>
+</div>
diff --git a/src/app/body/milestone/milestone-card/milestone-card.component.ts b/src/app/body/milestone/milestone-card/milestone-card.component.ts
@@ -12,8 +12,11 @@
  * See the MIT License for more details.
  ***********************************************************/
 import { Component, Input, OnInit } from '@angular/core';
+import { AngularFireFunctions } from '@angular/fire/compat/functions';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Milestones } from 'src/app/Interface/MilestoneInterface';
+import { BackendService } from 'src/app/services/backend/backend.service';
+import { ErrorHandlerService } from 'src/app/services/error-handler/error-handler.service';
 
 @Component({
   selector: 'app-milestone-card',
@@ -23,9 +26,9 @@ import { Milestones } from 'src/app/Interface/MilestoneInterface';
 export class MilestoneCardComponent implements OnInit {
 
   @Input("milestone") milestone:Milestones
-  constructor( private router: Router) { }
+  constructor( private router: Router, private backendService: BackendService,  private functions: AngularFireFunctions,  public errorHandlerService: ErrorHandlerService) { }
   color: string;
-  ngOnInit(): void {
+  ngOnInit(): void {     
     this.color="#"+this.milestone.ColorCode;
     if(this.milestone.ColorCode==null || this.milestone.ColorCode==""){
       this.color="#ffffff"
@@ -36,4 +39,20 @@ export class MilestoneCardComponent implements OnInit {
     this.router.navigate(['MilestoneDetails/', milestoneId]);
   }
 
+  deleteMilestone(milestoneId: string) {
+    const mId = milestoneId;
+    const orgDomain = this.backendService.getOrganizationDomain();
+    const callable = this.functions.httpsCallable('milestone/deleteMilestone');
+
+    callable({OrganizationDomain: orgDomain, MilestoneId: mId}).subscribe({
+      next: (data) => {
+        this.milestone.MilestoneStatus = "Deleted";
+      },
+      error: (error) => {
+        console.error("Error", error);
+        this.errorHandlerService.showError = true;
+      },
+      complete: () => console.info('Successful ')
+    });
+  }
 }