From ee0ae631b08ede924cca11e689fdbdff64f67e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20V=C3=A1zquez=20Teba?= Date: Thu, 27 Feb 2025 15:24:48 +0100 Subject: [PATCH 1/2] Deleted unnecessary imports and code --- .../softarch/tfgfinder/repository/ChatRepository.java | 6 +++--- .../tfgfinder/repository/MessageRepository.java | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java index 8b05d41..dba2770 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java @@ -1,13 +1,13 @@ package cat.udl.eps.softarch.tfgfinder.repository; -import cat.udl.eps.softarch.tfgfinder.domain.Message; +import cat.udl.eps.softarch.tfgfinder.domain.Chat; 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, PagingAndSortingRepository { +@RepositoryRestResource +public interface ChatRepository extends CrudRepository, PagingAndSortingRepository { } diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java index a034af4..4db0c68 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java @@ -13,16 +13,6 @@ @RepositoryRestResource public interface MessageRepository extends CrudRepository, PagingAndSortingRepository { - /* Interface provides automatically, as defined in - * https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data/repository/CrudRepository.html - * and - * https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data/repository/PagingAndSortingRepository.html - * the methods: count, delete, deleteAll, deleteById, existsById, findAll, findAllById, findById, save, saveAll,... - * - * Additional methods like findByUsernameContaining can be defined following: - * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#jpa.query-methods.query-creation - */ - List findByWhen(@Param("when")ZonedDateTime when); List findByFrom(@Param("user") User from); From 43758c5cfc5665d4bdbfd12d2bb3e75b9c484faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20V=C3=A1zquez=20Teba?= Date: Thu, 27 Feb 2025 15:54:47 +0100 Subject: [PATCH 2/2] Created the relations for Chat and Message --- .../java/cat/udl/eps/softarch/tfgfinder/domain/Chat.java | 9 +++------ .../cat/udl/eps/softarch/tfgfinder/domain/Message.java | 1 + .../softarch/tfgfinder/repository/ChatRepository.java | 4 ++++ .../softarch/tfgfinder/repository/MessageRepository.java | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Chat.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Chat.java index c40d2a4..a60a978 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Chat.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Chat.java @@ -1,11 +1,6 @@ package cat.udl.eps.softarch.tfgfinder.domain; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; +import jakarta.persistence.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,4 +14,6 @@ public class Chat extends UriEntity{ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @OneToOne + private Proposal proposal; } diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Message.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Message.java index fc78089..41b10df 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Message.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/domain/Message.java @@ -24,6 +24,7 @@ public class Message extends UriEntity { @NotBlank private String text; + @NotNull @ManyToOne private User from; diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java index dba2770..cbfc56f 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/ChatRepository.java @@ -5,9 +5,13 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; +import java.util.List; + @RepositoryRestResource public interface ChatRepository extends CrudRepository, PagingAndSortingRepository { + List findByProposalId(Long proposal_id); + } diff --git a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java index 4db0c68..985bc10 100644 --- a/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java +++ b/src/main/java/cat/udl/eps/softarch/tfgfinder/repository/MessageRepository.java @@ -17,4 +17,6 @@ public interface MessageRepository extends CrudRepository, Paging List findByFrom(@Param("user") User from); + List findByChatId(@Param("chatId") Long chatId); + }