Fix tests

Author: Brutus5000

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

@@ -16,12 +16,12 @@
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepDefaultData.sql")
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepMapData.sql")
 public class MapPoolElideTest extends AbstractIntegrationTest {
-  private static final String NEW_LADDER_MAP_BODY = "{\"data\":{\"type\":\"mapVersion\",\"id\":\"2\"}}}";
+  private static final String NEW_LADDER_MAP_BODY = "{\"data\":[{\"type\":\"mapVersion\",\"id\":\"2\"}]}";
 
   @Test
   public void cannotCreateMapPoolItemWithoutScope() throws Exception {
     mockMvc.perform(
-      post("/data/mapPool/1/mapVersions")
+      post("/data/mapPool/1/relationships/mapVersions")
         .with(getOAuthTokenWithTestUser(NO_SCOPE, GroupPermission.ROLE_WRITE_MATCHMAKER_MAP))
         .header(HttpHeaders.CONTENT_TYPE, JsonApiMediaType.JSON_API_MEDIA_TYPE)
         .content(NEW_LADDER_MAP_BODY)) // magic value from prepMapData.sql
@@ -31,7 +31,7 @@ public void cannotCreateMapPoolItemWithoutScope() throws Exception {
   @Test
   public void cannotCreateMapPoolItemWithoutRole() throws Exception {
     mockMvc.perform(
-      post("/data/mapPool/1/mapVersions")
+      post("/data/mapPool/1/relationships/mapVersions")
         .with(getOAuthTokenWithTestUser(OAuthScope._ADMINISTRATIVE_ACTION, NO_AUTHORITIES))
         .header(HttpHeaders.CONTENT_TYPE, JsonApiMediaType.JSON_API_MEDIA_TYPE)
         .content(NEW_LADDER_MAP_BODY)) // magic value from prepMapData.sql
@@ -41,34 +41,37 @@ public void cannotCreateMapPoolItemWithoutRole() throws Exception {
   @Test
   public void canCreateMapPoolItemWithScopeAndRole() throws Exception {
     mockMvc.perform(
-      post("/data/mapPool/1/mapVersions")
+      post("/data/mapPool/1/relationships/mapVersions")
         .with(getOAuthTokenWithTestUser(OAuthScope._ADMINISTRATIVE_ACTION, GroupPermission.ROLE_WRITE_MATCHMAKER_MAP))
         .header(HttpHeaders.CONTENT_TYPE, JsonApiMediaType.JSON_API_MEDIA_TYPE)
         .content(NEW_LADDER_MAP_BODY)) // magic value from prepMapData.sql
-      .andExpect(status().isCreated());
+      .andExpect(status().isNoContent());
   }
 
   @Test
   public void canDeleteMapPoolItemWithScopeAndRole() throws Exception {
     mockMvc.perform(
-      delete("/data/mapPool/1/mapVersions/1")
-        .with(getOAuthTokenWithTestUser(OAuthScope._ADMINISTRATIVE_ACTION, GroupPermission.ROLE_WRITE_MATCHMAKER_MAP))) // magic value from prepMapData.sql
+      delete("/data/mapPool/1/relationships/mapVersions/1")
+        .with(getOAuthTokenWithTestUser(OAuthScope._ADMINISTRATIVE_ACTION, GroupPermission.ROLE_WRITE_MATCHMAKER_MAP))
+        .content(NEW_LADDER_MAP_BODY)) // magic value from prepMapData.sql
       .andExpect(status().isNoContent());
   }
 
   @Test
   public void cannotDeleteMapPoolItemWithoutScope() throws Exception {
     mockMvc.perform(
-      delete("/data/mapPool/1/mapVersions/1")
-        .with(getOAuthTokenWithTestUser(NO_SCOPE, GroupPermission.ROLE_WRITE_MATCHMAKER_MAP))) // magic value from prepMapData.sql
+      delete("/data/mapPool/1/relationships/mapVersions/1")
+        .with(getOAuthTokenWithTestUser(NO_SCOPE, GroupPermission.ROLE_WRITE_MATCHMAKER_MAP))
+        .content(NEW_LADDER_MAP_BODY)) // magic value from prepMapData.sql
       .andExpect(status().isForbidden());
   }
 
   @Test
   public void cannotDeleteMapPoolItemWithoutRole() throws Exception {
     mockMvc.perform(
       delete("/data/mapPool/1")
-        .with(getOAuthTokenWithTestUser(OAuthScope._ADMINISTRATIVE_ACTION, NO_AUTHORITIES))) // magic value from prepMapData.sql
+        .with(getOAuthTokenWithTestUser(OAuthScope._ADMINISTRATIVE_ACTION, NO_AUTHORITIES))
+        .content(NEW_LADDER_MAP_BODY)) // magic value from prepMapData.sql
       .andExpect(status().isForbidden());
   }
 }

src/main/java/com/faforever/api/data/DataController.java

@@ -15,7 +15,6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.HandlerMapping;
@@ -117,11 +116,12 @@ public ResponseEntity<String> extensionPatch(@RequestParam final Map<String, Str
   @DeleteMapping(value = "/**", produces = JSON_API_MEDIA_TYPE)
   @PreAuthorize("isAuthenticated()")
   public ResponseEntity<String> delete(@RequestParam final Map<String, String> allRequestParams,
+                                       @RequestBody(required = false) final String body,
                                        final HttpServletRequest request,
                                        final Authentication authentication) {
     ElideResponse response = elide.delete(
       getJsonApiPath(request),
-      null,
+      body,
       new MultivaluedHashMap<>(allRequestParams),
       getPrincipal(authentication)
     );

src/main/java/com/faforever/api/data/domain/MapPool.java

@@ -4,10 +4,8 @@
 import com.yahoo.elide.annotation.CreatePermission;
 import com.yahoo.elide.annotation.DeletePermission;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-import org.hibernate.annotations.Immutable;
 
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -24,7 +22,6 @@
 @CreatePermission(expression = WriteMatchmakerMapCheck.EXPRESSION)
 @UpdatePermission(expression = WriteMatchmakerMapCheck.EXPRESSION)
 @DeletePermission(expression = WriteMatchmakerMapCheck.EXPRESSION)
-@SharePermission
 public class MapPool extends AbstractEntity {
   private String name;
   private Set<MapVersion> mapVersions;