og-statistics 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "og-statistics",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "",
   "main": "./src/index.js",
   "scripts": {

package/src/index.js

@@ -102,17 +102,28 @@ function filterStats(statsBase, keys = def, fallback = 0) {
 card
 */
 
-function filterIncidents(incidents, side = false) {
+function filterIncidents(incidents) {
   try {
 
-    const cards = filterCards(incidents.incidents, side);
-    const goals = filterGoals(incidents.incidents, side);
-    const subs = filterSubs(incidents.incidents, side);
+    const home_cards = filterCards(incidents.incidents, true);
+    const home_goals = filterGoals(incidents.incidents, true);
+    const home_subs = filterSubs(incidents.incidents, true);
+
+    const away_cards = filterCards(incidents.incidents, false);
+    const away_goals = filterGoals(incidents.incidents, false);
+    const away_subs = filterSubs(incidents.incidents, false);
 
     return {
-      cards,
-      goals,
-      subs
+      home: {
+        cards: home_cards,
+        goals: home_goals,
+        subs: home_subs
+      },
+      away: {
+        cards: away_cards,
+        goals: away_goals,
+        subs: away_subs
+      }
     }
 
   } catch (error) {
@@ -163,11 +174,11 @@ const filterGoals = (incidents, isHome) => {
 };
 
 function filterSubs(incidents, isHome) {
-  const teamIncidents = incidents.filter(s => s.isHome === isHome && s.incidentType === 'substitution');
-  const teamInjured = incidents.filter(s => s.isHome === isHome && s.incidentType === 'substitution' && s.injury === true);
+  let teamIncidents = incidents.filter(s => s.isHome === isHome && s.incidentType === 'substitution');
+  let teamInjured = incidents.filter(s => s.isHome === isHome && s.incidentType === 'substitution' && s.injury === true);
 
   return {
-    subs: teamIncidents,
+    all: teamIncidents,
     injured: teamInjured
   }
 }