From 6880bf8b3ccdcb5dd14a893ae0e69e98b85914b1 Mon Sep 17 00:00:00 2001
From: iRedTea <red__tea@outlook.com>
Date: Tue, 30 Aug 2022 16:50:01 +0300
Subject: [PATCH] Replace @Data, replace typo in word "exeption" to "exception"

---
 .../ProjectNotFoundException.java             |  2 +-
 .../web/project/domain/model/Participant.java | 25 ++++++++++++++++---
 .../web/project/domain/model/Project.java     | 25 ++++++++++++++++---
 .../web/project/domain/model/Tag.java         | 23 +++++++++++++++--
 .../web/project/service/ProjectService.java   |  5 +---
 src/main/resources/templates/discussion.html  | 10 ++++++++
 6 files changed, 76 insertions(+), 14 deletions(-)
 rename src/main/java/site/easystartup/web/project/domain/{exeption => exception}/ProjectNotFoundException.java (84%)

diff --git a/src/main/java/site/easystartup/web/project/domain/exeption/ProjectNotFoundException.java b/src/main/java/site/easystartup/web/project/domain/exception/ProjectNotFoundException.java
similarity index 84%
rename from src/main/java/site/easystartup/web/project/domain/exeption/ProjectNotFoundException.java
rename to src/main/java/site/easystartup/web/project/domain/exception/ProjectNotFoundException.java
index 0a090f9..9ff1abc 100644
--- a/src/main/java/site/easystartup/web/project/domain/exeption/ProjectNotFoundException.java
+++ b/src/main/java/site/easystartup/web/project/domain/exception/ProjectNotFoundException.java
@@ -1,4 +1,4 @@
-package site.easystartup.web.project.domain.exeption;
+package site.easystartup.web.project.domain.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/site/easystartup/web/project/domain/model/Participant.java b/src/main/java/site/easystartup/web/project/domain/model/Participant.java
index d1ae890..6412561 100644
--- a/src/main/java/site/easystartup/web/project/domain/model/Participant.java
+++ b/src/main/java/site/easystartup/web/project/domain/model/Participant.java
@@ -1,14 +1,17 @@
 package site.easystartup.web.project.domain.model;
 
-import lombok.Data;
+import lombok.*;
+import org.hibernate.Hibernate;
 import site.easystartup.web.domain.User;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.util.List;
-import java.util.Set;
+import java.util.Objects;
 
