Move user DOB formats to decorator

rubyforgood · Nov 8, 2023 · ecf5697 · ecf5697
1 parent dc8f97d
commit ecf5697
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
@@ -44,4 +44,16 @@ def formatted_reset_password_sent_at
   def formatted_invitation_sent_at
     formatted_timestamp(:invitation_sent_at)
   end
+
+  def formatted_birthday
+    return "" unless object.date_of_birth.respond_to?(:strftime)
+
+    object.date_of_birth.to_date.to_fs(:short_ordinal)
+  end
+
+  def formatted_date_of_birth
+    return "" unless object.date_of_birth.respond_to?(:strftime)
+
+    object.date_of_birth.to_date.to_fs(:slashes)
+  end
 end
diff --git a/app/notifications/volunteer_birthday_notification.rb b/app/notifications/volunteer_birthday_notification.rb
@@ -16,7 +16,7 @@ class VolunteerBirthdayNotification < BaseNotification
 
   # Define helper methods to make rendering easier.
   def message
-    "🎉 🎂  #{params[:volunteer].display_name}'s birthday is on #{params[:volunteer].date_of_birth.to_date.to_fs(:short_ordinal)}!"
+    "🎉 🎂  #{params[:volunteer].display_name}'s birthday is on #{params[:volunteer].decorate.formatted_birthday}!"
   end
 
   def title

diff --git a/app/views/shared/_edit_form.html.erb b/app/views/shared/_edit_form.html.erb
@@ -32,11 +32,11 @@
   <%= f.label :date_of_birth, "Date of birth" %>
   <% if policy(resource).update_user_setting? %>
     <%= f.text_field :date_of_birth,
-                     value: resource.date_of_birth&.strftime("%Y/%m/%d"),
+                     value: resource.decorate.formatted_date_of_birth,
                      data: {provide: "datepicker", date_format: "yyyy/mm/dd"},
                      class: "form-control label-font-weight" %>
-    <% else %>
-    <input type="text" placeholder="<%= resource.date_of_birth&.strftime("%Y/%m/%d") %>" autocomplete="off" readonly>
+  <% else %>
+    <input type="text" placeholder="<%= resource.decorate.formatted_date_of_birth %>" autocomplete="off" readonly>
   <% end %>
 </div>
 

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -26,7 +26,7 @@
             <div class="input-style-1">
               <%= form.label :date_of_birth, "Date of birth" %>
               <%= form.text_field :date_of_birth,
-                                  value: @user.date_of_birth&.strftime("%Y/%m/%d"),
+                                  value: @user.decorate.formatted_date_of_birth,
                                   data: {provide: "datepicker", date_format: "yyyy/mm/dd"},
                                   class: "form-control label-font-weight" %>
             </div>

diff --git a/config/initializers/date_formats.rb b/config/initializers/date_formats.rb
@@ -1 +1,2 @@
 Date::DATE_FORMATS[:short_ordinal] = ->(date) { date.strftime("%B #{date.day.ordinalize}") }
+Date::DATE_FORMATS[:slashes] = "%Y/%m/%d"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		Date::DATE_FORMATS[:short_ordinal] = ->(date) { date.strftime("%B #{date.day.ordinalize}") }
		Date::DATE_FORMATS[:slashes] = "%Y/%m/%d"