msimard/cod-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated rules on what games count, also can determine most recent record based on game

Browse Source
This commit is contained in:
Michael Simard
2020-12-22 10:27:37 -06:00
parent 87726f6b99
commit 068932195b
2 changed files with 172 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
Sources/App/Controllers/StatsController.swift
View File

@@ -22,8 +22,6 @@ struct StatsController: RouteCollection {
statsRoute.get("allDaily", use: allDaily) statsRoute.get("allDaily", use: allDaily)
statsRoute.get("test", use: test) statsRoute.get("test", use: test)
statsRoute.post("logMatch", use: logMatch) statsRoute.post("logMatch", use: logMatch)
statsRoute.get("history","page",":page", use: history) statsRoute.get("history","page",":page", use: history)
statsRoute.get("history", use: history) statsRoute.get("history", use: history)
@@ -65,13 +63,16 @@ struct StatsController: RouteCollection {
let newMatch = try req.content.decode(Match.self) let newMatch = try req.content.decode(Match.self)
return newMatch.save(on: req.db).map { newMatch} return newMatch.save(on: req.db).map { newMatch}
} }
func getStats(matches:[Match]) -> Stats{ func getStats(matches:[Match]) -> Stats{
let countedMatches = matches.filter {
return shouldCountMatch(match: $0)
}
let totals = matches.reduce([0,0]) { (totals, match) -> [Int] in let totals = countedMatches.reduce([0,0]) { (totals, match) -> [Int] in
if match.win == true { if match.win == true {
return [totals[0] + 1, totals[1]] return [totals[0] + 1, totals[1]]
@@ -80,44 +81,70 @@ struct StatsController: RouteCollection {
return [totals[0], totals[1] + 1] return [totals[0], totals[1] + 1]
} }
} }
// for match in matches {
// if match.win == true {
// winCount += 1;
//
// }
// if match.win == false {
// lossCount += 1;
// }
// }
let winCount = totals[0] let winCount = totals[0]
let lossCount = totals[1] let lossCount = totals[1]
let ratio = self.getRatio(num: Double(winCount), den: Double(lossCount)) let ratio = self.getRatio(num: Double(winCount), den: Double(lossCount))
return Stats(winLoss: ratio, totalWins: Int(winCount), totalLosses: Int(lossCount)) return Stats(winLoss: ratio, totalWins: Int(winCount), totalLosses: Int(lossCount))
} }
func getStatsWithMostRecentDailyRecord(matches:[Match], game:String? = nil) -> StatsWithMostRecentDailyRecord {
func mostRecentDailyStats (matches:[Match]) -> Stats{ let stats = getStats(matches: matches)
let mostRecentDailyStats = self.mostRecentDailyStats(matches: matches, game: game)
let ret = StatsWithMostRecentDailyRecord(winLoss: stats.winLossRatio, totalWins: stats.totalWins, totalLosses: stats.totalLosses, mostRecentRecord:"\(mostRecentDailyStats.totalWins)-\(mostRecentDailyStats.totalLosses)")
return ret
}
func mostRecentDailyStats (matches:[Match], game:String? = nil) -> Stats{
let daysPlayed = getDaysPlayed(matches: matches) let daysPlayed = getDaysPlayed(matches: matches)
let lastDayPlayed = daysPlayed.last let lastDayPlayed = daysPlayed.last
return getStats(matches: matches.filter({ (match) -> Bool in return getStats(matches: matches.filter({ (match) -> Bool in
return var shouldInclude =
match.date.day == lastDayPlayed?.day && match.date.day == lastDayPlayed?.day &&
match.date.month == lastDayPlayed?.month && match.date.month == lastDayPlayed?.month &&
match.date.year == lastDayPlayed?.year match.date.year == lastDayPlayed?.year &&
shouldCountMatch(match: match)
if let game = game {
// if game == "mw" {
// shouldInclude = shouldInclude && match.codGame == "mw"
// }
// else if game == "bocw" {
// shouldInclude = shouldInclude && match.codGame == "bocw"
//
// }else {
//
// }
shouldInclude = shouldInclude && match.codGame == game
}
return shouldInclude
})) }))
} }
private func shouldCountMatch (match:Match) -> Bool {
let isColdWar = match.codGame == "bocw"
let numberOfPlayers = self.numberOfPlayers(match: match)
return !isColdWar || (isColdWar && (numberOfPlayers == 0 || numberOfPlayers > 4 ))
}
private func numberOfPlayers(match:Match) -> Int {
return match.players?.components(separatedBy: ",").count ?? 0
}
private func getDaysPlayed(matches:[Match]) -> [CODDate] { private func getDaysPlayed(matches:[Match]) -> [CODDate] {
var sortedMatches = matches var sortedMatches = matches
@@ -147,12 +174,7 @@ struct StatsController: RouteCollection {
func getCumulativeWinLossRatios(matches:[Match]) -> [DataPoint] { func getCumulativeWinLossRatios(matches:[Match]) -> [DataPoint] {
let startTime = Date()
//print ("c \(Date().timeIntervalSince(startTime))")
let daysPlayed = getDaysPlayed(matches: matches) let daysPlayed = getDaysPlayed(matches: matches)
// print ("c \(Date().timeIntervalSince(startTime))")
var cumulativeRatios : [DataPoint] = [] var cumulativeRatios : [DataPoint] = []
var cumulativeWins:Int = 0 var cumulativeWins:Int = 0
@@ -194,26 +216,6 @@ struct StatsController: RouteCollection {
} }
// for (i, day) in daysPlayed.enumerated() {
// print ("ca \(Date().timeIntervalSince(startTime))")
//
//
// let stats = self.getStats(matches: matches.filter({ (match) -> Bool in
// return match.date.day == day.day && match.date.year == day.year && match.date.month == day.month
// }))
//
// print ("cb \(Date().timeIntervalSince(startTime))")
//
// cumulativeWins = cumulativeWins + stats.totalWins;
// cumulativeLosses = cumulativeLosses + stats.totalLosses;
// cumulativeRatios.append( DataPoint(x: Double(i), y: (Double(cumulativeWins) / (Double(cumulativeLosses) )), label: ("\(Utilities.monthToString(month: day.month)) \(day.day)")))
//
// print ("cc \(Date().timeIntervalSince(startTime))")
//
// }
// print ("c \(Date().timeIntervalSince(startTime))")
return cumulativeRatios return cumulativeRatios
} }
@@ -231,21 +233,23 @@ struct StatsController: RouteCollection {
date = Calendar.current.date(byAdding: .month, value: 1, to: date)! date = Calendar.current.date(byAdding: .month, value: 1, to: date)!
} while ( date < Calendar.current.date(byAdding: .month, value: 1, to: Date())!) } while ( date < Calendar.current.date(byAdding: .month, value: 1, to: Date())!)
// print (date - Date().timeIntervalSince(startTime)) // print (date - Date().timeIntervalSince(startTime))
return Match.query(on: req.db).all().map { (matches) -> AllStats in return Match.query(on: req.db).all().map { (matches) -> AllStats in
let overallStats = self.getStats(matches: matches) let overallStats = self.getStatsWithMostRecentDailyRecord(matches: matches)
// print ( Date().timeIntervalSince(startTime)) // print ( Date().timeIntervalSince(startTime))
let mwStats = self.getStats(matches: matches.filter({ (match) -> Bool in let mwStats = self.getStatsWithMostRecentDailyRecord(matches: matches.filter({ (match) -> Bool in
return match.codGame == "mw" return match.codGame == "mw"
})) }))
// print ( Date().timeIntervalSince(startTime)) // print ( Date().timeIntervalSince(startTime))
let bocwStats = self.getStats(matches: matches.filter({ (match) -> Bool in let bocwStats = self.getStatsWithMostRecentDailyRecord(matches: matches.filter({ (match) -> Bool in
return match.codGame == "bocw" return match.codGame == "bocw"
})) }))
// print ( Date().timeIntervalSince(startTime)) // print ( Date().timeIntervalSince(startTime))
let mostRecentDailyStats = self.mostRecentDailyStats(matches: matches) let mostRecentDailyStats = self.mostRecentDailyStats(matches: matches)
@@ -256,20 +260,20 @@ struct StatsController: RouteCollection {
} }
return MonthStats(month: codDate.month, year: codDate.year, stats: self.getStats(matches: relevantMatches )) return MonthStats(month: codDate.month, year: codDate.year, stats: self.getStats(matches: relevantMatches ))
} }
// print ( Date().timeIntervalSince(startTime)) // print ( Date().timeIntervalSince(startTime))
let cumulativeWinLossRatios = self.getCumulativeWinLossRatios(matches: matches) let cumulativeWinLossRatios = self.getCumulativeWinLossRatios(matches: matches)
// print ( Date().timeIntervalSince(startTime)) // print ( Date().timeIntervalSince(startTime))
let highestWinLossRatio = cumulativeWinLossRatios.reduce("0") { (highestRatio, dataPoint) -> String in let highestWinLossRatio = cumulativeWinLossRatios.reduce("0") { (highestRatio, dataPoint) -> String in
if dataPoint.y > Double(highestRatio)!{ if dataPoint.y > Double(highestRatio)!{
return String(dataPoint.y) return String(dataPoint.y)
} }
return highestRatio return highestRatio
} }
// print ( Date().timeIntervalSince(startTime)) // print ( Date().timeIntervalSince(startTime))
return AllStats.init(overall: overallStats,mwStats: mwStats, bocwStats: bocwStats, byMonth: monthlyStats, highestWinLossRatio: highestWinLossRatio, dataPoints: cumulativeWinLossRatios, mostRecentRecord: "\(mostRecentDailyStats.totalWins) - \(mostRecentDailyStats.totalLosses)") return AllStats.init(overall: overallStats,mwStats: mwStats, bocwStats: bocwStats, byMonth: monthlyStats, highestWinLossRatio: highestWinLossRatio, dataPoints: cumulativeWinLossRatios, mostRecentRecord: "\(mostRecentDailyStats.totalWins) - \(mostRecentDailyStats.totalLosses)")
@@ -495,67 +499,67 @@ struct StatsController: RouteCollection {
// func all(req: Request) throws -> EventLoopFuture<AllStats> { // func all(req: Request) throws -> EventLoopFuture<AllStats> {
// //
// var date = getStartDate() // var date = getStartDate()
// var previousMonths:[CODDate] = [] // var previousMonths:[CODDate] = []
// //
// repeat { // repeat {
// //let stats = getStatsByMonth(year: date.year, month: date.month, req: req) //returns eventloopfuture<Stats> // //let stats = getStatsByMonth(year: date.year, month: date.month, req: req) //returns eventloopfuture<Stats>
// previousMonths.append(CODDate(month: date.month, year: date.year, day: 15, hour:6, minute: 0)) // previousMonths.append(CODDate(month: date.month, year: date.year, day: 15, hour:6, minute: 0))
// date = Calendar.current.date(byAdding: .month, value: 1, to: date)! // date = Calendar.current.date(byAdding: .month, value: 1, to: date)!
// }while ( date < Calendar.current.date(byAdding: .month, value: 1, to: Date())!) // }while ( date < Calendar.current.date(byAdding: .month, value: 1, to: Date())!)
// //
// //
// func getMonthStats (_ remaining: ArraySlice<CODDate>, allMonthlyStats: inout [MonthStats], eventLoop: EventLoop) -> EventLoopFuture<[MonthStats]> { // func getMonthStats (_ remaining: ArraySlice<CODDate>, allMonthlyStats: inout [MonthStats], eventLoop: EventLoop) -> EventLoopFuture<[MonthStats]> {
// var remaining = remaining // var remaining = remaining
// if let first = remaining.popLast() { // if let first = remaining.popLast() {
// //
// return getstatsForMonth(year: first.year, month: first.month, req: req).flatMap { [remaining, allMonthlyStats] (stats) -> EventLoopFuture<[MonthStats]> in // return getstatsForMonth(year: first.year, month: first.month, req: req).flatMap { [remaining, allMonthlyStats] (stats) -> EventLoopFuture<[MonthStats]> in
// var allMonthlyStats = allMonthlyStats // var allMonthlyStats = allMonthlyStats
// allMonthlyStats.append(MonthStats(month: first.month, year: first.year, stats:stats )) // allMonthlyStats.append(MonthStats(month: first.month, year: first.year, stats:stats ))
// return getMonthStats(remaining, allMonthlyStats:&allMonthlyStats, eventLoop: eventLoop) // return getMonthStats(remaining, allMonthlyStats:&allMonthlyStats, eventLoop: eventLoop)
// } // }
// //
// } else { // } else {
// return req.eventLoop.makeSucceededFuture(allMonthlyStats) // return req.eventLoop.makeSucceededFuture(allMonthlyStats)
// } // }
// } // }
// //
// var stats:[MonthStats] = [] // var stats:[MonthStats] = []
// let monthstats = getMonthStats(previousMonths[0..<previousMonths.count], allMonthlyStats:&stats, eventLoop: req.eventLoop) // let monthstats = getMonthStats(previousMonths[0..<previousMonths.count], allMonthlyStats:&stats, eventLoop: req.eventLoop)
// let cumulativeRatios = getCumulativeWinLossRatios(req: req) // let cumulativeRatios = getCumulativeWinLossRatios(req: req)
// let mostRecentDayStats = mostRecentDailyStats(req: req) // let mostRecentDayStats = mostRecentDailyStats(req: req)
// //
// return try overall(req: req).and(monthstats).and(cumulativeRatios).and(mostRecentDayStats).map { arg -> AllStats in // return try overall(req: req).and(monthstats).and(cumulativeRatios).and(mostRecentDayStats).map { arg -> AllStats in
// //
// let (((overall, monthlyStats), cumulativeRatios), mostRecentDayStats) = arg // let (((overall, monthlyStats), cumulativeRatios), mostRecentDayStats) = arg
// let highestWinLossRatio = cumulativeRatios.reduce("0") { (highestRatio, dataPoint) -> String in // let highestWinLossRatio = cumulativeRatios.reduce("0") { (highestRatio, dataPoint) -> String in
// if dataPoint.y > Double(highestRatio)!{ // if dataPoint.y > Double(highestRatio)!{
// return String(dataPoint.y) // return String(dataPoint.y)
// } // }
// return highestRatio // return highestRatio
// } // }
// //
// //
// return AllStats.init(overall: overall,mwStats: overall, bocwStats: overall, byMonth: monthlyStats, highestWinLossRatio: highestWinLossRatio, dataPoints: cumulativeRatios, mostRecentRecord: "\(mostRecentDayStats.totalWins) - \(mostRecentDayStats.totalLosses)") // return AllStats.init(overall: overall,mwStats: overall, bocwStats: overall, byMonth: monthlyStats, highestWinLossRatio: highestWinLossRatio, dataPoints: cumulativeRatios, mostRecentRecord: "\(mostRecentDayStats.totalWins) - \(mostRecentDayStats.totalLosses)")
// } // }
// } // }
// //
func overall(req: Request) throws -> EventLoopFuture<OverallStats> { func overall(req: Request) throws -> EventLoopFuture<OverallStats> {
return Match.query(on: req.db).all().map { (matches) -> OverallStats in return Match.query(on: req.db).all().map { (matches) -> OverallStats in
let overallStats = self.getStats(matches: matches) let overallStats = self.getStatsWithMostRecentDailyRecord(matches: matches)
// print ( Date().timeIntervalSince(startTime)) // print ( Date().timeIntervalSince(startTime))
let mwStats = self.getStats(matches: matches.filter({ (match) -> Bool in let mwStats = self.getStatsWithMostRecentDailyRecord(matches: matches.filter({ (match) -> Bool in
return match.codGame == "mw" return match.codGame == "mw" && shouldCountMatch(match: match )
})) }))
let bocwStats = self.getStats(matches: matches.filter({ (match) -> Bool in let bocwStats = self.getStatsWithMostRecentDailyRecord(matches: matches.filter({ (match) -> Bool in
return match.codGame == "bocw" return match.codGame == "bocw" && shouldCountMatch(match: match )
})) }))
let mostRecentDailyStats = self.mostRecentDailyStats(matches: matches) let mostRecentDailyStats = self.mostRecentDailyStats(matches: matches)
@@ -673,7 +677,7 @@ struct StatsController: RouteCollection {
if !(stats.totalWins == 0 && stats.totalLosses == 0) { if !(stats.totalWins == 0 && stats.totalLosses == 0) {
let date = self.createDate(day: first.day, month: first.month, year: first.year, hour: first.hour + 6, minute:first.minute) // 6 hours to make sure we pick a time that isnt on borders of us time zones let date = self.createDate(day: first.day, month: first.month, year: first.year, hour: first.hour + 6, minute:first.minute) // 6 hours to make sure we pick a time that isnt on borders of us time zones
// print ("p \(date.timeIntervalSince1970)") // print ("p \(date.timeIntervalSince1970)")
let x = Double(cumulativeWinLossRatios.count) let x = Double(cumulativeWinLossRatios.count)
let d = Date(timeIntervalSince1970: date.timeIntervalSince1970) let d = Date(timeIntervalSince1970: date.timeIntervalSince1970)

34
Sources/App/Models/AllStats.swift
View File

@@ -25,15 +25,15 @@ struct DataPoint : Content {
final class AllStats: Content { final class AllStats: Content {
var overall:Stats var overall:StatsWithMostRecentDailyRecord
var mwStats:Stats var mwStats:StatsWithMostRecentDailyRecord
var bocwStats:Stats var bocwStats:StatsWithMostRecentDailyRecord
var byMonth: [MonthStats] var byMonth: [MonthStats]
var highestWinLossRatio:String var highestWinLossRatio:String
var dataPoints:[DataPoint] var dataPoints:[DataPoint]
var mostRecentRecord:String var mostRecentRecord:String
init( overall:Stats, mwStats:Stats, bocwStats:Stats, byMonth:[MonthStats], highestWinLossRatio:String, dataPoints:[DataPoint], mostRecentRecord:String) { init( overall:StatsWithMostRecentDailyRecord, mwStats:StatsWithMostRecentDailyRecord, bocwStats:StatsWithMostRecentDailyRecord, byMonth:[MonthStats], highestWinLossRatio:String, dataPoints:[DataPoint], mostRecentRecord:String) {
self.overall = overall self.overall = overall
self.byMonth = byMonth self.byMonth = byMonth
self.highestWinLossRatio = highestWinLossRatio self.highestWinLossRatio = highestWinLossRatio
@@ -46,12 +46,12 @@ final class AllStats: Content {
} }
final class OverallStats: Content { final class OverallStats: Content {
var overall:Stats var overall:StatsWithMostRecentDailyRecord
var mwStats:Stats var mwStats:StatsWithMostRecentDailyRecord
var bocwStats:Stats var bocwStats:StatsWithMostRecentDailyRecord
var mostRecentRecord:String var mostRecentRecord:String
init( overall:Stats, mwStats:Stats, bocwStats:Stats, mostRecentRecord:String){ init( overall:StatsWithMostRecentDailyRecord, mwStats:StatsWithMostRecentDailyRecord, bocwStats:StatsWithMostRecentDailyRecord, mostRecentRecord:String){
self.overall = overall self.overall = overall
self.mwStats = mwStats; self.mwStats = mwStats;
@@ -77,6 +77,7 @@ final class MonthStats: Content {
} }
final class Stats: Content { final class Stats: Content {
var winLossRatio:String var winLossRatio:String
var totalWins:Int var totalWins:Int
@@ -86,10 +87,25 @@ final class Stats: Content {
self.winLossRatio = winLoss self.winLossRatio = winLoss
self.totalWins = totalWins self.totalWins = totalWins
self.totalLosses = totalLosses self.totalLosses = totalLosses
} }
} }
final class StatsWithMostRecentDailyRecord: Content {
var winLossRatio:String
var totalWins:Int
var totalLosses:Int
var mostRecentRecord:String
init( winLoss:String, totalWins:Int, totalLosses:Int, mostRecentRecord:String ) {
self.winLossRatio = winLoss
self.totalWins = totalWins
self.totalLosses = totalLosses
self.mostRecentRecord = mostRecentRecord
}
}
final class AllDailyStats: Content { final class AllDailyStats: Content {
var dailyStats : [DailyStats] var dailyStats : [DailyStats]