Project

General

Profile

« Previous | Next » 

Revision 53199

1. Project.java: Remove 'token' field from 'Project' entity.
2. FetchProjectHandler.java, ProjectHandler.java, TestClass.java: Remove methods related to 'token' field.
3. FetchProjectHandler.java: Add 'fetchProjectIdsAndNamesByProjectManagerMail' method | Change 'fetchContactEmailsByProjectId' method (mails are returned as List from DAO).

View differences:

FetchProjectHandler.java
12 12
import java.sql.ResultSet;
13 13
import java.text.DateFormat;
14 14
import java.text.SimpleDateFormat;
15
import java.util.ArrayList;
16
import java.util.Date;
17
import java.util.List;
18
import java.util.UUID;
15
import java.util.*;
19 16

  
20 17
/**
21 18
 * Created by konstantina on 10/4/2017.
......
29 26
    public FetchProjectHandler(){
30 27

  
31 28
    }
32

  
29
/*
33 30
    public String fetchProjectIdByTokenAndEmail(String token, String email) throws Exception, SQLStoreException {
34 31
        String openaireId = null;
35 32
        ArrayList<Object> params = new ArrayList<>();
......
55 52
        rs.close();
56 53
        return openaireId;
57 54
    }
58

  
55
*/
59 56
    public Project fetchProjectById(String projectId) throws Exception, SQLStoreException {
60 57
        ArrayList<Object> params = new ArrayList<>();
61 58
        String query = queryGenerator.generateSelectProjectByIdQuery(projectId, params);
......
74 71
        String query = queryGenerator.generateSelectContactEmailsByProjectIdQuery(projectId, params);
75 72
        ResultSet rs = sqlDAO.executePreparedQuery(query, params);
76 73

  
77
        if(rs.next()) {
78
//            Array array = ((String[])rs.getArray(1));
79
            Array array = rs.getArray(1);
80
            if(array != null) {
81
                String[] str_array = (String[]) array.getArray();
74
        List<String> mails = null;
82 75

  
83
                List<String> mails = new ArrayList<String>();
84
                for (int i = 0; i < str_array.length; i++) {
85
                    mails.add(str_array[i]);
86
                }
87
                return mails;
76
        while(rs.next()) {
77
            if(mails == null) {
78
                mails = new ArrayList<String>();
88 79
            }
80
            mails.add(rs.getString(1));
89 81
        }
90
        return null;
82
        return mails;
91 83
    }
92 84

  
85
    public Map<String, String> fetchProjectIdsAndNamesByProjectManagerMail(String userMail) throws Exception, SQLStoreException {
86
        ArrayList<Object> params = new ArrayList<>();
87
        String query = queryGenerator.generateSelectProjectIdsAndNamesByProjectManagerMail(userMail, params);
88
        ResultSet rs = sqlDAO.executePreparedQuery(query, params);
89

  
90
        Map<String, String> projectIdsAndNames = null;
91
        while(rs.next()) {
92
            if(projectIdsAndNames == null) {
93
                projectIdsAndNames = new HashMap<String, String>();
94
            }
95
            projectIdsAndNames.put(rs.getString(1), rs.getString(2));
96
        }
97
        return projectIdsAndNames;
98
    }
99

  
93 100
    public Project fetchProjectByResultSet(ResultSet rs) throws Exception {
94 101
        Project project = null;
95 102
        while(rs.next()) {

Also available in: Unified diff