Merge pull request asapzacy#38 from asapzacy/fix/nba-games-post-covid

Fix/nba games post covid

Author: asapzacy

.babelrc

@@ -27,7 +27,8 @@
         "regenerator": true
       }
     ],
-    "@babel/plugin-syntax-dynamic-import"
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-proposal-optional-chaining"
   ],
   "env": {
     "test": {

.eslintrc

@@ -25,7 +25,6 @@
     "no-console": [2, { "allow": ["warn", "error"] }],
     "semi": [2, "never"],
     "no-extra-semi": 2,
-    "space-before-function-paren": ["error", "never"],
     "react/jsx-boolean-value": [2, "always"],
     "react/jsx-curly-spacing": [2, "never", { "allowMultiline": false }],
     "react/jsx-no-literals": 2,

package.json

@@ -50,6 +50,7 @@
     "@babel/core": "^7.4.5",
     "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-proposal-decorators": "^7.4.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
     "@babel/plugin-transform-runtime": "^7.4.4",
     "@babel/preset-env": "^7.4.5",

server.js

@@ -41,22 +41,31 @@ app.get('/api/mlb/scores/:dt', (req, res) => {
 
 app.get('/api/nba/scores/:dt', (req, res) => {
   const { dt } = req.params
-  const url = `http://data.nba.com/data/5s/json/cms/noseason/scoreboard/${dt}/games.json`
-  const url2 = `http://data.nba.net/data/10s/prod/v2/${dt}/scoreboard.json`
+  const gamesUrl = `http://data.nba.net/prod/v2/${dt}/scoreboard.json`
+  const teamsUrl = `https://data.nba.net/prod/v2/2019/teams.json`
+
   return axios
-    .all([axios.get(url), axios.get(url2)])
+    .all([axios.get(gamesUrl), axios.get(teamsUrl)])
     .then(
-      axios.spread((games, standings) => {
-        const scores = {}
-        scores.year =
-          games.data.sports_content.sports_meta.season_meta.season_year
-        scores.games = games.data.sports_content.games.game.reduce(
-          (arr, el, i) => {
-            arr.push(Object.assign({}, el, standings.data.games[i]))
-            return arr
-          },
-          []
+      axios.spread((games, teams) => {
+        const nbaTeams = teams.data.league.standard.filter(
+          team => team.isNBAFranchise === true
         )
+        const scores = {}
+        scores.year = dt.slice(0, 4)
+        scores.games = games.data.games
+
+        scores.games.forEach(game => {
+          game.vTeam = {
+            ...game.vTeam,
+            ...nbaTeams.find(team => team.teamId === game.vTeam.teamId)
+          }
+          game.hTeam = {
+            ...game.hTeam,
+            ...nbaTeams.find(team => team.teamId === game.hTeam.teamId)
+          }
+        })
+
         res.send(scores)
       })
     )
@@ -65,7 +74,7 @@ app.get('/api/nba/scores/:dt', (req, res) => {
 
 app.get('/api/nba/scores/:dt/details/:id', (req, res) => {
   const { dt, id } = req.params
-  const url = `http://data.nba.com/data/10s/json/cms/noseason/game/${dt}/${id}/boxscore.json`
+  const url = `http://data.nba.com/prod/v1/${dt}/${id}_boxscore.json`
   return axios
     .get(url)
     .then(scores => res.send(scores.data))

src/components/BoxScore/props.js

@@ -27,10 +27,10 @@ export const mlbBoxScoreProps = (game, league) => {
 //  nba box score props --> BoxScore component
 export const nbaBoxScoreProps = (game, league) => {
   const inGame = game.period.current
-  const size = Number(game.period_time.period_value)
+  const size = Number(game.period.current)
   return {
-    awayTeam: shortenTeamName(game.visitor.nickname),
-    homeTeam: shortenTeamName(game.home.nickname),
+    awayTeam: shortenTeamName(game.vTeam.nickname),
+    homeTeam: shortenTeamName(game.hTeam.nickname),
     awayScore: inGame ? game.vTeam.score : '',
     homeScore: inGame ? game.hTeam.score : '',
     linescore: {
@@ -39,7 +39,7 @@ export const nbaBoxScoreProps = (game, league) => {
     },
     periods: 4,
     totalPeriods: size,
-    overtimes: game.period_time.period_value > 4 ? size - 4 : 0,
+    overtimes: game.period.current > 4 ? size - 4 : 0,
     league
   }
 }

src/components/Details/Details.js

@@ -43,7 +43,7 @@ const MlbDetails = ({
   panels,
   activePanel,
   switchPanel,
-  lastUpdated
+  lastUpdatedStr
 }) => (
   <section className={s.container}>
     <Matchup {...mlbMatchupProps(game, date)} />
@@ -57,7 +57,7 @@ const MlbDetails = ({
         <Diamond {...mlbDiamondProps(game)} />
       </BoxScore>
     )}
-    <UpdateTime lastUpdated={lastUpdated} />
+    <UpdateTime lastUpdatedStr={lastUpdatedStr} />
   </section>
 )
 
@@ -68,7 +68,7 @@ const NbaDetails = ({
   panels,
   activePanel,
   switchPanel,
-  lastUpdated
+  lastUpdatedStr
 }) => (
   <section className={s.container}>
     <Matchup {...nbaMatchupProps(game, date)} />
@@ -81,24 +81,24 @@ const NbaDetails = ({
       <BoxScore {...nbaBoxScoreProps(game, league)} />
     )}
     {activePanel === 'team stats' && <Stats {...nbaStatsProps(game)} />}
-    <UpdateTime lastUpdated={lastUpdated} />
+    <UpdateTime lastUpdatedStr={lastUpdatedStr} />
   </section>
 )
 
-const NflDetails = ({ lastUpdated }) => (
+const NflDetails = ({ lastUpdatedStr }) => (
   <section className={s.container}>
     <br />
     <br />
     <br />
     <br />
-    <UpdateTime lastUpdated={lastUpdated} />
+    <UpdateTime lastUpdatedStr={lastUpdatedStr} />
   </section>
 )
 
-const NhlDetails = ({ game, date, league, lastUpdated }) => (
+const NhlDetails = ({ game, date, league, lastUpdatedStr }) => (
   <section className={s.container}>
     <Matchup {...nhlMatchupProps(game, date)} />
     <BoxScore {...nhlBoxScoreProps(game, league)} />
-    <UpdateTime lastUpdated={lastUpdated} />
+    <UpdateTime lastUpdatedStr={lastUpdatedStr} />
   </section>
 )

src/components/Game/Game.js

@@ -48,7 +48,7 @@ const NbaGame = ({
   game,
   date,
   league,
-  lastUpdated,
+  lastUpdatedStr,
   isExpanded,
   showDetails,
   isHovered,
@@ -88,7 +88,7 @@ const NbaGame = ({
           game={game}
           date={date}
           league={league}
-          lastUpdated={lastUpdated}
+          lastUpdatedStr={lastUpdatedStr}
         />
       )}
     </VelocityTransitionGroup>
@@ -99,7 +99,7 @@ const NflGame = ({
   game,
   date,
   league,
-  lastUpdated,
+  lastUpdatedStr,
   isExpanded,
   showDetails,
   isHovered,
@@ -139,7 +139,7 @@ const NflGame = ({
           game={game}
           date={date}
           league={league}
-          lastUpdated={lastUpdated}
+          lastUpdatedStr={lastUpdatedStr}
         />
       )}
     </VelocityTransitionGroup>
@@ -150,7 +150,7 @@ const MlbGame = ({
   game,
   date,
   league,
-  lastUpdated,
+  lastUpdatedStr,
   isExpanded,
   showDetails,
   isHovered,
@@ -190,7 +190,7 @@ const MlbGame = ({
           game={game}
           date={date}
           league={league}
-          lastUpdated={lastUpdated}
+          lastUpdatedStr={lastUpdatedStr}
         />
       )}
     </VelocityTransitionGroup>
@@ -201,7 +201,7 @@ const NhlGame = ({
   game,
   date,
   league,
-  lastUpdated,
+  lastUpdatedStr,
   isExpanded,
   showDetails,
   isHovered,
@@ -241,7 +241,7 @@ const NhlGame = ({
           game={game}
           date={date}
           league={league}
-          lastUpdated={lastUpdated}
+          lastUpdatedStr={lastUpdatedStr}
         />
       )}
     </VelocityTransitionGroup>

src/components/GameState/props.js

@@ -56,22 +56,20 @@ export const mlbGameStateProps = game => {
 //  nba game state props --> GameState component
 export const nbaGameStateProps = game => {
   const isPlayoffs = Boolean(game.playoffs)
+
   return {
-    gameState: Number(game.period_time.game_status) - 1,
-    status: game.period_time.period_status,
+    gameState: Number(game.statusNum) - 1,
+    status: game.statusNum === 3 ? 'Final' : '', // game.period_time.period_status
     time: `${formatTimezone(game.startTimeUTC)} ET`,
     periods: 4,
-    currentPeriod: game.period_time.period_value,
-    currentTime: game.period.isEndOfPeriod
-      ? 'END'
-      : game.period_time.game_clock,
-    isHalfTime:
-      game.period.isHalftime || game.period_time.period_status === 'Halftime',
-    totalPeriods: game.period_time.period_value,
+    currentPeriod: game.period.current,
+    currentTime: game.period.isEndOfPeriod ? 'END' : game.clock,
+    isHalfTime: game.period.isHalftime,
+    totalPeriods: game.period.maxRegular,
     overtime:
-      game.period_time.period_value > 4
-        ? game.period_time.period_value > 5
-          ? `${game.period_time.period_value - 4}OT`
+      game.period.current > 4
+        ? game.period.current > 5
+          ? `${game.period.current - 4}OT`
           : 'OT'
         : '',
     playoffs: isPlayoffs

src/components/League/League.js

@@ -11,7 +11,8 @@ const League = ({
   year,
   date,
   today,
-  league
+  league,
+  lastUpdated
 }) => (
   <div className={s.container}>
     {isLoading ? (
@@ -24,6 +25,7 @@ const League = ({
         today={today}
         league={league}
         isError={isError}
+        lastUpdated={lastUpdated}
       />
     ) : (
       <NotFound />

src/components/Matchup/props.js

@@ -9,9 +9,9 @@ export const mlbMatchupProps = (game, date) => ({
 
 //  nba matchup props --> Matchup component
 export const nbaMatchupProps = (game, date) => ({
-  awayTeam: game.visitor.nickname,
-  homeTeam: game.home.nickname,
-  location: `${game.city}, ${game.state}.`,
+  awayTeam: game.vTeam.nickname,
+  homeTeam: game.hTeam.nickname,
+  location: `${game.arena.city}, ${game.arena.stateAbbr}.`,
   venue: game.arena.name,
   date
 })