This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice/report"
|
||||
)
|
||||
|
||||
func (s *Service) Generate(creditor model.Entity, deptor *model.Entity, rate float64, repos []Repo, config *Options) (document io.ReadCloser, r report.Report, err error) {
|
||||
func (s *Service) Generate(creditor model.Entity, debtor *model.Entity, rate float64, repos []Repo, config *Options) (document io.ReadCloser, r report.Report, err error) {
|
||||
if config == nil {
|
||||
config = &DefaultOptions
|
||||
}
|
||||
@@ -32,12 +32,21 @@ func (s *Service) Generate(creditor model.Entity, deptor *model.Entity, rate flo
|
||||
is = append(is, iss...)
|
||||
}
|
||||
|
||||
is = filter(is, config.IssueFilter)
|
||||
{
|
||||
issueURLs := make([]string, 0, len(is))
|
||||
for _, issue := range is {
|
||||
issueURLs = append(issueURLs, issue.HTMLURL)
|
||||
}
|
||||
s.log.Debug("loaded all issues", "issueURLs", issueURLs)
|
||||
}
|
||||
|
||||
is = s.filterIssues(is, config.IssueFilter)
|
||||
|
||||
issues := issue.FromGiteas(is, config.Mindur)
|
||||
r = report.New(
|
||||
issues,
|
||||
creditor,
|
||||
deptor,
|
||||
debtor,
|
||||
rate,
|
||||
)
|
||||
|
||||
@@ -53,12 +62,14 @@ func (s *Service) Generate(creditor model.Entity, deptor *model.Entity, rate flo
|
||||
return document, r, err
|
||||
}
|
||||
|
||||
func filter[T any](slice []T, ok func(T) bool) []T {
|
||||
out := make([]T, 0, len(slice))
|
||||
func (s *Service) filterIssues(slice []*gitea.Issue, ok func(*gitea.Issue) bool) []*gitea.Issue {
|
||||
out := make([]*gitea.Issue, 0, len(slice))
|
||||
|
||||
for _, item := range slice {
|
||||
if ok(item) {
|
||||
out = append(out, item)
|
||||
for _, issue := range slice {
|
||||
if ok(issue) {
|
||||
out = append(out, issue)
|
||||
} else {
|
||||
s.log.Debug("filter out issue", "issueURL", issue.HTMLURL)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user