|
22 | 22 |
|
23 | 23 | import java.time.Instant; |
24 | 24 | import java.time.temporal.ChronoUnit; |
25 | | -import java.util.Collections; |
26 | 25 | import java.util.List; |
27 | 26 |
|
28 | 27 | @Service |
@@ -67,36 +66,17 @@ public void preCreate(Clan clan) { |
67 | 66 | @SneakyThrows |
68 | 67 | @Transactional |
69 | 68 | @Deprecated |
70 | | - // use preCreate instead |
| 69 | + // use POST via Elide instead |
71 | 70 | 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 | | - |
84 | 71 | Clan clan = new Clan(); |
85 | 72 | clan.setName(name); |
86 | 73 | clan.setTag(tag); |
87 | 74 | clan.setDescription(description); |
88 | 75 | clan.setRequiresInvitation(true); |
| 76 | + clan.setFounder(playerService.getCurrentPlayer()); |
| 77 | + clan.setLeader(playerService.getCurrentPlayer()); |
89 | 78 |
|
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 |
100 | 80 | clanRepository.save(clan); |
101 | 81 | return clan; |
102 | 82 | } |
|
0 commit comments