[attachments] minor fixes

Author: capcom6

internal/attachments/service.go

@@ -54,12 +54,13 @@ func (s *Service) InitUpload(ctx context.Context, input AttachmentInput) (*Uploa
 		return nil, err
 	}
 
-	if ok, err := s.tasksSvc.Exists(ctx, input.TaskID); err != nil || !ok {
-		if !ok {
-			return nil, ErrTaskNotFound
-		}
+	ok, err := s.tasksSvc.Exists(ctx, input.TaskID)
+	if err != nil {
 		return nil, fmt.Errorf("failed to check if task exists: %w", err)
 	}
+	if !ok {
+		return nil, ErrTaskNotFound
+	}
 
 	storageKey := s.buildStorageKey(input.TaskID, input.FileName)
 	uploadURL, err := s.storageSvc.PresignedPutObject(ctx, storageKey)
@@ -78,21 +79,27 @@ func (s *Service) InitUpload(ctx context.Context, input AttachmentInput) (*Uploa
 	}, nil
 }
 
-func (s *Service) ConfirmUpload(ctx context.Context, id int64, uploaderID int64) (*Attachment, error) {
-	attachment, err := s.attachments.GetByID(ctx, id)
+func (s *Service) ListByTask(ctx context.Context, taskID int64) ([]AttachmentWithURL, error) {
+	items, err := s.attachments.ListByTask(ctx, taskID)
 	if err != nil {
 		return nil, err
 	}
 
-	if attachment.UploadedBy != uploaderID {
-		return nil, ErrUnauthorized
-	}
+	result := make([]AttachmentWithURL, 0, len(items))
+	for _, item := range items {
+		if item.Status != StatusUploaded {
+			continue
+		}
 
-	if confirmErr := s.attachments.Confirm(ctx, id); confirmErr != nil {
-		return nil, confirmErr
+		downloadURL, urlErr := s.storageSvc.PresignedGetObject(ctx, item.StorageKey)
+		if urlErr != nil {
+			return nil, fmt.Errorf("failed to create download url: %w", urlErr)
+		}
+
+		result = append(result, AttachmentWithURL{Attachment: item, DownloadURL: downloadURL})
 	}
 
-	return s.attachments.GetByID(ctx, id)
+	return result, nil
 }
 
 func (s *Service) GetDownloadURL(ctx context.Context, id int64) (string, error) {
@@ -113,6 +120,23 @@ func (s *Service) GetDownloadURL(ctx context.Context, id int64) (string, error)
 	return downloadURL, nil
 }
 
+func (s *Service) ConfirmUpload(ctx context.Context, id int64, uploaderID int64) (*Attachment, error) {
+	attachment, err := s.attachments.GetByID(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	if attachment.UploadedBy != uploaderID {
+		return nil, ErrUnauthorized
+	}
+
+	if confirmErr := s.attachments.Confirm(ctx, id); confirmErr != nil {
+		return nil, confirmErr
+	}
+
+	return s.attachments.GetByID(ctx, id)
+}
+
 func (s *Service) Delete(ctx context.Context, user *users.User, id int64) error {
 	attachment, err := s.attachments.GetByID(ctx, id)
 	if err != nil {
@@ -128,34 +152,15 @@ func (s *Service) Delete(ctx context.Context, user *users.User, id int64) error
 		return ErrUnauthorized
 	}
 
-	if delErr := s.storageSvc.Delete(ctx, attachment.StorageKey); delErr != nil {
-		return fmt.Errorf("failed to delete attachment: %w", delErr)
-	}
-
-	return s.attachments.Delete(ctx, id)
-}
-
-func (s *Service) ListByTask(ctx context.Context, taskID int64) ([]AttachmentWithURL, error) {
-	items, err := s.attachments.ListByTask(ctx, taskID)
-	if err != nil {
-		return nil, err
+	if delErr := s.attachments.Delete(ctx, id); delErr != nil {
+		return delErr
 	}
 
-	result := make([]AttachmentWithURL, 0, len(items))
-	for _, item := range items {
-		if item.Status != StatusUploaded {
-			continue
-		}
-
-		downloadURL, urlErr := s.storageSvc.PresignedGetObject(ctx, item.StorageKey)
-		if urlErr != nil {
-			return nil, fmt.Errorf("failed to create download url: %w", urlErr)
-		}
-
-		result = append(result, AttachmentWithURL{Attachment: item, DownloadURL: downloadURL})
+	if delErr := s.storageSvc.Delete(ctx, attachment.StorageKey); delErr != nil {
+		return fmt.Errorf("attachment metadata deleted, but object cleanup failed: %w", delErr)
 	}
 
-	return result, nil
+	return nil
 }
 
 func (s *Service) buildStorageKey(taskID int64, fileName string) string {