Index: src/main/java/com/wediscussmovies/project/model/Reply.java
===================================================================
--- src/main/java/com/wediscussmovies/project/model/Reply.java	(revision 2a5d6a3d7e82fe6a72290f16b30ecfbbd8df2c98)
+++ src/main/java/com/wediscussmovies/project/model/Reply.java	(revision 2d57cad1a18953bc47becb4f96114a908ecbf03d)
@@ -1,57 +1,114 @@
 package com.wediscussmovies.project.model;
-
-import lombok.Data;
 
 import javax.persistence.*;
 import java.sql.Date;
-import java.util.Optional;
 
-@Data
 @Entity
-@Table(name="replies")
+@Table(name = "replies", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
+@IdClass(RepliesEntityPK.class)
 public class Reply {
     @Id
-    @GeneratedValue
+    @Column(name = "discussion_id",insertable = false, updatable = false)
+    private int discussionId;
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
     @Column(name = "reply_id")
-    private int reply_id;
+    private int replyId;
+    @Basic
+    @Column(name = "text")
+    private String text;
+    @Basic
+    @Column(name = "date")
+    private Date date;
+    @Basic
+    @Column(name = "user_id")
+    private int userId;
+    @ManyToOne
+    @JoinColumn(name = "discussion_id", referencedColumnName = "discussion_id", nullable = false,insertable = false, updatable = false)
+    private Discussion discussionsByDiscussionId;
+    @ManyToOne
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id", nullable = false,insertable = false, updatable = false)
+    private User usersByUserId;
 
-    @ManyToOne
-    @Column(name = "discussion_id")
-    private Discussion discussion;
+    public int getDiscussionId() {
+        return discussionId;
+    }
 
-    @ManyToOne
-    @Column(name = "user_id")
-    private User user;
+    public void setDiscussionId(int discussionId) {
+        this.discussionId = discussionId;
+    }
 
-    @Column(name = "date", nullable = false)
-    private Date date;
+    public int getReplyId() {
+        return replyId;
+    }
 
-    @Column(name= "text", length = 1000, nullable = false)
-    private String text;
+    public void setReplyId(int replyId) {
+        this.replyId = replyId;
+    }
 
-    public Reply(Discussion discussion, User user, Date date, String text) {
-        this.discussion = discussion;
-        this.user = user;
-        this.date = date;
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
         this.text = text;
     }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Reply that = (Reply) o;
+
+        if (discussionId != that.discussionId) return false;
+        if (replyId != that.replyId) return false;
+        if (userId != that.userId) return false;
+        if (text != null ? !text.equals(that.text) : that.text != null) return false;
+        if (date != null ? !date.equals(that.date) : that.date != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = discussionId;
+        result = 31 * result + replyId;
+        result = 31 * result + (text != null ? text.hashCode() : 0);
+        result = 31 * result + (date != null ? date.hashCode() : 0);
+        result = 31 * result + userId;
+        return result;
+    }
+
+    public Discussion getDiscussionsByDiscussionId() {
+        return discussionsByDiscussionId;
+    }
+
+    public void setDiscussionsByDiscussionId(Discussion discussionsByDiscussionId) {
+        this.discussionsByDiscussionId = discussionsByDiscussionId;
+    }
+
+    public User getUsersByUserId() {
+        return usersByUserId;
+    }
+
+    public void setUsersByUserId(User usersByUserId) {
+        this.usersByUserId = usersByUserId;
+    }
 }
-
-
-/*
-
-    create table replies(
-        discussion_id integer,
-        reply_id serial,
-        text varchar(1000) not null,
-        date date not null,
-        user_id integer not null,
-        constraint pk_replies primary key(discussion_id,reply_id),
-        constraint fk_user_create_reply foreign key (user_id) references users(user_id)
-        on delete cascade on update cascade,
-        constraint fk_reply_discussion foreign key (discussion_id) references discussions(discussion_id)
-        on delete cascade on update cascade
-
-
-    );
- */
