Merge remote-tracking branch 'origin/master' into solutions

Laoujin · Laoujin · commit 2aa3ef6fd3a9 · 2024-10-05T16:57:48.000+02:00
diff --git a/README.md b/README.md
@@ -110,8 +110,7 @@ In the `goals` table, `score0` and `score1` are `NULL`, our intern forgot to wri
 
 ### Other resources
 
-- [https://mystery.knightlab.com/](SQL Murder Mystery) - Can you find out whodunnit?
-- [https://datalemur.com/](datalemur.com) - Ace the SQL & Data Science Interview
-- [https://www.sql-practice.com/](sql-practice.com)
-- [https://sqlzoo.net/wiki/SQL_Tutorial](sqlzoo) - Learn SQL in stages (Countries & Teacher datasets came from this one!)
-
+- [SQL Murder Mystery](https://mystery.knightlab.com/) - Can you find out whodunnit?
+- [datalemur.com](https://datalemur.com/) - Ace the SQL & Data Science Interview
+- [sql-practice.com](https://www.sql-practice.com/)
+- [sqlzoo](https://sqlzoo.net/wiki/SQL_Tutorial) - Learn SQL in stages (Countries & Teacher datasets came from this one!)
diff --git a/sql-front/src/exercises/worldcupExercises.ts b/sql-front/src/exercises/worldcupExercises.ts
@@ -20,7 +20,7 @@ JOIN rounds r ON m.round_id=r.id JOIN events e ON r.event_id=e.id`,
     },
     {
       id: 2,
-      desc: 'Which country has "scored" the most ungoals?',
+      desc: 'Which country has "scored" the most owngoals?',
       points: 4,
       expected: [
         ['France', 4]
diff --git a/sql-front/src/leaderboard/ScoreTable.tsx b/sql-front/src/leaderboard/ScoreTable.tsx
@@ -27,6 +27,18 @@ export function ScoreTable({scores}: {scores: Score[]}) {
   const fastestTable = calculateFastest(exercises, scores);
   const leanestTable = calculateShortest(exercises, scores);
 
+  const totalScores = Object.entries(playerScores).map(([player, score]) => {
+    const fastest = fastestTable.filter(fast => fast.player === player).length;
+    const shortest = leanestTable.filter(fast => fast.player === player).length;
+    return {
+      name: player,
+      score,
+      fastest,
+      shortest,
+      total: score + fastest * 2 + shortest * 2
+    };
+  })
+
   return (
     <Table bordered hover>
       <thead>
@@ -40,17 +52,15 @@ export function ScoreTable({scores}: {scores: Score[]}) {
         </tr>
       </thead>
       <tbody>
-        {Object.entries(playerScores).sort((a, b) => b[1] - a[1]).map(([player, score], index) => {
-          const fastest = fastestTable.filter(fast => fast.player === player).length;
-          const shortest = leanestTable.filter(fast => fast.player === player).length;
+        {totalScores.sort((a, b) => b.total - a.total).map((player, index) => {
           return (
-            <tr key={player} className={player === registeredName ? 'table-primary' : undefined}>
+            <tr key={player.name} className={player.name === registeredName ? 'table-primary' : undefined}>
               <td>{index + 1}</td>
-              <td>{player}</td>
-              <td>{score}</td>
-              <td>{fastest}</td>
-              <td>{shortest}</td>
-              <td><b>{score + fastest * 2 + shortest * 2}</b></td>
+              <td>{player.name}</td>
+              <td>{player.score}</td>
+              <td>{player.fastest}</td>
+              <td>{player.shortest}</td>
+              <td><b>{player.total}</b></td>
             </tr>
           );
         })}
diff --git a/sql-server/Dockerfile b/sql-server/Dockerfile
@@ -9,4 +9,7 @@ ENV MSSQL_PID Express
 
 EXPOSE 1433
 
+RUN chmod +x ./entrypoint.sh
+RUN chmod +x ./run-initialization.sh
+
 CMD /bin/bash ./entrypoint.sh

Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ JOIN rounds r ON m.round_id=r.id JOIN events e ON r.event_id=e.id`,
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`id: 2,`
`23`		`- desc: 'Which country has "scored" the most ungoals?',`
	`23`	`+ desc: 'Which country has "scored" the most owngoals?',`
`24`	`24`	`points: 4,`
`25`	`25`	`expected: [`
`26`	`26`	`['France', 4]`