og-statistics 1.0.0 → 2.0.1

package/package.json

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

package/src/index.js

@@ -102,24 +102,17 @@ function filterStats(statsBase, keys = def, fallback = 0) {
 card
 */
 
-function filterIncidents(incidents) {
+function filterIncidents(incidents, side = false) {
   try {
-    //Cards, goals, substitutions
 
-    const homeCards = filterCards(incidents.incidents, true);
-    const awayCards = filterCards(incidents.incidents, false);
-
-    const homeGoals = filterGoals(incidents.incidents, true);
-    const awayGoals = filterGoals(incidents.incidents, false);
-
-    const homeSubs = filterSubs(incidents.incidents, true);
-    const awaySubs = filterSubs(incidents.incidents, false);
+    const cards = filterCards(incidents.incidents, side);
+    const goals = filterGoals(incidents.incidents, side);
+    const subs = filterSubs(incidents.incidents, side);
 
     return {
-      home: { cards: homeCards, goals: homeGoals, subs: homeSubs },
-      away: { cards: awayCards, goals: awayGoals, subs: awaySubs },
-
-
+      cards,
+      goals,
+      subs
     }
 
   } catch (error) {
@@ -170,11 +163,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
   }
 }