Skip to content

fix: make sure that split lines are expanded for line service #3054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: make sure that split lines are expanded for line service #3054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions openmeter/billing/service/lineservice/linebase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,13 @@ func (l lineBase) Validate(ctx context.Context, invoice *billing.Invoice) error
}
}

// Expanding the split lines are mandatory for the lineservice to work properly.
if l.line.SplitLineGroupID != nil && l.line.SplitLineHierarchy == nil {
return billing.ValidationError{
Err: fmt.Errorf("split line group[%s] has no hierarchy expanded hierarchy", *l.line.SplitLineGroupID),
}
}

return nil
}

Expand All @@ -114,10 +121,6 @@ func (l lineBase) IsLastInPeriod() bool {
return true
}

if l.line.SplitLineHierarchy == nil {
return true
}

if l.line.SplitLineHierarchy.Group.ServicePeriod.End.Equal(l.line.Period.End) {
return true
}
Expand All @@ -130,10 +133,6 @@ func (l lineBase) IsFirstInPeriod() bool {
return true
}

if l.line.SplitLineHierarchy == nil {
return true
}

if l.line.SplitLineHierarchy.Group.ServicePeriod.Start.Equal(l.line.Period.Start) {
return true
}
Expand Down
Loading