From ce05bea9c0a2d9cc0527f2fcb4b3a5ff17f394b7 Mon Sep 17 00:00:00 2001
From: Antonio Vidal <antonio.v.p.us@gmail.com>
Date: Tue, 23 Mar 2021 16:56:21 +0100
Subject: [PATCH] Arreglo de fallos en el despliegue

---
 .../springframework/cheapy/model/Administrator.java    | 10 ++++++++++
 .../org/springframework/cheapy/model/Authorities.java  | 10 +++++++++-
 .../java/org/springframework/cheapy/model/User.java    |  5 ++++-
 .../cheapy/repository/AuthoritiesRepository.java       |  3 ---
 .../cheapy/service/AuthoritiesService.java             |  8 ++++----
 .../springframework/cheapy/service/UserService.java    |  3 ++-
 6 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/org/springframework/cheapy/model/Administrator.java

diff --git a/src/main/java/org/springframework/cheapy/model/Administrator.java b/src/main/java/org/springframework/cheapy/model/Administrator.java
new file mode 100644
index 000000000..736908254
--- /dev/null
+++ b/src/main/java/org/springframework/cheapy/model/Administrator.java
@@ -0,0 +1,10 @@
+package org.springframework.cheapy.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "administrators")
+public class Administrator extends User{
+	
+}
diff --git a/src/main/java/org/springframework/cheapy/model/Authorities.java b/src/main/java/org/springframework/cheapy/model/Authorities.java
index 9631cc8c3..aaaa01f6c 100644
--- a/src/main/java/org/springframework/cheapy/model/Authorities.java
+++ b/src/main/java/org/springframework/cheapy/model/Authorities.java
@@ -12,7 +12,15 @@ public class Authorities {
 	String username;
 
 	String authority;
-
+	
+	public String getUsername() {
+		return username;
+	}
+	
+	public void setUser(String username) {
+		this.username = username;
+	}
+	
 	public String getAuthority() {
 		return authority;
 	}
diff --git a/src/main/java/org/springframework/cheapy/model/User.java b/src/main/java/org/springframework/cheapy/model/User.java
index a0db78bf9..ef31368b3 100644
--- a/src/main/java/org/springframework/cheapy/model/User.java
+++ b/src/main/java/org/springframework/cheapy/model/User.java
@@ -1,13 +1,16 @@
 package org.springframework.cheapy.model;
 
+import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.OneToOne;
+import javax.persistence.Table;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 
 
-@MappedSuperclass
+@Entity
+@Table(name = "users")
 public class User extends BaseEntity {
 
 	@NotBlank
diff --git a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java
index 0a0647e96..a8adee7f7 100644
--- a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java
+++ b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java
@@ -5,9 +5,6 @@ import org.springframework.cheapy.model.Authorities;
 import org.springframework.cheapy.model.User;
 
 
-
 public interface AuthoritiesRepository extends  CrudRepository<Authorities, Integer>{
 	
-	Authorities findByUser(User user);
-	
 }
diff --git a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java
index 092a08ad5..5307beeb1 100644
--- a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java
+++ b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java
@@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class AuthoritiesService {
-
+/*
 	private AuthoritiesRepository authoritiesRepository;
 	private UserService userService;
 
@@ -46,7 +46,7 @@ public class AuthoritiesService {
 	
 	@Transactional
 	public Authorities findAuthoritiyByUser(User user) {
-		return this.authoritiesRepository.findByUser(user);
+		return this.authoritiesRepository.findByUser(user.getUsername());
 	}
 
 	@Transactional
@@ -59,7 +59,7 @@ public class AuthoritiesService {
 		Authorities authority = new Authorities();
 		Optional<User> user = userService.findUser(username);
 		if(user.isPresent()) {
-			authority.setUser(user.get());
+			authority.setUser(user.get().getUsername());
 			authority.setAuthority(role);
 			//user.get().getAuthorities().add(authority);
 			authoritiesRepository.save(authority);
@@ -67,5 +67,5 @@ public class AuthoritiesService {
 			throw new DataAccessException("User '"+username+"' not found!") {};
 	}
 
-
+*/
 }
diff --git a/src/main/java/org/springframework/cheapy/service/UserService.java b/src/main/java/org/springframework/cheapy/service/UserService.java
index 895aae516..5576184a1 100644
--- a/src/main/java/org/springframework/cheapy/service/UserService.java
+++ b/src/main/java/org/springframework/cheapy/service/UserService.java
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class UserService {
-
+/*
 	private UserRepository userRepository;
 
 	@Autowired
@@ -60,4 +60,5 @@ public class UserService {
 		String currentPrincipalName = authentication.getName();             //Obtiene el nombre del ususario actual
 		return this.userRepository.findByUsername(currentPrincipalName);         //Obtiene el usuario con ese nombre
 	}
+	*/
 }