added check for existing system config when a feature is enabled

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/validator/ExperienceFeatureValidatorBean.java

@@ -0,0 +1,22 @@
+package dev.sheldan.abstracto.experience.validator;
+
+import dev.sheldan.abstracto.core.config.FeatureConfig;
+import dev.sheldan.abstracto.core.models.FeatureValidationResult;
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.service.FeatureValidatorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExperienceFeatureValidatorBean implements ExperienceFeatureValidator {
+
+    @Autowired
+    private FeatureValidatorService featureValidatorService;
+
+    @Override
+    public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
+        featureValidatorService.checkSystemConfig("expMultiplier", server, validationResult);
+        featureValidatorService.checkSystemConfig("minExp", server, validationResult);
+        featureValidatorService.checkSystemConfig("maxExp", server, validationResult);
+    }
+}

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/config/features/ExperienceFeatureConfig.java

@@ -2,13 +2,27 @@ package dev.sheldan.abstracto.experience.config.features;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.service.FeatureValidator;
+import dev.sheldan.abstracto.experience.validator.ExperienceFeatureValidator;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Component
 public class ExperienceFeatureConfig implements FeatureConfig {
+
+    @Autowired
+    private ExperienceFeatureValidator experienceFeatureValidator;
+
     @Override
     public FeatureEnum getFeature() {
         return ExperienceFeature.EXPERIENCE;
     }
 
+    @Override
+    public List<FeatureValidator> getAdditionalFeatureValidators() {
+        return Arrays.asList(experienceFeatureValidator);
+    }
 }

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/validator/ExperienceFeatureValidator.java

@@ -0,0 +1,6 @@
+package dev.sheldan.abstracto.experience.validator;
+
+import dev.sheldan.abstracto.core.service.FeatureValidator;
+
+public interface ExperienceFeatureValidator extends FeatureValidator {
+}

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/WarnDecayConfigListener.java

