Merge branch 'main' into arrangement-names

Reviewed-on: #90

.github/workflows/build.yml

@@ -3,9 +3,13 @@ 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,6 +3,9 @@ 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,6 +4,9 @@ on:
     branches:
       - main
   pull_request:
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   unit_tests:
     runs-on: ubuntu-latest

Gemfile

@@ -15,6 +15,7 @@ gem 'stimulus-rails'
 gem 'turbo-rails'
 gem 'tzinfo-data', platforms: %i[windows jruby]
 
+gem 'faker'
 gem 'jsonapi-rails'
 gem 'rack-cors'
 gem 'react-rails'
@@ -23,7 +24,6 @@ gem 'rubytree'
 group :development, :test do
   gem 'debug', platforms: %i[mri windows]
   gem 'factory_bot_rails'
-  gem 'faker'
   gem 'pry'
   gem 'rspec-rails', '~> 7.0.0'
 end

app/controllers/tables_arrangements_controller.rb

@@ -2,7 +2,7 @@
 
 class TablesArrangementsController < ApplicationController
   def index
-    render json: TablesArrangement.all.order(discomfort: :asc).limit(3).as_json(only: %i[id discomfort])
+    render json: TablesArrangement.all.order(discomfort: :asc).limit(3).as_json(only: %i[id name discomfort])
   end
 
   def show

app/models/tables_arrangement.rb

@@ -3,4 +3,12 @@
 class TablesArrangement < ApplicationRecord
   has_many :seats
   has_many :guests, through: :seats
+
+  before_create :assign_name
+
+  private
+
+  def assign_name
+    self.name = "#{Faker::Adjective.positive} #{Faker::Creature::Animal.name}".capitalize
+  end
 end

app/serializers/serializable_guest.rb

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

db/migrate/20241103072808_add_name_to_tables_arrangements.rb

@@ -0,0 +1,5 @@
+class AddNameToTablesArrangements < ActiveRecord::Migration[7.2]
+  def change
+    add_column :tables_arrangements, :name, :string, null: false
+  end
+end

db/migrate/20241103093955_remove_email_from_guests.rb

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

db/schema.rb

@@ -1,5 +1,3 @@
-# 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.
@@ -12,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_01_181052) 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 +40,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_01_181052) 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
@@ -65,6 +62,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_01_181052) do
     t.integer "discomfort"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "name", null: false
   end
 
   add_foreign_key "groups", "groups", column: "parent_id"

db/seeds.rb

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

spec/factories/guest.rb

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

spec/models/tables_arrangement_spec.rb

@@ -3,5 +3,9 @@
 require 'rails_helper'
 
 RSpec.describe TablesArrangement, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  describe 'callbacks' do
+    it 'assigns a name before creation' do
+      expect(described_class.create!.name).to be_present
+    end
+  end
 end