From a0e634c993f33f7a76dad2088104b7e7fe0542a0 Mon Sep 17 00:00:00 2001 From: Jared Cosulich Date: Fri, 1 Mar 2019 11:03:20 -0500 Subject: [PATCH] fixing merge_into --- app/models/school.rb | 2 +- app/models/school_category.rb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/school.rb b/app/models/school.rb index 6e973073..06893c25 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -48,7 +48,7 @@ class School < ApplicationRecord reload user_schools.update_all(school_id: school.id) - school.school_categories.map(&:sync_aggregated_responses) + # school.school_categories.map(&:sync_aggregated_responses) destroy end diff --git a/app/models/school_category.rb b/app/models/school_category.rb index cff724b7..6775147a 100644 --- a/app/models/school_category.rb +++ b/app/models/school_category.rb @@ -61,16 +61,18 @@ class SchoolCategory < ApplicationRecord average_zscore = total_zscore / zscore_categories.length end + + return { attempt_count: _aggregated_responses[:attempt_count] + - child_school_categories.inject(0) { |total, csc| total + csc.attempt_count || 0 }, + 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 || 0 }, + 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 || 0 }, + child_school_categories.inject(0) { |total, csc| total + (csc.answer_index_total || 0) }, zscore: average_zscore.present? ? average_zscore : _aggregated_responses[:zscore] } end