-@Data
+@Getter
+@Setter
+@ToString
+@RequiredArgsConstructor
 @Entity
 @Table(name = "participant")
 public class Participant {
@@ -31,5 +34,19 @@ public class Participant {
     @JoinTable(name = "user_request",
     joinColumns = @JoinColumn(name = "participant_id"),
     inverseJoinColumns = @JoinColumn(name = "user_id"))
+    @ToString.Exclude
     private List<User> requests;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Participant that = (Participant) o;
+        return participantId != null && Objects.equals(participantId, that.participantId);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }
diff --git a/src/main/java/site/easystartup/web/project/domain/model/Project.java b/src/main/java/site/easystartup/web/project/domain/model/Project.java
index 6e3a314..6df8106 100644
--- a/src/main/java/site/easystartup/web/project/domain/model/Project.java
+++ b/src/main/java/site/easystartup/web/project/domain/model/Project.java
@@ -1,7 +1,8 @@
 package site.easystartup.web.project.domain.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.*;
+import org.hibernate.Hibernate;
 import site.easystartup.web.domain.User;
 
 import javax.persistence.*;
@@ -9,9 +10,12 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Set;
+import java.util.Objects;
 
-@Data
+@Getter
+@Setter
+@ToString
+@RequiredArgsConstructor
 @Entity
 @Table(name = "project")
 public class Project {
@@ -41,6 +45,7 @@ public class Project {
             joinColumns = @JoinColumn(name = "project_id"),
             inverseJoinColumns = @JoinColumn(name = "tag_id")
     )
+    @ToString.Exclude
     private List<Tag> technology;
 
     @ManyToOne
@@ -48,6 +53,7 @@ public class Project {
     private User owner;
 
     @OneToMany(mappedBy = "project", cascade = {CascadeType.ALL})
+    @ToString.Exclude
     private List<Participant> participants;
 
     @Column(name = "created_date", updatable = false)
@@ -58,4 +64,17 @@ public class Project {
     private void createdDate() {
         this.createdDate = LocalDateTime.now();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Project project = (Project) o;
+        return projectId != null && Objects.equals(projectId, project.projectId);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }
diff --git a/src/main/java/site/easystartup/web/project/domain/model/Tag.java b/src/main/java/site/easystartup/web/project/domain/model/Tag.java
index 45cc3b9..b7cbad7 100644
--- a/src/main/java/site/easystartup/web/project/domain/model/Tag.java
+++ b/src/main/java/site/easystartup/web/project/domain/model/Tag.java
@@ -1,11 +1,16 @@
 package site.easystartup.web.project.domain.model;
 
-import lombok.Data;
+import lombok.*;
+import org.hibernate.Hibernate;
 
 import javax.persistence.*;
+import java.util.Objects;
 import java.util.Set;
 
-@Data
+@Getter
+@Setter
+@ToString
+@RequiredArgsConstructor
 @Entity
 @Table(name = "tag")
 public class Tag {
@@ -18,5 +23,19 @@ public class Tag {
     private String tagName;
 
     @ManyToMany(mappedBy = "technology")
+    @ToString.Exclude
     private Set<Project> projects;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Tag tag = (Tag) o;
+        return tagId != null && Objects.equals(tagId, tag.tagId);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }
diff --git a/src/main/java/site/easystartup/web/project/service/ProjectService.java b/src/main/java/site/easystartup/web/project/service/ProjectService.java
index 6c999f6..899c5be 100644
--- a/src/main/java/site/easystartup/web/project/service/ProjectService.java
+++ b/src/main/java/site/easystartup/web/project/service/ProjectService.java
@@ -4,10 +4,9 @@ import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Service;
 import site.easystartup.web.domain.User;
-import site.easystartup.web.project.domain.exeption.ProjectNotFoundException;
+import site.easystartup.web.project.domain.exception.ProjectNotFoundException;
 import site.easystartup.web.project.domain.model.Participant;
 import site.easystartup.web.project.domain.model.Project;
-import site.easystartup.web.project.domain.model.Tag;
 import site.easystartup.web.project.domain.payload.requst.ProjectRequest;
 import site.easystartup.web.project.repo.ParticipantRepo;
 import site.easystartup.web.project.repo.ProjectRepo;
@@ -15,8 +14,6 @@ import site.easystartup.web.service.UserService;
 import site.easystartup.web.storage.service.StorageService;
 
 import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/resources/templates/discussion.html b/src/main/resources/templates/discussion.html
index af99d90..ac58142 100644
--- a/src/main/resources/templates/discussion.html
+++ b/src/main/resources/templates/discussion.html
@@ -5,5 +5,15 @@
     <title>403</title>
 </head>
 <body>
+<div>
+    <h1 th:text="${discussion.title} + ' (созданно ' + ${#dates.format(el.last_update, 'hh:mm dd MMM yyyy')}"/>
+</div>
+<h2>Сообщения</h2>
+<div th:each="el : ${messages}">
+    <h2 th:text="${el.}"/>
+    <p th:text="'Автор: ' + ${el.author}"/>
+    <p th:text="'Дата создания: ' + ${#dates.format(el.date, 'hh:mm dd MMM yyyy')}"/>
+    <p th:text="'Последнее обновление: ' + ${#dates.format(el.last_update, 'hh:mm dd MMM yyyy')}"/>
+</div>
 </body>
 </html>
\ No newline at end of file