Refactor event invitation handling and improve specs

- Commented out authentication skip in InvitationsController.
- Added token generation validation in EventInvitation model.
- Made invitee association optional in Invitation model.
- Created factory for event invitations with necessary traits.
- Updated event invitations specs to use the new factory and improved setup.
- Removed unnecessary setup in metrics track share job spec.

Author: rsmithlal

app/controllers/better_together/invitations_controller.rb

@@ -2,7 +2,7 @@
 
 module BetterTogether
   class InvitationsController < ApplicationController # rubocop:todo Style/Documentation
-    skip_before_action :authenticate_user!
+    # skip_before_action :authenticate_user!
     before_action :find_invitation_by_token
 
     def show
@@ -40,7 +40,15 @@ def decline
       else
         @invitation.update!(status: 'declined')
       end
-      redirect_to root_path(locale: I18n.locale),
+
+      # For event invitations, redirect to the event. Otherwise use root path.
+      redirect_path = if @invitation.respond_to?(:event) && @invitation.event
+                        polymorphic_path(@invitation.invitable)
+                      else
+                        root_path(locale: I18n.locale)
+                      end
+
+      redirect_to redirect_path,
                   notice: t('flash.generic.updated', resource: t('resources.invitation'))
     end
 

app/models/better_together/event_invitation.rb

@@ -14,6 +14,9 @@ class EventInvitation < Invitation
     validates :locale, presence: true, inclusion: { in: I18n.available_locales.map(&:to_s) }
     validate :invitee_presence
 
+    # Ensure token is generated before validation
+    before_validation :ensure_token_present
+
     # Convenience helpers (invitable is the event)
     def event
       invitable
@@ -45,6 +48,12 @@ def url_for_review
 
     private
 
+    def ensure_token_present
+      return if token.present?
+
+      self.token = self.class.generate_unique_secure_token
+    end
+
     def resolve_invitee_person
       return invitee if invitee.is_a?(BetterTogether::Person)
 

app/models/better_together/invitation.rb

@@ -10,7 +10,8 @@ class Invitation < ApplicationRecord
     belongs_to :inviter,
                polymorphic: true
     belongs_to :invitee,
-               polymorphic: true
+               polymorphic: true,
+               optional: true
     belongs_to :role,
                optional: true
 

spec/factories/better_together/event_invitations.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory 'better_together/event_invitation',
+          class: 'BetterTogether::EventInvitation',
+          aliases: %i[better_together_event_invitation event_invitation] do
+    id { SecureRandom.uuid }
+    lock_version { 0 }
+    invitee_email { Faker::Internet.email }
+    status { 'pending' }
+    locale { I18n.available_locales.sample.to_s }
+    valid_from { Time.zone.now }
+    valid_until { valid_from + 7.days } # Optional expiry
+
+    # Required associations for Invitation base class
+    association :invitable, factory: :better_together_event
+    association :inviter, factory: :better_together_person
+
+    # Optional associations - invitee is nil for email-based invitations
+    invitee { nil }
+    role { nil } # Optional role assignment
+
+    # The token should be auto-generated by has_secure_token in the model
+
+    trait :expired do
+      valid_until { 1.day.ago }
+    end
+
+    trait :accepted do
+      status { 'accepted' }
+      accepted_at { Time.current }
+    end
+
+    trait :declined do
+      status { 'declined' }
+    end
+
+    trait :with_invitee do
+      association :invitee, factory: :better_together_person
+    end
+  end
+end

spec/features/agreements/create_spec.rb

@@ -3,11 +3,11 @@
 require 'rails_helper'
 
 RSpec.describe 'managing agreements', :as_platform_manager do
-  before do
-    fill_in 'agreement[title_en]', with: 'Test Agreement'
-    select 'Public', from: 'agreement[privacy]'
-    click_button 'Create Agreement'
-  end
+  # before do
+  #   fill_in 'agreement[title_en]', with: 'Test Agreement'
+  #   select 'Public', from: 'agreement[privacy]'
+  #   click_button 'Create Agreement'
+  # end
 
   scenario 'agreement appears on index' do
     create(:agreement, title: 'Existing Agreement', slug: 'existing-agreement', privacy: 'public')

spec/features/devise/registration_spec.rb

@@ -5,7 +5,6 @@
 # rubocop:disable Metrics/BlockLength
 RSpec.feature 'User Registration' do # rubocop:todo RSpec/MultipleMemoizedHelpers
   # Ensure you have a valid user created; using FactoryBot here
-  let!(:host_platform) { create(:better_together_platform, :host) } # rubocop:todo RSpec/LetSetup
   let!(:host_setup_wizard) do
     BetterTogether::Wizard.find_or_create_by(identifier: 'host_setup')
   end

spec/requests/better_together/event_invitations_spec.rb

@@ -4,12 +4,14 @@
 
 RSpec.describe 'Event Invitations', :as_platform_manager do
   let(:locale) { I18n.default_locale }
