TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 00:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: converters (#1413)

Browse Source 
* fix: converters

* fix: converters

* comments
This commit is contained in:
Livio Amstutz
2021-03-12 14:06:05 +01:00
committed by GitHub
parent af55c4a65c
commit e9eb5b7848
27 changed files with 149 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/grpc/project/application.go
View File

@@ -22,7 +22,7 @@ func AppsToPb(apps []*proj_model.ApplicationView) []*app_pb.App {
func AppToPb(app *proj_model.ApplicationView) *app_pb.App {
return &app_pb.App{
Id: app.ID,
Details: object_grpc.ToDetailsPb(app.Sequence, app.CreationDate, "app.ResourceOwner"), //TODO: RO
Details: object_grpc.ToViewDetailsPb(app.Sequence, app.CreationDate, app.ChangeDate, ""), //TODO: RO
State: AppStateToPb(app.State),
Name: app.Name,
Config: AppConfigToPb(app),

6
internal/api/grpc/project/converter.go
View File

@@ -10,7 +10,7 @@ import (
func ProjectToPb(project *proj_model.ProjectView) *proj_pb.Project {
return &proj_pb.Project{
Id: project.ProjectID,
Details: object_grpc.ToDetailsPb(project.Sequence, project.ChangeDate, project.ResourceOwner),
Details: object_grpc.ToViewDetailsPb(project.Sequence, project.CreationDate, project.ChangeDate, project.ResourceOwner),
Name: project.Name,
State: projectStateToPb(project.State),
ProjectRoleAssertion: project.ProjectRoleAssertion,
@@ -22,7 +22,7 @@ func GrantedProjectToPb(project *proj_model.ProjectGrantView) *proj_pb.GrantedPr
return &proj_pb.GrantedProject{
GrantId: project.GrantID,
ProjectId: project.ProjectID,
Details: object_grpc.ToDetailsPb(project.Sequence, project.ChangeDate, project.ResourceOwner),
Details: object_grpc.ToViewDetailsPb(project.Sequence, project.CreationDate, project.ChangeDate, project.ResourceOwner),
ProjectName: project.Name,
State: grantedProjectStateToPb(project.State),
ProjectOwnerId: project.ResourceOwner,
@@ -176,7 +176,7 @@ func RolesToPb(roles []*proj_model.ProjectRoleView) []*proj_pb.Role {
func RoleToPb(role *proj_model.ProjectRoleView) *proj_pb.Role {
return &proj_pb.Role{
Key: role.Key,
Details: object_grpc.ToDetailsPb(role.Sequence, role.ChangeDate, role.ResourceOwner),
Details: object_grpc.ToViewDetailsPb(role.Sequence, role.CreationDate, role.ChangeDate, role.ResourceOwner),
DisplayName: role.DisplayName,
Group: role.Group,
}