From 1506bf81f3559a9fd2022ac8ab7c228c8a019ca5 Mon Sep 17 00:00:00 2001 From: Antt02 Date: Tue, 20 Feb 2024 15:57:52 +0100 Subject: [PATCH 01/17] Created Pet class --- .../java/cat/udl/eps/softarch/demo/domain/Pet.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/Pet.java 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 new file mode 100644 index 00000000..24dd1e84 --- /dev/null +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Pet.java @@ -0,0 +1,13 @@ +package cat.udl.eps.softarch.demo.domain; + +public class Pet { + int id; + String name; + boolean isAdopted; + String color; + String size; + Double weight; + String age; + String description; + String breed; +} From 3787469b0a79253e581f6c44efc6e06a72524da3 Mon Sep 17 00:00:00 2001 From: globox97 Date: Tue, 20 Feb 2024 16:18:19 +0100 Subject: [PATCH 02/17] Basic creation for the classes I've been assigned --- .../java/cat/udl/eps/softarch/demo/domain/Client.java | 5 +++++ .../cat/udl/eps/softarch/demo/domain/Location.java | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/Client.java create mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/Location.java diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Client.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Client.java new file mode 100644 index 00000000..1ea3bc69 --- /dev/null +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Client.java @@ -0,0 +1,5 @@ +package cat.udl.eps.softarch.demo.domain; + +public class Client { + +} diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Location.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Location.java new file mode 100644 index 00000000..32140d4e --- /dev/null +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Location.java @@ -0,0 +1,11 @@ +package cat.udl.eps.softarch.demo.domain; + +public class Location { + private int id; + private String address; + private float latitude; + private float longitude; + private String province; + private String municipality; + private String postalCode; +} From d2ab886e4d765e3502badbabae9ea9a4bca82c69 Mon Sep 17 00:00:00 2001 From: Antt02 Date: Tue, 20 Feb 2024 16:43:00 +0100 Subject: [PATCH 03/17] changed Pet implementation to extend UriEntity --- .../java/cat/udl/eps/softarch/demo/domain/Pet.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 index 24dd1e84..947c3887 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Pet.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Pet.java @@ -1,7 +1,10 @@ package cat.udl.eps.softarch.demo.domain; -public class Pet { - int id; +import jakarta.persistence.Id; + +public class Pet extends UriEntity { + @Id + Long id; String name; boolean isAdopted; String color; @@ -10,4 +13,9 @@ public class Pet { String age; String description; String breed; + + @Override + public Long getId() { + return id; + } } From cbd9dd37aeb04a216497a9f389d35df71700890e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Mu=C3=B1oz?= <73690199+peremunoz@users.noreply.github.com> Date: Tue, 20 Feb 2024 17:14:01 +0100 Subject: [PATCH 04/17] Create ShelterCertificate.java --- .../eps/softarch/demo/domain/ShelterCertificate.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java b/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java new file mode 100644 index 00000000..0cef8b0e --- /dev/null +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java @@ -0,0 +1,10 @@ +package cat.udl.eps.softarch.demo.domain; + +import java.util.Date; + +public class ShelterCertificate extends UriEntity { + + private Long id; + private Date expirationDate; + +} From 93f5e37ebd833d0fc5819ab73c7c0aaeb1d7a66f Mon Sep 17 00:00:00 2001 From: nero Date: Tue, 20 Feb 2024 18:36:15 +0100 Subject: [PATCH 05/17] add Shelter class --- .../udl/eps/softarch/demo/domain/Shelter.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java new file mode 100644 index 00000000..ecd02ee6 --- /dev/null +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java @@ -0,0 +1,56 @@ +package cat.udl.eps.softarch.demo.domain; + +import jakarta.persistence.*; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.PastOrPresent; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Entity +@Table(name = "Shelter") +@Data +@EqualsAndHashCode(callSuper = true) +public class Shelter extends UriEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + @NotBlank + private String name; + + @NotBlank + @Email + @Column(unique = true) + private String email; + + @NotBlank + @Column(unique = true) + private String mobile; + + public String getEmail() { + return email; + } + + public Integer getId() { + return id; + } + + public String getMobile() { + return mobile; + } + + @PastOrPresent + @NotNull + private LocalDateTime createdAt; + + @PastOrPresent + private LocalDateTime updatedAt; + + @NotNull + private boolean isActive; + + private Integer rating; +} \ No newline at end of file From dbb0c9d3b394a8898df14873b0bfd6e89013121d Mon Sep 17 00:00:00 2001 From: nero Date: Tue, 20 Feb 2024 18:49:05 +0100 Subject: [PATCH 06/17] add Schedule class Committer: Sebastian Jitaru --- .../eps/softarch/demo/domain/Schedule.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java new file mode 100644 index 00000000..a9139d4b --- /dev/null +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java @@ -0,0 +1,33 @@ +package cat.udl.eps.softarch.demo.domain; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.PastOrPresent; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Entity +@Table(name = "Schedule") //Avoid collision with system table User +@Data +@EqualsAndHashCode(callSuper = true) + +public class Schedule extends UriEntity { + + @Id + private Integer id; + + @NotNull + private LocalDateTime start; + + @NotNull + private LocalDateTime end; + + public LocalDateTime getStart() { + return start; + } + + public LocalDateTime getEnd() { + return end; + } +} \ No newline at end of file From 0afb73e11f5dee1d6409e2a0f74c87d0e3ddebbd Mon Sep 17 00:00:00 2001 From: globox97 Date: Wed, 21 Feb 2024 12:30:35 +0100 Subject: [PATCH 07/17] Basic creation for the classes I've been assigned --- .../eps/softarch/demo/domain/Location.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Location.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Location.java index 32140d4e..c4773b14 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Location.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Location.java @@ -1,11 +1,30 @@ package cat.udl.eps.softarch.demo.domain; -public class Location { - private int id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor + +public class Location extends UriEntity{ + @Id + private Long id; + private String address; + private float latitude; + private float longitude; + private String province; + private String municipality; + private String postalCode; + } From 0a42943ddb7d85e9dfbc16311529b9498ea4b5d0 Mon Sep 17 00:00:00 2001 From: Faysal Badaoui Date: Wed, 21 Feb 2024 17:25:13 +0100 Subject: [PATCH 08/17] get implementation --- .../udl/eps/softarch/demo/domain/ShelterCertificate.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java b/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java index 0cef8b0e..f95d17af 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterCertificate.java @@ -6,5 +6,9 @@ public class ShelterCertificate extends UriEntity { private Long id; private Date expirationDate; - + + @Override + public Long getId() { + return id; + } } From 9ae2ada8a35488f20027608a1bb12b65348fa9b4 Mon Sep 17 00:00:00 2001 From: Faysal Badaoui Date: Wed, 21 Feb 2024 17:28:02 +0100 Subject: [PATCH 09/17] ShelterVolunteer class implementation --- .../cat/udl/eps/softarch/demo/domain/ShelterVolunteer.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/ShelterVolunteer.java diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterVolunteer.java b/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterVolunteer.java new file mode 100644 index 00000000..fbbd4f7c --- /dev/null +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/ShelterVolunteer.java @@ -0,0 +1,5 @@ +package cat.udl.eps.softarch.demo.domain; + +public class ShelterVolunteer extends User { + +} From c53711c5757ea4708bddf5f074879aab6899aadb Mon Sep 17 00:00:00 2001 From: Sebastian Jitaru Date: Wed, 21 Feb 2024 17:30:46 +0100 Subject: [PATCH 10/17] Added getter --- src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java index a9139d4b..00576885 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java @@ -30,4 +30,8 @@ public LocalDateTime getStart() { public LocalDateTime getEnd() { return end; } + + public Integer getId() { + return id; + } } \ No newline at end of file From 905888e0752b3fb0d082db1bd01fe2b8725fd520 Mon Sep 17 00:00:00 2001 From: vGerJ02 Date: Wed, 21 Feb 2024 17:49:17 +0100 Subject: [PATCH 11/17] fix: remove getters and correct imports --- .../cat/udl/eps/softarch/demo/domain/Schedule.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java index 00576885..b599a88e 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java @@ -2,11 +2,12 @@ import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.PastOrPresent; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; + @Entity @Table(name = "Schedule") //Avoid collision with system table User @Data @@ -23,15 +24,4 @@ public class Schedule extends UriEntity { @NotNull private LocalDateTime end; - public LocalDateTime getStart() { - return start; - } - - public LocalDateTime getEnd() { - return end; - } - - public Integer getId() { - return id; - } } \ No newline at end of file From 16bd5cc4a6523388c3130dc943c929d6e64484b3 Mon Sep 17 00:00:00 2001 From: Sebastian Jitaru Date: Wed, 21 Feb 2024 17:49:46 +0100 Subject: [PATCH 12/17] Getters removed --- .../cat/udl/eps/softarch/demo/domain/Shelter.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java index ecd02ee6..531b1f46 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java @@ -3,11 +3,14 @@ import jakarta.persistence.*; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.PastOrPresent; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; + @Entity @Table(name = "Shelter") @Data @@ -30,18 +33,6 @@ public class Shelter extends UriEntity { @Column(unique = true) private String mobile; - public String getEmail() { - return email; - } - - public Integer getId() { - return id; - } - - public String getMobile() { - return mobile; - } - @PastOrPresent @NotNull private LocalDateTime createdAt; From d018f1f376d483a7eee031c323cdfb98a08b1b6a Mon Sep 17 00:00:00 2001 From: Sebastian Jitaru Date: Wed, 21 Feb 2024 18:57:18 +0100 Subject: [PATCH 13/17] getID added --- .../eps/softarch/demo/domain/Schedule.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java index b599a88e..4dc53941 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java @@ -1,12 +1,14 @@ package cat.udl.eps.softarch.demo.domain; -import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; - import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDateTime; +import java.util.Date; + @Entity @Table(name = "Schedule") //Avoid collision with system table User @@ -16,12 +18,17 @@ public class Schedule extends UriEntity { @Id - private Integer id; + private long id; @NotNull - private LocalDateTime start; + private Date start; @NotNull - private LocalDateTime end; + private Date end; + + @Override + public Long getId() { + return id; + } } \ No newline at end of file From 91563c4ddf0f6708ed08555f155af10b2dfe0507 Mon Sep 17 00:00:00 2001 From: vGerJ02 Date: Wed, 21 Feb 2024 19:01:06 +0100 Subject: [PATCH 14/17] fix: change id to Long --- .../java/cat/udl/eps/softarch/demo/domain/Shelter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java index 531b1f46..9fd2b1fa 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Shelter.java @@ -9,7 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDateTime; +import java.time.ZonedDateTime; @Entity @Table(name = "Shelter") @@ -19,7 +19,7 @@ public class Shelter extends UriEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; + private Long id; @NotBlank private String name; @@ -35,10 +35,10 @@ public class Shelter extends UriEntity { @PastOrPresent @NotNull - private LocalDateTime createdAt; + private ZonedDateTime createdAt; @PastOrPresent - private LocalDateTime updatedAt; + private ZonedDateTime updatedAt; @NotNull private boolean isActive; From 4d7cbb3b689ccfda01726b1ca0ca3ac7d03a2bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Date: Thu, 22 Feb 2024 08:37:35 +0100 Subject: [PATCH 15/17] Remove unrelated and uncomplete class Client --- src/main/java/cat/udl/eps/softarch/demo/domain/Client.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/main/java/cat/udl/eps/softarch/demo/domain/Client.java diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Client.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Client.java deleted file mode 100644 index 1ea3bc69..00000000 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Client.java +++ /dev/null @@ -1,5 +0,0 @@ -package cat.udl.eps.softarch.demo.domain; - -public class Client { - -} From 8154927c6bb92aa0da4525cde0e541756b10c1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Date: Thu, 22 Feb 2024 14:52:07 +0100 Subject: [PATCH 16/17] Fix annotations and remove unnecessary getter --- .../cat/udl/eps/softarch/demo/domain/Schedule.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java index 4dc53941..4c7d7442 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java @@ -2,33 +2,23 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; -import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; - @Entity -@Table(name = "Schedule") //Avoid collision with system table User @Data @EqualsAndHashCode(callSuper = true) - public class Schedule extends UriEntity { @Id - private long id; + private Long id; @NotNull private Date start; @NotNull private Date end; - - - @Override - public Long getId() { - return id; - } -} \ No newline at end of file +} From d16cd5a7d1d093e91e62a9a3457f580ff599e271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Date: Thu, 22 Feb 2024 14:52:49 +0100 Subject: [PATCH 17/17] Use `finish` instead of apparently protected `end` --- src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java index 4c7d7442..bd3537d3 100644 --- a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java +++ b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java @@ -20,5 +20,5 @@ public class Schedule extends UriEntity { private Date start; @NotNull - private Date end; + private Date finish; }