From fc2010e530409632b1b90ba4141f391ae18edfe4 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 10 Jul 2023 18:00:27 +0300
Subject: [PATCH 1/3] [Monitor Service | master]: IndicatorController.java: In
 method "createSectionsAndSaveBulk()" -on import indicators- check if a
 section or an indicator is null, and ignore them.

---
 .../controllers/IndicatorController.java                  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
index 9a9d5ae..bc1ebf9 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
@@ -71,6 +71,10 @@ public class IndicatorController {
     private void createSectionsAndSaveBulk(Date date, List<Section<Indicator>> old_sections,
                                           Stakeholder stakeholder, String topicId, String categoryId, String subcategoryId) throws UnsupportedEncodingException {
         for(Section<Indicator> section : old_sections) {
+            if(section == null) {
+                continue;
+            }
+
             Section chart_section = null;
             Section number_section = null;
 
@@ -87,6 +91,10 @@ public class IndicatorController {
 
             List<Indicator> indicators = section.getIndicators();
             for (Indicator indicator : indicators) {
+                if(indicator == null) {
+                    continue;
+                }
+
                 if (indicator.getType().equals("chart")) {
                     saveIndicatorAndAddInSection(indicator, date, stakeholder, subcategoryId, chart_section, chart_indicators);
 

From 648803a30c00c9e2a99ffe1dc7447b056e7ad177 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 17 Jul 2023 17:06:52 +0300
Subject: [PATCH 2/3] [Monitor Service | master]: Stakeholder.java: Added field
 "private Date projectUpdateDate = null;" to expose the last update date in
 the UI.

---
 .../uoamonitorservice/entities/Stakeholder.java        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java b/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
index f0dfb09..6ab8c78 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
@@ -31,6 +31,7 @@ public class Stakeholder<StringOrTopic> {
     private String id;
 
     private StakeholderType type; // private StakeholderType type;
+    private Date projectUpdateDate = null;
     private String index_id;
     private String index_name;
     private String index_shortName;
@@ -54,6 +55,7 @@ public class Stakeholder<StringOrTopic> {
     public Stakeholder(Stakeholder stakeholder) {
         id = stakeholder.getId();
         setType(stakeholder.getType());
+        projectUpdateDate = stakeholder.getProjectUpdateDate();
         index_id = stakeholder.getIndex_id();
         index_name = stakeholder.getIndex_name();
         index_shortName = stakeholder.getIndex_shortName();
@@ -102,6 +104,14 @@ public class Stakeholder<StringOrTopic> {
         }
     }
 
+    public Date getProjectUpdateDate() {
+        return projectUpdateDate;
+    }
+
+    public void setProjectUpdateDate(Date projectUpdateDate) {
+        this.projectUpdateDate = projectUpdateDate;
+    }
+
     public String getIndex_id() {
         return index_id;
     }

From 8446c19ea9b96c02c979dbdee99ab4a2bc975056 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Mon, 31 Jul 2023 10:59:03 +0300
Subject: [PATCH 3/3] Fix section default Id null exception in save default
 indicator

---
 .../uoamonitorservice/controllers/IndicatorController.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
index bc1ebf9..1d8a186 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
@@ -218,7 +218,7 @@ public class IndicatorController {
 
             for (String sectionId : sections) {
                 Section section = sectionDAO.findById(sectionId);
-                if(section.getDefaultId().equals(defaultSection.getId())) {
+                if(section.getDefaultId() != null && section.getDefaultId().equals(defaultSection.getId())) {
                     Indicator indicatorNew = new Indicator();
                     indicatorNew.copyFromDefault(indicator, subCategory.getVisibility());
                     for (IndicatorPath indicatorPath : indicatorNew.getIndicatorPaths()) {