garrettmills/eecs448-project-4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add endpoint for fetching matchups & hook up to matchups interface

Browse Source
This commit is contained in:
Garrett Mills 2020-11-07 16:36:43 -06:00
parent d85570600a
commit ccf0792ac4
Signed by: garrettmills
GPG Key ID: D2BF5FBA8298F246
5 changed files with 64 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/controllers/Scores.controller.js Normal file
View File

@ -0,0 +1,24 @@
const { Controller } = require('libflitter')
class ScoresController extends Controller {
static get services() {
return [...super.services, 'models', 'sports_data']
}
async get_weekly_scores(req, res, next) {
const Matchup = this.models.get('Matchup')
const current_week = await this.sports_data.current_play_week()
const weekly_data = []
for ( let i = 1; i <= current_week; i += 1 ) {
const matchups = await Matchup.find({ week_num: i })
const api_data = await Promise.all(matchups.map(x => x.to_api()))
weekly_data.push(api_data)
}
return res.api(weekly_data)
}
}
module.exports = exports = ScoresController

24
app/models/Matchup.model.js
View File

@ -25,6 +25,30 @@ class Matchup extends Model {
const Team = this.models.get('Team') const Team = this.models.get('Team')
return Team.findById(this.visitor_team_id) return Team.findById(this.visitor_team_id)
} }
async to_api() {
const home_team = await this.home_team()
const visitor_team = await this.visitor_team()
const data = {
date: '2020-11-11', // TODO generate this in the matches patch
team_1: home_team.team_name,
team_1_projection: 0,
team_2: visitor_team.team_name,
team_2_projection: 0,
}
if ( this.complete ) {
const winner = this.home_team_score > this.visitor_team_score ? home_team : visitor_team
data.winner = winner.team_name
data.winner_score = Math.max(this.home_team_score, this.visitor_team_score)
data.loser_score = Math.min(this.home_team_score, this.visitor_team_score)
}
return data
}
} }
module.exports = exports = Matchup module.exports = exports = Matchup

2
app/routing/routers/api.routes.js
View File

