From 5479e2721633ed545aa422fdf4623db4d416e2de Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 26 Apr 2016 10:01:53 -0500
Subject: [PATCH] VRFS-4037 - fix mailing problemg

---
 admin/app/admin/interested_schools.rb    | 20 ++++++++++++++++++++
 ruby/lib/jam_ruby/models/user.rb         |  2 +-
 web/spec/features/school_landing_spec.rb |  6 ++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 admin/app/admin/interested_schools.rb

diff --git a/admin/app/admin/interested_schools.rb b/admin/app/admin/interested_schools.rb
new file mode 100644
index 000000000..fb3a1abe0
--- /dev/null
+++ b/admin/app/admin/interested_schools.rb
@@ -0,0 +1,20 @@
+ActiveAdmin.register JamRuby::User, :as => 'SchoolInterest' do
+
+  menu :label => 'Interested in Schools', :parent => 'JamClass'
+
+  config.sort_order = 'created_at desc'
+  config.batch_actions = false
+  config.per_page = 100
+  config.paginate = true
+  config.filters = false
+
+  scope("All", default: true) { |scope| scope.where(school_interest: true) }
+
+  index do
+    column "Name" do |user|
+      span do
+        link_to "#{user.name} (#{user.email})", "#{Rails.application.config.external_root_url}/client#/profile/#{user.id}"
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index 05cc1a504..e9f287d3b 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -1334,7 +1334,7 @@ module JamRuby
           end
 
           if user.school_interest
-            AdminMailer.partner({body: "#{user.email} signed up via the /landing/jamclass/schools page.", subject: "#{user.email} is interested in schools"})
+            AdminMailer.partner({body: "#{user.email} signed up via the https://www.jamkazam.com/landing/jamclass/schools page.\n\nFull list is here: https://www.jamkazam.com/admin/admin/school_interests", subject: "#{user.email} is interested in schools"}).deliver
           end
 
           if !user.email_confirmed
diff --git a/web/spec/features/school_landing_spec.rb b/web/spec/features/school_landing_spec.rb
index 1154941f5..80ef33f29 100644
--- a/web/spec/features/school_landing_spec.rb
+++ b/web/spec/features/school_landing_spec.rb
@@ -13,6 +13,10 @@ describe "School Landing", :js => true, :type => :feature, :capybara_feature =>
   end
 
 
+  before(:each) do
+    AdminMailer.deliveries.clear
+  end
+
   let(:user) { FactoryGirl.create(:user, country: 'US') }
 
 
@@ -35,6 +39,8 @@ describe "School Landing", :js => true, :type => :feature, :capybara_feature =>
     # this should show on the /client#/home page (WILL CHANGE)
     find('h2', text: 'sessions')
 
+    AdminMailer.deliveries.count.should eql 3 # welcome email, partners ping about new user, and
+
     user = User.find_by_email('school_interest_123@jamkazam.com')
     user.is_a_student.should be false
     user.is_a_teacher.should be false