Revision 61380
Added by Konstantinos Spyrou almost 3 years ago
| modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java | ||
|---|---|---|
| 35 | 35 |
String page, |
| 36 | 36 |
String size) throws JSONException, IOException; |
| 37 | 37 |
|
| 38 |
List<RepositorySnippet> getRepositoriesSnippetOfUser(String page, String size) throws Exception; |
|
| 38 |
List<RepositorySnippet> getRepositoriesSnippetsOfUser(String page, String size) throws Exception;
|
|
| 39 | 39 |
|
| 40 |
List<RepositorySnippet> getRepositoriesSnippetOfUser(String userEmail, String page, String size) throws Exception; |
|
| 40 |
List<RepositorySnippet> getRepositoriesSnippetsOfUser(String userEmail, String page, String size) throws Exception;
|
|
| 41 | 41 |
|
| 42 | 42 |
RepositorySnippet getRepositorySnippetById(String id) throws JSONException, ResourceNotFoundException; |
| 43 | 43 |
|
| modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java | ||
|---|---|---|
| 351 | 351 |
} |
| 352 | 352 |
|
| 353 | 353 |
@Override |
| 354 |
public List<RepositorySnippet> getRepositoriesSnippetOfUser(String page, String size) throws Exception {
|
|
| 354 |
public List<RepositorySnippet> getRepositoriesSnippetsOfUser(String page, String size) throws Exception {
|
|
| 355 | 355 |
Collection<String> repoIds = roleMappingService.getRepoIdsByRoleIds(authorizationService.getUserRoles()); |
| 356 | 356 |
return getRepositoriesSnippets(new ArrayList<>(repoIds)); |
| 357 | 357 |
} |
| 358 | 358 |
|
| 359 | 359 |
@Override |
| 360 |
public List<RepositorySnippet> getRepositoriesSnippetOfUser(String userEmail, String page, String size) throws Exception {
|
|
| 360 |
public List<RepositorySnippet> getRepositoriesSnippetsOfUser(String userEmail, String page, String size) throws Exception {
|
|
| 361 | 361 |
Collection<String> repoIds = roleMappingService.getRepoIdsByRoleIds(authorizationService.getUserRoles(userEmail)); |
| 362 | 362 |
return getRepositoriesSnippets(new ArrayList<>(repoIds)); |
| 363 | 363 |
} |
| modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java | ||
|---|---|---|
| 7 | 7 |
import eu.dnetlib.repo.manager.domain.Term; |
| 8 | 8 |
import eu.dnetlib.repo.manager.domain.Tuple; |
| 9 | 9 |
import eu.dnetlib.repo.manager.domain.broker.*; |
| 10 |
import org.apache.commons.lang.NotImplementedException; |
|
| 10 | 11 |
import org.json.JSONException; |
| 11 | 12 |
import org.springframework.beans.factory.annotation.Autowired; |
| 12 | 13 |
import org.springframework.beans.factory.annotation.Value; |
| ... | ... | |
| 81 | 82 |
long start = System.currentTimeMillis(); |
| 82 | 83 |
DatasourcesBroker ret = new DatasourcesBroker(); |
| 83 | 84 |
try {
|
| 84 |
ret.setDatasourcesOfUser(getDatasourcesOfUserType(repoAPI.getRepositoriesSnippetOfUser(user, "0", "100"))); |
|
| 85 |
ret.setDatasourcesOfUser(getDatasourcesOfUserType(repoAPI.getRepositoriesSnippetsOfUser(user, "0", "100")));
|
|
| 85 | 86 |
//TODO fix bug when values are true |
| 86 | 87 |
// if (Boolean.parseBoolean(includeShared)) {
|
| 87 | 88 |
// List<String> sharedDatasourceIds = new ArrayList<String>(); |
| ... | ... | |
| 165 | 166 |
List<Tuple<BrowseEntry, String>> entries = new ArrayList<>(); |
| 166 | 167 |
for (RepositorySnippet repo : repositories) {
|
| 167 | 168 |
BrowseEntry temp = new BrowseEntry(); |
| 168 |
temp.setValue(repo.getOfficialName());
|
|
| 169 |
temp.setValue(repo.getOfficialname());
|
|
| 169 | 170 |
temp.setSize(new Long(0)); |
| 170 |
for (BrowseEntry e : getTopicsForDatasource(repo.getOfficialName())) {
|
|
| 171 |
for (BrowseEntry e : getTopicsForDatasource(repo.getOfficialname())) {
|
|
| 171 | 172 |
temp.setSize(temp.getSize() + e.getSize()); |
| 172 | 173 |
} |
| 173 | 174 |
Tuple<BrowseEntry, String> tup = new Tuple<>(temp, repo.getLogoUrl()); |
| ... | ... | |
| 245 | 246 |
@Override |
| 246 | 247 |
public Map<String, List<SimpleSubscriptionDesc>> getSimpleSubscriptionsOfUserByRepoId(String userEmail, String repoId) throws BrokerException {
|
| 247 | 248 |
Map<String, List<SimpleSubscriptionDesc>> subscriptionsOfUser = getSimpleSubscriptionsOfUser(userEmail); |
| 248 |
|
|
| 249 |
return null; |
|
| 249 |
throw new NotImplementedException(); |
|
| 250 |
// return null;
|
|
| 250 | 251 |
} |
| 251 | 252 |
|
| 252 | 253 |
@Override |
| modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java | ||
|---|---|---|
| 32 | 32 |
|
| 33 | 33 |
try {
|
| 34 | 34 |
|
| 35 |
List<RepositorySnippet> repositoriesOfUser = repositoryService.getRepositoriesSnippetOfUser(userEmail, page, size); |
|
| 35 |
List<RepositorySnippet> repositoriesOfUser = repositoryService.getRepositoriesSnippetsOfUser(userEmail, page, size);
|
|
| 36 | 36 |
for (RepositorySnippet repository : repositoriesOfUser) {
|
| 37 | 37 |
RepositorySummaryInfo repositorySummaryInfo = new RepositorySummaryInfo(); |
| 38 | 38 |
repositorySummaryInfo.setId(repository.getId()); |
| 39 |
repositorySummaryInfo.setRepositoryName(repository.getOfficialName());
|
|
| 39 |
repositorySummaryInfo.setRepositoryName(repository.getOfficialname());
|
|
| 40 | 40 |
repositorySummaryInfo.setLogoURL(repository.getLogoUrl()); |
| 41 | 41 |
|
| 42 | 42 |
//TODO getRepositoryAggregations returns only the 20 more recent items. Is it positive that we will find an indexed version there? |
| ... | ... | |
| 65 | 65 |
|
| 66 | 66 |
try {
|
| 67 | 67 |
|
| 68 |
List<BrowseEntry> events = brokerService.getTopicsForDatasource(repository.getOfficialName());
|
|
| 68 |
List<BrowseEntry> events = brokerService.getTopicsForDatasource(repository.getOfficialname());
|
|
| 69 | 69 |
Long totalEvents = 0L; |
| 70 | 70 |
for (BrowseEntry browseEntry : events) |
| 71 | 71 |
totalEvents += browseEntry.getSize(); |
| modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java | ||
|---|---|---|
| 156 | 156 |
|
| 157 | 157 |
|
| 158 | 158 |
repositorySnippet.setId(repositorySnippetObject.get("id").toString());
|
| 159 |
repositorySnippet.setOfficialName(repositorySnippetObject.get("officialname").toString());
|
|
| 159 |
repositorySnippet.setOfficialname(repositorySnippetObject.get("officialname").toString());
|
|
| 160 | 160 |
|
| 161 |
repositorySnippet.setEnglishName(repositorySnippetObject.get("englishname").toString());
|
|
| 162 |
if (repositorySnippet.getEnglishName().equals("null"))
|
|
| 163 |
repositorySnippet.setEnglishName("");
|
|
| 161 |
repositorySnippet.setEnglishname(repositorySnippetObject.get("englishname").toString());
|
|
| 162 |
if (repositorySnippet.getEnglishname().equals("null"))
|
|
| 163 |
repositorySnippet.setEnglishname("");
|
|
| 164 | 164 |
|
| 165 |
repositorySnippet.setWebsiteUrl(repositorySnippetObject.get("websiteurl").toString());
|
|
| 166 |
if (repositorySnippet.getWebsiteUrl().equals("null"))
|
|
| 167 |
repositorySnippet.setWebsiteUrl("");
|
|
| 165 |
repositorySnippet.setWebsiteurl(repositorySnippetObject.get("websiteurl").toString());
|
|
| 166 |
if (repositorySnippet.getWebsiteurl().equals("null"))
|
|
| 167 |
repositorySnippet.setWebsiteurl("");
|
|
| 168 | 168 |
|
| 169 |
repositorySnippet.setRegisteredBy(repositorySnippetObject.get("registeredby").toString());
|
|
| 170 |
if (repositorySnippet.getRegisteredBy().equals("null"))
|
|
| 171 |
repositorySnippet.setRegisteredBy("");
|
|
| 169 |
repositorySnippet.setRegisteredby(repositorySnippetObject.get("registeredby").toString());
|
|
| 170 |
if (repositorySnippet.getRegisteredby().equals("null"))
|
|
| 171 |
repositorySnippet.setRegisteredby("");
|
|
| 172 | 172 |
return repositorySnippet; |
| 173 | 173 |
|
| 174 | 174 |
} |
| modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java | ||
|---|---|---|
| 65 | 65 |
@ResponseBody |
| 66 | 66 |
@PreAuthorize("hasAuthority('REGISTERED_USER')")
|
| 67 | 67 |
public List<RepositorySnippet> getRepositoriesSnippetsOfUser() throws Exception {
|
| 68 |
return repositoryService.getRepositoriesSnippetOfUser("0", "100");
|
|
| 68 |
return repositoryService.getRepositoriesSnippetsOfUser("0", "100");
|
|
| 69 | 69 |
} |
| 70 | 70 |
|
| 71 | 71 |
@RequestMapping(value = "/searchRegisteredRepositories/{page}/{size}", method = RequestMethod.GET,
|
| modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
public class RepositorySnippet {
|
| 9 | 9 |
|
| 10 |
// Do not refactor names to keep compatibility with external api. |
|
| 10 | 11 |
private String id; |
| 11 |
private String officialName;
|
|
| 12 |
private String englishName;
|
|
| 13 |
private String websiteUrl;
|
|
| 12 |
private String officialname;
|
|
| 13 |
private String englishname;
|
|
| 14 |
private String websiteurl;
|
|
| 14 | 15 |
private String typology; |
| 15 |
private String registeredBy;
|
|
| 16 |
private String registeredby;
|
|
| 16 | 17 |
private Organization[] organizations; |
| 17 |
private String registrationDate;
|
|
| 18 |
private String registrationdate;
|
|
| 18 | 19 |
private String logoUrl; |
| 19 | 20 |
private String description; |
| 20 | 21 |
private String fullTextDownload; |
| ... | ... | |
| 35 | 36 |
this.id = id; |
| 36 | 37 |
} |
| 37 | 38 |
|
| 38 |
public String getOfficialName() {
|
|
| 39 |
return officialName;
|
|
| 39 |
public String getOfficialname() {
|
|
| 40 |
return officialname;
|
|
| 40 | 41 |
} |
| 41 | 42 |
|
| 42 |
public void setOfficialName(String officialName) {
|
|
| 43 |
this.officialName = officialName;
|
|
| 43 |
public void setOfficialname(String officialname) {
|
|
| 44 |
this.officialname = officialname;
|
|
| 44 | 45 |
} |
| 45 | 46 |
|
| 46 |
public String getEnglishName() {
|
|
| 47 |
return englishName;
|
|
| 47 |
public String getEnglishname() {
|
|
| 48 |
return englishname;
|
|
| 48 | 49 |
} |
| 49 | 50 |
|
| 50 |
public void setEnglishName(String englishName) {
|
|
| 51 |
this.englishName = englishName;
|
|
| 51 |
public void setEnglishname(String englishname) {
|
|
| 52 |
this.englishname = englishname;
|
|
| 52 | 53 |
} |
| 53 | 54 |
|
| 54 |
public String getWebsiteUrl() {
|
|
| 55 |
return websiteUrl;
|
|
| 55 |
public String getWebsiteurl() {
|
|
| 56 |
return websiteurl;
|
|
| 56 | 57 |
} |
| 57 | 58 |
|
| 58 |
public void setWebsiteUrl(String websiteUrl) {
|
|
| 59 |
this.websiteUrl = websiteUrl;
|
|
| 59 |
public void setWebsiteurl(String websiteurl) {
|
|
| 60 |
this.websiteurl = websiteurl;
|
|
| 60 | 61 |
} |
| 61 | 62 |
|
| 62 |
public String getRegisteredBy() {
|
|
| 63 |
return registeredBy;
|
|
| 63 |
public String getRegisteredby() {
|
|
| 64 |
return registeredby;
|
|
| 64 | 65 |
} |
| 65 | 66 |
|
| 66 |
public void setRegisteredBy(String registeredBy) {
|
|
| 67 |
this.registeredBy = registeredBy;
|
|
| 67 |
public void setRegisteredby(String registeredby) {
|
|
| 68 |
this.registeredby = registeredby;
|
|
| 68 | 69 |
} |
| 69 | 70 |
|
| 70 | 71 |
public String getTypology() {
|
| ... | ... | |
| 83 | 84 |
this.organizations = organizations; |
| 84 | 85 |
} |
| 85 | 86 |
|
| 86 |
public String getRegistrationDate() {
|
|
| 87 |
return registrationDate;
|
|
| 87 |
public String getRegistrationdate() {
|
|
| 88 |
return registrationdate;
|
|
| 88 | 89 |
} |
| 89 | 90 |
|
| 90 |
public void setRegistrationDate(String registrationDate) {
|
|
| 91 |
this.registrationDate = registrationDate;
|
|
| 91 |
public void setRegistrationdate(String registrationdate) {
|
|
| 92 |
this.registrationdate = registrationdate;
|
|
| 92 | 93 |
} |
| 93 | 94 |
|
| 94 | 95 |
public PiwikInfo getPiwikInfo() {
|
Also available in: Unified diff
restored RepositorySnippet field names