fix: avoid update event on memo create attachments (#5961)
This commit is contained in:
parent
858f7419b4
commit
3c3382a3c6
2 changed files with 44 additions and 10 deletions
|
|
@ -130,11 +130,7 @@ func (s *APIV1Service) CreateMemo(ctx context.Context, request *v1pb.CreateMemoR
|
||||||
attachments := []*store.Attachment{}
|
attachments := []*store.Attachment{}
|
||||||
|
|
||||||
if len(request.Memo.Attachments) > 0 {
|
if len(request.Memo.Attachments) > 0 {
|
||||||
_, err := s.SetMemoAttachments(ctx, &v1pb.SetMemoAttachmentsRequest{
|
if err := s.setMemoAttachmentsInternal(ctx, user, memo, request.Memo.Attachments); err != nil {
|
||||||
Name: fmt.Sprintf("%s%s", MemoNamePrefix, memo.UID),
|
|
||||||
Attachments: request.Memo.Attachments,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrap(err, "failed to set memo attachments")
|
return nil, errors.Wrap(err, "failed to set memo attachments")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -147,11 +143,7 @@ func (s *APIV1Service) CreateMemo(ctx context.Context, request *v1pb.CreateMemoR
|
||||||
attachments = a
|
attachments = a
|
||||||
}
|
}
|
||||||
if len(request.Memo.Relations) > 0 {
|
if len(request.Memo.Relations) > 0 {
|
||||||
_, err := s.SetMemoRelations(ctx, &v1pb.SetMemoRelationsRequest{
|
if err := s.setMemoRelationsInternal(ctx, memo, request.Memo.Relations); err != nil {
|
||||||
Name: fmt.Sprintf("%s%s", MemoNamePrefix, memo.UID),
|
|
||||||
Relations: request.Memo.Relations,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrap(err, "failed to set memo relations")
|
return nil, errors.Wrap(err, "failed to set memo relations")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,48 @@ func TestCreateMemoComment_NoDuplicateSSEBroadcast(t *testing.T) {
|
||||||
"expected memo.comment.created, got: %s", events[0])
|
"expected memo.comment.created, got: %s", events[0])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestCreateMemoWithAttachment_NoDuplicateUpdatedSSEBroadcast(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
svc := newIntegrationService(t)
|
||||||
|
|
||||||
|
user, err := svc.Store.CreateUser(ctx, &store.User{
|
||||||
|
Username: "user", Role: store.RoleAdmin, Email: "user@example.com",
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
uctx := userCtx(ctx, user.ID)
|
||||||
|
|
||||||
|
attachment, err := svc.CreateAttachment(uctx, &v1pb.CreateAttachmentRequest{
|
||||||
|
Attachment: &v1pb.Attachment{
|
||||||
|
Filename: "test.txt",
|
||||||
|
Size: 5,
|
||||||
|
Type: "text/plain",
|
||||||
|
Content: []byte("hello"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
client := svc.SSEHub.Subscribe(user.ID, store.RoleAdmin)
|
||||||
|
defer svc.SSEHub.Unsubscribe(client)
|
||||||
|
|
||||||
|
memo, err := svc.CreateMemo(uctx, &v1pb.CreateMemoRequest{
|
||||||
|
Memo: &v1pb.Memo{
|
||||||
|
Content: "memo with initial attachment",
|
||||||
|
Visibility: v1pb.Visibility_PUBLIC,
|
||||||
|
Attachments: []*v1pb.Attachment{
|
||||||
|
{Name: attachment.Name},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
events := collectEventsFor(client.events, 150*time.Millisecond)
|
||||||
|
|
||||||
|
require.Len(t, events, 1, "expected exactly one SSE event for memo creation with attachment, got: %v", events)
|
||||||
|
assert.Contains(t, events[0], `"memo.created"`)
|
||||||
|
assert.Contains(t, events[0], memo.Name)
|
||||||
|
assert.NotContains(t, events[0], `"memo.updated"`)
|
||||||
|
}
|
||||||
|
|
||||||
// ---- Reaction SSE events carry correct visibility / parent fields ----
|
// ---- Reaction SSE events carry correct visibility / parent fields ----
|
||||||
|
|
||||||
func TestUpsertMemoReaction_SSEEvent(t *testing.T) {
|
func TestUpsertMemoReaction_SSEEvent(t *testing.T) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue