Iteration 4 - Add Course Filter

.env.example

@@ -20,6 +20,7 @@ S3_BUCKET_NAME=[NEW ONE]
 S3_REGION=us-west-2
 S3_SECRET_ACCESS_KEY=[NEW ONE]
 SECRET_KEY_BASE=[NEW ONE]
+MAILBLUSTER_API_KEY=[NEW ONE]
 SENTRY_DSN=
 SNAP_CLIENT_SECRET='ignore'
 SNAP_CLIENT_URL='https://forum.snap.berkeley.edu/session/sso_provider'

.gitignore

@@ -162,3 +162,6 @@ cc-test-reporter
 
 # CSV data files
 *.csv
+
+*.claude/
+CLAUDE.md

Gemfile

@@ -50,6 +50,7 @@ gem "activerecord-import", require: false
 gem "httparty", "~> 0.21.0"
 
 gem "country_select", "~> 8.0"
+gem "ajax-datatables-rails"
 
 group :development do
   gem "annotate"

Gemfile.lock

@@ -87,6 +87,9 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
+    ajax-datatables-rails (1.5.0)
+      rails (>= 6.0)
+      zeitwerk
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
@@ -567,6 +570,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-import
+  ajax-datatables-rails
   annotate
   aws-sdk-s3
   axe-core-cucumber

README.md

@@ -159,6 +159,44 @@ If bundler install runs successfully, continue with the following commands to co
 - `heroku config:set ...` for each of the environment variables.
 - `heroku open`
 
