Merge pull request #48 from UdL-EPS-SoftArch/main

Merge main to feat/category

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Admin.java

@@ -0,0 +1,22 @@
+package cat.udl.eps.softarch.tfgfinder.domain;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
+
+import java.util.Collection;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Admin extends User{
+
+    @Override
+    @ElementCollection
+    public Collection<GrantedAuthority> getAuthorities() {
+        return AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_ADMIN");
+    }
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Agree.java

@@ -0,0 +1,34 @@
+package cat.udl.eps.softarch.tfgfinder.domain;
+
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.ZonedDateTime;
+import java.util.Collection;
+
+@Entity
+@Table(name = "agrees")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Agree extends UriEntity<Long> {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @DateTimeFormat
+    private ZonedDateTime when;
+
+    public enum Status {
+        PENDING,
+        ACCEPTED,
+        REJECTED
+    }
+
+    @Enumerated(EnumType.STRING)
+    private Status status;
+
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Chat.java

@@ -4,6 +4,8 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Director.java

@@ -0,0 +1,28 @@
+package cat.udl.eps.softarch.tfgfinder.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
+
+import java.util.Collection;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Director extends User {
+
+    @NotNull(message = "Availability cannot be null")
+    private Boolean available = true;
+
+    @Override
+    @ElementCollection
+    public Collection<GrantedAuthority> getAuthorities() {
+        return AuthorityUtils.createAuthorityList("ROLE_DIRECTOR");
+    }
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/External.java

@@ -0,0 +1,57 @@
+package cat.udl.eps.softarch.tfgfinder.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
+
+import java.util.Collection;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class External extends Director {
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The first name must be between 2 and 50 characters")
+    private String name;
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The last name must be between 2 and 50 characters")
+    private String surname;
+
+    @NotEmpty
+    @Size(min = 2, max = 100, message = "The position must be between 2 and 100 characters")
+    private String position;
+
+    @NotEmpty
+    @Size(min = 2, max = 100, message = "The organization must be between 2 and 100 characters")
+    private String organization;
+
+    @NotEmpty
+    @Size(min = 5, max = 100, message = "The address must be between 5 and 100 characters")
+    private String address;
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The municipality must be between 2 and 50 characters")
+    private String municipality;
+
+    @NotEmpty
+    @Pattern(regexp = "^[0-9]{5}$", message = "The postal code must contain exactly 5 digits")
+    private String postalCode;
+
+    @NotEmpty
+    @Pattern(regexp = "^[0-9]{9}$", message = "The phone number must contain exactly 9 digits")
+    private String phoneNumber;
+
+    @Override
+    @ElementCollection
+    public Collection<GrantedAuthority> getAuthorities() {
+        return AuthorityUtils.createAuthorityList("ROLE_EXTERNAL");
+    }
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Interest.java

@@ -1,7 +1,9 @@
 package cat.udl.eps.softarch.tfgfinder.domain;
 
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import jakarta.persistence.*;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -28,4 +30,9 @@ public enum Status {
 
 	@Enumerated (EnumType.STRING)
 	private Status status;
+
+	@ManyToOne
+	@NotNull
+	@JsonIdentityReference(alwaysAsId = true)
+	private Proposal proposal;
 }

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Invite.java

@@ -1,5 +1,6 @@
 package cat.udl.eps.softarch.tfgfinder.domain;
 
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -24,4 +25,14 @@ public class Invite extends UriEntity<Long>  {
     @NotBlank
     private String status;
 
+    @ManyToOne
+    @NotNull
+    @JsonIdentityReference(alwaysAsId = true)
+    private User who;
+
+    @ManyToOne
+    @NotNull
+    @JsonIdentityReference(alwaysAsId = true)
+    private Proposal what;
+
 }

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Message.java

@@ -27,4 +27,7 @@ public class Message extends UriEntity<Long> {
     @ManyToOne
     private User from;
 
+    @ManyToOne
+    private Chat chat;
+
 }

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Professor.java

@@ -0,0 +1,41 @@
+package cat.udl.eps.softarch.tfgfinder.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
+
+import java.util.Collection;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Professor extends Director {
+
+    @NotEmpty
+    @Size(min = 2, max = 100, message = "The faculty name must be between 2 and 100 characters")
+    private String faculty;
+
+    @NotEmpty
+    @Size(min = 2, max = 100, message = "The department name must be between 2 and 100 characters")
+    private String department;
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The first name must be between 2 and 50 characters")
+    private String name;
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The last name must be between 2 and 50 characters")
+    private String surname;
+
+    @Override
+    @ElementCollection
+    public Collection<GrantedAuthority> getAuthorities() {
+        return AuthorityUtils.createAuthorityList("ROLE_PROFESSOR");
+    }
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Student.java

@@ -0,0 +1,57 @@
+package cat.udl.eps.softarch.tfgfinder.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
+
+import java.util.Collection;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Student extends User {
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The name must be between 2 and 50 characters long")
+    private String name;
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The surname must be between 2 and 50 characters long")
+    private String surname;
+
+    @NotEmpty
+    @Pattern(regexp = "^[0-9]{8}[A-Za-z]$", message = "The DNI must have 8 digits followed by a letter")
+    private String DNI;
+
+    @NotEmpty
+    @Size(min = 5, max = 100, message = "The address must be between 5 and 100 characters long")
+    private String address;
+
+    @NotEmpty
+    @Size(min = 2, max = 50, message = "The municipality must be between 2 and 50 characters long")
+    private String municipality;
+
+    @NotEmpty
+    @Pattern(regexp = "^[0-9]{5}$", message = "The postal code must contain exactly 5 digits")
+    private String postalCode;
+
+    @NotEmpty
+    @Pattern(regexp = "^[0-9]{9}$", message = "The phone number must contain exactly 9 digits")
+    private String phoneNumber;
+
+    @NotEmpty
+    @Size(min = 2, max = 100, message = "The degree name must be between 2 and 100 characters long")
+    private String degree;
+
+    @Override
+    @ElementCollection
+    public Collection<GrantedAuthority> getAuthorities() {
+        return AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_STUDENT");
+    }
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/domain/User.java

@@ -1,12 +1,14 @@
 package cat.udl.eps.softarch.tfgfinder.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 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 jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -27,7 +29,7 @@ public class User extends UriEntity<String> implements UserDetails {
 	public static PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 
 	@Id
-	private String id;
+	private String id;    //username?
 
 	@NotBlank
 	@Email
@@ -42,6 +44,8 @@ public class User extends UriEntity<String> implements UserDetails {
 	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private boolean passwordReset;
 
+	// Favourites for the list of favorite proposals still has to be created.
+
 	public void encodePassword() {
 		this.password = passwordEncoder.encode(this.password);
 	}

src/main/java/cat/udl/eps/softarch/tfgfinder/repository/AdminRepository.java

@@ -0,0 +1,15 @@
+package cat.udl.eps.softarch.tfgfinder.repository;
+
+import cat.udl.eps.softarch.tfgfinder.domain.Admin;
+import cat.udl.eps.softarch.tfgfinder.domain.User;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+import java.util.List;
+
+@RepositoryRestResource
+public interface AdminRepository extends CrudRepository<Admin, String>, PagingAndSortingRepository<Admin, String> {
+    List<User> findByIdContaining(@Param("text") String text);
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java

@@ -0,0 +1,13 @@
+package cat.udl.eps.softarch.tfgfinder.repository;
+
+import cat.udl.eps.softarch.tfgfinder.domain.Message;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+public interface ChatRepository extends CrudRepository<Message, Long>, PagingAndSortingRepository<Message, Long> {
+
+
+
+}

src/main/java/cat/udl/eps/softarch/tfgfinder/repository/DirectorRepository.java

@@ -0,0 +1,14 @@
+package cat.udl.eps.softarch.tfgfinder.repository;
+
+import cat.udl.eps.softarch.tfgfinder.domain.Director;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+import java.util.List;
+
+@RepositoryRestResource
+public interface DirectorRepository extends CrudRepository<Director, String>, PagingAndSortingRepository<Director, String> {
+  List<Director> findByAvailable(@Param("available") Boolean available);
+}