Merge branch 'main' into arrangement-names

.github/workflows/build.yml

@@ -3,13 +3,9 @@ on:
   push:
     branches:
       - main
-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:

.github/workflows/copyright_notice.yml

@@ -3,9 +3,6 @@ on:
   pull_request:
 permissions:
   contents: write
-concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: true
 jobs:
   copyright_notice:
     runs-on: ubuntu-latest

.github/workflows/tests.yml

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

app/serializers/serializable_guest.rb

@@ -3,7 +3,7 @@
 class SerializableGuest < JSONAPI::Serializable::Resource
   type 'guest'
 
-  attributes :id, :group_id, :status
+  attributes :id, :email, :group_id, :status
 
   attribute :name do
     "#{@object.first_name} #{@object.last_name}"

db/migrate/20241103072808_add_name_to_tables_arrangements.rb

@@ -1,3 +1,5 @@
+# Copyright (C) 2024 Manuel Bustillo
+
 class AddNameToTablesArrangements < ActiveRecord::Migration[7.2]
   def change
     add_column :tables_arrangements, :name, :string, null: false

db/migrate/20241103093955_remove_email_from_guests.rb

@@ -1,7 +0,0 @@
-# Copyright (C) 2024 Manuel Bustillo
-
-class RemoveEmailFromGuests < ActiveRecord::Migration[7.2]
-  def change
-    remove_column :guests, :email, :string
-  end
-end

db/schema.rb

@@ -1,3 +1,5 @@
+# Copyright (C) 2024 Manuel Bustillo
+
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,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_093955) do
+ActiveRecord::Schema[7.2].define(version: 2024_11_03_072808) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -40,6 +42,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_03_093955) 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

db/seeds.rb

@@ -58,6 +58,7 @@ 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

spec/factories/guest.rb

@@ -6,6 +6,7 @@ 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