Granular notify changes, improvements

PerlmutterFellows · Jan 14, 2021 · bc8e593 · bc8e593
1 parent b657619
commit bc8e593
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 55 deletions.
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -120,6 +120,6 @@ def set_event
 
     # Only allow a list of trusted parameters through.
     def event_params
-      params.require(:event).permit(:title, :description, :startDate, :startTime, :endDate, :endTime, :location, :eventType, :published, :users, :use_email, :use_call, :use_text, :use_app)
+      params.require(:event).permit(:title, :description, :startDate, :startTime, :endDate, :endTime, :location, :eventType, :published, :notify, :users, :use_email, :use_call, :use_text, :use_app)
     end
 end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
@@ -54,7 +54,7 @@ def get_event_html_body(event, attending_count, is_on_show)
     else
       if is_on_show
         event.users.each do |user|
-        users_html += "<p class='card-text pt-2'><strong>#{get_full_name(user)}</strong></p>" + get_user_html_body(user, EventStatus.find_by(user_id: user.id, event_id: event.id))
+          users_html += "<p class='card-text pt-2'><strong>#{get_full_name(user)}</strong></p>" + get_user_html_body(user, EventStatus.find_by(user_id: user.id, event_id: event.id))
         end
       end
       attendance_display_html = "#{attending_count} #{I18n.t("global.attending").downcase}"
@@ -67,17 +67,17 @@ def get_event_html_body(event, attending_count, is_on_show)
     end
 
     "#{!event.description.blank? ?
-           "<p class='card-text'><strong>#{I18n.t("events.description")}:</strong> #{with_urls(event.description)}</p>" :
-           ""}
+         "<p class='card-text'><strong>#{I18n.t("events.description")}:</strong> #{with_urls(event.description)}</p>" :
+         ""}
     #{!get_when_text(event).blank? ?
-          "<p class='card-text'><strong>#{I18n.t("events.when")}:</strong> #{with_urls(get_when_text(event))}</p>" :
-          ""}
+        "<p class='card-text'><strong>#{I18n.t("events.when")}:</strong> #{with_urls(get_when_text(event))}</p>" :
+        ""}
     #{!event.location.blank? ?
-          "<p class='card-text'><strong>#{I18n.t("events.where")}:</strong> #{with_urls(event.location)}</p>" :
-          ""}
+        "<p class='card-text'><strong>#{I18n.t("events.where")}:</strong> #{with_urls(event.location)}</p>" :
+        ""}
     #{attendance_display_html}
     #{users_html}"
-    .html_safe
+      .html_safe
   end
 
   def get_event_html_buttons(event, is_on_show)
@@ -90,8 +90,8 @@ def get_event_html_buttons(event, is_on_show)
                     <div class='btn-group btn-group-md' role='group'>"
     if moderator_signed_in?(current_user)
       button_html += "#{link_to I18n.t("global.delete"), event, class: "btn btn-danger", method: :delete, data: { confirm: I18n.t("global.are_you_sure") }}
-                      #{link_to I18n.t("global.edit"), edit_event_path(event), class: "btn btn-secondary"}
-                      #{tertiary_button}
+      #{link_to I18n.t("global.edit"), edit_event_path(event), class: "btn btn-secondary"}
+      #{tertiary_button}
                     </div>
                   </div>"
     else
@@ -141,10 +141,10 @@ def get_attending_counts(event)
     event.users.each do |user|
       status = EventStatus.find_by(user_id: user.id, event_id: event.id)
       if !status.blank? && status.attending?
-          attending_count += 1
+        attending_count += 1
       end
     end
-      attending_count
+    attending_count
   end
 
   ##
@@ -188,16 +188,18 @@ def get_event_text_params(event, uses_email)
   # event - an event
   # status - a status
   def set_new_state_after_notify(was_successful, event, status)
-    if was_successful
-      if event.event?
-        status.not_responded!
+    unless status.attending?
+      if was_successful
+        if event.event?
+          status.not_responded!
+        else
+          status.delivered!
+        end
       else
-        status.delivered!
+        status.not_delivered!
       end
-    else
-      status.not_delivered!
+      status.save
     end
-    status.save
   end
 
   ##
@@ -227,15 +229,17 @@ def handle_send_publish_event_notification(event, user, status, contact)
       end
       # Otherwise, they aren't new, don't update their state, send as updated event
     else
