From 774bc134069afdc09a82364c8f683fcaba1db52d Mon Sep 17 00:00:00 2001 From: Jordi Date: Tue, 18 Feb 2025 20:56:15 +0100 Subject: [PATCH 1/5] Interest class creation --- src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java new file mode 100644 index 0000000..e69de29 From 4b407778d7a9b1ca5e03dca9634350d74231b396 Mon Sep 17 00:00:00 2001 From: Jordi Date: Tue, 18 Feb 2025 21:06:29 +0100 Subject: [PATCH 2/5] interest imports --- .../softarch/tfgfinder/domain/Interest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java index e69de29..2b5ccd4 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java @@ -0,0 +1,19 @@ +package cat.udl.eps.softarch.tfgfinder.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.persistence.*; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; + +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Length; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +import java.util.Collection; \ No newline at end of file From f206eb440baf82c93cf2f488792e8bed67436e74 Mon Sep 17 00:00:00 2001 From: Jordi Date: Tue, 18 Feb 2025 21:39:21 +0100 Subject: [PATCH 3/5] Interest class defined --- .../softarch/tfgfinder/domain/Interest.java | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java index 2b5ccd4..2eb12fe 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java @@ -10,10 +10,49 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -import java.util.Collection; \ No newline at end of file +import java.time.ZonedDateTime; +import java.util.Collection; + +@Entity +@Table(name = "Interest") +@Data +@EqualsAndHashCode(callSuper = true) +public class Interest extends UriEntity { + + @Id + private String id; + + @DateTimeFormat + private ZonedDateTime when; + + public enum Status { + PENDING, + ACCEPTED, + REJECTED + } + + @Enumerated (EnumType.STRING) + private Status status; + + + public String getInvite() { return id; } + + public void setInvite(String invite) { this.id = invite; } + + + public ZonedDateTime getWhen() { return when; } + + public void setWhen(ZonedDateTime when) { this.when = when; } + + + public Status getStatus() { return status; } + + public void setStatus(Status status) { this.status = status; } +} \ No newline at end of file From dee72729a17b2f35d93c9513dfefe78f1cc3cb17 Mon Sep 17 00:00:00 2001 From: Jordi Date: Thu, 20 Feb 2025 22:35:47 +0100 Subject: [PATCH 4/5] lowercase --- .../java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java index 2eb12fe..e744a2b 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java @@ -21,7 +21,7 @@ import java.util.Collection; @Entity -@Table(name = "Interest") +@Table(name = "interest") @Data @EqualsAndHashCode(callSuper = true) public class Interest extends UriEntity { From 22f01f9c260a4bf21d09014aebeb04ebe94891c3 Mon Sep 17 00:00:00 2001 From: Jordi Date: Thu, 20 Feb 2025 22:36:09 +0100 Subject: [PATCH 5/5] getters and setters removed --- .../eps/softarch/tfgfinder/domain/Interest.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java index e744a2b..cf7e5e7 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java @@ -40,19 +40,4 @@ public enum Status { @Enumerated (EnumType.STRING) private Status status; - - - public String getInvite() { return id; } - - public void setInvite(String invite) { this.id = invite; } - - - public ZonedDateTime getWhen() { return when; } - - public void setWhen(ZonedDateTime when) { this.when = when; } - - - public Status getStatus() { return status; } - - public void setStatus(Status status) { this.status = status; } } \ No newline at end of file