Consider avatar description also on upload

Author: Brutus5000

src/inttest/java/com/faforever/api/avatar/AvatarControllerTest.java

@@ -9,9 +9,9 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
@@ -35,7 +35,7 @@
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepDefaultData.sql")
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepAvatarData.sql")
 public class AvatarControllerTest extends AbstractIntegrationTest {
-  @SpyBean
+  @MockitoSpyBean
   AuditService auditServiceSpy;
 
   @Autowired
@@ -51,6 +51,7 @@ public void canUploadWithScopeAndRole() throws Exception {
     final Avatar avatar = avatarRepository.findOneByFilename("avatar3.png").get();
     assertThat(avatar.getFilename(), is("avatar3.png"));
     assertThat(avatar.getTooltip(), is("Best avatar"));
+    assertThat(avatar.getDescription(), is("We like it"));
 
     verify(auditServiceSpy, times(1)).logMessage(any());
   }
@@ -67,6 +68,7 @@ public void canReuploadWithScopeAndRole() throws Exception {
     final Avatar avatar = avatarRepository.findOneByFilename("avatar1.png").get();
     assertThat(avatar.getFilename(), is("avatar1.png"));
     assertThat(avatar.getTooltip(), is("Best avatar"));
+    assertThat(avatar.getDescription(), is("We like it"));
     verify(auditServiceSpy, times(1)).logMessage(any());
   }
 

src/inttest/java/com/faforever/api/user/UsersControllerTest.java

@@ -12,9 +12,9 @@
 import com.faforever.api.security.OAuthScope;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.util.MultiValueMap;
 
@@ -43,13 +43,13 @@ public class UsersControllerTest extends AbstractIntegrationTest {
   private static final String NEW_PASSWORD = "newPassword";
   private static final String NEW_EMAIL = "[email protected]";
 
-  @MockBean
+  @MockitoBean
   private EmailSender emailSender;
 
-  @MockBean
+  @MockitoBean
   private SteamService steamService;
 
-  @MockBean
+  @MockitoBean
   private GogService gogService;
 
   @Autowired

src/main/java/com/faforever/api/avatar/AvatarMetadata.java

@@ -5,4 +5,5 @@
 @Data
 public class AvatarMetadata {
   private String name;
+  private String description;
 }

src/main/java/com/faforever/api/avatar/AvatarService.java

@@ -19,7 +19,7 @@
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.MemoryCacheImageInputStream;
-import java.awt.Dimension;
+import java.awt.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -51,6 +51,7 @@ public void createAvatar(AvatarMetadata avatarMetadata, String originalFilename,
       throw new ApiException(new Error(ErrorCode.AVATAR_NAME_CONFLICT, normalizedAvatarFileName));
     });
     avatarToCreate.setTooltip(avatarMetadata.getName())
+      .setDescription(avatarMetadata.getDescription())
       .setFilename(normalizedAvatarFileName);
 
     final InputStream markSupportedImageInputStream = getMarkSupportedInputStream(imageDataInputStream);
@@ -68,7 +69,9 @@ public void createAvatar(AvatarMetadata avatarMetadata, String originalFilename,
   public void updateAvatar(Integer avatarId, AvatarMetadata avatarMetadata, String originalFilename, InputStream imageDataInputStream, long avatarImageFileSize) {
     final Avatar existingAvatar = getExistingAvatar(avatarId);
     final String normalizedAvatarFileName = getFileNameFromUrl(existingAvatar.getUrl());
-    existingAvatar.setTooltip(avatarMetadata.getName());
+    existingAvatar
+      .setTooltip(avatarMetadata.getName())
+      .setDescription(avatarMetadata.getDescription());
 
     final InputStream markSupportedImageInputStream = getMarkSupportedInputStream(imageDataInputStream);
     validateImageFile(originalFilename, avatarImageFileSize);

src/test/java/com/faforever/api/avatar/AvatarServiceTest.java

@@ -39,8 +39,11 @@ public class AvatarServiceTest {
   private static final long VALID_FILE_SIZE = 1024;
   private static final long TOO_BIG_FILE_SIZE = 2048;
   private static final String AVATAR_NAME = "Nice Avatar";
+  private static final String AVATAR_DESCRIPTION = "Only for nice people";
   private static final String EXISTING_AVATAR_NAME = "Existing Nice Avatar";
-  private static final AvatarMetadata AVATAR_METADATA = new AvatarMetadata().setName(AVATAR_NAME);
+  private static final AvatarMetadata AVATAR_METADATA = new AvatarMetadata()
+    .setName(AVATAR_NAME)
+    .setDescription(AVATAR_DESCRIPTION);
   private static final String EXISTING_VALID_AVATAR_FILENAME = "qai.png";
   private static final String VALID_AVATAR_FILENAME = "qai2.png";
   private static final String BIG_AVATAR_FILENAME = "donator.png";
@@ -97,6 +100,7 @@ public void newAvatarUploadWithValidName() throws Exception {
       String expectedFilename = NameUtil.normalizeFileName(worstCasePrefix + avatarFileName);
       assertEquals(expectedFilename, storedAvatar.getFilename());
       assertEquals(AVATAR_NAME, storedAvatar.getTooltip());
+      assertEquals(AVATAR_DESCRIPTION, storedAvatar.getDescription());
       assertThat(avatarsPath.resolve(expectedFilename).toFile().length(), is(imageResource.openConnection().getContentLengthLong()));
     }
   }
@@ -118,6 +122,7 @@ public void existingAvatarReuploadWithDifferentValidName() throws Exception {
       final Avatar storedAvatar = avatarCaptor.getValue();
       assertEquals(String.format(DOWNLOAD_URL_FORMAT, EXISTING_VALID_AVATAR_FILENAME), storedAvatar.getUrl());
       assertEquals(AVATAR_NAME, storedAvatar.getTooltip());
+      assertEquals(AVATAR_DESCRIPTION, storedAvatar.getDescription());
       assertThat(avatarsPath.resolve(EXISTING_VALID_AVATAR_FILENAME).toFile().length(), is(imageResource.openConnection().getContentLengthLong()));
     }
   }

src/test/java/com/faforever/api/config/TestWebSecurityConfig.java

@@ -3,14 +3,15 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.web.SecurityFilterChain;
 
 @Order(1)
 public class TestWebSecurityConfig {
 
   @Bean
   public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-    http.csrf().disable();
+    http.csrf(AbstractHttpConfigurer::disable);
     return http.build();
   }
 }

src/test/java/com/faforever/api/deployment/ExeUploaderControllerTest.java

@@ -7,9 +7,9 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -27,13 +27,13 @@ public class ExeUploaderControllerTest {
 
   public static final String API_KEY = "banana";
   private MockMvc mvc;
-  @MockBean
+  @MockitoBean
   private ExeUploaderService exeUploaderService;
-  @MockBean
+  @MockitoBean
   private FafApiProperties fafApiProperties;
-  @MockBean
+  @MockitoBean
   private FafApiProperties.Deployment deployment;
-  @MockBean
+  @MockitoBean
   private FafApiProperties.Monitoring monitoring;
 
   @Mock

src/test/resources/avatars/metadata.json

@@ -1,3 +1,4 @@
 {
-  "name": "Best avatar"
+  "name": "Best avatar",
+  "description": "We like it"
 }