-      if contact == "email"
-        UserMailer.event_update_email(user, event).deliver rescue user
-      else
-        if contact == "text"
-          prompt = (event.event? ? t('texts.updated_prompt', id: event.id, yes: t('texts.text_yes'), no: t('texts.text_no')) : "")
-          TwilioHandler.new.send_text(user, t('texts.updated_event', params: get_event_text_params(event, false), type: event.eventType.capitalize, prompt: prompt))
+      if event.notify?
+        if contact == "email"
+          UserMailer.event_update_email(user, event).deliver rescue user
         else
-          prompt = (event.event? ? t('texts.updated_prompt', id: event.id.to_s.chars.join(' '), yes: " #{t('texts.call_yes')} #{t('texts.pound')}", no: " #{t('texts.call_no')} #{t('texts.pound')}") : "")
-          TwilioHandler.new.send_call(user, t('texts.updated_event', params: get_event_text_params(event, false), type: event.eventType.capitalize, prompt: prompt))
+          if contact == "text"
+            prompt = (event.event? ? t('texts.updated_prompt', id: event.id, yes: t('texts.text_yes'), no: t('texts.text_no')) : "")
+            TwilioHandler.new.send_text(user, t('texts.updated_event', params: get_event_text_params(event, false), type: event.eventType.capitalize, prompt: prompt))
+          else
+            prompt = (event.event? ? t('texts.updated_prompt', id: event.id.to_s.chars.join(' '), yes: " #{t('texts.call_yes')} #{t('texts.pound')}", no: " #{t('texts.call_no')} #{t('texts.pound')}") : "")
+            TwilioHandler.new.send_call(user, t('texts.updated_event', params: get_event_text_params(event, false), type: event.eventType.capitalize, prompt: prompt))
+          end
         end
       end
     end
@@ -248,36 +252,37 @@ def handle_send_publish_event_notification(event, user, status, contact)
   # user - a user
   # status - a status
   def send_publish_event_notification(event, user, status)
-    if !user.confirmed? && !user.confirmed_text? && !user.confirmed_call?
+    success = true
+    if user.use_email? && user.confirmed? && event.use_email?
+      success = handle_send_publish_event_notification(event, user, status, "email")
+    end
+    if user.use_text? && user.confirmed_text? && event.use_text?
+      success = handle_send_publish_event_notification(event, user, status, "text")
+    end
+    if user.use_call? && user.confirmed_call? && event.use_call?
+      success = handle_send_publish_event_notification(event, user, status, "call")
+    end
+    unless success
       status.not_delivered!
-    else
-      success = true
-      if user.use_email? && user.confirmed? && event.use_email?
-        success = handle_send_publish_event_notification(event, user, status, "email")
-      end
-      if user.use_text? && user.confirmed_text? && event.use_text?
-        success = handle_send_publish_event_notification(event, user, status, "text")
-      end
-      if user.use_call? && user.confirmed_call? && event.use_call?
-        success = handle_send_publish_event_notification(event, user, status, "call")
-      end
-      set_new_state_after_notify(success, event, status)
     end
+    set_new_state_after_notify(success, event, status)
   end
 
   ##
   # Sends notification of a deleted event to a given user
   # event - an event
   # user - a user
   def send_delete_event_notification(event, user)
-    if user.use_email? && user.confirmed? && event.use_email?
-      UserMailer.event_delete_email(user, event).deliver rescue user
-    end
-    if user.use_text? && user.confirmed_text? && event.use_text?
-      success, error = TwilioHandler.new.send_text(user, t('texts.deleted_event', params: get_event_text_params(event, false), type: event.eventType.capitalize))
-    end
-    if user.use_call? && user.confirmed_call? && event.use_call?
-      success, error = TwilioHandler.new.send_call(user, t('texts.deleted_event', params: get_event_text_params(event, false), type: event.eventType.capitalize))
+    if event.notify?
+      if user.use_email? && user.confirmed? && event.use_email?
+        UserMailer.event_delete_email(user, event).deliver rescue user
+      end
+      if user.use_text? && user.confirmed_text? && event.use_text?
+        success, error = TwilioHandler.new.send_text(user, t('texts.deleted_event', params: get_event_text_params(event, false), type: event.eventType.capitalize))
+      end
+      if user.use_call? && user.confirmed_call? && event.use_call?
+        success, error = TwilioHandler.new.send_call(user, t('texts.deleted_event', params: get_event_text_params(event, false), type: event.eventType.capitalize))
+      end
     end
   end
 

diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
@@ -63,6 +63,12 @@
             <% end %>
           </div>
 
+          <div class="col-12">
+            <%= f.form_group do %>
+              <%= f.check_box :notify, custom: :switch, control_class: "text-secondary", label: I18n.t("events.notify_changes") %>
+            <% end %>
+          </div>
+
         </div>
         <div class='btn-group mb-1' role='group'>
           <%= f.submit I18n.t("global.submit") %>

