From 06bc789b992770dcb6286ae4b253e4443c91c653 Mon Sep 17 00:00:00 2001 From: Iraq Jaber Date: Wed, 7 May 2025 13:57:08 +0200 Subject: [PATCH] fixup! fixup! fixup! Merge branch 'main' into org_api --- internal/api/grpc/org/v2beta/helper.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/api/grpc/org/v2beta/helper.go b/internal/api/grpc/org/v2beta/helper.go index 085b003aca..5f409688fc 100644 --- a/internal/api/grpc/org/v2beta/helper.go +++ b/internal/api/grpc/org/v2beta/helper.go @@ -171,6 +171,9 @@ func OrgViewToPb(org *query.Org) *v2beta_org.Organization { func ListOrgDomainsRequestToModel(systemDefaults systemdefaults.SystemDefaults, request *org.ListOrganizationDomainsRequest) (*query.OrgDomainSearchQueries, error) { offset, limit, asc, err := filter.PaginationPbToQuery(systemDefaults, request.Pagination) + if err != nil { + return nil, err + } queries, err := DomainQueriesToModel(request.Filter) if err != nil { return nil, err @@ -255,6 +258,9 @@ func BulkSetOrgMetadataToDomain(req *v2beta_org.SetOrganizationMetadataRequest) func ListOrgMetadataToDomain(systemDefaults systemdefaults.SystemDefaults, request *v2beta_org.ListOrganizationMetadataRequest) (*query.OrgMetadataSearchQueries, error) { offset, limit, asc, err := filter.PaginationPbToQuery(systemDefaults, request.Pagination) + if err != nil { + return nil, err + } queries, err := metadata.OrgMetadataQueriesToQuery(request.Filter) if err != nil { return nil, err