Merge remote-tracking branch 'origin/master' into production

Fix save stakeholder bug, where topics will be deleted on save.
2024-04-24 23:25:09 +03:00 · 2024-04-24 23:23:27 +03:00
1 changed files with 2 additions and 2 deletions
--- a/src/main/java/eu/dnetlib/uoamonitorservice/service/StakeholderService.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/service/StakeholderService.java
@ -123,14 +123,14 @@ public class StakeholderService {

    public Stakeholder save(Stakeholder stakeholder) {
        if (stakeholder.getId() != null) {
+            Stakeholder old = this.findByPath(stakeholder.getId());
+            stakeholder.setTopics(old.getTopics());
            if (!stakeholder.isCopy() && stakeholder.getDefaultId() != null) {
                stakeholder.getTopics().forEach(topic -> {
                    this.topicService.delete(stakeholder.getType(), topic, false);
                });
                stakeholder.setTopics(new ArrayList<>());
            } else {
-                Stakeholder old = this.findByPath(stakeholder.getId());
-                stakeholder.setTopics(old.getTopics());
                if(old.getTopics().isEmpty() && old.getDefaultId() != null) {
                    Stakeholder defaultStakeholder = this.findByPath(stakeholder.getDefaultId());
                    if(defaultStakeholder != null) {
Author	SHA1	Message	Date
Konstantinos Triantafyllou	4b3c088fd0	Merge remote-tracking branch 'origin/master' into production	2024-04-24 23:25:09 +03:00
Konstantinos Triantafyllou	014ca643d5	Fix save stakeholder bug, where topics will be deleted on save.	2024-04-24 23:23:27 +03:00