Merge pull request #1432 from utmstack/backlog/office-365-cloud-environment-configuration-field

feat(o365-plugin): add Office 365 cloud environment configuration opt…

Author: mjabascal10

backend/src/main/java/com/park/utmstack/domain/application_modules/UtmModuleGroupConfiguration.java

@@ -71,7 +71,8 @@ public UtmModuleGroupConfiguration(ModuleConfigurationKey key) {
         this.confDataType = key.getConfDataType();
         this.confRequired = key.getConfRequired();
         this.confOptions = key.getConfOptions();
-        this.confVisibility = key.getConfOptions();
+        this.confValue = key.getConfValue();
+        this.confVisibility = key.getConfVisibility();
     }
 
 }

backend/src/main/java/com/park/utmstack/domain/application_modules/factory/impl/ModuleO365.java

@@ -72,6 +72,22 @@ public List<ModuleConfigurationKey> getConfigurationKeys(Long groupId) throws Ex
             .withConfDataType("text")
             .withConfRequired(true)
             .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+                .withGroupId(groupId)
+                .withConfKey("office365_cloud_environment")
+                .withConfName("Cloud Environment")
+                .withConfDescription("Select the Microsoft cloud environment for Office 365 integration.")
+                .withConfDataType("select")
+                .withConfRequired(false)
+                .withConfValue("Commercial")
+                .withConfOptions("[" +
+                        "{ \"value\": \"Commercial\", \"label\": \"Commercial - Azure commercial global (Default)\" }," +
+                        "{ \"value\": \"GCC\", \"label\": \"GCC - US Government Community Cloud\" }," +
+                        "{ \"value\": \"GCCHigh\", \"label\": \"GCC High - US Government Community Cloud High (DoD IL4)\" }," +
+                        "{ \"value\": \"DoD\", \"label\": \"DoD - US Department of Defense (DoD IL5)\" }" +
+                        "]")
+                .build());
         return keys;
     }
 

backend/src/main/java/com/park/utmstack/domain/application_modules/types/ModuleConfigurationKey.java

@@ -1,74 +1,24 @@
 package com.park.utmstack.domain.application_modules.types;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
 public class ModuleConfigurationKey {
     private Long groupId;
     private String confKey;
     private String confName;
+    private String confValue;
     private String confDescription;
     private String confDataType;
     private String confOptions;
-
+    private String confVisibility;
     private Boolean confRequired;
 
     private ModuleConfigurationKey() {
     }
 
-    public Long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Long groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getConfKey() {
-        return confKey;
-    }
-
-    public void setConfKey(String confKey) {
-        this.confKey = confKey;
-    }
-
-    public String getConfName() {
-        return confName;
-    }
-
-    public void setConfName(String confName) {
-        this.confName = confName;
-    }
-
-    public String getConfDescription() {
-        return confDescription;
-    }
-
-    public void setConfDescription(String confDescription) {
-        this.confDescription = confDescription;
-    }
-
-    public String getConfDataType() {
-        return confDataType;
-    }
-
-    public void setConfDataType(String confDataType) {
-        this.confDataType = confDataType;
-    }
-
-    public Boolean getConfRequired() {
-        return confRequired;
-    }
-
-    public void setConfRequired(Boolean confRequired) {
-        this.confRequired = confRequired;
-    }
-
-    public String getConfOptions() {
-        return confOptions;
-    }
-
-    public void setConfOptions(String confOptions) {
-        this.confOptions = confOptions;
-    }
-
     public static Builder builder() {
         return new Builder();
     }
@@ -77,11 +27,11 @@ public static class Builder {
         private Long groupId;
         private String confKey;
         private String confName;
+        private String confValue;
         private String confDescription;
         private String confDataType;
         private Boolean confRequired;
-        private Boolean confVisible = true;
-
+        private String confVisibility;
         private String confOptions;
 
         public Builder withGroupId(Long groupId) {
@@ -119,6 +69,16 @@ public Builder withConfOptions(String confOptions) {
             return this;
         }
 
+        public Builder withConfValue(String confValue) {
+            this.confValue = confValue;
+            return this;
+        }
+
+        public Builder withConfVisibility(String confVisibility) {
+            this.confVisibility = confVisibility;
+            return this;
+        }
+
         public ModuleConfigurationKey build() {
             ModuleConfigurationKey key = new ModuleConfigurationKey();
             key.setGroupId(groupId);
@@ -128,6 +88,8 @@ public ModuleConfigurationKey build() {
             key.setConfDataType(confDataType);
             key.setConfRequired(confRequired);
             key.setConfOptions(confOptions);
+            key.setConfValue(confValue);
+            key.setConfVisibility(confVisibility);
             return key;
         }
     }

backend/src/main/resources/config/liquibase/changelog/20251125001_add_environment_o365_integration.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet id="20251125001" author="Manuel">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="1">
+                SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END AS result
+                FROM public.utm_module_group
+                WHERE module_id = 34
+            </sqlCheck>
+        </preConditions>
+
+        <sql dbms="postgresql" splitStatements="true" stripComments="true">
+            INSERT INTO public.utm_module_group_configuration (
+                group_id,
+                conf_key,
+                conf_value,
+                conf_name,
+                conf_description,
+                conf_data_type,
+                conf_required,
+                conf_options,
+                conf_visibility
+            )
+            SELECT
+                g.id,
+                'office365_cloud_environment',
+                'Commercial',
+                'Cloud Environment',
+                'Select the Microsoft cloud environment for Office 365 integration.',
+                'select',
+                false,
+                '[
+                    { "value": "Commercial", "label": "Commercial - Azure commercial global (Default)" },
+                    { "value": "GCC", "label": "GCC - US Government Community Cloud" },
+                    { "value": "GCCHigh", "label": "GCC High - US Government Community Cloud High (DoD IL4)" },
+                    { "value": "DoD", "label": "DoD - US Department of Defense (DoD IL5)" }
+                ]',
+                null
+            FROM public.utm_module_group g
+            WHERE g.module_id = 34;
+        </sql>
+    </changeSet>
+
+</databaseChangeLog>

backend/src/main/resources/config/liquibase/master.xml

@@ -269,5 +269,7 @@
 
     <include file="/config/liquibase/changelog/20251111001_set_alert-response_rule_seq.xml" relativeToChangelogFile="false"/>
 
+    <include file="/config/liquibase/changelog/20251125001_add_environment_o365_integration.xml" relativeToChangelogFile="false"/>
+
 
 </databaseChangeLog>