Skip to content

Commit 41982d0

Browse files
authored
Merge pull request #29 from UdL-EPS-SoftArch/portfolio
Allow to create restricted portfolios
2 parents 18f29dc + 8711269 commit 41982d0

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

src/main/java/cat/udl/eps/softarch/demo/domain/Creator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
import jakarta.persistence.OneToOne;
1616
import lombok.EqualsAndHashCode;
1717

18+
import lombok.ToString;
19+
1820
@Entity
1921
@DiscriminatorValue("CREATOR")
20-
@EqualsAndHashCode(callSuper = true)
22+
@EqualsAndHashCode(callSuper = true, exclude = "profile")
23+
@ToString(exclude = "profile")
2124
public class Creator extends User {
2225

2326
@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)

src/main/java/cat/udl/eps/softarch/demo/domain/Portfolio.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import lombok.Data;
77
import lombok.EqualsAndHashCode;
88

9+
import java.util.Set;
10+
import java.util.HashSet;
11+
912
import java.time.ZonedDateTime;
1013

1114
@Entity
@@ -36,6 +39,10 @@ public class Portfolio extends UriEntity<Long> {
3639
@JsonIdentityReference(alwaysAsId = true)
3740
private User owner;
3841

42+
@ManyToMany(fetch = FetchType.EAGER)
43+
@JsonIdentityReference(alwaysAsId = true)
44+
private Set<User> allowedUsers = new HashSet<>();
45+
3946
@PrePersist
4047
protected void onCreate() {
4148
ZonedDateTime now = ZonedDateTime.now();

src/main/java/cat/udl/eps/softarch/demo/domain/Profile.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
import jakarta.persistence.*;
44
import lombok.Data;
55

6+
import lombok.EqualsAndHashCode;
7+
import lombok.ToString;
8+
69
@Entity
710
@Data
11+
@EqualsAndHashCode(exclude = "creator")
12+
@ToString(exclude = "creator")
813
public class Profile {
914

1015
@Id

0 commit comments

Comments
 (0)