Project

General

Profile

« Previous | Next » 

Revision 49869

1. Broker api ready
2. Piwi api ready

View differences:

PiwikDAO.java
1 1
package eu.dnetlib.repo.manager.server.services;
2 2

  
3
import eu.dnetlib.repo.manager.service.controllers.PiWiApi;
3 4
import eu.dnetlib.repo.manager.shared.PiwikInfo;
4 5
import eu.dnetlib.utils.md5.MD5;
5 6
import org.springframework.beans.factory.annotation.Autowired;
......
21 22
@Component(value = "piwikDAO")
22 23
public class PiwikDAO {
23 24

  
25

  
24 26
    @Autowired
25
    @Qualifier("repomanager.dataSource")
26
    private DataSource dataSource;
27
    private PiWiApi piWiApi;
27 28

  
28
    private final static String GET_PIWIK_SITE = "select repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, approved, approvaldate, comment, repositoryname, country from piwik_site where repositoryid = ?;";
29

  
30
    private final static String INSERT_PIWIK_INFO = "insert into piwik_site (repositoryid, siteid, creationdate, requestorname, requestoremail, approved, repositoryname, country, authenticationtoken) values (?, ?, now(), ?, ?, ?, ?, ?, ?)";
31

  
32
    private final static String GET_PIWIK_SITES = "select repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, approved, approvaldate, comment, repositoryname, country from piwik_site order by repositoryname";
33

  
34
    private final static String APPROVE_PIWIK_SITE = "update piwik_site set approved=true, approvaldate=now() where repositoryid = ?;";
35

  
36
    private RowMapper<PiwikInfo> piwikRowMapper = new RowMapper<PiwikInfo>() {
37
        @Override
38
        public PiwikInfo mapRow(ResultSet rs, int i) throws SQLException {
39
            return new PiwikInfo(rs.getString("repositoryid"), getOpenaireId(rs.getString("repositoryid")), rs.getString("repositoryname"), rs.getString("country"),
40
                    rs.getString("siteid"), rs.getString("authenticationtoken"), rs.getTimestamp("creationdate"), rs.getString("requestorname"), rs.getString("requestoremail"),
41
                    rs.getBoolean("approved"), rs.getTimestamp("approvaldate"), rs.getString("comment"));
42
        }
43
    };
44

  
45 29
    public PiwikInfo getPiwikSiteForRepo(String repositoryId) {
46
        return new JdbcTemplate(dataSource).queryForObject(GET_PIWIK_SITE, new String[]{repositoryId}, new int[]{Types.VARCHAR}, piwikRowMapper);
30
        return piWiApi.getPiwikSiteForRepo(repositoryId);
47 31
    }
48 32

  
49 33
    public PiwikInfo savePiwikInfo(PiwikInfo piwikInfo) {
50
        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
51
        jdbcTemplate.update(INSERT_PIWIK_INFO, new Object[]{piwikInfo.getRepositoryId(), piwikInfo.getSiteId(), piwikInfo.getRequestorName(),
52
                piwikInfo.getRequestorEmail(), piwikInfo.isApproved(), piwikInfo.getRepositoryName(), piwikInfo.getCountry(), piwikInfo.getAuthenticationToken()},
53
                new int[]{Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.BOOLEAN, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR});
54
        return piwikInfo;
34
       return piWiApi.savePiwikInfo(piwikInfo);
55 35
    }
56 36

  
57 37
    public List<PiwikInfo> getPiwikSitesForRepos() {
58
        return new JdbcTemplate(dataSource).query(GET_PIWIK_SITES, piwikRowMapper);
38
        return piWiApi.getPiwikSitesForRepos();
59 39
    }
60 40

  
61 41
    public void approvePiwikSite(String repositoryId) {
62
        new JdbcTemplate(dataSource).update(APPROVE_PIWIK_SITE, new Object[] {repositoryId}, new int[] {Types.VARCHAR});
42
       piWiApi.approvePiwikSite(repositoryId);
63 43
    }
64 44

  
65 45
    private String getOpenaireId(String repositoryid) {
66
        try {
67
            if (repositoryid != null && repositoryid.contains("::"))
68
                return repositoryid.split("::")[0] + "::" + MD5.encrypt2Hex(repositoryid.split("::")[1]);
69
            else
70
                return null;
71
        } catch (NoSuchAlgorithmException e) {
72
            e.printStackTrace();
73
        }
74
        return null;
46
       return piWiApi.getOpenaireId(repositoryid);
75 47
    }
76 48
}

Also available in: Unified diff