Fixed filtering the job opportunities

Author: dearrudam

front-end/src/app/model/vaga.model.ts

@@ -3,7 +3,7 @@ export class Vaga {
   number: number;
   title: String;
   body: string;
-  labels: string[];
+  labels: { name: string }[];
   username: string;
   password: string;
-}
+}

front-end/src/app/pages/cadastro-vaga/cadastro-vaga.page.html

@@ -13,18 +13,20 @@
 
 <ion-content>
   <ion-list>
+    
     <ion-item>
-      <ion-label position="floating">Titulo</ion-label>
-      <ion-input [ngModel]="vaga?.title"></ion-input>
+      <!-- <ion-input [ngModel]="vaga?.title"></ion-input> -->
+      <h2 [innerHTML]="vaga?.title"></h2>
     </ion-item>
     <ion-item>
       <ion-label position="stacked">Descrição</ion-label>
       <div [innerHTML]="getContent(vaga?.body)"></div>
 
     </ion-item>
     <ion-item>
-      <ion-label position="floating">Labels</ion-label>
-      <ion-input [ngModel]="getLabels(vaga?.labels)"></ion-input>
+      <!-- <ion-label position="floating">Labels</ion-label>
+      <ion-input [ngModel]="getLabels(vaga?.labels)" [disabled]="true"></ion-input> -->
+      <div [innerHTML]="getLabels(vaga?.labels)"></div>
     </ion-item>
   </ion-list>
 </ion-content>

front-end/src/app/pages/cadastro-vaga/cadastro-vaga.page.ts

@@ -23,51 +23,49 @@ export class CadastroVagaPage implements OnInit {
 
   private renderer = new marked.Renderer();
   private defaultOptions: marked.MarkedOptions = {};
-  
 
   vaga: Vaga;
   async ngOnInit() {
-
-    const  loading = await this.loadingController.create({
-      message: 'Please wait...',
-      spinner:'bubbles'
+    const loading = await this.loadingController.create({
+      message: "Please wait...",
+      spinner: "bubbles",
     });
     loading.present();
 
     this.applyDefaultOptions();
-    this.vagaService
-      .getVagaById(this.route.snapshot.params["id"])
-      .subscribe(
-        {
-          next:async(result:Vaga)=>{
-              this.vaga = result;
-              await loading.dismiss();
-          },
-          error: async (response: any) => {
-            await loading.dismiss();
-            console.error(response);
-            const { error, statusText } = response;
-            let { message } = error ? error : { message: statusText };
-            
-            const alert = await this.alertController.create({
-              cssClass: "my-custom-class",
-              header: "Ops!!!",
-              message,
-              buttons: [
-                {
-                  text: "OK",
-                  id: "confirm-button",
-                  handler: () => {
-                    this.router.navigate(["home"]);
-                    alert.dismiss();
-                  },
-                },
-              ],
-            });
-            await alert.present();
-          },
+    this.vagaService.getVagaById(this.route.snapshot.params["id"]).subscribe({
+      next: async (result: Vaga) => {
+        this.vaga = result;
+        await loading.dismiss();
+      },
+      error: async (response: any) => {
+        await loading.dismiss();
+        console.error(response);
+        const { error, statusText } = response;
+        let { message } = error ? error : { message: statusText };
+
+        if (!message && response.message) {
+          message = response.message;
         }
-      );
+
+        const alert = await this.alertController.create({
+          cssClass: "my-custom-class",
+          header: "Ops!!!",
+          message,
+          buttons: [
+            {
+              text: "OK",
+              id: "confirm-button",
+              handler: () => {
+                this.router.navigate(["home"]);
+                alert.dismiss();
+              },
+            },
+          ],
+        });
+        await alert.present();
+      },
+    });
   }
 
   getContent(content: string) {

front-end/src/app/service/vaga.service.ts

@@ -1,34 +1,59 @@
 import { Vaga } from "./../model/vaga.model";
 import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
+import { Observable, of, throwError } from "rxjs";
+import { filter, switchMap } from "rxjs/operators";
 import { environment } from "src/environments/environment";
 
 const BASE_URL_REPOS = environment.BASE_URL_REPOS;
+
+const ehVaga = (vaga: Vaga) => {
+  if (vaga?.labels) {
+    return (
+      vaga.labels.map((label) => label.name).indexOf("dependencies") == -1
+    );
+  }
+  return true;
+};
+
 @Injectable({
   providedIn: "root",
 })
 export class VagaService {
   constructor(private http: HttpClient) {}
 
-  getAllVagas(): Observable<Vaga[]> {
-    return this.http.get<Vaga[]>(
-      `${BASE_URL_REPOS}/soujava/vagas-java/issues?state=open&page=1&per_page=100`
-    );
-  }
+  // getAllVagas(): Observable<Vaga[]> {
+  //   return this.http.get<Vaga[]>(
+  //     `${BASE_URL_REPOS}/soujava/vagas-java/issues?state=open&page=1&per_page=100`
+  //   );
+  // }
 
   getAllVagasPaginacao(
     page: number,
     itensPorPagina: number
   ): Observable<Vaga[]> {
-    return this.http.get<Vaga[]>(
-      `${BASE_URL_REPOS}/soujava/vagas-java/issues?state=open&page=${page}&per_page=${itensPorPagina}`
-    );
+    return this.http
+      .get<Vaga[]>(
+        `${BASE_URL_REPOS}/soujava/vagas-java/issues?state=open&page=${page}&per_page=${itensPorPagina}`
+      )
+      .pipe(
+        switchMap((vagas) => {
+          return of(vagas.filter(ehVaga));
+        })
+      );
   }
 
-  getVagaById(id: number): Observable<Vaga> {
-    return this.http.get<Vaga>(
-      `${BASE_URL_REPOS}/soujava/vagas-java/issues/${id}`
-    );
+
+  getVagaById(id: number): Observable<Vaga | null> {
+    return this.http
+      .get<Vaga>(`${BASE_URL_REPOS}/soujava/vagas-java/issues/${id}`)
+      .pipe(
+        switchMap((vaga) => {
+          if(!ehVaga(vaga)){
+            return throwError(new Error("Not found"));
+          }
+          return of(vaga);
+        })
+      );
   }
 }