diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorTS.java index b1c41fb..e4fb786 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorTS.java @@ -3,7 +3,9 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; import ru.ulstu.extractor.author.model.Author; import ru.ulstu.extractor.author.service.AuthorService; +import ru.ulstu.extractor.branch.service.BranchService; import ru.ulstu.extractor.commit.service.CommitService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -19,14 +21,18 @@ public class AuthorTS extends AbstractTimeSeriesCreator { private final CommitService commitService; private final AuthorService authorService; private final GitRepositoryService gitRepositoryService; + private final BranchService branchService; public AuthorTS(TimeSeriesService timeSeriesService, CommitService commitService, - AuthorService authorService, GitRepositoryService gitRepositoryService) { + AuthorService authorService, + GitRepositoryService gitRepositoryService, + BranchService branchService) { this.timeSeriesService = timeSeriesService; this.commitService = commitService; this.authorService = authorService; this.gitRepositoryService = gitRepositoryService; + this.branchService = branchService; } @Override @@ -38,14 +44,16 @@ public class AuthorTS extends AbstractTimeSeriesCreator { public List getTimeSeries(Integer repositoryId, String branchName) { List timeSeriesResult = new ArrayList<>(); List authors = authorService.findAll(); + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); List commits = new ArrayList<>(commitService.findByRepositoryIdAndName(repositoryId, branchName)); for (Author author : authors) { TimeSeries timeSeries = new TimeSeries( String.format("%s %s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, author.getName(), getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType()); for (ru.ulstu.extractor.model.Commit commit : commits) { if (commit.getAuthor().equals(author)) { diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCommitTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCommitTS.java index 005cda2..2c6927d 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCommitTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCommitTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,11 +15,15 @@ import java.util.List; @Component public class AuthorsCommitTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public AuthorsCommitTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public AuthorsCommitTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @@ -28,12 +34,15 @@ public class AuthorsCommitTS extends AbstractTimeSeriesCreator { @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); + //TODO: добавить постраничное чтение return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCompletedIssueTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCompletedIssueTS.java index fc25833..700b6cb 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCompletedIssueTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCompletedIssueTS.java @@ -1,35 +1,43 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; 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.service.TimeSeriesService; import ru.ulstu.extractor.ts.util.Dummy; - import java.util.Collections; import java.util.List; @Component public class AuthorsCompletedIssueTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public AuthorsCompletedIssueTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public AuthorsCompletedIssueTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); + //TODO: добавить постраничное чтение return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsIssueTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsIssueTS.java index f279362..c4fa9ea 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsIssueTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/AuthorsIssueTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,22 +15,28 @@ import java.util.List; @Component public class AuthorsIssueTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public AuthorsIssueTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public AuthorsIssueTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/BranchTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/BranchTS.java index b358cc7..a6d99f0 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/BranchTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/BranchTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,11 +15,15 @@ import java.util.List; @Component public class BranchTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public BranchTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public BranchTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @@ -28,12 +34,14 @@ public class BranchTS extends AbstractTimeSeriesCreator { @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/ClassTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/ClassTS.java index 406bd43..f284e90 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/ClassTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/ClassTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,22 +15,28 @@ import java.util.List; @Component public class ClassTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public ClassTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public ClassTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/DependenceTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/DependenceTS.java index d0ba6cb..d89b5e8 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/DependenceTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/DependenceTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,22 +15,28 @@ import java.util.List; @Component public class DependenceTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public DependenceTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public DependenceTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/EntityTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/EntityTS.java index 946d9ac..eee1017 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/EntityTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/EntityTS.java @@ -1,8 +1,10 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; import ru.ulstu.extractor.commit.service.CommitService; import ru.ulstu.extractor.gitrepository.model.FileChange; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -19,22 +21,28 @@ public class EntityTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; private final CommitService commitService; private final GitRepositoryService gitRepositoryService; + private final BranchService branchService; - - public EntityTS(TimeSeriesService timeSeriesService, CommitService commitService, GitRepositoryService gitRepositoryService) { + public EntityTS(TimeSeriesService timeSeriesService, + CommitService commitService, + GitRepositoryService gitRepositoryService, + BranchService branchService) { this.timeSeriesService = timeSeriesService; this.commitService = commitService; this.gitRepositoryService = gitRepositoryService; + this.branchService = branchService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), commitService.findByRepositoryIdAndName(repositoryId, branchName) .stream() diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/FileTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/FileTS.java index 8e6a934..7ab007d 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/FileTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/FileTS.java @@ -1,8 +1,10 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; import ru.ulstu.extractor.commit.service.CommitService; import ru.ulstu.extractor.gitrepository.model.FileChange; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.ts.model.TimeSeries; @@ -18,23 +20,30 @@ public class FileTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; private final GitRepositoryService gitRepositoryService; private final CommitService commitService; + private final BranchService branchService; - public FileTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService, CommitService commitService) { + public FileTS(TimeSeriesService timeSeriesService, + GitRepositoryService gitRepositoryService, + CommitService commitService, + BranchService branchService) { this.timeSeriesService = timeSeriesService; this.gitRepositoryService = gitRepositoryService; this.commitService = commitService; + this.branchService = branchService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); List timeSeriesResult = new ArrayList<>(); List commits = new ArrayList<>(commitService.findByRepositoryIdAndName(repositoryId, branchName)); double value = 0; TimeSeries timeSeries = new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType()); for (Commit commit : commits) { for (FileChange fileChange : commit.getFileChanges()) { diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/InterfaceTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/InterfaceTS.java index 0e3d3e5..4c00620 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/InterfaceTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/InterfaceTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,22 +15,28 @@ import java.util.List; @Component public class InterfaceTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public InterfaceTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public InterfaceTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/IssuesTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/IssuesTS.java index 20ef996..af43b83 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/IssuesTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/IssuesTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,22 +15,28 @@ import java.util.List; @Component public class IssuesTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public IssuesTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public IssuesTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/ProcessTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/ProcessTS.java index 0000758..c172063 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/ProcessTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/ProcessTS.java @@ -1,6 +1,8 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService; import ru.ulstu.extractor.ts.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeriesType; @@ -13,22 +15,28 @@ import java.util.List; @Component public class ProcessTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public ProcessTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public ProcessTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); } diff --git a/src/main/java/ru/ulstu/extractor/ts/creator/StarTS.java b/src/main/java/ru/ulstu/extractor/ts/creator/StarTS.java index b628576..0bbcf93 100644 --- a/src/main/java/ru/ulstu/extractor/ts/creator/StarTS.java +++ b/src/main/java/ru/ulstu/extractor/ts/creator/StarTS.java @@ -1,35 +1,42 @@ package ru.ulstu.extractor.ts.creator; import org.springframework.stereotype.Component; +import ru.ulstu.extractor.branch.service.BranchService; +import ru.ulstu.extractor.gitrepository.model.GitRepository; 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.service.TimeSeriesService; import ru.ulstu.extractor.ts.util.Dummy; - import java.util.Collections; import java.util.List; @Component public class StarTS extends AbstractTimeSeriesCreator { private final TimeSeriesService timeSeriesService; + private final BranchService branchService; private final GitRepositoryService gitRepositoryService; - public StarTS(TimeSeriesService timeSeriesService, GitRepositoryService gitRepositoryService) { + public StarTS(TimeSeriesService timeSeriesService, + BranchService branchService, + GitRepositoryService gitRepositoryService) { this.timeSeriesService = timeSeriesService; + this.branchService = branchService; this.gitRepositoryService = gitRepositoryService; } @Override public List getTimeSeries(Integer repositoryId, String branchName) { + GitRepository gitRepository = gitRepositoryService.findById(repositoryId); return Collections.singletonList( new TimeSeries( String.format("%s %s %s", - gitRepositoryService.findById(repositoryId).getName(), + gitRepository.getName(), branchName, getTimeSeriesType().getDescription()), + branchService.findByRepositoryAndName(gitRepository, branchName), getTimeSeriesType(), Dummy.getDefaultTimeSeries())); }