From 2dd216ee25614b1d4aacfd12c95ca31ed2a86f52 Mon Sep 17 00:00:00 2001
From: Jared Cosulich <jared.cosulich@gmail.com>
Date: Mon, 14 Jan 2019 15:30:18 -0500
Subject: [PATCH] fixing bug with merging schools

---
 app/models/school_category.rb |  6 +++---
 lib/tasks/data.rake           | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/models/school_category.rb b/app/models/school_category.rb
index f8e985b5..161bf203 100644
--- a/app/models/school_category.rb
+++ b/app/models/school_category.rb
@@ -62,13 +62,13 @@ class SchoolCategory < ApplicationRecord
     return {
       attempt_count:
         _aggregated_responses[:attempt_count] +
-        child_school_categories.inject(0) { |total, csc| total + csc.attempt_count },
+        child_school_categories.inject(0) { |total, csc| total + csc.attempt_count || 0 },
       response_count:
         _aggregated_responses[:response_count] +
-        child_school_categories.inject(0) { |total, csc| total + csc.response_count },
+        child_school_categories.inject(0) { |total, csc| total + csc.response_count || 0 },
       answer_index_total:
         _aggregated_responses[:answer_index_total] +
-        child_school_categories.inject(0) { |total, csc| total + csc.answer_index_total },
+        child_school_categories.inject(0) { |total, csc| total + csc.answer_index_total || 0 },
       zscore: average_zscore.present? ? average_zscore : _aggregated_responses[:zscore]
     }
   end
diff --git a/lib/tasks/data.rake b/lib/tasks/data.rake
index 0893e46d..eb70f7be 100644
--- a/lib/tasks/data.rake
+++ b/lib/tasks/data.rake
@@ -383,16 +383,16 @@ namespace :data do
         )
       end
 
-      pc = nonlikert_category.parent_category
-      while pc != nil
-        psc = SchoolCategory.for(school, pc).in(school_category.year).first
-        if psc != nil
-          psc.update(valid_child_count: (psc.valid_child_count || 0) + 1)
-          pc = pc.parent_category
-        else
-          pc = nil
-        end
-      end
+      # pc = nonlikert_category.parent_category
+      # while pc != nil
+      #   psc = SchoolCategory.for(school, pc).in(school_category.year).first
+      #   if psc != nil
+      #     psc.update(valid_child_count: (psc.valid_child_count || 0) + 1)
+      #     pc = pc.parent_category
+      #   else
+      #     pc = nil
+      #   end
+      # end
 
     end