Merge branch 'dev' into feat/add-australian-food-classification-data-table

This commit is contained in:
Daniel O'Connor
2025-12-01 19:43:24 +10:30
committed by GitHub
13 changed files with 2777 additions and 1 deletions

View File

@@ -635,7 +635,7 @@ GEM
rubocop-factory_bot (2.28.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rails (2.34.1)
rubocop-rails (2.34.2)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)

View File

@@ -149,6 +149,32 @@ class CropsController < ApplicationController
respond_with @crop
end
def data_improvement
@active_tab = params[:tab] || 'photos'
@crops = case @active_tab
when 'photos'
Crop.approved.where(photo_associations_count: 0).order(plantings_count: :desc)
when 'descriptions'
Crop.approved.where(description: [nil, '']).order(plantings_count: :desc)
when 'youtube'
Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
when 'alternate_names'
Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
when 'wikidata'
crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
when 'row_spacing'
Crop.approved.where(row_spacing: nil).order(plantings_count: :desc)
when 'sun_requirements'
Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
when 'height'
Crop.approved.where(height: nil).order(plantings_count: :desc)
else
Crop.none
end
end
private
def notifier

View File

@@ -0,0 +1,2 @@
class AustralianFoodClassificationData < ApplicationRecord
end

View File

@@ -0,0 +1,10 @@
%table.table.table-striped
%thead
%tr
%th Name
%th Plantings
%tbody
- crops.each do |crop|
%tr
%td= link_to crop.name, crop
%td= crop.plantings_count

View File

@@ -0,0 +1,13 @@
%h1 Data Improvement
- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
%ul.nav.nav-tabs
- tabs.each do |key, value|
%li{class: ('active' if @active_tab == key.to_s)}
= link_to value, data_improvement_crops_path(tab: key)
.tab-content
.tab-pane.active
%h2= "Crops without #{tabs[@active_tab.to_sym]}"
= render 'crop_list', crops: @crops

View File

@@ -3,6 +3,7 @@
- content_for :buttonbar do
- if can? :wrangle, Crop
= link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-secondary'
= link_to 'Data Improvement', data_improvement_crops_path, class: 'btn btn-info'
- if can? :create, Crop
= link_to 'Add New Crop', new_crop_path, class: 'btn btn-primary'

View File

@@ -89,6 +89,7 @@ Rails.application.routes.draw do
get 'wrangle'
get 'hierarchy'
get 'search'
get 'data_improvement'
end
end

View File

