Mostly there

Author: Sheikah45

src/inttest/java/com/faforever/api/AbstractIntegrationTest.java

@@ -34,6 +34,7 @@
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.RabbitMQContainer;
@@ -50,6 +51,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @ActiveProfiles(ApplicationProfile.INTEGRATION_TEST)
+@Transactional
 @Import(OAuthHelper.class)
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/truncateTables.sql")
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepDefaultData.sql")

src/inttest/java/com/faforever/api/data/BanTest.java

@@ -12,6 +12,8 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.OffsetDateTime;
 
@@ -150,6 +152,7 @@ public void canRevokeBanWithScopeAndRole() throws Exception {
   }
 
   @Test
+  @Transactional(propagation = Propagation.NOT_SUPPORTED)
   public void canCreateBanWithModerationWithScopeAndRole() throws Exception {
 
     final BanInfo ban = new BanInfo()

src/inttest/java/com/faforever/api/data/ClanElideTest.java

@@ -13,6 +13,8 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -166,14 +168,10 @@ private String generateTransferLeadershipContent(int clanId, int newLeaderId) {
   }
 
   @Test
+  @Transactional(propagation = Propagation.NOT_SUPPORTED)
   public void canDeleteClanAsLeader() throws Exception {
-    Clan clan = clanRepository.findOneByName("Alpha Clan")
-      .orElseThrow(() -> new IllegalStateException("Alpha Clan could not be found"));
-
-    List<Player> clanMember = new ArrayList<>();
-    clan.getMemberships().stream()
-      .map(ClanMembership::getPlayer)
-      .forEach(clanMember::add);
+//    clanRepository.findOneByName("Alpha Clan")
+//      .orElseThrow(() -> new IllegalStateException("Alpha Clan could not be found"));
 
     mockMvc.perform(
         delete("/data/clan/1")

src/inttest/java/com/faforever/api/moderationreport/ModerationReportTest.java

@@ -14,6 +14,8 @@
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Set;
 
@@ -165,6 +167,7 @@ public void cannotUpdateSomeoneElsesReport() throws Exception {
   }
 
   @Test
+  @Transactional(propagation = Propagation.NOT_SUPPORTED)
   public void canUpdateOwnReport() throws Exception {
     reportedUsers.add((Player) new Player().setId("1"));
 
@@ -252,6 +255,7 @@ public void canUpdateReportStatusWithScopeAndRole() throws Exception {
   }
 
   @Test
+  @Transactional(propagation = Propagation.NOT_SUPPORTED)
   public void canUpdateNoticeWithScopeAndRole() throws Exception {
     final ModerationReport updatedPublicNoteModerationReport = (ModerationReport) new ModerationReport()
       .setModeratorNotice("New moderator notice")
@@ -295,6 +299,7 @@ public void cannotUpdateNoticeWithoutRole() throws Exception {
   }
 
   @Test
+  @Transactional(propagation = Propagation.NOT_SUPPORTED)
   public void canUpdatePrivateNoteWithScopeAndRole() throws Exception {
     final ModerationReport updatedPrivateNoteModerationReport = (ModerationReport) new ModerationReport()
       .setModeratorPrivateNote("New moderator private note")
@@ -338,6 +343,7 @@ public void cannotUpdatePrivateNoteWithoutRole() throws Exception {
   }
 
   @Test
+  @Transactional(propagation = Propagation.NOT_SUPPORTED)
   public void lastModeratorIsUpdatedWhenCalledByModerator() throws Exception {
     final ModerationReport updatedPrivateNoteModerationReport = (ModerationReport) new ModerationReport()
       .setModeratorPrivateNote("New moderator private note")

src/inttest/java/com/faforever/api/user/UsersControllerTest.java

@@ -339,7 +339,7 @@ public void linkToSteamAlreadyLinkedAccount() throws Exception {
       .andExpect(redirectedUrlPattern(callbackUrl + "?errors=*" + ErrorCode.STEAM_ID_ALREADY_LINKED.getCode() + "*" + userThatOwnsSteamId.getLogin() + "*"));
     //We expect and error with code STEAM_ID_ALREADY_LINKED and that the error message contains the user that this steam account was linked to already which is MODERATOR with id 2
 
-    assertThat(accountLinkRepository.existsByUserAndServiceType(userRepository.getReferenceById(1), LinkedServiceType.STEAM), is(false));
+    assertThat(accountLinkRepository.existsByUserAndServiceType(userRepository.findById(1).orElseThrow(), LinkedServiceType.STEAM), is(false));
   }
 
   @Test
@@ -519,7 +519,7 @@ public void linkToGogSuccess() throws Exception {
         .params(params))
       .andExpect(status().isOk());
 
-    assertThat(accountLinkRepository.existsByUserAndServiceType(userRepository.getReferenceById(1), LinkedServiceType.GOG), is(true));
+    assertThat(accountLinkRepository.existsByUserAndServiceType(userRepository.findById(1).orElseThrow(), LinkedServiceType.GOG), is(true));
   }
 
   @Test
@@ -535,6 +535,6 @@ public void linkToGogAlreadyLinked() throws Exception {
           .params(params))
       .andExpect(status().isUnprocessableEntity());
 
-    assertThat(accountLinkRepository.existsByUserAndServiceType(userRepository.getReferenceById(1), LinkedServiceType.GOG), is(false));
+    assertThat(accountLinkRepository.existsByUserAndServiceType(userRepository.findById(1).orElseThrow(), LinkedServiceType.GOG), is(false));
   }
 }

src/inttest/java/com/faforever/api/utils/OAuthHelper.java

@@ -9,6 +9,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -23,8 +24,9 @@ public OAuthHelper(PlayerRepository playerRepository) {
     this.playerRepository = playerRepository;
   }
 
+  @Transactional
   public RequestPostProcessor addBearerTokenForUser(int userId, @NotNull Set<String> scopes) {
-    Player user = playerRepository.getReferenceById(userId);
+    Player user = playerRepository.findById(userId).orElseThrow();
 
     Set<FafRole> roles = user.getUserGroups().stream()
       .flatMap(userGroup -> userGroup.getPermissions().stream())