Default to using pinnacle sportsbook for odds, also display bookmaker

spec/picks/bestPicks.spec.ts

@@ -4,6 +4,7 @@ import { GameData } from '@utils/game'
 const testGames: GameData[] =
 [
   {
+    bookmaker: 'none',
     gameIndex: 0,
     early: false,
     locked: false,
@@ -13,6 +14,7 @@ const testGames: GameData[] =
     ]
   },
   {
+    bookmaker: 'none',
     gameIndex: 1,
     early: false,
     locked: false,

spec/picks/bestSeasonPicks.spec.ts

@@ -5,6 +5,7 @@ import { BestPicks } from './bestPicks'
 const testGames: GameData[] =
 [
   {
+    bookmaker: 'none',
     gameIndex: 0,
     early: false,
     locked: false,
@@ -14,6 +15,7 @@ const testGames: GameData[] =
     ]
   },
   {
+    bookmaker: 'none',
     gameIndex: 1,
     early: false,
     locked: false,

spec/picks/bestWeeklyPicks.spec.ts

@@ -8,6 +8,7 @@ describe(getBestWeeklyPicks, () => {
   beforeEach(() => {
     testGames = [
       {
+        bookmaker: 'none',
         gameIndex: 0,
         early: false,
         locked: false,
@@ -17,6 +18,7 @@ describe(getBestWeeklyPicks, () => {
         ]
       },
       {
+        bookmaker: 'none',
         gameIndex: 1,
         early: false,
         locked: false,

spec/utils/display.spec.ts

@@ -5,6 +5,7 @@ import { BestPicks, BestProb } from '@picks/bestPicks'
 const testGame: GameData[] =
 [
   {
+    bookmaker: 'none',
     gameIndex: 0,
     early: false,
     locked: false,
@@ -41,7 +42,7 @@ describe(displayPicks, () => {
     }
 
     displayPicks(testGame, best)
-    const expected = '     Away Team over Home Team          16 confidence     Prob:    0.25     Win:    8.00     Loss:   -3.00     Net:    4.00' +
+    const expected = '     Away Team over Home Team          16 confidence     Bookmaker: none      Prob:    0.25     Win:    8.00     Loss:   -3.00     Net:    4.00' +
                     '' +
                     'Net Points Gained: -2.00' +
                     '' +

spec/utils/game.spec.ts

@@ -3,6 +3,7 @@ import { OfpData } from '@webscraper/getData'
 import { OddsData } from '@service/odds'
 
 const testGame: GameData = {
+  bookmaker: 'none',
   gameIndex: 0,
   early: false,
   locked: false,
@@ -46,6 +47,7 @@ const testOddsData: OddsData = [
     commence_time: '2020-12-20T18:05:00Z',
     bookmakers: [
       {
+        key: 'pinnacle',
         markets: [
           {
             outcomes: [
@@ -65,6 +67,7 @@ describe(mergeOfpAndOddsData, () => {
   beforeEach(() => {
     expected = [
       {
+        bookmaker: 'pinnacle',
         gameIndex: 0,
         early: false,
         locked: false,
@@ -113,6 +116,7 @@ let testGames: GameData[] = []
 beforeEach(() => {
   testGames = [
     {
+      bookmaker: 'none',
       gameIndex: 0,
       early: false,
       locked: false,
@@ -122,6 +126,7 @@ beforeEach(() => {
       ]
     },
     {
+      bookmaker: 'none',
       gameIndex: 1,
       early: false,
       locked: false,

src/service/odds.ts

@@ -12,6 +12,7 @@ interface MarketData {
 }
 
 interface BookmakerData {
+  key: string
   markets: MarketData[]
 }
 
@@ -30,7 +31,7 @@ export const getOddsData = async (): Promise<OddsData> => {
   const oddsApiUrl = buildUrl(
     env.oddsApi.host,
     '/v4/sports/americanfootball_nfl/odds',
-    { regions: 'us', markets: 'h2h', oddsFormat: 'decimal', apiKey: env.oddsApi.apiKey }
+    { regions: 'eu', markets: 'h2h', oddsFormat: 'decimal', apiKey: env.oddsApi.apiKey }
   )
   return (await axios.get(oddsApiUrl)).data
 }

src/utils/display.ts

@@ -2,6 +2,8 @@ import { GameData } from '@utils/game'
 import { BestProb } from '@picks/bestPicks'
 
 export const displayPicks = (gamesData: GameData[], best: BestProb): void => {
+  const longestBookmakerName = gamesData.reduce((longest, game) => Math.max(longest, game.bookmaker.length), 0)
+
   best.picks.forEach(({ netPoints, pick, rank }, i) => {
     const pointsAvg = netPoints.avg.toFixed(2)
     const pointsIfWin = netPoints.win.toFixed(2)
@@ -13,11 +15,12 @@ export const displayPicks = (gamesData: GameData[], best: BestProb): void => {
 
     const teamsColumn = `${winningTeam.padStart(14)} over ${losingTeam.padEnd(14)}`
     const rankColumn = `${rank.toString().padStart(2)} confidence`
+    const bookmakerColumn = `Bookmaker: ${gameData.bookmaker.padEnd(longestBookmakerName + 1)}`
     const probColumn = `Prob: ${gameData.teams[pick].winProb.toString().padStart(7)}`
     const winColumn = `Win: ${pointsIfWin.toString().padStart(7)}`
     const lossColumn = `Loss: ${pointsIfLose.toString().padStart(7)}`
     const netColumn = `Net: ${pointsAvg.toString().padStart(7)}`
-    const tableRow = [teamsColumn, rankColumn, probColumn, winColumn, lossColumn, netColumn].join(''.padStart(5))
+    const tableRow = [teamsColumn, rankColumn, bookmakerColumn, probColumn, winColumn, lossColumn, netColumn].join(''.padStart(5))
 
     console.log(tableRow)
   })

src/utils/game.ts

@@ -13,6 +13,7 @@ interface TeamData {
 };
 
 export interface GameData {
+  bookmaker: string
   gameIndex: number
   early: boolean
   locked: boolean
@@ -44,6 +45,7 @@ export const mergeOfpAndOddsData = (ofpGames: OfpData, oddsGames: OddsData): Gam
     // Some games have happened in the past (ie TNF), these games won't have odds
     if (away.state === 'won' || home.state === 'won') {
       return {
+        bookmaker: 'none',
         gameIndex: i,
         early: true,
         locked: true,
@@ -63,14 +65,21 @@ export const mergeOfpAndOddsData = (ofpGames: OfpData, oddsGames: OddsData): Gam
       throw new Error(`could not find a matching game for ${away.team} at ${home.team}`)
     }
 
-    const mlPrices = matchingGame.bookmakers[0].markets[0].outcomes
+    // Use pinnable if they're available
+    const pinnacleIndex = matchingGame.bookmakers.findIndex((bookmaker) => bookmaker.key === 'pinnacle')
+    const bookmakerIndex = pinnacleIndex === -1 ? 0 : pinnacleIndex
+    const bookmakerName = matchingGame.bookmakers[bookmakerIndex].key
+
+    const mlPrices = matchingGame.bookmakers[bookmakerIndex].markets[0].outcomes
+
     const early = isEarlyGame(new Date(matchingGame.commence_time))
     const awaySpreadIndex = ofpTeamToOddsApiTeam(away.team) === mlPrices[0].name.toLowerCase() ? 0 : 1
     const homeSpreadIndex = 1 - awaySpreadIndex
 
     const [homeWinProb, awayWinProb] = noVigOdds(mlPrices[homeSpreadIndex].price, mlPrices[awaySpreadIndex].price)
 
     const gameData: GameData = {
+      bookmaker: bookmakerName,
       gameIndex: i,
       early,
       locked: false,