From 8828663880240e2c66d511e088513e93ac19c89d Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Tue, 3 Apr 2018 11:57:16 +0200 Subject: [PATCH] Individual: save the birthdate in Y --- app/models/individual.rb | 10 ++++++++++ spec/models/individual_spec.rb | 3 +++ 2 files changed, 13 insertions(+) diff --git a/app/models/individual.rb b/app/models/individual.rb index 3a0c1410c..b5ac55067 100644 --- a/app/models/individual.rb +++ b/app/models/individual.rb @@ -8,6 +8,7 @@ class Individual < ApplicationRecord validates :birthdate, format: { with: /\A\d{4}\-\d{2}\-\d{2}\z/, message: "La date n'est pas au format AAAA-MM-JJ" }, allow_nil: true before_validation :set_iso_date, if: -> { birthdate_changed? } + before_save :save_birthdate_in_datetime_format private @@ -17,4 +18,13 @@ class Individual < ApplicationRecord self.birthdate = Date.parse(birthdate).iso8601 end end + + def save_birthdate_in_datetime_format + if birthdate.present? + begin + self.second_birthdate = Date.parse(birthdate) + rescue + end + end + end end diff --git a/spec/models/individual_spec.rb b/spec/models/individual_spec.rb index c101a1ca7..43d627139 100644 --- a/spec/models/individual_spec.rb +++ b/spec/models/individual_spec.rb @@ -23,6 +23,7 @@ describe Individual do it { expect(individual.valid?).to be true } it { expect(individual.birthdate).to eq("1980-11-12") } + it { expect(individual.second_birthdate).to eq(Date.new(1980, 11, 12)) } end context "and the format is ISO" do @@ -30,6 +31,7 @@ describe Individual do it { expect(individual.valid?).to be true } it { expect(individual.birthdate).to eq("1980-11-12") } + it { expect(individual.second_birthdate).to eq(Date.new(1980, 11, 12)) } end context "and the format is WTF" do @@ -37,6 +39,7 @@ describe Individual do it { expect(individual.valid?).to be false } it { expect(individual.birthdate).to eq("1980 1 12") } + it { expect(individual.second_birthdate).to be_nil } end end end