effective_memberships 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0eef9b0e1ee657cc1d68ba1bdadde44e3f89b8002889512a62f99ba77fba756
-  data.tar.gz: 0a08d2d2352e7b6a1fa1bd67ae66b99706e278c85b08eee75ef3d2e4aae8eab6
+  metadata.gz: 259907d1e85043159bf1f3000ee1d6b9d856b422b8cc8e6164045c5a7513142a
+  data.tar.gz: f0f0b98543ee1e1cbd20ea53749a9ca2d479798d7374ee992815af8d9b2800e2
 SHA512:
-  metadata.gz: db209b01ffdbe5b9071e05b7df946c72454b8edfd19833e3cb393261beed6336c65345d7133e3da3406c190e16e87612f3064e412a7bc7023191be17cfbe2691
-  data.tar.gz: f3dcfabe8a98ccae4109166398356127fb6a860d3896966681604f119fdd4b830870ae9a2f808c8fdd6a4a3be7bbbb0ba442bc8a2acb5b0e692921164f6a47a2
+  metadata.gz: f4b7d38ee4af24942eed3d80c66cb62ba47850616b620cd24351ff9f860bcc3ef4ee3fa66e3d54a128790694c2c85798fa57282602b24914fc4df7810d8785dd
+  data.tar.gz: 18111c8718b33ca1253ee82b706195cc5cccde005ca07a5f102c30c6588e1bbb6dde7a7387037ba888b4d516ec15e41e0845257ddaa1635fcd329aafb090491a

data/app/controllers/effective/applicants_controller.rb

@@ -6,29 +6,5 @@ module Effective
 
     resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners) }
 
-    # Allow only 1 in-progress application at a time
-    before_action(only: [:new, :show], unless: -> { resource&.done? }) do
-      existing = resource_scope.in_progress.where.not(id: resource).first
-
-      if existing.present?
-        flash[:success] = "You have been redirected to your existing in progress application"
-        redirect_to effective_memberships.applicant_build_path(existing, existing.next_step)
-      end
-    end
-
-    after_save do
-      flash.now[:success] = ''
-    end
-
-    private
-
-    def permitted_params
-      params.require(:applicant).permit!.except(
-        :owner_id, :owner_type, :status, :status_steps, :wizard_steps,
-        :submitted_at, :completed_at, :reviewed_at, :approved_at,
-        :declined_at, :declined_reason, :created_at, :updated_at
-      )
-    end
-
   end
 end

data/app/controllers/effective/fee_payments_controller.rb

@@ -6,27 +6,5 @@ module Effective
 
     resource_scope -> { EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owners) }
 
-    # Allow only 1 in-progress fee payment at a time
-    before_action(only: [:new, :show], unless: -> { resource&.done? }) do
-      existing = resource_scope.in_progress.where.not(id: resource).first
-
-      if existing.present?
-        flash[:success] = "You have been redirected to your existing in progress fee payment"
-        redirect_to effective_memberships.fee_payment_build_path(existing, existing.next_step)
-      end
-    end
-
-    after_save do
-      flash.now[:success] = ''
-    end
-
-    private
-
-    def permitted_params
-      params.require(:fee_payment).permit!.except(
-        :status, :status_steps, :wizard_steps, :submitted_at
-      )
-    end
-
   end
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -77,20 +77,20 @@ module EffectiveMembershipsApplicant
     belongs_to :category, polymorphic: true, optional: true
     belongs_to :from_category, polymorphic: true, optional: true
 
-    has_many :applicant_reviews, -> { order(:id) }, inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_reviews, -> { order(:id) }, as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_reviews, reject_if: :all_blank, allow_destroy: true
 
     # Effective Namespace
-    has_many :applicant_courses, -> { order(:id) }, class_name: 'Effective::ApplicantCourse', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_courses, -> { order(:id) }, class_name: 'Effective::ApplicantCourse', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_courses, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_educations, -> { order(:id) }, class_name: 'Effective::ApplicantEducation', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_educations, -> { order(:id) }, class_name: 'Effective::ApplicantEducation', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_educations, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_experiences, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_references, reject_if: :all_blank, allow_destroy: true
 
     has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
@@ -312,13 +312,15 @@ module EffectiveMembershipsApplicant
       raise('already submitted') if was_submitted?
       raise('expected a purchased order') unless submit_order&.purchased?
 
