Simplify S3BackupService and S3Helpers with streamlined error handling

app/services/concerns/s3_helpers.rb

@@ -6,47 +6,15 @@ module S3Helpers
   private
 
   def ensure_s3_enabled
-    return if ENV["USE_S3_STORAGE"] == "true"
-
-    error_msg = "S3 storage is not enabled. Set USE_S3_STORAGE=true in your .env file"
-    raise error_msg
+    raise "S3 storage is not enabled" unless ENV["USE_S3_STORAGE"] == "true"
   end
 
   def validate_s3_config
     required_vars = %w[S3_ENDPOINT S3_ACCESS_KEY_ID S3_SECRET_ACCESS_KEY S3_BUCKET]
     missing_vars = required_vars.select { |var| ENV[var].blank? }
 
-    if missing_vars.any?
-      error_msg = "Missing required S3 environment variables: #{missing_vars.join(", ")}"
-
-      Sentry.capture_message(error_msg, level: "error", extra: {
-        missing_vars: missing_vars,
-        context: self.class.name,
-        environment: Rails.env
-      })
-
-      raise error_msg
-    end
-  end
-
-  def get_s3_service
-    service = ActiveStorage::Blob.service
-
-    unless service.is_a?(ActiveStorage::Service::S3Service)
-      error_msg = "Active Storage is not configured to use S3. Current service: #{service.class.name}"
-      raise error_msg
-    end
-
-    service
+    raise "Missing S3 config: #{missing_vars.join(", ")}" if missing_vars.any?
   end
 
-  def handle_s3_errors
-    yield
-  rescue Aws::S3::Errors::ServiceError => e
-    Sentry.capture_exception(e)
-    raise
-  rescue => e
-    Sentry.capture_exception(e)
-    raise
-  end
+  def get_s3_service = ActiveStorage::Blob.service
 end

app/services/s3_backup_service.rb

@@ -9,124 +9,49 @@ def perform
     ensure_s3_enabled
     validate_s3_config
 
