Check for existing Mod UID

Fixes #99
FAForever · May 29, 2017 · 70c604c · 70c604c
1 parent ab131ff
commit 70c604c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/com/faforever/api/mod/ModService.java b/src/main/java/com/faforever/api/mod/ModService.java
@@ -65,7 +65,8 @@ public void processUploadedMod(Path uploadedFile, Player uploader) {
       throw new ApiException(new Error(ErrorCode.MOD_NOT_ORIGINAL_AUTHOR));
     }
 
-    if (modExists(displayName, version)) {
+    String uid = modInfo.getUid();
+    if (modExists(displayName, version, uid)) {
       throw new ApiException(new Error(ErrorCode.MOD_VERSION_EXISTS));
     }
 
@@ -93,13 +94,15 @@ public void processUploadedMod(Path uploadedFile, Player uploader) {
     }
   }
 
-  private boolean modExists(String displayName, short version) {
-    ModVersion probe = new ModVersion()
+  private boolean modExists(String displayName, short version, String uid) {
+    ModVersion versionAndNameProbe = new ModVersion()
       .setVersion(version)
       .setMod(new Mod()
         .setDisplayName(displayName)
       );
-    return modVersionRepository.exists(Example.of(probe, ExampleMatcher.matching().withIgnoreCase()));
+
+    return modVersionRepository.exists(Example.of(versionAndNameProbe, ExampleMatcher.matching().withIgnoreCase()))
+      || modVersionRepository.existsByUid(uid);
   }
 
   private boolean canUploadMod(String displayName, Player uploader) {

diff --git a/src/main/java/com/faforever/api/mod/ModVersionRepository.java b/src/main/java/com/faforever/api/mod/ModVersionRepository.java
@@ -6,4 +6,5 @@
 
 @Repository
 public interface ModVersionRepository extends JpaRepository<ModVersion, Integer> {
+  boolean existsByUid(String uid);
 }
diff --git a/src/test/java/com/faforever/api/mod/ModServiceTest.java b/src/test/java/com/faforever/api/mod/ModServiceTest.java
@@ -12,6 +12,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.data.domain.Example;
 
 import java.io.BufferedInputStream;
 import java.io.InputStream;
@@ -51,6 +52,7 @@ public void setUp() throws Exception {
   }
 
   @Test
+  @SuppressWarnings("unchecked")
   public void processUploadedMod() throws Exception {
     Path uploadedFile = temporaryFolder.getRoot().toPath().resolve("uploaded-mod.zip");
     try (InputStream inputStream = new BufferedInputStream(getClass().getResourceAsStream(TEST_MOD))) {
@@ -83,6 +85,10 @@ public void processUploadedMod() throws Exception {
     assertThat(savedModVersion.getMod(), is(savedMod));
     assertThat(savedModVersion.isRanked(), is(false));
     assertThat(savedModVersion.isHidden(), is(false));
+
+    ArgumentCaptor<Example<ModVersion>> exampleCaptor = ArgumentCaptor.forClass((Class) ModVersion.class);
+    verify(modVersionRepository).exists(exampleCaptor.capture());
+    verify(modVersionRepository).existsByUid("26778D4E-BA75-5CC2-CBA8-63795BDE74AA");
   }
 
   // TODO test error cases