1 files changed, 7 insertions, 5 deletions
diff --git a/app/models/nutrient_measurement.rb b/app/models/nutrient_measurement.rb
index 1139af7..b56c5ed 100644
--- a/app/models/nutrient_measurement.rb
+++ b/app/models/nutrient_measurement.rb
@@ -1,7 +1,5 @@
 class NutrientMeasurement < ApplicationRecord
-  NUTRIENT_FIELDS = %i[
-    nno3 p k ca mg s na cl si fe zn b mn cu mo nnh4
-  ].freeze
+  include NutrientVector
 
   validates :measured_on, presence: true
   validates :measured_on, uniqueness: true
@@ -12,7 +10,11 @@ class NutrientMeasurement < ApplicationRecord
     end
   end
 
-  def self.nutrient_fields
-    NUTRIENT_FIELDS
+  private
+
+  def nutrient_values
+    @nutrient_values ||= NutrientVector::NUTRIENT_KEYS.index_with do |k|
+      read_attribute(k).to_f
+    end
   end
 end