File tree Expand file tree Collapse file tree
java/com/faforever/api/data/domain Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ name: Build
22on : [ push, pull_request ]
33env :
44 FLYWAY_VERSION : 7.5.4
5- FAF_DB_VERSION : v119
5+ FAF_DB_VERSION : v121
66jobs :
77 test :
88 runs-on : ubuntu-latest
Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ public abstract class Login extends AbstractEntity<Login> implements OwnableEnti
3333 private String login ;
3434 private String email ;
3535 private String steamId ;
36+ private String gogId ;
3637 private String userAgent ;
3738 private Set <BanInfo > bans ;
3839 private Set <UserNote > userNotes ;
@@ -64,6 +65,12 @@ public String getSteamId() {
6465 return steamId ;
6566 }
6667
68+ @ Column (name = "gog_id" )
69+ @ ReadPermission (expression = IsEntityOwner .EXPRESSION + " OR " + ReadAccountPrivateDetailsCheck .EXPRESSION )
70+ public String getGogId () {
71+ return gogId ;
72+ }
73+
6774 @ Column (name = "ip" )
6875 @ ReadPermission (expression = IsEntityOwner .EXPRESSION + " OR " + ReadAccountPrivateDetailsCheck .EXPRESSION )
6976 public String getRecentIpAddress () {
Original file line number Diff line number Diff line change 11package com .faforever .api .data .domain ;
22
3- import com .faforever .api .data .checks .IsEntityOwner ;
43import com .yahoo .elide .annotation .Include ;
5- import com .yahoo .elide .annotation .UpdatePermission ;
64import lombok .Setter ;
75
86import javax .persistence .Column ;
@@ -23,23 +21,28 @@ public class MatchmakerQueue extends AbstractEntity<MatchmakerQueue> {
2321
2422 private String technicalName ;
2523 private String nameKey ;
24+ private String params ;
2625 private FeaturedMod featuredMod ;
2726 private Leaderboard leaderboard ;
2827
2928 @ Column (name = "technical_name" )
3029 @ NotNull
31- @ UpdatePermission (expression = IsEntityOwner .EXPRESSION )
3230 public String getTechnicalName () {
3331 return technicalName ;
3432 }
3533
3634 @ Column (name = "name_key" )
3735 @ NotNull
38- @ UpdatePermission (expression = IsEntityOwner .EXPRESSION )
3936 public String getNameKey () {
4037 return nameKey ;
4138 }
4239
40+ @ Column (name = "params" )
41+ @ NotNull
42+ public String getParams () {
43+ return params ;
44+ }
45+
4346 @ ManyToOne (fetch = FetchType .LAZY )
4447 @ JoinColumn (name = "featured_mod_id" )
4548 public FeaturedMod getFeaturedMod () {
Original file line number Diff line number Diff line change 99 challonge :
1010 key : ${CHALLONGE_KEY:}
1111 database :
12- schema-version : ${DATABASE_SCHEMA_VERSION:119 }
12+ schema-version : ${DATABASE_SCHEMA_VERSION:121 }
1313 mautic :
1414 base-url : ${MAUTIC_BASE_URL:false}
1515 client-id : ${MAUTIC_CLIENT_ID:false}
You can’t perform that action at this time.
0 commit comments