maxnes3/MobileApp-Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Улучшил Report

Browse Source
This commit is contained in:
maxnes3 2023-12-28 13:35:56 +04:00
parent 1a35063891
commit c44b373be0
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/android/mobileappserver/Report/ReportDTO.java
View File

@ -1,9 +1,13 @@
package com.android.mobileappserver.Report;
import com.android.mobileappserver.Story.StoryDTO;
import com.android.mobileappserver.User.UserDTO;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
@NoArgsConstructor
@ -11,14 +15,16 @@ public class ReportDTO {
private Long dateFrom;
private Long dateTo;
private int postCount;
private String mostPostAuthor;
private UserDTO mostPostAuthor;
private int mostPostCount;
private List<StoryDTO> listPostAuthor;
public ReportDTO(Long dateFrom, Long dateTo, int postCount, String mostPostAuthor, int mostPostCount){
public ReportDTO(Long dateFrom, Long dateTo, int postCount, UserDTO mostPostAuthor, int mostPostCount, List<StoryDTO> listPostAuthor){
this.dateFrom = dateFrom;
this.dateTo = dateTo;
this.postCount = postCount;
this.mostPostAuthor = mostPostAuthor;
this.mostPostCount = mostPostCount;
this.listPostAuthor = listPostAuthor;
}
}

22
src/main/java/com/android/mobileappserver/Report/ReportService.java
View File

@ -1,7 +1,10 @@
package com.android.mobileappserver.Report;
import com.android.mobileappserver.Story.StoryDTO;
import com.android.mobileappserver.Story.StoryModel;
import com.android.mobileappserver.Story.StoryService;
import com.android.mobileappserver.User.UserDTO;
import com.android.mobileappserver.User.UserModel;
import com.android.mobileappserver.User.UserService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -25,19 +28,22 @@ public class ReportService {
public ReportDTO createReport(Long dateFrom, Long dateTo){
List<StoryModel> stories = storyService.getStoriesByDate(dateFrom, dateTo);
int postCount = stories.size();
Map<String, Integer> authorWithCount = new HashMap<>();
Map<Long, Integer> authorWithCount = new HashMap<>();
for (var story: stories) {
String authorName = story.getUser().getLogin();
if (authorWithCount.containsKey(authorName)) {
Long authorId = story.getUser().getId();
if (authorWithCount.containsKey(authorId)) {
// Если автор уже есть, увеличиваем количество историй
authorWithCount.put(authorName, authorWithCount.get(authorName) + 1);
authorWithCount.put(authorId, authorWithCount.get(authorId) + 1);
} else {
// Если автора еще нет в мапе, добавляем его с количеством 1
authorWithCount.put(authorName, 1);
authorWithCount.put(authorId, 1);
}
}
Map.Entry<String, Integer> maxEntry = Collections.max(authorWithCount.entrySet(), Map.Entry.comparingByValue());
return new ReportDTO(dateFrom, dateTo,
postCount, maxEntry.getKey(), maxEntry.getValue());
Map.Entry<Long, Integer> maxEntry = Collections.max(authorWithCount.entrySet(), Map.Entry.comparingByValue());
UserModel mostPostAuthor = userService.getUserById(maxEntry.getKey());
return new ReportDTO(dateFrom, dateTo, postCount, new UserDTO(mostPostAuthor), maxEntry.getValue(),
mostPostAuthor.getStories().stream().map(
StoryDTO::new
).toList());
}
}