From 1e335de1cba1c857dbad16eb2fd93882a5c817b7 Mon Sep 17 00:00:00 2001
From: Iraq Jaber <iraq+github@zitadel.com>
Date: Wed, 21 May 2025 16:14:29 +0200
Subject: [PATCH] fixup! fixup! fixup! fixup! Merge branch 'main' into org_api

---
 internal/api/grpc/org/v2beta/org_test.go | 167 -----------------------
 1 file changed, 167 deletions(-)
 delete mode 100644 internal/api/grpc/org/v2beta/org_test.go

diff --git a/internal/api/grpc/org/v2beta/org_test.go b/internal/api/grpc/org/v2beta/org_test.go
deleted file mode 100644
index 78330bddbc..0000000000
--- a/internal/api/grpc/org/v2beta/org_test.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package org
-
-import (
-	"testing"
-	"time"
-
-	"github.com/muhlemmer/gu"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	"github.com/zitadel/zitadel/internal/command"
-	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/zerrors"
-	org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta"
-	user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta"
-)
-
-func Test_createOrganizationRequestToCommand(t *testing.T) {
-	type args struct {
-		request *org.CreateOrganizationRequest
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    *command.OrgSetup
-		wantErr error
-	}{
-		{
-			name: "nil user",
-			args: args{
-				request: &org.CreateOrganizationRequest{
-					Name: "name",
-					Admins: []*org.CreateOrganizationRequest_Admin{
-						{},
-					},
-				},
-			},
-			wantErr: zerrors.ThrowUnimplementedf(nil, "ORGv2-SL2r8", "userType oneOf %T in method AddOrganization not implemented", nil),
-		},
-		{
-			name: "user ID",
-			args: args{
-				request: &org.CreateOrganizationRequest{
-					Name: "name",
-					Admins: []*org.CreateOrganizationRequest_Admin{
-						{
-							UserType: &org.CreateOrganizationRequest_Admin_UserId{
-								UserId: "userID",
-							},
-							Roles: nil,
-						},
-					},
-				},
-			},
-			want: &command.OrgSetup{
-				Name:         "name",
-				CustomDomain: "",
-				Admins: []*command.OrgSetupAdmin{
-					{
-						ID: "userID",
-					},
-				},
-			},
-		},
-		{
-			name: "human user",
-			args: args{
-				request: &org.CreateOrganizationRequest{
-					Name: "name",
-					Admins: []*org.CreateOrganizationRequest_Admin{
-						{
-							UserType: &org.CreateOrganizationRequest_Admin_Human{
-								Human: &user.AddHumanUserRequest{
-									Profile: &user.SetHumanProfile{
-										GivenName:  "firstname",
-										FamilyName: "lastname",
-									},
-									Email: &user.SetHumanEmail{
-										Email: "email@test.com",
-									},
-								},
-							},
-							Roles: nil,
-						},
-					},
-				},
-			},
-			want: &command.OrgSetup{
-				Name:         "name",
-				CustomDomain: "",
-				Admins: []*command.OrgSetupAdmin{
-					{
-						Human: &command.AddHuman{
-							Username:  "email@test.com",
-							FirstName: "firstname",
-							LastName:  "lastname",
-							Email: command.Email{
-								Address: "email@test.com",
-							},
-							Metadata: make([]*command.AddMetadataEntry, 0),
-							Links:    make([]*command.AddLink, 0),
-						},
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := createOrganizationRequestToCommand(tt.args.request)
-			require.ErrorIs(t, err, tt.wantErr)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func Test_createdOrganizationToPb(t *testing.T) {
-	now := time.Now()
-	type args struct {
-		createdOrg *command.CreatedOrg
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    *org.CreateOrganizationResponse
-		wantErr error
-	}{
-		{
-			name: "human user with phone and email code",
-			args: args{
-				createdOrg: &command.CreatedOrg{
-					ObjectDetails: &domain.ObjectDetails{
-						Sequence:      1,
-						EventDate:     now,
-						ResourceOwner: "orgID",
-					},
-					CreatedAdmins: []*command.CreatedOrgAdmin{
-						{
-							ID:        "id",
-							EmailCode: gu.Ptr("emailCode"),
-							PhoneCode: gu.Ptr("phoneCode"),
-						},
-					},
-				},
-			},
-			want: &org.CreateOrganizationResponse{
-				CreationDate: timestamppb.New(now),
-				Id:           "orgID",
-				CreatedAdmins: []*org.CreatedAdmin{
-					{
-						UserId:    "id",
-						EmailCode: gu.Ptr("emailCode"),
-						PhoneCode: gu.Ptr("phoneCode"),
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := createdOrganizationToPb(tt.args.createdOrg)
-			require.ErrorIs(t, err, tt.wantErr)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}