Implement deep copy method for model.WebSocketEvent (#18977)

Этот коммит содержится в:
Claudio Costa
2021-11-22 09:54:19 +01:00
коммит произвёл GitHub
родитель 0da249c651
Коммит 3dea98ea4b
4 изменённых файлов: 195 добавлений и 2 удалений

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

@@ -90,12 +90,58 @@ type WebsocketBroadcast struct {
ContainsSensitiveData bool `json:"-"`
}
func (wb *WebsocketBroadcast) copy() *WebsocketBroadcast {
if wb == nil {
return nil
}
var c WebsocketBroadcast
if wb.OmitUsers != nil {
c.OmitUsers = make(map[string]bool, len(wb.OmitUsers))
for k, v := range wb.OmitUsers {
c.OmitUsers[k] = v
}
}
c.UserId = wb.UserId
c.ChannelId = wb.ChannelId
c.TeamId = wb.TeamId
c.ContainsSanitizedData = wb.ContainsSanitizedData
c.ContainsSensitiveData = wb.ContainsSensitiveData
return &c
}
type precomputedWebSocketEventJSON struct {
Event json.RawMessage
Data json.RawMessage
Broadcast json.RawMessage
}
func (p *precomputedWebSocketEventJSON) copy() *precomputedWebSocketEventJSON {
if p == nil {
return nil
}
var c precomputedWebSocketEventJSON
if p.Event != nil {
c.Event = make([]byte, len(p.Event))
copy(c.Event, p.Event)
}
if p.Data != nil {
c.Data = make([]byte, len(p.Data))
copy(c.Data, p.Data)
}
if p.Broadcast != nil {
c.Broadcast = make([]byte, len(p.Broadcast))
copy(c.Broadcast, p.Broadcast)
}
return &c
}
// webSocketEventJSON mirrors WebSocketEvent to make some of its unexported fields serializable
type webSocketEventJSON struct {
Event string `json:"event"`
@@ -154,6 +200,25 @@ func (ev *WebSocketEvent) Copy() *WebSocketEvent {
return copy
}
func (ev *WebSocketEvent) DeepCopy() *WebSocketEvent {
var dataCopy map[string]interface{}
if ev.data != nil {
dataCopy = make(map[string]interface{}, len(ev.data))
for k, v := range ev.data {
dataCopy[k] = v
}
}
copy := &WebSocketEvent{
event: ev.event,
data: dataCopy,
broadcast: ev.broadcast.copy(),
sequence: ev.sequence,
precomputedJSON: ev.precomputedJSON.copy(),
}
return copy
}
func (ev *WebSocketEvent) GetData() map[string]interface{} {
return ev.data
}

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

@@ -157,3 +157,80 @@ func BenchmarkWebSocketEvent_ToJSON(b *testing.B) {
}
})
}
func TestWebsocketBroadcastCopy(t *testing.T) {
w := &WebsocketBroadcast{}
require.Equal(t, w, w.copy())
w = nil
require.Equal(t, w, w.copy())
w = &WebsocketBroadcast{
OmitUsers: map[string]bool{
"aaa": true,
"bbb": true,
"ccc": false,
},
UserId: "aaa",
ChannelId: "bbb",
TeamId: "ccc",
ContainsSanitizedData: true,
ContainsSensitiveData: true,
}
require.Equal(t, w, w.copy())
}
func TestPrecomputedWebSocketEventJSONCopy(t *testing.T) {
p := &precomputedWebSocketEventJSON{}
require.Equal(t, p, p.copy())
p = nil
require.Equal(t, p, p.copy())
p = &precomputedWebSocketEventJSON{
Event: []byte{},
Data: []byte{},
Broadcast: []byte{},
}
require.Equal(t, p, p.copy())
p = &precomputedWebSocketEventJSON{
Event: []byte{'a', 'b', 'c'},
Data: []byte{'d', 'e', 'f'},
Broadcast: []byte{'g', 'h', 'i'},
}
require.Equal(t, p, p.copy())
}
func TestWebSocketEventDeepCopy(t *testing.T) {
omitUsers := map[string]bool{
"user1": true,
"user2": false,
}
broadcast := &WebsocketBroadcast{
OmitUsers: omitUsers,
UserId: "aaa",
ChannelId: "bbb",
TeamId: "ccc",
ContainsSanitizedData: true,
ContainsSensitiveData: true,
}
ev := NewWebSocketEvent("test", "team", "channel", "user", omitUsers)
ev.Add("post", &Post{})
ev.SetBroadcast(broadcast)
ev = ev.PrecomputeJSON()
evCopy := ev.DeepCopy()
require.Equal(t, ev, evCopy)
require.NotSame(t, ev.data, evCopy.data)
require.NotSame(t, ev.broadcast, evCopy.broadcast)
require.NotSame(t, ev.precomputedJSON, evCopy.precomputedJSON)
ev.Add("post", &Post{
Id: "test",
})
require.NotEqual(t, ev.data, evCopy.data)
}