effective_memberships 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a684e853c8b3b7d6e43291514cc6242c9b1fc480e8523c8c40a0f109774c6a
-  data.tar.gz: 57ce4d9495e7464abd05de9302a69f9bf86ad5fd2e4742e2b978b2fbbe39e079
+  metadata.gz: bced8cc69d7024a32e2c3a659c0b97637bbf3f1d3542f1757079e66e585f3cbb
+  data.tar.gz: 695ba5032274cceb7e0f1d39f7283edf8029032323b51988875afb0149d76759
 SHA512:
-  metadata.gz: 1e1a659ec1fd40c302ebe4212a8c0cb41365fa13415288df965dc7daa3f6525b7237deafb86ca1dfe5ecca6a0f6605190286021227ef6fd2cc1dcea52d51bd03
-  data.tar.gz: 959a2dce5b5f70566226ceef2bfec3f09dfc75182dd5faa02152c032e166d5ce1e1d569b601aa914ff5d1e9bc3534bcbaeb4e2ab9dc28a187b5198ef5bacd417
+  metadata.gz: 07ac154133b57deaa2aeb5eb26af1c2eac572e946e3b407b76715eeae3c8bf4eedb719dd8ed4c5b9a7a3e869a9b0db007dcc177fac88a048ecfa04db822f3954
+  data.tar.gz: 9139022657817e218cf169c6aa97b2eec69c89e8dc2592535f78815135289a15e098184b9a099a217112a4c213058f965cfae2835bcfc6369ba903e0f768f5d1

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -109,6 +109,17 @@ module EffectiveMembershipsFeePayment
     validates :user, presence: true
     validates :period, presence: true
 
+    # Sanity check validations. We should not have more than 1 in progress fee payment at a time
+    validate(if: -> { new_record? && user.present? }) do
+      existing = user.fee_payments.in_progress.first
+      self.errors.add(:base, 'please complete your existing fee payment first') if existing.present?
+    end
+
+    validate(if: -> { new_record? && organization.present? }) do
+      existing = organization.fee_payments.in_progress.first
+      self.errors.add(:base, 'please complete your existing fee payment first') if existing.present?
+    end
+
     # Declarations Step
     with_options(if: -> { current_step == :declarations }) do
       validates :declare_code_of_ethics, acceptance: true

data/app/models/concerns/effective_memberships_owner.rb

@@ -27,10 +27,10 @@ module EffectiveMembershipsOwner
     has_many :orders, -> { order(:id) }, inverse_of: :user, as: :user, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders, reject_if: :all_blank, allow_destroy: true
 
-    has_one :membership, inverse_of: :owner, as: :owner, class_name: 'Effective::Membership'
+    has_one :membership, inverse_of: :owner, as: :owner, class_name: 'Effective::Membership', dependent: :destroy
     accepts_nested_attributes_for :membership
 
-    has_many :membership_histories, -> { Effective::MembershipHistory.sorted }, inverse_of: :owner, as: :owner, class_name: 'Effective::MembershipHistory'
+    has_many :membership_histories, -> { Effective::MembershipHistory.sorted }, inverse_of: :owner, as: :owner, class_name: 'Effective::MembershipHistory', dependent: :delete_all
     accepts_nested_attributes_for :membership_histories
 
     scope :members, -> { joins(:membership) }

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.0'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails