From b62cd656a78b763c0db77dd9f625bb2cfab99937 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 12 Aug 2021 18:01:10 +0200
Subject: [PATCH] GetCSV refactoring - changed the model to store only the
 information needed

---
 .../utils/{ => model}/CSVProgramme.java       | 24 +++++----
 .../project/utils/model/CSVProject.java       | 51 +++++++++++++++++++
 2 files changed, 64 insertions(+), 11 deletions(-)
 rename dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/{ => model}/CSVProgramme.java (77%)
 create mode 100644 dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/model/CSVProject.java

diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/CSVProgramme.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/model/CSVProgramme.java
similarity index 77%
rename from dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/CSVProgramme.java
rename to dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/model/CSVProgramme.java
index d486f01049..ea89a75eb4 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/CSVProgramme.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/model/CSVProgramme.java
@@ -1,20 +1,31 @@
 
-package eu.dnetlib.dhp.actionmanager.project.utils;
+package eu.dnetlib.dhp.actionmanager.project.utils.model;
 
 import java.io.Serializable;
 
+import com.opencsv.bean.CsvBindByName;
+
 /**
  * The model for the programme csv file
  */
 public class CSVProgramme implements Serializable {
 
-	private String rcn;
+	@CsvBindByName(column = "code")
 	private String code;
 
+	@CsvBindByName(column = "title")
 	private String title;
+
+	@CsvBindByName(column = "shortTitle")
 	private String shortTitle;
+
+	@CsvBindByName(column = "language")
 	private String language;
+
+	@CsvBindByName(column = "classification")
 	private String classification;
+
+	@CsvBindByName(column = "classification_short")
 	private String classification_short;
 
 	public String getClassification_short() {
@@ -33,14 +44,6 @@ public class CSVProgramme implements Serializable {
 		this.classification = classification;
 	}
 
-	public String getRcn() {
-		return rcn;
-	}
-
-	public void setRcn(String rcn) {
-		this.rcn = rcn;
-	}
-
 	public String getCode() {
 		return code;
 	}
@@ -73,5 +76,4 @@ public class CSVProgramme implements Serializable {
 		this.language = language;
 	}
 
-//
 }
diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/model/CSVProject.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/model/CSVProject.java
new file mode 100644
index 0000000000..73cea0539f
--- /dev/null
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/model/CSVProject.java
@@ -0,0 +1,51 @@
+
+package eu.dnetlib.dhp.actionmanager.project.utils.model;
+
+import java.io.Serializable;
+
+import com.opencsv.bean.CsvBindByName;
+
+/**
+ * the mmodel for the projects csv file
+ */
+public class CSVProject implements Serializable {
+
+	@CsvBindByName(column = "id")
+	private String id;
+
+	@CsvBindByName(column = "programme")
+	private String programme;
+
+	@CsvBindByName(column = "topics")
+	private String topics;
+
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+
+
+	public String getProgramme() {
+		return programme;
+	}
+
+	public void setProgramme(String programme) {
+		this.programme = programme;
+	}
+
+	public String getTopics() {
+		return topics;
+	}
+
+	public void setTopics(String topics) {
+		this.topics = topics;
+	}
+
+
+
+}