From 2f9cacba617fae4100b4e6f30c2b5d65daf472ce Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Wed, 2 Apr 2025 21:19:02 +0200 Subject: [PATCH] Rename format column to file_format in exports table --- app/controllers/exports_controller.rb | 2 +- app/models/export.rb | 2 +- app/services/exports/create.rb | 2 +- config/credentials/production.key | 1 - config/environments/production.rb | 2 +- .../20250324180755_add_format_start_at_end_at_to_exports.rb | 2 +- db/schema.rb | 2 +- spec/factories/exports.rb | 2 +- spec/models/export_spec.rb | 2 +- spec/services/exports/create_spec.rb | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 config/credentials/production.key diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb index b557dc9a..87029695 100644 --- a/app/controllers/exports_controller.rb +++ b/app/controllers/exports_controller.rb @@ -14,7 +14,7 @@ class ExportsController < ApplicationController export = current_user.exports.create( name: export_name, status: :created, - format: params[:file_format], + file_format: params[:file_format], start_at: params[:start_at], end_at: params[:end_at] ) diff --git a/app/models/export.rb b/app/models/export.rb index 8ba14bef..21ab76a1 100644 --- a/app/models/export.rb +++ b/app/models/export.rb @@ -4,7 +4,7 @@ class Export < ApplicationRecord belongs_to :user enum :status, { created: 0, processing: 1, completed: 2, failed: 3 } - enum :format, { json: 0, gpx: 1 } + enum :file_format, { json: 0, gpx: 1 } validates :name, presence: true diff --git a/app/services/exports/create.rb b/app/services/exports/create.rb index 590173ad..d885afb8 100644 --- a/app/services/exports/create.rb +++ b/app/services/exports/create.rb @@ -6,7 +6,7 @@ class Exports::Create @user = export.user @start_at = export.start_at @end_at = export.end_at - @file_format = export.format + @file_format = export.file_format end def call diff --git a/config/credentials/production.key b/config/credentials/production.key deleted file mode 100644 index 4c969005..00000000 --- a/config/credentials/production.key +++ /dev/null @@ -1 +0,0 @@ -41976cfff86107bc1bb52cec7d8107b0 \ No newline at end of file diff --git a/config/environments/production.rb b/config/environments/production.rb index 4e8f5661..947c8e4e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -43,7 +43,7 @@ Rails.application.configure do # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local + config.active_storage.service = ENV['SELF_HOSTED'] == 'true' ? :local : :s3 config.silence_healthcheck_path = '/api/v1/health' diff --git a/db/migrate/20250324180755_add_format_start_at_end_at_to_exports.rb b/db/migrate/20250324180755_add_format_start_at_end_at_to_exports.rb index 1f515199..6c397961 100644 --- a/db/migrate/20250324180755_add_format_start_at_end_at_to_exports.rb +++ b/db/migrate/20250324180755_add_format_start_at_end_at_to_exports.rb @@ -2,7 +2,7 @@ class AddFormatStartAtEndAtToExports < ActiveRecord::Migration[8.0] def change - add_column :exports, :format, :integer, default: 0 + add_column :exports, :file_format, :integer, default: 0 add_column :exports, :start_at, :datetime add_column :exports, :end_at, :datetime end diff --git a/db/schema.rb b/db/schema.rb index e0c2ca0e..f6e71855 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -74,7 +74,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_03_24_180755) do t.bigint "user_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "format", default: 0 + t.integer "file_format", default: 0 t.datetime "start_at" t.datetime "end_at" t.index ["status"], name: "index_exports_on_status" diff --git a/spec/factories/exports.rb b/spec/factories/exports.rb index 1eae0b47..1db026af 100644 --- a/spec/factories/exports.rb +++ b/spec/factories/exports.rb @@ -4,7 +4,7 @@ FactoryBot.define do factory :export do name { 'export' } status { :created } - format { :json } + file_format { :json } user end end diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb index bb15eb15..e743fefe 100644 --- a/spec/models/export_spec.rb +++ b/spec/models/export_spec.rb @@ -9,6 +9,6 @@ RSpec.describe Export, type: :model do describe 'enums' do it { is_expected.to define_enum_for(:status).with_values(created: 0, processing: 1, completed: 2, failed: 3) } - it { is_expected.to define_enum_for(:format).with_values(json: 0, gpx: 1) } + it { is_expected.to define_enum_for(:file_format).with_values(json: 0, gpx: 1) } end end diff --git a/spec/services/exports/create_spec.rb b/spec/services/exports/create_spec.rb index e8ecb08a..d400b6cc 100644 --- a/spec/services/exports/create_spec.rb +++ b/spec/services/exports/create_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Exports::Create do let(:end_at) { DateTime.new(2021, 1, 2).to_s } let(:export_name) { "#{start_at.to_date}_#{end_at.to_date}.#{file_format}" } let(:export) do - create(:export, user:, name: export_name, status: :created, format: file_format, start_at:, end_at:) + create(:export, user:, name: export_name, status: :created, file_format: file_format, start_at:, end_at:) end let(:export_content) { Points::GeojsonSerializer.new(points).call } let(:reverse_geocoded_at) { Time.zone.local(2021, 1, 1) }