Handle errors when getting modifications#61
Conversation
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
…onfig Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com> # Conflicts: # monitor-commons/src/main/java/org/gridsuite/monitor/commons/SecurityAnalysisConfig.java # monitor-server/src/main/java/org/gridsuite/monitor/server/entities/SecurityAnalysisConfigEntity.java # monitor-server/src/main/java/org/gridsuite/monitor/server/mapper/SecurityAnalysisConfigMapper.java # monitor-server/src/main/resources/db/changelog/db.changelog-master.yaml # monitor-server/src/test/java/org/gridsuite/monitor/server/MonitorIntegrationTest.java # monitor-server/src/test/java/org/gridsuite/monitor/server/controllers/ProcessConfigControllerTest.java
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
…config_uuid Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com> # Conflicts: # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/SecurityAnalysisRestService.java
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
Don't set startedAt and completedAt for skipped step Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
Add process config id in the process execution entity Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
…en_getting_modifications
This comment was marked as outdated.
This comment was marked as outdated.
…config_uuid Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com> # Conflicts: # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/StepExecutionService.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/securityanalysis/steps/SecurityAnalysisRunComputationStepTest.java
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
…' into handle_errors_when_getting_modifications Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com> # Conflicts: # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/StepExecutionService.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStepTest.java
…tting_modifications Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com> # Conflicts: # monitor-commons/src/main/java/org/gridsuite/monitor/commons/SecurityAnalysisConfig.java # monitor-commons/src/main/java/org/gridsuite/monitor/commons/steps/AbstractStepExecutor.java # monitor-commons/src/test/java/org/gridsuite/monitor/commons/steps/StepExecutorTest.java # monitor-server/src/main/java/org/gridsuite/monitor/server/controllers/MonitorController.java # monitor-server/src/main/java/org/gridsuite/monitor/server/mapper/ProcessExecutionMapper.java # monitor-server/src/main/java/org/gridsuite/monitor/server/mapper/SecurityAnalysisConfigMapper.java # monitor-server/src/main/java/org/gridsuite/monitor/server/services/MonitorService.java # monitor-server/src/main/resources/db/changelog/changesets/changelog_20260227T101113Z.xml # monitor-server/src/test/java/org/gridsuite/monitor/server/MonitorIntegrationTest.java # monitor-server/src/test/java/org/gridsuite/monitor/server/controllers/MonitorControllerTest.java # monitor-server/src/test/java/org/gridsuite/monitor/server/services/MonitorServiceTest.java # monitor-server/src/test/java/org/gridsuite/monitor/server/services/ProcessConfigServiceTest.java # monitor-worker-server/pom.xml # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStep.java # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/processes/securityanalysis/steps/SecurityAnalysisRunComputationStep.java # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/ActionsRestService.java # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/SecurityAnalysisParametersService.java # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/SecurityAnalysisRestService.java # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/StepExecutionService.java # monitor-worker-server/src/main/resources/org/gridsuite/monitor/worker/server/reports.properties # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStepTest.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/securityanalysis/steps/SecurityAnalysisRunComputationStepTest.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/services/ActionsRestServiceTest.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/services/SecurityAnalysisRestServiceTest.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/services/StepExecutionServiceTest.java
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
There was a problem hiding this comment.
🧹 Nitpick comments (1)
monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStepTest.java (1)
102-119: Consider asserting the specific exception type.The mocks are now properly set up (addressing previous feedback). However, the production code throws
PowsyblException(as seen inApplyModificationsStep.javaline 94), but the test assertsRuntimeException.class. While this works becausePowsyblExceptionextendsRuntimeException, using the specific type provides better test precision and ensures other runtime exceptions aren't inadvertently caught.♻️ Proposed fix for more precise assertion
- assertThrows(RuntimeException.class, () -> applyModificationsStep.execute(stepContext)); + assertThrows(PowsyblException.class, () -> applyModificationsStep.execute(stepContext));Add the import:
import com.powsybl.commons.PowsyblException;🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStepTest.java` around lines 102 - 119, Change the test to assert the specific PowsyblException instead of RuntimeException: in ApplyModificationsStepTest (method executeApplyModificationsFailWhenModificationsAreMissing) replace assertThrows(RuntimeException.class, ...) with assertThrows(PowsyblException.class, ...) and add the import com.powsybl.commons.PowsyblException; this aligns the test with the actual exception thrown by ApplyModificationsStep (PowsyblException).
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In
`@monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStepTest.java`:
- Around line 102-119: Change the test to assert the specific PowsyblException
instead of RuntimeException: in ApplyModificationsStepTest (method
executeApplyModificationsFailWhenModificationsAreMissing) replace
assertThrows(RuntimeException.class, ...) with
assertThrows(PowsyblException.class, ...) and add the import
com.powsybl.commons.PowsyblException; this aligns the test with the actual
exception thrown by ApplyModificationsStep (PowsyblException).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 9611a4fb-9959-4409-8826-b085c9b2002e
📒 Files selected for processing (1)
monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStepTest.java
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
…tting_modifications
f84ea7c to
a5fdbb7
Compare
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
antoinebhs
left a comment
There was a problem hiding this comment.
I'm not sure to understand why we need this complexity?
On main, we know the ID we want:
networkModificationRestService.getModifications(modificationIds);
and the ID we get List modificationInfos.getUuid()
Why can't we deduce the missing modifications ?
...ver/src/main/java/org/gridsuite/monitor/worker/server/orchestrator/StepExecutionService.java
Show resolved
Hide resolved
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
…_modifications # Conflicts: # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/process/commons/steps/ApplyModificationsStep.java # monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/SecurityAnalysisParametersService.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/clients/NetworkModificationRestClientTest.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/orchestrator/StepExecutionServiceTest.java # monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/process/commons/steps/ApplyModificationsStepTest.java
antoinebhs
left a comment
There was a problem hiding this comment.
Some maybe to discuss? let me know
...uite/monitor/worker/server/dto/networkmodifications/NetworkModificationsWithMissingInfo.java
Show resolved
Hide resolved
...ver/src/main/java/org/gridsuite/monitor/worker/server/orchestrator/StepExecutionService.java
Show resolved
Hide resolved
...n/java/org/gridsuite/monitor/worker/server/process/commons/steps/ApplyModificationsStep.java
Outdated
Show resolved
Hide resolved
...n/java/org/gridsuite/monitor/worker/server/process/commons/steps/ApplyModificationsStep.java
Outdated
Show resolved
Hide resolved
...src/test/java/org/gridsuite/monitor/worker/server/orchestrator/StepExecutionServiceTest.java
Show resolved
Hide resolved
...va/org/gridsuite/monitor/worker/server/process/commons/steps/ApplyModificationsStepTest.java
Show resolved
Hide resolved
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
...va/org/gridsuite/monitor/worker/server/process/commons/steps/ApplyModificationsStepTest.java
Outdated
Show resolved
Hide resolved
...va/org/gridsuite/monitor/worker/server/process/commons/steps/ApplyModificationsStepTest.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
|



PR Summary
Handle errors when getting modifications
based on PR : #58
to be merged together with PR : gridsuite/network-modification-server#775