From ba4331c2527b87be5868c06280b4a08da17048f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20B=C3=B6hm?= Date: Sat, 7 Sep 2024 23:24:07 +0200 Subject: [PATCH] changed enum to string in user and job model --- app/models/job.rb | 10 +++++----- app/models/user.rb | 6 +++--- db/migrate/20240727101347_create_jobs.rb | 2 +- db/migrate/20240826144015_create_users.rb | 2 +- db/schema.rb | 4 ++-- db/seeds.rb | 3 ++- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/models/job.rb b/app/models/job.rb index b1e2345..1d4fa47 100644 --- a/app/models/job.rb +++ b/app/models/job.rb @@ -27,11 +27,11 @@ class Job < ApplicationRecord # NOTE: Multiple status if paing before brinting? enum :status, { - open: 0, - printing: 1, - pickup: 2, - paid: 3, - canceled: 4 + open: "open", + printing: "printing", + pickup: "pickup", + paid: "paid", + canceled: "canceled" } AVAILABLE_PAGE_FORMATS = [ :a0, :a1, :a2, :a3 ] diff --git a/app/models/user.rb b/app/models/user.rb index 8cc8e0a..f64ddfa 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -22,9 +22,9 @@ class User < ApplicationRecord normalizes :email, with: -> { _1.strip.downcase } enum :role, { - user: 0, - operator: 1, - admin: 2 + user: "user", + operator: "operator", + admin: "admin" } before_validation if: :email_changed?, on: :update do diff --git a/db/migrate/20240727101347_create_jobs.rb b/db/migrate/20240727101347_create_jobs.rb index d37e475..90b3f0e 100644 --- a/db/migrate/20240727101347_create_jobs.rb +++ b/db/migrate/20240727101347_create_jobs.rb @@ -14,7 +14,7 @@ class CreateJobs < ActiveRecord::Migration[7.1] t.datetime :paid_at t.boolean :intern, default: false t.string :cost_center - t.integer :status, default: 0, index: true + t.string :status, default: 0, index: true t.integer :number_of_plans_a0, default: 0 t.integer :number_of_plans_a1, default: 0 t.integer :number_of_plans_a2, default: 0 diff --git a/db/migrate/20240826144015_create_users.rb b/db/migrate/20240826144015_create_users.rb index c5391d3..87b1fb4 100644 --- a/db/migrate/20240826144015_create_users.rb +++ b/db/migrate/20240826144015_create_users.rb @@ -6,7 +6,7 @@ class CreateUsers < ActiveRecord::Migration[7.2] t.string :firstname t.string :lastname - t.integer :role, default: 0, index: true + t.string :role, default: 0, index: true t.boolean :verified, null: false, default: false diff --git a/db/schema.rb b/db/schema.rb index d751713..ee82797 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -53,7 +53,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_08_26_144016) do t.datetime "paid_at" t.boolean "intern", default: false t.string "cost_center" - t.integer "status", default: 0 + t.string "status", default: "0" t.integer "number_of_plans_a0", default: 0 t.integer "number_of_plans_a1", default: 0 t.integer "number_of_plans_a2", default: 0 @@ -83,7 +83,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_08_26_144016) do t.string "password_digest", null: false t.string "firstname" t.string "lastname" - t.integer "role", default: 0 + t.string "role", default: "0" t.boolean "verified", default: false, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false diff --git a/db/seeds.rb b/db/seeds.rb index 3fe9b28..17df35f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -23,12 +23,13 @@ students = [] 5.times do firstname = Faker::Name.unique.first_name.delete(" ") lastname = Faker::Name.unique.last_name.delete(" ") - email=firstname + "." + lastname + "@student.hs-rm.de" + email="#{firstname}.#{lastname}@student.hs-rm.de" email.delete(" ") students << User.new(email: email, firstname: firstname, lastname: lastname, password_digest: BCrypt::Password.create("password"), verified: true) students.last.save! end +# Jobs [ 'GanzWichtig.pdf', 'IchBinIn5MinDran.pdf', 'DerPlanDerImmerProblemeMacht.pdf', 'DieFarbenGefallenMirNicht.pdf', 'MachHinIchHabsEilig.pdf', 'WarumDauertDasSoLange.pdf', 'DenPlanBezahleIchNicht.pdf', 'IchWarAlsErstesDran.pdf', 'WarumIstDerPlotterDefekt.pdf',