[backend] fix(opencti): fix compile errors and formatting in multi-tenancy migration

Agent-Logs-Url: https://github.com/OpenAEV-Platform/openaev/sessions/cbd93948-001f-41ef-93a5-c6d8f6886825

Co-authored-by: RomuDeuxfois <53513584+RomuDeuxfois@users.noreply.github.com>

Author: Copilot

openaev-api/src/main/java/io/openaev/opencti/connectors/service/PrivilegeService.java

@@ -111,11 +111,11 @@ private Group createWellKnownGroupWithRole(Role role) {
     input.setDescription(PROCESS_STIX_GROUP_DESCRIPTION);
     input.setDefaultUserAssignation(false);
 
-      List<Role> roles = new ArrayList<>(List.of(role));
-      if (processStixGroup.isPresent()) {
-          return tenantGroupService.updateGroupInfoWithRoles(processStixGroup.get(), input, roles);
-      } else {
-          return tenantGroupService.createGroupWithRole(PROCESS_STIX_GROUP_ID, input, roles);
-      }
+    List<Role> roles = new ArrayList<>(List.of(role));
+    if (processStixGroup.isPresent()) {
+      return tenantGroupService.updateGroupInfoWithRoles(processStixGroup.get(), input, roles);
+    } else {
+      return tenantGroupService.createGroupWithRole(PROCESS_STIX_GROUP_ID, input, roles);
+    }
   }
 }

openaev-api/src/main/java/io/openaev/rest/settings/TenantSettingsApi.java

@@ -5,7 +5,6 @@
 import io.openaev.aop.AccessControl;
 import io.openaev.aop.LogExecutionTime;
 import io.openaev.aop.UserRoleDescription;
-import io.openaev.context.TenantContext;
 import io.openaev.database.model.Action;
 import io.openaev.database.model.CustomDashboard;
 import io.openaev.database.model.ResourceType;
