add get statistic route

index.js

@@ -15,13 +15,13 @@ const {
 const app = require('./src/api/app');
 
 const scrape = async () => {
-    await openBrowser(true);
+    await openBrowser(false);
     try {
         const currentlyListedGames = await getCurrentlyListedGames();
-        fs.writeFileSync('./newLeagues1.json', JSON.stringify(currentlyListedGames));
+        fs.writeFileSync('./newLeagues34.json', JSON.stringify(currentlyListedGames));
         const newRounds = await updateGamesAndLeaguesInDB(currentlyListedGames);
         const newTeamStats = await getTeamStats(newRounds);
-        fs.writeFileSync('./newStats2.json', JSON.stringify(newTeamStats));
+        fs.writeFileSync('./newStats34.json', JSON.stringify(newTeamStats));
         await updateStatsInDB(newTeamStats);
     } catch (e) {
         console.log(e);
@@ -30,9 +30,10 @@ const scrape = async () => {
     await closeBrowser();
 };
 
-// scrape();
+//scrape();
 
 const port = process.env.port || 5050;
 app.listen(port, () => {
    console.log(`App is listening at port ${port}`)
 });
+

package.json

@@ -20,6 +20,7 @@
     "express": "^4.17.1",
     "helmet": "^3.22.0",
     "knex": "^0.21.0",
+    "moment": "^2.25.3",
     "morgan": "^1.10.0",
     "pg": "^8.0.3",
     "puppeteer": "^2.1.1"

src/api/app.js

@@ -15,6 +15,7 @@ app.get('/', (req, res) => {
 });
 
 app.use('/api/v1/games', Routes.games);
+app.use('/api/v1/stat', Routes.stats);
 
 configErrorHandler(app);
 

src/api/config/middlewares.js

@@ -16,12 +16,12 @@ const notFound = (req, res, next) => {
     next(error);
 };
 
-const errorHandler = (error, req, res) => {
+const errorHandler = (error, req, res, next) => {
     const statusCode = res.statusCode === 200 ? 500 : res.statusCode;
     res.status(statusCode);
     res.json({
         status: statusCode,
-        message: error.message,
+        message: process.env.NODE_ENV === 'production' ? '🥞' : error.message,
         stack: process.env.NODE_ENV === 'production' ? '🥞' : error.stack,
     });
 };

src/api/modules/games/gamesController.js

@@ -2,9 +2,8 @@ const { getFilteredGamesFromDB } = require('../../../dbService/utils/dbOperation
 
 const getFilteredGames = async (req,res) => {
     try {
-        // cerate a base query body
         const games = await getFilteredGamesFromDB();
-        res.status(200).json({ games });
+        res.status(200).json({ games, length: games.length });
     } catch (e) {
         res.status(400).json({ message: e.message });
     }

src/api/modules/index.js

@@ -1,5 +1,7 @@
 const games = require('./games/gamesRoutes');
+const stats = require('./stats/statRoutes');
 
 module.exports = {
-    games
+    games,
+    stats,
 };

src/api/modules/stats/statRoutes.js

@@ -0,0 +1,8 @@
+const { Router } = require('express');
+const { getStatForTeam } = require('./statsController');
+
+const routes = Router();
+
+routes.get('/team/:teamID/:state', getStatForTeam);
+
+module.exports = routes;

src/api/modules/stats/statsController.js

@@ -0,0 +1,19 @@
+const { getHomeTeamStatFromDB, getAwayTeamStatFromDB } =require('../../../dbService/utils/dbOperations');
+
+const getStatForTeam = async (req, res) => {
+    // TODO add validation
+    const teamID = req.params.teamID;
+    const state = req.params.state;
+    const statQuery = state === 'home' ? getHomeTeamStatFromDB : getAwayTeamStatFromDB;
+
+    try {
+        const stats = await statQuery(teamID);
+        res.status(200).json({ teamID, state, stats });
+    } catch(e) {
+        res.status(400).json({ message: e.message });
+    }
+};
+
+module.exports = {
+    getStatForTeam,
+};

src/dbService/utils/dbOperations.js

@@ -1,5 +1,6 @@
 const db = require('../db');
 const tableNames = require('../constants/tableNames');
+const moment = require('moment');
 
 // Inserts
 const createUpsertOrDoNothing = dataBase => tableName => conflictingFields => async dataToBeInserted =>
@@ -27,13 +28,13 @@ const insertIntoLeagues = createInsertIntoLeagues('name');
 const insertIntoTeams = createInsertIntoTeams('name');
 
 // Queries
-const createQuery = dataBase => tableName => (...fields) => async () =>
+const createBaseQuery = dataBase => tableName => (...fields) => async () =>
             dataBase.from(tableName).select(fields);
 
 const createIdQueryForName = dataBase => tableName => async name =>
             dataBase.from(tableName).where('name', name).select('id').first();
 
-const query = createQuery(db);
+const query = createBaseQuery(db);
 const idQuery = createIdQueryForName(db);
 
 const createWeeklyGameHashQuery = query(tableNames.weekly_game_hash);
@@ -45,14 +46,36 @@ const getTeamIdWhereNameFromDB = idQuery(tableNames.team);
 const getWeeklyGameHashFromDB = createWeeklyGameHashQuery('hash');
 const getGameHashFromDB = createGameHashQuery('hash');
 
-// TODO stat and a game queries, always pick the latest one as, there will be the data always be inserted
+const getFilteredGamesFromDB = async () => {
+    const yesterday = moment().subtract(1, 'day').toISOString();
+    return db(`${tableNames.game} AS g`)
+        .join(`${tableNames.league} as l`, 'g.league_id', 'l.id' )
+        .join(`${tableNames.team} as t1`, 'g.home_team_id', 't1.id')
+        .join(`${tableNames.team} as t2`, 'g.away_team_id', 't2.id')
+       // .leftJoin(`${tableNames.weekly_home_stat} as hst`, 'g.home_team_id', 'hst.team_id')
+       // .leftJoin(`${tableNames.weekly_home_stat} as ast`, 'g.away_team_id', 'ast.team_id')
+        .select(
+            'l.name AS league',
+            't1.name AS home_team',
+            'g.home_team_id AS home_team_id',
+            'g.away_team_id AS away_team_id',
+            't2.name AS away_team',
+            'g.game_date AS date')
+        .where('g.game_date', '>', yesterday)
+        .andWhere('l.name', 'Turkey - Super Lig');
+};
+
+const createBaseStatQuery = dataBase => tableName => async id =>
+    dataBase.from(tableName)
+        .where('team_id', id)
+        .select('*')
+        .orderBy('id', 'desc')
+        .limit(1);
+
+const createStatQuery = createBaseStatQuery(db);
 
-const getFilteredGamesFromDB = async () => db(`${tableNames.game} AS g`)
-    .join(`${tableNames.league} as l`, 'g.league_id', 'l.id' )
-    .join(`${tableNames.team} as t1`, 'g.home_team_id', 't1.id')
-    .join(`${tableNames.team} as t2`, 'g.away_team_id', 't2.id')
-    .select('l.name', 't1.name', 't2.name')
-    .where('l.name', 'Bundesliga');
+const getHomeTeamStatFromDB = createStatQuery(tableNames.weekly_home_stat);
+const getAwayTeamStatFromDB = createStatQuery(tableNames.weekly_away_stat);
 
 module.exports = {
     insertIntoLeagues,
@@ -66,4 +89,6 @@ module.exports = {
     getLeagueIdWhereNameFromDB,
     getTeamIdWhereNameFromDB,
     getFilteredGamesFromDB,
+    getHomeTeamStatFromDB,
+    getAwayTeamStatFromDB,
 };