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

cumulative test trial

Browse Source
This commit is contained in:
Michael Simard
2020-06-16 12:06:10 -05:00
parent 8dd189bf51
commit eabf387b08
2 changed files with 118 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,11 +3,11 @@ import Vapor
struct CODDate { struct CODDate {
let month:Int let month:Int
let year:Int let year:Int
let day: Int let day: Int
} }
struct StatsController: RouteCollection { struct StatsController: RouteCollection {
@@ -20,7 +20,7 @@ struct StatsController: RouteCollection {
statsRoute.get("overall", use: overall) statsRoute.get("overall", use: overall)
statsRoute.get("all", use: all) statsRoute.get("all", use: all)
statsRoute.get("allDaily", use: allDaily) statsRoute.get("allDaily", use: allDaily)
} }
func index(req: Request) throws -> EventLoopFuture<[Match]> { func index(req: Request) throws -> EventLoopFuture<[Match]> {
@@ -68,30 +68,30 @@ struct StatsController: RouteCollection {
} }
func getStatsForDay(year:Int, month:Int, day:Int, req: Request) -> EventLoopFuture<Stats>{ func getStatsForDay(year:Int, month:Int, day:Int, req: Request) -> EventLoopFuture<Stats>{
let winCount = Match.query(on: req.db) let winCount = Match.query(on: req.db)
.filter(\.$date >= getStartOfDay(day:day, month: month, year: year)) .filter(\.$date >= getStartOfDay(day:day, month: month, year: year))
.filter(\.$date <= getEndOfDay(day: day, month: month, year: year)) .filter(\.$date <= getEndOfDay(day: day, month: month, year: year))
.filter(\.$win == true ) .filter(\.$win == true )
.count() .count()
let lossCount = Match.query(on: req.db) let lossCount = Match.query(on: req.db)
.filter(\.$date >= getStartOfDay(day:day, month: month, year: year)) .filter(\.$date >= getStartOfDay(day:day, month: month, year: year))
.filter(\.$date <= getEndOfDay(day: day, month: month, year: year)) .filter(\.$date <= getEndOfDay(day: day, month: month, year: year))
.filter(\.$win == false ) .filter(\.$win == false )
.count() .count()
let combined = winCount.and(lossCount) let combined = winCount.and(lossCount)
return combined.map { (winCount, lossCount) -> (Stats) in return combined.map { (winCount, lossCount) -> (Stats) in
let ratio:Double = (Double(winCount) / Double(lossCount)).truncate(places: 2) let ratio:Double = (Double(winCount) / Double(lossCount)).truncate(places: 2)
return Stats.init(winLoss: String(ratio), totalWins: winCount, totalLosses: lossCount) return Stats.init(winLoss: String(ratio), totalWins: winCount, totalLosses: lossCount)
} }
} }
@@ -134,36 +134,36 @@ struct StatsController: RouteCollection {
private func getEndOfMonth(month:Int, year:Int) -> Date { private func getEndOfMonth(month:Int, year:Int) -> Date {
let calendar = Calendar.current let calendar = Calendar.current
var components = DateComponents() var components = DateComponents()
components.day = -1 components.day = -1
components.month = month + 1 components.month = month + 1
components.year = year components.year = year
components.hour = 23 components.hour = 23
components.minute = 59 components.minute = 59
return calendar.date(from: components)! return calendar.date(from: components)!
} }
private func getStartOfDay(day:Int, month:Int, year:Int) -> Date { private func getStartOfDay(day:Int, month:Int, year:Int) -> Date {
let calendar = Calendar.current let calendar = Calendar.current
var components = DateComponents() var components = DateComponents()
components.day = day components.day = day
components.month = month components.month = month
components.year = year components.year = year
components.hour = 0 components.hour = 0
components.minute = 0 components.minute = 0
return calendar.date(from: components)! return calendar.date(from: components)!
} }
private func getEndOfDay(day:Int, month:Int, year:Int) -> Date { private func getEndOfDay(day:Int, month:Int, year:Int) -> Date {
let calendar = Calendar.current let calendar = Calendar.current
var components = DateComponents() var components = DateComponents()
components.day = day components.day = day
components.month = month components.month = month
components.year = year components.year = year
components.hour = 23 components.hour = 23
components.minute = 59 components.minute = 59
return calendar.date(from: components)! return calendar.date(from: components)!
} }
@@ -171,11 +171,11 @@ 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>
@@ -188,15 +188,15 @@ struct StatsController: RouteCollection {
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)
} }
@@ -230,13 +230,16 @@ struct StatsController: RouteCollection {
return combined.map { (winCount, lossCount) -> (Stats) in return combined.map { (winCount, lossCount) -> (Stats) in
let ratio:Double = (Double(winCount) / Double(lossCount)).truncate(places: 2) return Stats.init(winLoss: self.getRatio(num: Double(winCount), den: Double(lossCount)), totalWins: winCount, totalLosses: lossCount)
return Stats.init(winLoss: String(ratio), totalWins: winCount, totalLosses: lossCount)
} }
} }
private func getRatio( num:Double, den:Double) -> String {
return String((Double(num) / Double(den)).truncate(places: 2))
}
func allDaily(req:Request) -> EventLoopFuture<AllDailyStats>{ func allDaily(req:Request) -> EventLoopFuture<AllDailyStats>{
var date = getStartDate() var date = getStartDate()
@@ -249,58 +252,71 @@ struct StatsController: RouteCollection {
} while (date < Date()) } while (date < Date())
previousDays = previousDays.reversed()
func getDailyStats (_ remaining: ArraySlice<CODDate>, allDailyStats: inout [DailyStats], eventLoop: EventLoop) -> EventLoopFuture<[DailyStats]> {
var remaining = remaining
if let first = remaining.popLast() {
return getStatsForDay(year: first.year, month: first.month, day:first.day, req: req).flatMap { [remaining, allDailyStats] (stats) -> EventLoopFuture<[DailyStats]> in func getDailyStats (_ remaining: ArraySlice<CODDate>, allDailyStats: inout [DailyStats], eventLoop: EventLoop) -> EventLoopFuture<[DailyStats]> {
var allDailyStats = allDailyStats var remaining = remaining
allDailyStats.append(DailyStats(day: first.day, month: first.month, year: first.year, stats: stats)) if let first = remaining.popLast() {
return getDailyStats(remaining, allDailyStats:&allDailyStats, eventLoop: eventLoop)
}
} else { return getStatsForDay(year: first.year, month: first.month, day:first.day, req: req).flatMap { [remaining, allDailyStats] (stats) -> EventLoopFuture<[DailyStats]> in
return req.eventLoop.makeSucceededFuture(allDailyStats) var allDailyStats = allDailyStats
}
} let totalWins = allDailyStats.reduce(0) { (total, dailyStats) -> Double in
return total + Double(dailyStats.stats.totalWins)
var stats:[DailyStats] = []
let dailyStats = getDailyStats(previousDays[0..<previousDays.count], allDailyStats:&stats, eventLoop: req.eventLoop)
return dailyStats.map { (dailyStats) -> AllDailyStats in
return AllDailyStats(dailyStats: dailyStats.filter({ (dailyStats) -> Bool in
if dailyStats.stats.totalWins == 0 && dailyStats.stats.totalLosses == 0 {
return false
} }
return true
})) let totalLosses = allDailyStats.reduce(0) { (total, dailyStats) -> Double in
return total + Double(dailyStats.stats.totalLosses)
}
allDailyStats.append(DailyStats(day: first.day, month: first.month, year: first.year, stats: stats, cumulativeRatio: self.getRatio(num: totalWins, den: totalLosses)))
return getDailyStats(remaining, allDailyStats:&allDailyStats, eventLoop: eventLoop)
}
} else {
return req.eventLoop.makeSucceededFuture(allDailyStats)
}
}
var stats:[DailyStats] = []
let dailyStats = getDailyStats(previousDays[0..<previousDays.count], allDailyStats:&stats, eventLoop: req.eventLoop)
return dailyStats.map { (dailyStats) -> AllDailyStats in
return AllDailyStats(dailyStats: dailyStats.filter({ (dailyStats) -> Bool in
if dailyStats.stats.totalWins == 0 && dailyStats.stats.totalLosses == 0 {
return false
}
return true
}).reversed()
)
} }
} }
// func allCumulativeStats(req:Request) -> EventLoopFuture<AllRollingStats> { // func allCumulativeStats(req:Request) -> EventLoopFuture<AllRollingStats> {
// //
// //
// } // }
private func getStartDate() -> Date { private func getStartDate() -> Date {
let calendar = Calendar.current let calendar = Calendar.current
var components = DateComponents() var components = DateComponents()
components.day = 20 components.day = 20
components.month = 03 components.month = 03
components.year = 2020 components.year = 2020
components.hour = 0 components.hour = 0
components.minute = 0 components.minute = 0
return calendar.date(from: components)! return calendar.date(from: components)!
} }
@@ -316,7 +332,7 @@ extension Double
} }
extension Date { extension Date {
var month:Int { var month:Int {
let calanderDate = Calendar.current.dateComponents([.day, .year, .month], from: self) let calanderDate = Calendar.current.dateComponents([.day, .year, .month], from: self)
return calanderDate.month ?? 1 return calanderDate.month ?? 1

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

@@ -62,20 +62,20 @@ final class AllRollingStats: Content {
var cumulativeStats:[DailyStats] var cumulativeStats:[DailyStats]
} }
final class DailyStats: Content { final class DailyStats: Content {
var day: String var day: String
var month:String var month:String
var year: String var year: String
var cumulativeRatio:String
var stats:Stats var stats:Stats
init(day:Int, month:Int, year:Int, stats:Stats) { init(day:Int, month:Int, year:Int, stats:Stats, cumulativeRatio:String) {
self.day = String(day) self.day = String(day)
self.month = Utilities.monthToString(month: month) self.month = Utilities.monthToString(month: month)
self.year = String(year) self.year = String(year)
self.stats = stats self.stats = stats
self.cumulativeRatio = cumulativeRatio
} }
} }