Merge pull request #13 from blarth/fix/my-duels

fix: all duels
blarth · Aug 4, 2022 · 397bd67 · 397bd67
2 parents a266617 + 5f79a80
commit 397bd67
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/repositories/duelUserRepository.ts b/src/repositories/duelUserRepository.ts
@@ -54,7 +54,12 @@ export async function findAll(){
  },
  }
  },
- id : true
+ id : true,
+ match : {
+ select : {
+ finishedAt : true
+ }
+ }
  }
  })
 }
diff --git a/src/services/duelUserService.ts b/src/services/duelUserService.ts
@@ -4,8 +4,8 @@ import * as duelUserRepository from "../repositories/duelUserRepository.js"
 export async function findAllGivenId(id : number){
  const duels = await duelUserRepository.findAllGivenId(id)
  const duelsUpcoming = duels.filter(el => el.duel.match.result === 0)
- const duelsLost = duels.filter(el => el.duel.match.result === el.team.id)
- const duelsWon = duels.filter(el => el.duel.match.result !== el.team.id && el.duel.match.result !== 0)
+ const duelsLost = duels.filter(el => el.duel.match.result !== el.team.id && el.duel.match.result !== 0)
+ const duelsWon = duels.filter(el => el.duel.match.result === el.team.id && el.duel.match.result !== 0)
 
  const duelsMapped = {
  duelsUpcoming,
@@ -17,6 +17,6 @@ export async function findAllGivenId(id : number){
 
 export async function findAll(){
  const duels = await duelUserRepository.findAll()
- const duelsFiltered = duels.filter(el => el.duelUser.length < 2)
+ const duelsFiltered = duels.filter(el => el.duelUser.length < 2 && el.match.finishedAt === null)
  return duelsFiltered
 }
diff --git a/src/services/getDataService.ts b/src/services/getDataService.ts
@@ -163,6 +163,8 @@ async function getDataResult() {
  openDuels.forEach(async (duel) => {
  const amount = duel.duelUser.reduce((total, acc) => total + acc.bet, 0)
  const winner = duel.duelUser.find((duelist) => duelist.teamId === id)
+ console.log(winner)
+ console.log(amount)
  await duelsRepository.update(winner.userId, amount)
  })
  }