From 4b6579cd7ee8938852c0588149c4afa68fa64c8f Mon Sep 17 00:00:00 2001
From: c2038058 <gillj8@cardiff.ac.uk>
Date: Wed, 24 Nov 2021 13:24:39 +0000
Subject: [PATCH] Moved relationship between "Rewards" and "StampBoards" into
"StampBoards" instead of "Rewards"
---
.../example/clientproject/data/rewards/Rewards.java | 4 ----
.../clientproject/data/stampBoards/StampBoards.java | 10 +++++++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/example/clientproject/data/rewards/Rewards.java b/src/main/java/com/example/clientproject/data/rewards/Rewards.java
index 1f31895..dc5d8f8 100644
--- a/src/main/java/com/example/clientproject/data/rewards/Rewards.java
+++ b/src/main/java/com/example/clientproject/data/rewards/Rewards.java
@@ -23,8 +23,4 @@ public class Rewards {
private long rewardId;
private String rewardName;
private int rewardStampLocation;
-
- @ManyToOne
- @JoinColumn(name="Stamp_Board_Id", nullable=false)
- private StampBoards stampBoard;
}
diff --git a/src/main/java/com/example/clientproject/data/stampBoards/StampBoards.java b/src/main/java/com/example/clientproject/data/stampBoards/StampBoards.java
index ddac39e..4394976 100644
--- a/src/main/java/com/example/clientproject/data/stampBoards/StampBoards.java
+++ b/src/main/java/com/example/clientproject/data/stampBoards/StampBoards.java
@@ -1,12 +1,12 @@
package com.example.clientproject.data.stampBoards;
+import com.example.clientproject.data.rewards.Rewards;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import javax.persistence.*;
+import java.util.Set;
/**
* StampBoards Entity
@@ -21,4 +21,8 @@ public class StampBoards {
@GeneratedValue
private long stampBoardId;
private int stampBoardSize;
+
+ @OneToMany
+ @JoinColumn(name="Stamp_Board_Id")
+ private Set<Rewards> rewards;
}
--
GitLab