From 2bab1d00d08a425c1857cd9fc7f5c62be536563c Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Sat, 17 Feb 2024 17:25:02 -0800
Subject: [PATCH 01/10] migration adds 'to' feld to email template database

---
 .../20240218005604_add_to_field_to_email_template.rb      | 8 ++++++++
 db/schema.rb                                              | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240218005604_add_to_field_to_email_template.rb

diff --git a/db/migrate/20240218005604_add_to_field_to_email_template.rb b/db/migrate/20240218005604_add_to_field_to_email_template.rb
new file mode 100644
index 00000000..1aa60400
--- /dev/null
+++ b/db/migrate/20240218005604_add_to_field_to_email_template.rb
@@ -0,0 +1,8 @@
+class AddToFieldToEmailTemplate < ActiveRecord::Migration[6.1]
+  def change
+    add_column :email_templates, :to, :string
+    #below is the default prepopulated 'to' field value,
+    to_field = "{{teacher_email}}, {{teacher_personal_email}}"
+    EmailTemplate.update_all(to: to_field)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5bd75815..d2dabf7e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_09_05_181019) do
+ActiveRecord::Schema.define(version: 2024_02_18_005604) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -65,6 +65,7 @@
     t.string "title"
     t.string "subject"
     t.boolean "required", default: false
+    t.string "to"
   end
 
   create_table "pages", force: :cascade do |t|

From b1173d2f3176610d7fff33c37a2e94e841d23e18 Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Sat, 17 Feb 2024 17:30:54 -0800
Subject: [PATCH 02/10] added to field to view and added a file I forgot to add
 from prev migration

---
 app/models/email_template.rb             | 1 +
 app/views/email_templates/_form.html.erb | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/email_template.rb b/app/models/email_template.rb
index a8042c03..b94f0df0 100644
--- a/app/models/email_template.rb
+++ b/app/models/email_template.rb
@@ -14,6 +14,7 @@
 #  required   :boolean          default(FALSE)
 #  subject    :string
 #  title      :string
+#  to         :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
diff --git a/app/views/email_templates/_form.html.erb b/app/views/email_templates/_form.html.erb
index 5a7a6e12..ce6df5f3 100644
--- a/app/views/email_templates/_form.html.erb
+++ b/app/views/email_templates/_form.html.erb
@@ -1,7 +1,10 @@
+<%# This part of the page is the email template form %>
 <%= form_with(model: email_template, local: true) do |form| %>
   <div class="form">
     <label for="email_template_title"><h3>Title</h3></label>
     <%= form.text_field :title, class: "form-control", readonly: email_template.required? %>
+    <label for="email_template_to"><h3>To</h3></label>
+    <%= form.text_field :to, class: "form-control" %>
     <label for="email_template_subject"><h3>Subject</h3></label>
     <%= form.text_field :subject, class: "form-control" %>
     <label for="email_template_body"><h3>Body</h3></label>
@@ -12,7 +15,7 @@
     <%= form.submit "Submit", class: "btn btn-primary" %>
   </div>
 <% end %>
-
+<%# This renders the section on "Allowed Tags" %>
 <%= render 'liquid_fields' %>
 
 <script type="text/javascript">

From 870491a296efabc9855353c6ace09d700afb8671 Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Mon, 19 Feb 2024 16:32:14 -0800
Subject: [PATCH 03/10] update backend to send to all emails specified in To
 field in email template

---
 app/mailers/teacher_mailer.rb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/mailers/teacher_mailer.rb b/app/mailers/teacher_mailer.rb
index 4acb1634..7757fea4 100644
--- a/app/mailers/teacher_mailer.rb
+++ b/app/mailers/teacher_mailer.rb
@@ -11,7 +11,8 @@ class TeacherMailer < ApplicationMailer
   def welcome_email(teacher)
     @teacher = teacher
     set_body
-    mail to: teacher.email_name,
+    set_recipients
+    mail to: @recipients, #ActionMailer accepts comma-separated lists of emails
          cc: CONTACT_EMAIL,
          subject: email_template.subject
   end
@@ -20,7 +21,8 @@ def deny_email(teacher, denial_reason)
     @teacher = teacher
     @denial_reason = denial_reason
     set_body
-    mail to: @teacher.email_name,
+    set_recipients
+    mail to: @recipients,
          cc: CONTACT_EMAIL,
          subject: email_template.subject
   end
@@ -29,7 +31,8 @@ def request_info_email(teacher, request_reason)
     @teacher = teacher
     @request_reason = request_reason
     set_body
