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> old_sections, Stakeholder stakeholder, String topicId, String categoryId, String subcategoryId) throws UnsupportedEncodingException { for(Section section : old_sections) { + if(section == null) { + continue; + } + Section chart_section = null; Section number_section = null; @@ -87,6 +91,10 @@ public class IndicatorController { List 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); 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 { 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 { 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 { } } + public Date getProjectUpdateDate() { + return projectUpdateDate; + } + + public void setProjectUpdateDate(Date projectUpdateDate) { + this.projectUpdateDate = projectUpdateDate; + } + public String getIndex_id() { return index_id; }