Testing import from arrays

mattbeedle · Apr 18, 2016 · 08853f9 · 08853f9
1 parent 76e716f
commit 08853f9
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 18 deletions.
diff --git a/lib/usda_nutrient_database/import/base.rb b/lib/usda_nutrient_database/import/base.rb
@@ -26,11 +26,7 @@ def extract_row(row)
       end
 
       def build_object(row)
-        find_or_initialize(row).tap do |object|
-          columns.each_with_index do |column, index|
-            object.send("#{column}=", row[index])
-          end
-        end
+        columns.map.with_index { |_, index| row[index] }
       end
 
       def columns

diff --git a/lib/usda_nutrient_database/import/food_groups.rb b/lib/usda_nutrient_database/import/food_groups.rb
@@ -21,8 +21,12 @@ def log_import_started
       end
 
       def save_objects
-        UsdaNutrientDatabase::FoodGroup.import(objects_to_import, {
-          validate: false
+        UsdaNutrientDatabase::FoodGroup.import(columns, objects_to_import, {
+          validate: false,
+          on_duplicate_key_update: {
+            conflict_target: :code,
+            columns: %i(description)
+          }
         })
       end
     end

diff --git a/lib/usda_nutrient_database/import/foods.rb b/lib/usda_nutrient_database/import/foods.rb
@@ -34,8 +34,12 @@ def columns
       end
 
       def save_objects
-        UsdaNutrientDatabase::Food.import(objects_to_import, {
-          validate: false
+        UsdaNutrientDatabase::Food.import(columns, objects_to_import, {
+          validate: false,
+          on_duplicate_key_update: {
+            conflict_target: :nutrient_databank_number,
+            columns: columns
+          }
         })
       end
     end

diff --git a/lib/usda_nutrient_database/import/foods_nutrients.rb b/lib/usda_nutrient_database/import/foods_nutrients.rb
@@ -4,6 +4,11 @@ class FoodsNutrients < Base
 
       private
 
+      def apply_typecasts(row)
+        row[8] = row[8] == 'Y'
+        row
+      end
+
       def columns
         [
           :nutrient_databank_number, :nutrient_number, :nutrient_value,
@@ -30,9 +35,15 @@ def log_import_started
       end
 
       def save_objects
-        UsdaNutrientDatabase::FoodsNutrient.import(objects_to_import, {
-          validate: false
-        })
+        objects_to_import.each_slice(10000) do |to_import|
+          UsdaNutrientDatabase::FoodsNutrient.import(columns, to_import, {
+            validate: false,
+            on_dupliate_key_update: {
+              conflict_target: %i(nutrient_databank_numner nutrient_number),
+              columns: columns
+            }
+          })
+        end
       end
     end
   end

diff --git a/lib/usda_nutrient_database/import/nutrients.rb b/lib/usda_nutrient_database/import/nutrients.rb
@@ -25,8 +25,12 @@ def log_import_started
       end
 
       def save_objects
-        UsdaNutrientDatabase::Nutrient.import(objects_to_import, {
-          validate: false
+        UsdaNutrientDatabase::Nutrient.import(columns, objects_to_import, {
+          validate: false,
+          on_duplicate_key_update: {
+            conflict_target: :nutrient_number,
+            columns: columns
+          }
         })
       end
     end

diff --git a/lib/usda_nutrient_database/import/source_codes.rb b/lib/usda_nutrient_database/import/source_codes.rb
@@ -21,8 +21,12 @@ def filename
       end
 
       def save_objects
-        UsdaNutrientDatabase::SourceCode.import(objects_to_import, {
-          validate: false
+        UsdaNutrientDatabase::SourceCode.import(columns, objects_to_import, {
+          validate: false,
+          on_duplicate_key_update: {
+            conflict_target: :code,
+            columns: columns
+          }
         })
       end
     end

diff --git a/lib/usda_nutrient_database/import/weights.rb b/lib/usda_nutrient_database/import/weights.rb
@@ -28,8 +28,12 @@ def log_import_started
       end
 
       def save_objects
-        UsdaNutrientDatabase::Weight.import(objects_to_import, {
-          validate: false
+        UsdaNutrientDatabase::Weight.import(columns, objects_to_import, {
+          validate: false,
+          on_duplicate_key_update: {
+            conflict_target: %i(nutrient_databank_number sequence_number),
+            columns: columns
+          }
         })
       end
     end