Fix featured mod file URL

Fixes #183
FAForever · Nov 29, 2017 · 7d57715 · 7d57715
1 parent be93c22
commit 7d57715
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/com/faforever/api/featuredmods/FeaturedModFile.java b/src/main/java/com/faforever/api/featuredmods/FeaturedModFile.java
@@ -1,5 +1,6 @@
 package com.faforever.api.featuredmods;
 
+import com.yahoo.elide.annotation.Exclude;
 import lombok.Setter;
 import org.hibernate.annotations.Immutable;
 
@@ -21,7 +22,9 @@ public class FeaturedModFile {
   private String group;
   private String md5;
   private String name;
+  private String originalFileName;
   private int version;
+  // Enriched in FeaturedModFileEnricher
   private String url;
   private String folderName;
   private short fileId;
@@ -42,11 +45,24 @@ public String getMd5() {
     return md5;
   }
 
+  /**
+   * Name of the file on the client's file system.
+   */
   @Column(name = "name")
   public String getName() {
     return name;
   }
 
+
+  /**
+   * Name of the file on the server's file system.
+   */
+  @Column(name = "fileName")
+  @Exclude
+  public String getOriginalFileName() {
+    return originalFileName;
+  }
+
   @Column(name = "version")
   public int getVersion() {
     return version;

diff --git a/src/main/java/com/faforever/api/featuredmods/FeaturedModFileEnricher.java b/src/main/java/com/faforever/api/featuredmods/FeaturedModFileEnricher.java
@@ -18,10 +18,9 @@ public void init(FafApiProperties fafApiProperties) {
 
   @PostLoad
   public void enhance(FeaturedModFile featuredModFile) {
-    String filename = featuredModFile.getName();
     String folder = featuredModFile.getFolderName();
     String urlFormat = fafApiProperties.getFeaturedMod().getFileUrlFormat();
 
-    featuredModFile.setUrl(String.format(urlFormat, folder, filename));
+    featuredModFile.setUrl(String.format(urlFormat, folder, featuredModFile.getOriginalFileName()));
   }
 }
diff --git a/src/main/java/com/faforever/api/featuredmods/LegacyFeaturedModFileRepository.java b/src/main/java/com/faforever/api/featuredmods/LegacyFeaturedModFileRepository.java
@@ -34,7 +34,7 @@ public List<FeaturedModFile> getFiles(String modName, Integer version) {
         "  file.md5     AS `md5`," +
         "  file.fileId  AS `fileId`," +
         "  file.id      AS `id`," +
-        "  file.name    AS `url`," +
+        "  file.name    AS `fileName`," +
         "  'updates_%1$s_files'    AS `folderName`" +
         "FROM updates_%1$s_files file" +
         "  INNER JOIN" +