Test

Author: jbarcia2019

angular/wallypop/.idea/workspace.xml

@@ -4,6 +4,7 @@ import {ArticleService} from '../../services/article.service';
 import {Article} from '../../models/article.model';
 import {Category} from '../../models/category.model';
 import {CategoryService} from '../../services/category.service';
+import {User} from '../../models/user.model';
 
 @Component({
     selector: 'commercial',
@@ -32,5 +33,12 @@ export class CommercialComponent implements OnInit {
             article => this.articles = article,
             error => console.log(error)
         );
+        this.articles.forEach(value => {
+            value.user = this.getUser(value.userID);
+        });
+    }
+
+    getUser(id: bigint): User {
+        return this.loginService.getUser(id);
     }
 }

angular/wallypop/src/app/components/articles/commercial.component.ts

@@ -1,3 +1,5 @@
+import {User} from './user.model';
+
 export interface Article {
     id_ARTICLE?: number;
     city: string;
@@ -11,6 +13,7 @@ export interface Article {
     sold: boolean;
 
 	// photo: Blob;
-    // user: User;
+    userID: bigint;
+    user: User;
     // categories: Category[];
-}
+}

angular/wallypop/src/app/models/article.model.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { User } from '../models/user.model';
 import {Subscription} from 'rxjs';
+import {retry} from 'rxjs/operators';
 
 const BASE_URL = '/api/auth';
 
@@ -65,4 +66,15 @@ export class LoginService {
     currentUser(): User {
         return this.user;
     }
+
+    getUser(id: bigint): User {
+        // tslint:disable-next-line:variable-name
+        let user_: User;
+        this.http.post('/api/users/', { id }, { withCredentials: true })
+            .subscribe(
+                (response) => user_ = response as User,
+                (error) => alert('Usuario y/o contraseña no válidos')
+            );
+        return user_;
+    }
 }

angular/wallypop/src/app/services/login.service.ts

@@ -12,6 +12,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.security.Principal;
 import java.sql.SQLException;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/api/users")
@@ -70,4 +71,16 @@ public ResponseEntity<User> deleteUser(HttpServletRequest request) {
         }
     }
 
+    @GetMapping("/{id}")
+    public ResponseEntity<User> getUser(@PathVariable long id) {
+
+        Optional<User> op = userService.findById(id);
+        if (op.isPresent()) {
+            User user = op.get();
+            return new ResponseEntity<>(user, HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
 }