refactor: adjust apk file name

#2153

Author: jo-elimu

src/main/java/ai/elimu/entity/application/ApplicationVersion.java

@@ -67,7 +67,7 @@ public class ApplicationVersion extends BaseEntity {
    */
   public String getFileUrl() {
     return "https://github.com/elimu-ai" +
-        "/" + getApplication().getPackageName().replace("ai.elimu.", "") +
+        "/" + getApplication().getRepoName() +
         "/releases" +
         "/download" +
         "/" + getVersionName() +

src/main/java/ai/elimu/rest/v2/applications/ApplicationVersionsRestController.java

@@ -4,10 +4,10 @@
 import ai.elimu.dao.ApplicationVersionDao;
 import ai.elimu.entity.application.Application;
 import ai.elimu.entity.application.ApplicationVersion;
+import ai.elimu.model.v2.enums.Language;
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
 import ai.elimu.util.ChecksumHelper;
 import ai.elimu.util.ConfigHelper;
-import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.application.application_version.ApplicationVersionCreateController;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -85,7 +85,11 @@ public String handlePutRequest(
       File tmpDirElimuAi = new File(tmpDir, "elimu-ai");
       log.info("tmpDirElimuAi: " + tmpDirElimuAi);
       log.info("tmpDirElimuAi.mkdir(): " + tmpDirElimuAi.mkdir());
-      File apkFile = new File(tmpDirElimuAi, application.getPackageName() + "-" + versionName + ".apk");
+      Language language = Language.valueOf(ConfigHelper.getProperty("content.language"));
+      File tmpDirLanguage = new File(tmpDirElimuAi, "lang-" + language);
+      log.info("tmpDirLanguage: " + tmpDirLanguage);
+      log.info("tmpDirLanguage.mkdir(): " + tmpDirLanguage.mkdir());
+      File apkFile = new File(tmpDirLanguage, application.getPackageName() + "-" + versionName + ".apk");
       log.info("apkFile.getPath(): " + apkFile.getPath());
       FileUtils.copyURLToFile(new URL(fileUrl), apkFile);
       log.info("apkFile.exists(): " + apkFile.exists());
@@ -157,15 +161,6 @@ public String handlePutRequest(
         applicationDao.update(application);
       }
 
-      String contentUrl = "http://" + ConfigHelper.getProperty("content.language").toLowerCase() + ".elimu.ai/application/edit/" + application.getId();
-      DiscordHelper.sendChannelMessage(
-          "A new Application version (`.apk`) was published: " + contentUrl,
-          application.getPackageName(),
-          "Version: `" + applicationVersion.getVersionName() + "`",
-          null,
-          null
-      );
-
       jsonResponseObject.put("result", "success");
       jsonResponseObject.put("successMessage", "The application version was published with versionName " + applicationVersion.getVersionName());
       response.setStatus(HttpStatus.OK.value());

src/main/java/ai/elimu/web/application/application_version/ApplicationVersionCreateController.java

@@ -5,6 +5,7 @@
 import ai.elimu.entity.application.Application;
 import ai.elimu.entity.application.ApplicationVersion;
 import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.model.v2.enums.Language;
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
 import ai.elimu.util.ChecksumHelper;
 import ai.elimu.util.ConfigHelper;
@@ -88,7 +89,11 @@ public String handleSubmit(
       File tmpDirElimuAi = new File(tmpDir, "elimu-ai");
       log.info("tmpDirElimuAi: " + tmpDirElimuAi);
       log.info("tmpDirElimuAi.mkdir(): " + tmpDirElimuAi.mkdir());
-      File apkFile = new File(tmpDirElimuAi, application.getPackageName() + ".apk");
+      Language language = Language.valueOf(ConfigHelper.getProperty("content.language"));
+      File tmpDirLanguage = new File(tmpDirElimuAi, "lang-" + language);
+      log.info("tmpDirLanguage: " + tmpDirLanguage);
+      log.info("tmpDirLanguage.mkdir(): " + tmpDirLanguage.mkdir());
+      File apkFile = new File(tmpDirLanguage, application.getPackageName() + ".apk");
       log.info("apkFile.getPath(): " + apkFile.getPath());
       FileUtils.copyURLToFile(new URL(fileUrl), apkFile);
       log.info("apkFile.exists(): " + apkFile.exists());

src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java

@@ -290,7 +290,7 @@ private void populateDatabase(WebApplicationContext webApplicationContext) {
 
         Application application = new Application();
         application.setPackageName("ai.elimu.soundcards");
-        application.setRepoName("soundcards");
+        application.setRepoName("sound-cards");
         application.setApplicationStatus(ApplicationStatus.MISSING_APK);
         application.setContributor(contributor);
         applicationDao.create(application);