+## MailBluster Integration
+
+The app integrates with [MailBluster](https://mailbluster.com/) for email marketing and newsletter management.
+
+### Configuration
+
+Set the `MAILBLUSTER_API_KEY` environment variable:
+
+```bash
+# Local development
+export MAILBLUSTER_API_KEY=your_api_key_here
+
+# Heroku
+heroku config:set MAILBLUSTER_API_KEY=your_api_key_here
+```
+
+### Features
+
+- **Auto-sync on approval**: When a teacher is validated, their info is synced to MailBluster as a lead
+- **Auto-sync on status change**: Updating a teacher's application status triggers a MailBluster sync
+- **Auto-sync on email add**: Adding a new email address to a validated teacher triggers sync
+- **Manual sync**: Admins can sync individual teachers or all validated teachers from the UI
+- **Lead cleanup**: Deleting a teacher removes their lead from MailBluster
+- **Delivery tracking**: Email addresses track `emails_sent`, `emails_delivered`, and `bounced` status
+
+### Rake Tasks
+
+```bash
+# Sync all validated teachers to MailBluster
+bundle exec rake mailbluster:sync_all
+
+# Sync a single teacher by ID
+bundle exec rake mailbluster:sync_teacher[123]
+
+# Check sync status
+bundle exec rake mailbluster:status
+```
+
 
 
 ### CodeClimate Local Test
@@ -168,3 +206,6 @@ TODO: Link to download CodeClimate binaries for macOS.
 ```
 https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64
 ```
+
+### Contributions
+[Hagen Haeussler](https://www.linkedin.com/in/hagen-h%C3%A4u%C3%9Fler-6bb293289/?lipi=urn%3Ali%3Apage%3Ad_flagship3_profile_view_base_contact_details%3BeCJ75lhZToWJMy945exu1g%3D%3D) 

app/controllers/email_addresses_controller.rb

@@ -2,8 +2,8 @@
 
 class EmailAddressesController < ApplicationController
   before_action :require_login
-  before_action :require_admin
   before_action :set_teacher
+  before_action :require_email_edit_permission
 
   def create
     email = params[:email].to_s.strip
@@ -13,6 +13,8 @@ def create
     end
 
     @teacher.email_addresses.create!(email:, primary: false)
+    # Sync teacher to MailBluster when a new email is added
+    MailblusterService.create_or_update_lead(@teacher) if MailblusterService.configured? && @teacher.validated?
     redirect_to teacher_path(@teacher), notice: "Personal email addresses added successfully."
   rescue ActiveRecord::RecordInvalid => e
     error_message = e.record&.errors&.full_messages&.join(", ")
@@ -27,7 +29,14 @@ def destroy
       return
     end
 
+    if @teacher.email_addresses.count <= 1
+      redirect_to teacher_path(@teacher), alert: "Add another email before deleting this one."
+      return
+    end
+
     email.destroy!
+    # Re-sync to MailBluster since email list changed
+    MailblusterService.create_or_update_lead(@teacher) if MailblusterService.configured? && @teacher.validated?
     redirect_to teacher_path(@teacher), notice: "Email address deleted successfully."
   rescue ActiveRecord::RecordNotFound
     redirect_to teacher_path(@teacher), alert: "Email address not found."
@@ -39,4 +48,10 @@ def destroy
   def set_teacher
     @teacher = Teacher.find(params[:teacher_id])
   end
+
+  def require_email_edit_permission
+    return if is_admin? || current_user.id == @teacher.id
+
+    redirect_to edit_teacher_path(current_user.id), alert: "You can only edit your own information"
+  end
 end

app/controllers/schools_controller.rb

@@ -5,7 +5,10 @@ class SchoolsController < ApplicationController
   before_action :require_admin
 
   def index
-    @schools = School.all.order(:name)
+    respond_to do |format|
+      format.html
+      format.json { render json: SchoolDatatable.new(params) }
+    end
   end
 
   def show

app/controllers/teachers_controller.rb

@@ -10,10 +10,10 @@ class TeachersController < ApplicationController
   include CsvProcess
 
   before_action :load_pages, only: [:new, :create, :edit, :update]
-  before_action :load_teacher, except: [:new, :index, :create, :import, :search]
+  before_action :load_teacher, except: [:new, :index, :create, :import, :search, :sync_all_mailbluster]
   before_action :sanitize_params, only: [:new, :create, :edit, :update]
   before_action :require_login, except: [:new, :create]
-  before_action :require_admin, only: [:validate, :deny, :destroy, :index, :show, :search]
+  before_action :require_admin, only: [:validate, :deny, :destroy, :index, :show, :search, :sync_mailbluster, :sync_all_mailbluster]
   before_action :require_edit_permission, only: [:edit, :update, :resend_welcome_email]
 
   rescue_from ActiveRecord::RecordNotUnique, with: :deny_access
@@ -131,6 +131,7 @@ def update
 
     attach_new_files_if_any
     send_email_if_application_status_changed_and_email_resend_enabled
+    sync_to_mailbluster_if_status_changed
 
     if fail_to_update
       return
@@ -162,6 +163,19 @@ def send_email_if_application_status_changed_and_email_resend_enabled
     end
   end
 
+  def sync_to_mailbluster_if_status_changed
+    return unless MailblusterService.configured?
+    return unless @teacher.application_status_changed?
+
+    if @teacher.validated?
+      MailblusterService.create_or_update_lead(@teacher)
+    elsif @teacher.application_status_was == "validated"
+      # If teacher was validated but status changed away, update MailBluster
+      # to mark them as unsubscribed
+      MailblusterService.create_or_update_lead(@teacher)
+    end
+  end
+
   def request_info
     @teacher.info_needed!
     if !params[:skip_email].present?
@@ -173,6 +187,7 @@ def request_info
   def validate
     @teacher.validated!
     TeacherMailer.welcome_email(@teacher).deliver_now
+    MailblusterService.create_or_update_lead(@teacher) if MailblusterService.configured?
     redirect_to root_path
   end
 
@@ -185,6 +200,9 @@ def deny
   end
 
   def destroy
+    if MailblusterService.configured? && @teacher.primary_email.present?
+      MailblusterService.delete_lead(@teacher.primary_email)
+    end
     @teacher.destroy!
     flash[:info] = "Deleted #{@teacher.full_name} successfully."
     redirect_to teachers_path
@@ -208,6 +226,34 @@ def import
     redirect_to teachers_path
   end
 
+  def sync_mailbluster
+    unless MailblusterService.configured?
+      redirect_to teacher_path(@teacher), alert: "MailBluster API key is not configured."
+      return
+    end
+
+    result = MailblusterService.sync_teacher(@teacher)
+    if result[:success]
+      redirect_to teacher_path(@teacher), notice: "Successfully synced #{@teacher.full_name} to MailBluster."
+    else
+      redirect_to teacher_path(@teacher), alert: "Failed to sync #{@teacher.full_name} to MailBluster. #{result[:error]}"
+    end
+  end
+
+  def sync_all_mailbluster
+    unless MailblusterService.configured?
+      redirect_to teachers_path, alert: "MailBluster API key is not configured."
+      return
+    end
+
+    results = MailblusterService.sync_all_teachers
+    flash[:notice] = "MailBluster sync complete: #{results[:synced]} synced, #{results[:failed]} failed, #{results[:skipped]} skipped."
+    if results[:errors].any?
+      flash[:alert] = "Errors: #{results[:errors].first(5).join('; ')}"
+    end
+    redirect_to teachers_path
+  end
+
   private
   def load_teacher
     @teachers = Teacher.all

app/datatables/school_datatable.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class SchoolDatatable < AjaxDatatablesRails::ActiveRecord
+  include Rails.application.routes.url_helpers
+
+  def view_columns
+    @view_columns ||= {
+      name: { source: "School.name", cond: :like },
+      location: { source: "School.city", cond: :like },
+      country: { source: "School.country", cond: :like },
+      website: { source: "School.website", cond: :like },
+      teachers_count: { source: "School.teachers_count", searchable: false },
+      grade_level: { source: "School.grade_level", searchable: false },
+      actions: { source: "School.id", searchable: false, orderable: false }
+    }
+  end
+
+  def data
+    records.map do |record|
+      {
+        name: name_link(record),
+        location: record.location,
+        country: record.country,
+        website: website_link(record),
+        teachers_count: record.teachers_count,
+        grade_level: record.display_grade_level,
+        actions: action_links(record),
+        DT_RowId: record.id
+      }
+    end
+  end
+
+  def get_raw_records
+    School.all
+  end
+
+  private
+  SEARCHABLE_COLUMNS = %w[name city state country website].freeze
+
+  def filter_records(records)
+    search_value = params.dig(:search, :value).presence
+    return records unless search_value
+
+    conditions = SEARCHABLE_COLUMNS.map { |col| "schools.#{col} ILIKE :q" }.join(" OR ")
+    records.where(conditions, q: "%#{search_value}%")
+  end
+
+  def name_link(record)
+    "<a href=\"#{school_path(record)}\">#{ERB::Util.html_escape(record.name)}</a>".html_safe
+  end
+
+  def website_link(record)
+    url = record.website
+    display = url.to_s.truncate(30)
+    "<a href=\"#{ERB::Util.html_escape(url)}\" target=\"_blank\">#{ERB::Util.html_escape(display)}</a>".html_safe
+  end
+
+  def action_links(record)
+    edit = "<a class=\"btn btn-info\" href=\"#{edit_school_path(record)}\">Edit</a>"
+    delete = "<a class=\"btn btn-outline-danger\" data-confirm=\"Are you sure?\" rel=\"nofollow\" data-method=\"delete\" href=\"#{school_path(record)}\">❌</a>"
+    "<span class=\"btn-group\">#{edit} #{delete}</span>".html_safe
+  end
+end

app/helpers/teacher_helper.rb

@@ -13,7 +13,23 @@ def ip_history_display(teacher)
   end
 
   def email_address_label(email)
-    return unless email.primary?
-    '&nbsp; <span class="badge badge-pill badge-primary h6">primary</span>'.html_safe
+    labels = []
+    labels << '<span class="primary-email-dot" data-toggle="tooltip" data-placement="top" title="Primary email"></span>' if email.primary?
+    labels << '<span class="bounced-email-dot" data-toggle="tooltip" data-placement="top" title="Bounced email"></span>' if email.bounced?
+    return nil if labels.empty?
+    labels.join("").html_safe
+  end
+
+  def mailbluster_sync_status(teacher)
+    if teacher.mailbluster_synced?
+      url = teacher.mailbluster_profile_url
+      if url
+        link_to('<span class="badge badge-success">Synced</span>'.html_safe, url, target: "_blank", title: "View in MailBluster")
+      else
+        '<span class="badge badge-success">Synced</span>'.html_safe
+      end
+    else
+      '<span class="badge badge-secondary">Not Synced</span>'.html_safe
+    end
   end
 end

app/javascript/packs/application.js

@@ -51,6 +51,7 @@ import "datatables.net-buttons-bs4";
 import 'datatables.net-buttons/js/buttons.html5.js';
 
 import './datatables.js';
+import './schools_index.js';
 import '../styles/application.scss';
 import './schools.js';