rework export network file #899
Conversation
| @Lazy StudyService studyService, | ||
| RootNetworkService rootNetworkService, | ||
| RootNetworkNodeInfoService rootNetworkNodeInfoService, | ||
| DirectoryService directoryService) { |
There was a problem hiding this comment.
reformatted code to be reverted
|
|
||
| @ElementCollection | ||
| @CollectionTable( | ||
| name = "exportUuids", |
There was a problem hiding this comment.
| name = "exportUuids", | |
| name = "node_export", |
| @CollectionTable( | ||
| name = "exportUuids", | ||
| joinColumns = @JoinColumn(name = "root_network_node_info_id"), | ||
| foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_exportUuids_fk") |
There was a problem hiding this comment.
| foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_exportUuids_fk") | |
| foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_nodeExport_fk") |
| joinColumns = @JoinColumn(name = "root_network_node_info_id"), | ||
| foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_exportUuids_fk") | ||
| ) | ||
| @MapKeyColumn(name = "export_uuid_key") |
There was a problem hiding this comment.
| @MapKeyColumn(name = "export_uuid_key") | |
| @MapKeyColumn(name = "export_uuid") |
| @MapKeyColumn(name = "export_uuid_key") | ||
| @Column(name = "status") | ||
| @Enumerated(EnumType.STRING) | ||
| private Map<UUID, ExportNetworkStatus> exportNetworkUuids = new HashMap<>(); |
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
There was a problem hiding this comment.
I’ll look into how to do it
There was a problem hiding this comment.
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
| 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); |
There was a problem hiding this comment.
why do you add this ? I guess it's not used as you didn't change the conversion-server
There was a problem hiding this comment.
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
There was a problem hiding this comment.
You need it in some other methods yes. But not this one that is dedicated to the request to network-conversion-server
There was a problem hiding this comment.
Hum ok it's for the nodeUuid and rootNetworkUuid to be present in the notification ?
There was a problem hiding this comment.
rootNetworkUuid and nodeUuid removed
done
… rework-export-network-file
| joinColumns = @JoinColumn(name = "root_network_node_info_id"), | ||
| foreignKey = @ForeignKey(name = "rootNetworkNodeInfo_nodeExport_fk") | ||
| ) | ||
| private Map<UUID, NodeExportEmbeddable> nodeExportNetwork = new HashMap<>(); |
There was a problem hiding this comment.
Use a list and add exportUuid to NodeExportEmbeddable ?
There was a problem hiding this comment.
map replaced by list
done
… rework-export-network-file
|
PR Summary
rework export network file