D-Net
/
dnet-hadoop
13
4
Fork 10
Code Issues 14 Pull Requests 8 Projects 2 Releases 1 Wiki Activity

Adding H2020 Classification, topic code and topic description to H2020 projects #46

Merged
claudio.atzori merged 59 commits from miriam.baglioni/dnet-hadoop:h2020classification into master 2020-10-05 14:14:39 +02:00
Conversation 1 Commits 59 Files Changed 35 +1372 -188
miriam.baglioni commented 2020-10-01 16:42:42 +02:00
Member
Copy Link

This PR include the code to update H2020 project information with H2020Classification and h2020 topic code and topic description.

To obtain this update a modification to the model of the Project entity was needed:

  • Added :

    • H2020classification variable of type H2020Classification List. The model of the H2020Classification is the following :

    "h2020classification": [
    {
    "h2020Programme": {
    "code": "Programme code",
    "description": "programme description"
    },
    "level1": "classification level 1",
    "level2": "classification level 2",
    "level3": "classification level 3",
    "classification": "entire classification related to the programme code"
    }
    ]

    • H2020topicdescription of type String and
    • H2020topiccode of type String. The model of the H2020Classification is the following:

  • Removed :

    • H2020Programme variable of type H2020Programme that has been inserted in the H2020Classification definition
This PR include the code to update H2020 project information with H2020Classification and h2020 topic code and topic description. To obtain this update a modification to the model of the Project entity was needed: * Added : - H2020classification variable of type H2020Classification List. The model of the H2020Classification is the following : "h2020classification": [ { "h2020Programme": { "code": "Programme code", "description": "programme description" }, "level1": "classification level 1", "level2": "classification level 2", "level3": "classification level 3", "classification": "entire classification related to the programme code" } ] - H2020topicdescription of type String and - H2020topiccode of type String. The model of the H2020Classification is the following: * Removed : - H2020Programme variable of type H2020Programme that has been inserted in the H2020Classification definition
claudio.atzori added the
enhancement
 label 2020-10-01 17:05:20 +02:00
claudio.atzori self-assigned this 2020-10-01 17:05:25 +02:00
claudio.atzori reviewed 2020-10-01 17:07:18 +02:00
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/H2020Classification.java
@ -0,0 +2,4 @@
package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable;
claudio.atzori commented 2020-10-01 17:07:18 +02:00
Owner
Copy Link

Consider adding some javadoc

Consider adding some javadoc
claudio.atzori commented 2020-10-05 14:06:12 +02:00
Owner
Copy Link

LGTM

LGTM
claudio.atzori reviewed 2020-10-01 17:08:12 +02:00
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/H2020Classification.java
@ -0,0 +3,4 @@
import java.io.Serializable;
import java.util.Objects;
claudio.atzori commented 2020-10-01 17:08:12 +02:00
Owner
Copy Link

Consider adding some javadoc

Consider adding some javadoc
claudio.atzori commented 2020-10-05 14:10:47 +02:00
Owner
Copy Link

LGTM

LGTM
claudio.atzori reviewed 2020-10-01 17:11:30 +02:00
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java
@ -63,3 +61,3 @@
private Granted granted;
private List<Programme> programme;
// private List<Programme> programme;
claudio.atzori commented 2020-10-01 17:11:30 +02:00
Owner
Copy Link

please remove unused code lines

please remove unused code lines
miriam.baglioni closed this pull request 2020-10-01 17:18:05 +02:00
miriam.baglioni reopened this pull request 2020-10-01 17:29:36 +02:00
claudio.atzori reviewed 2020-10-01 17:35:31 +02:00
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
@ -332,3 +352,3 @@
: fundedamount;
programme = mergeLists(programme, p.getProgramme());
// programme = mergeLists(programme, p.getProgramme());
claudio.atzori commented 2020-10-01 17:35:31 +02:00
Owner
Copy Link

please remove unused code lines

please remove unused code lines
claudio.atzori reviewed 2020-10-01 17:37:22 +02:00
dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/PrepareProjects.java Outdated
@ -98,2 +96,4 @@
String[] programme = csvProject.get().getProgramme().split(";");
String topic = csvProject.get().getTopics();
// String topicdescription = Optional
claudio.atzori commented 2020-10-01 17:37:22 +02:00
Owner
Copy Link

please remove unused code lines

please remove unused code lines
claudio.atzori reviewed 2020-10-01 17:38:25 +02:00
dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/ReadExcel.java Outdated
@ -0,0 +79,4 @@
this.writer = new BufferedWriter(new OutputStreamWriter(fsDataOutputStream, StandardCharsets.UTF_8));
this.excelFile = httpConnector.getInputSourceAsStream(fileURL);
;
claudio.atzori commented 2020-10-01 17:38:25 +02:00
Owner
Copy Link

cleanup needed :)

cleanup needed :)
claudio.atzori requested changes 2020-10-02 11:48:41 +02:00
claudio.atzori left a comment
Owner
Copy Link

Except for some minor changes, looks good to me.

Except for some minor changes, looks good to me.
claudio.atzori commented 2020-10-02 11:49:46 +02:00
Owner
Copy Link

Adding link to the discussion about the H2020 programmes: #5926

Adding link to the discussion about the H2020 programmes: [#5926](https://issue.openaire.research-infrastructures.eu/issues/5926)
claudio.atzori changed title from WIP: adding H2020 Classification, topic code and topic description to H2020 projects to Adding H2020 Classification, topic code and topic description to H2020 projects 2020-10-05 14:13:49 +02:00
claudio.atzori closed this pull request 2020-10-05 14:14:39 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature / refactoring

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
RDGraph

EOSC Research Discovery Graph

  
RSAC

EOSC Research Software APIs and Connectors

  
wontfix

This won't be fixed

No Label
bug
duplicate
enhancement
help wanted
invalid
question
RDGraph
RSAC
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
claudio.atzori
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: D-Net/dnet-hadoop#46
No description provided.
Delete Branch "miriam.baglioni/dnet-hadoop:h2020classification"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?