rework export network file #899

ghazwarhili · 2025-12-12T15:27:18Z

PR Summary

rework export network file

… rework-export-network-file

ghazwarhili · 2025-12-15T17:16:38Z

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

+            @Lazy StudyService studyService,
+            RootNetworkService rootNetworkService,
+            RootNetworkNodeInfoService rootNetworkNodeInfoService,
+            DirectoryService directoryService) {


reformatted code to be reverted

etiennehomer · 2025-12-16T14:20:34Z

...a/org/gridsuite/study/server/networkmodificationtree/entities/RootNetworkNodeInfoEntity.java


+    @ElementCollection
+    @CollectionTable(
+            name = "exportUuids",


Suggested change

name = "exportUuids",

name = "node_export",

etiennehomer · 2025-12-16T14:22:08Z

...a/org/gridsuite/study/server/networkmodificationtree/entities/RootNetworkNodeInfoEntity.java

+    @CollectionTable(
+            name = "exportUuids",
+            joinColumns = @JoinColumn(name = "root_network_node_info_id"),
+            foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_exportUuids_fk")


Suggested change

foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_exportUuids_fk")

foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_nodeExport_fk")

etiennehomer · 2025-12-16T14:23:05Z

...a/org/gridsuite/study/server/networkmodificationtree/entities/RootNetworkNodeInfoEntity.java

+            joinColumns = @JoinColumn(name = "root_network_node_info_id"),
+            foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_exportUuids_fk")
+    )
+    @MapKeyColumn(name = "export_uuid_key")


Suggested change

@MapKeyColumn(name = "export_uuid_key")

@MapKeyColumn(name = "export_uuid")

etiennehomer · 2025-12-16T14:56:09Z

...a/org/gridsuite/study/server/networkmodificationtree/entities/RootNetworkNodeInfoEntity.java

+    @MapKeyColumn(name = "export_uuid_key")
+    @Column(name = "status")
+    @Enumerated(EnumType.STRING)
+    private Map<UUID, ExportNetworkStatus> exportNetworkUuids = new HashMap<>();


Entries in the sub table should be deleted when the node is unbuild (and also when a modification is added to the node ? to be done later maybe)

see

study-server/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java

Line 242 in 30130ce

public InvalidateNodeInfos invalidateRootNetworkNode(RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity, InvalidateNodeTreeParameters invalidateTreeParameters) {

I’ll look into how to do it

And it would be simpler by using a NodeExportEmbeddable and remove @MapKeyColumn and @Enumerated.
After your PR, Bassel will add some columns to this table

etiennehomer · 2025-12-16T16:21:44Z

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

                uriComponentsBuilder.queryParam("fileName", fileName);
            }
-            String receiver = URLEncoder.encode(objectMapper.writeValueAsString(new NetworkExportReceiver(studyUuid, userId)), StandardCharsets.UTF_8);
+            String receiver = URLEncoder.encode(objectMapper.writeValueAsString(new NetworkExportReceiver(studyUuid, nodeUuid, rootNetworkUuid, userId)), StandardCharsets.UTF_8);


why do you add this ? I guess it's not used as you didn't change the conversion-server

I need it because I use nodeUuid and rootNetworkUuid to look up the rootNetworkNodeInfoEntity. Even if the conversion-server wasn’t changed, these values are required for that lookup

You need it in some other methods yes. But not this one that is dedicated to the request to network-conversion-server

Hum ok it's for the nodeUuid and rootNetworkUuid to be present in the notification ?

rootNetworkUuid and nodeUuid removed
done

… rework-export-network-file

etiennehomer · 2025-12-17T13:23:21Z

...a/org/gridsuite/study/server/networkmodificationtree/entities/RootNetworkNodeInfoEntity.java

+            joinColumns = @JoinColumn(name = "root_network_node_info_id"),
+            foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_nodeExport_fk")
+    )
+    private Map<UUID, NodeExportEmbeddable> nodeExportNetwork = new HashMap<>();


Use a list and add exportUuid to NodeExportEmbeddable ?

map replaced by list
done

… rework-export-network-file

etiennehomer · 2025-12-30T14:23:08Z

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

+    }
+
+    @Transactional
+    public void updateExportNetworkStatus(UUID nodeUuid, UUID rootNetworkUuid, UUID exportUuid, ExportNetworkStatus status) {


method to remove ? The one above does the job

etiennehomer · 2025-12-30T14:43:55Z

...in/java/org/gridsuite/study/server/repository/rootnetwork/RootNetworkNodeInfoRepository.java


    List<RootNetworkNodeInfoEntity> findAllByPccMinResultUuidNotNull();

+    List<RootNetworkNodeInfoEntity> findAllByNodeExportNetworkExportUuid(UUID exportUuid);


You should add a JPQL request (as it is done for existsByNodeUuidsAndBlockedNode()) that will return a NodeExportEmbeddable for a given exportUuid. This will simplify also updateExportNetworkStatus(UUID exportUuid, ExportNetworkStatus status) and getExportNetworkStatus()

etiennehomer · 2025-12-30T14:45:20Z

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

                UUID exportUuid = msg.getHeaders().containsKey(HEADER_EXPORT_UUID) ? UUID.fromString((String) Objects.requireNonNull(msg.getHeaders().get(HEADER_EXPORT_UUID))) : null;
                String errorMessage = (String) msg.getHeaders().get(HEADER_ERROR);
                notificationService.emitNetworkExportFinished(studyUuid, exportUuid, userId, errorMessage);
+                rootNetworkNodeInfoService.updateExportNetworkStatus(exportUuid, errorMessage == null ? ExportNetworkStatus.SUCCESS : ExportNetworkStatus.FAILED);


You should first update the export status and then notify that the export is finished

etiennehomer · 2025-12-30T15:20:38Z

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

+        RootNetworkNodeInfoEntity rootNetworkNodeInfo = findRootNetworkNodeInfo(nodeUuid, rootNetworkUuid);
+        if (rootNetworkNodeInfo.getNodeExportNetwork() != null) {
+            rootNetworkNodeInfo.getNodeExportNetwork().clear();
+        } else {


Remove this branch ? It's not in the clearNodeExportNetwork that we should set a new ArrayList<> instead of a null

etiennehomer · 2025-12-30T15:24:48Z

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


        deleteInvalidationInfos(invalidateNodeInfos);
-
+        rootNetworkNodeInfoService.clearNodeExportNetworks(nodeUuid, rootNetworkUuid);


Move this into invalidateRootNetworkNode(RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity, InvalidateNodeTreeParameters invalidateTreeParameters) of RootNetworkNodeInfoService.java

etiennehomer · 2025-12-30T15:25:56Z

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

        }

        if (!networkModificationTreeService.isRootNode(nodeUuid)) {
+            rootNetworkNodeInfoService.clearNodeExportNetworks(nodeUuid, rootNetworkUuid);


You can remove this call after you did https://github.com/gridsuite/study-server/pull/899/changes#r2653235285

etiennehomer · 2026-01-07T10:43:22Z

...a/org/gridsuite/study/server/networkmodificationtree/entities/RootNetworkNodeInfoEntity.java

+            joinColumns = @JoinColumn(name = "root_network_node_info_id"),
+            foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_nodeExport_fk")
+    )
+    private List<NodeExportEmbeddable> nodeExportNetwork = new ArrayList<>();


I think you have to move this to AbstractNodeInfoEntity.
RootNetworkNodeInfoEntity is for modification nodes only, not for root nodes. And we need to export also root nodes

sonarqubecloud · 2026-01-08T14:15:39Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
97.2% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

ghazwarhili added 7 commits December 12, 2025 16:26

rework export network file

583597e

Merge branch 'main' into rework-export-network-file

5271580

add changeset

3c26cdc

Merge remote-tracking branch 'origin/rework-export-network-file' into…

d475144

… rework-export-network-file

revert unused import

3391759

fix TU

ddcaa17

fix TU

1b3ee60

ghazwarhili commented Dec 15, 2025

View reviewed changes

ghazwarhili added 4 commits December 16, 2025 15:04

enhance coverage code

06d1a60

enhance coverage test

7b84c83

unused import

5aa25e2

Merge branch 'main' into rework-export-network-file

0cdebf0

etiennehomer requested changes Dec 16, 2025

View reviewed changes

ghazwarhili added 2 commits December 16, 2025 18:15

code review remarks

1bdb4cf

Merge remote-tracking branch 'origin/rework-export-network-file' into…

0a6c2d1

… rework-export-network-file

ghazwarhili requested a review from etiennehomer December 16, 2025 17:21

ghazwarhili added 3 commits December 17, 2025 11:03

code review remarks

54e641a

revert formatted code

5cc81d5

resolve conflicts

e0df4cf

etiennehomer reviewed Dec 17, 2025

View reviewed changes

ghazwarhili added 8 commits December 17, 2025 15:28

remove nodeUuid and rootNetworkUuid from notification

169806e

replace map by list

993b15d

fix TU

0ef74aa

add clearNodeExportNetworks

ef4e3d7

Merge branch 'main' into rework-export-network-file

06cd2ee

add unique key contraint for export uuid

5bb4086

Merge remote-tracking branch 'origin/rework-export-network-file' into…

a1f61cb

… rework-export-network-file

fix TU

e1e1e8a

etiennehomer requested changes Dec 30, 2025

View reviewed changes

Merge branch 'main' into rework-export-network-file

6867f5b

code review remarks

b44de1d

etiennehomer requested changes Jan 7, 2026

View reviewed changes

ghazwarhili added 2 commits January 7, 2026 14:19

fix test

a59df3f

move to node entity

97f17ed

ghazwarhili force-pushed the rework-export-network-file branch from b6c2eb9 to 97f17ed Compare January 7, 2026 15:42

ghazwarhili added 2 commits January 7, 2026 16:56

Merge branch 'main' into rework-export-network-file

5e867e6

unused import

1e0bbc5

ghazwarhili requested a review from etiennehomer January 7, 2026 16:09

ghazwarhili added 5 commits January 7, 2026 18:13

code review remarks

fccd7ad

clean code

381882c

clean test

0fb91dc

code review remarks

7eab465

add node_export_export_uuid_idx

fe2590e

etiennehomer approved these changes Jan 8, 2026

View reviewed changes

ghazwarhili merged commit 7ad354d into main Jan 8, 2026
4 checks passed

ghazwarhili deleted the rework-export-network-file branch January 8, 2026 14:52

	foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_exportUuids_fk")
	foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_nodeExport_fk")

	@MapKeyColumn(name = "export_uuid_key")
	@MapKeyColumn(name = "export_uuid")


		List<RootNetworkNodeInfoEntity> findAllByPccMinResultUuidNotNull();

		List<RootNetworkNodeInfoEntity> findAllByNodeExportNetworkExportUuid(UUID exportUuid);


		deleteInvalidationInfos(invalidateNodeInfos);

		rootNetworkNodeInfoService.clearNodeExportNetworks(nodeUuid, rootNetworkUuid);

rework export network file #899

rework export network file #899

Uh oh!

Conversation

ghazwarhili commented Dec 12, 2025

PR Summary

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghazwarhili Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jan 8, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ghazwarhili Dec 17, 2025 •

edited

Loading