-    mail to: @teacher.email_name,
+    set_recipients
+    mail to: @recipients,
          cc: CONTACT_EMAIL,
          subject: email_template.subject
   end
@@ -58,7 +61,14 @@ def email_template
     @email_template ||= EmailTemplate.find_by(title: action_name.titlecase)
   end
 
+  #renders the email body with the {{parameter}} things
   def set_body
     @body = Liquid::Template.parse(email_template.body).render(liquid_assigns).html_safe
   end
+
+  #renders the list of recipients with the {{parameter}} things
+  def set_recipients
+    @recipients = Liquid::Template.parse(email_template.to).render(liquid_assigns).html_safe
+  end
+
 end

From c231e07f577d9bb2d81d25d772969fb52ef81015 Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Mon, 19 Feb 2024 17:38:01 -0800
Subject: [PATCH 04/10] fixed rspec test failures and rubocop by updating seed
 data which gets loaded on each run

---
 app/mailers/teacher_mailer.rb | 7 +++----
 db/seed_data.rb               | 6 ++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/mailers/teacher_mailer.rb b/app/mailers/teacher_mailer.rb
index 7757fea4..66135998 100644
--- a/app/mailers/teacher_mailer.rb
+++ b/app/mailers/teacher_mailer.rb
@@ -12,7 +12,7 @@ def welcome_email(teacher)
     @teacher = teacher
     set_body
     set_recipients
-    mail to: @recipients, #ActionMailer accepts comma-separated lists of emails
+    mail to: @recipients, # ActionMailer accepts comma-separated lists of emails
          cc: CONTACT_EMAIL,
          subject: email_template.subject
   end
@@ -61,14 +61,13 @@ def email_template
     @email_template ||= EmailTemplate.find_by(title: action_name.titlecase)
   end
 
-  #renders the email body with the {{parameter}} things
+  # renders the email body with the {{parameter}} things
   def set_body
     @body = Liquid::Template.parse(email_template.body).render(liquid_assigns).html_safe
   end
 
-  #renders the list of recipients with the {{parameter}} things
+  # renders the list of recipients with the {{parameter}} things
   def set_recipients
     @recipients = Liquid::Template.parse(email_template.to).render(liquid_assigns).html_safe
   end
-
 end
diff --git a/db/seed_data.rb b/db/seed_data.rb
index deccbc0d..7c8a2a76 100644
--- a/db/seed_data.rb
+++ b/db/seed_data.rb
@@ -59,9 +59,12 @@ module SeedData
 
   DENY_EMAIL3
 
