/ - Diff - D-Net - D-Net project tracking tool

         List<PiwikInfo> getPiwikSitesForRepos(OrderByField orderByField, OrderByType orderByType, int from, int quantity, String searchField);
         int getPiwikSitesTotals();
         ResponseEntity<Object> approvePiwikSite(String repositoryId);
         String getOpenaireId(String repositoryid);

         private final static String INSERT_PIWIK_INFO = "insert into piwik_site (repositoryid, siteid, creationdate, requestorname, requestoremail, validated, repositoryname, country, authenticationtoken) values (?, ?, now(), ?, ?, ?, ?, ?, ?)";
         private final static String GET_PIWIK_SITES = "select count(*) OVER() as totals, repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site ";
         private final static String GET_PIWIK_SITES = "select  repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site ";
         private final static String GET_PIWIK_SITES_TOTAL = "select count(*) as totals from piwik_site ";
         private final static String APPROVE_PIWIK_SITE = "update piwik_site set validated=true, validationdate=now() where repositoryid = ?;";
         private RowMapper<PiwikInfo> piwikRowMapper = (rs, i) -> new PiwikInfo(rs.getString("repositoryid"), getOpenaireId(rs.getString("repositoryid")), rs.getString("repositoryname"), rs.getString("country"),
-...
+        }
         @Override
         public int getPiwikSitesTotals(){
             try{
                 return new JdbcTemplate(dataSource).queryForObject(GET_PIWIK_SITES_TOTAL,Integer.class);
             }catch (EmptyResultDataAccessException e){
                 return 0;
+            }
+        }
         @Override
         @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN')")
         public ResponseEntity<Object> approvePiwikSite(String repositoryId) {
             new JdbcTemplate(dataSource).update(APPROVE_PIWIK_SITE, new Object[] {repositoryId}, new int[] {Types.VARCHAR});

     import eu.dnetlib.domain.data.PiwikInfo;
     import eu.dnetlib.repo.manager.domain.OrderByField;
     import eu.dnetlib.repo.manager.domain.OrderByType;
     import eu.dnetlib.repo.manager.domain.Paging;
     import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
     import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
     import io.swagger.annotations.Api;
-...
                 @ApiImplicitParam(name = "searchField", dataType = "eu.dnetlib.repo.manager.domain.OrderByField", paramType = "query"),
                 @ApiImplicitParam(name = "orderField", dataType = "string", paramType = "query"),
         })
         public List<PiwikInfo> getPiwikSitesForRepos(
         public Paging<PiwikInfo> getPiwikSitesForRepos(
                 @RequestParam(value = "from",required=false,defaultValue = "0") int from,
                 @RequestParam(value = "quantity",required=false,defaultValue = "100") int quantity,
                 @RequestParam(value = "order",required=false,defaultValue = "ASC") OrderByType orderType,
-...
                 @RequestParam(value = "searchField", required = false, defaultValue = "") String searchField
         ){
             return piWikService.getPiwikSitesForRepos(orderField,orderType,from,quantity,searchField);
             Paging<PiwikInfo> results = new Paging<>();
             List<PiwikInfo> returning = piWikService.getPiwikSitesForRepos(orderField,orderType,from,quantity,searchField);
             results.setFrom(from);
             results.setTo(from + returning.size());
             results.setTotal(piWikService.getPiwikSitesTotals());
             results.setResults(returning);
             return results;
+        }
         @RequestMapping(value = "/approvePiwikSite/{repositoryId}" , method = RequestMethod.GET)

     package eu.dnetlib.repo.manager.domain;
     import javax.validation.constraints.NotNull;
     import java.util.ArrayList;
     import java.util.List;
     public class Paging<T> {
         private int total;
         private int from;
         private int to;
         private List<T> results;
         public Paging(int total, int from, int to, List<T> results) {
             this.total = total;
             this.from = from;
             this.to = to;
             this.results = results;
+        }
         public Paging(@NotNull Paging<T> page) {
             this.total = page.getTotal();
             this.from = page.getFrom();
             this.to = page.getTo();
             this.results = page.getResults();
+        }
         public <K> Paging(@NotNull Paging<K> page, List<T> results) {
             this.total = page.getTotal();
             this.from = page.getFrom();
             this.to = page.getTo();
             this.results = results;
+        }
         public Paging() {
             this.total = 0;
             this.from = 0;
             this.to = 0;
             this.results = new ArrayList<>();
+        }
         public int getTotal() {
             return total;
+        }
         public void setTotal(int total) {
             this.total = total;
+        }
         public int getFrom() {
             return from;
+        }
         public void setFrom(int from) {
             this.from = from;
+        }
         public int getTo() {
             return to;
+        }
         public void setTo(int to) {
             this.to = to;
+        }
         public List<T> getResults() {
             return results;
+        }
         public void setResults(List<T> results) {
             this.results = results;
+        }
+    }

Project

General

Profile

D-Net

Revision 56683

Added by Ioannis Diplas almost 5 years ago