From 2a113b8ac0333cfdcc31eb0dc7500619f1c92744 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 6 May 2026 18:13:22 +0200 Subject: [PATCH 1/2] delete feature content --- .../udl/eps/softarch/demo/domain/Content.java | 60 ++++++------------- 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java index 0a26288d..241cfaad 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java @@ -4,45 +4,34 @@ import com.fasterxml.jackson.annotation.JsonIdentityReference; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.PrePersist; +import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.persistence.ManyToOne; -import com.fasterxml.jackson.annotation.JsonIdentityReference; import java.util.List; - - @Entity @Data -//@EqualsAndHashCode(callSuper = true) public class Content { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long contentId; - /*@ManyToOne - @JsonIdentityReference(alwaysAsId = true) - @Column(nullable = false) - private Project project;*/ + @ManyToMany + @JoinTable( + name = "content_tags", + joinColumns = @JoinColumn(name = "content_id"), + inverseJoinColumns = @JoinColumn(name = "tag_id") + ) + private List tags; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @OneToMany(mappedBy = "content", cascade = CascadeType.REMOVE, orphanRemoval = true) + private List reports; - /*@ManyToOne - @JsonIdentityReference(alwaysAsId = true) - @Column(nullable = false) - private User user;*/ - @NotBlank(message = "Name cannot be empty") @Column(unique = true, nullable = false) private String name; @@ -54,24 +43,11 @@ public class Content { @Column(length = 100) private String description; - @Column(nullable = false, updatable = false) private ZonedDateTime createdAt; - @Column(nullable = false, updatable = false) private ZonedDateTime modifiedAt; - @Enumerated(EnumType.STRING) - @Column(nullable = false) private Visibility visibility; - - @PrePersist - public void prePersist() { - if (createdAt == null) { - createdAt = ZonedDateTime.now(); - } - if (modifiedAt == null) { - modifiedAt = ZonedDateTime.now(); - } - } - - + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Visibility visibility; } \ No newline at end of file From d0072312bb2bc0c37039de9058fa3f6903f1db2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Date: Thu, 7 May 2026 16:14:21 +0200 Subject: [PATCH 2/2] fix: remove unnecessary jointable and joincloumn --- .../java/cat/udl/eps/softarch/demo/domain/Content.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java index 6698ddc8..0c05a17a 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Content.java @@ -17,15 +17,9 @@ public class Content { private Long contentId; @ManyToMany - @JoinTable( - name = "content_tags", - joinColumns = @JoinColumn(name = "content_id"), - inverseJoinColumns = @JoinColumn(name = "tag_id") - ) private List tags; @ManyToOne - @JoinColumn(name = "user_id") private User user; @OneToMany(mappedBy = "content", cascade = CascadeType.REMOVE, orphanRemoval = true) @@ -49,4 +43,4 @@ public class Content { @Enumerated(EnumType.STRING) @Column(nullable = false) private Visibility visibility; -} \ No newline at end of file +}