diff options
| author | George Goldberg <george@gberg.me> | 2018-02-08 16:08:47 +0000 |
|---|---|---|
| committer | Jesús Espino <jespinog@gmail.com> | 2018-02-08 17:08:47 +0100 |
| commit | 96ffde43dc5dccef7af106dc8200566ff16ba1dc (patch) | |
| tree | 9574b60e1afc03a3684efa1e6fe238f0a365c4d2 | |
| parent | fa5cba9cc79b3bdc48ad42f276652bc699795a39 (diff) | |
| download | chat-96ffde43dc5dccef7af106dc8200566ff16ba1dc.tar.gz chat-96ffde43dc5dccef7af106dc8200566ff16ba1dc.tar.bz2 chat-96ffde43dc5dccef7af106dc8200566ff16ba1dc.zip | |
XYZ-80: Add CreateAt/UpdateAt/DeleteAt fields to roles table. (#8223)
| -rw-r--r-- | model/role.go | 3 | ||||
| -rw-r--r-- | store/sqlstore/role_supplier.go | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/model/role.go b/model/role.go index eedf97d25..281304801 100644 --- a/model/role.go +++ b/model/role.go @@ -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"` } diff --git a/store/sqlstore/role_supplier.go b/store/sqlstore/role_supplier.go index 41eed85e0..f9ce53788 100644 --- a/store/sqlstore/role_supplier.go +++ b/store/sqlstore/role_supplier.go @@ -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 { |