Merge pull request #3 from ADPRO-C11/setup-db

Add JPA & SQL Confirugration
ADPRO-C11 · Apr 24, 2024 · 30081f5 · 30081f5
2 parents a1a8083 + b0a3fd1
commit 30081f5
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 26 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,10 +23,12 @@ repositories {
 }
 
 dependencies {
+	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 	implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	compileOnly("org.projectlombok:lombok")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
+	runtimeOnly("org.postgresql:postgresql")
 	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 	annotationProcessor("org.projectlombok:lombok")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")

diff --git a/src/main/java/snackscription/review/model/Review.java b/src/main/java/snackscription/review/model/Review.java
@@ -4,17 +4,36 @@
 import lombok.Setter;
 
 import java.util.UUID;
+import jakarta.persistence.*;
+
 
 @Getter
+@Entity
+@Table(name = "review")
 public class Review {
-    private final String id;
+    @Id
+    private String id;
+
+    @Column(name = "rating", nullable = false)
     private int rating;
+
     @Setter
+    @Column(name = "content", nullable = false)
     private String content;
+
     @Setter
+    @ManyToOne
+    @JoinColumn(name = "state_id", nullable = false)
     private ReviewState state;
-    private final String userId;
-    private final String subscriptionBoxId;
+
+    @Column(name="user_id", nullable = false)
+    private String userId;
+
+    @Column(name="subsbox_id", nullable = false)
+    private String subscriptionBoxId;
+
+    public Review() {
+    }
 
     public Review(int rating, String content, String userId, String subscriptionBoxId) {
         this.id = UUID.randomUUID().toString();
@@ -25,6 +44,7 @@ public Review(int rating, String content, String userId, String subscriptionBoxI
         this.subscriptionBoxId = subscriptionBoxId;
     }
 
+
     public void editReview(int rating, String content) {
         this.setRating(rating);
         this.setContent(content);

diff --git a/src/main/java/snackscription/review/model/ReviewState.java b/src/main/java/snackscription/review/model/ReviewState.java
@@ -1,13 +1,32 @@
 package snackscription.review.model;
 
+import jakarta.persistence.*;
+
+
+@Entity
+@Table(name = "review_state")
 public abstract class ReviewState {
+
+    @Transient
     Review review;
-    String state;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    Long id; 
+
+    @Column(nullable = false)
+    String name; 
+
     ReviewState(Review review) {
         this.review = review;
     }
 
     public abstract void  approve();
 
     public abstract void reject();
+
+    @Override
+    public String toString() {
+        return this.name;
+    }
 }
diff --git a/src/main/java/snackscription/review/model/ReviewStateApproved.java b/src/main/java/snackscription/review/model/ReviewStateApproved.java
@@ -4,6 +4,7 @@ public class ReviewStateApproved extends ReviewState {
 
     ReviewStateApproved(Review review) {
         super(review);
+        this.name = "Approved";
     }
 
     @Override
@@ -15,9 +16,4 @@ public void approve() {
     public void reject() {
         this.review.setState(new ReviewStateRejected(this.review));
     }
-
-    @Override
-    public String toString() {
-        return "Approved";
-    }
 }
diff --git a/src/main/java/snackscription/review/model/ReviewStatePending.java b/src/main/java/snackscription/review/model/ReviewStatePending.java
@@ -4,6 +4,7 @@ public class ReviewStatePending extends ReviewState {
 
     ReviewStatePending(Review review) {
         super(review);
+        this.name = "Pending";
     }
 
     @Override
@@ -15,9 +16,4 @@ public void approve() {
     public void reject() {
         this.review.setState(new ReviewStateRejected(this.review));
     }
-
-    @Override
-    public String toString() {
-        return "Pending";
-    }
 }
diff --git a/src/main/java/snackscription/review/model/ReviewStateRejected.java b/src/main/java/snackscription/review/model/ReviewStateRejected.java
@@ -1,8 +1,10 @@
 package snackscription.review.model;
 
 public class ReviewStateRejected extends ReviewState {
+
     ReviewStateRejected(Review review) {
         super(review);
+        this.name = "Rejected";
     }
 
     @Override
@@ -14,9 +16,4 @@ public void approve() {
     public void reject() {
         throw new RuntimeException("Review already rejected.");
     }
-
-    @Override
-    public String toString() {
-        return "Rejected";
-    }
 }
diff --git a/src/test/java/snackscription/review/model/ReviewTest.java b/src/test/java/snackscription/review/model/ReviewTest.java
@@ -10,16 +10,11 @@ public class ReviewTest {
 
     @BeforeEach
     void setUp() {
-        this.review = new Review(
-                5,
-                "Bagus bgt dah",
-                "1",
-                "111"
-        );
+        this.review = new Review(5, "Great product!", "user1",  "subsbox1");
     }
 
     @Test
-    void testCreateReview() {
+    void testConstructor() {
         int rating = 3;
         String content = "Wow!";
         String userId = "33";