commit
f59dc9b523
@ -1,4 +1,6 @@
|
||||
package ru.ulstu.extractor.model;
|
||||
package ru.ulstu.extractor.author.model;
|
||||
|
||||
import ru.ulstu.extractor.core.BaseEntity;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.extractor.model;
|
||||
package ru.ulstu.extractor.core;
|
||||
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.extractor.model;
|
||||
package ru.ulstu.extractor.core;
|
||||
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.Sort;
|
||||
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.extractor.model.mvc;
|
||||
package ru.ulstu.extractor.gitrepository.model;
|
||||
|
||||
public class RepoForm {
|
||||
private String repo;
|
||||
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.extractor.gitrepository;
|
||||
package ru.ulstu.extractor.gitrepository.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.extractor.gitrepository.model.GitRepository;
|
||||
@ -1,4 +1,6 @@
|
||||
package ru.ulstu.extractor.model;
|
||||
package ru.ulstu.extractor.rule.model;
|
||||
|
||||
import ru.ulstu.extractor.core.BaseEntity;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.extractor.repository;
|
||||
package ru.ulstu.extractor.rule.repository;
|
||||
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.extractor.model.AntecedentValue;
|
||||
import ru.ulstu.extractor.rule.model.AntecedentValue;
|
||||
|
||||
public interface AntecedentValueRepository extends JpaRepository<AntecedentValue, Integer> {
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.extractor.repository;
|
||||
package ru.ulstu.extractor.rule.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.extractor.model.Rule;
|
||||
import ru.ulstu.extractor.rule.model.Rule;
|
||||
|
||||
public interface RuleRepository extends JpaRepository<Rule, Integer> {
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.extractor.service;
|
||||
package ru.ulstu.extractor.rule.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.extractor.model.AntecedentValue;
|
||||
import ru.ulstu.extractor.repository.AntecedentValueRepository;
|
||||
import ru.ulstu.extractor.rule.model.AntecedentValue;
|
||||
import ru.ulstu.extractor.rule.repository.AntecedentValueRepository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
package ru.ulstu.extractor.ts;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.ulstu.extractor.model.TimeSeriesValue;
|
||||
import ru.ulstu.extractor.service.TimeSeriesService;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
public class AuthorsCommentTS extends AbstractTimeSeriesCreator {
|
||||
private final TimeSeriesService timeSeriesService;
|
||||
|
||||
public AuthorsCommentTS(TimeSeriesService timeSeriesService) {
|
||||
this.timeSeriesService = timeSeriesService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTimeSeriesName() {
|
||||
return "Количество коммитов авторов";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, List<TimeSeriesValue>> getTimeSeriesValues(Integer repositoryId, String branchName) {
|
||||
return new HashMap<>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimeSeriesService getTimeSeriesService() {
|
||||
return timeSeriesService;
|
||||
}
|
||||
}
|
||||
@ -1,51 +0,0 @@
|
||||
package ru.ulstu.extractor.ts;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.ulstu.extractor.commit.service.CommitService;
|
||||
import ru.ulstu.extractor.gitrepository.GitRepositoryService;
|
||||
import ru.ulstu.extractor.model.TimeSeriesValue;
|
||||
import ru.ulstu.extractor.service.TimeSeriesService;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Component
|
||||
public class CommitsTS extends AbstractTimeSeriesCreator {
|
||||
private final TimeSeriesService timeSeriesService;
|
||||
private final CommitService commitService;
|
||||
private final GitRepositoryService gitRepositoryService;
|
||||
|
||||
public CommitsTS(TimeSeriesService timeSeriesService,
|
||||
CommitService commitService,
|
||||
GitRepositoryService gitRepositoryService) {
|
||||
this.timeSeriesService = timeSeriesService;
|
||||
this.commitService = commitService;
|
||||
this.gitRepositoryService = gitRepositoryService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTimeSeriesName() {
|
||||
return "Количество коммитов во времени";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, List<TimeSeriesValue>> getTimeSeriesValues(Integer repositoryId, String branchName) {
|
||||
//TODO: добавить постраничное чтение
|
||||
Map<String, List<TimeSeriesValue>> result = new HashMap<>();
|
||||
result.put(String.format("%s %s %s", gitRepositoryService.findById(repositoryId).getName(),
|
||||
branchName,
|
||||
getTimeSeriesName()),
|
||||
commitService.findByRepositoryIdAndName(repositoryId, branchName)
|
||||
.stream()
|
||||
.map(c -> new TimeSeriesValue(c.getDate(), 1.0))
|
||||
.collect(Collectors.toList()));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimeSeriesService getTimeSeriesService() {
|
||||
return timeSeriesService;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package ru.ulstu.extractor.ts.creator;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeries;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeriesType;
|
||||
import ru.ulstu.extractor.ts.service.TimeSeriesService;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
public class AuthorsCommitTS extends AbstractTimeSeriesCreator {
|
||||
private final TimeSeriesService timeSeriesService;
|
||||
|
||||
public AuthorsCommitTS(TimeSeriesService timeSeriesService) {
|
||||
this.timeSeriesService = timeSeriesService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimeSeriesType getTimeSeriesType() {
|
||||
return TimeSeriesType.AUTHOR_COMMITS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TimeSeries> getTimeSeries(Integer repositoryId, String branchName) {
|
||||
return new ArrayList<TimeSeries>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimeSeriesService getTimeSeriesService() {
|
||||
return timeSeriesService;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package ru.ulstu.extractor.ts.creator;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.ulstu.extractor.commit.service.CommitService;
|
||||
import ru.ulstu.extractor.gitrepository.service.GitRepositoryService;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeries;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeriesType;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeriesValue;
|
||||
import ru.ulstu.extractor.ts.service.TimeSeriesService;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Component
|
||||
public class CommitsTS extends AbstractTimeSeriesCreator {
|
||||
private final TimeSeriesService timeSeriesService;
|
||||
private final CommitService commitService;
|
||||
private final GitRepositoryService gitRepositoryService;
|
||||
|
||||
public CommitsTS(TimeSeriesService timeSeriesService,
|
||||
CommitService commitService,
|
||||
GitRepositoryService gitRepositoryService) {
|
||||
this.timeSeriesService = timeSeriesService;
|
||||
this.commitService = commitService;
|
||||
this.gitRepositoryService = gitRepositoryService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TimeSeries> getTimeSeries(Integer repositoryId, String branchName) {
|
||||
//TODO: добавить постраничное чтение
|
||||
return Collections.singletonList(
|
||||
new TimeSeries(
|
||||
String.format("%s %s %s",
|
||||
gitRepositoryService.findById(repositoryId).getName(),
|
||||
branchName,
|
||||
getTimeSeriesType().getDescription()),
|
||||
getTimeSeriesType(),
|
||||
commitService.findByRepositoryIdAndName(repositoryId, branchName)
|
||||
.stream()
|
||||
.map(c -> new TimeSeriesValue(c.getDate(), 1.0))
|
||||
.collect(Collectors.toList())));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimeSeriesService getTimeSeriesService() {
|
||||
return timeSeriesService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimeSeriesType getTimeSeriesType() {
|
||||
return TimeSeriesType.COMMITS;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package ru.ulstu.extractor.ts.model;
|
||||
|
||||
public enum TimeSeriesType {
|
||||
COMMITS("Временной ряд коммитов"),
|
||||
AUTHOR_COMMITS("Временной ряд коммитов авторов"),
|
||||
AUTHOR_ISSUES("Временной ряд задач авторов"),
|
||||
AUTHOR_COMPLETED_ISSUES("Временной ряд завершенных задач авторов"),
|
||||
AUTHORS("Временной ряд авторов"),
|
||||
BRANCHES("Временной ряд веток"),
|
||||
CLASSES("Временной ряд кклассов"),
|
||||
DEPENDENCIES("Временной ряд зависимостей"),
|
||||
ENTITIES("Временной ряд сущностей"),
|
||||
FILES("Временной файлов"),
|
||||
INTERFACES("Временной ряд интерфейсов"),
|
||||
ISSUES("Временной ряд задач"),
|
||||
PROCESSES("Временной ряд процессов"),
|
||||
STARS("Временной ряд звезд");
|
||||
|
||||
private final String description;
|
||||
|
||||
TimeSeriesType(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
package ru.ulstu.extractor.model;
|
||||
package ru.ulstu.extractor.ts.model;
|
||||
|
||||
import ru.ulstu.extractor.core.BaseEntity;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import java.util.Date;
|
||||
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.extractor.repository;
|
||||
package ru.ulstu.extractor.ts.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.extractor.model.TimeSeries;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeries;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.extractor.repository;
|
||||
package ru.ulstu.extractor.ts.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.extractor.model.TimeSeriesValue;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeriesValue;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.extractor.ts;
|
||||
package ru.ulstu.extractor.ts.util;
|
||||
|
||||
import org.apache.commons.lang3.time.DateUtils;
|
||||
import ru.ulstu.extractor.model.TimeSeries;
|
||||
import ru.ulstu.extractor.model.TimeSeriesValue;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeries;
|
||||
import ru.ulstu.extractor.ts.model.TimeSeriesValue;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
Loading…
Reference in New Issue