Merge branch 'main' into solid-queue-vns
This commit is contained in:
commit
a5c6def0b6
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@ -3,10 +3,13 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: ${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
build-static-assets:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 30
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
|
3
.github/workflows/copyright_notice.yml
vendored
3
.github/workflows/copyright_notice.yml
vendored
@ -3,6 +3,9 @@ on:
|
||||
pull_request:
|
||||
permissions:
|
||||
contents: write
|
||||
concurrency:
|
||||
group: ${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
copyright_notice:
|
||||
runs-on: ubuntu-latest
|
||||
|
3
.github/workflows/tests.yml
vendored
3
.github/workflows/tests.yml
vendored
@ -4,6 +4,9 @@ on:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: ${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
unit_tests:
|
||||
runs-on: ubuntu-latest
|
||||
|
@ -3,7 +3,7 @@
|
||||
class SerializableGuest < JSONAPI::Serializable::Resource
|
||||
type 'guest'
|
||||
|
||||
attributes :id, :email, :group_id, :status
|
||||
attributes :id, :group_id, :status
|
||||
|
||||
attribute :name do
|
||||
"#{@object.first_name} #{@object.last_name}"
|
||||
|
7
db/migrate/20241103093955_remove_email_from_guests.rb
Normal file
7
db/migrate/20241103093955_remove_email_from_guests.rb
Normal file
@ -0,0 +1,7 @@
|
||||
# Copyright (C) 2024 Manuel Bustillo
|
||||
|
||||
class RemoveEmailFromGuests < ActiveRecord::Migration[7.2]
|
||||
def change
|
||||
remove_column :guests, :email, :string
|
||||
end
|
||||
end
|
3
db/schema.rb
generated
3
db/schema.rb
generated
@ -12,7 +12,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema[7.2].define(version: 2024_11_03_075705) do
|
||||
ActiveRecord::Schema[7.2].define(version: 2024_11_03_093955) do
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
||||
@ -42,7 +42,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_03_075705) do
|
||||
create_table "guests", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
|
||||
t.string "first_name"
|
||||
t.string "last_name"
|
||||
t.string "email"
|
||||
t.string "phone"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
|
@ -58,7 +58,6 @@ NUMBER_OF_GUESTS.times do
|
||||
Guest.create!(
|
||||
first_name: Faker::Name.first_name,
|
||||
last_name: Faker::Name.last_name,
|
||||
email: Faker::Internet.email,
|
||||
phone: Faker::PhoneNumber.cell_phone,
|
||||
group: groups.sample,
|
||||
status: Guest.statuses.keys.sample
|
||||
|
@ -6,7 +6,6 @@ FactoryBot.define do
|
||||
|
||||
first_name { Faker::Name.first_name }
|
||||
last_name { Faker::Name.last_name }
|
||||
email { Faker::Internet.email }
|
||||
phone { Faker::PhoneNumber.cell_phone }
|
||||
end
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user