From 87f23d34cff891c70ef3746e5a483bd7403b25ab Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Fri, 17 Jul 2020 11:16:27 +0200 Subject: [PATCH] extend DailyPlayerStatsFilter and DailyTibeStatsFilter | add EnnoblementFilterOr type --- models/daily_player_stats.go | 5 +++-- models/daily_tribe_stats.go | 5 +++-- models/ennoblement.go | 9 +++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/models/daily_player_stats.go b/models/daily_player_stats.go index 58b7d62..b85164d 100644 --- a/models/daily_player_stats.go +++ b/models/daily_player_stats.go @@ -18,8 +18,9 @@ type DailyPlayerStats struct { type DailyPlayerStatsFilter struct { tableName struct{} `urlstruct:"daily_player_stats"` - PlayerID []int `json:"playerID" gqlgen:"playerID" xml:"playerID"` - PlayerIdNEQ []int `json:"playerIDNEQ" gqlgen:"playerIDNEQ" xml:"playerIDNEQ"` + PlayerID []int `json:"playerID" gqlgen:"playerID" xml:"playerID"` + PlayerIdNEQ []int `json:"playerIDNEQ" gqlgen:"playerIDNEQ" xml:"playerIDNEQ"` + PlayerFilter *PlayerFilter `urlstruct:",nowhere" json:"playerFilter" gqlgen:"playerFilter" xml:"playerFilter"` CreateDate time.Time `json:"createDate" gqlgen:"createDate" xml:"createDate"` CreateDateGT time.Time `json:"createDateGT" gqlgen:"createDateGT" xml:"createDateGT"` diff --git a/models/daily_tribe_stats.go b/models/daily_tribe_stats.go index 1af2497..42e8c0e 100644 --- a/models/daily_tribe_stats.go +++ b/models/daily_tribe_stats.go @@ -23,8 +23,9 @@ type DailyTribeStats struct { type DailyTribeStatsFilter struct { tableName struct{} `urlstruct:"daily_tribe_stats"` - TribeID []int `json:"tribeID" gqlgen:"tribeID" xml:"tribeID"` - TribeIdNEQ []int `json:"tribeIDNEQ" gqlgen:"tribeIDNEQ" xml:"tribeIDNEQ"` + TribeID []int `json:"tribeID" gqlgen:"tribeID" xml:"tribeID"` + TribeIdNEQ []int `json:"tribeIDNEQ" gqlgen:"tribeIDNEQ" xml:"tribeIDNEQ"` + TribeFilter *TribeFilter `urlstruct:",nowhere" json:"tribeFilter" gqlgen:"tribeFilter" xml:"tribeFilter"` CreateDate time.Time `json:"createDate" gqlgen:"createDate" xml:"createDate"` CreateDateGT time.Time `json:"createDateGT" gqlgen:"createDateGT" xml:"createDateGT"` diff --git a/models/ennoblement.go b/models/ennoblement.go index dcf41d9..e03669e 100644 --- a/models/ennoblement.go +++ b/models/ennoblement.go @@ -18,6 +18,13 @@ type Ennoblement struct { EnnobledAt time.Time `pg:"default:now(),use_zero" json:"ennobledAt" gqlgen:"ennobledAt" xml:"ennobledAt"` } +type EnnoblementFilterOr struct { + NewOwnerID []int `json:"newOwnerID" gqlgen:"newOwnerID" xml:"newOwnerID"` + NewOwnerTribeID []int `json:"newOwnerTribeID" gqlgen:"newOwnerTribeID" xml:"newOwnerTribeID"` + OldOwnerID []int `json:"oldOwnerID" gqlgen:"oldOwnerID" xml:"oldOwnerID"` + OldOwnerTribeID []int `json:"oldOwnerTribeID" gqlgen:"oldOwnerTribeID" xml:"oldOwnerTribeID"` +} + type EnnoblementFilter struct { tableName struct{} `urlstruct:"ennoblement"` @@ -40,6 +47,8 @@ type EnnoblementFilter struct { EnnobledAtLT time.Time `json:"ennobledAtLT" gqlgen:"ennobledAtLT" xml:"ennobledAtLT"` EnnobledAtLTE time.Time `json:"ennobledAtLTE" gqlgen:"ennobledAtLTE" xml:"ennobledAtLTE"` + Or *EnnoblementFilterOr `urlstruct:",nowhere" json:"or" gqlgen:"or" xml:"or"` + Offset int `urlstruct:",nowhere" json:"offset" gqlgen:"offset" xml:"offset"` Limit int `urlstruct:",nowhere" json:"limit" gqlgen:"limit" xml:"limit"` Sort string `urlstruct:",nowhere" json:"sort" gqlgen:"sort" xml:"sort"`