Merge f440252 into e663713

.travis.yml

@@ -23,7 +23,7 @@ before_install:
 install:
   - git clone https://github.com/FAForever/faf-stack.git faf-stack
     && pushd faf-stack
-    && git checkout 03b2fd4
+    && git checkout 33a24b3
     && cp -r config.template config
     && ./scripts/init-db.sh
     && popd

src/main/java/com/faforever/api/data/domain/Game.java

@@ -5,6 +5,7 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
+import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 import org.jetbrains.annotations.Nullable;
 
@@ -19,6 +20,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.time.OffsetDateTime;
@@ -114,8 +116,10 @@ public List<GameReview> getReviews() {
     return reviews;
   }
 
-  @OneToOne(mappedBy = "game")
+  @OneToOne(fetch = FetchType.LAZY)
+  @PrimaryKeyJoinColumn
   @UpdatePermission(expression = "Prefab.Role.All")
+  @BatchSize(size = 1000)
   public GameReviewsSummary getReviewsSummary() {
     return reviewsSummary;
   }

src/main/java/com/faforever/api/data/domain/GameReviewsSummary.java

@@ -7,9 +7,7 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
@@ -58,8 +56,7 @@ public float getLowerBound() {
     return lowerBound;
   }
 
-  @OneToOne(fetch = FetchType.LAZY)
-  @JoinColumn(name = "game_id", insertable = false, updatable = false)
+  @OneToOne(mappedBy = "reviewsSummary")
   @BatchSize(size = 1000)
   public Game getGame() {
     return game;

src/main/java/com/faforever/api/data/domain/Rating.java

@@ -2,7 +2,6 @@
 
 
 import lombok.Setter;
-import org.hibernate.annotations.Formula;
 
 import javax.persistence.Column;
 import javax.persistence.FetchType;
@@ -46,7 +45,7 @@ public Player getPlayer() {
     return player;
   }
 
-  @Formula("mean - 3 * deviation")
+  @Column(name = "rating", updatable = false)
   public double getRating() {
     return rating;
   }

src/main/resources/config/application.yml

@@ -9,7 +9,7 @@ faf-api:
   challonge:
     key: ${CHALLONGE_KEY:}
   database:
-    schema-version: ${DATABASE_SCHEMA_VERSION:71}
+    schema-version: ${DATABASE_SCHEMA_VERSION:72}
   mautic:
     base-url: ${MAUTIC_BASE_URL:false}
     client-id: ${MAUTIC_CLIENT_ID:false}