apps/dnet-exporter-api/pom.xml

@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>eu.dnetlib</groupId>
 			<artifactId>dnet-datasource-manager-common</artifactId>
-			<version>1.2.0-EOSC-SNAPSHOT</version>
+			<version>[2.0.1,3.0.0)</version>
 		</dependency>
 
 		<dependency>

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtils.java

@@ -53,6 +53,7 @@ public class DsmMappingUtils {
 		ds.setDescription(d.getDescription());
 		ds.setConsentTermsOfUse(d.getConsentTermsOfUse());
 		ds.setConsentTermsOfUseDate(d.getConsentTermsOfUseDate());
+		ds.setLastConsentTermsOfUseDate(d.getLastConsentTermsOfUseDate());
 		ds.setFullTextDownload(d.getFullTextDownload());
 		if (d.getOrganizations() != null) {
 			ds.setOrganizations(d.getOrganizations().stream().map(DsmMappingUtils::asOrganizationDetail).collect(Collectors.toSet()));

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java

@@ -114,6 +114,9 @@ public class DatasourceDetails extends DatasourceIgnoredProperties {
 	@ApiModelProperty(position = 30)
 	private Date consentTermsOfUseDate;
 
+	@ApiModelProperty(position = 31)
+	private Date lastConsentTermsOfUseDate;
+
 	@ApiModelProperty(position = 26)
 	private Set<OrganizationDetails> organizations;
 
@@ -124,7 +127,7 @@ public class DatasourceDetails extends DatasourceIgnoredProperties {
 	private String status;
 
 	@Deprecated
-	@ApiModelProperty(position = 32)
+	@ApiModelProperty(position = 33)
 	private String typology;
 
 	public String getId() {
@@ -421,8 +424,18 @@ public class DatasourceDetails extends DatasourceIgnoredProperties {
 	}
 
 	@Deprecated
-	public void setTypology(final String typology) {
+	public DatasourceDetails setTypology(final String typology) {
 		this.typology = typology;
+		return this;
+	}
+
+	public Date getLastConsentTermsOfUseDate() {
+		return lastConsentTermsOfUseDate;
+	}
+
+	public DatasourceDetails setLastConsentTermsOfUseDate(final Date lastConsentTermsOfUseDate) {
+		this.lastConsentTermsOfUseDate = lastConsentTermsOfUseDate;
+		return this;
 	}
 
 }

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java

@@ -75,7 +75,10 @@ public class DatasourceDetailsUpdate {
 	@ApiModelProperty(position = 29)
 	private Date consentTermsOfUseDate;
 
-	@ApiModelProperty(position = 30)
+	@ApiModelProperty(position = 29)
+	private Date lastConsentTermsOfUseDate;
+
+	@ApiModelProperty(position = 31)
 	private Boolean fullTextDownload;
 
 	public String getId() {
@@ -217,24 +220,36 @@ public class DatasourceDetailsUpdate {
 		return consentTermsOfUse;
 	}
 
-	public void setConsentTermsOfUse(final Boolean consentTermsOfUse) {
+	public DatasourceDetailsUpdate setConsentTermsOfUse(final Boolean consentTermsOfUse) {
 		this.consentTermsOfUse = consentTermsOfUse;
+		return this;
 	}
 
 	public Date getConsentTermsOfUseDate() {
 		return consentTermsOfUseDate;
 	}
 
-	public void setConsentTermsOfUseDate(final Date consentTermsOfUseDate) {
+	public DatasourceDetailsUpdate setConsentTermsOfUseDate(final Date consentTermsOfUseDate) {
 		this.consentTermsOfUseDate = consentTermsOfUseDate;
+		return this;
 	}
 
 	public Boolean getFullTextDownload() {
 		return fullTextDownload;
 	}
 
-	public void setFullTextDownload(final Boolean fullTextDownload) {
+	public DatasourceDetailsUpdate setFullTextDownload(final Boolean fullTextDownload) {
 		this.fullTextDownload = fullTextDownload;
+		return this;
+	}
+
+	public Date getLastConsentTermsOfUseDate() {
+		return lastConsentTermsOfUseDate;
+	}
+
+	public DatasourceDetailsUpdate setLastConsentTermsOfUseDate(final Date lastConsentTermsOfUseDate) {
+		this.lastConsentTermsOfUseDate = lastConsentTermsOfUseDate;
+		return this;
 	}
 
 }

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java

@@ -53,13 +53,16 @@ public class DatasourceSnippetExtended {
 	private Date consentTermsOfUseDate;
 
 	@ApiModelProperty(position = 12)
-	private Boolean fullTextDownload;
+	private Date lastConsentTermsOfUseDate;
 
 	@ApiModelProperty(position = 13)
+	private Boolean fullTextDownload;
+
+	@ApiModelProperty(position = 14)
 	private Set<OrganizationDetails> organizations;
 
 	@Deprecated
-	@ApiModelProperty(position = 14)
+	@ApiModelProperty(position = 15)
 	private String typology;
 
 	public String getId() {
@@ -167,8 +170,9 @@ public class DatasourceSnippetExtended {
 		return organizations;
 	}
 
-	public void setOrganizations(final Set<OrganizationDetails> organizations) {
+	public DatasourceSnippetExtended setOrganizations(final Set<OrganizationDetails> organizations) {
 		this.organizations = organizations;
+		return this;
 	}
 
 	@Deprecated
@@ -177,8 +181,18 @@ public class DatasourceSnippetExtended {
 	}
 
 	@Deprecated
-	public void setTypology(final String typology) {
+	public DatasourceSnippetExtended setTypology(final String typology) {
 		this.typology = typology;
+		return this;
+	}
+
+	public Date getLastConsentTermsOfUseDate() {
+		return lastConsentTermsOfUseDate;
+	}
+
+	public DatasourceSnippetExtended setLastConsentTermsOfUseDate(final Date lastConsentTermsOfUseDate) {
+		this.lastConsentTermsOfUseDate = lastConsentTermsOfUseDate;
+		return this;
 	}
 
 }