Project

General

Profile

« Previous | Next » 

Revision 57174

Usage summary custom return object with PiwikInfo and MetricsInfo

View differences:

modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
2 2

  
3 3
import eu.dnetlib.repo.manager.domain.BrokerSummary;
4 4
import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
5
import eu.dnetlib.repo.manager.domain.UsageSummary;
5 6
import eu.dnetlib.repo.manager.service.BrokerService;
6 7
import eu.dnetlib.repo.manager.service.DashboardService;
7 8
import eu.dnetlib.repo.manager.service.PiWikService;
......
33 34
    @Autowired
34 35
    private BrokerService brokerService;
35 36

  
37
    @Autowired
38
    private PiWikService piWikService;
39

  
36 40
    @RequestMapping(value = "/getRepositoriesSummary/{userEmail}/{page}/{size}" , method = RequestMethod.GET,
37 41
            produces = MediaType.APPLICATION_JSON_VALUE)
38 42
    @ResponseBody
......
57 61
            produces = MediaType.APPLICATION_JSON_VALUE)
58 62
    @ResponseBody
59 63
    @PreAuthorize("hasRole('ROLE_USER')")
60
    public MetricsInfo getUsageSummary(
64
    public UsageSummary getUsageSummary(
61 65
            @PathVariable("repoId") String repoId) throws RepositoryServiceException {
62
        return repositoryService.getMetricsInfoForRepository(repoId);
66
        return new UsageSummary(repositoryService.getMetricsInfoForRepository(repoId), piWikService.getPiwikSiteForRepo(repoId));
63 67
    }
64 68

  
65 69
    @RequestMapping(value = "/brokerSummary/{email}/{ds_name}" , method = RequestMethod.GET,
modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/domain/UsageSummary.java
1
package eu.dnetlib.repo.manager.domain;
2

  
3
import eu.dnetlib.domain.data.PiwikInfo;
4
import eu.dnetlib.repo.manager.shared.MetricsInfo;
5
import eu.dnetlib.repo.manager.shared.broker.BrowseEntry;
6
import eu.dnetlib.repo.manager.shared.broker.SimpleSubscriptionDesc;
7

  
8
import java.util.List;
9
import java.util.Map;
10

  
11
public class UsageSummary {
12
    private MetricsInfo metricsInfo;
13

  
14
    private PiwikInfo piwikInfo;
15

  
16
    public UsageSummary() {
17
    }
18

  
19
    public UsageSummary(MetricsInfo metricsInfo, PiwikInfo piwikInfo) {
20
        this.metricsInfo = metricsInfo;
21
        this.piwikInfo = piwikInfo;
22
    }
23

  
24
    public MetricsInfo getMetricsInfo() {
25
        return metricsInfo;
26
    }
27

  
28
    public void setMetricsInfo(MetricsInfo metricsInfo) {
29
        this.metricsInfo = metricsInfo;
30
    }
31

  
32
    public PiwikInfo getPiwikInfo() {
33
        return piwikInfo;
34
    }
35

  
36
    public void setPiwikInfo(PiwikInfo piwikInfo) {
37
        this.piwikInfo = piwikInfo;
38
    }
39
}

Also available in: Unified diff