function to get race results added and name changed for types

Author: yashkathe

package.json

@@ -30,7 +30,7 @@
         "name": "Yash Kathe"
     },
     "license": "GPL-3.0",
-    "bugs":"https://github.com/yashkathe/F1-API/issues",
+    "bugs": "https://github.com/yashkathe/F1-API/issues",
     "devDependencies": {
         "@types/cheerio": "^0.22.31",
         "@types/jest": "^29.1.1",

src/endpoints/endpoints.ts

@@ -9,6 +9,8 @@ interface dynamicLinks {
     driverStandings_2: string;
     constructorStandings_1: string;
     constructorStandings_2: string;
+    results_1: string;
+    results_2: string;
 }
 
 export const staticLinks: staticLinks = {
@@ -22,4 +24,6 @@ export const dynamicLinks: dynamicLinks = {
     driverStandings_2: "drivers.html",
     constructorStandings_1: "https://www.formula1.com/en/results.html",
     constructorStandings_2: "team.html",
+    results_1: "https://www.formula1.com/en/results.html",
+    results_2: "races.html",
 };

src/scraper/constructors-standings.ts

@@ -3,11 +3,11 @@ import cheerio from "cheerio";
 
 import { dynamicLinks } from "../endpoints/endpoints";
 
-import { constructorStanding } from "../types/types";
+import { isConstructorStanding } from "../types/types";
 
-export const getConstructorStandings = async (year: number = new Date().getFullYear()): Promise<constructorStanding[]> => {
+export const getConstructorStandings = async (year: number = new Date().getFullYear()): Promise<isConstructorStanding[]> => {
     try {
-        let constructorStandings: constructorStanding[] = [];
+        let constructorStandings: isConstructorStanding[] = [];
 
         const response = await axios(`${dynamicLinks.constructorStandings_1}/${year}/${dynamicLinks.constructorStandings_2}`);
         const $ = cheerio.load(response.data);
@@ -18,7 +18,7 @@ export const getConstructorStandings = async (year: number = new Date().getFullY
             const points: number = parseInt($(this).find("td:nth-child(4)").text().trim());
 
             if (!Number.isNaN(position) && team.length !== 0 && !Number.isNaN(points)) {
-                const constructorStanding: constructorStanding = {
+                const constructorStanding: isConstructorStanding = {
                     position,
                     team,
                     points,

src/scraper/driver-data.ts

@@ -3,11 +3,11 @@ import cheerio from "cheerio";
 
 import { staticLinks } from "../endpoints/endpoints";
 
-import { drivers } from "../types/types";
+import { isDriver } from "../types/types";
 
-export const getDriverData = (): Promise<drivers[]> => {
+export const getDriverData = (): Promise<isDriver[]> => {
     try {
-        let drivers: drivers[] = [];
+        let drivers: isDriver[] = [];
 
         return new Promise(async (resolve, reject) => {
             const response = await axios(staticLinks.drivers);
@@ -25,7 +25,7 @@ export const getDriverData = (): Promise<drivers[]> => {
                 const driverImage: string | undefined = $(this).find(" div:nth-child(4) > picture:nth-child(1) > img:nth-child(2)").attr("data-src");
 
                 if (firstName.length !== 0 && secondName.length !== 0 && team.length !== 0 && !Number.isNaN(rank) && !Number.isNaN(points)) {
-                    const driver: drivers = {
+                    const driver: isDriver = {
                         name: firstName.concat(" ", secondName),
                         team,
                         rank,

src/scraper/driver-standings.ts

@@ -3,11 +3,11 @@ import cheerio from "cheerio";
 
 import { dynamicLinks } from "../endpoints/endpoints";
 
-import { driverStanding } from "../types/types";
+import { isDriverStanding } from "../types/types";
 
-export const getDriverStandings = (year: number = new Date().getFullYear()): Promise<driverStanding[]> => {
+export const getDriverStandings = (year: number = new Date().getFullYear()): Promise<isDriverStanding[]> => {
     try {
-        let driverStandings: driverStanding[] = [];
+        let driverStandings: isDriverStanding[] = [];
 
         return new Promise(async (resolve, reject) => {
             const response = await axios(`${dynamicLinks.driverStandings_1}/${year}/${dynamicLinks.driverStandings_2}`);
@@ -23,7 +23,7 @@ export const getDriverStandings = (year: number = new Date().getFullYear()): Pro
                 const points: number = parseInt($(this).find(" td:nth-child(6) ").text());
 
                 if (!Number.isNaN(position) && !Number.isNaN(points) && driver.length !== 0 && nationality.length !== 0 && team.length !== 0) {
-                    const driverStanding: driverStanding = {
+                    const driverStanding: isDriverStanding = {
                         position,
                         driver,
                         nationality,

src/scraper/race-results.ts

@@ -0,0 +1,41 @@
+import axios from "axios";
+import cheerio from "cheerio";
+
+import { dynamicLinks } from "../endpoints/endpoints";
+
+import { isRaceResult } from "../types/types";
+
+export const getRaceResults = (year: number): Promise<isRaceResult[]> => {
+    try {
+        let raceResults: isRaceResult[] = [];
+
+        return new Promise(async (resolve, reject) => {
+            const response = await axios(`${dynamicLinks.results_1}/${year}/${dynamicLinks.results_2}`);
+            const $ = cheerio.load(response.data);
+
+            $("tr").each(function () {
+                const grandPrix: string = $(this).find("td:nth-child(2) > a:nth-child(1)").text().trim();
+                const raceDate: string = $(this).find("td:nth-child(3)").text().trim();
+                const winner: string = $(this).find("td:nth-child(4) > span:nth-child(2)").text().trim();
+                const car: string = $(this).find("td:nth-child(5)").text().trim();
+                const laps: number = parseInt($(this).find("td:nth-child(6)").text().trim());
+                const time: string = $(this).find("td:nth-child(7)").text().trim();
+
+                if ((grandPrix.length !== 0 && raceDate.length !== 0 && winner.length !== 0, car.length !== 0, !Number.isNaN(laps), time.length !== 0)) {
+                    const raceResult: isRaceResult = {
+                        grandPrix,
+                        date: new Date(raceDate),
+                        winner,
+                        car,
+                        laps,
+                        time,
+                    };
+                    raceResults.push(raceResult);
+                }
+                resolve(raceResults);
+            });
+        });
+    } catch (error: any) {
+        throw new Error(error);
+    }
+};

src/scraper/team-data.ts

@@ -3,11 +3,11 @@ import cheerio from "cheerio";
 
 import { staticLinks } from "../endpoints/endpoints";
 
-import { teams } from "../types/types";
+import { isTeam } from "../types/types";
 
-export const getTeamsData = (): Promise<teams[]> => {
+export const getTeamsData = (): Promise<isTeam[]> => {
     try {
-        let teams: teams[] = [];
+        let teams: isTeam[] = [];
 
         return new Promise(async (resolve, reject) => {
             const response = await axios(staticLinks.teams);
@@ -32,7 +32,7 @@ export const getTeamsData = (): Promise<teams[]> => {
                 const carImage: string | undefined = $(this).find("div:nth-child(1) > div:nth-child(4) > picture:nth-child(1) > img:nth-child(5)").attr("data-src");
 
                 if (name.length !== 0 && !Number.isNaN(points) && !Number.isNaN(rank)) {
-                    const team: teams = {
+                    const team: isTeam = {
                         name,
                         drivers,
                         points,

src/scraper/world-champions.ts

@@ -3,9 +3,9 @@ import cheerio from "cheerio";
 
 import { staticLinks } from "../endpoints/endpoints";
 
-import { hallOfFame } from "../types/types";
+import { isHallOfFame } from "../types/types";
 
-export const getWorldChampions = (): Promise<hallOfFame[]> => {
+export const getWorldChampions = (): Promise<isHallOfFame[]> => {
     try {
         let worldChampions: any = [];
 
@@ -31,7 +31,7 @@ export const getWorldChampions = (): Promise<hallOfFame[]> => {
                     });
 
                 if (name.length !== 0 && years.length !== 0) {
-                    const worldChampion: hallOfFame = {
+                    const worldChampion: isHallOfFame = {
                         name,
                         years,
                     };

src/server.ts

@@ -3,3 +3,4 @@ export { getTeamsData } from "./scraper/team-data";
 export { getDriverStandings } from "./scraper/driver-standings";
 export { getConstructorStandings } from "./scraper/constructors-standings";
 export { getWorldChampions } from "./scraper/world-champions";
+export { getRaceResults } from "./scraper/race-results";

src/types/types.ts

@@ -1,10 +1,10 @@
-export type constructorStanding = {
+export type isConstructorStanding = {
     position: number;
     team: string;
     points: number;
 };
 
-export type drivers = {
+export type isDriver = {
     name: string;
     team: string;
     rank: number;
@@ -13,15 +13,15 @@ export type drivers = {
     driverImage: string | undefined;
 };
 
-export type driverStanding = {
+export type isDriverStanding = {
     position: number;
     driver: string;
     nationality: string;
     team: string;
     points: number;
 };
 
-export type teams = {
+export type isTeam = {
     name: string;
     drivers: string[];
     points: number;
@@ -30,7 +30,16 @@ export type teams = {
     carImage: string | undefined;
 };
 
-export type hallOfFame = {
+export type isHallOfFame = {
     name: string;
     years: number[];
 };
+
+export type isRaceResult = {
+    grandPrix: string;
+    date: Date;
+    winner: string;
+    car: string;
+    laps: number;
+    time: string;
+};