implement computation result filters uuid

src/main/java/org/gridsuite/study/server/controller/ComputationResultFiltersController.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.study.server.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import org.gridsuite.study.server.StudyApi;
+import org.gridsuite.study.server.service.StudyService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.UUID;
+/**
+ * @author Rehili Ghazwa <ghazwa.rehili at rte-france.com>
+ */
+
+@RestController
+@RequestMapping(value = "/" + StudyApi.API_VERSION + "/studies/{studyUuid}/computation-result-filters")
+@Tag(name = "Study server - Computation result filters")
+public class ComputationResultFiltersController {
+    private final StudyService studyService;
+
+    public ComputationResultFiltersController(StudyService studyService) {
+        this.studyService = studyService;
+    }
+
+    @GetMapping()
+    @Operation(summary = "Get study's computation result filters")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The computation result filters")})
+    public ResponseEntity<String> getComputationResultFilters(
+            @PathVariable("studyUuid") UUID studyUuid) {
+        return ResponseEntity.ok().body(studyService.getComputationResultFilters(studyUuid));
+    }
+
+    @PostMapping("/{id}/global-filters")
+    @Operation(summary = "Set global filters",
+            description = "Replaces all existing global filters with the provided list for a computation result")
+    @ApiResponse(responseCode = "204", description = "Global filters set successfully")
+    @ApiResponse(responseCode = "404", description = "computation result global filters not found")
+    public ResponseEntity<Void> setGlobalFiltersForComputationResult(
+            @PathVariable("studyUuid") UUID studyUuid,
+            @Parameter(description = "ID of the global filters") @PathVariable UUID id,
+            @RequestBody String filters) {
+        studyService.setGlobalFiltersForComputationResult(studyUuid, id, filters);
+        return ResponseEntity.noContent().build();
+    }
+
+    @PutMapping("/{id}/columns/{columnUuid}")
+    @Operation(summary = "Update a column", description = "Updates an existing column")
+    @ApiResponse(responseCode = "204", description = "Column updated")
+    public ResponseEntity<Void> updateColumns(
+            @PathVariable("studyUuid") UUID studyUuid,
+            @Parameter(description = "ID of the spreadsheet config") @PathVariable UUID id,
+            @Parameter(description = "ID of the column to update") @PathVariable UUID columnUuid,
+            @Valid @RequestBody String columnInfos) {
+        studyService.updateColumns(studyUuid, id, columnUuid, columnInfos);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/org/gridsuite/study/server/repository/StudyEntity.java

@@ -104,6 +104,9 @@ public class StudyEntity extends AbstractManuallyAssignedIdentifierEntity<UUID>
     @Column(name = "spreadsheetConfigCollectionUuid")
     private UUID spreadsheetConfigCollectionUuid;
 
+    @Column(name = "computationResultFiltersUuid")
+    private UUID computationResultFiltersUuid;
+
     @Column(name = "diagramGridLayoutUuid")
     private UUID diagramGridLayoutUuid;
 

src/main/java/org/gridsuite/study/server/service/StudyConfigService.java

@@ -45,6 +45,9 @@
     private static final String DIAGRAM_GRID_LAYOUT_URI = "/diagram-grid-layout";
     private static final String DIAGRAM_GRID_LAYOUT_WITH_ID_URI = DIAGRAM_GRID_LAYOUT_URI + UUID_PARAM;
 
+    private static final String COMPUTATION_RESULT_FILTERS_URI = "/computation-result-filters";
+    private static final String COMPUTATION_RESULT_FILTERS_WITH_ID_URI = COMPUTATION_RESULT_FILTERS_URI + UUID_PARAM;
+
     private static final DiagramPosition DEFAULT_DIAGRAM_POSITION = new DiagramPosition(2, 2, 0, 0);
 
     private final RestTemplate restTemplate;
@@ -102,7 +105,7 @@
 
     public UUID createDefaultNetworkVisualizationParameters() {
         var path = UriComponentsBuilder
                 .fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + NETWORK_VISU_PARAMETERS_URI + "/default")
                 .buildAndExpand()
                 .toUriString();
         return restTemplate.exchange(studyConfigServerBaseUri + path, HttpMethod.POST, null, UUID.class).getBody();
@@ -242,7 +245,7 @@
     }
 
     public void updateColumn(UUID configUuid, UUID columnUuid, String columnInfos) {
         var uriBuilder = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + SPREADSHEET_CONFIG_WITH_ID_URI + "/columns/{colId}");
         String path = uriBuilder.buildAndExpand(configUuid, columnUuid).toUriString();
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -360,4 +363,42 @@
         HttpEntity<DiagramGridLayout> httpEntity = new HttpEntity<>(diagramGridLayout, headers);
         return restTemplate.exchange(studyConfigServerBaseUri + path, HttpMethod.POST, httpEntity, UUID.class).getBody();
     }