@@ -0,0 +1,301 @@
class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
def change
create_table :australian_food_classification_data do |t|
t.string :public_food_key, index: true, unique: true
t.string :classification
t.string :food_name
t.decimal :energy_with_dietary_fibre_equated_kj
t.decimal :energy_without_dietary_fibre_equated_kj
t.decimal :moisture_water_g
t.decimal :protein_g
t.decimal :nitrogen_g
t.decimal :fat_total_g
t.decimal :ash_g
t.decimal :total_dietary_fibre_g
t.decimal :alcohol_g
t.decimal :fructose_g
t.decimal :glucose_g
t.decimal :sucrose_g
t.decimal :maltose_g
t.decimal :lactose_g
t.decimal :galactose_g
t.decimal :maltotrios_g
t.decimal :total_sugars_g
t.decimal :added_sugars_g
t.decimal :free_sugars_g
t.decimal :starch_g
t.decimal :dextrin_g
t.decimal :glycerol_g
t.decimal :glycogen_g
t.decimal :inulin_g
t.decimal :erythritol_g
t.decimal :maltitol_g
t.decimal :mannitol_g
t.decimal :xylitol_g
t.decimal :maltodextrin_g
t.decimal :oligosaccharides_g
t.decimal :polydextrose_g
t.decimal :raffinose_g
t.decimal :stachyose_g
t.decimal :sorbitol_g
t.decimal :resistant_starch_g
t.decimal :available_carbohydrate_without_sugar_alcohols_g
t.decimal :available_carbohydrate_with_sugar_alcohols_g
t.decimal :acetic_acid_g
t.decimal :citric_acid_g
t.decimal :fumaric_acid_g
t.decimal :lactic_acid_g
t.decimal :malic_acid_g
t.decimal :oxalic_acid_g
t.decimal :propionic_acid_g
t.decimal :quinic_acid_g
t.decimal :shikimic_acid_g
t.decimal :succinic_acid_g
t.decimal :tartaric_acid_g
t.decimal :aluminium_al_ug
t.decimal :antimony_sb_ug
t.decimal :arsenic_as_ug
t.decimal :cadmium_cd_ug
t.decimal :calcium_ca_mg
t.decimal :chromium_cr_ug
t.decimal :chloride_cl_mg
t.decimal :cobalt_co_ug
t.decimal :copper_cu_mg
t.decimal :fluoride_f_ug
t.decimal :iodine_i_ug
t.decimal :iron_fe_mg
t.decimal :lead_pb_ug
t.decimal :magnesium_mg_mg
t.decimal :manganese_mn_mg
t.decimal :mercury_hg_ug
t.decimal :molybdenum_mo_ug
t.decimal :nickel_ni_ug
t.decimal :phosphorus_p_mg
t.decimal :potassium_k_mg
t.decimal :selenium_se_ug
t.decimal :sodium_na_mg
t.decimal :sulphur_s_mg
t.decimal :tin_sn_ug
t.decimal :zinc_zn_mg
t.decimal :retinol_preformed_vitamin_a_ug
t.decimal :alpha_carotene_ug
t.decimal :beta_carotene_ug
t.decimal :cryptoxanthin_ug
t.decimal :beta_carotene_equivalents_provitamin_a_ug
t.decimal :vitamin_a_retinol_equivalents_ug
t.decimal :lutein_ug
t.decimal :lycopene_ug
t.decimal :xanthophyl_ug
t.decimal :thiamin_b1_mg
t.decimal :riboflavin_b2_mg
t.decimal :niacin_b3_mg
t.decimal :niacin_derived_from_tryptophan_mg
t.decimal :niacin_derived_equivalents_mg
t.decimal :pantothenic_acid_b5_mg
t.decimal :pyridoxine_b6_mg
t.decimal :biotin_b7_ug
t.decimal :cobalamin_b12_ug
t.decimal :folate_natural_ug
t.decimal :folic_acid_ug
t.decimal :total_folates_ug
t.decimal :dietary_folate_equivalents_ug
t.decimal :vitamin_c_mg
t.decimal :cholecalciferol_d3_ug
t.decimal :ergocalciferol_d2_ug
t.decimal :c25_hydroxy_cholecalciferol_25_oh_d3_ug
t.decimal :c25_hydroxy_ergocalciferol_25_oh_d2_ug
t.decimal :vitamin_d3_equivalents_ug
t.decimal :alpha_tocopherol_mg
t.decimal :alpha_tocotrienol_mg
t.decimal :beta_tocopherol_mg
t.decimal :beta_tocotrienol_mg
t.decimal :delta_tocopherol_mg
t.decimal :delta_tocotrienol_mg
t.decimal :gamma_tocopherol_mg
t.decimal :gamma_tocotrienol_mg
t.decimal :vitamin_e_mg
t.decimal :c4_t
t.decimal :c6_t
t.decimal :c8_t
t.decimal :c10_t
t.decimal :c11_t
t.decimal :c12_t
t.decimal :c13_t
t.decimal :c14_t
t.decimal :c15_t
t.decimal :c16_t
t.decimal :c17_t
t.decimal :c18_t
t.decimal :c19_t
t.decimal :c20_t
t.decimal :c21_t
t.decimal :c22_t
t.decimal :c23_t
t.decimal :c24_t
t.decimal :total_saturated_fatty_acids_equated_t
t.decimal :c10_1_t
t.decimal :c12_1_t
t.decimal :c14_1_t
t.decimal :c15_1_t
t.decimal :c16_1_t
t.decimal :c17_1_t
t.decimal :c18_1_t
t.decimal :c18_1w5_t
t.decimal :c18_1w6_t
t.decimal :c18_1w7_t
t.decimal :c18_1w9_t
t.decimal :c20_1_t
t.decimal :c20_1w9_t
t.decimal :c20_1w13_t
t.decimal :c20_1w11_t
t.decimal :c22_1_t
t.decimal :c22_1w9_t
t.decimal :c22_1w11_t
t.decimal :c24_1_t
t.decimal :c24_1w9_t
t.decimal :c24_1w11_t
t.decimal :c24_1w13_t
t.decimal :total_monounsaturated_fatty_acids_equated_t
t.decimal :c12_2_t
t.decimal :c16_2w4_t
t.decimal :c16_3_t
t.decimal :c18_2w6_t
t.decimal :c18_3w3_t
t.decimal :c18_3w4_t
t.decimal :c18_3w6_t
t.decimal :c18_4w1_t
t.decimal :c18_4w3_t
t.decimal :c20_2_t
t.decimal :c20_2w6_t
t.decimal :c20_3_t
t.decimal :c20_4_t
t.decimal :c20_3w3_t
t.decimal :c20_3w6_t
t.decimal :c20_4w3_t
t.decimal :c20_4w6_t
t.decimal :c20_5w3_t
t.decimal :c21_5w3_t
t.decimal :c22_2_t
t.decimal :c22_2w6_t
t.decimal :c22_4w6_t
t.decimal :c22_5w3_t
t.decimal :c22_5w6_t
t.decimal :c22_6w3_t
t.decimal :total_polyunsaturated_fatty_acids_equated_t
t.decimal :total_long_chain_omega_3_fatty_acids_equated_t
t.decimal :total_undifferentiated_fatty_acids_t
t.decimal :total_trans_fatty_acids_imputed_t
t.decimal :c4_g
t.decimal :c6_g
t.decimal :c8_g
t.decimal :c10_g
t.decimal :c11_g
t.decimal :c12_g
t.decimal :c13_g
t.decimal :c14_g
t.decimal :c15_g
t.decimal :c16_g
t.decimal :c17_g
t.decimal :c18_g
t.decimal :c19_g
t.decimal :c20_g
t.decimal :c21_g
t.decimal :c22_g
t.decimal :c23_g
t.decimal :c24_g
t.decimal :total_saturated_fatty_acids_equated_g
t.decimal :c10_1_g
t.decimal :c12_1_g
t.decimal :c14_1_g
t.decimal :c15_1_g
t.decimal :c16_1_g
t.decimal :c17_1_g
t.decimal :c18_1_g
t.decimal :c18_1w5_mg
t.decimal :c18_1w6_mg
t.decimal :c18_1w7_g
t.decimal :c18_1w9_mg
t.decimal :c20_1_g
t.decimal :c20_1w9_mg
t.decimal :c20_1w13_mg
t.decimal :c20_1w11_mg
t.decimal :c22_1_g
t.decimal :c22_1w9_mg
t.decimal :c22_1w11_mg
t.decimal :c24_1_g
t.decimal :c24_1w9_mg
t.decimal :c24_1w11_mg
t.decimal :c24_1w13_mg
t.decimal :total_monounsaturated_fatty_acids_equated_g
t.decimal :c12_2_g
t.decimal :c16_2w4_mg
t.decimal :c16_3_g
t.decimal :c18_2w6_g
t.decimal :c18_3w3_g
t.decimal :c18_3w4_g
t.decimal :c18_3w6_mg
t.decimal :c18_4w1_g
t.decimal :c18_4w3_mg
t.decimal :c20_2_mg
t.decimal :c20_2w6_mg
t.decimal :c20_3_mg
t.decimal :c20_3w3_mg
t.decimal :c20_3w6_mg
t.decimal :c20_4_g
t.decimal :c20_4w3_mg
t.decimal :c20_4w6_mg
t.decimal :c20_5w3_mg
t.decimal :c21_5w3_g
t.decimal :c22_5w3_mg
t.decimal :c22_4w6_mg
t.decimal :c22_2_g
t.decimal :c22_2w6_mg
t.decimal :c22_5w6_g
t.decimal :c22_6w3_mg
t.decimal :total_polyunsaturated_fatty_acids_equated_g
t.decimal :total_long_chain_omega_3_fatty_acids_equated_mg
t.decimal :total_undifferentiated_fatty_acids_mass_basis_basis_mg
t.decimal :total_trans_fatty_acids_imputed_mg
t.decimal :caffeine_mg
t.decimal :cholesterol_mg
t.decimal :alanine_mg_gn
t.decimal :arginine_mg_gn
t.decimal :aspartic_acid_mg_gn
t.decimal :cystine_plus_cysteine_mg_gn
t.decimal :glutamic_acid_mg_gn
t.decimal :glycine_mg_gn
t.decimal :histidine_mg_gn
t.decimal :isoleucine_mg_gn
t.decimal :leucine_mg_gn
t.decimal :lysine_mg_gn
t.decimal :methionine_mg_gn
t.decimal :phenylalanine_mg_gn
t.decimal :proline_mg_gn
t.decimal :serine_mg_gn
t.decimal :threonine_mg_gn
t.decimal :tyrosine_mg_gn
t.decimal :tryptophan_mg_gn
t.decimal :valine_mg_gn
t.decimal :alanine_mg
t.decimal :arginine_mg
t.decimal :aspartic_acid_mg
t.decimal :cystine_plus_cysteine_mg
t.decimal :glutamic_acid_mg
t.decimal :glycine_mg
t.decimal :histidine_mg
t.decimal :isoleucine_mg
t.decimal :leucine_mg
t.decimal :lysine_mg
t.decimal :methionine_mg
t.decimal :phenylalanine_mg
t.decimal :proline_mg
t.decimal :serine_mg
t.decimal :threonine_mg
t.decimal :tyrosine_mg
t.decimal :tryptophan_mg
t.decimal :valine_mg
t.timestamps
end
end
end