+      wizard_steps[:checkout] ||= Time.zone.now
+      wizard_steps[:submitted] = Time.zone.now
+      submitted!
+
       after_commit do
         applicant_references.each { |reference| reference.notify! if reference.submitted? }
       end
 
-      wizard_steps[:checkout] ||= Time.zone.now
-      wizard_steps[:submitted] = Time.zone.now
-      submitted!
+      true
     end
 
   end
@@ -526,9 +528,10 @@ module EffectiveMembershipsApplicant
       raise('unsupported approval applicant_type')
     end
 
-    after_commit { send_email(:applicant_approved) }
-
     save!
+
+    after_commit { send_email(:applicant_approved) }
+    true
   end
 
   # Admin approves an applicant. Registers the owner. Sends an email.
@@ -542,9 +545,10 @@ module EffectiveMembershipsApplicant
     wizard_steps[:submitted] ||= Time.zone.now
     declined!
 
-    after_commit { send_email(:applicant_declined) }
-
     save!
+
+    after_commit { send_email(:applicant_declined) }
+    true
   end
 
   private

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -109,30 +109,33 @@ module EffectiveMembershipsApplicantReview
     end
 
     def conflict_of_interest!
-      after_commit { send_email(:applicant_review_conflict_of_interest) }
-
       update!(conflict_of_interest: true, recommendation: nil)
       conflicted!
 
       applicant.save!
+
+      after_commit { send_email(:applicant_review_conflict_of_interest) }
+      true
     end
 
     def accept!
-      after_commit { send_email(:applicant_review_completed) }
-
       assign_attributes(recommendation: 'Accept')
       accepted!
 
       applicant.save!
-    end
 
-    def reject!
       after_commit { send_email(:applicant_review_completed) }
+      true
+    end
 
+    def reject!
       assign_attributes(recommendation: 'Reject')
       rejected!
 
       applicant.save!
+
+      after_commit { send_email(:applicant_review_completed) }
+      true
     end
 
     private

data/app/models/effective/applicant_course.rb

@@ -4,8 +4,8 @@ module Effective
 
     belongs_to :applicant_course_area
 
+    belongs_to :applicant, polymorphic: true, optional: true
     belongs_to :applicant_course_name, optional: true
-    belongs_to :applicant, optional: true
 
     effective_resource do
       title          :string
@@ -17,7 +17,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant_course_area, :applicant_course_name, :applicant) }
+    scope :deep, -> { includes(:applicant_course_area, :applicant_course_name) }
     scope :sorted, -> { order(:title) }
 
     before_validation(if: -> { applicant_course_name.present? }) do

data/app/models/effective/applicant_education.rb

@@ -1,6 +1,6 @@
 module Effective
   class ApplicantEducation < ActiveRecord::Base
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
@@ -16,7 +16,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant) }
+    scope :deep, -> { all }
 
     validates :start_on, presence: true
     validates :end_on, presence: true

data/app/models/effective/applicant_experience.rb

@@ -1,6 +1,6 @@
 module Effective
   class ApplicantExperience < ActiveRecord::Base
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
@@ -25,7 +25,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant) }
+    scope :deep, -> { all }
 
     before_validation(if: -> { start_on.present? && end_on.present? }) do
       self.months ||= ((end_on - start_on) / 1.month).to_i

data/app/models/effective/applicant_reference.rb

@@ -5,7 +5,7 @@ module Effective
     acts_as_statused :submitted, :completed
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     KNOWNS = ['6 months - 1 year', '1 year - 2 years', '2 - 5 years', '5 - 10 years', 'More than 10 years']
     RELATIONSHIPS = ['Supervisor', 'Employer', 'Colleague', 'Other']
@@ -38,7 +38,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant) }
+    scope :deep, -> { all }
 
     # All step validations
     validates :applicant, presence: true

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -172,6 +172,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Educations
     create_table :applicant_educations do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.date :start_on
       t.date :end_on
@@ -191,6 +192,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Experiences
     create_table :applicant_experiences do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string :level
       t.integer :months
@@ -216,6 +218,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant References
     create_table :applicant_references do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string :name
       t.string :email
@@ -264,7 +267,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     create_table :applicant_courses do |t|
       t.integer :applicant_course_area_id
       t.integer :applicant_course_name_id
+
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string  :title
       t.integer :amount
@@ -279,7 +284,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Reviews
     create_table :applicant_reviews do |t|
       t.string :token
+
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.integer :reviewer_id
       t.string :reviewer_type

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.2.4'
+  VERSION = '0.3.1'
 end

metadata

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