Assign mentor to club when joining team

app/controllers/mentor/mentor_invites_controller.rb

@@ -28,11 +28,11 @@ def update
 
         invite.update(invite_params)
 
-        student_chapters = invite.team.students.flat_map { |s| s.account.current_chapter }.uniq
+        student_chapterables = invite.team.students.flat_map { |s| s.account.current_chapterable_assignment&.chapterable }.uniq
 
-        student_chapters.each do |chapter|
-          if chapter.present?
-            chapter.chapter_account_assignments.create(
+        student_chapterables.each do |chapterable|
+          if chapterable.present?
+            chapterable.chapterable_account_assignments.create(
               profile: current_mentor,
               account: current_mentor.account,
               season: Season.current.year,

app/controllers/mentor/team_member_invites_controller.rb

@@ -11,11 +11,11 @@ def update
       )
         invite.update(invite_params)
 
-        student_chapters = invite.team.students.flat_map { |s| s.account.current_chapter }.uniq
+        student_chapterables = invite.team.students.flat_map { |s| s.account.current_chapterable_assignment&.chapterable }.uniq
 
-        student_chapters.each do |chapter|
-          if chapter.present?
-            chapter.chapter_account_assignments.create(
+        student_chapterables.each do |chapterable|
+          if chapterable.present?
+            chapterable.chapterable_account_assignments.create(
               profile: current_mentor,
               account: current_mentor.account,
               season: Season.current.year,

app/models/chapter.rb

@@ -10,10 +10,10 @@ class Chapter < ActiveRecord::Base
   has_one :legal_contact, dependent: :destroy
   has_one :chapter_program_information, dependent: :destroy
 
-  has_many :chapter_account_assignments, as: :chapterable, class_name: "ChapterableAccountAssignment"
-  has_many :accounts, through: :chapter_account_assignments
+  has_many :chapterable_account_assignments, as: :chapterable, class_name: "ChapterableAccountAssignment"
+  has_many :accounts, through: :chapterable_account_assignments
   has_many :chapter_ambassadors, -> { where "profile_type = 'ChapterAmbassadorProfile'" },
-    through: :chapter_account_assignments,
+    through: :chapterable_account_assignments,
     source: :account
 
   has_many :chapter_links, dependent: :destroy

app/null_objects/null_account.rb

@@ -9,6 +9,10 @@ def name
     "null account"
   end
 
+  def scope_name
+    nil
+  end
+
   def mentor_profile
     ::NullProfile.new
   end
@@ -37,6 +41,10 @@ def authenticated?
     false
   end
 
+  def profile_image_url
+    nil
+  end
+
   def current_chapter
     NullChapter.new
   end

app/null_objects/null_chapterable.rb

@@ -1,5 +1,5 @@
 class NullChapterable < NullObject
   def primary_contact
-    nil
+    NullAccount.new
   end
 end

app/technovation/join_request_approved.rb

@@ -10,11 +10,11 @@ def self.call(join_request)
     TeamRosterManaging.add(join_request.team, join_request.requestor)
 
     if join_request.requestor_scope_name == "mentor"
-      student_chapters = join_request.team.students.flat_map { |s| s.account.current_chapter }.uniq
+      student_chapterables = join_request.team.students.flat_map { |s| s.account.current_chapterable_assignment&.chapterable }.uniq
 
-      student_chapters.each do |chapter|
-        if chapter.present?
-          chapter.chapter_account_assignments.create(
+      student_chapterables.each do |chapterable|
+        if chapterable.present?
+          chapterable.chapterable_account_assignments.create(
             profile: join_request.requestor,
             account: join_request.requestor.account,
             season: Season.current.year,

spec/controllers/mentor/mentor_invites_controller_spec.rb

@@ -151,54 +151,56 @@
     end
   end
 
-  describe "mentor chapter assignments" do
-    context "when two students from the same chapter are on a team" do
-      let(:team) { FactoryBot.create(:team) }
-      let(:mentor) { FactoryBot.create(:mentor, :onboarded) }
-      let(:chapter) { FactoryBot.create(:chapter) }
-      let(:student1) { FactoryBot.create(:student, :not_assigned_to_chapter) }
-      let(:student2) { FactoryBot.create(:student, :not_assigned_to_chapter) }
-      let!(:invite) { FactoryBot.create(:team_member_invite, invitee: mentor) }
-
-      before do
-        student1.chapterable_assignments.create(
-          chapterable: chapter,
-          account: student1.account,
-          season: Season.current.year,
-          primary: true
-        )
-
-        student2.chapterable_assignments.create(
-          chapterable: chapter,
-          account: student2.account,
-          season: Season.current.year,
-          primary: true
-        )
-
-        team.students << student1
-        team.students << student2
-        team.save
-
-        invite.team = team
-        invite.save
-      end
+  describe "mentor chapterable assignments" do
+    %w[club chapter].each do |chapterable_type|
+      context "when two students from the same #{chapterable_type} are on a team" do
+        let(:team) { FactoryBot.create(:team) }
+        let(:mentor) { FactoryBot.create(:mentor, :onboarded) }
+        let(:chapterable) { FactoryBot.create(chapterable_type.to_sym) }
+        let(:student1) { FactoryBot.create(:student, :not_assigned_to_chapter) }
+        let(:student2) { FactoryBot.create(:student, :not_assigned_to_chapter) }
+        let!(:invite) { FactoryBot.create(:team_member_invite, invitee: mentor) }
 
-      context "when the mentor invite request for this team is accepted" do
         before do
-          sign_in(mentor)
-
-          put :update, params: {
-            id: invite.invite_token,
-            team_member_invite: {status: :accepted}
-          }
+          student1.chapterable_assignments.create(
+            chapterable: chapterable,
+            account: student1.account,
+            season: Season.current.year,
+            primary: true
+          )
+
+          student2.chapterable_assignments.create(
+            chapterable: chapterable,
+            account: student2.account,
+            season: Season.current.year,
+            primary: true
+          )
+
+          team.students << student1
+          team.students << student2
+          team.save
+
+          invite.team = team
+          invite.save
         end
 
-        it "creates one non-primary chapter assignment (since both students belong to the same chapter)" do
-          expect(mentor.account.chapterable_assignments.where(chapterable: chapter, primary: false).count).to eq(1)
-        end
+        context "when the mentor invite request for this team is accepted" do
+          before do
+            sign_in(mentor)
+
+            put :update, params: {
+              id: invite.invite_token,
+              team_member_invite: {status: :accepted}
+            }
+          end
+
+          it "creates one non-primary chapterable assignment (since both students belong to the same #{chapterable_type})" do
+            expect(mentor.account.chapterable_assignments.where(chapterable: chapterable, primary: false).count).to eq(1)
+          end
 
-        it "assigns the mentor to the student's chapter" do
-          expect(mentor.account.current_chapters).to include(student1.account.current_chapter)
+          it "assigns the mentor to the student's #{chapterable_type}" do
+            expect(mentor.account.chapterable_assignments.map(&:chapterable)).to include(student1.account.current_primary_chapterable_assignment.chapterable)
+          end
         end
       end
     end

spec/controllers/mentor/team_member_invites_controller_spec.rb

@@ -75,54 +75,56 @@
     end
   end
 
-  describe "mentor chapter assignments" do
-    context "when two students from the same chapter are on a team" do
-      let(:team) { FactoryBot.create(:team) }
-      let(:mentor) { FactoryBot.create(:mentor, :onboarded) }
-      let(:chapter) { FactoryBot.create(:chapter) }
-      let(:student1) { FactoryBot.create(:student, :not_assigned_to_chapter) }
-      let(:student2) { FactoryBot.create(:student, :not_assigned_to_chapter) }
-      let!(:invite) { FactoryBot.create(:team_member_invite, invitee: mentor) }
-
-      before do
-        student1.chapterable_assignments.create(
-          chapterable: chapter,
-          account: student1.account,
-          season: Season.current.year,
-          primary: true
-        )
-
-        student2.chapterable_assignments.create(
-          chapterable: chapter,
-          account: student2.account,
-          season: Season.current.year,
-          primary: true
-        )
-
-        team.students << student1
-        team.students << student2
-        team.save
-
-        invite.team = team
-        invite.save
-      end
+  describe "mentor chapterable assignments" do
+    %w[club chapter].each do |chapterable_type|
+      context "when two students from the same #{chapterable_type} are on a team" do
+        let(:team) { FactoryBot.create(:team) }
+        let(:mentor) { FactoryBot.create(:mentor, :onboarded) }
+        let(:chapterable) { FactoryBot.create(chapterable_type.to_sym) }
+        let(:student1) { FactoryBot.create(:student, :not_assigned_to_chapter) }
+        let(:student2) { FactoryBot.create(:student, :not_assigned_to_chapter) }
+        let!(:invite) { FactoryBot.create(:team_member_invite, invitee: mentor) }
 
-      context "when the mentor invite request for this team is accepted" do
         before do
-          sign_in(mentor)
-
-          put :update, params: {
-            id: invite.invite_token,
-            team_member_invite: {status: :accepted}
-          }
+          student1.chapterable_assignments.create(
+            chapterable: chapterable,
+            account: student1.account,
+            season: Season.current.year,
+            primary: true
+          )
+
+          student2.chapterable_assignments.create(
+            chapterable: chapterable,
+            account: student2.account,
+            season: Season.current.year,
+            primary: true
+          )
+
+          team.students << student1
+          team.students << student2
+          team.save
+
+          invite.team = team
+          invite.save
         end
 
-        it "creates one non-primary chapter assignment (since both students belong to the same chapter)" do
-          expect(mentor.account.chapterable_assignments.where(chapterable: chapter, primary: false).count).to eq(1)
-        end
+        context "when the mentor invite request for this team is accepted" do
+          before do
+            sign_in(mentor)
+
+            put :update, params: {
+              id: invite.invite_token,
+              team_member_invite: {status: :accepted}
+            }
+          end
+
+          it "creates one non-primary chapterable assignment (since both students belong to the same #{chapterable_type})" do
+            expect(mentor.account.chapterable_assignments.where(chapterable: chapterable, primary: false).count).to eq(1)
+          end
 
-        it "assigns the mentor to the student's chapter" do
-          expect(mentor.account.current_chapters).to include(student1.account.current_chapter)
+          it "assigns the mentor to the student's #{chapterable_type}" do
+            expect(mentor.account.chapterable_assignments.map(&:chapterable)).to include(student1.account.current_primary_chapterable_assignment.chapterable)
+          end
         end
       end
     end

spec/controllers/student/join_requests_controller_spec.rb

@@ -248,59 +248,61 @@
     end
   end
 
-  describe "mentor chapter assignments" do
-    context "when two students from the same chapter are on a team" do
-      let(:team) { FactoryBot.create(:team) }
-      let(:mentor) { FactoryBot.create(:mentor, :onboarded) }
-      let(:chapter) { FactoryBot.create(:chapter) }
-      let(:student1) { FactoryBot.create(:student, :not_assigned_to_chapter) }
-      let(:student2) { FactoryBot.create(:student, :not_assigned_to_chapter) }
-      let(:join_request) {
-        FactoryBot.create(
-          :join_request,
-          team: team,
-          requestor: mentor
-        )
-      }
-
-      before do
-        student1.chapterable_assignments.create(
-          chapterable: chapter,
-          account: student1.account,
-          season: Season.current.year,
-          primary: true
-        )
-
-        student2.chapterable_assignments.create(
-          chapterable: chapter,
-          account: student2.account,
-          season: Season.current.year,
-          primary: true
-        )
-
-        team.students << student1
-        team.students << student2
-        team.save
-      end
-
-      before do
-        sign_in(student1)
-      end
+  describe "mentor chapterable assignments" do
+    %w[club chapter].each do |chapterable_type|
+      context "when two students from the same #{chapterable_type} are on a team" do
+        let(:team) { FactoryBot.create(:team) }
+        let(:mentor) { FactoryBot.create(:mentor, :onboarded) }
+        let(:chapterable) { FactoryBot.create(chapterable_type.to_sym) }
+        let(:student1) { FactoryBot.create(:student, :not_assigned_to_chapter) }
+        let(:student2) { FactoryBot.create(:student, :not_assigned_to_chapter) }
+        let(:join_request) {
+          FactoryBot.create(
+            :join_request,
+            team: team,
+            requestor: mentor
+          )
+        }
 
-      context "when the mentor join request for the team is accepted" do
         before do
-          put :update, params: {
-            id: join_request.review_token,
-            join_request: {status: :approved}
-          }
+          student1.chapterable_assignments.create(
+            chapterable: chapterable,
+            account: student1.account,
+            season: Season.current.year,
+            primary: true
+          )
+
+          student2.chapterable_assignments.create(
+            chapterable: chapterable,
+            account: student2.account,
+            season: Season.current.year,
+            primary: true
+          )
+
+          team.students << student1
+          team.students << student2
+          team.save
         end
 
-        it "creates one non-primary chapter assignment (since both students belong to the same chapter)" do
-          expect(mentor.account.chapterable_assignments.where(chapterable: chapter, primary: false).count).to eq(1)
+        before do
+          sign_in(student1)
         end
 
-        it "assigns the mentor to the student's chapter" do
-          expect(mentor.account.current_chapters).to include(student1.account.current_chapter)
+        context "when the mentor join request for the team is accepted" do
+          before do
+            put :update, params: {
+              id: join_request.review_token,
+              join_request: {status: :approved}
+            }
+          end
+
+          it "creates one non-primary chapterable assignment (since both students belong to the same #{chapterable_type})" do
+            expect(mentor.account.chapterable_assignments.where(chapterable: chapterable, primary: false).count).to eq(1)
+          end
+
+          it "assigns the mentor to the student's #{chapterable_type}" do
+            expect(mentor.account.chapterable_assignments.map(&:chapterable)).to include(student1.account.current_primary_chapterable_assignment.chapterable)
+          end
         end
       end
     end