Merge pull request 'Update dependency factory_bot_rails to v6.5.0' (#281) from renovate/factory_bot_rails-6.x-lockfile into main

Reviewed-on: #281

.gitea/workflows/tests.yml

@@ -124,9 +124,6 @@ jobs:
     timeout-minutes: 30
     needs:
       - unit_tests
-      - rubocop
-      - check-licenses
-      - copyright_notice
     steps:
       - uses: actions/checkout@v4
         with:

.ruby-version

@@ -1 +1 @@
-ruby-3.4.2
+ruby-3.4.3

Dockerfile

@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.4.2
+ARG RUBY_VERSION=3.4.3
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
 
 # Rails app lives here

Dockerfile.dev

@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.4.2
+ARG RUBY_VERSION=3.4.3
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
 
 # Rails app lives here

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '3.4.2'
+ruby '3.4.3'
 gem 'bootsnap', require: false
 gem 'csv'
 gem 'importmap-rails'

Gemfile.lock

@@ -85,7 +85,7 @@ GEM
     base64 (0.3.0)
     bcrypt (3.1.20)
     benchmark (0.4.1)
-    bigdecimal (3.2.1)
+    bigdecimal (3.2.2)
     bindex (0.8.1)
     bootsnap (1.18.6)
       msgpack (~> 1.2)
@@ -115,11 +115,11 @@ GEM
     et-orbi (1.2.11)
       tzinfo
     execjs (2.9.1)
-    factory_bot (6.4.6)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.4)
-      railties (>= 5.0.0)
+    factory_bot (6.5.4)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.0)
+      factory_bot (~> 6.5)
+      railties (>= 6.1.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
     fugit (1.11.1)
@@ -245,7 +245,7 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.15)
+    rack (3.1.16)
     rack-cors (3.0.0)
       logger
       rack (>= 3.0.14)
@@ -491,7 +491,7 @@ CHECKSUMS
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bcrypt (3.1.20) sha256=8410f8c7b3ed54a3c00cd2456bf13917d695117f033218e2483b2e40b0784099
   benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce
-  bigdecimal (3.2.1) sha256=1f68631e876c6aba8fe9b84b36983c55ad3293ff2d1ad4c6f115bde1e9d802e3
+  bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc
   bindex (0.8.1) sha256=7b1ecc9dc539ed8bccfc8cb4d2732046227b09d6f37582ff12e50a5047ceb17e
   bootsnap (1.18.6) sha256=0ae2393c1e911e38be0f24e9173e7be570c3650128251bf06240046f84a07d00
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
@@ -511,8 +511,8 @@ CHECKSUMS
   erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9
   et-orbi (1.2.11) sha256=d26e868cc21db88280a9ec1a50aa3da5d267eb9b2037ba7b831d6c2731f5df64
   execjs (2.9.1) sha256=e8fd066f6df60c8e8fbebc32c6fb356b5212c77374e8416a9019ca4bb154dcfb
-  factory_bot (6.4.6) sha256=1a9486ce98d318d740d8f5804b885a8265a28f326ecf2bcd4ce9fb27a71a6e04
-  factory_bot_rails (6.4.3) sha256=ea73ceac1c0ff3dc11fff390bf2ea8a2604066525ed8ecd3b3bc2c267226dcc8
+  factory_bot (6.5.4) sha256=4707fb7d80a7c14d71feb069460587bfc342e4ff1ef28097e0ad69d5ddfce613
+  factory_bot_rails (6.5.0) sha256=4a7b61635424a57cc60412a18b72b9dcfb02fabfce2c930447a01dce8b37c0a2
   faker (3.5.1) sha256=1ad1fbea279d882f486059c23fe3ddb816ccd1d7052c05a45014b4450d859bfc
   fugit (1.11.1) sha256=e89485e7be22226d8e9c6da411664d0660284b4b1c08cacb540f505907869868
   globalid (1.2.1) sha256=70bf76711871f843dbba72beb8613229a49429d1866828476f9c9d6ccc327ce9
@@ -572,7 +572,7 @@ CHECKSUMS
   puma (6.6.0) sha256=f25c06873eb3d5de5f0a4ebc783acc81a4ccfe580c760cfe323497798018ad87
   raabro (1.4.0) sha256=d4fa9ff5172391edb92b242eed8be802d1934b1464061ae5e70d80962c5da882
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
-  rack (3.1.15) sha256=d12b3e9960d18a26ded961250f2c0e3b375b49ff40dbe6786e9c3b160cbffca4
+  rack (3.1.16) sha256=efb5606c351efc56b85b10c3493055d0d35209d23f44792ec4e1183eb0234635
   rack-cors (3.0.0) sha256=7b95be61db39606906b61b83bd7203fa802b0ceaaad8fcb2fef39e097bf53f68
   rack-session (2.1.1) sha256=0b6dc07dea7e4b583f58a48e8b806d4c9f1c6c9214ebc202ec94562cbea2e4e9
   rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
@@ -634,7 +634,7 @@ CHECKSUMS
   zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85
 
 RUBY VERSION
-   ruby 3.4.2p28
+   ruby 3.4.3p32
 
 BUNDLED WITH
    2.6.1

app/controllers/guests_controller.rb

@@ -6,10 +6,13 @@ require 'csv'
 
 class GuestsController < ApplicationController
   GUEST_PARAMS = { only: %i[id name status], include: { group: { only: %i[id name] } } }.freeze
+
+  skip_before_action :authenticate_user!, only: :update
+
   def index
     render json: Guest.includes(:group)
                       .left_joins(:group)
-                      .order('groups.name' => :asc, name: :asc)
+                      .order('groups.name' => :asc, invitation_id: :asc, name: :asc)
                       .as_json(GUEST_PARAMS)
   end
 
@@ -31,6 +34,6 @@ class GuestsController < ApplicationController
   private
 
   def guest_params
-    params.expect(guest: %i[name group_id status])
+    user_signed_in? ? params.expect(guest: %i[name group_id status]) : params.expect(guest: %i[status])
   end
 end

app/controllers/invitations_controller.rb

@@ -2,9 +2,9 @@
 
 # frozen_string_literal: true
 
-# Copyright (C) 2024-2025 LibreWeddingPlanner contributors
-
 class InvitationsController < ApplicationController
+  skip_before_action :authenticate_user!, only: :show
+
   def index
     render json: Invitation.includes(:guests).as_json(
       only: :id,
@@ -16,6 +16,16 @@ class InvitationsController < ApplicationController
     )
   end
 
+  def show
+    invitation = Invitation.includes(:guests).find(params[:id])
+
+    if invitation
+      render json: invitation, only: :id, include: { guests: { only: %i[id name status] } }, status: :ok
+    else
+      render json: { error: 'Invitation not found' }, status: :not_found
+    end
+  end
+
   def create
     invitation = Invitation.create
 

config/routes.rb

@@ -42,7 +42,7 @@ Rails.application.routes.draw do
 
     resources :tables_arrangements, only: %i[index show create]
     resources :summary, only: :index
-    resources :invitations, only: %i[index create update destroy]
+    resources :invitations, only: %i[show index create update destroy]
 
     root to: redirect("/%{slug}")
   end