[MM-57963] Log Name and DisplayName of groups (#26836)

Этот коммит содержится в:
Ben Schumacher
2024-07-08 21:25:21 +02:00
коммит произвёл GitHub
родитель 3513d310af
Коммит 0e6bfbdd26
4 изменённых файлов: 171 добавлений и 13 удалений

Просмотреть файл

@@ -52,18 +52,30 @@ func (group *Group) Auditable() map[string]interface{} {
return map[string]interface{}{
"id": group.Id,
"source": group.Source,
"remote_id": group.RemoteId,
"remote_id": group.GetRemoteId(),
"create_at": group.CreateAt,
"update_at": group.UpdateAt,
"delete_at": group.DeleteAt,
"has_syncables": group.HasSyncables,
"member_count": group.MemberCount,
"member_count": group.GetMemberCount(),
"allow_reference": group.AllowReference,
}
}
func (group *Group) LogClone() any {
return group.Auditable()
return map[string]interface{}{
"id": group.Id,
"name": group.GetName(),
"display_name": group.DisplayName,
"source": group.Source,
"remote_id": group.GetRemoteId(),
"create_at": group.CreateAt,
"update_at": group.UpdateAt,
"delete_at": group.DeleteAt,
"has_syncables": group.HasSyncables,
"member_count": group.GetMemberCount(),
"allow_reference": group.AllowReference,
}
}
type GroupWithUserIds struct {
@@ -75,12 +87,12 @@ func (group *GroupWithUserIds) Auditable() map[string]interface{} {
return map[string]interface{}{
"id": group.Id,
"source": group.Source,
"remote_id": group.RemoteId,
"remote_id": group.GetRemoteId(),
"create_at": group.CreateAt,
"update_at": group.UpdateAt,
"delete_at": group.DeleteAt,
"has_syncables": group.HasSyncables,
"member_count": group.MemberCount,
"member_count": group.GetMemberCount(),
"allow_reference": group.AllowReference,
"user_ids": group.UserIds,
}
@@ -268,17 +280,15 @@ func (group *Group) IsValidName() *AppError {
}
func (group *Group) GetName() string {
if group.Name == nil {
return ""
}
return *group.Name
return SafeDereference(group.Name)
}
func (group *Group) GetRemoteId() string {
if group.RemoteId == nil {
return ""
}
return *group.RemoteId
return SafeDereference(group.RemoteId)
}
func (group *Group) GetMemberCount() int {
return SafeDereference(group.MemberCount)
}
type GroupsWithCount struct {