From 2a2fb61c58fcce60c6ff442e696a1021ca121684 Mon Sep 17 00:00:00 2001
From: Kalane <kalanehd@gmail.com>
Date: Wed, 15 Sep 2021 21:17:52 +0200
Subject: [PATCH] feat: aggregate RecentActivity with matches data

---
 .../components/Summoner/RecentActivity.vue    | 25 ++++++++-----------
 client/src/layouts/Default.vue                |  2 +-
 client/src/store/modules/summoner.js          |  4 +++
 .../Controllers/Http/SummonersController.ts   |  3 +++
 server-v2/app/Repositories/MatchRepository.ts | 19 ++++++++++++++
 server-v2/app/Services/StatsService.ts        |  8 ++++++
 6 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/client/src/components/Summoner/RecentActivity.vue b/client/src/components/Summoner/RecentActivity.vue
index e5bf468..95f2ae6 100644
--- a/client/src/components/Summoner/RecentActivity.vue
+++ b/client/src/components/Summoner/RecentActivity.vue
@@ -57,6 +57,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 import Tooltip from '@/components/Common/Tooltip.vue'
 
 export default {
@@ -64,15 +65,6 @@ export default {
     Tooltip,
   },
 
-  props: {
-    matches: {
-      type: Array,
-      default() {
-        return []
-      }
-    }
-  },
-
   data() {
     return {
       gridDays: [],
@@ -86,8 +78,14 @@ export default {
     }
   },
 
+  computed: {
+  ...mapState({
+      recentActivity: state => state.summoner.basic.recentActivity
+    }),
+  },
+
   watch: {
-    matches() {
+    recentActivity() {
       this.fillGrid()
     }
   },
@@ -118,16 +116,15 @@ export default {
     },
     fillGrid() {
       // Add all the matches made by the summoner
-      for (const key in this.matches) {
-        const match = this.matches[key]
-        const matchTime = new Date(match.timestamp)
+      for (const match of this.recentActivity) {
+        const matchTime = new Date(match.day)
         const formattedTime = matchTime.toLocaleString(undefined, this.options)
 
         const dayOfTheMatch = this.gridDays.filter(
           e => e.date === formattedTime
         )
         if (dayOfTheMatch.length > 0) {
-          dayOfTheMatch[0].matches++
+          dayOfTheMatch[0].matches = match.count
         }
       }
 
diff --git a/client/src/layouts/Default.vue b/client/src/layouts/Default.vue
index 7c68b0b..63594b2 100644
--- a/client/src/layouts/Default.vue
+++ b/client/src/layouts/Default.vue
@@ -114,7 +114,7 @@
             </div>
 
             <div>
-              <RecentActivity :matches="basic.matchList" />
+              <RecentActivity />
             </div>
           </div>
           <div class="flex items-center justify-between">
diff --git a/client/src/store/modules/summoner.js b/client/src/store/modules/summoner.js
index 395833c..9698aac 100644
--- a/client/src/store/modules/summoner.js
+++ b/client/src/store/modules/summoner.js
@@ -9,6 +9,7 @@ export const state = {
     currentSeason: null,
     matchList: [],
     ranked: {},
+    recentActivity: [],
     seasons: [],
     status: '',
   },
@@ -66,6 +67,7 @@ export const mutations = {
     state.overview.matchesLoading = true
   },
   MATCHES_FOUND(state, { newMatches, stats }) {
+    state.basic.recentActivity = stats.recentActivity
     state.overview.matchesLoading = false
     state.overview.matches = [...state.overview.matches, ...newMatches]
     state.overview.matchIndex += newMatches.length
@@ -74,6 +76,7 @@ export const mutations = {
     state.records.recordsLoaded = false
   },
   OVERVIEW_FOUND(state, infos) {
+    state.basic.recentActivity = infos.stats.recentActivity
     state.overview.matches = infos.matches
     state.overview.matchIndex = infos.matches.length
     state.overview.stats = infos.stats
@@ -87,6 +90,7 @@ export const mutations = {
     state.basic.account = infos.account
     state.basic.matchList = infos.matchList
     state.basic.ranked = infos.ranked
+    state.basic.recentActivity = infos.recentActivity
     state.basic.seasons = infos.seasons.sort((a, b) => b - a)
     state.basic.status = 'found'
     state.live.match = infos.current
diff --git a/server-v2/app/Controllers/Http/SummonersController.ts b/server-v2/app/Controllers/Http/SummonersController.ts
index f7920ca..a8de7e3 100644
--- a/server-v2/app/Controllers/Http/SummonersController.ts
+++ b/server-v2/app/Controllers/Http/SummonersController.ts
@@ -43,6 +43,9 @@ export default class SummonersController {
 
       // RANKED STATS
       finalJSON.ranked = await SummonerService.getRanked(account, region)
+
+      // RECENT ACTIVITY
+      finalJSON.recentActivity = await StatsService.getRecentActivity(account.puuid)
     } catch (e) {
       console.log(e)
       console.timeEnd('BASIC_REQUEST')
diff --git a/server-v2/app/Repositories/MatchRepository.ts b/server-v2/app/Repositories/MatchRepository.ts
index 55fa08b..e6317f1 100644
--- a/server-v2/app/Repositories/MatchRepository.ts
+++ b/server-v2/app/Repositories/MatchRepository.ts
@@ -12,6 +12,25 @@ class MatchRepository {
     AND matches.gamemode NOT IN (800, 810, 820, 830, 840, 850, 2000, 2010, 2020)
   `
 
+  public async recentActivity(puuid: string) {
+    const query = `
+    SELECT
+        to_timestamp(matches.date/1000)::date as day,
+        COUNT(match_players.id) as count
+    FROM
+        match_players
+        ${this.JOIN_MATCHES}
+    WHERE
+        match_players.summoner_puuid = :puuid
+    GROUP BY
+        day
+    ORDER BY
+        day
+    `
+    const { rows } = await Database.rawQuery(query, { puuid })
+    return rows
+  }
+
   public async globalStats(puuid: string) {
     const query = `
     SELECT
diff --git a/server-v2/app/Services/StatsService.ts b/server-v2/app/Services/StatsService.ts
index 8ba4081..36600ac 100644
--- a/server-v2/app/Services/StatsService.ts
+++ b/server-v2/app/Services/StatsService.ts
@@ -4,6 +4,9 @@ import MatchRepository from 'App/Repositories/MatchRepository'
 import BasicMatchSerializer from 'App/Serializers/BasicMatchSerializer'
 
 class StatsService {
+  public async getRecentActivity(puuid: string) {
+    return MatchRepository.recentActivity(puuid)
+  }
   public async getSummonerStats(puuid: string, season?: number) {
     console.time('GLOBAL')
     const globalStats = await MatchRepository.globalStats(puuid)
@@ -45,6 +48,10 @@ class StatsService {
     const mates = await MatchRepository.mates(puuid)
     console.timeEnd('MATES')
 
+    console.time('RECENT_ACTIVITY')
+    const recentActivity = await MatchRepository.recentActivity(puuid)
+    console.timeEnd('RECENT_ACTIVITY')
+
     return {
       global: globalStats,
       league: gamemodeStats,
@@ -52,6 +59,7 @@ class StatsService {
       champion: championStats,
       class: championClassStats,
       mates,
+      recentActivity,
     }
   }
 }