From 5bdffec8f9b3b2723a18ea953d8c4ad7fef82a87 Mon Sep 17 00:00:00 2001
From: rebuilt <memoryman51@hotmail.com>
Date: Wed, 30 Aug 2023 15:18:38 -0700
Subject: [PATCH] Add disaggregation by ELL

---
 app/services/survey_item_values.rb                 |  1 -
 db/schema.rb                                       | 14 +++++++-------
 spec/services/survey_responses_data_loader_spec.rb | 13 +++++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/services/survey_item_values.rb b/app/services/survey_item_values.rb
index 2e851e08..3e541d73 100644
--- a/app/services/survey_item_values.rb
+++ b/app/services/survey_item_values.rb
@@ -312,4 +312,3 @@ class SurveyItemValues
     races
   end
 end
-
diff --git a/db/schema.rb b/db/schema.rb
index 92d92c3b..da386168 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_09_12_223701) do
+ActiveRecord::Schema[7.0].define(version: 20_230_912_223_701) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "plpgsql"
@@ -346,7 +346,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_09_12_223701) do
     t.integer "eleven"
     t.integer "twelve"
     t.index ["academic_year_id"], name: "index_respondents_on_academic_year_id"
-    t.index ["school_id", "academic_year_id"], name: "index_respondents_on_school_id_and_academic_year_id", unique: true
+    t.index %w[school_id academic_year_id], name: "index_respondents_on_school_id_and_academic_year_id", unique: true
   end
 
   create_table "response_rates", force: :cascade do |t|
@@ -360,7 +360,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_09_12_223701) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["academic_year_id"], name: "index_response_rates_on_academic_year_id"
-    t.index ["school_id", "subcategory_id"], name: "index_response_rates_on_school_id_and_subcategory_id"
+    t.index %w[school_id subcategory_id], name: "index_response_rates_on_school_id_and_subcategory_id"
     t.index ["subcategory_id"], name: "index_response_rates_on_subcategory_id"
   end
 
@@ -412,7 +412,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_09_12_223701) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["race_id"], name: "index_student_races_on_race_id"
-    t.index ["student_id", "race_id"], name: "index_student_races_on_student_id_and_race_id"
+    t.index %w[student_id race_id], name: "index_student_races_on_student_id_and_race_id"
     t.index ["student_id"], name: "index_student_races_on_student_id"
   end
 
@@ -453,9 +453,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_09_12_223701) do
     t.index ["gender_id"], name: "index_survey_item_responses_on_gender_id"
     t.index ["income_id"], name: "index_survey_item_responses_on_income_id"
     t.index ["response_id"], name: "index_survey_item_responses_on_response_id"
-    t.index ["school_id", "academic_year_id", "survey_item_id"], name: "by_school_year_and_survey_item"
-    t.index ["school_id", "academic_year_id"], name: "index_survey_item_responses_on_school_id_and_academic_year_id"
-    t.index ["school_id", "survey_item_id", "academic_year_id", "grade"], name: "index_survey_responses_on_grade"
+    t.index %w[school_id academic_year_id survey_item_id], name: "by_school_year_and_survey_item"
+    t.index %w[school_id academic_year_id], name: "index_survey_item_responses_on_school_id_and_academic_year_id"
+    t.index %w[school_id survey_item_id academic_year_id grade], name: "index_survey_responses_on_grade"
     t.index ["student_id"], name: "index_survey_item_responses_on_student_id"
     t.index ["survey_item_id"], name: "index_survey_item_responses_on_survey_item_id"
   end
diff --git a/spec/services/survey_responses_data_loader_spec.rb b/spec/services/survey_responses_data_loader_spec.rb
index 26500b63..c176fba9 100644
--- a/spec/services/survey_responses_data_loader_spec.rb
+++ b/spec/services/survey_responses_data_loader_spec.rb
@@ -370,3 +370,16 @@ def assigns_ell_to_responses
   end
 end
 
+def assigns_ell_to_responses
+  results = { "student_survey_response_1" => not_ell,
+              "student_survey_response_3" => unknown_ell,
+              "student_survey_response_4" => yes_ell,
+              "student_survey_response_5" => yes_ell,
+              "student_survey_response_6" => unknown_ell,
+              "student_survey_response_7" => unknown_ell }
+
+  results.each do |key, value|
+    ell = SurveyItemResponse.find_by_response_id(key).ell
+    expect(ell).to eq value
+  end
+end