eslintrc

index.js

@@ -1,110 +1,110 @@
-const express = require('express');
+const express = require("express");
-const axios = require('axios');
+const axios = require("axios");
-const redis = require('redis');
+const redis = require("redis");
-const cors = require('cors');
+const cors = require("cors");
-const { param, validationResult } = require('express-validator');
+const { param, validationResult } = require("express-validator");
 const app = express();
 
+// Redis setup
 const redisConfig = {
-    url: process.env.REDIS_URL,
+  url: process.env.REDIS_URL,
-    db: 1,
+  database: 1,
-}
+};
 
-const client = redis.createClient(redisConfig);
+let redisClient;
 
-client.on('error', (err) => {
+(async () => {
-  console.log(err);
+  redisClient = redis.createClient(redisConfig);
-});
+  redisClient.on("error", (error) => console.error(`Error: ${error}`));
+  await redisClient.connect();
+})();
 
 // CORS
 app.use(cors());
 
-function LeagueSeason(leagueID, year) {
+// Functions
-  this.params = { league: leagueID, season: year }
+
+// Legacy fetch function
+function LeagueSeason(league, season) {
+  this.url = "https://api-football-v1.p.rapidapi.com/v3/standings";
+  this.method = "GET";
+  this.params = {
+    league: league,
+    season: season,
+  };
   this.headers = {
-    'x-rapidapi-host': process.env.API_HOST,
+    "X-RapidAPI-Host": process.env.API_HOST,
-    'x-rapidapi-key': process.env.API_KEY,
+    "X-RapidAPI-Key": process.env.API_KEY,
+  };
+}
+
+// Fetch table from remote API
+async function fetchTable(league, season) {
+  reqSeason = new LeagueSeason(league, season);
+  const apiResponse = await axios.request(reqSeason);
+  return apiResponse.data;
+}
+
+// Get a league table
+async function getLeagueTable(req, res) {
+  const league = req.params.league;
+  const season = req.params.season;
+  const seasontable = req.params.league + req.params.season;
+  let results;
+  let isCached = false;
+
+  // Try to fetch a league table
+  try {
+    // First check cache
+    const cacheResults = await redisClient.get(seasontable);
+    if (cacheResults) {
+      isCached = true;
+      results = JSON.parse(cacheResults);
+    } else {
+      // Fetch remotely
+      results = await fetchTable(league, season);
+      if (results.length === 0) {
+        throw "API returned no data";
+      }
+      // Store table in cache
+      await redisClient.set(seasontable, JSON.stringify(results), {
+        EX: 21600,
+        NX: true,
+      });
+    }
+    // Return the league table for the corresponding season
+    res.status(200).send({
+      fromCache: isCached,
+      table: results,
+    });
+  } catch (error) {
+    console.error(error);
+    res.status(404).send("Data not found");
   }
 }
 
 // Routes
+// new method
+app.get("/league/:league/:season", getLeagueTable);
 
-app.get('/pl', async (req, res) => {
+// Current Premier League Table
-  const league = '39';
+app.get("/pl", getLeagueTable);
-  const year = '2021';
-  const query = league + year;
-  try {
-    client.get(query, async (err, leagueTable) => {
-      if (err) throw err;
 
-      // Return cached league table if present
+app.get(
-      if (leagueTable) {
+  "/v2/:league/:year",
-        res.status(200).send({
-          table: JSON.parse(leagueTable),
-          message: 'data retrieved from cache',
-        });
-      } else {
-        // Fetch from the API
-        reqSeason = new LeagueSeason(league, year);
-        const leagueTable = await axios.get(
-          'https://v3.football.api-sports.io/standings',
-          reqSeason
-        );
-        // Save result to cache
-        client.setex(query, 43200, JSON.stringify(leagueTable.data));
-        // Return data from API
-        res.status(200).send({
-          table: leagueTable.data,
-          message: 'cache miss',
-        });
-      }
-    });
-  } catch (err) {
-    res.status(500).send({ message: err.message });
-  }
-});
-
-app.get('/championship', async (req, res) => {
-  const league = '40';
-  const year = '2021';
-  const query = league + year;
-  try {
-    client.get(query, async (err, leagueTable) => {
-      if (err) throw err;
-
-      // Return cached league table if present
-      if (leagueTable) {
-        res.status(200).send({
-          table: JSON.parse(leagueTable),
-          message: 'data retrieved from cache',
-        });
-      } else {
-        // Fetch from the API
-        reqSeason = new LeagueSeason(league, year);
-        const leagueTable = await axios.get(
-          'https://v3.football.api-sports.io/standings',
-          reqSeason
-        );
-        // Save result to cache
-        client.setex(league, 43200, JSON.stringify(leagueTable.data));
-        // Return data from API
-        res.status(200).send({
-          table: leagueTable.data,
-          message: 'cache miss',
-        });
-      }
-    });
-  } catch (err) {
-    res.status(500).send({ message: err.message });
-  }
-});
-
-app.get('/v2/:league/:year', 
   [
     // League id must be one of these
-    param('league').isIn(['39', '40', '41', '42']),
+    param("league").isIn(["39", "40", "41", "42"]),
     // Year must be no earlier than 2018
-    param('year').isIn(['2018', '2019', '2020', '2021']),
+    param("year").isIn([
+      "2018",
+      "2019",
+      "2020",
+      "2021",
+      "2022",
+      "2023",
+      "2024",
+    ]),
   ],
   async (req, res) => {
     // Validate
@@ -124,13 +124,13 @@ app.get('/v2/:league/:year',
         if (leagueTable) {
           res.status(200).send({
             table: JSON.parse(leagueTable),
-            message: 'data retrieved from cache',
+            message: "data retrieved from cache",
           });
         } else {
           // Fetch from the API
           reqSeason = new LeagueSeason(league, year);
           const leagueTable = await axios.get(
-            'https://v3.football.api-sports.io/standings',
+            "https://v3.football.api-sports.io/standings",
             reqSeason
           );
           // Save result to cache
@@ -138,14 +138,15 @@ app.get('/v2/:league/:year',
           // Return data from API
           res.status(200).send({
             table: leagueTable.data,
-            message: 'cache miss',
+            message: "cache miss",
           });
         }
       });
     } catch (err) {
       res.status(500).send({ message: err.message });
     }
-});
+  }
+);
 
 app.listen(process.env.PORT || 3001, () => {
   console.log(`Server running`);

package.json

@@ -1,8 +1,8 @@
 {
   "name": "league_table",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "engines": {
-    "node": "18.x"
+    "node": "20.x"
   },
   "description": "",
   "main": "index.js",
@@ -13,14 +13,15 @@
   "author": "nplayfair",
   "license": "MIT",
   "devDependencies": {
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.5.0",
-    "nodemon": "^3.0.2"
+    "eslint-import-resolver-node": "^0.3.9",
+    "nodemon": "^3.1.10"
   },
   "dependencies": {
-    "axios": "^1.6.2",
+    "axios": "^1.9.0",
     "cors": "^2.8.5",
-    "express": "^4.18.2",
+    "express": "^5.1.0",
-    "express-validator": "^7.0.1",
+    "express-validator": "^7.2.1",
-    "redis": "^4.6.11"
+    "redis": "^5.5.5"
   }
 }