Closes #899 Add avatar description field

Author: Brutus5000

compose.yaml

@@ -16,7 +16,7 @@ services:
       - "3306:3306"
 
   faf-db-migrations:
-    image: faforever/faf-db-migrations:v136
+    image: faforever/faf-db-migrations:v137
     command: migrate
     environment:
       FLYWAY_URL: jdbc:mysql://faf-db/faf?useSSL=false

src/inttest/java/com/faforever/api/config/MainDbTestContainers.java

@@ -20,8 +20,8 @@
 @ConditionalOnProperty(value = "spring.datasource.url", havingValue = "jdbc:mariadb://testcontainers/faf?useSSL=false")
 @Configuration
 public class MainDbTestContainers {
-  private static final MariaDBContainer<?> fafDBContainer = new MariaDBContainer<>("mariadb:10.6");
-  private static final GenericContainer<?> flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v136");
+  private static final MariaDBContainer<?> fafDBContainer = new MariaDBContainer<>("mariadb:11.7");
+  private static final GenericContainer<?> flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v137");
   private static final Network sharedNetwork = Network.newNetwork();
 
   @Bean

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

@@ -37,6 +37,7 @@ public void getUnusedAvatar() throws Exception {
       .andExpect(jsonPath("$.data.type", is("avatar")))
       .andExpect(jsonPath("$.data.attributes.tooltip", is("Donator Avatar")))
       .andExpect(jsonPath("$.data.attributes.url", is("http://localhost/faf/avatars/donator.png")))
+      .andExpect(jsonPath("$.data.attributes.description", is("Only for donators")))
       .andExpect(jsonPath("$.data.relationships.assignments.data", hasSize(0)));
   }
 

src/inttest/resources/sql/prepAvatarData.sql

@@ -1,8 +1,8 @@
-INSERT INTO avatars_list (id, filename, tooltip)
-VALUES (1, 'avatar1.png', 'Avatar No. 1'),
-       (2, 'avatar2.png', 'Avatar No. 2'),
-       (3, 'donator.png', 'Donator Avatar'),
-       (4, 'avatar space.png', 'Space Avatar');
+INSERT INTO avatars_list (id, filename, tooltip, avatar_text_description)
+VALUES (1, 'avatar1.png', 'Avatar No. 1', null),
+       (2, 'avatar2.png', 'Avatar No. 2', null),
+       (3, 'donator.png', 'Donator Avatar', 'Only for donators'),
+       (4, 'avatar space.png', 'Space Avatar', null);
 
 INSERT INTO avatars (id, idUser, idAvatar, selected)
 VALUES (1, 5, 1, 1),

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

@@ -32,6 +32,7 @@ public class Avatar extends AbstractEntity<Avatar> {
   private String url;
   private String tooltip;
   private String filename;
+  private String description;
   private List<AvatarAssignment> assignments;
 
   @Transient
@@ -50,6 +51,12 @@ public String getTooltip() {
     return tooltip;
   }
 
+  @Column(name = "avatar_text_description")
+  @UpdatePermission(expression = WriteAvatarCheck.EXPRESSION)
+  public String getDescription() {
+    return description;
+  }
+
   // Cascading is needed for Create & Delete
   @OneToMany(mappedBy = "avatar", cascade = CascadeType.ALL, orphanRemoval = true)
   // Permission is managed by AvatarAssignment class

src/main/resources/config/application.yml

@@ -16,7 +16,7 @@ faf-api:
     hmac-secret: ${CLOUDFLARE_HMAC_SECRET}
     hmac-param: ${CLOUDFLARE_HMAC_PARAM:verify}
   database:
-    schema-version: ${DATABASE_SCHEMA_VERSION:136}
+    schema-version: ${DATABASE_SCHEMA_VERSION:137}
   deployment:
     forged-alliance-exe-path: ${FORGED_ALLIANCE_EXE_PATH:/content/legacy-featured-mod-files/updates_faf_files/ForgedAlliance.exe}
     repositories-directory: ${REPOSITORIES_DIRECTORY:/repositories}