Merge branch 'Carlos' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into JuanFase3

Author: JLRR2019

frontend/src/app/services/NewsService.ts

@@ -1,39 +1,58 @@
-import { Service } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
-import { News } from '../Model/News';
-import { NewRepository } from '../Repositories/NewRepository';
+import { News } from '../models/new.model';
+import { Observable } from 'rxjs';
 
-@Service
-export class NewsService {
+const URL = '/api/news/';
 
-    constructor(private httpClient: HttpClient) {}
+@Injectable({ providedIn: 'root' })
+export class NewsService {
 
-    private repository: NewRepository;
+    constructor(private httpClient: HttpClient) { }
 
+    /*
     findById(id: number) {
         return this.repository.findById(id);
     }
+    */
+    getNewById(id: number): Observable<News> {
+        return this.httpClient.get(URL + id) as Observable<News>;
+    }
 
     exist(id: number) {
         return this.repository.existById(id);
     }
 
     findAll(pageable: Pageable) {
-        return this.repository.findAll(pageable);
+        return this.httpClient.findAll(pageable);
     }
 
+    /*
     findAll() {
         return this.repository.findAll();
     }
+    */
+    getNews(): Observable<News> {
+        return this.httpClient.get(URL) as Observable<News>;
+    }
 
-    save(new: News) {
+    /*save(new: News) {
         return this.httpClient.put(URL + new.id, new);
     }
+    */
+    saveNew(news: News) {
+        return this.httpClient.put(URL + news.id, news);
+    }
 
+    /*
     delete(id: number) {
         this.repository.deleteById(id);
     }
+    */
+    deleteNew(news: News) {
+        return this.httpClient.delete(URL + news.id);
+    }
 
     findAll(of: PageRequest) {
         return this.repository.findAll(of);
@@ -42,4 +61,4 @@ export class NewsService {
     findByIds(notices) {
         return this.repository.findAllById(notices);
     }
-}
+}