Skip to content

Update tournament_status_logic.js #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
idanstark42 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update tournament_status_logic.js #147

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08bd60e
Update tournament_status_logic.js
idanstark42 Feb 10, 2020
b575c80
Now this should work
idanstark42 Feb 22, 2020
2843102
Fixed check
idanstark42 Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions server/logic/tournament_status_logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function resetMatchNumberByStage () {
.then(currStage => getFirstMatchInStage(currStage))
.then(match => {
MsLogger.info(`Resetting current match number to ${match}`)
return setCurrentMatchNumber(match.matchId)
return setCurrentMatchNumber(match.matchId - 1)
})
.catch(e => {
MsLogger.error(e.message)
Expand Down Expand Up @@ -140,8 +140,12 @@ function getCurrentMatchNumber () {
}

function setCurrentMatchNumber (newMatch) {
return isMatchInCurrentStage(newMatch).then(result => {
if (result || newMatch === 0) {
return Promise.all([
isMatchInCurrentStage(newMatch),
getSetting(CURRENT_STAGE_NAME)
.then(currStage => getFirstMatchInStage(currStage))
]).then(([matchInCurrentStage, firstMatchInCurrentStage]) => {
if (matchInCurrentStage || newMatch === firstMatchInCurrentStage.matchId - 1) {
return updateSetting(CURRENT_MATCH_NAME, newMatch).then(() => {
publishMatchAvailable()
return true
Expand Down