effective_memberships 0.2.5 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5349de013b96f392cd5d9965a55fc8348656aed3a20b9c2798538454286368cd
-  data.tar.gz: 1f04f3dfd643b060a48919a00705255590439632fa4afd03925c0b1abe6ab324
+  metadata.gz: 0bc312d4be0f593086ccda4c567644f539f733dc019e1580f7b79c82a20343d1
+  data.tar.gz: 5607e8a5cc0223e5e5c80856b2ee7227d8da9d5799e34da85d3d6c5f6fb22018
 SHA512:
-  metadata.gz: 1a9056129fa56370cf1dd1b9324b1f2581f81b3952f801f3509e60d68de68da6c65c7cf3a898bfd525d9e4a5ad3b648088e2e5218ead9448288bd67a9daf783e
-  data.tar.gz: 0f75e5e23b53188eb83524190ad4fc7292bddb7af3faf349207074a3bc0b4da660ea41415392933c851843d1c57b1eafa43127fd3c6f9ac2dfeca5f43fe5f303
+  metadata.gz: c8fd4647fa682ceaf5db08536bc1f709f21a4312d42e979500850350f79ee235dd83e4d490417521b7e456f910ad418d0ae70988fd09197dd2e8b240393e612d
+  data.tar.gz: 5c864a7bc2a30b7a7cc0d63faddc185a914f295a61b67f58f92899ad1328278d3f9ddbecb115e4517e9b2f292322c9c8010db3b89992ecd6bb9d81cb8cf339c5

data/app/models/concerns/effective_memberships_applicant.rb

@@ -77,26 +77,26 @@ 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, inverse_of: :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, inverse_of: :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, inverse_of: :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, inverse_of: :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, inverse_of: :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
+    has_many :fees, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Fee', dependent: :nullify
     accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
 
-    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
+    has_many :orders, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders
 
     effective_resource do
@@ -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.5'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.2
 platform: ruby
 authors:
 - Code and Effect