Merge 0f7a527 into 15b5144

FAForever · Jan 6, 2019 · 9d89f19 · 9d89f19
2 parents 15b5144 + 0f7a527
commit 9d89f19
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java b/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java
@@ -11,7 +11,6 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 @Entity
@@ -43,13 +42,13 @@ public int getPlayerId() {
     return playerId;
   }
 
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne(fetch = FetchType.LAZY, optional = false)
   @JoinColumn(name = "player_id", insertable = false, updatable = false)
   public Player getPlayer() {
     return player;
   }
 
-  @OneToOne
+  @ManyToOne(fetch = FetchType.LAZY, optional = false)
   @JoinColumn(name = "achievement_id")
   public Achievement getAchievement() {
     return achievement;