Merge branch 'main' into arrangement-names
All checks were successful
Add copyright notice / copyright_notice (pull_request) Successful in 3m43s
Run unit tests / unit_tests (pull_request) Successful in 13m1s

This commit is contained in:
Manuel Bustillo 2024-11-03 11:42:28 +01:00
commit eb2b111472
8 changed files with 19 additions and 6 deletions

View File

@ -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:

View File

@ -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

View File

@ -4,6 +4,9 @@ on:
branches:
- main
pull_request:
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true
jobs:
unit_tests:
runs-on: ubuntu-latest

View File

@ -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}"

View 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
View File

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.2].define(version: 2024_11_03_072808) 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"
@ -40,7 +40,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_03_072808) 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

View File

@ -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

View File

@ -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