Merge pull request #81 from UdL-EPS-SoftArch/crud-Pet

crud-Pet
UdL-EPS-SoftArch · Mar 28, 2024 · 151e200 · 151e200
2 parents d036661 + 61557d2
commit 151e200
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Pet.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Pet.java
@@ -24,7 +24,4 @@ public class Pet extends UriEntity<Long> {
 
     @ManyToOne
     public Shelter isIn;
-
-    @ManyToMany
-    public User[] favouritedBy;
 }
diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/User.java b/src/main/java/cat/udl/eps/softarch/demo/domain/User.java
@@ -17,6 +17,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.util.Collection;
+import java.util.List;
 
 @Entity
 @Table(name = "DemoUser") //Avoid collision with system table User
@@ -75,4 +76,8 @@ public boolean isCredentialsNonExpired() {
 	public boolean isEnabled() {
 		return true;
 	}
+
+	@ManyToMany
+	public List<Pet> favouritedPets;
+
 }