From 4b7b83827db3881381a0d060295294988240c159 Mon Sep 17 00:00:00 2001
From: Kalane <vkaelin@hey.com>
Date: Thu, 7 Nov 2024 20:40:35 +0100
Subject: [PATCH] fix: use new names in matches too

---
 client/src/components/Match/DetailedMatchTeam.vue         | 4 ++--
 client/src/components/Match/Match.vue                     | 8 ++++----
 client/src/components/Summoner/Overview/SummonerMates.vue | 2 +-
 client/src/layouts/Default.vue                            | 2 +-
 server/app/Parsers/MatchParser.ts                         | 4 ++--
 server/app/Services/Jax/src/Endpoints/SummonerEndpoint.ts | 1 +
 server/app/Services/SummonerService.ts                    | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/client/src/components/Match/DetailedMatchTeam.vue b/client/src/components/Match/DetailedMatchTeam.vue
index ac10f59..d8a7dab 100644
--- a/client/src/components/Match/DetailedMatchTeam.vue
+++ b/client/src/components/Match/DetailedMatchTeam.vue
@@ -186,13 +186,13 @@
                     'font-semibold text-yellow-400': account.id === player.summonerId,
                   }"
                   class="text-overflow w-[5.5rem] overflow-hidden whitespace-nowrap text-left text-xs text-white hover:text-blue-200"
-                  >{{ player.name }}</router-link
+                  >{{ player.name.replace('-', '#') }}</router-link
                 >
                 <div
                   v-else
                   class="text-overflow w-[5.5rem] overflow-hidden whitespace-nowrap text-left text-xs text-white"
                 >
-                  {{ player.name }}
+                  {{ player.name.replace('-', '#') }}
                 </div>
                 <div class="text-xxs text-teal-500">
                   {{ player.champion.name }}
diff --git a/client/src/components/Match/Match.vue b/client/src/components/Match/Match.vue
index 8c85f60..21110aa 100644
--- a/client/src/components/Match/Match.vue
+++ b/client/src/components/Match/Match.vue
@@ -141,14 +141,14 @@
                 }"
                 :class="isSummonerProfile(ally.account_id)"
                 class="text-overflow w-16 overflow-hidden whitespace-nowrap text-right text-xs font-medium hover:text-white"
-                >{{ ally.name }}</router-link
+                >{{ ally.name.replace('-', '#') }}</router-link
               >
               <div
                 v-else
                 :class="isSummonerProfile(ally.account_id)"
                 class="text-overflow w-16 overflow-hidden whitespace-nowrap text-right text-xs font-medium"
               >
-                {{ ally.name }}
+                {{ ally.name.replace('-', '#') }}
               </div>
               <div
                 :class="index !== 0 ? '-mt-1' : ''"
@@ -175,13 +175,13 @@
                   params: { region: $route.params.region, name: data.enemyTeam[index].name },
                 }"
                 class="text-overflow ml-1 w-16 overflow-hidden whitespace-nowrap text-left text-xs font-medium text-blue-200 hover:text-white"
-                >{{ data.enemyTeam[index].name }}</router-link
+                >{{ data.enemyTeam[index].name.replace('-', '#') }}</router-link
               >
               <div
                 v-else
                 class="text-overflow ml-1 w-16 overflow-hidden whitespace-nowrap text-left text-xs font-medium text-blue-200"
               >
-                {{ data.enemyTeam[index].name }}
+                {{ data.enemyTeam[index].name.replace('-', '#') }}
               </div>
             </div>
           </div>
diff --git a/client/src/components/Summoner/Overview/SummonerMates.vue b/client/src/components/Summoner/Overview/SummonerMates.vue
index 30be4bc..4a194c0 100644
--- a/client/src/components/Summoner/Overview/SummonerMates.vue
+++ b/client/src/components/Summoner/Overview/SummonerMates.vue
@@ -25,7 +25,7 @@
             <router-link
               :to="{ name: 'summoner', params: { region: $route.params.region, name: mate.name } }"
               class="w-2/4 truncate hover:text-teal-200"
