Skip to content

dedupe for setSingleOr.. func #43

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

Merged
oursimon merged 1 commit into from
Feb 10, 2026
Merged

dedupe for setSingleOr.. func #43

Show file tree
Hide file tree
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
21 changes: 12 additions & 9 deletions puan/ruleset_creator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,11 +311,12 @@ func (c *RulesetCreator) setSingleOrOR(ids ...string) (string, error) {
)
}

if len(ids) == 1 {
return ids[0], nil
deduped := utils.Dedupe(ids)
if len(deduped) == 1 {
return deduped[0], nil
}

return c.SetOr(ids...)
return c.SetOr(deduped...)
}

func (c *RulesetCreator) setSingleOrXOR(ids ...string) (string, error) {
Expand All @@ -326,11 +327,12 @@ func (c *RulesetCreator) setSingleOrXOR(ids ...string) (string, error) {
)
}

if len(ids) == 1 {
return ids[0], nil
deduped := utils.Dedupe(ids)
if len(deduped) == 1 {
return deduped[0], nil
}

return c.SetXor(ids...)
return c.SetXor(deduped...)
}

func (c *RulesetCreator) setSingleOrAnd(ids ...string) (string, error) {
Expand All @@ -341,11 +343,12 @@ func (c *RulesetCreator) setSingleOrAnd(ids ...string) (string, error) {
)
}

if len(ids) == 1 {
return ids[0], nil
deduped := utils.Dedupe(ids)
if len(deduped) == 1 {
return deduped[0], nil
}

return c.SetAnd(ids...)
return c.SetAnd(deduped...)
}

func (c *RulesetCreator) createAssumeConstraints() error {
Expand Down
49 changes: 49 additions & 0 deletions puan/ruleset_creator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/stretchr/testify/assert"

"github.com/ourstudio-se/puan-sdk-go/internal/fake"
"github.com/ourstudio-se/puan-sdk-go/puanerror"
)

func Test_RulesetCreator_newTimeBoundVariable_givenTimeEnabled_andValidPeriod(t *testing.T) {
Expand Down Expand Up @@ -174,3 +175,51 @@ func Test_RulesetCreator_AssumeInPeriod_givenDifferentPeriod_shouldAddTimeBoundV
assert.NotContains(t, creator.assumedVariables, "itemX")
assert.Contains(t, creator.timeBoundAssumedVariables.ids(), "itemX")
}

func Test_RulesetCreator_setSingleOrOR_givenNoIDs_shouldReturnError(t *testing.T) {
creator := NewRulesetCreator()
_, err := creator.setSingleOrOR([]string{}...)

assert.ErrorIs(t, err, puanerror.InvalidArgument)
}

func Test_RulesetCreator_setSingleOrOR_givenDuplicatedIDs_shouldReturnID(t *testing.T) {
code := fake.New[string]()
creator := NewRulesetCreator()
got, err := creator.setSingleOrOR(code, code)

assert.NoError(t, err)
assert.Equal(t, code, got)
}

func Test_RulesetCreator_setSingleOrXOR_givenNoIDs_shouldReturnError(t *testing.T) {
creator := NewRulesetCreator()
_, err := creator.setSingleOrXOR([]string{}...)

assert.ErrorIs(t, err, puanerror.InvalidArgument)
}

func Test_RulesetCreator_setSingleOrXOR_givenDuplicatedIDs_shouldReturnID(t *testing.T) {
code := fake.New[string]()
creator := NewRulesetCreator()
got, err := creator.setSingleOrXOR(code, code)

assert.NoError(t, err)
assert.Equal(t, code, got)
}

func Test_RulesetCreator_setSingleOrAND_givenNoIDs_shouldReturnError(t *testing.T) {
creator := NewRulesetCreator()
_, err := creator.setSingleOrAnd([]string{}...)

assert.ErrorIs(t, err, puanerror.InvalidArgument)
}

func Test_RulesetCreator_setSingleOrAND_givenDuplicatedIDs_shouldReturnID(t *testing.T) {
code := fake.New[string]()
creator := NewRulesetCreator()
got, err := creator.setSingleOrAnd(code, code)

assert.NoError(t, err)
assert.Equal(t, code, got)
}
Loading