From b4cee886fcec9277bc5972f43e9cf85a7f96e7a3 Mon Sep 17 00:00:00 2001
From: adlerhurst <27845747+adlerhurst@users.noreply.github.com>
Date: Tue, 29 Jul 2025 18:04:32 +0200
Subject: [PATCH] cleanup

---
 backend/v3/api/domain.go     | 13 -------------
 backend/v3/api/org/v2/org.go | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/backend/v3/api/domain.go b/backend/v3/api/domain.go
index 445be35e9c..f21994cdfe 100644
--- a/backend/v3/api/domain.go
+++ b/backend/v3/api/domain.go
@@ -3,21 +3,8 @@ package api
 import (
 	"github.com/zitadel/zitadel/backend/v3/domain"
 	filter "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta"
-	org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta"
 )
 
-func V2BetaOrgStateToDomain(state org.OrgState) domain.OrgState {
-	switch state {
-	case org.OrgState_ORG_STATE_ACTIVE:
-		return domain.OrgStateActive
-	case org.OrgState_ORG_STATE_INACTIVE:
-		return domain.OrgStateInactive
-	default:
-		// TODO: removed is not supported in the domain
-		panic("unknown org state: " + state.String())
-	}
-}
-
 func V2BetaPaginationToDomain(pagination *filter.PaginationRequest) domain.Pagination {
 	return domain.Pagination{
 		Limit:     pagination.Limit,
diff --git a/backend/v3/api/org/v2/org.go b/backend/v3/api/org/v2/org.go
index d06e1b6a0a..38ce3d1353 100644
--- a/backend/v3/api/org/v2/org.go
+++ b/backend/v3/api/org/v2/org.go
@@ -145,7 +145,7 @@ func orgFilterToDomain(filter *org.OrganizationSearchFilter) domain.OrgsQueryOpt
 	case *org.OrganizationSearchFilter_IdFilter:
 		return domain.WithOrgByIDQuery(f.IdFilter.Id)
 	case *org.OrganizationSearchFilter_StateFilter:
-		return domain.WithOrgByStateQuery(api.V2BetaOrgStateToDomain(f.StateFilter.State))
+		return domain.WithOrgByStateQuery(orgStateToDomain(f.StateFilter.State))
 	default:
 		panic("unknown organization search filter: " + filter.String())
 	}
@@ -196,3 +196,15 @@ func orgFieldNameToDatabase(fieldName org.OrgFieldName) func(query *domain.OrgsQ
 		return nil
 	}
 }
+
+func orgStateToDomain(state org.OrgState) domain.OrgState {
+	switch state {
+	case org.OrgState_ORG_STATE_ACTIVE:
+		return domain.OrgStateActive
+	case org.OrgState_ORG_STATE_INACTIVE:
+		return domain.OrgStateInactive
+	default:
+		// TODO: removed is not supported in the domain
+		panic("unknown org state: " + state.String())
+	}
+}