fix(management): map all fields in user grant view converter (#324)

* fix(management): map all fields in user grant view converter

* feat(management): add display name to user grant view
This commit is contained in:
Silvan
2020-07-01 12:46:46 +02:00
committed by GitHub
parent cf7a906023
commit f57913fdcc
9 changed files with 13403 additions and 14017 deletions

View File

@@ -162,6 +162,7 @@ func (u *UserGrant) fillUserData(grant *view_model.UserGrantView, user *usr_mode
grant.UserName = user.UserName
grant.FirstName = user.FirstName
grant.LastName = user.LastName
grant.DispalyName = user.DisplayName
grant.Email = user.EmailAddress
}

View File

@@ -1,8 +1,9 @@
package model
import (
"github.com/caos/zitadel/internal/model"
"time"
"github.com/caos/zitadel/internal/model"
)
type UserGrantView struct {
@@ -13,6 +14,7 @@ type UserGrantView struct {
UserName string
FirstName string
LastName string
DisplayName string
Email string
ProjectName string
OrgName string

View File

@@ -30,6 +30,7 @@ type UserGrantView struct {
UserName string `json:"-" gorm:"column:user_name"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
DispalyName string `json:"-" grom:"column:display_name"`
Email string `json:"-" gorm:"column:email"`
ProjectName string `json:"-" gorm:"column:project_name"`
OrgName string `json:"-" gorm:"column:org_name"`
@@ -54,6 +55,7 @@ func UserGrantFromModel(grant *model.UserGrantView) *UserGrantView {
UserName: grant.UserName,
FirstName: grant.FirstName,
LastName: grant.LastName,
DispalyName: grant.DisplayName,
Email: grant.Email,
ProjectName: grant.ProjectName,
OrgName: grant.OrgName,
@@ -74,6 +76,7 @@ func UserGrantToModel(grant *UserGrantView) *model.UserGrantView {
UserName: grant.UserName,
FirstName: grant.FirstName,
LastName: grant.LastName,
DisplayName: grant.DispalyName,
Email: grant.Email,
ProjectName: grant.ProjectName,
OrgName: grant.OrgName,