diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b3400cb5f..7606740c5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ jobs: - name: Install tools run: apt update && apt install -y git wget - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Gradle build env: API_VERSION: ${{ steps.get_version.outputs.API_VERSION }} diff --git a/src/inttest/java/com/faforever/api/config/MainDbTestContainers.java b/src/inttest/java/com/faforever/api/config/MainDbTestContainers.java index 8ed9fbe40..7cb1be6bd 100644 --- a/src/inttest/java/com/faforever/api/config/MainDbTestContainers.java +++ b/src/inttest/java/com/faforever/api/config/MainDbTestContainers.java @@ -21,7 +21,7 @@ @Configuration public class MainDbTestContainers { private static final MariaDBContainer fafDBContainer = new MariaDBContainer<>("mariadb:10.6"); - private static final GenericContainer flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v129"); + private static final GenericContainer flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v133"); private static final Network sharedNetwork = Network.newNetwork(); @Bean diff --git a/src/inttest/resources/sql/prepDefaultData.sql b/src/inttest/resources/sql/prepDefaultData.sql index ac9621d08..57816a9d4 100644 --- a/src/inttest/resources/sql/prepDefaultData.sql +++ b/src/inttest/resources/sql/prepDefaultData.sql @@ -1,8 +1,3 @@ -INSERT INTO oauth_clients (id, name, client_secret, client_type, redirect_uris, default_redirect_uri, default_scope) -VALUES ('test', 'test', '{noop}test', 'public', 'http://localhost https://www.getpostman.com/oauth2/callback ', - 'http://localhost', - 'read_events read_achievements upload_map upload_mod upload_avatar write_account_data vote read_sensible_userdata'); - INSERT INTO login (id, login, email, password, ip) VALUES (1, 'USER', 'user@faforever.com', '92b7b421992ef490f3b75898ec0e511f1a5c02422819d89719b20362b023ee4f', '127.0.0.1'), diff --git a/src/inttest/resources/sql/prepLeaderboardData.sql b/src/inttest/resources/sql/prepLeaderboardData.sql deleted file mode 100644 index e38c42729..000000000 --- a/src/inttest/resources/sql/prepLeaderboardData.sql +++ /dev/null @@ -1,12 +0,0 @@ -insert into ladder1v1_rating_rank_view (id, ranking, mean, deviation, num_games, win_games, rating) -VALUES (1, 1, 1500, 120, 5, 1, 1500 - 3 * 120), - (2, 2, 1200, 90, 5, 2, 1200 - 3 * 90), - (3, 3, 1000, 100, 5, 3, 1000 - 3 * 100); - -insert into global_rating_rank_view (id, ranking, mean, deviation, num_games, rating) -VALUES (1, 1, 1500, 120, 5, 1500 - 3 * 120), - (2, 2, 1200, 90, 5, 1200 - 3 * 90), - (3, 3, 1000, 100, 5, 1000 - 3 * 100); - - -commit; diff --git a/src/inttest/resources/sql/prepMapData.sql b/src/inttest/resources/sql/prepMapData.sql index 6d7afafc4..401d416a1 100644 --- a/src/inttest/resources/sql/prepMapData.sql +++ b/src/inttest/resources/sql/prepMapData.sql @@ -6,9 +6,6 @@ INSERT INTO map_version (id, description, max_players, width, height, version, f (1, 'SCMP 001', 8, 5, 5, 1, 'maps/scmp_001.v0001.zip', 0, 1), (2, 'SCMP 002', 8, 5, 5, 1, 'maps/scmp_002.v0001.zip', 0, 2); -INSERT INTO ladder_map (id, idmap) VALUES - (1, 1); - INSERT INTO map_pool (id, name) VALUES (1, 'Ladder 1v1 <300'), (2, 'Ladder 1v1 300-800'), diff --git a/src/inttest/resources/sql/truncateTables.sql b/src/inttest/resources/sql/truncateTables.sql index ff6b0f2f8..7e5504c32 100644 --- a/src/inttest/resources/sql/truncateTables.sql +++ b/src/inttest/resources/sql/truncateTables.sql @@ -17,19 +17,8 @@ DELETE FROM `game_player_stats`; DELETE FROM `game_review`; DELETE FROM `game_reviews_summary`; DELETE FROM `game_stats`; --- DELETE FROM `game_validity`; -DELETE FROM `global_rating`; -DELETE FROM `global_rating_distribution`; -DELETE FROM `global_rating_rank_view`; -- DELETE FROM `group_permission`; DELETE FROM `group_permission_assignment`; -DELETE FROM `jwt_users`; -DELETE FROM `ladder1v1_rating`; -DELETE FROM `ladder1v1_rating_distribution`; -DELETE FROM `ladder1v1_rating_rank_view`; -DELETE FROM `ladder_division`; -DELETE FROM `ladder_division_score`; -DELETE FROM `ladder_map`; -- DELETE FROM `leaderboard`; DELETE FROM `leaderboard_rating`; DELETE FROM `leaderboard_rating_journal`; @@ -53,8 +42,6 @@ DELETE FROM `mod_version_review`; DELETE FROM `mod_version_reviews_summary`; DELETE FROM `moderation_report`; DELETE FROM `name_history`; -DELETE FROM `oauth_clients`; -DELETE FROM `oauth_tokens`; DELETE FROM `patchs_table`; DELETE FROM `player_achievements`; DELETE FROM `player_events`; diff --git a/src/main/java/com/faforever/api/client/ClientType.java b/src/main/java/com/faforever/api/client/ClientType.java deleted file mode 100644 index af43bf3c4..000000000 --- a/src/main/java/com/faforever/api/client/ClientType.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.faforever.api.client; - -import java.util.HashMap; -import java.util.Map; - -public enum ClientType { - CONFIDENTIAL("confidential"), PUBLIC("public"); - - private static final Map fromString; - - static { - fromString = new HashMap<>(); - for (ClientType clientType : values()) { - fromString.put(clientType.string, clientType); - } - } - - private final String string; - - ClientType(String string) { - this.string = string; - } - - public String getString() { - return string; - } - - public static ClientType fromString(String string) { - if (!fromString.containsKey(string)) { - throw new IllegalArgumentException("No such client type: " + string); - } - return fromString.get(string); - } -} diff --git a/src/main/java/com/faforever/api/client/OAuthClient.java b/src/main/java/com/faforever/api/client/OAuthClient.java deleted file mode 100644 index e1ed4d5f9..000000000 --- a/src/main/java/com/faforever/api/client/OAuthClient.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.faforever.api.client; - -import lombok.Setter; -import org.jetbrains.annotations.Nullable; -import org.springframework.util.Assert; - -import jakarta.persistence.AttributeConverter; -import jakarta.persistence.Column; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotNull; - - -@Entity -@Table(name = "oauth_clients") -@Setter -public class OAuthClient { - - private String id; - private String name; - private String clientSecret; - private ClientType clientType; - private String redirectUris; - private String defaultRedirectUri; - private String defaultScope; - private String iconUrl; - private Boolean autoApproveScopes; - - @Id - @Column(name = "id") - public String getId() { - return id; - } - - @NotNull - @Column(name = "name") - public String getName() { - return name; - } - - @NotNull - @Column(name = "client_secret") - public String getClientSecret() { - return clientSecret; - } - - @NotNull - @Column(name = "client_type") - public ClientType getClientType() { - return clientType; - } - - @NotNull - @Column(name = "redirect_uris") - public String getRedirectUris() { - return redirectUris; - } - - @NotNull - @Column(name = "default_redirect_uri") - public String getDefaultRedirectUri() { - return defaultRedirectUri; - } - - @NotNull - @Column(name = "default_scope") - public String getDefaultScope() { - return defaultScope; - } - - @Column(name = "icon_url") - public String getIconUrl() { - return iconUrl; - } - - @Column(name = "auto_approve_scopes") - @Nullable - public Boolean isAutoApproveScopes() { - return autoApproveScopes; - } - - @Converter(autoApply = true) - public static class ClientTypeConverter implements AttributeConverter { - - @Override - public String convertToDatabaseColumn(ClientType attribute) { - Assert.isTrue(attribute != null, "'attribute' cannot be null"); - return attribute.getString(); - } - - @Override - public ClientType convertToEntityAttribute(String dbData) { - Assert.isTrue(dbData != null, "'dbData' cannot be null"); - return ClientType.fromString(dbData); - } - } -} diff --git a/src/main/java/com/faforever/api/client/OAuthClientRepository.java b/src/main/java/com/faforever/api/client/OAuthClientRepository.java deleted file mode 100644 index d6fbb1811..000000000 --- a/src/main/java/com/faforever/api/client/OAuthClientRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.faforever.api.client; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface OAuthClientRepository extends JpaRepository { - -} diff --git a/src/main/java/com/faforever/api/client/package-info.java b/src/main/java/com/faforever/api/client/package-info.java deleted file mode 100644 index c646d1eea..000000000 --- a/src/main/java/com/faforever/api/client/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains classes for accessing oauth_clients. - */ -package com.faforever.api.client; diff --git a/src/main/java/com/faforever/api/data/domain/Division.java b/src/main/java/com/faforever/api/data/domain/Division.java deleted file mode 100644 index 536585051..000000000 --- a/src/main/java/com/faforever/api/data/domain/Division.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.faforever.api.data.domain; - -import com.yahoo.elide.annotation.Include; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - -@Entity -@Table(name = "ladder_division") -@Include -@Data -@NoArgsConstructor -@EqualsAndHashCode(of = "id") -@ToString(of = {"id", "league", "name", "threshold"}, includeFieldNames = false) -public class Division { - private int id; - private String name; - private int league; - private int threshold; - - @Id - @Column(name = "id") - @GeneratedValue(strategy = GenerationType.IDENTITY) - public int getId() { - return id; - } - - @Column(name = "name", nullable = false) - public String getName() { - return name; - } - - @Column(name = "league") - public int getLeague() { - return league; - } - - @Column(name = "threshold") - public int getThreshold() { - return threshold; - } -} diff --git a/src/main/java/com/faforever/api/data/domain/GlobalRating.java b/src/main/java/com/faforever/api/data/domain/GlobalRating.java deleted file mode 100644 index 22cf4cac6..000000000 --- a/src/main/java/com/faforever/api/data/domain/GlobalRating.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.faforever.api.data.domain; - -import com.yahoo.elide.annotation.Include; - -import jakarta.persistence.Entity; -import jakarta.persistence.Table; - -@Entity -@Table(name = "global_rating_rank_view") -@Include(name = "globalRating") -public class GlobalRating extends Rating { -} diff --git a/src/main/java/com/faforever/api/data/domain/Ladder1v1Rating.java b/src/main/java/com/faforever/api/data/domain/Ladder1v1Rating.java deleted file mode 100644 index 1f2e130bb..000000000 --- a/src/main/java/com/faforever/api/data/domain/Ladder1v1Rating.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.faforever.api.data.domain; - -import com.yahoo.elide.annotation.Include; -import lombok.Setter; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; - -@Entity -@Setter -@Table(name = "ladder1v1_rating_rank_view") -@Include(name = "ladder1v1Rating") -public class Ladder1v1Rating extends Rating { - private int wonGames; - - @Column(name = "win_games", updatable = false) - public int getWonGames() { - return wonGames; - } -} diff --git a/src/main/java/com/faforever/api/data/domain/Player.java b/src/main/java/com/faforever/api/data/domain/Player.java index aca37d329..a34612b9a 100644 --- a/src/main/java/com/faforever/api/data/domain/Player.java +++ b/src/main/java/com/faforever/api/data/domain/Player.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.BatchSize; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; import jakarta.persistence.ManyToMany; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; @@ -27,26 +26,12 @@ public class Player extends Login { public static final String TYPE_NAME = "player"; - private Ladder1v1Rating ladder1v1Rating; - private GlobalRating globalRating; private ClanMembership clanMembership; private Set names; private Set avatarAssignments; private Set reporterOnModerationReports; private Set reportedOnModerationReports; - @OneToOne(mappedBy = "player", fetch = FetchType.LAZY) - @Deprecated - public Ladder1v1Rating getLadder1v1Rating() { - return ladder1v1Rating; - } - - @OneToOne(mappedBy = "player", fetch = FetchType.LAZY) - @Deprecated - public GlobalRating getGlobalRating() { - return globalRating; - } - // Permission is managed by ClanMembership class @UpdatePermission(expression = Prefab.ALL) @OneToOne(mappedBy = "player") diff --git a/src/main/java/com/faforever/api/data/domain/PlayerDivisionInfo.java b/src/main/java/com/faforever/api/data/domain/PlayerDivisionInfo.java deleted file mode 100644 index 37a408286..000000000 --- a/src/main/java/com/faforever/api/data/domain/PlayerDivisionInfo.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.faforever.api.data.domain; - -import com.yahoo.elide.annotation.Include; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; -import org.hibernate.annotations.JoinColumnOrFormula; -import org.hibernate.annotations.JoinColumnsOrFormulas; -import org.hibernate.annotations.JoinFormula; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; - -@Entity -@Table(name = "ladder_division_score") -@Include -@Data -@NoArgsConstructor -@EqualsAndHashCode(of = "id") -@ToString(of = {"id", "league", "player", "score"}) -public class PlayerDivisionInfo { - - private int id; - private int season; - private Player player; - private int league; - private float score; - private int games; - private Division division; - - @Id - @Column(name = "id") - @GeneratedValue(strategy = GenerationType.IDENTITY) - public int getId() { - return id; - } - - @Column(name = "season") - public int getSeason() { - return season; - } - - @ManyToOne - @JoinColumn(name = "user_id") - public Player getPlayer() { - return player; - } - - @Column(name = "league") - public int getLeague() { - return league; - } - - @Column(name = "score") - public float getScore() { - return score; - } - - @Column(name = "games") - public int getGames() { - return games; - } - - @ManyToOne - @JoinColumnsOrFormulas({ - @JoinColumnOrFormula(formula = @JoinFormula(value = "(SELECT d.id from ladder_division d WHERE d.league = league AND score <= d.threshold ORDER BY d.threshold DESC LIMIT 1)", referencedColumnName = "id")), - }) - public Division getDivision() { - return division; - } -} diff --git a/src/main/java/com/faforever/api/data/domain/Rating.java b/src/main/java/com/faforever/api/data/domain/Rating.java deleted file mode 100644 index 8adaa877f..000000000 --- a/src/main/java/com/faforever/api/data/domain/Rating.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.faforever.api.data.domain; - - -import lombok.Setter; -import org.hibernate.annotations.Generated; -import org.hibernate.annotations.GenerationTime; - -import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.MappedSuperclass; -import jakarta.persistence.OneToOne; - -@MappedSuperclass -@Setter -public abstract class Rating { - private int id; - private int ranking; - private Double mean; - private Double deviation; - private Player player; - private Double rating; - private int numberOfGames; - - @Id - @Column(name = "id") - public int getId() { - return id; - } - - @Column(name = "ranking") - public int getRanking() { - return ranking; - } - - @Column(name = "mean") - public Double getMean() { - return mean; - } - - @Column(name = "deviation") - public Double getDeviation() { - return deviation; - } - - @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id", updatable = false, insertable = false) - public Player getPlayer() { - return player; - } - - @Column(name = "rating", updatable = false, insertable = false) - @Generated(GenerationTime.ALWAYS) - public Double getRating() { - return rating; - } - - @Column(name = "num_games", updatable = false) - public int getNumberOfGames() { - return numberOfGames; - } -} diff --git a/src/main/java/com/faforever/api/rating/GlobalRatingRepository.java b/src/main/java/com/faforever/api/rating/GlobalRatingRepository.java deleted file mode 100644 index 09051775e..000000000 --- a/src/main/java/com/faforever/api/rating/GlobalRatingRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.faforever.api.rating; - -import com.faforever.api.data.domain.GlobalRating; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface GlobalRatingRepository extends JpaRepository { - -} diff --git a/src/main/java/com/faforever/api/rating/Ladder1v1RatingRepository.java b/src/main/java/com/faforever/api/rating/Ladder1v1RatingRepository.java deleted file mode 100644 index 01a9520ec..000000000 --- a/src/main/java/com/faforever/api/rating/Ladder1v1RatingRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.faforever.api.rating; - -import com.faforever.api.data.domain.Ladder1v1Rating; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface Ladder1v1RatingRepository extends JpaRepository { -} diff --git a/src/main/java/com/faforever/api/user/UserService.java b/src/main/java/com/faforever/api/user/UserService.java index bc93c90a6..bcf8a406e 100644 --- a/src/main/java/com/faforever/api/user/UserService.java +++ b/src/main/java/com/faforever/api/user/UserService.java @@ -2,8 +2,6 @@ import com.faforever.api.config.FafApiProperties; import com.faforever.api.data.domain.AccountLink; -import com.faforever.api.data.domain.GlobalRating; -import com.faforever.api.data.domain.Ladder1v1Rating; import com.faforever.api.data.domain.LinkedServiceType; import com.faforever.api.data.domain.NameRecord; import com.faforever.api.data.domain.User; @@ -12,8 +10,6 @@ import com.faforever.api.error.Error; import com.faforever.api.error.ErrorCode; import com.faforever.api.player.PlayerRepository; -import com.faforever.api.rating.GlobalRatingRepository; -import com.faforever.api.rating.Ladder1v1RatingRepository; import com.faforever.api.security.FafAuthenticationToken; import com.faforever.api.security.FafPasswordEncoder; import com.faforever.api.security.FafTokenService; @@ -67,8 +63,6 @@ public class UserService { private final FafTokenService fafTokenService; private final SteamService steamService; private final GogService gogService; - private final GlobalRatingRepository globalRatingRepository; - private final Ladder1v1RatingRepository ladder1v1RatingRepository; private final MeterRegistry meterRegistry; private final Counter userRegistrationCounter; private final Counter userActivationCounter; @@ -94,8 +88,6 @@ public UserService(EmailService emailService, FafTokenService fafTokenService, SteamService steamService, GogService gogService, - GlobalRatingRepository globalRatingRepository, - Ladder1v1RatingRepository ladder1v1RatingRepository, MeterRegistry meterRegistry, ApplicationEventPublisher eventPublisher) { this.emailService = emailService; @@ -108,8 +100,6 @@ public UserService(EmailService emailService, this.fafTokenService = fafTokenService; this.steamService = steamService; this.gogService = gogService; - this.globalRatingRepository = globalRatingRepository; - this.ladder1v1RatingRepository = ladder1v1RatingRepository; this.eventPublisher = eventPublisher; this.meterRegistry = meterRegistry; @@ -180,7 +170,7 @@ private void validateUsername(String username) { * */ @Transactional - void activate(String registrationToken, String password, String ipAddress) { + public void activate(String registrationToken, String password, String ipAddress) { Map claims = fafTokenService.resolveToken(FafTokenType.REGISTRATION, registrationToken); String username = claims.get(KEY_USERNAME); @@ -197,23 +187,6 @@ void activate(String registrationToken, String password, String ipAddress) { user = userRepository.save(user); - // @Deprecated - // TODO: Move this db activity to the server (upcert instead of update) */ - // >>> - double mean = properties.getRating().getDefaultMean(); - double deviation = properties.getRating().getDefaultDeviation(); - - globalRatingRepository.save((GlobalRating) new GlobalRating() - .setId(user.getId()) - .setMean(mean) - .setDeviation(deviation)); - - ladder1v1RatingRepository.save((Ladder1v1Rating) new Ladder1v1Rating() - .setId(user.getId()) - .setMean(mean) - .setDeviation(deviation)); - // <<< - log.info("User has been activated: {}", user); broadcastUserChange(user); diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index a12ea67f7..848cc356d 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -18,7 +18,7 @@ faf-api: hmac-secret: ${CLOUDFLARE_HMAC_SECRET} hmac-param: ${CLOUDFLARE_HMAC_PARAM:verify} database: - schema-version: ${DATABASE_SCHEMA_VERSION:129} + schema-version: ${DATABASE_SCHEMA_VERSION:133} deployment: forged-alliance-exe-path: ${FORGED_ALLIANCE_EXE_PATH:/content/legacy-featured-mod-files/updates_faf_files/ForgedAlliance.exe} repositories-directory: ${REPOSITORIES_DIRECTORY:/repositories} diff --git a/src/test/java/com/faforever/api/user/UserServiceTest.java b/src/test/java/com/faforever/api/user/UserServiceTest.java index dc2c483f7..e7d89acfd 100644 --- a/src/test/java/com/faforever/api/user/UserServiceTest.java +++ b/src/test/java/com/faforever/api/user/UserServiceTest.java @@ -2,8 +2,6 @@ import com.faforever.api.config.FafApiProperties; import com.faforever.api.data.domain.AccountLink; -import com.faforever.api.data.domain.GlobalRating; -import com.faforever.api.data.domain.Ladder1v1Rating; import com.faforever.api.data.domain.LinkedServiceType; import com.faforever.api.data.domain.NameRecord; import com.faforever.api.data.domain.User; @@ -12,8 +10,6 @@ import com.faforever.api.error.Error; import com.faforever.api.error.ErrorCode; import com.faforever.api.player.PlayerRepository; -import com.faforever.api.rating.GlobalRatingRepository; -import com.faforever.api.rating.Ladder1v1RatingRepository; import com.faforever.api.security.FafPasswordEncoder; import com.faforever.api.security.FafTokenService; import com.faforever.api.security.FafTokenType; @@ -94,10 +90,6 @@ public class UserServiceTest { private GogService gogService; @Mock private FafTokenService fafTokenService; - @Mock - private GlobalRatingRepository globalRatingRepository; - @Mock - private Ladder1v1RatingRepository ladder1v1RatingRepository; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private MeterRegistry meterRegistry; @Mock @@ -131,8 +123,6 @@ public void setUp() { fafTokenService, steamService, gogService, - globalRatingRepository, - ladder1v1RatingRepository, meterRegistry, eventPublisher); validUser = createUser(TEST_USERID, TEST_USERNAME, TEST_CURRENT_PASSWORD, TEST_CURRENT_EMAIL, IP_ADDRESS); @@ -200,8 +190,6 @@ public void activate() throws Exception{ ArgumentCaptor captor = ArgumentCaptor.forClass(User.class); verify(userRepository).save(captor.capture()); - verify(globalRatingRepository).save(any(GlobalRating.class)); - verify(ladder1v1RatingRepository).save(any(Ladder1v1Rating.class)); User user = captor.getValue(); assertThat(user.getLogin(), is(TEST_USERNAME));