+  @to_field = "{{teacher_email}}, {{teacher_personal_email}}"
+
   def self.emails
     [
       {
+        to: @to_field,
         body: @welcome_email,
         path: "teacher_mailer/welcome_email",
         locale: nil,
@@ -73,6 +76,7 @@ def self.emails
         subject: "Welcome to The Beauty and Joy of Computing!"
       },
       {
+        to: @to_field,
         body: @form_submission,
         path: "teacher_mailer/form_submission",
         locale: nil,
@@ -84,6 +88,7 @@ def self.emails
         subject: "Form Submission"
       },
       {
+        to: @to_field,
         body: @deny_email,
         path: "teacher_mailer/deny_email",
         locale: nil,
@@ -95,6 +100,7 @@ def self.emails
         subject: "Deny Email"
       },
       {
+        to: @to_field,
         body: @basic_email_with_reason,
         path: "teacher_mailer/request_info_email",
         locale: nil,

From be305efc12af44f7682862c1a78157152459a51c Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Mon, 19 Feb 2024 17:50:25 -0800
Subject: [PATCH 05/10] added test with barney the purple dinosaur

---
 spec/fixtures/teachers.yml          | 13 +++++++++++++
 spec/mailers/teacher_mailer_spec.rb | 11 +++++++++++
 2 files changed, 24 insertions(+)

diff --git a/spec/fixtures/teachers.yml b/spec/fixtures/teachers.yml
index 05f272b6..b1909094 100644
--- a/spec/fixtures/teachers.yml
+++ b/spec/fixtures/teachers.yml
@@ -96,3 +96,16 @@ reimu:
   school: berkeley
   application_status: Info Needed
   education_level: -1
+
+barney:
+  id: 6
+  first_name: Barney
+  last_name: Dinosaur
+  snap: barney
+  email: 'barneydinosaur@gmail.com'
+  personal_email: 'bigpurpletrex@gmail.com'
+  status: 1
+  more_info: ''
+  application_status: Denied
+  school: berkeley
+  education_level: -1
\ No newline at end of file
diff --git a/spec/mailers/teacher_mailer_spec.rb b/spec/mailers/teacher_mailer_spec.rb
index d9db4aab..82b1682f 100644
--- a/spec/mailers/teacher_mailer_spec.rb
+++ b/spec/mailers/teacher_mailer_spec.rb
@@ -17,6 +17,17 @@
      expect(email.body.encoded).to include("Hi Bob")
    end
 
+   it "Sends to Both School and Personal Email When Possible" do
+    teacher = teachers(:barney)
+    email = TeacherMailer.welcome_email(teacher)
+    email.deliver_now
+    expect(email.from[0]).to eq("contact@bjc.berkeley.edu")
+    expect(email.to[0]).to eq("barneydinosaur@gmail.com")
+    expect(email.to[1]).to eq("bigpurpletrex@gmail.com")
+    expect(email.subject).to eq("Welcome to The Beauty and Joy of Computing!")
+    expect(email.body.encoded).to include("Hi Barney")
+  end
+
 
   it "Sends Deny Email" do
     teacher = teachers(:long)

From 2088b071378b2f7eacaef31e0e3a4511c020a34a Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Mon, 19 Feb 2024 17:51:46 -0800
Subject: [PATCH 06/10] rubocop fix

---
 spec/mailers/teacher_mailer_spec.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/mailers/teacher_mailer_spec.rb b/spec/mailers/teacher_mailer_spec.rb
index 82b1682f..129c42c5 100644
--- a/spec/mailers/teacher_mailer_spec.rb
+++ b/spec/mailers/teacher_mailer_spec.rb
@@ -17,16 +17,16 @@
      expect(email.body.encoded).to include("Hi Bob")
    end
 
-   it "Sends to Both School and Personal Email When Possible" do
-    teacher = teachers(:barney)
-    email = TeacherMailer.welcome_email(teacher)
-    email.deliver_now
-    expect(email.from[0]).to eq("contact@bjc.berkeley.edu")
-    expect(email.to[0]).to eq("barneydinosaur@gmail.com")
-    expect(email.to[1]).to eq("bigpurpletrex@gmail.com")
-    expect(email.subject).to eq("Welcome to The Beauty and Joy of Computing!")
-    expect(email.body.encoded).to include("Hi Barney")
-  end
+  it "Sends to Both School and Personal Email When Possible" do
+   teacher = teachers(:barney)
+   email = TeacherMailer.welcome_email(teacher)
+   email.deliver_now
+   expect(email.from[0]).to eq("contact@bjc.berkeley.edu")
+   expect(email.to[0]).to eq("barneydinosaur@gmail.com")
+   expect(email.to[1]).to eq("bigpurpletrex@gmail.com")
+   expect(email.subject).to eq("Welcome to The Beauty and Joy of Computing!")
+   expect(email.body.encoded).to include("Hi Barney")
+ end
 
 
   it "Sends Deny Email" do

From 7a8e473205d74d51303800a204320f96b95eeb84 Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Wed, 21 Feb 2024 12:21:36 -0800
Subject: [PATCH 07/10] change prepopulated TO field for form submission email

---
 app/mailers/teacher_mailer.rb |  3 ++-
 db/schema.rb                  |  2 +-
 db/seed_data.rb               | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/mailers/teacher_mailer.rb b/app/mailers/teacher_mailer.rb
index 66135998..769a47ea 100644
--- a/app/mailers/teacher_mailer.rb
+++ b/app/mailers/teacher_mailer.rb
@@ -40,8 +40,9 @@ def request_info_email(teacher, request_reason)
   def form_submission(teacher)
     @teacher = teacher
     set_body
+    set_recipients
     if @teacher.not_reviewed?
-      mail to: CONTACT_EMAIL,
+      mail to: @recipients,
            subject: email_template.subject
     end
   end
diff --git a/db/schema.rb b/db/schema.rb
index d2dabf7e..acd0374a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_02_18_005604) do
+ActiveRecord::Schema.define(version: 2024_02_20_192015) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
diff --git a/db/seed_data.rb b/db/seed_data.rb
index 7c8a2a76..315b8edc 100644
--- a/db/seed_data.rb
+++ b/db/seed_data.rb
@@ -59,12 +59,12 @@ module SeedData
 
   DENY_EMAIL3
 
-  @to_field = "{{teacher_email}}, {{teacher_personal_email}}"
+  @default_to_field = "{{teacher_email}}, {{teacher_personal_email}}"
 
   def self.emails
     [
       {
-        to: @to_field,
+        to: @default_to_field,
         body: @welcome_email,
         path: "teacher_mailer/welcome_email",
         locale: nil,
@@ -76,7 +76,7 @@ def self.emails
         subject: "Welcome to The Beauty and Joy of Computing!"
       },
       {
-        to: @to_field,
+        to: "lmock@berkeley.edu, contact@bjc.berkeley.edu",
         body: @form_submission,
         path: "teacher_mailer/form_submission",
         locale: nil,
@@ -88,7 +88,7 @@ def self.emails
         subject: "Form Submission"
       },
       {
-        to: @to_field,
+        to: @default_to_field,
         body: @deny_email,
         path: "teacher_mailer/deny_email",
         locale: nil,
@@ -100,7 +100,7 @@ def self.emails
         subject: "Deny Email"
       },
       {
-        to: @to_field,
+        to: @default_to_field,
         body: @basic_email_with_reason,
         path: "teacher_mailer/request_info_email",
         locale: nil,

From 1b42b58e011ea927230ad88151684d0f9b4948c5 Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Wed, 21 Feb 2024 13:07:38 -0800
Subject: [PATCH 08/10] added validations and more descriptive, useful error
 messages to email template CRUD routes

---
 app/controllers/email_templates_controller.rb | 15 ++++++++++-----
 app/models/email_template.rb                  |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/controllers/email_templates_controller.rb b/app/controllers/email_templates_controller.rb
index 901a1a4f..9db5b06f 100644
--- a/app/controllers/email_templates_controller.rb
+++ b/app/controllers/email_templates_controller.rb
@@ -14,8 +14,13 @@ def edit
   def update
     template = EmailTemplate.find(params[:id])
     template.update(template_params)
-    template.save!
-    redirect_to email_templates_path
+    if template.save
+      flash[:success] = "Updated #{template.title} template successfully."
+      redirect_to email_templates_path
+    else
+      flash[:alert] = "Failed to save #{template.title} template: " + template.errors.full_messages.join(', ')
+      redirect_to edit_email_template_path(params[:id])
+    end
   end
 
   def create
@@ -27,11 +32,11 @@ def create
     end
     load_ordered_email_templates
 
-    if @email_template.save!
+    if @email_template.save
       flash[:success] = "Created #{@email_template.title} successfully."
       redirect_to email_templates_path
     else
-      flash[:alert] = "Failed to submit information :("
+      flash[:alert] = "Failed to submit information: " + @email_template.errors.full_messages.join(', ')
       render "new"
     end
   end
@@ -49,7 +54,7 @@ def destroy
 
   private
   def template_params
-    params.require(:email_template).permit(:body, :subject, :title)
+    params.require(:email_template).permit(:body, :subject, :title, :to)
   end
 
   def load_ordered_email_templates
diff --git a/app/models/email_template.rb b/app/models/email_template.rb
index b94f0df0..78583d6b 100644
--- a/app/models/email_template.rb
+++ b/app/models/email_template.rb
@@ -22,7 +22,8 @@ class EmailTemplate < ApplicationRecord
   validates :title,
             inclusion: TeacherMailer.instance_methods(false).map { |method| method.to_s.titlecase },
             if: -> { self.required? }
-  validates :body, presence: true
+  validates :body, presence: {message: "cannot be blank" }
+  validates :to, presence: {message: "cannot be blank" }
 
   before_destroy :prevent_deleting_required_emails
 

From 96267f9c84e4743ce0f6d418a880c812f6931309 Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Wed, 21 Feb 2024 13:09:42 -0800
Subject: [PATCH 09/10] rubocop fixes

---
 app/controllers/email_templates_controller.rb | 4 ++--
 app/models/email_template.rb                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/email_templates_controller.rb b/app/controllers/email_templates_controller.rb
index 9db5b06f..8dfe1c3f 100644
--- a/app/controllers/email_templates_controller.rb
+++ b/app/controllers/email_templates_controller.rb
@@ -18,7 +18,7 @@ def update
       flash[:success] = "Updated #{template.title} template successfully."
       redirect_to email_templates_path
     else
-      flash[:alert] = "Failed to save #{template.title} template: " + template.errors.full_messages.join(', ')
+      flash[:alert] = "Failed to save #{template.title} template: " + template.errors.full_messages.join(", ")
       redirect_to edit_email_template_path(params[:id])
     end
   end
@@ -36,7 +36,7 @@ def create
       flash[:success] = "Created #{@email_template.title} successfully."
       redirect_to email_templates_path
     else
-      flash[:alert] = "Failed to submit information: " + @email_template.errors.full_messages.join(', ')
+      flash[:alert] = "Failed to submit information: " + @email_template.errors.full_messages.join(", ")
       render "new"
     end
   end
diff --git a/app/models/email_template.rb b/app/models/email_template.rb
index 78583d6b..f8d516c2 100644
--- a/app/models/email_template.rb
+++ b/app/models/email_template.rb
@@ -22,8 +22,8 @@ class EmailTemplate < ApplicationRecord
   validates :title,
             inclusion: TeacherMailer.instance_methods(false).map { |method| method.to_s.titlecase },
             if: -> { self.required? }
-  validates :body, presence: {message: "cannot be blank" }
-  validates :to, presence: {message: "cannot be blank" }
+  validates :body, presence: { message: "cannot be blank" }
+  validates :to, presence: { message: "cannot be blank" }
 
   before_destroy :prevent_deleting_required_emails
 

From 96c18ec8a3ebdb16927ef32b58133fdc76e38c31 Mon Sep 17 00:00:00 2001
From: Arush Chhatrapati <arushc@berkeley.edu>
Date: Thu, 22 Feb 2024 21:12:33 -0800
Subject: [PATCH 10/10] added cucumber tests and added untracked migration file

---
 ...015_change_to_field_for_form_submission.rb |  5 ++++
 features/email_template.feature               | 30 +++++++++++++++++++
 features/step_definitions/web_steps.rb        | 12 ++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 db/migrate/20240220192015_change_to_field_for_form_submission.rb

diff --git a/db/migrate/20240220192015_change_to_field_for_form_submission.rb b/db/migrate/20240220192015_change_to_field_for_form_submission.rb
new file mode 100644
index 00000000..0674e52e
--- /dev/null
+++ b/db/migrate/20240220192015_change_to_field_for_form_submission.rb
@@ -0,0 +1,5 @@
+class ChangeToFieldForFormSubmission < ActiveRecord::Migration[6.1]
+  def change
+    EmailTemplate.find_by(path: "teacher_mailer/form_submission").update(to: "lmock@berkeley.edu, contact@bjc.berkeley.edu")
+  end
+end
diff --git a/features/email_template.feature b/features/email_template.feature
index 9b67dc3a..36e96d97 100644
--- a/features/email_template.feature
+++ b/features/email_template.feature
@@ -33,3 +33,33 @@ Scenario: Logging in as an admin should be able to edit email subject
     And I press "Submit"
     And I follow "Welcome Email"
     Then the "email_template_subject" field should contain "Test Subject"
+
+Scenario: Creating new email template with blank fields displays flash error
+    Given I am on the email templates index
+    And I press "New Email Templates"
+    When I press "Submit"
+    Then I should see "Failed to submit information: Body cannot be blank, To cannot be blank"
+
+Scenario: Creating and deleting new email template with valid fields succeeds
+    Given I am on the email templates index
+    And I press "New Email Templates"
+    When I fill in "email_template_title" with "Test Email"
+    And I fill in "email_template_subject" with "Test Subject"
+    And I fill in "email_template_to" with "{{teacher_email}}"
+    And I fill in TinyMCE email form with "This is the body of my test email"
+    And I press "Submit"
+    Then I should see "Created Test Email successfully"
+    When I follow the first "❌" link
+    And I accept the popup alert
+    Then I should be on the email templates index
+    And I should not see "Test Email"
+
+Scenario: Editing email template to have blank body or to field displays flash error
+    Given I am on the email templates index
+    And I follow "Welcome Email"
+    And I fill in "email_template_to" with ""
+    And I press "Submit"
+    Then I should see "Failed to save Welcome Email template: To cannot be blank"
+    When I fill in TinyMCE email form with ""
+    And I press "Submit"
+    Then I should see "Failed to save Welcome Email template: Body cannot be blank"
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index b35e61d9..6f216b75 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -60,6 +60,18 @@ def with_scope(locator, &block)
   page.execute_script('$(tinymce.editors[0].setContent("' + value + '"))')
 end
 
+When(/^(?:|I )follow the first "([^"]*)" link$/) do |link_text|
+  first("a", text: link_text).click
+end
+
+When(/^(?:|I )press the first "([^"]*)" button$/) do |button_text|
+  first("button", text: button_text).click
+end
+
+Then(/^(?:|I )accept the popup alert$/) do
+  page.driver.browser.switch_to.alert.accept
+end
+
 When(/^(?:|I )fill in "([^"]*)" for "([^"]*)"$/) do |value, field|
   fill_in(field, with: value)
 end