From c4e8dc828bef2f80cf41b9ea7b420442a83a6d50 Mon Sep 17 00:00:00 2001
From: Sendou <sendou77@gmail.com>
Date: Mon, 10 Feb 2020 18:56:00 +0200
Subject: [PATCH] voting with counts

---
 .../src/components/plus/SummaryLists.js        |  8 ++++++--
 .../src/graphql/queries/summaries.js           |  4 ++--
 graphql-schemas/plus.js                        | 18 ++++--------------
 mongoose-models/summary.js                     |  6 ++++--
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/frontend-react/src/components/plus/SummaryLists.js b/frontend-react/src/components/plus/SummaryLists.js
index 1bb58a731..ebeb96283 100644
--- a/frontend-react/src/components/plus/SummaryLists.js
+++ b/frontend-react/src/components/plus/SummaryLists.js
@@ -22,8 +22,12 @@ const summaryMap = summary => {
           <b>
             <span style={{ ...getColor(score.total) }}>{score.total}</span>%
           </b>{" "}
-          (EU <span style={getColor(score.eu)}>{score.eu}</span>% | NA{" "}
-          <span style={getColor(score.na)}>{score.na}</span>%)
+          {score.eu_count.length > 0 && (
+            <>
+              (EU <span>{score.eu_count.join("/")}</span> | NA{" "}
+              <span>{score.na_count.join("/")}</span>)
+            </>
+          )}
           {summary.vouched && (
             <Popup
               content="User was vouched to the server last month"
diff --git a/frontend-react/src/graphql/queries/summaries.js b/frontend-react/src/graphql/queries/summaries.js
index cef5325a2..bd00bcbe0 100644
--- a/frontend-react/src/graphql/queries/summaries.js
+++ b/frontend-react/src/graphql/queries/summaries.js
@@ -11,8 +11,8 @@ export const summaries = gql`
       }
       score {
         total
-        eu
-        na
+        eu_count
+        na_count
       }
       plus_server
       suggested
diff --git a/graphql-schemas/plus.js b/graphql-schemas/plus.js
index df7f6d1b9..9b234f4bf 100644
--- a/graphql-schemas/plus.js
+++ b/graphql-schemas/plus.js
@@ -96,8 +96,6 @@ const typeDef = gql`
 
   type Score {
     total: Float!
-    eu: Float
-    na: Float
     eu_count: [Int]
     na_count: [Int]
   }
@@ -637,16 +635,6 @@ const resolvers = {
           const same_total = same_region.reduce((acc, cur) => acc + cur)
           const other_total = other_region.reduce((acc, cur) => acc + cur)
 
-          const same_score = +(
-            ((same_total / same_region.length + 2) / 4) *
-            100
-          ).toFixed(2)
-
-          const other_score = +(
-            ((other_total / other_region.length + 1) / 2) *
-            100
-          ).toFixed(2)
-
           const total_score = +(
             ((same_total / same_region.length +
               other_total / other_region.length +
@@ -660,10 +648,12 @@ const resolvers = {
             const scoreIndex = scoreMap[cur]
             if (!acc[scoreIndex]) acc[scoreIndex] = 1
             else acc[scoreIndex] = acc[scoreIndex] + 1
+
+            return acc
           }
 
-          const same_count = same_region.reduce(countReducer, [])
-          const other_count = other_region.reduce(countReducer, [])
+          const same_count = same_region.reduce(countReducer, [0, 0, 0, 0])
+          const other_count = other_region.reduce(countReducer, [0, 0, 0, 0])
 
           const summary = {
             discord_id,
diff --git a/mongoose-models/summary.js b/mongoose-models/summary.js
index d98e4477a..59da3465a 100644
--- a/mongoose-models/summary.js
+++ b/mongoose-models/summary.js
@@ -9,8 +9,10 @@ const summarySchema = new mongoose.Schema({
   suggested: Boolean,
   score: {
     total: { type: Number, required: true, min: 0, max: 100 },
-    eu: { type: Number, required: true, min: 0, max: 100 },
-    na: { type: Number, required: true, min: 0, max: 100 },
+    eu: { type: Number, min: 0, max: 100 },
+    na: { type: Number, min: 0, max: 100 },
+    eu_count: [Number],
+    na_count: [Number],
   },
 })