effective_mentorships 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51540f932b6939477810dbc83ca434c9a1f645e02ad8ce1bdfbf6ecf97254dbc
-  data.tar.gz: 5561bd5faa4e649f72702f9f861ca0571c47f92f6a719d866e64aead6ccf500d
+  metadata.gz: 945b289d8db3d3677c664afe604a39f8def52d09a0aa7d29adebfcd655a6cb89
+  data.tar.gz: 497b103498c79371700c455440edf05a37f04b37bcf9f076f3e222cc13abc10a
 SHA512:
-  metadata.gz: 42f67c456e342f4abf4be9983246c6d01172db3e9a4bb36980c597a74153dc401bb3ac3e8056e94982b6344e5e90e98506c91e215e979451e0fa4f0cb00b8c1a
-  data.tar.gz: 6575760097d8daf6fe4160313eee73eb7c180464cdeaa16a910b5107b7e69be4cce7295c7b5a6c22f44778aa53a0af69639123be69f4850daf9220ca9970a89e
+  metadata.gz: 7a33123dce1938db8df87d14bba03791d4c92ddf3ca9e1446dd70c041016d2c0aba1eafc84357af750e50a65931d15d07b46571204359304a3860a246f0ee588
+  data.tar.gz: fde52709889007242daf8b59ef0789d2a019ba3c2a1a81493d81a663950b99268abca7f3c1e9a8a6b028292c57b4885fecfeda4f5c7e9ec16e72f496e06844e2

data/app/models/concerns/effective_mentorships_user.rb

@@ -29,6 +29,7 @@ module EffectiveMentorshipsUser
     scope :deep_effective_mentorships_user, -> { all }
 
     scope :mentorships_opted_in, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
       raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
 
       opted_in = EffectiveMentorships.MentorshipRegistration.opt_in.where(mentorship_cycle: mentorship_cycle)
@@ -36,6 +37,7 @@ module EffectiveMentorshipsUser
     }
 
     scope :mentorships_opted_out, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
       raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
 
       opted_out = EffectiveMentorships.MentorshipRegistration.opt_out.where(mentorship_cycle: mentorship_cycle)
@@ -43,6 +45,7 @@ module EffectiveMentorshipsUser
     }
 
     scope :mentorships_opted_in_mentors, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
       raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
 
       opted_in_mentors = EffectiveMentorships.MentorshipRegistration.opt_in.mentors.where(mentorship_cycle: mentorship_cycle)
@@ -50,6 +53,7 @@ module EffectiveMentorshipsUser
     }
 
     scope :mentorships_opted_in_mentees, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
       raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
 
       opted_in_mentees = EffectiveMentorships.MentorshipRegistration.opt_in.mentees.where(mentorship_cycle: mentorship_cycle)
@@ -57,6 +61,7 @@ module EffectiveMentorshipsUser
     }
 
     scope :mentorships_with_groups, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
       raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
 
       grouped = Effective::MentorshipGroupUser.where(mentorship_cycle: mentorship_cycle)
@@ -64,11 +69,40 @@ module EffectiveMentorshipsUser
     }
 
     scope :mentorships_without_groups, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
       raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
 
       grouped = Effective::MentorshipGroupUser.where(mentorship_cycle: mentorship_cycle)
       where.not(id: grouped.select(:user_id))
     }
+
+    scope :mentorships_mentors_with_groups, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
+      raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
+
+      grouped = Effective::MentorshipGroupUser.mentors.where(mentorship_cycle: mentorship_cycle)
+      where(id: grouped.select(:user_id))
+    }
+
+    scope :mentorships_mentees_with_groups, -> (mentorship_cycle) {
+      mentorship_cycle = Effective::MentorshipCycle.find(mentorship_cycle) if mentorship_cycle.kind_of?(Integer)
+      raise('expected an EffectiveMentorships.MentorshipCycle') unless mentorship_cycle.kind_of?(Effective::MentorshipCycle)
+
+      grouped = Effective::MentorshipGroupUser.mentees.where(mentorship_cycle: mentorship_cycle)
+      where(id: grouped.select(:user_id))
+    }
+
+    scope :mentorships_participant_in_mentorship_cycle_id, -> (membership_cycle_id) {
+      mentorships_with_groups(membership_cycle_id)
+    }
+
+    scope :mentorships_mentor_in_mentorship_cycle_id, -> (membership_cycle_id) {
+      mentorships_mentors_with_groups(membership_cycle_id)
+    }
+
+    scope :mentorships_mentee_in_mentorship_cycle_id, -> (membership_cycle_id) {
+      mentorships_mentees_with_groups(membership_cycle_id)
+    }
   end
 
   # Used for the dashboard datatables. Which cycles can we register for?

data/app/models/effective/mentorship_group_user.rb

@@ -25,6 +25,9 @@ module Effective
     scope :deep, -> { includes(:mentorship_cycle, :mentorship_group, :user) }
     scope :sorted, -> { order(:mentorship_cycle_id).order(:position) }
 
+    scope :mentors, -> { where(mentorship_role: 'mentor') }
+    scope :mentees, -> { where(mentorship_role: 'mentee') }
+
     # Assign position and cycle
     before_validation(if: -> { mentorship_group.present? }) do
       self.position ||= (mentorship_group.mentorship_group_users.map(&:position).compact.max || -1) + 1

data/config/routes.rb

@@ -13,7 +13,7 @@ EffectiveMentorships::Engine.routes.draw do
 
   namespace :admin do
     resources :mentorship_cycles, except: [:show]
-    resources :mentorship_registrations, only: [:index, :edit, :update, :delete]
+    resources :mentorship_registrations, except: [:show]
 
     resources :mentorship_bulk_groups, only: [:index, :new, :show, :destroy] do
       resources :build, controller: :mentorship_bulk_groups, only: [:show, :update]

data/lib/effective_mentorships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMentorships
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

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