@ -52,6 +52,8 @@ const index = {
'/my-team/lineup': ['controller::Teams.get_my_team_current_lineup'], '/my-team/lineup': ['controller::Teams.get_my_team_current_lineup'],
'/draft-board/available': ['controller::DraftBoard.get_available_players'], '/draft-board/available': ['controller::DraftBoard.get_available_players'],
'/matchups': ['controller::Scores.get_weekly_scores'],
}, },
/* /*

215
frontend/src/components/pages/Scores.component.js
View File

@ -1,5 +1,6 @@
import {Component} from '../../../lib/vues6.js' import {Component} from '../../../lib/vues6.js'
import {GridCellRenderType} from '../Grid.component.js' import {GridCellRenderType} from '../Grid.component.js'
import {api} from '../../module/api.js'
const template = ` const template = `
<div class="page-scores"> <div class="page-scores">
@ -7,7 +8,7 @@ const template = `
<div class="left"> <div class="left">
<h2>Matchups & Scores - <small>Week {{ current_week }}</small></h2> <h2>Matchups & Scores - <small>Week {{ current_week }}</small></h2>
</div> </div>
<div class="right"> <div class="right" v-if="week_x_data.length > 1">
<button :class="{ 'disable-click': current_week === max_week }" @click="to_next_week()">Next Week</button><button :class="{ 'disable-click': current_week === min_week }" @click="to_previous_week()">Previous Week</button> <button :class="{ 'disable-click': current_week === max_week }" @click="to_next_week()">Next Week</button><button :class="{ 'disable-click': current_week === min_week }" @click="to_previous_week()">Previous Week</button>
</div> </div>
</div> </div>
@ -32,13 +33,13 @@ class ScoresComponent extends Component {
* The number of the current week shown in the interface * The number of the current week shown in the interface
* @type {number} * @type {number}
*/ */
current_week = 6 current_week = 1
/** /**
* Most recent week number. * Most recent week number.
* @type {number} * @type {number}
*/ */
max_week = 6 max_week = 1
/** /**
* Least recent week number. * Least recent week number.
@ -50,206 +51,7 @@ class ScoresComponent extends Component {
* Array of arrays of data for each week with first item being week 1, second being week 2, &c. * Array of arrays of data for each week with first item being week 1, second being week 2, &c.
* @type {object[][]} * @type {object[][]}
*/ */
week_x_data = [ week_x_data = []
// Week 1 Data
[
{
"date": "11/2/2020",
"team_1": "Team 1",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 50,
"team_2": "Team 6",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 73
},
{
"date": "10/23/2020",
"team_1": "Team 2",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 66,
"team_2": "Team 5",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 71,
"winner": "Team 5",
"winner_score": "84",
"loser_score": "41",
},
{
"date": "10/31/2020",
"team_1": "Team 3",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 85,
"team_2": "Team 4",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 67
},
],
// Week 2 Data
[
{
"date": "11/2/2020",
"team_1": "Team 1",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 58,
"team_2": "Team 6",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 34
},
{
"date": "10/23/2020",
"team_1": "Team 2",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 57,
"team_2": "Team 5",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 27,
"winner": "Team 5",
"winner_score": "84",
"loser_score": "41",
},
{
"date": "10/31/2020",
"team_1": "Team 3",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 48,
"team_2": "Team 4",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 49
},
],
// Week 3 Data
[
{
"date": "11/2/2020",
"team_1": "Team 1",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 67,
"team_2": "Team 6",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 47
},
{
"date": "10/23/2020",
"team_1": "Team 2",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 83,
"team_2": "Team 5",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 62,
"winner": "Team 5",
"winner_score": "84",
"loser_score": "41",
},
{
"date": "10/31/2020",
"team_1": "Team 3",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 48,
"team_2": "Team 4",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 17
},
],
// Week 4 Data
[
{
"date": "11/2/2020",
"team_1": "Team 1",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 30,
"team_2": "Team 6",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 41
},
{
"date": "10/23/2020",
"team_1": "Team 2",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 65,
"team_2": "Team 5",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 27,
"winner": "Team 5",
"winner_score": "84",
"loser_score": "41",
},
{
"date": "10/31/2020",
"team_1": "Team 3",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 48,
"team_2": "Team 4",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 24
},
],
// Week 5 Data
[
{
"date": "11/2/2020",
"team_1": "Team 1",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 43,
"team_2": "Team 6",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 48
},
{
"date": "10/23/2020",
"team_1": "Team 2",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 57,
"team_2": "Team 5",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 61,
"winner": "Team 5",
"winner_score": "84",
"loser_score": "41",
},
{
"date": "10/31/2020",
"team_1": "Team 3",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 48,
"team_2": "Team 4",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 91
},
],
// Week 6 Data
[
{
"date": "11/2/2020",
"team_1": "Team 1",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 50,
"team_2": "Team 6",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 37
},
{
"date": "10/23/2020",
"team_1": "Team 2",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 36,
"team_2": "Team 5",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 71,
"winner": "Team 5",
"winner_score": "84",
"loser_score": "41",
},
{
"date": "10/31/2020",
"team_1": "Team 3",
"team_1_logo": "https://via.placeholder.com/150x100",
"team_1_projection": 48,
"team_2": "Team 4",
"team_2_logo": "https://via.placeholder.com/150x100",
"team_2_projection": 1
},
]
]
/** /**
* Column definitions for the matchups grid. * Column definitions for the matchups grid.
@ -270,7 +72,7 @@ class ScoresComponent extends Component {
key: 'team_1', key: 'team_1',
renderer: (_, data) => ` renderer: (_, data) => `
<div style="display: flex; flex-direction: row;"> <div style="display: flex; flex-direction: row;">
<img src="${data.team_1_logo}" alt="${data.team_1}"> <!-- <img src="${data.team_1_logo}" alt="${data.team_1}">-->
<div style="margin-left: 20px"> <div style="margin-left: 20px">
<b>${data.team_1}</b> <b>${data.team_1}</b>
<p>Projection: ${data.team_1_projection}</p> <p>Projection: ${data.team_1_projection}</p>
@ -284,7 +86,7 @@ class ScoresComponent extends Component {
key: 'team_2', key: 'team_2',
renderer: (_, data) => ` renderer: (_, data) => `
<div style="display: flex; flex-direction: row;"> <div style="display: flex; flex-direction: row;">
<img src="${data.team_2_logo}" alt="${data.team_2}"> <!-- <img src="${data.team_2_logo}" alt="${data.team_2}">-->
<div style="margin-left: 20px"> <div style="margin-left: 20px">
<b>${data.team_2}</b> <b>${data.team_2}</b>
<p>Projection: ${data.team_2_projection}</p> <p>Projection: ${data.team_2_projection}</p>
@ -320,6 +122,9 @@ class ScoresComponent extends Component {
* @return {Promise<void>} * @return {Promise<void>}
*/ */
async vue_on_create() { async vue_on_create() {
this.week_x_data = await api.get_matchups()
this.max_week = this.current_week = this.week_x_data.length
this.data = this.week_x_data[this.max_week - 1]; this.data = this.week_x_data[this.max_week - 1];
} }

4
frontend/src/module/api.js
View File

@ -3,6 +3,10 @@ class API {
this.base_url = APP_BASE_PATH.replace('/app/', '/api/v1/') this.base_url = APP_BASE_PATH.replace('/app/', '/api/v1/')
} }
async get_matchups() {
return this.get_request('matchups')
}
async get_available_draft_players() { async get_available_draft_players() {
return this.get_request('draft-board/available') return this.get_request('draft-board/available')
} }