XYZ-80: Add CreateAt/UpdateAt/DeleteAt fields to roles table. (#8223)

This commit is contained in:
George Goldberg
2018-02-08 16:08:47 +00:00
committed by Jesús Espino
parent fa5cba9cc7
commit 96ffde43dc
2 changed files with 15 additions and 0 deletions

View File

@@ -34,6 +34,9 @@ type Role struct {
Name string `json:"name"`
DisplayName string `json:"display_name"`
Description string `json:"description"`
CreateAt int64 `json:"create_at"`
UpdateAt int64 `json:"update_at"`
DeleteAt int64 `json:"delete_at"`
Permissions []string `json:"permissions"`
SchemeManaged bool `json:"scheme_managed"`
}

View File

@@ -19,6 +19,9 @@ type Role struct {
Name string
DisplayName string
Description string
CreateAt int64
UpdateAt int64
DeleteAt int64
Permissions string
SchemeManaged bool
}
@@ -39,6 +42,9 @@ func NewRoleFromModel(role *model.Role) *Role {
Name: role.Name,
DisplayName: role.DisplayName,
Description: role.Description,
CreateAt: role.CreateAt,
UpdateAt: role.UpdateAt,
DeleteAt: role.DeleteAt,
Permissions: permissions,
SchemeManaged: role.SchemeManaged,
}
@@ -50,6 +56,9 @@ func (role Role) ToModel() *model.Role {
Name: role.Name,
DisplayName: role.DisplayName,
Description: role.Description,
CreateAt: role.CreateAt,
UpdateAt: role.UpdateAt,
DeleteAt: role.DeleteAt,
Permissions: strings.Fields(role.Permissions),
SchemeManaged: role.SchemeManaged,
}
@@ -77,10 +86,13 @@ func (s *SqlSupplier) RoleSave(ctx context.Context, role *model.Role, hints ...s
dbRole := NewRoleFromModel(role)
if len(dbRole.Id) == 0 {
dbRole.Id = model.NewId()
dbRole.CreateAt = model.GetMillis()
dbRole.UpdateAt = dbRole.CreateAt
if err := s.GetMaster().Insert(dbRole); err != nil {
result.Err = model.NewAppError("SqlRoleStore.Save", "store.sql_role.save.insert.app_error", nil, err.Error(), http.StatusInternalServerError)
}
} else {
dbRole.UpdateAt = model.GetMillis()
if rowsChanged, err := s.GetMaster().Update(dbRole); err != nil {
result.Err = model.NewAppError("SqlRoleStore.Save", "store.sql_role.save.update.app_error", nil, err.Error(), http.StatusInternalServerError)
} else if rowsChanged != 1 {