From c5a4eb3555fab85911f91576631a866d5a85838e Mon Sep 17 00:00:00 2001 From: Silvan Date: Wed, 1 Jul 2020 13:18:30 +0200 Subject: [PATCH] fix: typo in display name and gorm annotation (#325) * fix(management): map all fields in user grant view converter * feat(management): add display name to user grant view * fix(usergrant): typo in display name --- .../repository/eventsourcing/handler/user_grant.go | 2 +- internal/usergrant/repository/view/model/user_grant.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/management/repository/eventsourcing/handler/user_grant.go b/internal/management/repository/eventsourcing/handler/user_grant.go index 8df0c0a997..45750eda1f 100644 --- a/internal/management/repository/eventsourcing/handler/user_grant.go +++ b/internal/management/repository/eventsourcing/handler/user_grant.go @@ -162,7 +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.DisplayName = user.DisplayName grant.Email = user.EmailAddress } diff --git a/internal/usergrant/repository/view/model/user_grant.go b/internal/usergrant/repository/view/model/user_grant.go index 13ed23e055..7c782361dd 100644 --- a/internal/usergrant/repository/view/model/user_grant.go +++ b/internal/usergrant/repository/view/model/user_grant.go @@ -30,7 +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"` + DisplayName string `json:"-" gorm:"column:display_name"` Email string `json:"-" gorm:"column:email"` ProjectName string `json:"-" gorm:"column:project_name"` OrgName string `json:"-" gorm:"column:org_name"` @@ -55,7 +55,7 @@ func UserGrantFromModel(grant *model.UserGrantView) *UserGrantView { UserName: grant.UserName, FirstName: grant.FirstName, LastName: grant.LastName, - DispalyName: grant.DisplayName, + DisplayName: grant.DisplayName, Email: grant.Email, ProjectName: grant.ProjectName, OrgName: grant.OrgName, @@ -76,7 +76,7 @@ func UserGrantToModel(grant *UserGrantView) *model.UserGrantView { UserName: grant.UserName, FirstName: grant.FirstName, LastName: grant.LastName, - DisplayName: grant.DispalyName, + DisplayName: grant.DisplayName, Email: grant.Email, ProjectName: grant.ProjectName, OrgName: grant.OrgName,