Merge pull request #6 from nestauk/ask-child-birthday

Store child age as birthday rather than no of months

app/controllers/users_controller.rb

@@ -34,6 +34,6 @@ def create
   private
 
   def user_params
-    params.require(:user).permit(:first_name, :last_name, :phone_number, :child_age, :interest_ids)
+    params.require(:user).permit(:first_name, :last_name, :phone_number, :child_birthday, :interest_ids)
   end
 end

app/models/user.rb

@@ -2,7 +2,7 @@ class User < ApplicationRecord
   has_many :interests
   has_many :messages, dependent: :destroy
   has_many :contents, through: :messages
-  validates :phone_number, :first_name, :last_name, :child_age, presence: true
+  validates :phone_number, :first_name, :last_name, :child_birthday, presence: true
   validates_uniqueness_of :phone_number
   phony_normalize :phone_number, default_country_code: "UK"
 
@@ -11,7 +11,7 @@ class User < ApplicationRecord
   scope :contactable, -> { where(contactable: true) }
 
   def child_age_in_months_today
-    child_age + ((Time.now.to_date.year * 12 + Time.now.to_date.month) - (created_at.to_date.year * 12 + created_at.to_date.month))
+    (Time.now.year * 12 + Time.now.month) - (child_birthday.year * 12 + child_birthday.month)
   end
 
   def full_name

app/views/users/new.html.erb

@@ -21,7 +21,7 @@
         </div>
 
         <div class="mt-3">
-          <%= form.input :child_age, label: "Your child's age in months" %>
+          <%= form.input :child_birthday, label: "Your child's age in months", as: :date, order: [:day, :month, :year]  %>
         </div>
 
         <%= form.input :interest_ids, as: :hidden, input_html: { value: params["interest_ids"] } %>

db/migrate/20240923131205_add_child_birthday_to_usr.rb

@@ -0,0 +1,12 @@
+class AddChildBirthdayToUsr < ActiveRecord::Migration[7.1]
+  def change
+    add_column :users, :child_birthday, :date
+
+    User.find_each do |user|
+      user.update(child_birthday: user.created_at - 18.months)
+    end
+
+    remove_column :users, :child_age, :date
+    change_column_null :users, :child_birthday, false
+  end
+end

test/factories/user.rb

@@ -3,6 +3,6 @@
     first_name { "Ali" }
     last_name { "Smith" }
     sequence(:phone_number) { |n| "07#{n}23456789" }
-    child_age { 18 }
+    child_birthday { Time.now - 18.months }
   end
 end

test/models/user_test.rb

@@ -22,7 +22,7 @@ class UserTest < ActiveSupport::TestCase
   test("phone_number required") { assert_present(:phone_number) }
   test("first_name required") { assert_present(:first_name) }
   test("last_name required") { assert_present(:last_name) }
-  test("child_age required") { assert_present(:child_age) }
+  test("child_birthday required") { assert_present(:child_birthday) }
 
   test "should have a contactable scope" do
     create(:user, contactable: false)
@@ -32,7 +32,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   test "child_age_in_months_today method" do
-    user = create(:user, child_age: 5)
+    user = create(:user, child_birthday: Time.now - 5.months)
 
     assert_equal user.child_age_in_months_today, 5
   end