From 652ca51d7e5edee7466f1f9e77f5aaef894e0131 Mon Sep 17 00:00:00 2001
From: Antonio Vidal <antonio.v.p.us@gmail.com>
Date: Tue, 23 Mar 2021 15:49:28 +0100
Subject: [PATCH] Arreglo de las clases respecto develop

---
 .../cheapy/model/Authorities.java             | 23 +++--------
 .../springframework/cheapy/model/Client.java  | 40 ++++++++-----------
 .../springframework/cheapy/model/User.java    | 18 ++++-----
 3 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/src/main/java/org/springframework/cheapy/model/Authorities.java b/src/main/java/org/springframework/cheapy/model/Authorities.java
index 7a46d8d28..9631cc8c3 100644
--- a/src/main/java/org/springframework/cheapy/model/Authorities.java
+++ b/src/main/java/org/springframework/cheapy/model/Authorities.java
@@ -1,31 +1,18 @@
 package org.springframework.cheapy.model;
 
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
+import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.validation.constraints.Size;
 
 @Entity
 @Table(name = "authorities")
-public class Authorities extends BaseEntity {
+public class Authorities {
+	
+	@Id
+	String username;
 
-	@OneToOne
-	@JoinColumn(name = "username")
-	User user;
-
-	@Size(min = 3, max = 50)
 	String authority;
 
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
 	public String getAuthority() {
 		return authority;
 	}
diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java
index ec873a517..9a942cd44 100644
--- a/src/main/java/org/springframework/cheapy/model/Client.java
+++ b/src/main/java/org/springframework/cheapy/model/Client.java
@@ -1,33 +1,13 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.cheapy.model;
 
+import java.util.Set;
+
 import javax.persistence.Entity;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotEmpty;
 
-/**
- * Simple JavaBean domain object representing an owner.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
 @Entity
 @Table(name = "clients")
 public class Client extends User {
@@ -50,6 +30,18 @@ public class Client extends User {
 
 	@NotEmpty
 	private String food;
+	
+	@OneToMany
+	private Set<FoodOffer> foodOffers;
+	
+	@OneToMany
+	private Set<NuOffer> nuOffers;
+	
+	@OneToMany
+	private Set<SpeedOffer> speedOffers;
+	
+	@OneToMany
+	private Set<TimeOffer> timeOffers;
 
 	public String getAddress() {
 		return address;
@@ -99,4 +91,4 @@ public class Client extends User {
 		this.food = food;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/springframework/cheapy/model/User.java b/src/main/java/org/springframework/cheapy/model/User.java
index f9407e46a..f072d3744 100644
--- a/src/main/java/org/springframework/cheapy/model/User.java
+++ b/src/main/java/org/springframework/cheapy/model/User.java
@@ -1,19 +1,15 @@
 package org.springframework.cheapy.model;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
 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;
 
-@Entity
-@Table(name = "users")
-public class User {
 
-	@Id
+@MappedSuperclass
+public class User extends BaseEntity {
+
 	@NotBlank
 	String username;
 
@@ -23,6 +19,9 @@ public class User {
 	@Email
 	@NotBlank
 	String email;
+	
+	@OneToOne
+	Authorities authority;
 
 	public String getUsername() {
 		return username;
@@ -56,7 +55,4 @@ public class User {
 		this.authority = authority;
 	}
 
-	@OneToOne(cascade = CascadeType.ALL, mappedBy = "user", fetch = FetchType.LAZY)
-	private Authorities authority;
-
 }
\ No newline at end of file