Merge pull request 'Datasource consent fields' (#202) from datasource_pdf_consent into beta

Reviewed-on: #202

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java

@@ -309,6 +309,9 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication i
 			ds.setThematic(rs.getBoolean("thematic"));
 			ds.setKnowledgegraph(rs.getBoolean("knowledgegraph"));
 			ds.setContentpolicies(prepareListOfQualifiers(rs.getArray("contentpolicies")));
+			ds.setConsenttermsofuse(rs.getBoolean("consenttermsofuse"));
+			ds.setFulltextdownload(rs.getBoolean("fulltextdownload"));
+			ds.setConsenttermsofusedate(rs.getDate("consenttermsofusedate").toString());
 
 			return Arrays.asList(ds);
 		} catch (final Exception e) {

dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryDatasources.sql

@@ -89,6 +89,9 @@ SELECT
 	d.issn                                                                                                     AS issnPrinted,
 	d.eissn                                                                                                    AS issnOnline,
 	d.lissn                                                                                                    AS issnLinking,
+	d.consenttermsofuse                                                                                        AS consenttermsofuse,
+	d.fulltextdownload                                                                                         AS fulltextdownload,
+	d.consenttermsofusedate                                                                                    AS consenttermsofusedate,
 	de.jurisdiction||'@@@eosc:jurisdictions'                                                                   AS jurisdiction,
 	de.thematic                                                                                                AS thematic,
 	de.knowledge_graph                                                                                         AS knowledgegraph,

dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplicationTest.java

@@ -100,6 +100,9 @@ public class MigrateDbEntitiesApplicationTest {
 		assertEquals("Journal article", ds.getContentpolicies().get(0).getClassid());
 		assertEquals("eosc:contentpolicies", ds.getContentpolicies().get(0).getSchemeid());
 
+		assertEquals(true, ds.getConsenttermsofuse());
+		assertEquals(true, ds.getFulltextdownload());
+		assertEquals("2022-03-11", ds.getConsenttermsofusedate());
 	}
 
 	@Test

dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/oa/graph/raw/datasources_resultset_entry.json

@@ -268,5 +268,20 @@
 		"value": [
 			"Journal article@@@eosc:contentpolicies"
 		]
+	},
+	{
+		"field": "consenttermsofuse",
+		"type": "boolean",
+		"value": true
+	},
+	{
+		"field": "fulltextdownload",
+		"type": "boolean",
+		"value": true
+	},
+	{
+		"field": "consenttermsofusedate",
+		"type": "date",
+		"value": "2022-03-11"
 	}
 ]