From 636239c5fd170047e1923ff4a5a7e59eb94a02d6 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Wed, 24 Jun 2020 15:45:44 +0200 Subject: [PATCH] add PlayerNameChange model, add DeletedAt field to Player/Tribe model --- models/player.go | 7 +++++++ models/player_name_change.go | 12 ++++++++++++ models/tribe.go | 7 +++++++ 3 files changed, 26 insertions(+) create mode 100644 models/player_name_change.go diff --git a/models/player.go b/models/player.go index a69dfd4..c2d3c9c 100644 --- a/models/player.go +++ b/models/player.go @@ -15,6 +15,7 @@ type Player struct { Tribe *Tribe `json:"tribe,omitempty" gqlgen:"-"` DailyGrowth int `json:"dailyGrowth" pg:",use_zero" gqlgen:"dailyGrowth"` JoinedAt time.Time `json:"joinedAt" pg:"default:now(),use_zero" gqlgen:"joinedAt"` + DeletedAt time.Time `json:"deletedAt" pg:",use_zero" gqlgen:"deletedAt"` OpponentsDefeated } @@ -62,6 +63,12 @@ type PlayerFilter struct { JoinedAtLT time.Time `json:"joinedAtLT" gqlgen:"joinedAtLT" xml:"joinedAtLT"` JoinedAtLTE time.Time `json:"joinedAtLTE" gqlgen:"joinedAtLTE" xml:"joinedAtLTE"` + DeletedAt time.Time `json:"deletedAt" gqlgen:"deletedAt" xml:"deletedAt"` + DeletedAtGT time.Time `json:"deletedAtGT" gqlgen:"deletedAtGT" xml:"deletedAtGT"` + DeletedAtGTE time.Time `json:"deletedAtGTE" gqlgen:"deletedAtGTE" xml:"deletedAtGTE"` + DeletedAtLT time.Time `json:"deletedAtLT" gqlgen:"deletedAtLT" xml:"deletedAtLT"` + DeletedAtLTE time.Time `json:"deletedAtLTE" gqlgen:"deletedAtLTE" xml:"deletedAtLTE"` + TribeID []int `json:"tribeID" gqlgen:"tribeID" xml:"tribeID"` TribeFilter *TribeFilter `urlstruct:",nowhere" json:"tribeFilter" gqlgen:"tribeFilter" xml:"tribeFilter"` diff --git a/models/player_name_change.go b/models/player_name_change.go new file mode 100644 index 0000000..c3bcf9b --- /dev/null +++ b/models/player_name_change.go @@ -0,0 +1,12 @@ +package models + +import "time" + +type PlayerNameChange struct { + LangVersionTag LanguageTag `pg:",unique:group_1" json:"langVersionTag" gqlgen:"langVersionTag" xml:"langVersionTag"` + LangVersion *LangVersion `pg:"fk:lang_version_tag" json:"langVersion" gqlgen:"langVersion" xml:"langVersion"` + PlayerID int `pg:",unique:group_1" json:"playerID" gqlgen:"playerID" xml:"playerID"` + OldName string `pg:",unique:group_1" json:"oldName" gqlgen:"oldName" xml:"oldName"` + NewName string `pg:",unique:group_1" json:"newName" gqlgen:"newName" xml:"newName"` + ChangedOn time.Time `pg:"default:CURRENT_DATE,type:DATE,use_zero,unique:group_1" json:"changedOn" gqlgen:"changedOn" xml:"changedOn"` +} diff --git a/models/tribe.go b/models/tribe.go index c2cb204..cb345bc 100644 --- a/models/tribe.go +++ b/models/tribe.go @@ -16,6 +16,7 @@ type Tribe struct { Dominance float64 `json:"dominance" gqlgen:"dominance" pg:",use_zero"` Exist *bool `json:"exist" gqlgen:"exist" pg:",use_zero"` CreatedAt time.Time `json:"createdAt" pg:"default:now(),use_zero" gqlgen:"createdAt"` + DeletedAt time.Time `json:"deletedAt" pg:",use_zero" gqlgen:"deletedAt"` OpponentsDefeated } @@ -80,6 +81,12 @@ type TribeFilter struct { CreatedAtLT time.Time `json:"createdAtLT" gqlgen:"createdAtLT" xml:"createdAtLT"` CreatedAtLTE time.Time `json:"createdAtLTE" gqlgen:"createdAtLTE" xml:"createdAtLTE"` + DeletedAt time.Time `json:"deletedAt" gqlgen:"deletedAt" xml:"deletedAt"` + DeletedAtGT time.Time `json:"deletedAtGT" gqlgen:"deletedAtGT" xml:"deletedAtGT"` + DeletedAtGTE time.Time `json:"deletedAtGTE" gqlgen:"deletedAtGTE" xml:"deletedAtGTE"` + DeletedAtLT time.Time `json:"deletedAtLT" gqlgen:"deletedAtLT" xml:"deletedAtLT"` + DeletedAtLTE time.Time `json:"deletedAtLTE" gqlgen:"deletedAtLTE" xml:"deletedAtLTE"` + Offset int `urlstruct:",nowhere" json:"offset" gqlgen:"offset"` Limit int `urlstruct:",nowhere" json:"limit" gqlgen:"limit"` Sort string `urlstruct:",nowhere" json:"sort" gqlgen:"sort"`