fix: team logotype on highscore list (#351)

Etimo · Nov 15, 2024 · 80af67a · 80af67a
1 parent 1fcd94e
commit 80af67a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/packages/backend/src/models/highscore-public.dto.ts b/packages/backend/src/models/highscore-public.dto.ts
@@ -17,16 +17,17 @@ export class HighscorePublicDto implements IHighscoreDto {
   @IsOptional()
   team: string | null = null;
 
-  @ApiProperty()
-  teamLogotype!: string;
+  @ApiPropertyOptional({ nullable: true })
+  @IsOptional()
+  teamLogotype: string | null = null;
 
   public static fromEntity(entity: IHighscore): HighscorePublicDto {
     return {
       botName: entity.bot!.name,
       score: entity.score,
       seasonId: entity.seasonId,
       team: entity.bot!.team?.name ?? null,
-      teamLogotype: entity.bot!.team!.logotypeUrl,
+      teamLogotype: entity.bot!.team?.logotypeUrl ?? null,
     };
   }
 }
diff --git a/packages/frontend/src/components/HighScoreTable.tsx b/packages/frontend/src/components/HighScoreTable.tsx
@@ -1,3 +1,4 @@
+import { IHighscoreDto } from '@etimo/diamonds2-types';
 import { FC, memo } from 'react';
 import { useHighScore } from '../hooks/useHighScore';
 import { Spinner } from './Spinner';
@@ -9,6 +10,16 @@ type HighScoreProps = {
 export const HighScoreTable: FC<HighScoreProps> = memo((props) => {
   const { seasonId } = props;
 
+  const logotype = (item: IHighscoreDto) => {
+    if (item.teamLogotype) {
+      return <img src={item.teamLogotype} alt="school-logo" />;
+    }
+    if (item.team) {
+      return item.team;
+    }
+    return '';
+  };
+
   if (!seasonId) {
     return <Spinner />;
   }
@@ -20,12 +31,7 @@ export const HighScoreTable: FC<HighScoreProps> = memo((props) => {
       data={highscore.map((item) => {
         return {
           name: item.botName,
-          team:
-            item.teamLogotype !== '' ? (
-              <img src={item.teamLogotype} alt="school-logo" />
-            ) : (
-              item.team
-            ),
+          team: logotype(item),
           score: item.score,
         };
       })}

diff --git a/packages/types/src/dto/highscore-dto.ts b/packages/types/src/dto/highscore-dto.ts
@@ -3,5 +3,5 @@ export interface IHighscoreDto {
   score: number;
   seasonId: string;
   team: string | null;
-  teamLogotype: string;
+  teamLogotype: string | null;
 }