Refactor unit tests and original clan create

FAForever · Aug 19, 2020 · 2879712 · 2879712
1 parent 1f7e66c
commit 2879712
Show file tree

Hide file tree

Showing 2 changed files with 174 additions and 271 deletions.
diff --git a/src/main/java/com/faforever/api/clan/ClanService.java b/src/main/java/com/faforever/api/clan/ClanService.java
@@ -22,7 +22,6 @@
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -67,36 +66,17 @@ public void preCreate(Clan clan) {
   @SneakyThrows
   @Transactional
   @Deprecated
-    // use preCreate instead
+    // use POST via Elide instead
   Clan create(String name, String tag, String description) {
-    Player creator = playerService.getCurrentPlayer();
-
-    if (creator.getClanMembership() != null) {
-      throw ApiException.of(ErrorCode.CLAN_CREATE_FOUNDER_IS_IN_A_CLAN);
-    }
-    if (clanRepository.findOneByName(name).isPresent()) {
-      throw ApiException.of(ErrorCode.CLAN_NAME_EXISTS, name);
-    }
-    if (clanRepository.findOneByTag(tag).isPresent()) {
-      throw ApiException.of(ErrorCode.CLAN_TAG_EXISTS, tag);
-    }
-
     Clan clan = new Clan();
     clan.setName(name);
     clan.setTag(tag);
     clan.setDescription(description);
     clan.setRequiresInvitation(true);
+    clan.setFounder(playerService.getCurrentPlayer());
+    clan.setLeader(playerService.getCurrentPlayer());
 
-    clan.setFounder(creator);
-    clan.setLeader(creator);
-
-    ClanMembership membership = new ClanMembership();
-    membership.setClan(clan);
-    membership.setPlayer(creator);
-
-    clan.setMemberships(Collections.singletonList(membership));
-
-    // clan membership is saved over cascading, otherwise validation will fail
+    // validation is done at preCreate() called by ClanListener
     clanRepository.save(clan);
     return clan;
   }