-              >{{ mate.name }}</router-link
+              >{{ mate.name.replace('-', '#') }}</router-link
             >
             <div class="w-1/4">{{ mate.wins }} / {{ mate.losses }}</div>
             <div class="w-1/4">
diff --git a/client/src/layouts/Default.vue b/client/src/layouts/Default.vue
index 04629f3..159e5be 100644
--- a/client/src/layouts/Default.vue
+++ b/client/src/layouts/Default.vue
@@ -56,7 +56,7 @@
                 <Tooltip>
                   <template #trigger>
                     <h1 class="text-4xl font-extrabold">
-                      {{ basic.account.name }}
+                      {{ basic.account.name + '#' + basic.account.tagLine }}
                     </h1>
                   </template>
                   <template #default>
diff --git a/server/app/Parsers/MatchParser.ts b/server/app/Parsers/MatchParser.ts
index 7d11870..2a8c67e 100644
--- a/server/app/Parsers/MatchParser.ts
+++ b/server/app/Parsers/MatchParser.ts
@@ -1,7 +1,7 @@
 import Database, { TransactionClientContract } from '@ioc:Adonis/Lucid/Database'
 import { MatchDto } from 'App/Services/Jax/src/Endpoints/MatchEndpoint'
 import Match from 'App/Models/Match'
-import { getSeasonNumber, queuesWithRole } from 'App/helpers'
+import { ACCOUNT_NAME_DELIMITER, getSeasonNumber, queuesWithRole } from 'App/helpers'
 import CDragonService from 'App/Services/CDragonService'
 import { ChampionRoles, TeamPosition } from './ParsedType'
 class MatchParser {
@@ -106,7 +106,7 @@ class MatchParser {
           participant_id: player.participantId,
           summoner_id: player.summonerId,
           summoner_puuid: player.puuid,
-          summoner_name: player.summonerName || player.riotIdGameName,
+          summoner_name: player.riotIdGameName + ACCOUNT_NAME_DELIMITER + player.riotIdTagline,
           win: team.win ? 1 : 0,
           loss: team.win ? 0 : 1,
           remake: isRemake ? 1 : 0,
diff --git a/server/app/Services/Jax/src/Endpoints/SummonerEndpoint.ts b/server/app/Services/Jax/src/Endpoints/SummonerEndpoint.ts
index e805121..4ba9325 100644
--- a/server/app/Services/Jax/src/Endpoints/SummonerEndpoint.ts
+++ b/server/app/Services/Jax/src/Endpoints/SummonerEndpoint.ts
@@ -13,6 +13,7 @@ export interface SummonerDTO {
 
 export interface SummonerDTOExtended extends SummonerDTO {
   name: string
+  tagLine: string
 }
 
 export default class SummonerEndpoint {
diff --git a/server/app/Services/SummonerService.ts b/server/app/Services/SummonerService.ts
index e5b8240..1e4146e 100644
--- a/server/app/Services/SummonerService.ts
+++ b/server/app/Services/SummonerService.ts
@@ -76,7 +76,7 @@ class SummonerService {
 
     if (account) {
       const summoner = await Jax.Summoner.summonerPuuid(account.puuid, region)
-      return { ...summoner, name: account.gameName }
+      return { ...summoner, name: account.gameName, tagLine: account.tagLine }
     }
 
     return null
@@ -93,7 +93,7 @@ class SummonerService {
    */
   public async getAllSummonerNames(account: SummonerDTOExtended, summonerDB: Summoner) {
     await summonerDB.related('names').firstOrCreate({
-      name: account.name,
+      name: account.name + ACCOUNT_NAME_DELIMITER + account.tagLine,
     })
     return summonerDB.related('names').query().select('name', 'created_at')
   }