diff --git a/config/locales/presets/devise.es.yml b/config/locales/presets/devise.es.yml
@@ -122,7 +122,7 @@ es:
       signed_up: Bienvenido. Tu cuenta fue creada.
       signed_up_but_inactive: Tu cuenta ha sido creada correctamente. Sin embargo, no hemos podido iniciar la sesión porque tu cuenta aún no está activada.
       signed_up_but_locked: Tu cuenta ha sido creada correctamente. Sin embargo, no hemos podido iniciar la sesión porque que tu cuenta está bloqueada.
-      signed_up_but_unconfirmed: Se ha enviado un mensaje con un enlace de confirmación a tu correo electrónico. Abre el enlace para activar tu cuenta.
+      signed_up_but_unconfirmed: Se ha enviado un mensaje con un enlace de confirmación a su método de contacto. Siga el enlace para activar su cuenta.
       update_needs_confirmation: Has actualizado tu cuenta correctamente, pero es necesario confirmar tu nuevo correo electrónico. Por favor, comprueba tu correo y sigue el enlace de confirmación para finalizar la comprobación del nuevo correo electrónico.
       updated: Tu cuenta se ha actualizado.
       updated_but_not_signed_in: Su cuenta se ha actualizado correctamente, pero como se cambió su contraseña, debe iniciar sesión nuevamente

diff --git a/config/locales/presets/en.yml b/config/locales/presets/en.yml
@@ -140,6 +140,7 @@ en:
     location: "Location"
     type: "Type"
     published: "Published"
+    notify_changes: "Notify changes"
     event: "Event"
     info: "Info"
     message: "Message"
@@ -215,7 +216,7 @@ en:
     sessions:
       new:
         login: "Login"
-        login_prompt: "Please login below using your username, email, or phone number."
+        login_prompt: "Please login below using your email."
     passwords:
       title: "Forgot your password?"
       button: "Resend me reset password instructions"

diff --git a/config/locales/presets/es.yml b/config/locales/presets/es.yml
@@ -140,6 +140,7 @@ es:
     location: "Sitio"
     type: "Tipo"
     published: "Publicado"
+    notify_changes: "Notificar cambios"
     event: "Evento"
     info: "Información"
     message: "Mensaje"
@@ -215,7 +216,7 @@ es:
     sessions:
       new:
         login: "Iniciar sesión"
-        login_prompt: "Inicie sesión a continuación utilizando su nombre de usuario, correo electrónico o número de teléfono."
+        login_prompt: "Inicie sesión a continuación utilizando su correo electrónico."
     passwords:
       title: "¿Olvidaste tu contraseña?"
       button: "Reenviarme las instrucciones para restablecer la contraseña"

diff --git a/db/migrate/20210114090813_add_notify_flag.rb b/db/migrate/20210114090813_add_notify_flag.rb
@@ -0,0 +1,5 @@
+class AddNotifyFlag < ActiveRecord::Migration[6.0]
+  def change
+    add_column :events, :notify, :boolean, null: false, default: false
+  end
+end
diff --git 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: 2020_07_21_054514) do
+ActiveRecord::Schema.define(version: 2021_01_14_090813) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -61,6 +61,7 @@
     t.boolean "use_text", default: false
     t.boolean "use_call", default: false
     t.boolean "use_app", default: false
+    t.boolean "notify", default: false, null: false
   end
 
   create_table "group_memberships", force: :cascade do |t|

diff --git a/org_init.rb b/org_init.rb
@@ -557,7 +557,7 @@ def get_heroku_app_name(name)
       begin
         @config["config"]["app_name"] = @prompt.ask(prompt_box(name_prompt), default: name, required: true) { |q| q.validate /^[a-z0-9]+$/m, "Must be lowercase alphanumeric only" }
         name = @config["config"]["app_name"]
-        @cmd.run("heroku #{command_case} #{name}")
+        @cmd.run("heroku #{command_case} #{name} #{command_case == "create" ? "--stack heroku-18" : ""}")
         app_not_found = false
       rescue TTY::Command::ExitError
         error_box("App #{command_case} failed. Please try a different name.")
@@ -568,7 +568,7 @@ def get_heroku_app_name(name)
     begin
       @config["config"]["app_name"] = get_argument_value("heroku_app_name", true, nil)
       name = @config["config"]["app_name"]
-      @cmd.run("heroku #{command_case} #{name}")
+      @cmd.run("heroku #{command_case} #{name} #{command_case == "create" ? "--stack heroku-18" : ""}")
     rescue TTY::Command::ExitError
       error_box("App #{command_case} failed.")
       raise ArgumentError