-    handle_s3_errors do
-      # Capture backup context for better error reporting
-      Sentry.with_scope do |scope|
-        scope.set_context("backup", {
-          service: "S3BackupService",
-          rails_env: Rails.env,
-          timestamp: Time.current.iso8601
-        })
-      end
-
-      service = get_s3_service
-
-      # Create temp directory
-      FileUtils.mkdir_p(temp_dir)
-
-      # Generate backup filename
-      timestamp = Time.current.strftime("%Y-%m-%d")
-      backup_filename = "database-#{timestamp}.sqlite3"
-      temp_backup_path = temp_dir.join(backup_filename)
-      s3_key = "#{backup_dir}/database-#{timestamp}.tar.gz"
-
-      begin
-        # Create SQLite backup
-        log_info "Creating database backup..."
-
-        # Check if database path exists and is valid
-        unless database_path && File.exist?(database_path)
-          error_msg = "Database file not found at: #{database_path}"
-          log_error error_msg
-          Sentry.capture_message(error_msg, level: "error")
-          raise error_msg
-        end
-
-        # Check if sqlite3 command is available
-        unless system("which sqlite3 > /dev/null 2>&1")
-          error_msg = "sqlite3 command not found - required for database backup"
-          log_error error_msg
-          Sentry.capture_message(error_msg, level: "error", extra: {
-            environment: Rails.env,
-            path: ENV["PATH"]
-          })
-          raise error_msg
-        end
-
-        # Use array form to prevent command injection
-        unless system("sqlite3", database_path.to_s, ".backup '#{temp_backup_path}'", exception: true)
-          error_msg = "Failed to create SQLite backup"
-          Sentry.capture_message(error_msg, level: "error", extra: {
-            command: "sqlite3 #{database_path} .backup '#{temp_backup_path}'",
-            database_path: database_path.to_s,
-            temp_backup_path: temp_backup_path.to_s
-          })
-          raise error_msg
-        end
-        log_info "Database backup created successfully"
-
-        # Compress the backup
-        log_info "Compressing backup..."
-        temp_compressed_path = create_tar_gz(timestamp)
-        log_info "Backup compressed successfully"
-
-        # Upload to S3
-        log_info "Uploading to S3 (#{s3_key})..."
-        File.open(temp_compressed_path, "rb") do |file|
-          service.upload(s3_key, file)
-        end
-        log_info "Backup uploaded to S3 successfully"
-
-        # Clean up old backups
-        log_info "Cleaning up old backups..."
-        deleted_count = cleanup_old_backups(service)
-        log_info "Deleted #{deleted_count} old backups" if deleted_count.positive?
-
-        backup_size_mb = (File.size(temp_compressed_path) / 1024.0 / 1024.0).round(2)
-        log_info "Database backup completed successfully!"
-        log_info "Backup location: #{s3_key}"
-        log_info "Backup size: #{backup_size_mb} MB"
-
-        # Return summary for callers
-        {
-          success: true,
-          location: s3_key,
-          size_mb: backup_size_mb,
-          deleted_count: deleted_count
-        }
-      rescue => e
-        # Report any unexpected errors to Sentry with full context
-        Sentry.capture_exception(e, extra: {
-          database_path: database_path.to_s,
-          backup_filename: backup_filename,
-          s3_key: s3_key,
-          step: "backup_process"
-        })
-        raise # Re-raise to let handle_s3_errors deal with it
-      ensure
-        # Clean up temp files
-        FileUtils.rm_f(temp_backup_path)
-        FileUtils.rm_f(temp_dir.join("database-#{timestamp}.tar.gz"))
-      end
-    end
-  end
-
-  private
-
-  # Logging helpers that work for both rake tasks and jobs
-  def log_info(message)
-    if defined?(Rails.logger)
-      Rails.logger.info message
-    else
-      warn message
-    end
-  end
-
-  def log_error(message)
-    if defined?(Rails.logger)
-      Rails.logger.error message
-    else
-      warn "❌ #{message}"
+    service = get_s3_service
+    FileUtils.mkdir_p(temp_dir)
+
+    timestamp = Time.current.strftime("%Y-%m-%d")
+    backup_filename = "database-#{timestamp}.sqlite3"
+    temp_backup_path = temp_dir.join(backup_filename)
+    s3_key = "#{backup_dir}/database-#{timestamp}.tar.gz"
+
+    # Create SQLite backup
+    Rails.logger.info "Creating database backup..."
+    system("sqlite3", database_path.to_s, ".backup '#{temp_backup_path}'", exception: true)
+    Rails.logger.info "Database backup created successfully"
+
+    # Compress the backup
+    Rails.logger.info "Compressing backup..."
+    temp_compressed_path = create_tar_gz(timestamp)
+    Rails.logger.info "Backup compressed successfully"
+
+    # Upload to S3
+    Rails.logger.info "Uploading to S3 (#{s3_key})..."
+    File.open(temp_compressed_path, "rb") do |file|
+      service.upload(s3_key, file)
     end
+    Rails.logger.info "Backup uploaded to S3 successfully"
+
+    # Clean up old backups
+    Rails.logger.info "Cleaning up old backups..."
+    deleted_count = cleanup_old_backups(service)
+    Rails.logger.info "Deleted #{deleted_count} old backups" if deleted_count.positive?
+
+    backup_size_mb = (File.size(temp_compressed_path) / 1024.0 / 1024.0).round(2)
+    Rails.logger.info "Database backup completed successfully!"
+    Rails.logger.info "Backup location: #{s3_key}"
+    Rails.logger.info "Backup size: #{backup_size_mb} MB"
+
+    {
+      success: true,
+      location: s3_key,
+      size_mb: backup_size_mb,
+      deleted_count: deleted_count
+    }
+  ensure
+    FileUtils.rm_f(temp_backup_path) if defined?(temp_backup_path)
+    FileUtils.rm_f(temp_dir.join("database-#{timestamp}.tar.gz")) if defined?(timestamp)
   end
 end