effective_memberships 0.4.2 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 885423c81ffcee648c3ad06826b943ed31f9ed059432e9eda6a55b24a0f07ec0
-  data.tar.gz: 3b7c8ed91242b0cd0648cdca9f5e9b70af40bc5f7be7fb3ad585dfbe147c7909
+  metadata.gz: 940bfa04e965ae36e054add85ac673260b5fa11f2ff3939ec0f00a3732b6bba1
+  data.tar.gz: c3d94b16860a507b64e75bc7b156e6ce96f79845e5561a25a52ae48c57f3951b
 SHA512:
-  metadata.gz: 57654df20abfb3444de50023ea70cc011a28254ac8e986b54b158dc171fffb5c49c4b560128fe6d9ca937fb5f143031c4d4e3eaa372a12cede3968e476de1dfe
-  data.tar.gz: b15c8258ebfbeb653bf4cf5745ef0f63ded375c4326ed32ac5050f6adb7a4d92d6c79d35e914b288d1dbad70f0547e912379783224ef0b737bb6923f334c6029
+  metadata.gz: 81ba80b0314968331c9bc85a2a021be327780daf44854379f52f4f9f64d8e6c0a3b816871129610b953d2b6d29f8eca22aa4699cc5fc5aceee3fbf86b72e87e2
+  data.tar.gz: 7671e32ba29f5540b90bbd250e5f78503033af257702a01caccfb93064c5e8a111e95cff7212f64c7b0ef2d0d8872131b76cef7ee10a800700f157fd3e8258d1

data/app/controllers/effective/applicant_references_controller.rb

@@ -25,7 +25,7 @@ module Effective
     def permitted_params
       permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
 
-      if current_user && current_user.effective_memberships_owners.include?(resource.applicant&.owner)
+      if current_user && current_user.memberships_owners.include?(resource.applicant&.owner)
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)
       else
         permitted

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -48,7 +48,7 @@ module Admin
       end
 
       if attributes[:user_id].present?
-        applicants = applicants.where(user_id: attributes[:owner_id])
+        applicants = applicants.where(user_id: attributes[:user_id])
       end
 
       if attributes[:organization_id].present?

data/app/datatables/admin/effective_categories_datatable.rb

@@ -17,6 +17,10 @@ module Admin
       col :tax_exempt
       col :qb_item_name, visible: false
 
+      col :create_renewal_fees, visible: false
+      col :create_late_fees, visible: false
+      col :create_bad_standing, visible: false
+
       col :category_type, search: EffectiveMemberships.Category.category_types
 
       col :optional_applicant_wizard_steps, label: 'Applicant Steps'

data/app/models/concerns/effective_memberships_category.rb

@@ -110,11 +110,6 @@ module EffectiveMembershipsCategory
       .or(where(can_apply_restricted: true))
     }
 
-    # For the create_fees rake task
-    scope :create_renewal_fees, -> { where(create_renewal_fees: true) }
-    scope :create_late_fees, -> { where(create_late_fees: true) }
-    scope :create_bad_standing, -> { where(create_bad_standing: true) }
-
     validates :title, presence: true, uniqueness: true
     validates :category_type, presence: true
     validates :position, presence: true

data/app/models/concerns/effective_memberships_owner.rb

@@ -160,9 +160,21 @@ module EffectiveMembershipsOwner
     fee
   end
 
+  # These should be singular fees anyway.
+  def membership_period_fee(category:, period:, except: nil)
+    raise('expected except to be a string like Renewal') if except.present? && !except.kind_of?(String)
+    fees.find { |fee| fee.membership_period_fee? && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name && (except.blank? || fee.fee_type != except) }
+  end
+
   def build_renewal_fee(category:, period:, late_on: nil, bad_standing_on: nil)
     raise('must have an existing membership') unless membership.present?
 
+    # Sanity check.
+    # If there's already a purchased or unpurchased Prorated (or other membership period advancing fee) in this period
+    # We shouldn't be building renewal fees for the same period a prorated fee is purcahsed in
+    prorated = membership_period_fee(category: category, period: period, except: 'Renewal')
+    raise('must not have an existing membership_period (prorated) fee in this period') if prorated.present?
+
     fee = fees.find { |fee| fee.fee_type == 'Renewal' && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name }
     return fee if fee&.purchased?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -33,6 +33,15 @@ module EffectiveMembershipsRegistrar
     raise('to be implemented by app registrar')
   end
 
+  # Should two could be overridden if we do non 1-year periods
+  def advance_period(period:, number:)
+    period.advance(years: number).beginning_of_year
+  end
+
+  def period_end_on(date:)
+    period(date: date).end_of_year
+  end
+
   def assign!(owner, categories:, date: nil, number: nil)
     categories = Array(categories)
 
