Skip to content

Commit 2879712

Browse files
committed
Refactor unit tests and original clan create
1 parent 1f7e66c commit 2879712

File tree

2 files changed

+174
-271
lines changed

2 files changed

+174
-271
lines changed

src/main/java/com/faforever/api/clan/ClanService.java

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import java.time.Instant;
2424
import java.time.temporal.ChronoUnit;
25-
import java.util.Collections;
2625
import java.util.List;
2726

2827
@Service
@@ -67,36 +66,17 @@ public void preCreate(Clan clan) {
6766
@SneakyThrows
6867
@Transactional
6968
@Deprecated
70-
// use preCreate instead
69+
// use POST via Elide instead
7170
Clan create(String name, String tag, String description) {
72-
Player creator = playerService.getCurrentPlayer();
73-
74-
if (creator.getClanMembership() != null) {
75-
throw ApiException.of(ErrorCode.CLAN_CREATE_FOUNDER_IS_IN_A_CLAN);
76-
}
77-
if (clanRepository.findOneByName(name).isPresent()) {
78-
throw ApiException.of(ErrorCode.CLAN_NAME_EXISTS, name);
79-
}
80-
if (clanRepository.findOneByTag(tag).isPresent()) {
81-
throw ApiException.of(ErrorCode.CLAN_TAG_EXISTS, tag);
82-
}
83-
8471
Clan clan = new Clan();
8572
clan.setName(name);
8673
clan.setTag(tag);
8774
clan.setDescription(description);
8875
clan.setRequiresInvitation(true);
76+
clan.setFounder(playerService.getCurrentPlayer());
77+
clan.setLeader(playerService.getCurrentPlayer());
8978

90-
clan.setFounder(creator);
91-
clan.setLeader(creator);
92-
93-
ClanMembership membership = new ClanMembership();
94-
membership.setClan(clan);
95-
membership.setPlayer(creator);
96-
97-
clan.setMemberships(Collections.singletonList(membership));
98-
99-
// clan membership is saved over cascading, otherwise validation will fail
79+
// validation is done at preCreate() called by ClanListener
10080
clanRepository.save(clan);
10181
return clan;
10282
}

0 commit comments

Comments
 (0)