+
+    public UUID createDefaultComputationResultFilters() {
+        var path = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + COMPUTATION_RESULT_FILTERS_URI + "/default")
+                .buildAndExpand().toUriString();
+        return restTemplate.exchange(studyConfigServerBaseUri + path, HttpMethod.POST, null, UUID.class).getBody();
+    }
+
+    public UUID getComputationResultFiltersUuidOrElseCreateDefaults(StudyEntity studyEntity) {
+        if (studyEntity.getComputationResultFiltersUuid() == null) {
+            studyEntity.setComputationResultFiltersUuid(createDefaultComputationResultFilters());
+        }
+        return studyEntity.getComputationResultFiltersUuid();
+    }
+
+    public String getComputationResultFilters(UUID uuid) {
+        Objects.requireNonNull(uuid);
+        String path = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + COMPUTATION_RESULT_FILTERS_WITH_ID_URI)
+                .buildAndExpand(uuid).toUriString();
+        return restTemplate.getForObject(studyConfigServerBaseUri + path, String.class);
+    }
+
+    public void setGlobalFiltersForComputationResult(UUID studyUuid, UUID configUuid, String globalFilters) {
+        var uriBuilder = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + COMPUTATION_RESULT_FILTERS_WITH_ID_URI + "/global-filters");
+        String path = uriBuilder.buildAndExpand(configUuid).toUriString();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> httpEntity = new HttpEntity<>(globalFilters, headers);
+        restTemplate.exchange(studyConfigServerBaseUri + path, HttpMethod.POST, httpEntity, Void.class);
+    }
+
+    public void updateColumns(UUID configUuid, UUID columnUuid, String columnInfos) {
+        var uriBuilder = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + COMPUTATION_RESULT_FILTERS_WITH_ID_URI + "/columns/{colId}");
+        String path = uriBuilder.buildAndExpand(configUuid, columnUuid).toUriString();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> httpEntity = new HttpEntity<>(columnInfos, headers);
+        restTemplate.put(studyConfigServerBaseUri + path, httpEntity);
+    }
 }

src/main/java/org/gridsuite/study/server/service/StudyService.java

@@ -2737,6 +2737,12 @@
         return studyConfigService.getSpreadsheetConfigCollection(studyConfigService.getSpreadsheetConfigCollectionUuidOrElseCreateDefaults(studyEntity));
     }
 
+    @Transactional
+    public String getComputationResultFilters(UUID studyUuid) {
+        StudyEntity studyEntity = getStudy(studyUuid);
+        return studyConfigService.getComputationResultFilters(studyConfigService.getComputationResultFiltersUuidOrElseCreateDefaults(studyEntity));
+    }
+
     /**
      * Set spreadsheet config collection on study or reset to default one if empty body.
      * Default is the user profile one, or system default if no profile is available.
@@ -3559,6 +3565,14 @@
         notificationService.emitSpreadsheetConfigChanged(studyUuid, configUuid);
     }
 
+    public void setGlobalFiltersForComputationResult(UUID studyUuid, UUID configUuid, String globalFilters) {
+        studyConfigService.setGlobalFiltersForComputationResult(studyUuid, configUuid, globalFilters);
+    }
+
+    public void updateColumns(UUID studyUuid, UUID configUuid, UUID columnUuid, String columnInfos) {
+        studyConfigService.updateColumns(configUuid, columnUuid, columnInfos);
+    }
+
     public void renameSpreadsheetConfig(UUID studyUuid, UUID configUuid, String newName) {
         studyConfigService.renameSpreadsheetConfig(configUuid, newName);
         notificationService.emitSpreadsheetConfigChanged(studyUuid, configUuid);

src/main/resources/db/changelog/changesets/changelog_20251117T095627Z.xml

@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="rehiligha (generated)" id="1763373405443-18">
+        <addColumn tableName="study">
+            <column name="computation_result_filters_uuid" type="uuid"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -356,3 +356,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20251113T131808Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20251117T095627Z.xml
+      relativeToChangelogFile: true