+  let!(:manager_user) { BetterTogether::User.find_by(email: '[email protected]') }
   let!(:event) do
     BetterTogether::Event.create!(
       name: 'Neighborhood Clean-up',
       starts_at: 1.day.from_now,
       identifier: SecureRandom.uuid,
-      privacy: 'public'
+      privacy: 'public',
+      creator: manager_user.person
     )
   end
 
@@ -36,14 +38,12 @@
     end
 
     it 'returns not found for expired token' do # rubocop:todo RSpec/ExampleLength
-      invitation = BetterTogether::EventInvitation.create!(
-        invitable: event,
-        inviter: BetterTogether::Person.first || create(:better_together_person),
-        status: 'pending',
-        invitee_email: '[email protected]',
-        valid_from: 2.days.ago,
-        valid_until: 1.day.ago
-      )
+      invitation = create(:better_together_event_invitation,
+                          invitable: event,
+                          invitee_email: '[email protected]',
+                          status: 'pending',
+                          valid_from: 2.days.ago,
+                          valid_until: 1.day.ago)
 
       get better_together.invitation_path(invitation.token, locale: locale)
       expect(response).to have_http_status(:not_found)
@@ -54,14 +54,12 @@
     # rubocop:todo RSpec/MultipleExpectations
     it 'does not update last_sent within 15 minutes' do # rubocop:todo RSpec/ExampleLength, RSpec/MultipleExpectations
       # rubocop:enable RSpec/MultipleExpectations
-      invitation = BetterTogether::EventInvitation.create!(
-        invitable: event,
-        inviter: BetterTogether::Person.first || create(:better_together_person),
-        status: 'pending',
-        invitee_email: '[email protected]',
-        valid_from: Time.current,
-        last_sent: Time.current
-      )
+      invitation = create(:better_together_event_invitation,
+                          invitable: event,
+                          invitee_email: '[email protected]',
+                          status: 'pending',
+                          valid_from: Time.current,
+                          last_sent: Time.current)
 
       put better_together.resend_event_invitation_path(event, invitation, locale: locale)
       expect(response).to have_http_status(:found)
@@ -73,17 +71,18 @@
     # rubocop:todo RSpec/MultipleExpectations
     it 'marks accepted and creates attendance' do # rubocop:todo RSpec/ExampleLength, RSpec/MultipleExpectations
       # rubocop:enable RSpec/MultipleExpectations
-      invitation = BetterTogether::EventInvitation.create!(
-        invitable: event,
-        inviter: BetterTogether::Person.first || create(:better_together_person),
-        status: 'pending',
-        invitee_email: '[email protected]',
-        valid_from: Time.current
-      )
+      invitation = create(:better_together_event_invitation,
+                          invitable: event,
+                          invitee_email: '[email protected]',
+                          status: 'pending',
+                          valid_from: Time.current)
 
       # Ensure user exists and logged in as regular user
       user = BetterTogether::User.find_by(email: '[email protected]') ||
              create(:better_together_user, :confirmed, email: '[email protected]', password: 'password12345')
+
+      # Clear any existing session and login as the specific user
+      logout if respond_to?(:logout)
       login(user.email, 'password12345')
 
       post better_together.accept_invitation_path(invitation.token, locale: locale)
@@ -99,19 +98,21 @@
     # rubocop:todo RSpec/MultipleExpectations
     it 'marks declined' do # rubocop:todo RSpec/ExampleLength, RSpec/MultipleExpectations
       # rubocop:enable RSpec/MultipleExpectations
-      invitation = BetterTogether::EventInvitation.create!(
-        invitable: event,
-        inviter: BetterTogether::Person.first || create(:better_together_person),
-        status: 'pending',
-        invitee_email: '[email protected]',
-        valid_from: Time.current
-      )
+      invitation = create(:better_together_event_invitation,
+                          invitable: event,
+                          invitee_email: '[email protected]',
+                          status: 'pending',
+                          valid_from: Time.current)
 
       user = BetterTogether::User.find_by(email: '[email protected]') ||
              create(:better_together_user, :confirmed, email: '[email protected]', password: 'password12345')
+
+      # Clear any existing session and login as the specific user
+      logout if respond_to?(:logout)
       login(user.email, 'password12345')
 
       post better_together.decline_invitation_path(invitation.token, locale: locale)
+
       expect(response).to have_http_status(:found)
       expect(invitation.reload.status).to eq('declined')
     end

spec/requests/better_together/metrics_track_share_job_spec.rb

@@ -3,13 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe BetterTogether::Metrics::SharesController do # rubocop:todo RSpec/SpecFilePathFormat
-  include RequestSpecHelper
   include ActiveJob::TestHelper
 
-  before do
-    configure_host_platform
-  end
-
   let(:page) { create(:page) }
   let(:url) { 'https://example.org/somewhere' }