Project

General

Profile

« Previous | Next » 

Revision 52619

Added by Konstantina Galouni almost 6 years ago

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 -> 'executeUpdateQuery' in 'SqlDAO.java' assumes update queries do not have resultset.

View differences:

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);


  		












Also available in:  Unified diff