Merge pull request #150 from fugasjunior/dev

Relese v1.4.1

Author: fugasjunior

backend/src/main/java/cz/forgottenempire/servermanager/common/Constants.java

@@ -35,5 +35,5 @@ public class Constants {
     public static final String ARMA3_PROFILE_TEMPLATE = "arma3ServerProfile.ftl";
     public static final String ARMA3_NETWORK_SETTINGS = "arma3NetworkSettings.ftl";
 
-    public final static String STEAM_API_URL = "https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/";
+    public final static String STEAM_API_URL = "https://api.steampowered.com/IPublishedFileService/GetDetails/v1/";
 }

backend/src/main/java/cz/forgottenempire/servermanager/workshop/Arma3CDLC.java

@@ -6,6 +6,7 @@
 
 public enum Arma3CDLC {
     CSLA_IRON_CURTAIN("CSLA Iron Curtain", "csla"),
+    EXPEDITIONARY_FORCES("Expeditionary Forces", "ef"),
     GLOBAL_MOBILIZATION("Global Mobilization", "gm"),
     REACTION_FORCES("Reaction Forces", "rf"),
     SOG_PRAIRIE_FIRE("S.O.G. Prairie Fire", "vn"),
@@ -29,13 +30,14 @@ public String getId() {
     }
 
     public static List<Arma3CDLC> getAll() {
-        return List.of(CSLA_IRON_CURTAIN, GLOBAL_MOBILIZATION, REACTION_FORCES, SOG_PRAIRIE_FIRE, SPEARHEAD_1944, WESTERN_SAHARA);
+        return List.of(CSLA_IRON_CURTAIN, EXPEDITIONARY_FORCES, GLOBAL_MOBILIZATION, REACTION_FORCES, SOG_PRAIRIE_FIRE, SPEARHEAD_1944, WESTERN_SAHARA);
     }
 
     public static Arma3CDLC fromId(String id) {
         return switch (id) {
             case "csla" -> CSLA_IRON_CURTAIN;
             case "gm" -> GLOBAL_MOBILIZATION;
+            case "ef" -> EXPEDITIONARY_FORCES;
             case "rf" -> REACTION_FORCES;
             case "vn" -> SOG_PRAIRIE_FIRE;
             case "spe" -> SPEARHEAD_1944;

backend/src/main/java/cz/forgottenempire/servermanager/workshop/WorkshopMod.java

@@ -39,7 +39,7 @@ public class WorkshopMod {
     @Enumerated(EnumType.STRING)
     private ServerType serverType;
 
-    @ElementCollection
+    @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "workshop_mod_bikey")
     @Column(name = "bikey")
     private Set<String> biKeys = new HashSet<>();

backend/src/main/java/cz/forgottenempire/servermanager/workshop/WorkshopModsFacade.java

@@ -17,6 +17,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Slf4j
@@ -57,6 +58,7 @@ public Collection<WorkshopMod> getAllMods(@Nullable ServerType filter) {
         return modsService.getAllMods(filter);
     }
 
+    @Transactional
     public List<WorkshopMod> saveAndInstallMods(List<Long> ids) {
         List<WorkshopMod> workshopMods = ids.stream()
                 .map(id -> getMod(id).orElse(new WorkshopMod(id)))
@@ -65,10 +67,7 @@ public List<WorkshopMod> saveAndInstallMods(List<Long> ids) {
         workshopMods.forEach(mod -> {
             mod.setInstallationStatus(InstallationStatus.INSTALLATION_IN_PROGRESS);
             mod.setErrorStatus(null);
-        });
-        modsService.saveAllMods(workshopMods);
 
-        workshopMods.forEach(mod -> {
             ModMetadata modMetadata = fileDetailsService.fetchModMetadata(mod.getId());
             mod.setName(modMetadata.name());
             setModServerType(mod, modMetadata.consumerAppId());
@@ -80,6 +79,7 @@ public List<WorkshopMod> saveAndInstallMods(List<Long> ids) {
         return workshopMods;
     }
 
+    @Transactional
     public void updateAllMods() {
         List<Long> allModIds = modsService.getAllMods().stream()
                 .map(WorkshopMod::getId)

backend/src/main/java/cz/forgottenempire/servermanager/workshop/metadata/AbstractModMetadataProvider.java

@@ -1,25 +1,21 @@
 package cz.forgottenempire.servermanager.workshop.metadata;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
 
-class JsonPropertyProvider implements PropertyProvider {
+class JsonPropertyProvider {
 
     private final JsonNode modInfoJson;
 
     JsonPropertyProvider(JsonNode modInfoJson) {
         this.modInfoJson = modInfoJson;
     }
 
-    @Override
     public String findName() {
         return getValueFromJson("title", modInfoJson);
     }
 
-    @Override
     public String findConsumerAppId() {
-        return getValueFromJson("consumer_app_id", modInfoJson);
+        return getValueFromJson("consumer_appid", modInfoJson);
     }
 
     private String getValueFromJson(String key, JsonNode modInfoJson) {

backend/src/main/java/cz/forgottenempire/servermanager/workshop/metadata/HtmlPropertyProvider.java

@@ -10,20 +10,14 @@
 public class ModMetadataService {
 
     private final WorkshopApiMetadataProvider apiMetadataProvider;
-    private final HtmlScraperMetadataProvider htmlScraperMetadataProvider;
 
     @Autowired
-    public ModMetadataService(
-            WorkshopApiMetadataProvider apiMetadataProvider,
-            HtmlScraperMetadataProvider htmlScraperMetadataProvider
-    ) {
+    ModMetadataService(WorkshopApiMetadataProvider apiMetadataProvider) {
         this.apiMetadataProvider = apiMetadataProvider;
-        this.htmlScraperMetadataProvider = htmlScraperMetadataProvider;
     }
 
     public ModMetadata fetchModMetadata(long modId) {
         return apiMetadataProvider.fetchModMetadata(modId)
-                .orElseGet(() -> htmlScraperMetadataProvider.fetchModMetadata(modId)
-                        .orElseThrow(() -> new NotFoundException("Mod ID " + modId + " not found.")));
+                .orElseThrow(() -> new NotFoundException("Mod ID " + modId + " not found."));
     }
 }