Refactor reviews according to new DB schema

Fixes #123
FAForever · Aug 28, 2017 · 4cc7ac6 · 4cc7ac6
1 parent 20df858
commit 4cc7ac6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/src/main/java/com/faforever/api/data/domain/GameReview.java b/src/main/java/com/faforever/api/data/domain/GameReview.java
@@ -11,14 +11,12 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 
 @Setter
 @Include(rootLevel = true, type = "gameReview")
 @Entity
 @Table(name = "game_review")
-@PrimaryKeyJoinColumn(name = "review_id", referencedColumnName = "id")
 @CreatePermission(expression = "Prefab.Role.All")
 @DeletePermission(expression = IsReviewOwner.EXPRESSION)
 public class GameReview extends Review {

diff --git a/src/main/java/com/faforever/api/data/domain/MapVersionReview.java b/src/main/java/com/faforever/api/data/domain/MapVersionReview.java
@@ -11,14 +11,12 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 
 @Setter
 @Include(rootLevel = true, type = "mapVersionReview")
 @Entity
 @Table(name = "map_version_review")
-@PrimaryKeyJoinColumn(name = "review_id", referencedColumnName = "id")
 @CreatePermission(expression = "Prefab.Role.All")
 @DeletePermission(expression = IsReviewOwner.EXPRESSION)
 public class MapVersionReview extends Review {

diff --git a/src/main/java/com/faforever/api/data/domain/ModVersionReview.java b/src/main/java/com/faforever/api/data/domain/ModVersionReview.java
@@ -11,14 +11,12 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 
 @Setter
 @Include(rootLevel = true, type = "modVersionReview")
 @Entity
 @Table(name = "mod_version_review")
-@PrimaryKeyJoinColumn(name = "review_id", referencedColumnName = "id")
 @CreatePermission(expression = "Prefab.Role.All")
 @DeletePermission(expression = IsReviewOwner.EXPRESSION)
 public class ModVersionReview extends Review {

diff --git a/src/main/java/com/faforever/api/data/domain/Review.java b/src/main/java/com/faforever/api/data/domain/Review.java
@@ -1,32 +1,21 @@
 package com.faforever.api.data.domain;
 
 import com.faforever.api.data.checks.IsReviewOwner;
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
 
 @Setter
-@Include(rootLevel = true, type = "review")
 @EqualsAndHashCode(of = "id")
-@Entity
-@Table(name = "review")
-@Inheritance(strategy = InheritanceType.JOINED)
-@CreatePermission(expression = "Prefab.Role.All")
-@DeletePermission(expression = IsReviewOwner.EXPRESSION)
+@MappedSuperclass
 public class Review extends AbstractEntity {
   private String text;
   private Byte score;