Merge pull request #10 from aloatias/development

Release v0.0.1.0
aloatias · May 8, 2020 · 1cbabdf · 1cbabdf
2 parents 9d51dd3 + b0ceed0
commit 1cbabdf
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 13 deletions.
diff --git a/src/app/Shared/BaseUrl.ts b/src/app/Shared/BaseUrl.ts
@@ -5,5 +5,5 @@ export class Urls {
     public static TASK_GETALL = environment.url + Global.TASK_ENDPOINT + "GetAll";
     public static TASK_ADD = environment.url + Global.TASK_ENDPOINT + "Add";
     public static TASK_UPDATESTATUS = environment.url + Global.TASK_ENDPOINT + "UpdateStatus";
-    public static TASK_DELETE = environment.url + Global.TASK_ENDPOINT + "Delete?taskId=";
+    public static TASK_DELETE = environment.url + Global.TASK_ENDPOINT + "Delete";
 }
diff --git a/src/app/task.service.ts b/src/app/task.service.ts
@@ -1,13 +1,15 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, throwError } from 'rxjs';
 import { Task } from './Dtos/Task';
-import { HttpClient, HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpParams, HttpRequest, HttpErrorResponse } from '@angular/common/http';
 import { Urls } from './Shared/BaseUrl';
+import { retry, catchError } from 'rxjs/operators';
 
 const httpOptions = {
   headers: new HttpHeaders({
     "Content-Type": "application/json"
-  })
+  }),
+  params: new HttpParams()
 };
 
 @Injectable({
@@ -18,21 +20,50 @@ export class TaskService {
   constructor(
     private _http: HttpClient) {
   }
-
-  AddTask(taskDescription: string) : Observable<Task> {
-    return this._http.post<Task>(Urls.TASK_ADD, { "description": taskDescription }, httpOptions);
+
+  AddTask(taskDescription: string): Observable<Task> {
+    return this._http
+      .post<Task>(Urls.TASK_ADD, { "description": taskDescription }, httpOptions)
+      .pipe(catchError(this.handleError));
   }
 
   DeleteTask(taskId: string) {
-    let url = Urls.TASK_DELETE + taskId;
-    return this._http.delete(url, httpOptions);
+    let url = Urls.TASK_DELETE;
+    httpOptions.params = httpOptions.params.set("taskId", taskId);
+
+    return this._http
+      .delete(url, httpOptions)
+      .pipe(catchError(this.handleError));
   }
 
-  GetAllTasks() : Observable<Task[]> {
-    return this._http.get<Task[]>(Urls.TASK_GETALL);
+  GetAllTasks(): Observable<Task[]> {
+    return this._http
+      .get<Task[]>(Urls.TASK_GETALL)
+      .pipe(catchError(this.handleError));
   }
-  
+
   UpdateTaskStatus(taskId: string): Observable<Task> {
-    return this._http.put<Task>(Urls.TASK_UPDATESTATUS, { "id": taskId }, httpOptions);
+    return this._http
+      .put<Task>(Urls.TASK_UPDATESTATUS, { "id": taskId }, httpOptions)
+      .pipe(catchError(this.handleError));
+  }
+
+  private handleError(error: HttpErrorResponse) {
+    let errorMessage = '';
+    if (error.error instanceof ErrorEvent) {
+      // client-side error
+      errorMessage = `Error: ${error.error.message}`;
+    } else {
+      // server-side error
+      if (error.status !== 500) {
+        errorMessage = error.error;
+      } else {
+        errorMessage = "Un error occured. Please try again later";
+      }
+    }
+
+    alert(errorMessage);
+
+    return throwError(errorMessage);
   }
 }