Merge branch 'main' into CRUD-shelter

EntitiesModel.puml

@@ -11,14 +11,14 @@ class User extends UriEntity implements UserDetails {
 class UriEntity {
   uri : String
 }
-abstract class Pet{
-  id: Integer
+abstract class Pet extends UriEntity {
+  id: Long
   name: String
-  dateOfBirth: String
+  dateOfBirth: Date
   isAdopted: Boolean
   colour: String
   size: Integer
-  chip: Integer
+  chip: String
   sex: String
   race: String
   dangerous: Boolean
@@ -31,8 +31,8 @@ class Cat extends Pet {
     meowingLevel: Integer
 }
 
-class Shelter extends UriEntity{
-  id: Integer
+class Shelter extends UriEntity {
+  id: Long
   name: String
   email: String
   mobile : String
@@ -42,7 +42,7 @@ class Shelter extends UriEntity{
 }
 
 class Location {
- id: Integer
+ id: Long
  address: String
  latitude: Float
  longitude: Float
@@ -52,12 +52,12 @@ class Location {
 }
 
 class ShelterCertificate {
-  id: String
+  id: Long
   expirationDate: DateTime
 }
 
 class Schedule {
-    id: Integer
+    id: Long
     startTime: Time
     endTime: Time
 }
@@ -67,12 +67,12 @@ class Adoptions {
 }
 
 class Role {
-    id: Integer
+    id: Long
     name: String
 }
 
 class Permission {
-    id: Integer
+    id: Long
     name: String
 }
 

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

@@ -0,0 +1,23 @@
+package cat.udl.eps.softarch.demo.domain;
+
+import jakarta.persistence.Entity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class Cat extends Pet {
+
+    private Integer meowingLevel;
+
+    @Override
+    public Long getId() {
+        return super.getId();
+    }
+
+}

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

@@ -0,0 +1,22 @@
+package cat.udl.eps.softarch.demo.domain;
+
+import jakarta.persistence.Entity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class Dog extends Pet {
+
+    private Integer barkingLevel;
+
+    @Override
+    public Long getId() {
+        return super.getId();
+    }
+}

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

@@ -0,0 +1,42 @@
+package cat.udl.eps.softarch.demo.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+public abstract class Pet extends UriEntity<Long> {
+
+    @Id
+    private Long id;
+
+    @NotBlank
+    private String name;
+
+    private LocalDate dateOfBirth;
+
+    private boolean isAdopted;
+
+    private String colour;
+
+    private Integer size;
+
+    private String chip;
+
+    private String sex;
+
+    private String race;
+
+    private boolean dangerous;
+
+}