@@ -243,18 +252,41 @@ module EffectiveMembershipsRegistrar
     period(date: Time.zone.now)
   end
 
+  def last_period
+    advance_period(period: current_period, number: -1)
+  end
+
   # Returns a date of Jan 1, Year
   def period(date:)
     cutoff = renewal_fee_date(date: date) # period_end_on
-    period = (date < cutoff) ? date.beginning_of_year : date.advance(years: 1).beginning_of_year
+    period = (date < cutoff) ? advance_period(period: date, number: 0) : advance_period(period: date, number: 1)
     period.to_date
   end
 
-  def period_end_on(date:)
-    period(date: date).end_of_year
+  # This is only used for a form collection on admin memberships
+  def periods(from:, to: nil)
+    to ||= Time.zone.now
+
+    raise('expected to date') unless to.respond_to?(:strftime)
+    raise('expected from date') unless from.respond_to?(:strftime)
+
+    from = period(date: from)
+    to = period(date: to)
+
+    retval = []
+
+    loop do
+      retval << from
+      from = advance_period(period: from, number: 1)
+      break if from > to
+    end
+
+    retval
   end
 
+
   # This is intended to be run once per day in a rake task
+  # rake effective_memberships:create_fees
   # Create Renewal and Late fees
   def create_fees!(period: nil, late_on: nil, bad_standing_on: nil)
     # The current period, based on Time.zone.now
@@ -263,13 +295,17 @@ module EffectiveMembershipsRegistrar
     bad_standing_on ||= bad_standing_date(period: period)
 
     # Create Renewal Fees
-    Effective::Membership.create_renewal_fees(period).find_each do |membership|
-
+    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
       membership.categories.select(&:create_renewal_fees?).map do |category|
+        existing = membership.owner.membership_period_fee(category: category, period: period, except: 'Renewal')
+        next if existing.present? # This might be an existing Prorated fee
+
         fee = membership.owner.build_renewal_fee(category: category, period: period, late_on: late_on, bad_standing_on: bad_standing_on)
         raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
         next if fee.purchased?
 
+        puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
+
         fee.save!
       end
     end
@@ -277,7 +313,7 @@ module EffectiveMembershipsRegistrar
     GC.start
 
     # Create Late Fees
-    Effective::Membership.create_late_fees(period).find_each do |membership|
+    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
       membership.categories.select(&:create_late_fees?).map do |category|
         fee = membership.owner.build_late_fee(category: category, period: period)
         next if fee.blank? || fee.purchased?

data/app/models/effective/membership.rb

@@ -42,18 +42,6 @@ module Effective
       .or(where(fees_paid_period: nil))
     }
 
-    scope :create_renewal_fees, -> (period = nil) {
-      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-    }
-
-    scope :create_late_fees, -> (period = nil) {
-      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-    }
-
-    scope :create_bad_standing, -> (period = nil) {
-      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-    }
-
     before_validation do
       self.registration_on ||= joined_on
     end
@@ -134,5 +122,18 @@ module Effective
       fees_paid_period == EffectiveMemberships.Registrar.current_period
     end
 
+    def change_fees_paid_period
+      fees_paid_period
+    end
+
+    def change_fees_paid_period=(date)
+      date = (date.respond_to?(:strftime) ? date : Date.parse(date))
+
+      period = EffectiveMemberships.Registrar.period(date: date)
+      period_end_on = EffectiveMemberships.Registrar.period_end_on(date: date)
+
+      assign_attributes(fees_paid_period: period, fees_paid_through_period: period_end_on)
+    end
+
   end
 end

data/app/views/admin/memberships/_form_membership.html.haml

@@ -17,6 +17,12 @@
     = f.date_field :registration_on, label: 'Registered', hint: 'When the membership category last changed'
     = f.text_field :number, hint: 'The membership number. Must be unique.'
 
+    - registrar = EffectiveMemberships.Registrar
+    - periods = registrar.periods(from: f.object.joined_on)
+    - collection = periods.reverse.map { |period| [registrar.period_end_on(date: period), period] }
+
+    = f.select :change_fees_paid_period, collection, label: 'Fees Paid Through', hint: 'Which period this user has fees paid through. Can change how renewal fees are created.'
+
     %p.text-muted To update the current membership categories, use the 'Assign' or 'Reclassify' actions below
 
     = f.submit 'Update Membership', border: false, center: true, 'data-confirm': "Really update #{f.object.owner}?"

data/app/views/effective/membership_cards/index.html.haml

@@ -1,4 +1,4 @@
-- owners = current_user.effective_memberships_owners
+- owners = current_user.memberships_owners
 
 - owners.each do |owner|
   - membership = owner.membership

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.2'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails