diff --git a/src/main/java/ru/ulstu/activity/common/service/ActivityService.java b/src/main/java/ru/ulstu/activity/common/service/ActivityService.java index eeae0bd..cc7bb7b 100644 --- a/src/main/java/ru/ulstu/activity/common/service/ActivityService.java +++ b/src/main/java/ru/ulstu/activity/common/service/ActivityService.java @@ -92,6 +92,11 @@ public abstract class ActivityService getActivityListDto(entity)); } + + public abstract PageableItems findAllActiveDto(int offset, int count); + + public abstract PageableItems findAllActive(int offset, int count); + protected abstract T copyFromDto(T t, D d) throws IOException; protected abstract L getActivityListDto(T entity); diff --git a/src/main/java/ru/ulstu/activity/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/activity/conference/service/ConferenceService.java index ca3f824..07c99ec 100644 --- a/src/main/java/ru/ulstu/activity/conference/service/ConferenceService.java +++ b/src/main/java/ru/ulstu/activity/conference/service/ConferenceService.java @@ -112,7 +112,8 @@ public class ConferenceService extends ActivityService findAllActive(int offset, int count) { + @Override + public PageableItems findAllActive(int offset, int count) { Page activeConferencePage = conferenceRepository .findAllActive(new OffsetablePageRequest(offset, count), new Date()); return new PageableItems<>(activeConferencePage.getTotalElements(), activeConferencePage.getContent()); diff --git a/src/main/java/ru/ulstu/activity/grant/service/GrantService.java b/src/main/java/ru/ulstu/activity/grant/service/GrantService.java index 044c88a..d3f3a1c 100644 --- a/src/main/java/ru/ulstu/activity/grant/service/GrantService.java +++ b/src/main/java/ru/ulstu/activity/grant/service/GrantService.java @@ -92,6 +92,7 @@ public class GrantService extends ActivityService } protected Grant copyFromDto(Grant grant, GrantDto grantDto) throws IOException { + grant.setId(grantDto.getId()); grant.setComment(grantDto.getComment()); grant.setStatus(grantDto.getStatus() == null ? APPLICATION : grantDto.getStatus()); grant.setTitle(grantDto.getTitle()); @@ -157,10 +158,12 @@ public class GrantService extends ActivityService } } + @Override public PageableItems findAllActiveDto(int offset, int count) { return convertPageable(findAllActive(offset, count), GrantDashboardDto::new); } + @Override public PageableItems findAllActive(int offset, int count) { Page activeGrantsPage = grantRepository.findAllActive(new OffsetablePageRequest(offset, count)); return new PageableItems<>(activeGrantsPage.getTotalElements(), activeGrantsPage.getContent()); diff --git a/src/main/java/ru/ulstu/activity/paper/service/PaperService.java b/src/main/java/ru/ulstu/activity/paper/service/PaperService.java index 30adfec..3cac351 100644 --- a/src/main/java/ru/ulstu/activity/paper/service/PaperService.java +++ b/src/main/java/ru/ulstu/activity/paper/service/PaperService.java @@ -97,7 +97,8 @@ public class PaperService extends ActivityService return new PaperDto(entity); } - private PageableItems findAllActive(int offset, int count) { + @Override + public PageableItems findAllActive(int offset, int count) { Page activePapersPage = paperRepository.findAllWithoutStatuses(new OffsetablePageRequest(offset, count), COMPLETED, FAILED); return new PageableItems<>(activePapersPage.getTotalElements(), sortPapers(activePapersPage.getContent())); } diff --git a/src/main/java/ru/ulstu/activity/project/service/ProjectService.java b/src/main/java/ru/ulstu/activity/project/service/ProjectService.java index a601f47..d0b1087 100644 --- a/src/main/java/ru/ulstu/activity/project/service/ProjectService.java +++ b/src/main/java/ru/ulstu/activity/project/service/ProjectService.java @@ -45,11 +45,13 @@ public class ProjectService extends ActivityService findAllActiveDto(int offset, int count) { return convertPageable(findAllActive(offset, count), ProjectDashboardDto::new); } - private PageableItems findAllActive(int offset, int count) { + @Override + public PageableItems findAllActive(int offset, int count) { Page activeProjectPage = projectRepository.findAllWithoutStatuses(new OffsetablePageRequest(offset, count), CLOSED, FAILED); return new PageableItems<>(activeProjectPage.getTotalElements(), activeProjectPage.getContent()); } diff --git a/src/main/java/ru/ulstu/activity/students/service/TaskService.java b/src/main/java/ru/ulstu/activity/students/service/TaskService.java index 64f3567..48c4dbe 100644 --- a/src/main/java/ru/ulstu/activity/students/service/TaskService.java +++ b/src/main/java/ru/ulstu/activity/students/service/TaskService.java @@ -243,11 +243,13 @@ public class TaskService extends ActivityService { return newTask; } + @Override public PageableItems findAllActiveDto(int offset, int count) { return convertPageable(findAllActive(offset, count), TaskDashboardDto::new); } - private PageableItems findAllActive(int offset, int count) { + @Override + public PageableItems findAllActive(int offset, int count) { return findAll(offset, count); }