Skip to content

Commit de3d99f

Browse files
AchoArnoldCopilot
andcommitted
fix: simplify uploadAttachments call with := and add user ID to logs
- Use attachmentURLs, err := instead of var err error pattern - Add early return in uploadAttachments for empty slices - Include user ID in upload and error log messages Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 4158509 commit de3d99f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

api/pkg/services/message_service.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -323,16 +323,12 @@ func (service *MessageService) ReceiveMessage(ctx context.Context, params *Messa
323323
ctxLogger := service.tracer.CtxLogger(service.logger, span)
324324

325325
messageID := uuid.New()
326-
attachmentURLs := []string{}
327-
328-
if len(params.Attachments) > 0 {
329-
ctxLogger.Info(fmt.Sprintf("uploading [%d] attachments for message [%s]", len(params.Attachments), messageID))
330-
var err error
331-
attachmentURLs, err = service.uploadAttachments(ctx, params.UserID, messageID, params.Attachments)
332-
if err != nil {
333-
msg := fmt.Sprintf("cannot upload attachments for message [%s]", messageID)
334-
return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
335-
}
326+
327+
ctxLogger.Info(fmt.Sprintf("uploading [%d] attachments for user [%s] message [%s]", len(params.Attachments), params.UserID, messageID))
328+
attachmentURLs, err := service.uploadAttachments(ctx, params.UserID, messageID, params.Attachments)
329+
if err != nil {
330+
msg := fmt.Sprintf("cannot upload attachments for user [%s] message [%s]", params.UserID, messageID)
331+
return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
336332
}
337333

338334
eventPayload := events.MessagePhoneReceivedPayload{
@@ -612,6 +608,10 @@ func (service *MessageService) storeReceivedMessage(ctx context.Context, params
612608
}
613609

614610
func (service *MessageService) uploadAttachments(ctx context.Context, userID entities.UserID, messageID uuid.UUID, attachments []ServiceAttachment) ([]string, error) {
611+
if len(attachments) == 0 {
612+
return []string{}, nil
613+
}
614+
615615
ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)
616616
defer span.End()
617617

0 commit comments

Comments
 (0)