View File

@@ -73,6 +73,305 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) do
t.index ["language"], name: "index_alternate_names_on_language"
end
create_table "australian_food_classification_data", force: :cascade do |t|
t.string "public_food_key"
t.string "classification"
t.string "food_name"
t.decimal "energy_with_dietary_fibre_equated_kj"
t.decimal "energy_without_dietary_fibre_equated_kj"
t.decimal "moisture_water_g"
t.decimal "protein_g"
t.decimal "nitrogen_g"
t.decimal "fat_total_g"
t.decimal "ash_g"
t.decimal "total_dietary_fibre_g"
t.decimal "alcohol_g"
t.decimal "fructose_g"
t.decimal "glucose_g"
t.decimal "sucrose_g"
t.decimal "maltose_g"
t.decimal "lactose_g"
t.decimal "galactose_g"
t.decimal "maltotrios_g"
t.decimal "total_sugars_g"
t.decimal "added_sugars_g"
t.decimal "free_sugars_g"
t.decimal "starch_g"
t.decimal "dextrin_g"
t.decimal "glycerol_g"
t.decimal "glycogen_g"
t.decimal "inulin_g"
t.decimal "erythritol_g"
t.decimal "maltitol_g"
t.decimal "mannitol_g"
t.decimal "xylitol_g"
t.decimal "maltodextrin_g"
t.decimal "oligosaccharides_g"
t.decimal "polydextrose_g"
t.decimal "raffinose_g"
t.decimal "stachyose_g"
t.decimal "sorbitol_g"
t.decimal "resistant_starch_g"
t.decimal "available_carbohydrate_without_sugar_alcohols_g"
t.decimal "available_carbohydrate_with_sugar_alcohols_g"
t.decimal "acetic_acid_g"
t.decimal "citric_acid_g"
t.decimal "fumaric_acid_g"
t.decimal "lactic_acid_g"
t.decimal "malic_acid_g"
t.decimal "oxalic_acid_g"
t.decimal "propionic_acid_g"
t.decimal "quinic_acid_g"
t.decimal "shikimic_acid_g"
t.decimal "succinic_acid_g"
t.decimal "tartaric_acid_g"
t.decimal "aluminium_al_ug"
t.decimal "antimony_sb_ug"
t.decimal "arsenic_as_ug"
t.decimal "cadmium_cd_ug"
t.decimal "calcium_ca_mg"
t.decimal "chromium_cr_ug"
t.decimal "chloride_cl_mg"
t.decimal "cobalt_co_ug"
t.decimal "copper_cu_mg"
t.decimal "fluoride_f_ug"
t.decimal "iodine_i_ug"
t.decimal "iron_fe_mg"
t.decimal "lead_pb_ug"
t.decimal "magnesium_mg_mg"
t.decimal "manganese_mn_mg"
t.decimal "mercury_hg_ug"
t.decimal "molybdenum_mo_ug"
t.decimal "nickel_ni_ug"
t.decimal "phosphorus_p_mg"
t.decimal "potassium_k_mg"
t.decimal "selenium_se_ug"
t.decimal "sodium_na_mg"
t.decimal "sulphur_s_mg"
t.decimal "tin_sn_ug"
t.decimal "zinc_zn_mg"
t.decimal "retinol_preformed_vitamin_a_ug"
t.decimal "alpha_carotene_ug"
t.decimal "beta_carotene_ug"
t.decimal "cryptoxanthin_ug"
t.decimal "beta_carotene_equivalents_provitamin_a_ug"
t.decimal "vitamin_a_retinol_equivalents_ug"
t.decimal "lutein_ug"
t.decimal "lycopene_ug"
t.decimal "xanthophyl_ug"
t.decimal "thiamin_b1_mg"
t.decimal "riboflavin_b2_mg"
t.decimal "niacin_b3_mg"
t.decimal "niacin_derived_from_tryptophan_mg"
t.decimal "niacin_derived_equivalents_mg"
t.decimal "pantothenic_acid_b5_mg"
t.decimal "pyridoxine_b6_mg"
t.decimal "biotin_b7_ug"
t.decimal "cobalamin_b12_ug"
t.decimal "folate_natural_ug"
t.decimal "folic_acid_ug"
t.decimal "total_folates_ug"
t.decimal "dietary_folate_equivalents_ug"
t.decimal "vitamin_c_mg"
t.decimal "cholecalciferol_d3_ug"
t.decimal "ergocalciferol_d2_ug"
t.decimal "c25_hydroxy_cholecalciferol_25_oh_d3_ug"
t.decimal "c25_hydroxy_ergocalciferol_25_oh_d2_ug"
t.decimal "vitamin_d3_equivalents_ug"
t.decimal "alpha_tocopherol_mg"
t.decimal "alpha_tocotrienol_mg"
t.decimal "beta_tocopherol_mg"
t.decimal "beta_tocotrienol_mg"
t.decimal "delta_tocopherol_mg"
t.decimal "delta_tocotrienol_mg"
t.decimal "gamma_tocopherol_mg"
t.decimal "gamma_tocotrienol_mg"
t.decimal "vitamin_e_mg"
t.decimal "c4_t"
t.decimal "c6_t"
t.decimal "c8_t"
t.decimal "c10_t"
t.decimal "c11_t"
t.decimal "c12_t"
t.decimal "c13_t"
t.decimal "c14_t"
t.decimal "c15_t"
t.decimal "c16_t"
t.decimal "c17_t"
t.decimal "c18_t"
t.decimal "c19_t"
t.decimal "c20_t"
t.decimal "c21_t"
t.decimal "c22_t"
t.decimal "c23_t"
t.decimal "c24_t"
t.decimal "total_saturated_fatty_acids_equated_t"
t.decimal "c10_1_t"
t.decimal "c12_1_t"
t.decimal "c14_1_t"
t.decimal "c15_1_t"
t.decimal "c16_1_t"
t.decimal "c17_1_t"
t.decimal "c18_1_t"
t.decimal "c18_1w5_t"
t.decimal "c18_1w6_t"
t.decimal "c18_1w7_t"
t.decimal "c18_1w9_t"
t.decimal "c20_1_t"
t.decimal "c20_1w9_t"
t.decimal "c20_1w13_t"
t.decimal "c20_1w11_t"
t.decimal "c22_1_t"
t.decimal "c22_1w9_t"
t.decimal "c22_1w11_t"
t.decimal "c24_1_t"
t.decimal "c24_1w9_t"
t.decimal "c24_1w11_t"
t.decimal "c24_1w13_t"
t.decimal "total_monounsaturated_fatty_acids_equated_t"
t.decimal "c12_2_t"
t.decimal "c16_2w4_t"
t.decimal "c16_3_t"
t.decimal "c18_2w6_t"
t.decimal "c18_3w3_t"
t.decimal "c18_3w4_t"
t.decimal "c18_3w6_t"
t.decimal "c18_4w1_t"
t.decimal "c18_4w3_t"
t.decimal "c20_2_t"
t.decimal "c20_2w6_t"
t.decimal "c20_3_t"
t.decimal "c20_4_t"
t.decimal "c20_3w3_t"
t.decimal "c20_3w6_t"
t.decimal "c20_4w3_t"
t.decimal "c20_4w6_t"
t.decimal "c20_5w3_t"
t.decimal "c21_5w3_t"
t.decimal "c22_2_t"
t.decimal "c22_2w6_t"
t.decimal "c22_4w6_t"
t.decimal "c22_5w3_t"
t.decimal "c22_5w6_t"
t.decimal "c22_6w3_t"
t.decimal "total_polyunsaturated_fatty_acids_equated_t"
t.decimal "total_long_chain_omega_3_fatty_acids_equated_t"
t.decimal "total_undifferentiated_fatty_acids_t"
t.decimal "total_trans_fatty_acids_imputed_t"
t.decimal "c4_g"
t.decimal "c6_g"
t.decimal "c8_g"
t.decimal "c10_g"
t.decimal "c11_g"
t.decimal "c12_g"
t.decimal "c13_g"
t.decimal "c14_g"
t.decimal "c15_g"
t.decimal "c16_g"
t.decimal "c17_g"
t.decimal "c18_g"
t.decimal "c19_g"
t.decimal "c20_g"
t.decimal "c21_g"
t.decimal "c22_g"
t.decimal "c23_g"
t.decimal "c24_g"
t.decimal "total_saturated_fatty_acids_equated_g"
t.decimal "c10_1_g"
t.decimal "c12_1_g"
t.decimal "c14_1_g"
t.decimal "c15_1_g"
t.decimal "c16_1_g"
t.decimal "c17_1_g"
t.decimal "c18_1_g"
t.decimal "c18_1w5_mg"
t.decimal "c18_1w6_mg"
t.decimal "c18_1w7_g"
t.decimal "c18_1w9_mg"
t.decimal "c20_1_g"
t.decimal "c20_1w9_mg"
t.decimal "c20_1w13_mg"
t.decimal "c20_1w11_mg"
t.decimal "c22_1_g"
t.decimal "c22_1w9_mg"
t.decimal "c22_1w11_mg"
t.decimal "c24_1_g"
t.decimal "c24_1w9_mg"
t.decimal "c24_1w11_mg"
t.decimal "c24_1w13_mg"
t.decimal "total_monounsaturated_fatty_acids_equated_g"
t.decimal "c12_2_g"
t.decimal "c16_2w4_mg"
t.decimal "c16_3_g"
t.decimal "c18_2w6_g"
t.decimal "c18_3w3_g"
t.decimal "c18_3w4_g"
t.decimal "c18_3w6_mg"
t.decimal "c18_4w1_g"
t.decimal "c18_4w3_mg"
t.decimal "c20_2_mg"
t.decimal "c20_2w6_mg"
t.decimal "c20_3_mg"
t.decimal "c20_3w3_mg"
t.decimal "c20_3w6_mg"
t.decimal "c20_4_g"
t.decimal "c20_4w3_mg"
t.decimal "c20_4w6_mg"
t.decimal "c20_5w3_mg"
t.decimal "c21_5w3_g"
t.decimal "c22_5w3_mg"
t.decimal "c22_4w6_mg"
t.decimal "c22_2_g"
t.decimal "c22_2w6_mg"
t.decimal "c22_5w6_g"
t.decimal "c22_6w3_mg"
t.decimal "total_polyunsaturated_fatty_acids_equated_g"
t.decimal "total_long_chain_omega_3_fatty_acids_equated_mg"
t.decimal "total_undifferentiated_fatty_acids_mass_basis_basis_mg"
t.decimal "total_trans_fatty_acids_imputed_mg"
t.decimal "caffeine_mg"
t.decimal "cholesterol_mg"
t.decimal "alanine_mg_gn"
t.decimal "arginine_mg_gn"
t.decimal "aspartic_acid_mg_gn"
t.decimal "cystine_plus_cysteine_mg_gn"
t.decimal "glutamic_acid_mg_gn"
t.decimal "glycine_mg_gn"
t.decimal "histidine_mg_gn"
t.decimal "isoleucine_mg_gn"
t.decimal "leucine_mg_gn"
t.decimal "lysine_mg_gn"
t.decimal "methionine_mg_gn"
t.decimal "phenylalanine_mg_gn"
t.decimal "proline_mg_gn"
t.decimal "serine_mg_gn"
t.decimal "threonine_mg_gn"
t.decimal "tyrosine_mg_gn"
t.decimal "tryptophan_mg_gn"
t.decimal "valine_mg_gn"
t.decimal "alanine_mg"
t.decimal "arginine_mg"
t.decimal "aspartic_acid_mg"
t.decimal "cystine_plus_cysteine_mg"
t.decimal "glutamic_acid_mg"
t.decimal "glycine_mg"
t.decimal "histidine_mg"
t.decimal "isoleucine_mg"
t.decimal "leucine_mg"
t.decimal "lysine_mg"
t.decimal "methionine_mg"
t.decimal "phenylalanine_mg"
t.decimal "proline_mg"
t.decimal "serine_mg"
t.decimal "threonine_mg"
t.decimal "tyrosine_mg"
t.decimal "tryptophan_mg"
t.decimal "valine_mg"
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.index ["public_food_key"], name: "index_australian_food_classification_data_on_public_food_key"
end
create_table "authentications", id: :serial, force: :cascade do |t|
t.integer "member_id", null: false
t.string "provider", null: false

