Index: src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java
===================================================================
--- src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java	(revision 296decc46e1e8f8e26f7fae51dc7f22ceff6edc3)
+++ src/main/java/com/db/finki/www/build_board/entity/request/Feedback.java	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
@@ -17,5 +17,10 @@
     @Id
     @Column(name = "submission_id")
-    Integer id;
+    private Integer id;
+
+    @OneToOne
+    @JoinColumn(name = "submission_id")
+    @MapsId
+    private Submission forSubmission;
 
     private String description;
@@ -30,16 +35,16 @@
     private LocalDateTime createdAt;
 
-    public Feedback(FeedbackFor submissionType, BBUser creator, String description, Integer subId) {
+    public Feedback(FeedbackFor submissionType, BBUser creator, String description, Submission sub) {
         setDescription(description);
         setSubmissionType(submissionType);
         setCreator(creator);
-        setId(subId);
+        setForSubmission(sub);
         setCreatedAt(LocalDateTime.now());
     }
 
-    public Feedback(FeedbackFor feedbackFor, BBUser creator, Integer subId) {
+    public Feedback(FeedbackFor feedbackFor, BBUser creator, Submission sub) {
         setSubmissionType(feedbackFor);
         setCreator(creator);
-        setId(subId);
+        setForSubmission(sub);
         setCreatedAt(LocalDateTime.now());
     }
Index: src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java
===================================================================
--- src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java	(revision 296decc46e1e8f8e26f7fae51dc7f22ceff6edc3)
+++ src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
@@ -36,8 +36,7 @@
     private Status status;
 
-    @OneToOne(cascade = { CascadeType.PERSIST })
+    @OneToOne
     @JoinColumn(name = "submission_id")
-    private Feedback feedback;
-
+    private Submission submission;
 
     public ProjectRequests(Project project, BBUser creator, String description) {
@@ -48,3 +47,7 @@
         setCreatedAt(LocalDateTime.now());
     }
+
+    public Feedback getFeedback() {
+        return submission == null ? null : submission.getFeedback();
+    }
 }
Index: src/main/java/com/db/finki/www/build_board/entity/request/Submission.java
===================================================================
--- src/main/java/com/db/finki/www/build_board/entity/request/Submission.java	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
+++ src/main/java/com/db/finki/www/build_board/entity/request/Submission.java	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
@@ -0,0 +1,21 @@
+package com.db.finki.www.build_board.entity.request;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "submission")
+@Getter
+@Setter
+@NoArgsConstructor
+public class Submission {
+    @Id
+    @GeneratedValue(generator = "sub_gen",strategy = GenerationType.SEQUENCE)
+    @SequenceGenerator(name = "sub_gen",sequenceName = "submission_id_seq",allocationSize = 1,initialValue = 0)
+    private Integer id;
+
+    @OneToOne(mappedBy = "forSubmission")
+    private Feedback feedback;
+}
Index: src/main/java/com/db/finki/www/build_board/repository/request/FeedbackRepo.java
===================================================================
--- src/main/java/com/db/finki/www/build_board/repository/request/FeedbackRepo.java	(revision 296decc46e1e8f8e26f7fae51dc7f22ceff6edc3)
+++ src/main/java/com/db/finki/www/build_board/repository/request/FeedbackRepo.java	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
@@ -2,8 +2,9 @@
 
 import com.db.finki.www.build_board.entity.request.Feedback;
+import com.db.finki.www.build_board.entity.request.Submission;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface FeedbackRepo extends JpaRepository<Feedback, Long> {
+public interface FeedbackRepo extends JpaRepository<Feedback, Integer> {
 }
Index: src/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java
===================================================================
--- src/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java	(revision 296decc46e1e8f8e26f7fae51dc7f22ceff6edc3)
+++ src/main/java/com/db/finki/www/build_board/service/request/FeedbackService.java	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
@@ -3,4 +3,5 @@
 import com.db.finki.www.build_board.entity.entity_enum.FeedbackFor;
 import com.db.finki.www.build_board.entity.request.Feedback;
+import com.db.finki.www.build_board.entity.request.Submission;
 import com.db.finki.www.build_board.entity.user_type.BBUser;
 import com.db.finki.www.build_board.repository.request.FeedbackRepo;
@@ -13,9 +14,9 @@
     public FeedbackService(FeedbackRepo feedbackRepo) {this.feedbackRepo = feedbackRepo;}
 
-    public Feedback create(String description, BBUser creator, FeedbackFor feedbackFor, Integer reqId){
-        return feedbackRepo.save(new Feedback(feedbackFor, creator, description,reqId));
+    public Feedback create(String description, BBUser creator, FeedbackFor feedbackFor, Submission submission) {
+        return feedbackRepo.save(new Feedback(feedbackFor, creator, description,submission));
     }
-    public Feedback create(BBUser creator, FeedbackFor feedbackFor, Integer reqId){
-        return feedbackRepo.save(new Feedback(feedbackFor, creator,reqId));
+    public Feedback create(BBUser creator, FeedbackFor feedbackFor, Submission sub){
+        return feedbackRepo.save(new Feedback(feedbackFor, creator,sub));
     }
 }
Index: src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java
===================================================================
--- src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java	(revision 296decc46e1e8f8e26f7fae51dc7f22ceff6edc3)
+++ src/main/java/com/db/finki/www/build_board/service/request/ProjectRequestService.java	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
@@ -38,5 +38,5 @@
         ProjectRequests prReq = getRequestById(reqId);
         prReq.setStatus(Status.DENIED);
-        prReq.setFeedback(feedbackService.create(desc, creator, FeedbackFor.P, reqId));
+        feedbackService.create(desc,creator,FeedbackFor.P,prReq.getSubmission());
         prReqRepo.save(prReq);
     }
@@ -46,5 +46,6 @@
         ProjectRequests prReq = getRequestById(reqId);
         prReq.setStatus(Status.ACCEPTED);
-        prReq.setFeedback(feedbackService.create(creator, FeedbackFor.P, reqId));
+
+        feedbackService.create(creator,FeedbackFor.P,prReq.getSubmission());
         projectService.addDeveloperToProject(prReq.getProject(), prReq.getCreator());
         prReqRepo.save(prReq);
Index: src/main/resources/db/migration/V1__init_ddl.sql
===================================================================
--- src/main/resources/db/migration/V1__init_ddl.sql	(revision 296decc46e1e8f8e26f7fae51dc7f22ceff6edc3)
+++ src/main/resources/db/migration/V1__init_ddl.sql	(revision 8cf263e6b244842fce127f3d9bdab3d94ce925b5)
@@ -403,5 +403,5 @@
 $$
 BEGIN
-    insert into submission default values returning id into NEW.submission_id;
+    insert into submission(id) values (nextval('submission_id_seq'))  returning id into NEW.submission_id;
     return new;
 END;
@@ -450,23 +450,5 @@
 end;
 $$;
-create or replace function fn_replace_id_with_submission_id()
-    returns trigger
-    language plpgsql
-as $$
-BEGIN
-    IF NEW.submission_type = 'P' THEN
-        select submission_id
-        into NEW.submission_id
-        from project_request
-        where id=NEW.submission_id;
-    ELSE
-        select submission_id
-        into NEW.submission_id
-        from report
-        where id=NEW.submission_id;
-    end if;
-    return new;
-end;
-$$;
+
 
 -------------------------- TRIGGERS ----------------------
@@ -514,7 +496,4 @@
 execute function fn_insert_general_for_project();
 
-create or replace trigger tr_replace_id_with_submission_id
-    before insert on feedback
-    for each row
-execute function fn_replace_id_with_submission_id();
-
+
+