Fixed getTeamLineup method

Author: Matt443

src/endpoints/endpoints.ts

@@ -2,6 +2,7 @@ interface staticLinks {
     drivers: string;
     teams: string;
     hallOfFame: string;
+    teamsPoints: string;
 }
 
 interface dynamicLinks {
@@ -16,6 +17,7 @@ interface dynamicLinks {
 export const staticLinks: staticLinks = {
     drivers: "https://www.formula1.com/en/drivers.html",
     teams: "https://www.formula1.com/en/teams.html",
+    teamsPoints: `https://www.formula1.com/en/results/${new Date().getFullYear()}/team`,
     hallOfFame: "https://www.formula1.com/en/drivers/hall-of-fame.html",
 };
 

src/scraper/team-lineup.ts

@@ -8,29 +8,43 @@ import { isTeam } from "../types/types";
 export const getTeamLineup = async (): Promise<isTeam[]> => {
     try {
         let teams: isTeam[] = [];
-
         const response = await axios(staticLinks.teams);
         const $ = cheerio.load(response.data);
 
-        $("a.group").each(function () {
-            const name: string = $(this).find("div > div:nth-child(3) > div:nth-child(1) > span:nth-child(1)").text();
-            const driver1_0: string = $(this).find("div > div:nth-child(5) > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > p:nth-child(1)").text();
-            const driver1_1: string = $(this).find("div > div:nth-child(5) > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > p:nth-child(2)").text();
-            const driver2_0: string = $(this).find("div > div:nth-child(5) > div:nth-child(2) > div:nth-child(1) > div:nth-child(1) > p:nth-child(1)").text();
-            const driver2_1: string = $(this).find("div > div:nth-child(5) > div:nth-child(2) > div:nth-child(1) > div:nth-child(1) > p:nth-child(2)").text();
+        async function getTeamPoints(): Promise<Array<[string, number]>> {
+            const response = await axios(staticLinks.teamsPoints);
+            const $ = cheerio.load(response.data);
+
+            const teamPoints: Array<[string, number]> = [];
+            $(".f1-table tbody tr").each(function () {
+                const teamName = $(this).find("td:nth-child(2)").text().trim();
+                const points = $(this).find("td:nth-child(3)").text().trim();
+                teamPoints.push([teamName, Number(points)]);
+            });
+            return teamPoints;
+        }
+        const teamsPoints = await getTeamPoints();
+
+        $('a[data-f1rd-a7s-click="team_card_click"]').each(function () {
+            const name: string = $(this).find("span:nth-child(3) > span > span:nth-child(1) > p").text().trim();
+            const driver1_0: string = $(this).find("span:nth-child(3) > span > span:nth-child(1) > span > span:nth-child(1) > span:nth-child(2) > span:nth-child(1)").text().trim();
+            const driver1_1: string = $(this).find("span:nth-child(3) > span > span:nth-child(1) > span > span:nth-child(1) > span:nth-child(2) > span:nth-child(2)").text().trim();
+            const driver2_0: string = $(this).find("span:nth-child(3) > span > span:nth-child(1) > span > span:nth-child(2) > span:nth-child(2) > span:nth-child(1)").text().trim();
+            const driver2_1: string = $(this).find("span:nth-child(3) > span > span:nth-child(1) > span > span:nth-child(2) > span:nth-child(2) > span:nth-child(2)").text().trim();
             const driver1 = driver1_0.concat(" ", driver1_1);
             const driver2 = driver2_0.concat(" ", driver2_1);
             const drivers: string[] = [driver1, driver2];
 
-            const carLogo: string | undefined = $(this).find("div > div:nth-child(3) > img:nth-child(2)").attr("src");
-            const carImage: string | undefined = $(this).find("div > div:nth-child(6) > img:nth-child(1)").attr("src");
+            const carLogo: string | undefined = $(this).find("span:nth-child(3) > span > span:nth-child(2) > img").attr("src");
+            const carImage: string | undefined = $(this).find("span:nth-child(3) > span:nth-child(2) > img").attr("src");
 
-            const points: string | undefined = $(this).find("div> div:nth-child(1) > div:nth-child(2) > p:nth-child(1)").text();
+            const foundedPoints = teamsPoints.find((teamPoints) => teamPoints[0] === name);
+            const points: number | undefined = foundedPoints ? foundedPoints[1] : 0;
 
             if (name.length !== 0) {
                 const team: isTeam = {
                     name,
-                    points: parseInt(points),
+                    points,
                     drivers,
                     carLogo,
                     carImage,

src/server.ts

@@ -1,6 +1,6 @@
 export { getFastestLaps } from "./scraper/fastest-laps";
 export { getDriverLineup } from "./scraper/driver-lineup";
-// export { getTeamLineup } from "./scraper/team-lineup";
+export { getTeamLineup } from "./scraper/team-lineup";
 // export { getDriverStandings } from "./scraper/driver-standings";
 // export { getConstructorStandings } from "./scraper/constructors-standings";
 // export { getWorldChampions } from "./scraper/world-champions";