@@ -65,7 +64,7 @@ public TenantSettingsOutput findSettings(@PathVariable String tenantId) {
   @ApiResponses(@ApiResponse(responseCode = "200", description = "The updated tenant settings"))
   public TenantSettingsOutput updateSettings(
       @PathVariable String tenantId, @Valid @RequestBody TenantSettingsUpdateInput input) {
-    return tenantSettingsService.updateSettings(tenantId, input, TenantContext.getCurrentTenant());
+    return tenantSettingsService.updateSettings(tenantId, input);
   }
 
   // -- THEME --

openaev-api/src/main/java/io/openaev/service/PlatformSettingsService.java

@@ -282,28 +282,28 @@ public PlatformSettings findSettings() {
             .orElse(IMAP_SERVICE_AVAILABLE.defaultValue()));
 
     // Authenticated user settings
-      platformSettings.setMapTileServerLight(openAEVConfig.getMapTileServerLight());
-      platformSettings.setMapTileServerDark(openAEVConfig.getMapTileServerDark());
-      platformSettings.setPlatformId(
-          ofNullable(dbSettings.get(PLATFORM_INSTANCE.key()))
-              .map(Setting::getValue)
-              .orElse(PLATFORM_INSTANCE.defaultValue()));
-      platformSettings.setPlatformName(
-          ofNullable(dbSettings.get(PLATFORM_NAME.key()))
-              .map(Setting::getValue)
-              .orElse(PLATFORM_NAME.defaultValue()));
-      platformSettings.setPlatformBaseUrl(openAEVConfig.getBaseUrl());
-      platformSettings.setPlatformAgentUrl(openAEVConfig.getBaseUrlForAgent());
-      platformSettings.setPlatformVersion(openAEVConfig.getVersion());
-      platformSettings.setXtmOneConfigured(xtmOneConfig.isConfigured());
-      platformSettings.setXtmOneUrl(xtmOneConfig.getUrl());
-      platformSettings.setXtmOneWebToken(xtmOneConfig.getEffectiveWebToken());
-      platformSettings.setAiEnabled(aiConfig.isEnabled());
-      platformSettings.setAiHasToken(StringUtils.hasText(aiConfig.getToken()));
-      platformSettings.setAiType(aiConfig.getType());
-      platformSettings.setAiModel(aiConfig.getModel());
-      platformSettings.setExecutorTaniumEnable(false);
-      platformSettings.setTelemetryManagerEnable(true);
+    platformSettings.setMapTileServerLight(openAEVConfig.getMapTileServerLight());
+    platformSettings.setMapTileServerDark(openAEVConfig.getMapTileServerDark());
+    platformSettings.setPlatformId(
+        ofNullable(dbSettings.get(PLATFORM_INSTANCE.key()))
+            .map(Setting::getValue)
+            .orElse(PLATFORM_INSTANCE.defaultValue()));
+    platformSettings.setPlatformName(
+        ofNullable(dbSettings.get(PLATFORM_NAME.key()))
+            .map(Setting::getValue)
+            .orElse(PLATFORM_NAME.defaultValue()));
+    platformSettings.setPlatformBaseUrl(openAEVConfig.getBaseUrl());
+    platformSettings.setPlatformAgentUrl(openAEVConfig.getBaseUrlForAgent());
+    platformSettings.setPlatformVersion(openAEVConfig.getVersion());
+    platformSettings.setXtmOneConfigured(xtmOneConfig.isConfigured());
+    platformSettings.setXtmOneUrl(xtmOneConfig.getUrl());
+    platformSettings.setXtmOneWebToken(xtmOneConfig.getEffectiveWebToken());
+    platformSettings.setAiEnabled(aiConfig.isEnabled());
+    platformSettings.setAiHasToken(StringUtils.hasText(aiConfig.getToken()));
+    platformSettings.setAiType(aiConfig.getType());
+    platformSettings.setAiModel(aiConfig.getModel());
+    platformSettings.setExecutorTaniumEnable(false);
+    platformSettings.setTelemetryManagerEnable(true);
 
     // Admin-only settings
     OpenAEVPrincipal user = currentUser();

openaev-api/src/main/java/io/openaev/service/settings/TenantSettingsService.java

@@ -12,7 +12,6 @@
 import io.openaev.database.model.TenantSettingKeys;
 import io.openaev.database.model.Theme;
 import io.openaev.database.repository.SettingRepository;
-import io.openaev.database.repository.TenantSettingRepository;
 import io.openaev.opencti.config.OpenCTIConfig;
 import io.openaev.opencti.config.XtmConfig;
 import io.openaev.rest.settings.form.TenantSettingsUpdateInput;
@@ -45,7 +44,7 @@ public class TenantSettingsService {
   @Transactional(readOnly = true)
   public TenantSettingsOutput findSettings(@NotBlank String tenantId) {
     Map<String, Setting> tenantSettings = loadTenantSettings(tenantId);
-    return buildTenantSettings(tenantSettings);
+    return buildTenantSettings(tenantSettings, tenantId);
   }
 
   /** Find a single setting by key for the given tenant. */
@@ -139,7 +138,6 @@ private TenantSettingsOutput buildTenantSettings(
         resolveValue(tenantSettings, TENANT_SIMULATION_DASHBOARD),
         createThemeFromSettings(tenantSettings, THEME_TYPE_DARK),
         createThemeFromSettings(tenantSettings, THEME_TYPE_LIGHT),
-        resolveValue(tenantSettings, TENANT_SIMULATION_DASHBOARD),
         Boolean.TRUE.equals(openctiConfig != null ? openctiConfig.getEnable() : null),
         openctiConfig != null ? openctiConfig.getUrl() : null);
   }

openaev-api/src/main/java/io/openaev/service/tenants/TenantUserService.java

@@ -11,7 +11,6 @@
 import io.openaev.api.users.dto.UserOutput;
 import io.openaev.config.cache.TenantMembershipCacheManager;
 import io.openaev.context.TenantContext;
-import io.openaev.database.model.Tenant;
 import io.openaev.database.model.Group;
 import io.openaev.database.model.Tenant;
 import io.openaev.database.model.User;
@@ -76,12 +75,6 @@ public void attachToTenant(@NotBlank String userId, @NotBlank String tenantId) {
     tenantMembershipCacheManager.evict(userId, tenantId);
   }
 
-  /** Attaches a user to the specified tenant. Does nothing if already attached. */
-  public void attachToTenant(@NotBlank String userId, @NotBlank String tenantId) {
-    tenantRepository.addUserToTenant(userId, tenantId);
-    tenantMembershipCacheManager.evict(userId, tenantId);
-  }
-
   // -- READ --
 
   /** Returns a user by ID within the current tenant scope. */