fix(api): evaluate cloud namespace limits before enterprise'one

henrybarreto · henrybarreto · commit 96fd99d5b8b2 · 2025-06-30T17:05:17.000-03:00
diff --git a/api/services/device.go b/api/services/device.go
@@ -322,10 +322,6 @@ func (s *service) UpdateDeviceStatus(ctx context.Context, tenant string, uid mod
 	}
 
 	switch {
-	case envs.IsCommunity(), envs.IsEnterprise():
-		if namespace.HasMaxDevices() && namespace.HasMaxDevicesReached() {
-			return NewErrDeviceMaxDevicesReached(namespace.MaxDevices)
-		}
 	case envs.IsCloud():
 		if namespace.Billing.IsActive() {
 			if err := s.BillingReport(s.client, namespace.TenantID, ReportDeviceAccept); err != nil {
@@ -362,6 +358,10 @@ func (s *service) UpdateDeviceStatus(ctx context.Context, tenant string, uid mod
 				return ErrDeviceLimit
 			}
 		}
+	case envs.IsCommunity(), envs.IsEnterprise():
+		if namespace.HasMaxDevices() && namespace.HasMaxDevicesReached() {
+			return NewErrDeviceMaxDevicesReached(namespace.MaxDevices)
+		}
 	}
 
 	if err := s.store.DeviceUpdateStatus(ctx, uid, status); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -322,10 +322,6 @@ func (s *service) UpdateDeviceStatus(ctx context.Context, tenant string, uid mod`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`switch {`
`325`		`- case envs.IsCommunity(), envs.IsEnterprise():`
`326`		`- if namespace.HasMaxDevices() && namespace.HasMaxDevicesReached() {`
`327`		`- return NewErrDeviceMaxDevicesReached(namespace.MaxDevices)`
`328`		`- }`
`329`	`325`	`case envs.IsCloud():`
`330`	`326`	`if namespace.Billing.IsActive() {`
`331`	`327`	`if err := s.BillingReport(s.client, namespace.TenantID, ReportDeviceAccept); err != nil {`
`@@ -362,6 +358,10 @@ func (s *service) UpdateDeviceStatus(ctx context.Context, tenant string, uid mod`
`362`	`358`	`return ErrDeviceLimit`
`363`	`359`	`}`
`364`	`360`	`}`
	`361`	`+ case envs.IsCommunity(), envs.IsEnterprise():`
	`362`	`+ if namespace.HasMaxDevices() && namespace.HasMaxDevicesReached() {`
	`363`	`+ return NewErrDeviceMaxDevicesReached(namespace.MaxDevices)`
	`364`	`+ }`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`if err := s.store.DeviceUpdateStatus(ctx, uid, status); err != nil {`