diff --git a/controlplane/src/core/repositories/analytics/UsageRepository.ts b/controlplane/src/core/repositories/analytics/UsageRepository.ts index 76c8dc7884..5426c7874a 100644 --- a/controlplane/src/core/repositories/analytics/UsageRepository.ts +++ b/controlplane/src/core/repositories/analytics/UsageRepository.ts @@ -177,7 +177,7 @@ export class UsageRepository { params.namedType = input.namedType; whereSql += ` AND NamedType = {namedType:String}`; } - whereSql += ` AND IsIndirectFieldUsage = false`; + whereSql += ` AND IsIndirectFieldUsage = false AND IsNull = false`; const [requestSeries, clients, meta] = await Promise.all([ this.getUsageRequestSeries(whereSql, timeFilters, params), @@ -246,6 +246,7 @@ export class UsageRepository { Timestamp >= startDate AND Timestamp <= endDate AND OrganizationID = {organizationId:String} AND FederatedGraphID = {federatedGraphId:String} + AND IsNull = false GROUP BY FieldName, TypeName ) @@ -334,6 +335,7 @@ export class UsageRepository { Timestamp >= startDate AND Timestamp <= endDate AND OrganizationID = {organizationId:String} AND FederatedGraphID = {federatedGraphId:String} + AND IsNull = false GROUP BY FieldName, TypeName ) @@ -432,6 +434,7 @@ export class UsageRepository { AND FederatedGraphID = {federatedGraphId:String} AND OperationHash = {operationHash:String} AND hasAny(TypeNames, df.TypeNames) = 1 + AND IsNull = false ${operationName === undefined ? '' : 'AND OperationName = {operationName:String}'} `;