Fixed bug by removing convert_date method and creating new method con…

…vert_to_date. Removed unneeded methods get_date and is_missing_the_day?. Modified Spec test file to utilize convert_to_date method and added more parsing of date strings into date objects.

app/models/study_json_record/processor_v2.rb

@@ -102,16 +102,16 @@ def study_data
     {
       nct_id: nct_id,
       nlm_download_date_description: nil,
-      last_update_submitted_date: get_date(status['lastUpdateSubmitDate']),
-      study_first_submitted_date: get_date(status['studyFirstSubmitDate']),
+      last_update_submitted_date: convert_to_date(status['lastUpdateSubmitDate']),
+      study_first_submitted_date: convert_to_date(status['studyFirstSubmitDate']),
       study_first_submitted_qc_date: status['studyFirstSubmitQcDate'],
       study_first_posted_date: study_posted['date'],
       study_first_posted_date_type: study_posted['type'],
-      results_first_submitted_date: get_date(status['resultsFirstSubmitDate']),
+      results_first_submitted_date: convert_to_date(status['resultsFirstSubmitDate']),
       results_first_submitted_qc_date: status['resultsFirstSubmitQcDate'],
       results_first_posted_date: results_posted['date'],
       results_first_posted_date_type: results_posted['type'],
-      disposition_first_submitted_date: get_date(status['dispFirstSubmitDate']),
+      disposition_first_submitted_date: convert_to_date(status['dispFirstSubmitDate']),
       disposition_first_submitted_qc_date: status['dispFirstSubmitQcDate'],
       disposition_first_posted_date: disp_posted['date'],
       disposition_first_posted_date_type: disp_posted['type'],
@@ -120,15 +120,15 @@ def study_data
       last_update_posted_date_type: last_posted['type'],
       start_month_year: start_date['date'],
       start_date_type: start_date['type'],
-      start_date: convert_date(start_date['date']),
+      start_date: convert_to_date(start_date['date']),
       verification_month_year: status['statusVerifiedDate'],
-      verification_date: convert_date(status['statusVerifiedDate']),
+      verification_date: convert_to_date(status['statusVerifiedDate']),
       completion_month_year: completion_date['date'],
       completion_date_type: completion_date['type'],
-      completion_date: convert_date(completion_date['date']),
+      completion_date: convert_to_date(completion_date['date']),
       primary_completion_month_year: primary_completion_date['date'],
       primary_completion_date_type: primary_completion_date['type'],
-      primary_completion_date: convert_date(primary_completion_date['date']),
+      primary_completion_date: convert_to_date(primary_completion_date['date']),
       baseline_population: baseline['populationDescription'],
       brief_title: ident['briefTitle'],
       official_title: ident['officialTitle'],
@@ -276,29 +276,19 @@ def key_check(key)
     key ||= {}
   end
 
-  def get_date(str)
-    begin
-      str.try(:to_date)
-    rescue
-      nil
+  def convert_to_date(str)
+    case str.split('-').length
+    when 1
+      Date.strptime(str, '%Y').end_of_year
+    when 2
+      Date.strptime(str, '%Y-%m').end_of_month
+    when 3
+      Date.strptime(str, '%Y-%m-%d')
+    else
+      DateTime.strptime(str, '%Y-%m-%dT%H:%M')
     end
   end
-
-  def convert_date(str)
-    return unless str
-
-    converted_date = get_date(str)
-    return unless converted_date
-    return converted_date.end_of_month if is_missing_the_day?(str)
-
-    converted_date
-  end
-
-  def is_missing_the_day?(str)
-    # use this method on string representations of dates.  If only one space in the string, then the day is not provided.
-    (str.count ' ') == 1
-  end
-
+
   STRING_BOOLEAN_MAP = {
     'y' => true,
     'yes' => true,

spec/models/study_json_record/processor_v2_spec.rb

@@ -22,15 +22,15 @@
                         :last_update_posted_date_type=>"ACTUAL", 
                         :start_month_year=>"2006-11", 
                         :start_date_type=>"ESTIMATED", 
-                        :start_date=>nil, 
+                        :start_date=>Date.parse("Thu, 30 Nov 2006"), 
                         :verification_month_year=>"2017-05", 
-                        :verification_date=>nil, 
+                        :verification_date=>Date.parse("Wed, 31 May 2017"),
                         :completion_month_year=>"2013-01", 
                         :completion_date_type=>"ACTUAL", 
-                        :completion_date=>nil, 
+                        :completion_date=>Date.parse("Thu, 31 Jan 2013"),
                         :primary_completion_month_year=>"2013-01", 
                         :primary_completion_date_type=>"ACTUAL", 
-                        :primary_completion_date=>nil,
+                        :primary_completion_date=>Date.parse("Thu, 31 Jan 2013"),
                         :baseline_population=>"Patients attended the Washington University CF Clinics between 2006 and 2008.", 
                         :brief_title=>"Pilot and Feasibility Study for the Treatment of Pre-diabetes in Patients With Cystic Fibrosis", 
                         :official_title=>"Pilot and Feasibility Study for the Treatment of Pre-diabetes in Patients With Cystic Fibrosis", 
@@ -73,7 +73,7 @@
 
   context '#initialize' do
     it 'should set an instance variable @json with the JSON API data provided.' do
-      hash = JSON.parse(File.read('spec/support/json_data/study_data_output.json'))
+      hash = JSON.parse(File.read('spec/support/json_data/study_data.json'))
       json_instance = StudyJsonRecord::ProcessorV2.new(hash)
       json_value = json_instance.instance_variable_get("@json")
       expect(json_value).to eq(hash)
@@ -82,7 +82,7 @@
 
   context '#study_data' do
     it 'should use JSON API to generate data that will be inserted into the studies table.' do
-      hash = JSON.parse(File.read('spec/support/json_data/study_data_output.json'))
+      hash = JSON.parse(File.read('spec/support/json_data/study_data.json'))
       json_instance = StudyJsonRecord::ProcessorV2.new(hash)
       data = json_instance.study_data
       expect(data).to eq(study_data_output)