effective_memberships 0.1.23 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928383b46dabf57a0ee3e4ebed61050c15ddd4d2da01fcc50cec8ead2ded706b
-  data.tar.gz: 2e7b2f5b6e5e75991239f093783ab8a83c6f2b522fa8f5a482c067d04cb122ba
+  metadata.gz: 2f8c32ed9ffd17db6a7c0826bfb9eb72615ec3e7049adbb9f18b99cb8957c905
+  data.tar.gz: 5685ca74db5bd94d757c6a209b135160a015fddd2900ba6d66b55976a495eaa9
 SHA512:
-  metadata.gz: 8cd3faa8139e44db7aa485de820bed35f09b9d8cf8b2d56010cd87bf47515f143b9289362978cc305d63a50d8a24b4b8b9dadaabd240fffcc50abb970e8ac7d4
-  data.tar.gz: ba43e01d4180108144333d61d17f22a4297374db0842c6e33bf7044d381b192883d6813532b5717dca8df778293b065e1a0ba7d07a2c867f2c60b03912520e1e
+  metadata.gz: 9590986cb17a70c70183acfa7a4bf7dbc23959fd9482058737a916f767feedeb77a14444f2b6f1ed9631bb1c4d7d70affaf46e38f879a0af1a6acdc4ac480c94
+  data.tar.gz: 4dc42f6e02b50adad0c8c714ee64e97ef398828a391736db51348fed377ced92784cf116f21f147edec98eea06c365925d4d0efce559001c839d2ad89826e7ca

data/app/controllers/effective/applicants_controller.rb

@@ -16,7 +16,6 @@ module Effective
       end
     end
 
-
     after_save do
       flash.now[:success] = ''
     end

data/app/models/concerns/effective_memberships_owner.rb

@@ -21,6 +21,8 @@ module EffectiveMembershipsOwner
   end
 
   included do
+    acts_as_role_restricted unless respond_to?(:acts_as_role_restricted?)
+
     # App scoped
     has_many :applicants, -> { order(:id) }, inverse_of: :owner, as: :owner
     has_many :fee_payments, -> { order(:id) }, inverse_of: :owner, as: :owner
@@ -57,6 +59,31 @@ module EffectiveMembershipsOwner
     owners || [self]
   end
 
+  # This is the calculated way of determining if an owner is a member or not.
+  # The correct way to check for membership is: current_user.is?(:member)
+  def membership_present?
+    individual_membership_present? || organization_membership_present?
+  end
+
+  def individual_membership_present?
+    membership.present? && !membership.marked_for_destruction?
+  end
+
+  def organization_membership_present?(except: nil)
+    return false unless self.class.respond_to?(:effective_organizations_user?)
+    organizations.any? { |organization| organization != except && organization.membership_present? }
+  end
+
+  def assign_member_role
+    membership_present? ? add_role(:member) : remove_role(:member)
+  end
+
+  # This can be called by a script to recalculate the owner role based on current membership
+  def update_member_role!
+    assign_member_role
+    save!
+  end
+
   def outstanding_fee_payment_owners
     effective_memberships_owners.select { |owner| !owner.membership_fees_paid? }
   end
@@ -230,6 +257,7 @@ module EffectiveMembershipsOwner
     fee
   end
 
+  # Called by the registrar.
   def update_membership_status!
     raise('expected membership to be present') unless membership.present?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -37,7 +37,7 @@ module EffectiveMembershipsRegistrar
     categories = Array(categories)
 
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expecting a membership category') unless categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
+    raise('expecting a membership category') unless categories.present? && categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
 
     # Default Date and next number
     date ||= Time.zone.now
@@ -73,6 +73,9 @@ module EffectiveMembershipsRegistrar
       save!(owner, date: date)
     end
 
+    # Assign member role
+    add_member_role(owner)
+
     owner.update_membership_status!
   end
 
@@ -113,6 +116,9 @@ module EffectiveMembershipsRegistrar
       raise('already has purchased prorated fee') if fee.purchased?
     end
 
+    # Assign member role
+    add_member_role(owner)
+
     # Save owner
     save!(owner, date: date)
   end
@@ -163,6 +169,9 @@ module EffectiveMembershipsRegistrar
     owner.outstanding_fee_payment_fees.each { |fee| fee.mark_for_destruction }
     owner.outstanding_fee_payment_orders.each { |order| order.mark_for_destruction }
 
+    # Remove member role
+    remove_member_role(owner)
+
     save!(owner, date: date)
   end
 
@@ -293,6 +302,34 @@ module EffectiveMembershipsRegistrar
 
   protected
 
+  def add_member_role(owner)
+    owner.add_role(:member)
+
+    if owner.class.respond_to?(:effective_organizations_organization?)
+      organization = owner
+      organization.representatives.each { |representative| representative.user.add_role(:member) }
+    end
+
+    true
+  end
+
+  def remove_member_role(owner)
+    owner.remove_role(:member)
+
+    if owner.class.respond_to?(:effective_organizations_organization?)
+      organization = owner
+
+      organization.representatives.each do |representative|
+        user = representative.user
+        member = user.individual_membership_present? || user.organization_membership_present?(except: organization)
+
+        user.remove_role(:member) if !member
+      end
+    end
+
+    true
+  end
+
   def save!(owner, date: Time.zone.now)
     owner.build_membership_history(start_on: date)
     owner.save!

data/app/models/effective/membership.rb

@@ -58,6 +58,7 @@ module Effective
     validates :number, presence: true, uniqueness: true
     validates :joined_on, presence: true
     validates :registration_on, presence: true
+    validates :membership_categories, presence: true
 
     validate(if: -> { owner.present? }) do
       self.errors.add(:owner_id, 'must be a memberships owner') unless owner.class.effective_memberships_owner?

data/config/effective_memberships.rb

@@ -32,7 +32,7 @@ EffectiveMemberships.setup do |config|
   # config.deliver_method = :deliver_later
 
   # Default layout
-  config.mailer_layout = 'effective_memberships_mailer_layout'
+  # config.mailer_layout = 'effective_memberships_mailer_layout'
 
   # Default From
   config.mailer_sender = "no-reply@example.com"

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.23'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_roles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_organizations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_developer
   requirement: !ruby/object:Gem::Requirement