lou-taylor/accounting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

feat: more options
Some checks failed
Go / build (push) Failing after 1m16s
Details

Browse Source
This commit is contained in:
schreifuchs
2025-11-04 20:16:44 +01:00
parent 8f5ae15ef0
commit cfbb475a42
6 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/api/httpinvoce/controller.go
View File

@@ -9,6 +9,7 @@ import (
"time"
"git.schreifuchs.ch/lou-taylor/accounting/internal/email"
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice"
)
const bufSize = 1024 * 1024 // 1Mib
@@ -28,7 +29,9 @@ func (s Service) createInvoice(w http.ResponseWriter, r *http.Request) {
return
}
invoice, report, err := s.invoice.Generate(req.Creditor, &req.Debtor, time.Duration(req.DurationThreshold), req.HourlyRate, repos)
opts := invoice.DefaultOptions
opts.Mindur = time.Duration(req.DurationThreshold)
invoice, report, err := s.invoice.Generate(req.Creditor, &req.Debtor, req.HourlyRate, repos, &opts)
if err != nil {
s.sendErr(w, http.StatusInternalServerError, "internal server error")
return
@@ -65,11 +68,15 @@ func (s Service) sendInvoice(w http.ResponseWriter, r *http.Request) {
s.sendErr(w, 500, err.Error())
return
}
invoice, report, err := s.invoice.Generate(req.Invoice.Creditor, &req.Invoice.Debtor, time.Duration(req.Invoice.DurationThreshold), req.Invoice.HourlyRate, repos)
opts := invoice.DefaultOptions
opts.Mindur = time.Duration(req.Invoice.DurationThreshold)
invoice, report, err := s.invoice.Generate(req.Invoice.Creditor, &req.Invoice.Debtor, req.Invoice.HourlyRate, repos, &opts)
if err != nil {
s.sendErr(w, http.StatusInternalServerError, "error while processing invoice:", err)
return
}
// if no time has to be billed aka if bill for 0 CHF
if report.Total() <= time.Duration(0) {
s.sendErr(w, http.StatusNotFound, "no suitable issues to be billed")

20
internal/api/httpinvoce/controller_test.go
View File

@@ -65,12 +65,12 @@ func (s SendReq) ToEMail() email.Mail {
// MockInvoiceService mocks the invoice.Service interface
type MockInvoiceService struct {
GenerateFunc func(creditor model.Entity, debtor *model.Entity, durationThreshold time.Duration, hourlyRate float64, repos []invoice.Repo) (io.ReadCloser, *report.Report, error)
GenerateFunc func(creditor model.Entity, debtor *model.Entity, hourlyRate float64, repos []invoice.Repo, opts *invoice.Options) (io.ReadCloser, *report.Report, error)
}
func (m *MockInvoiceService) Generate(creditor model.Entity, debtor *model.Entity, durationThreshold time.Duration, hourlyRate float64, repos []invoice.Repo) (io.ReadCloser, *report.Report, error) {
func (m *MockInvoiceService) Generate(creditor model.Entity, debtor *model.Entity, hourlyRate float64, repos []invoice.Repo, opts *invoice.Options) (io.ReadCloser, *report.Report, error) {
if m.GenerateFunc != nil {
return m.GenerateFunc(creditor, debtor, durationThreshold, hourlyRate, repos)
return m.GenerateFunc(creditor, debtor, hourlyRate, repos, opts)
}
return nil, &report.Report{}, nil
}
@@ -166,7 +166,12 @@ func TestCreateInvoice(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mockInvoiceService := &MockInvoiceService{
GenerateFunc: tt.mockGenerate,
GenerateFunc: func(creditor model.Entity, debtor *model.Entity, hourlyRate float64, repos []invoice.Repo, opts *invoice.Options) (io.ReadCloser, *report.Report, error) {
if opts == nil {
opts = &invoice.DefaultOptions
}
return tt.mockGenerate(creditor, debtor, opts.Mindur, hourlyRate, repos)
},
}
service := Service{invoice: mockInvoiceService, log: dummyLogger} // Pass the dummy logger
@@ -298,7 +303,12 @@ func TestSendInvoice(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mockInvoiceService := &MockInvoiceService{
GenerateFunc: tt.mockGenerate,
GenerateFunc: func(creditor model.Entity, debtor *model.Entity, hourlyRate float64, repos []invoice.Repo, opts *invoice.Options) (io.ReadCloser, *report.Report, error) {
if opts == nil {
opts = &invoice.DefaultOptions
}
return tt.mockGenerate(creditor, debtor, opts.Mindur, hourlyRate, repos)
},
}
mockEmailService := &MockEmailService{
SendFunc: tt.mockSend,

3
internal/api/httpinvoce/resource.go
View File

@@ -3,7 +3,6 @@ package httpinvoce
import (
"io"
"log/slog"
"time"
"git.schreifuchs.ch/lou-taylor/accounting/internal/email"
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice"
@@ -22,7 +21,7 @@ func New(log *slog.Logger, invoice invoicer, mail mailer) *Service {
}
type invoicer interface {
Generate(creditor model.Entity, deptor *model.Entity, mindur time.Duration, rate float64, repos []invoice.Repo) (document io.ReadCloser, report *report.Report, err error)
Generate(creditor model.Entity, deptor *model.Entity, rate float64, repos []invoice.Repo, opts *invoice.Options) (document io.ReadCloser, report *report.Report, err error)
}
type mailer interface {