|
|
@ -2,6 +2,7 @@ package ru.ulstu.extractor.ts;
|
|
|
|
|
|
|
|
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
import ru.ulstu.extractor.commit.service.CommitService;
|
|
|
|
import ru.ulstu.extractor.commit.service.CommitService;
|
|
|
|
|
|
|
|
import ru.ulstu.extractor.gitrepository.GitRepositoryService;
|
|
|
|
import ru.ulstu.extractor.model.TimeSeriesValue;
|
|
|
|
import ru.ulstu.extractor.model.TimeSeriesValue;
|
|
|
|
import ru.ulstu.extractor.service.TimeSeriesService;
|
|
|
|
import ru.ulstu.extractor.service.TimeSeriesService;
|
|
|
|
|
|
|
|
|
|
|
@ -14,11 +15,14 @@ import java.util.stream.Collectors;
|
|
|
|
public class CommitsTS extends AbstractTimeSeriesCreator {
|
|
|
|
public class CommitsTS extends AbstractTimeSeriesCreator {
|
|
|
|
private final TimeSeriesService timeSeriesService;
|
|
|
|
private final TimeSeriesService timeSeriesService;
|
|
|
|
private final CommitService commitService;
|
|
|
|
private final CommitService commitService;
|
|
|
|
|
|
|
|
private final GitRepositoryService gitRepositoryService;
|
|
|
|
|
|
|
|
|
|
|
|
public CommitsTS(TimeSeriesService timeSeriesService,
|
|
|
|
public CommitsTS(TimeSeriesService timeSeriesService,
|
|
|
|
CommitService commitService) {
|
|
|
|
CommitService commitService,
|
|
|
|
|
|
|
|
GitRepositoryService gitRepositoryService) {
|
|
|
|
this.timeSeriesService = timeSeriesService;
|
|
|
|
this.timeSeriesService = timeSeriesService;
|
|
|
|
this.commitService = commitService;
|
|
|
|
this.commitService = commitService;
|
|
|
|
|
|
|
|
this.gitRepositoryService = gitRepositoryService;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -30,7 +34,9 @@ public class CommitsTS extends AbstractTimeSeriesCreator {
|
|
|
|
public Map<String, List<TimeSeriesValue>> getTimeSeriesValues(Integer repositoryId, String branchName) {
|
|
|
|
public Map<String, List<TimeSeriesValue>> getTimeSeriesValues(Integer repositoryId, String branchName) {
|
|
|
|
//TODO: добавить постраничное чтение
|
|
|
|
//TODO: добавить постраничное чтение
|
|
|
|
Map<String, List<TimeSeriesValue>> result = new HashMap<>();
|
|
|
|
Map<String, List<TimeSeriesValue>> result = new HashMap<>();
|
|
|
|
result.put(String.format("%s %s %s", getTimeSeriesName(), repositoryId, branchName),
|
|
|
|
result.put(String.format("%s %s %s", gitRepositoryService.findById(repositoryId).getName(),
|
|
|
|
|
|
|
|
branchName,
|
|
|
|
|
|
|
|
getTimeSeriesName()),
|
|
|
|
commitService.findByRepositoryIdAndName(repositoryId, branchName)
|
|
|
|
commitService.findByRepositoryIdAndName(repositoryId, branchName)
|
|
|
|
.stream()
|
|
|
|
.stream()
|
|
|
|
.map(c -> new TimeSeriesValue(c.getDate(), 1.0))
|
|
|
|
.map(c -> new TimeSeriesValue(c.getDate(), 1.0))
|
|
|
|