View File

File diff suppressed because it is too large Load Diff

325
lib/tasks/import.rake Normal file
View File

@@ -0,0 +1,325 @@
require 'csv'
namespace :import do
desc "Import Australian Food Classification Data from a CSV file"
task australian_food_classification_data: :environment do
HEADER_MAP = {
"Public Food Key" => :public_food_key,
"Classification" => :classification,
"Food Name" => :food_name,
"Energy with dietary fibre, equated \n(kJ)" => :energy_with_dietary_fibre_equated_kj,
"Energy, without dietary fibre, equated \n(kJ)" => :energy_without_dietary_fibre_equated_kj,
"Moisture (water) \n(g)" => :moisture_water_g,
"Protein \n(g)" => :protein_g,
"Nitrogen \n(g)" => :nitrogen_g,
"Fat, total \n(g)" => :fat_total_g,
"Ash \n(g)" => :ash_g,
"Total dietary fibre \n(g)" => :total_dietary_fibre_g,
"Alcohol \n(g)" => :alcohol_g,
"Fructose \n(g)" => :fructose_g,
"Glucose \n(g)" => :glucose_g,
"Sucrose\n(g)" => :sucrose_g,
"Maltose \n(g)" => :maltose_g,
"Lactose \n(g)" => :lactose_g,
"Galactose \n(g)" => :galactose_g,
"Maltotrios \n(g)" => :maltotrios_g,
"Total sugars (g)" => :total_sugars_g,
"Added sugars (g)" => :added_sugars_g,
"Free sugars \n(g)" => :free_sugars_g,
"Starch \n(g)" => :starch_g,
"Dextrin \n(g)" => :dextrin_g,
"Glycerol \n(g)" => :glycerol_g,
"Glycogen \n(g)" => :glycogen_g,
"Inulin \n(g)" => :inulin_g,
"Erythritol \n(g)" => :erythritol_g,
"Maltitol \n(g)" => :maltitol_g,
"Mannitol \n(g)" => :mannitol_g,
"Xylitol \n(g)" => :xylitol_g,
"Maltodextrin (g)" => :maltodextrin_g,
"Oligosaccharides \n(g)" => :oligosaccharides_g,
"Polydextrose \n(g)" => :polydextrose_g,
"Raffinose \n(g)" => :raffinose_g,
"Stachyose \n(g)" => :stachyose_g,
"Sorbitol \n(g)" => :sorbitol_g,
"Resistant starch \n(g)" => :resistant_starch_g,
"Available carbohydrate, without sugar alcohols \n(g)" => :available_carbohydrate_without_sugar_alcohols_g,
"Available carbohydrate, with sugar alcohols \n(g)" => :available_carbohydrate_with_sugar_alcohols_g,
"Acetic acid \n(g)" => :acetic_acid_g,
"Citric acid \n(g)" => :citric_acid_g,
"Fumaric acid \n(g)" => :fumaric_acid_g,
"Lactic acid \n(g)" => :lactic_acid_g,
"Malic acid\n (g)" => :malic_acid_g,
"Oxalic acid \n(g)" => :oxalic_acid_g,
"Propionic acid \n(g)" => :propionic_acid_g,
"Quinic acid \n(g)" => :quinic_acid_g,
"Shikimic acid \n(g)" => :shikimic_acid_g,
"Succinic acid \n(g)" => :succinic_acid_g,
"Tartaric acid \n(g)" => :tartaric_acid_g,
"Aluminium (Al) \n(ug)" => :aluminium_al_ug,
"Antimony (Sb) \n(ug)" => :antimony_sb_ug,
"Arsenic (As) \n(ug)" => :arsenic_as_ug,
"Cadmium (Cd) \n(ug)" => :cadmium_cd_ug,
"Calcium (Ca) \n(mg)" => :calcium_ca_mg,
"Chromium (Cr) \n(ug)" => :chromium_cr_ug,
"Chloride (Cl) \n(mg)" => :chloride_cl_mg,
"Cobalt (Co) \n(ug)" => :cobalt_co_ug,
"Copper (Cu) \n(mg)" => :copper_cu_mg,
"Fluoride (F) \n(ug)" => :fluoride_f_ug,
"Iodine (I) \n(ug)" => :iodine_i_ug,
"Iron (Fe) \n(mg)" => :iron_fe_mg,
"Lead (Pb) \n(ug)" => :lead_pb_ug,
"Magnesium (Mg) \n(mg)" => :magnesium_mg_mg,
"Manganese (Mn) \n(mg)" => :manganese_mn_mg,
"Mercury (Hg) \n(ug)" => :mercury_hg_ug,
"Molybdenum (Mo) \n(ug)" => :molybdenum_mo_ug,
"Nickel (Ni) \n(ug)" => :nickel_ni_ug,
"Phosphorus (P) \n(mg)" => :phosphorus_p_mg,
"Potassium (K) \n(mg)" => :potassium_k_mg,
"Selenium (Se) \n(ug)" => :selenium_se_ug,
"Sodium (Na) \n(mg)" => :sodium_na_mg,
"Sulphur (S) \n(mg)" => :sulphur_s_mg,
"Tin (Sn) \n(ug)" => :tin_sn_ug,
"Zinc (Zn) \n(mg)" => :zinc_zn_mg,
"Retinol (preformed vitamin A) \n(ug)" => :retinol_preformed_vitamin_a_ug,
"Alpha-carotene \n(ug)" => :alpha_carotene_ug,
"Beta-carotene \n(ug)" => :beta_carotene_ug,
"Cryptoxanthin \n(ug)" => :cryptoxanthin_ug,
"Beta-carotene equivalents (provitamin A) \n(ug)" => :beta_carotene_equivalents_provitamin_a_ug,
"Vitamin A retinol equivalents \n(ug)" => :vitamin_a_retinol_equivalents_ug,
"Lutein \n(ug)" => :lutein_ug,
"Lycopene \n(ug)" => :lycopene_ug,
"Xanthophyl \n(ug)" => :xanthophyl_ug,
"Thiamin (B1) \n(mg)" => :thiamin_b1_mg,
"Riboflavin (B2) \n(mg)" => :riboflavin_b2_mg,
"Niacin (B3) \n(mg)" => :niacin_b3_mg,
"Niacin derived from tryptophan \n(mg)" => :niacin_derived_from_tryptophan_mg,
"Niacin derived equivalents \n(mg)" => :niacin_derived_equivalents_mg,
"Pantothenic acid (B5) \n(mg)" => :pantothenic_acid_b5_mg,
"Pyridoxine (B6) \n(mg)" => :pyridoxine_b6_mg,
"Biotin (B7) \n(ug)" => :biotin_b7_ug,
"Cobalamin (B12) \n(ug)" => :cobalamin_b12_ug,
"Folate, natural \n(ug)" => :folate_natural_ug,
"Folic acid \n(ug)" => :folic_acid_ug,
"Total folates \n(ug)" => :total_folates_ug,
"Dietary folate equivalents \n(ug)" => :dietary_folate_equivalents_ug,
"Vitamin C \n(mg)" => :vitamin_c_mg,
"Cholecalciferol (D3) \n(ug)" => :cholecalciferol_d3_ug,
"Ergocalciferol (D2) \n(ug)" => :ergocalciferol_d2_ug,
"25-hydroxy cholecalciferol (25-OH D3) \n(ug)" => :c25_hydroxy_cholecalciferol_25_oh_d3_ug,
"25-hydroxy ergocalciferol (25-OH D2) \n(ug)" => :c25_hydroxy_ergocalciferol_25_oh_d2_ug,
"Vitamin D3 equivalents \n(ug)" => :vitamin_d3_equivalents_ug,
"Alpha tocopherol \n(mg)" => :alpha_tocopherol_mg,
"Alpha tocotrienol \n(mg)" => :alpha_tocotrienol_mg,
"Beta tocopherol \n(mg)" => :beta_tocopherol_mg,
"Beta tocotrienol \n(mg)" => :beta_tocotrienol_mg,
"Delta tocopherol \n(mg)" => :delta_tocopherol_mg,
"Delta tocotrienol \n(mg)" => :delta_tocotrienol_mg,
"Gamma tocopherol \n(mg)" => :gamma_tocopherol_mg,
"Gamma tocotrienol \n(mg)" => :gamma_tocotrienol_mg,
"Vitamin E \n(mg)" => :vitamin_e_mg,
"C4 (%T)" => :c4_t,
"C6 (%T)" => :c6_t,
"C8 (%T)" => :c8_t,
"C10 (%T)" => :c10_t,
"C11 (%T)" => :c11_t,
"C12 (%T)" => :c12_t,
"C13 (%T)" => :c13_t,
"C14 (%T)" => :c14_t,
"C15 (%T)" => :c15_t,
"C16 (%T)" => :c16_t,
"C17 (%T)" => :c17_t,
"C18 (%T)" => :c18_t,
"C19 (%T)" => :c19_t,
"C20 (%T)" => :c20_t,
"C21 (%T)" => :c21_t,
"C22 (%T)" => :c22_t,
"C23 (%T)" => :c23_t,
"C24 (%T)" => :c24_t,
"Total saturated fatty acids, equated (%T)" => :total_saturated_fatty_acids_equated_t,
"C10:1 (%T)" => :c10_1_t,
"C12:1 (%T)" => :c12_1_t,
"C14:1 (%T)" => :c14_1_t,
"C15:1 (%T)" => :c15_1_t,
"C16:1 (%T)" => :c16_1_t,
"C17:1 (%T)" => :c17_1_t,
"C18:1 (%T)" => :c18_1_t,
"C18:1w5 (%T)" => :c18_1w5_t,
"C18:1w6 (%T)" => :c18_1w6_t,
"C18:1w7 (%T)" => :c18_1w7_t,
"C18:1w9 (%T)" => :c18_1w9_t,
"C20:1 (%T)" => :c20_1_t,
"C20:1w9 (%T)" => :c20_1w9_t,
"C20:1w13 (%T)" => :c20_1w13_t,
"C20:1w11 (%T)" => :c20_1w11_t,
"C22:1 (%T)" => :c22_1_t,
"C22:1w9 (%T)" => :c22_1w9_t,
"C22:1w11 (%T)" => :c22_1w11_t,
"C24:1 (%T)" => :c24_1_t,
"C24:1w9 (%T)" => :c24_1w9_t,
"C24:1w11 (%T)" => :c24_1w11_t,
"C24:1w13 (%T)" => :c24_1w13_t,
"Total monounsaturated fatty acids, equated (%T)" => :total_monounsaturated_fatty_acids_equated_t,
"C12:2 (%T)" => :c12_2_t,
"C16:2w4 (%T)" => :c16_2w4_t,
"C16:3 (%T)" => :c16_3_t,
"C18:2w6 (%T)" => :c18_2w6_t,
"C18:3w3 (%T)" => :c18_3w3_t,
"C18:3w4 (%T)" => :c18_3w4_t,
"C18:3w6 (%T)" => :c18_3w6_t,
"C18:4w1 (%T)" => :c18_4w1_t,
"C18:4w3 (%T)" => :c18_4w3_t,
"C20:2 (%T)" => :c20_2_t,
"C20:2w6 (%T)" => :c20_2w6_t,
"C20:3 (%T)" => :c20_3_t,
"C20:4 (%T)" => :c20_4_t,
"C20:3w3 (%T)" => :c20_3w3_t,
"C20:3w6 (%T)" => :c20_3w6_t,
"C20:4w3 (%T)" => :c20_4w3_t,
"C20:4w6 (%T)" => :c20_4w6_t,
"C20:5w3 (%T)" => :c20_5w3_t,
"C21:5w3 (%T)" => :c21_5w3_t,
"C22:2 (%T)" => :c22_2_t,
"C22:2w6 (%T)" => :c22_2w6_t,
"C22:4w6 (%T)" => :c22_4w6_t,
"C22:5w3 (%T)" => :c22_5w3_t,
"C22:5w6 (%T)" => :c22_5w6_t,
"C22:6w3 (%T)" => :c22_6w3_t,
"Total polyunsaturated fatty acids, equated (%T)" => :total_polyunsaturated_fatty_acids_equated_t,
"Total long chain omega 3 fatty acids, equated \n(%T)" => :total_long_chain_omega_3_fatty_acids_equated_t,
"Total undifferentiated fatty acids \n(%T)" => :total_undifferentiated_fatty_acids_t,
"Total trans fatty acids, imputed \n(%T)" => :total_trans_fatty_acids_imputed_t,
"C4 (g)" => :c4_g,
"C6 (g)" => :c6_g,
"C8 (g)" => :c8_g,
"C10 (g)" => :c10_g,
"C11 (g)" => :c11_g,
"C12 (g)" => :c12_g,
"C13 (g)" => :c13_g,
"C14 (g)" => :c14_g,
"C15 (g)" => :c15_g,
"C16 (g)" => :c16_g,
"C17 (g)" => :c17_g,
"C18 (g)" => :c18_g,
"C19 (g)" => :c19_g,
"C20 (g)" => :c20_g,
"C21 (g)" => :c21_g,
"C22 (g)" => :c22_g,
"C23 (g)" => :c23_g,
"C24 (g)" => :c24_g,
"Total saturated fatty acids, equated \n(g)" => :total_saturated_fatty_acids_equated_g,
"C10:1 (g)" => :c10_1_g,
"C12:1 (g)" => :c12_1_g,
"C14:1 (g)" => :c14_1_g,
"C15:1 (g)" => :c15_1_g,
"C16:1 (g)" => :c16_1_g,
"C17:1 (g)" => :c17_1_g,
"C18:1 (g)" => :c18_1_g,
"C18:1w5 (mg)" => :c18_1w5_mg,
"C18:1w6 (mg)" => :c18_1w6_mg,
"C18:1w7 (g)" => :c18_1w7_g,
"C18:1w9 (mg)" => :c18_1w9_mg,
"C20:1 (g)" => :c20_1_g,
"C20:1w9 (mg)" => :c20_1w9_mg,
"C20:1w13 (mg)" => :c20_1w13_mg,
"C20:1w11 (mg)" => :c20_1w11_mg,
"C22:1 (g)" => :c22_1_g,
"C22:1w9 (mg)" => :c22_1w9_mg,
"C22:1w11 (mg)" => :c22_1w11_mg,
"C24:1 (g)" => :c24_1_g,
"C24:1w9 (mg)" => :c24_1w9_mg,
"C24:1w11 (mg)" => :c24_1w11_mg,
"C24:1w13 (mg)" => :c24_1w13_mg,
"Total monounsaturated fatty acids, equated \n(g)" => :total_monounsaturated_fatty_acids_equated_g,
"C12:2 (g)" => :c12_2_g,
"C16:2w4 (mg)" => :c16_2w4_mg,
"C16:3 (g)" => :c16_3_g,
"C18:2w6 (g)" => :c18_2w6_g,
"C18:3w3 (g)" => :c18_3w3_g,
"C18:3w4 (g)" => :c18_3w4_g,
"C18:3w6 (mg)" => :c18_3w6_mg,
"C18:4w1 (g)" => :c18_4w1_g,
"C18:4w3 (mg)" => :c18_4w3_mg,
"C20:2 (mg)" => :c20_2_mg,
"C20:2w6 (mg)" => :c20_2w6_mg,
"C20:3 (mg)" => :c20_3_mg,
"C20:3w3 (mg)" => :c20_3w3_mg,
"C20:3w6 (mg)" => :c20_3w6_mg,
"C20:4 (g)" => :c20_4_g,
"C20:4w3 (mg)" => :c20_4w3_mg,
"C20:4w6 (mg)" => :c20_4w6_mg,
"C20:5w3 (mg)" => :c20_5w3_mg,
"C21:5w3 (g)" => :c21_5w3_g,
"C22:5w3 (mg)" => :c22_5w3_mg,
"C22:4w6 (mg)" => :c22_4w6_mg,
"C22:2 (g)" => :c22_2_g,
"C22:2w6 (mg)" => :c22_2w6_mg,
"C22:5w6 (g)" => :c22_5w6_g,
"C22:6w3 (mg)" => :c22_6w3_mg,
"Total polyunsaturated fatty acids, equated \n(g)" => :total_polyunsaturated_fatty_acids_equated_g,
"Total long chain omega 3 fatty acids, equated \n(mg)" => :total_long_chain_omega_3_fatty_acids_equated_mg,
"Total undifferentiated fatty acids, mass basis basis \n(mg)" => :total_undifferentiated_fatty_acids_mass_basis_basis_mg,
"Total trans fatty acids, imputed \n(mg)" => :total_trans_fatty_acids_imputed_mg,
"Caffeine \n(mg)" => :caffeine_mg,
"Cholesterol \n(mg)" => :cholesterol_mg,
"Alanine \n(mg/gN)" => :alanine_mg_gn,
"Arginine \n(mg/gN)" => :arginine_mg_gn,
"Aspartic acid \n(mg/gN)" => :aspartic_acid_mg_gn,
"Cystine plus cysteine \n(mg/gN)" => :cystine_plus_cysteine_mg_gn,
"Glutamic acid \n(mg/gN)" => :glutamic_acid_mg_gn,
"Glycine \n(mg/gN)" => :glycine_mg_gn,
"Histidine \n(mg/gN)" => :histidine_mg_gn,
"Isoleucine \n(mg/gN)" => :isoleucine_mg_gn,
"Leucine \n(mg/gN)" => :leucine_mg_gn,
"Lysine \n(mg/gN)" => :lysine_mg_gn,
"Methionine \n(mg/gN)" => :methionine_mg_gn,
"Phenylalanine \n(mg/gN)" => :phenylalanine_mg_gn,
"Proline \n(mg/gN)" => :proline_mg_gn,
"Serine \n(mg/gN)" => :serine_mg_gn,
"Threonine \n(mg/gN)" => :threonine_mg_gn,
"Tyrosine \n(mg/gN)" => :tyrosine_mg_gn,
"Tryptophan \n(mg/gN)" => :tryptophan_mg_gn,
"Valine \n(mg/gN)" => :valine_mg_gn,
"Alanine \n(mg)" => :alanine_mg,
"Arginine \n(mg)" => :arginine_mg,
"Aspartic acid \n(mg)" => :aspartic_acid_mg,
"Cystine plus cysteine \n(mg)" => :cystine_plus_cysteine_mg,
"Glutamic acid \n(mg)" => :glutamic_acid_mg,
"Glycine \n(mg)" => :glycine_mg,
"Histidine \n(mg)" => :histidine_mg,
"Isoleucine \n(mg)" => :isoleucine_mg,
"Leucine \n(mg)" => :leucine_mg,
"Lysine \n(mg)" => :lysine_mg,
"Methionine \n(mg)" => :methionine_mg,
"Phenylalanine \n(mg)" => :phenylalanine_mg,
"Proline \n(mg)" => :proline_mg,
"Serine \n(mg)" => :serine_mg,
"Threonine \n(mg)" => :threonine_mg,
"Tyrosine \n(mg)" => :tyrosine_mg,
"Tryptophan \n(mg)" => :tryptophan_mg,
"Valine \n(mg)" => :valine_mg
}.freeze
csv_file = File.read(Rails.root.join('lib', 'tasks', 'australian_food_classification_data.csv'))
csv = CSV.parse(csv_file, headers: true)
csv.each do |row|
record = AustralianFoodClassificationData.find_or_initialize_by(
public_food_key: row.fetch("Public Food Key")
)
attributes = {}
HEADER_MAP.each do |csv_header, db_column|
raw_value = row[csv_header]
value = if raw_value&.match?(/\A-?[\d,.]+\z/)
raw_value.gsub(',', '')
else
raw_value
end
attributes[db_column] = value
end
record.assign_attributes(attributes)
record.save!
end
end
end

