Revision 52619
Added by Konstantina Galouni almost 6 years ago
| modules/uoa-claims/trunk/src/test/java/eu/dnetlib/data/claims/migration/parser/ContextUtilsTest.java | ||
|---|---|---|
| 28 | 28 |
id="egi::classification::natsc::math::applied"; |
| 29 | 29 |
Assert.assertEquals("EGI Federation> EGI classification scheme> Applied Mathematics", ContextUtils.extractLabel(id));
|
| 30 | 30 |
id="aginfra::projects"; |
| 31 |
Assert.assertEquals("AGINFRA+> AGINFRA+ Projects", ContextUtils.extractLabel(id));
|
|
| 31 |
Assert.assertEquals("AGINFRA> AGINFRA+ Projects", ContextUtils.extractLabel(id));
|
|
| 32 | 32 |
id="aginfra::projects::1"; |
| 33 |
Assert.assertEquals("AGINFRA+> AGINFRA+ Projects> European Foodbusiness Transfer Laboratory for stimulating entrepreneurial skills, for fostering innovation and for business creation in the Food Sector", ContextUtils.extractLabel(id));
|
|
| 33 |
Assert.assertEquals("AGINFRA> AGINFRA+ Projects> European Foodbusiness Transfer Laboratory for stimulating entrepreneurial skills, for fostering innovation and for business creation in the Food Sector", ContextUtils.extractLabel(id));
|
|
| 34 | 34 |
|
| 35 | 35 |
/* |
| 36 | 36 |
|
| modules/uoa-claims/trunk/src/main/java/eu/dnetlib/data/claims/migration/handler/FetchProjectHandler.java | ||
|---|---|---|
| 30 | 30 |
|
| 31 | 31 |
} |
| 32 | 32 |
|
| 33 |
public String fetchProjectIdByToken(String token, String email) throws Exception, SQLStoreException {
|
|
| 33 |
public String fetchProjectIdByTokenAndEmail(String token, String email) throws Exception, SQLStoreException {
|
|
| 34 | 34 |
String openaireId = null; |
| 35 | 35 |
ArrayList<Object> params = new ArrayList<>(); |
| 36 |
String query = queryGenerator.generateSelectProjectIdByTokenQuery(token, email, params); |
|
| 36 |
String query = queryGenerator.generateSelectProjectIdByTokenAndEmailQuery(token, email, params);
|
|
| 37 | 37 |
ResultSet rs = sqlDAO.executePreparedQuery(query, params); |
| 38 | 38 |
|
| 39 | 39 |
if(rs.next()) {
|
| ... | ... | |
| 43 | 43 |
return openaireId; |
| 44 | 44 |
} |
| 45 | 45 |
|
| 46 |
public String fetchProjectIdByToken(String token) throws Exception, SQLStoreException {
|
|
| 47 |
String openaireId = null; |
|
| 48 |
ArrayList<Object> params = new ArrayList<>(); |
|
| 49 |
String query = queryGenerator.generateSelectProjectIdByTokenQuery(token, params); |
|
| 50 |
ResultSet rs = sqlDAO.executePreparedQuery(query, params); |
|
| 51 |
|
|
| 52 |
if(rs.next()) {
|
|
| 53 |
openaireId = rs.getString(1); |
|
| 54 |
} |
|
| 55 |
rs.close(); |
|
| 56 |
return openaireId; |
|
| 57 |
} |
|
| 58 |
|
|
| 46 | 59 |
public Project fetchProjectById(String projectId) throws Exception, SQLStoreException {
|
| 47 | 60 |
ArrayList<Object> params = new ArrayList<>(); |
| 48 | 61 |
String query = queryGenerator.generateSelectProjectByIdQuery(projectId, params); |
| modules/uoa-claims/trunk/src/main/java/eu/dnetlib/data/claimsDemo/TestClass.java | ||
|---|---|---|
| 455 | 455 |
} |
| 456 | 456 |
|
| 457 | 457 |
@Test |
| 458 |
public void testFetchProjectIdByTokenAndEmail() throws Exception, SQLStoreException {
|
|
| 459 |
String openaireId = this.fetchProjectHandler.fetchProjectIdByTokenAndEmail("dedc6979-1967-4ea2-a2ad-5135f95285ae", "test11111@mail.com");
|
|
| 460 |
System.out.println(openaireId); |
|
| 461 |
} |
|
| 462 |
|
|
| 463 |
@Test |
|
| 458 | 464 |
public void testFetchProjectIdByToken() throws Exception, SQLStoreException {
|
| 459 |
String openaireId = this.fetchProjectHandler.fetchProjectIdByToken("dedc6979-1967-4ea2-a2ad-5135f95285ae", "test11111@mail.com");
|
|
| 465 |
String openaireId = this.fetchProjectHandler.fetchProjectIdByToken("dedc6979-1967-4ea2-a2ad-5135f95285ae");
|
|
| 460 | 466 |
System.out.println(openaireId); |
| 461 | 467 |
} |
| 462 | 468 |
|
| modules/uoa-claims/trunk/src/main/java/eu/dnetlib/data/claimsDemo/QueryGenerator.java | ||
|---|---|---|
| 744 | 744 |
((filterByType==null)?"":" where "+filterByType+" "); |
| 745 | 745 |
} |
| 746 | 746 |
*/ |
| 747 |
public String generateSelectProjectIdByTokenQuery(String token, String email, ArrayList<Object> params) {
|
|
| 747 |
public String generateSelectProjectIdByTokenAndEmailQuery(String token, String email, ArrayList<Object> params) {
|
|
| 748 | 748 |
params.add(token); |
| 749 | 749 |
params.add(email); |
| 750 | 750 |
return "SELECT openaire_id FROM project WHERE token=? AND ?= ANY(contact_person);"; |
| 751 | 751 |
} |
| 752 | 752 |
|
| 753 |
public String generateSelectProjectIdByTokenQuery(String token, ArrayList<Object> params) {
|
|
| 754 |
params.add(token); |
|
| 755 |
return "SELECT openaire_id FROM project WHERE token=?;"; |
|
| 756 |
} |
|
| 757 |
|
|
| 753 | 758 |
public String generateFetchClaimsByContext(String contextId, Integer limit, Integer offset,String keyword, String orderBy, boolean desc, List<String> types, ArrayList<Object> params) {
|
| 754 | 759 |
String clause= "claim.source_id like ?"; |
| 755 | 760 |
ArrayList<Object> clauseParams = new ArrayList<>(); |
| ... | ... | |
| 1097 | 1102 |
params.add(claimId); |
| 1098 | 1103 |
String query = "UPDATE claim " |
| 1099 | 1104 |
+ "SET curation_date = ?::timestamp, curated_by = ?, approved = ? " |
| 1100 |
+ "WHERE id = ?::int RETURNING curation_date, curated_by, approved"; |
|
| 1105 |
+ "WHERE id = ?::int";// RETURNING curation_date, curated_by, approved";
|
|
| 1101 | 1106 |
|
| 1102 | 1107 |
logger.debug("Query to execute: "+query);
|
| 1103 | 1108 |
|
Also available in: Unified diff
1. FetchProjectHandler.java: Rename 'fetchProjectIdByToken' to 'fetchProjectIdByTokenAndEmail' and create 'public String fetchProjectIdByToken(String token)' method.
2. QueryGenerator.java: Rename 'generateSelectProjectIdByTokenQuery' to 'generateSelectProjectIdByTokenAndEmailQuery'
create 'public String generateSelectProjectIdByTokenQuery(String token, ArrayList<Object> params)' method,
remove 'RETURNING' clause from query of 'generateUpdateClaimCuration' method -