From 55e399cab565a30c8c7c95f22826d4c794416da8 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 17 Jan 2020 11:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/item_baskets_controller.rb       |  8 +-------
 app/views/item_baskets/basket_list.json.jbuilder | 14 +++++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/controllers/item_baskets_controller.rb b/app/controllers/item_baskets_controller.rb
index dc5367378..03355189d 100644
--- a/app/controllers/item_baskets_controller.rb
+++ b/app/controllers/item_baskets_controller.rb
@@ -12,13 +12,7 @@ class ItemBasketsController < ApplicationController
   end
 
   def basket_list
-    @single_questions_count = current_user.item_baskets.where(item_type: "SINGLE").count
-    @multiple_questions_count = current_user.item_baskets.where(item_type: "MULTIPLE").count
-    @judgement_questions_count = current_user.item_baskets.where(item_type: "JUDGMENT").count
-    @completion_questions_count = current_user.item_baskets.where(item_type: "COMPLETION").count
-    @subjective_questions_count = current_user.item_baskets.where(item_type: "SUBJECTIVE").count
-    @practical_questions_count = current_user.item_baskets.where(item_type: "PRACTICAL").count
-    @program_questions_count = current_user.item_baskets.where(item_type: "PROGRAM").count
+    @basket_count = current_user.item_baskets.group(:item_type).count
   end
 
   def create
diff --git a/app/views/item_baskets/basket_list.json.jbuilder b/app/views/item_baskets/basket_list.json.jbuilder
index 11db844ab..4cb0d5592 100644
--- a/app/views/item_baskets/basket_list.json.jbuilder
+++ b/app/views/item_baskets/basket_list.json.jbuilder
@@ -1,7 +1,7 @@
-json.single_questions_count @single_questions_count
-json.multiple_questions_count @multiple_questions_count
-json.judgement_questions_count @judgement_questions_count
-json.completion_questions_count @completion_questions_count
-json.subjective_questions_count @subjective_questions_count
-json.practical_questions_count @practical_questions_count
-json.program_questions_count @program_questions_count
+json.single_questions_count @basket_count&.fetch("SINGLE", 0)
+json.multiple_questions_count @basket_count&.fetch("MULTIPLE", 0)
+json.judgement_questions_count @basket_count&.fetch("JUDGMENT", 0)
+json.completion_questions_count @basket_count&.fetch("COMPLETION", 0)
+json.subjective_questions_count @basket_count&.fetch("SUBJECTIVE", 0)
+json.practical_questions_count @basket_count&.fetch("PRACTICAL", 0)
+json.program_questions_count @basket_count&.fetch("PROGRAM", 0)
\ No newline at end of file