26
spec/tasks/import_spec.rb Normal file
View File

@@ -0,0 +1,26 @@
require 'rails_helper'
require 'rake'
describe 'import:australian_food_classification_data' do
before :all do
Rails.application.load_tasks
end
it "imports the data from the CSV file" do
Rake::Task['import:australian_food_classification_data'].invoke
expect(AustralianFoodClassificationData.count).to eq(2)
first_record = AustralianFoodClassificationData.find_by(public_food_key: 'F002258')
expect(first_record.food_name).to eq('Cardamom seed, dried, ground')
expect(first_record.protein_g).to eq(BigDecimal('10.8'))
second_record = AustralianFoodClassificationData.find_by(public_food_key: 'F002893')
expect(second_record.food_name).to eq('Chilli (chili), dried, ground')
expect(second_record.fat_total_g).to eq(BigDecimal('14.3'))
# Test idempotency
Rake::Task['import:australian_food_classification_data'].reenable
Rake::Task['import:australian_food_classification_data'].invoke
expect(AustralianFoodClassificationData.count).to eq(2)
end
end

View File

@@ -12,6 +12,7 @@ describe "crops/show" do
@current_member = @member
@harvest = FactoryBot.create(:harvest, owner: @member)
controller.stub(:current_user) { @member }
assign(:version_members, {})
end
it "hides sunniness block if no sunniness" do