Skip to content

Commit 39796d7

Browse files
authored
refactor: rm unnecessary validation (#3374)
1 parent 724de44 commit 39796d7

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

openmeter/entitlement/adapter/entitlement.go

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@ func (a *entitlementDBAdapter) CreateEntitlement(ctx context.Context, ent entitl
237237
return nil, fmt.Errorf("failed to query created entitlement with edges: %w", err)
238238
}
239239

240-
if err := repo.validateSubjectKeysMatch(entWithEdges); err != nil {
241-
return nil, err
242-
}
243-
244240
return repo.mapEntitlementEntity(entWithEdges)
245241
},
246242
)
@@ -548,10 +544,6 @@ func (a *entitlementDBAdapter) mapEntitlementEntity(e *db.Entitlement) (*entitle
548544
return nil, fmt.Errorf("entitlement %s has no customer", e.ID)
549545
}
550546

551-
if err := a.validateSubjectKeysMatch(e); err != nil {
552-
return nil, err
553-
}
554-
555547
ent := &entitlement.Entitlement{
556548
GenericProperties: entitlement.GenericProperties{
557549
NamespacedModel: models.NamespacedModel{
@@ -669,29 +661,6 @@ func (a *entitlementDBAdapter) mapEntitlementEntity(e *db.Entitlement) (*entitle
669661
return ent, nil
670662
}
671663

672-
func (a *entitlementDBAdapter) validateSubjectKeysMatch(e *db.Entitlement) error {
673-
if e.Edges.Customer == nil {
674-
return fmt.Errorf("entitlement %s has no customer", e.ID)
675-
}
676-
677-
if e.Edges.Subject == nil {
678-
return fmt.Errorf("entitlement %s has no subject", e.ID)
679-
}
680-
681-
found := false
682-
for _, cs := range e.Edges.Customer.Edges.Subjects {
683-
if cs != nil && cs.SubjectKey == e.Edges.Subject.Key {
684-
found = true
685-
break
686-
}
687-
}
688-
if !found {
689-
return fmt.Errorf("entitlement %s customer mapping does not reference subject %s", e.ID, e.Edges.Subject.Key)
690-
}
691-
692-
return nil
693-
}
694-
695664
func (a *entitlementDBAdapter) UpdateEntitlementUsagePeriod(ctx context.Context, entitlementID models.NamespacedID, params entitlement.UpdateEntitlementUsagePeriodParams) error {
696665
_, err := entutils.TransactingRepo(
697666
ctx,

0 commit comments

Comments
 (0)