TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-14 04:27:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! adding more tests for ListOrganization()

Browse Source
This commit is contained in:
Iraq Jaber
2025-05-06 09:09:30 +02:00
parent 4f340dc973
commit 1d7c414f87
7 changed files with 12 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/api/grpc/instance/converter.go
View File

@@ -28,7 +28,7 @@ func InstanceToPb(instance *query.Instance) *instance_pb.Instance {
Name: instance.Name,
Domains: DomainsToPb(instance.Domains),
Version: build.Version(),
State: instance_pb.State_STATE_RUNNING, // TODO: change when delete is implemented
State: instance_pb.State_STATE_RUNNING, // TODO: change when delete is implemented
}
}
@@ -44,7 +44,7 @@ func InstanceDetailToPb(instance *query.Instance) *instance_pb.InstanceDetail {
Name: instance.Name,
Domains: DomainsToPb(instance.Domains),
Version: build.Version(),
State: instance_pb.State_STATE_RUNNING, // TODO: change when delete is implemented
State: instance_pb.State_STATE_RUNNING, // TODO: change when delete is implemented
}
}

4
internal/api/grpc/management/org_converter.go
View File

@@ -26,7 +26,7 @@ func ListOrgDomainsRequestToModel(req *mgmt_pb.ListOrgDomainsRequest) (*query.Or
Limit: limit,
Asc: asc,
},
// SortingColumn: //TODO: sorting
// SortingColumn: //TODO: sorting
Queries: queries,
}, nil
}
@@ -89,7 +89,7 @@ func ListOrgMembersRequestToModel(ctx context.Context, req *mgmt_pb.ListOrgMembe
Offset: offset,
Limit: limit,
Asc: asc,
// SortingColumn: //TODO: sorting
// SortingColumn: //TODO: sorting
},
Queries: queries,
},

41
internal/api/grpc/metadata/v2beta/metadata.go
View File

@@ -7,26 +7,7 @@ import (
meta_pb "github.com/zitadel/zitadel/pkg/grpc/metadata/v2beta"
)
// func UserMetadataListToPb(dataList []*query.UserMetadata) []*meta_pb.Metadata {
// mds := make([]*meta_pb.Metadata, len(dataList))
// for i, data := range dataList {
// mds[i] = UserMetadataToPb(data)
// }
// return mds
// }
// func UserMetadataToPb(data *query.UserMetadata) *meta_pb.Metadata {
// return &meta_pb.Metadata{
// Key: data.Key,
// Value: data.Value,
// Details: object.ToViewDetailsPb(
// data.Sequence,
// data.CreationDate,
// data.ChangeDate,
// data.ResourceOwner,
// ),
// }
// }
// code in thsi file is copied from internal/api/grpc/metadata/metadata.go
func OrgMetadataListToPb(dataList []*query.OrgMetadata) []*meta_pb.Metadata {
mds := make([]*meta_pb.Metadata, len(dataList))
@@ -68,23 +49,3 @@ func OrgMetadataQueryToQuery(metadataQuery *meta_pb.MetadataQuery) (query.Search
return nil, zerrors.ThrowInvalidArgument(nil, "METAD-fdg23", "List.Query.Invalid")
}
}
// func UserMetadataQueriesToQuery(queries []*meta_pb.MetadataQuery) (_ []query.SearchQuery, err error) {
// q := make([]query.SearchQuery, len(queries))
// for i, query := range queries {
// q[i], err = UserMetadataQueryToQuery(query)
// if err != nil {
// return nil, err
// }
// }
// return q, nil
// }
// func UserMetadataQueryToQuery(metadataQuery *meta_pb.MetadataQuery) (query.SearchQuery, error) {
// switch q := metadataQuery.Query.(type) {
// case *meta_pb.MetadataQuery_KeyQuery:
// return query.NewUserMetadataKeySearchQuery(q.KeyQuery.Key, object.TextMethodToQuery(q.KeyQuery.Method))
// default:
// return nil, zerrors.ThrowInvalidArgument(nil, "METAD-Vn7qy", "List.Query.Invalid")
// }
// }

3
internal/api/grpc/org/v2beta/helper.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/zitadel/zitadel/internal/query"
"github.com/zitadel/zitadel/internal/zerrors"
v2beta "github.com/zitadel/zitadel/pkg/grpc/object/v2beta"
// TODO fix below
org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta"
v2beta_org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta"
@@ -138,6 +139,8 @@ func FieldNameToOrgColumn(fieldName v2beta_org.OrgFieldName) query.Column {
switch fieldName {
case v2beta_org.OrgFieldName_ORG_FIELD_NAME_NAME:
return query.OrgColumnName
case v2beta_org.OrgFieldName_ORG_FIELD_NAME_CREATION_DATE:
return query.OrgColumnCreationDate
case v2beta_org.OrgFieldName_ORG_FIELD_NAME_UNSPECIFIED:
return query.Column{}
default:

1
proto/zitadel/admin.proto
View File

@@ -1272,6 +1272,7 @@ service AdminService {
};
}
// Deprecated: use CreateOrganization [/v2beta/organization] API instead
rpc SetUpOrg(SetUpOrgRequest) returns (SetUpOrgResponse) {
option (google.api.http) = {
post: "/orgs/_setup";

2
proto/zitadel/management.proto
View File

@@ -2197,7 +2197,7 @@ service ManagementService {
};
}
// Reprecated: use ReactivateOrganization [/v2beta/organization/_reactivate] API instead
// Deprecated: use ReactivateOrganization [/v2beta/organization/_reactivate] API instead
rpc ReactivateOrg(ReactivateOrgRequest) returns (ReactivateOrgResponse) {
option (google.api.http) = {
post: "/orgs/me/_reactivate"

3
proto/zitadel/org/v2beta/org.proto
View File

@@ -42,6 +42,7 @@ enum OrgState {
enum OrgFieldName {
ORG_FIELD_NAME_UNSPECIFIED = 0;
ORG_FIELD_NAME_NAME = 1;
ORG_FIELD_NAME_CREATION_DATE = 2;
}
message OrgQuery {
@@ -73,7 +74,7 @@ message OrgDomainQuery {
string domain = 1 [
(validate.rules).string = {max_len: 200},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"citadel.cloud\"";
example: "\"zitadel.cloud\"";
}
];
zitadel.object.v2beta.TextQueryMethod method = 2 [