@@ -18,6 +18,6 @@ public class WarnDecayConfigListener implements ServerConfigListener {
 
     @Override
     public void updateServerConfig(AServer server) {
-        configManagementService.createIfNotExists(server.getId(), "decayDays", decayDays.longValue());
+        configManagementService.createIfNotExists(server.getId(), "decayDays", decayDays);
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/validator/WarnDecayFeatureValidatorBean.java

@@ -0,0 +1,20 @@
+package dev.sheldan.abstracto.moderation.validator;
+
+import dev.sheldan.abstracto.core.config.FeatureConfig;
+import dev.sheldan.abstracto.core.models.FeatureValidationResult;
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.service.FeatureValidatorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WarnDecayFeatureValidatorBean implements WarnDecayFeatureValidator {
+
+    @Autowired
+    private FeatureValidatorService featureValidatorService;
+
+    @Override
+    public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
+        featureValidatorService.checkSystemConfig("decayDays", server, validationResult);
+    }
+}

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/features/WarningDecayFeature.java

@@ -3,7 +3,9 @@ package dev.sheldan.abstracto.moderation.config.features;
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
+import dev.sheldan.abstracto.core.service.FeatureValidator;
 import dev.sheldan.abstracto.moderation.config.posttargets.WarnDecayPostTarget;
+import dev.sheldan.abstracto.moderation.validator.WarnDecayFeatureValidator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -16,6 +18,9 @@ public class WarningDecayFeature implements FeatureConfig {
     @Autowired
     private WarningFeature warningFeature;
 
+    @Autowired
+    private WarnDecayFeatureValidator warnDecayFeatureValidator;
+
     @Override
     public FeatureEnum getFeature() {
         return ModerationFeatures.AUTOMATIC_WARN_DECAY;
@@ -30,4 +35,9 @@ public class WarningDecayFeature implements FeatureConfig {
     public List<PostTargetEnum> getRequiredPostTargets() {
         return Arrays.asList(WarnDecayPostTarget.DECAY_LOG);
     }
+
+    @Override
+    public List<FeatureValidator> getAdditionalFeatureValidators() {
+        return Arrays.asList(warnDecayFeatureValidator);
+    }
 }

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/validator/WarnDecayFeatureValidator.java

@@ -0,0 +1,6 @@
+package dev.sheldan.abstracto.moderation.validator;
+
+import dev.sheldan.abstracto.core.service.FeatureValidator;
+
+public interface WarnDecayFeatureValidator extends FeatureValidator {
+}

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidatorBean.java

@@ -0,0 +1,50 @@
+package dev.sheldan.abstracto.modmail.validator;
+
+import dev.sheldan.abstracto.core.config.FeatureConfig;
+import dev.sheldan.abstracto.core.models.FeatureValidationResult;
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.service.BotService;
+import dev.sheldan.abstracto.core.service.ConfigService;
+import dev.sheldan.abstracto.core.service.FeatureValidatorService;
+import dev.sheldan.abstracto.modmail.models.template.ModMailCategoryValidationError;
+import dev.sheldan.abstracto.modmail.service.ModMailThreadServiceBean;
+import net.dv8tion.jda.api.entities.Category;
+import net.dv8tion.jda.api.entities.Guild;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+@Component
+public class ModMailFeatureValidatorBean implements ModMailFeatureValidator {
+
+    @Autowired
+    private BotService botService;
+
+    @Autowired
+    private ConfigService configService;
+
+    @Autowired
+    private FeatureValidatorService featureValidatorService;
+
+    @Override
+    public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
+        Optional<Guild> guildById = botService.getGuildById(server.getId());
+        if(guildById.isPresent()) {
+            Guild guild = guildById.get();
+            boolean checkSucceeded = featureValidatorService.checkSystemConfig(ModMailThreadServiceBean.MODMAIL_CATEGORY, server, validationResult);
+            if(checkSucceeded) {
+                Long modMailCategory = configService.getLongValue(ModMailThreadServiceBean.MODMAIL_CATEGORY, server.getId());
+                Category categoryById = guild.getCategoryById(modMailCategory);
+                if(categoryById == null) {
+                    validationResult.setValidationResult(false);
+                    ModMailCategoryValidationError newError = ModMailCategoryValidationError
+                            .builder()
+                            .currentCategoryId(modMailCategory)
+                            .build();
+                    validationResult.getValidationErrors().add(newError);
+                }
+            }
+        }
+    }
+}

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/exception/modmail_category_not_setup_en_US.ftl

@@ -0,0 +1 @@
+<#assign categoryId>${(error.templateModel['categoryId'])!"0"}</#assign><#include "modmail_category_not_setup_text">

abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/config/ModMailFeature.java

@@ -3,6 +3,8 @@ package dev.sheldan.abstracto.modmail.config;
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
+import dev.sheldan.abstracto.core.service.FeatureValidator;
+import dev.sheldan.abstracto.modmail.validator.ModMailFeatureValidator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -12,6 +14,9 @@ import java.util.List;
 @Component
 public class ModMailFeature implements FeatureConfig {
 
+    @Autowired
+    private ModMailFeatureValidator modMailFeatureValidator;
+
     @Autowired
     private ModMailLoggingFeature modMailLoggingFeature;
 
@@ -29,4 +34,9 @@ public class ModMailFeature implements FeatureConfig {
     public List<PostTargetEnum> getRequiredPostTargets() {
         return Arrays.asList(ModMailPostTargets.MOD_MAIL_PING);
     }
+
+    @Override
+    public List<FeatureValidator> getAdditionalFeatureValidators() {
+        return Arrays.asList(modMailFeatureValidator);
+    }
 }

abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/models/template/ModMailCategoryValidationError.java

@@ -0,0 +1,27 @@
+package dev.sheldan.abstracto.modmail.models.template;
+
+import dev.sheldan.abstracto.core.models.ValidationError;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+
+@Getter
+@Setter
+@Builder
+public class ModMailCategoryValidationError implements ValidationError {
+    private Long currentCategoryId;
+
+    @Override
+    public String getTemplateName() {
+        return "modmail_category_not_setup";
+    }
+
+    @Override
+    public Object getTemplateModel() {
+        HashMap<String, Long> params = new HashMap<>();
+        params.put("categoryId", currentCategoryId);
+        return params;
+    }
+}

abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidator.java

@@ -0,0 +1,6 @@
+package dev.sheldan.abstracto.modmail.validator;
+
+import dev.sheldan.abstracto.core.service.FeatureValidator;
+
+public interface ModMailFeatureValidator extends FeatureValidator {
+}

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/validator/StarboardFeatureValidatorService.java

@@ -0,0 +1,27 @@
+package dev.sheldan.abstracto.utility.validator;
+
+import dev.sheldan.abstracto.core.config.FeatureConfig;
+import dev.sheldan.abstracto.core.models.FeatureValidationResult;
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.service.FeatureValidatorService;
+import dev.sheldan.abstracto.utility.StarboardFeatureValidator;
+import dev.sheldan.abstracto.utility.config.StarboardConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StarboardFeatureValidatorService implements StarboardFeatureValidator {
+
+    @Autowired
+    private StarboardConfig starboardConfig;
+
+    @Autowired
+    private FeatureValidatorService featureValidatorService;
+
+    @Override
+    public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
+        for(int i = starboardConfig.getLvl().size(); i > 0; i--) {
+            featureValidatorService.checkSystemConfig("starLvl" + i, server, validationResult);
+        }
+    }
+}

abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/StarboardFeatureValidator.java

@@ -0,0 +1,6 @@
+package dev.sheldan.abstracto.utility;
+
+import dev.sheldan.abstracto.core.service.FeatureValidator;
+
+public interface StarboardFeatureValidator extends FeatureValidator {
+}

abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/config/features/StarboardFeature.java

@@ -3,7 +3,10 @@ package dev.sheldan.abstracto.utility.config.features;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
+import dev.sheldan.abstracto.core.service.FeatureValidator;
+import dev.sheldan.abstracto.utility.StarboardFeatureValidator;
 import dev.sheldan.abstracto.utility.config.posttargets.StarboardPostTarget;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -12,6 +15,9 @@ import java.util.List;
 @Component
 public class StarboardFeature implements FeatureConfig {
 
+    @Autowired
+    private StarboardFeatureValidator starboardFeatureValidator;
+
     @Override
     public FeatureEnum getFeature() {
         return UtilityFeature.STARBOARD;
@@ -21,4 +27,9 @@ public class StarboardFeature implements FeatureConfig {
     public List<PostTargetEnum> getRequiredPostTargets() {
         return Arrays.asList(StarboardPostTarget.STARBOARD);
     }
+
+    @Override
+    public List<FeatureValidator> getAdditionalFeatureValidators() {
+        return Arrays.asList(starboardFeatureValidator);
+    }
 }

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureValidationServiceBean.java

@@ -29,12 +29,14 @@ public class FeatureValidationServiceBean implements FeatureValidatorService {
     }
 
     @Override
-    public void checkSystemConfig(String name, AServer server, FeatureValidationResult featureValidationResult) {
+    public boolean checkSystemConfig(String name, AServer server, FeatureValidationResult featureValidationResult) {
         if(!configService.configExists(server, name)) {
             SystemConfigValidationError validationError = SystemConfigValidationError.builder().configKey(name).build();
             featureValidationResult.setValidationResult(false);
             featureValidationResult.getValidationErrors().add(validationError);
+            return false;
         }
+        return true;
     }
 
 

abstracto-application/core/core-impl/src/main/resources/seedData/templates/general/config_key_not_setup_en_US.ftl

@@ -0,0 +1 @@
+<#assign configKey>${error.templateModel['configKey']}</#assign><#include "config_key_not_setup_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/general/post_target_not_setup_en_US.ftl

@@ -0,0 +1 @@
+<#assign postTargetKey>${error.templateModel['postTargetKey']}</#assign><#include "post_target_not_setup_text">

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/FeatureValidatorService.java

@@ -6,5 +6,5 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 
 public interface FeatureValidatorService {
     void checkPostTarget(PostTargetEnum postTargetEnum, AServer server, FeatureValidationResult featureValidationResult);
-    void checkSystemConfig(String name, AServer server, FeatureValidationResult featureValidationResult);
+    boolean checkSystemConfig(String name, AServer server, FeatureValidationResult featureValidationResult);
 }

abstracto-application/template-config/src/main/resources/templates/en_US/core/general/config_key_not_setup_en_US.ftl

@@ -1 +0,0 @@
-Post target ${error.templateModel['configKey']} is not set up.

abstracto-application/template-config/src/main/resources/templates/en_US/core/general/config_key_not_setup_text_en_US.ftl

@@ -0,0 +1 @@
+System config `${configKey}` is not set up.

abstracto-application/template-config/src/main/resources/templates/en_US/core/general/post_target_not_setup_en_US.ftl

@@ -1 +0,0 @@
-Post target ${error.templateModel['postTargetKey']} is not set up.

abstracto-application/template-config/src/main/resources/templates/en_US/core/general/post_target_not_setup_text_en_US.ftl

@@ -0,0 +1 @@
+Post target `${postTargetKey}` is not set up.

abstracto-application/template-config/src/main/resources/templates/en_US/modmail/general/modmail_category_not_setup_text_en_US.ftl

@@ -0,0 +1 @@
+Mod mail category is not correctly set up. `${categoryId}` is not valid.