effective_events 0.22.1 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4ffee3a1a64a15a48d9e7ff3ce8eecd6b8f5759fccb0c886e9f943fd42f919
-  data.tar.gz: c184b3851caea22f826b685c4fc2a0db174f1b99a218f59deeb1edaad7a90694
+  metadata.gz: f3b9faa624904b433109451d6e7a064141af823256bc6482091e3edfe5cfe877
+  data.tar.gz: a55f320e5007311f0c53ab662642b5192b6f9310fdb40e8171f6f6119d0546e7
 SHA512:
-  metadata.gz: 729e826bfdbe9b0287a87b00f2168791c7b861feb2cbd10e678706ea83876d1bdd638f6e6e18c90b8795bf9058b65c8c2396dda7e47901bfe5962e4071678fe7
-  data.tar.gz: acf5fc1714ad5b37e9ebf9b0aa56dc3eaf83129059d54a5a9cf16da2edb4f2127cb35ca317d521e14fb171717ba2d95851fb7ea7b17aa1df6c81ec041dbf0caf
+  metadata.gz: e26a9f437b4f21a3a74f6fa666cb602927ecdd22334ea1151761cbc750b6fafa0aefc6f6fc4b616b8b84742aa62359eeb351d79b74656c5bdaea9db4bf423608
+  data.tar.gz: c7e80b197ccb38b79f9f5f21c5c63247b259a0e728aea20dd148d6b78cee077983f764f9740d8aaf7fa04a4363836009ded9f764a970f64ec53c615640d2f0c2

data/app/models/concerns/effective_events_event_registration.rb

@@ -141,6 +141,18 @@ module EffectiveEventsEventRegistration
       end
     end
 
+    # Validate the same registrant user isn't registered on another registration
+    validate(if: -> { current_step == :details }) do
+      present_event_registrants.select { |er| er.user.present? }.each do |er|
+        existing = Effective::EventRegistrant.unarchived.registered.where(event_ticket: er.event_ticket, user: er.user).where.not(id: er)
+
+        if existing.present?
+          errors.add(:base, "Unable to register #{er.user} for #{er.event_ticket}. They've already been registered")
+          er.errors.add(:user_id, "Unable to register #{er.user} for #{er.event_ticket}. They've already been registered")
+        end
+      end
+    end
+
     # Validate all products are available for registration
     validate(if: -> { current_step == :addons }) do
       unavailable_event_products.each do |event_product|

data/app/models/effective/event_registrant.rb

@@ -114,9 +114,6 @@ module Effective
     validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
     validates :email, email: true
 
-    # This works for persisted and adding a new one. But not adding two at same time in a registration
-    validates :user_id, uniqueness: { scope: [:event_ticket_id], allow_blank: true, message: 'is already registered for this event ticket' }
-
     # First name, last name and email are always required fields on details
     validates :first_name, presence: true, if: -> { registrant_validations_enabled? }
     validates :last_name, presence: true, if: -> { registrant_validations_enabled? }

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.22.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2
 platform: ruby
 authors:
 - Code and Effect