From 8d4ce284f518810b75a4889bfcfb3a92c56138f9 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sun, 21 Mar 2021 07:50:19 +0100 Subject: [PATCH] move safeStrPointer and safeIntPointer from the resolvers package to the utils package --- graphql/resolvers/daily_player_stats.go | 5 +++-- graphql/resolvers/daily_tribe_stats.go | 5 +++-- graphql/resolvers/ennoblement.go | 5 +++-- graphql/resolvers/helpers.go | 14 -------------- graphql/resolvers/player.go | 13 +++++++------ graphql/resolvers/player_history.go | 5 +++-- graphql/resolvers/server.go | 5 +++-- graphql/resolvers/server_stats.go | 5 +++-- graphql/resolvers/tribe.go | 9 +++++---- graphql/resolvers/tribe_change.go | 5 +++-- graphql/resolvers/tribe_history.go | 5 +++-- graphql/resolvers/version.go | 5 +++-- graphql/resolvers/village.go | 5 +++-- utils/safe_pointer.go | 22 ++++++++++++++++++++++ 14 files changed, 64 insertions(+), 44 deletions(-) create mode 100644 utils/safe_pointer.go diff --git a/graphql/resolvers/daily_player_stats.go b/graphql/resolvers/daily_player_stats.go index bcd93f8..4aaa8f7 100644 --- a/graphql/resolvers/daily_player_stats.go +++ b/graphql/resolvers/daily_player_stats.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/dailyplayerstats" "github.com/tribalwarshelp/api/graphql/generated" @@ -28,8 +29,8 @@ func (r *queryResolver) DailyPlayerStats(ctx context.Context, Server: server, Filter: filter, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/daily_tribe_stats.go b/graphql/resolvers/daily_tribe_stats.go index 8ca17a4..87c19e1 100644 --- a/graphql/resolvers/daily_tribe_stats.go +++ b/graphql/resolvers/daily_tribe_stats.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/dailytribestats" "github.com/tribalwarshelp/api/graphql/generated" @@ -28,8 +29,8 @@ func (r *queryResolver) DailyTribeStats(ctx context.Context, Server: server, Filter: filter, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/ennoblement.go b/graphql/resolvers/ennoblement.go index b6aee62..53eb22a 100644 --- a/graphql/resolvers/ennoblement.go +++ b/graphql/resolvers/ennoblement.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/ennoblement" "github.com/tribalwarshelp/api/graphql/generated" @@ -59,8 +60,8 @@ func (r *queryResolver) Ennoblements(ctx context.Context, server string, Server: server, Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/helpers.go b/graphql/resolvers/helpers.go index 5bd9086..5fd7434 100644 --- a/graphql/resolvers/helpers.go +++ b/graphql/resolvers/helpers.go @@ -75,17 +75,3 @@ func shouldCount(ctx context.Context) bool { } return false } - -func safeStrPointer(s *string, def string) string { - if s == nil { - return def - } - return *s -} - -func safeIntPointer(s *int, def int) int { - if s == nil { - return def - } - return *s -} diff --git a/graphql/resolvers/player.go b/graphql/resolvers/player.go index 3265a23..818b38e 100644 --- a/graphql/resolvers/player.go +++ b/graphql/resolvers/player.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/middleware" @@ -58,8 +59,8 @@ func (r *queryResolver) Players(ctx context.Context, Server: server, Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err @@ -80,11 +81,11 @@ func (r *queryResolver) SearchPlayer(ctx context.Context, list := &generated.FoundPlayerList{} list.Items, list.Total, err = r.PlayerUcase.SearchPlayer(ctx, player.SearchPlayerConfig{ Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Version: version, - Name: safeStrPointer(name, ""), - ID: safeIntPointer(id, 0), + Name: utils.SafeStrPointer(name, ""), + ID: utils.SafeIntPointer(id, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/player_history.go b/graphql/resolvers/player_history.go index 06c2117..95e547a 100644 --- a/graphql/resolvers/player_history.go +++ b/graphql/resolvers/player_history.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/playerhistory" @@ -36,8 +37,8 @@ func (r *Resolver) PlayerHistory(ctx context.Context, Server: server, Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/server.go b/graphql/resolvers/server.go index 50a9ee3..6fe2e04 100644 --- a/graphql/resolvers/server.go +++ b/graphql/resolvers/server.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/middleware" "github.com/tribalwarshelp/api/server" @@ -29,8 +30,8 @@ func (r *queryResolver) Servers(ctx context.Context, list.Items, list.Total, err = r.ServerUcase.Fetch(ctx, server.FetchConfig{ Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/server_stats.go b/graphql/resolvers/server_stats.go index d849d6e..c306cfa 100644 --- a/graphql/resolvers/server_stats.go +++ b/graphql/resolvers/server_stats.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/serverstats" @@ -20,8 +21,8 @@ func (r *Resolver) ServerStats(ctx context.Context, Server: server, Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/tribe.go b/graphql/resolvers/tribe.go index 1282302..528f5f0 100644 --- a/graphql/resolvers/tribe.go +++ b/graphql/resolvers/tribe.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/tribe" @@ -20,8 +21,8 @@ func (r *queryResolver) Tribes(ctx context.Context, Server: server, Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err @@ -41,8 +42,8 @@ func (r *queryResolver) SearchTribe(ctx context.Context, list := &generated.FoundTribeList{} list.Items, list.Total, err = r.TribeUcase.SearchTribe(ctx, tribe.SearchTribeConfig{ Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Version: version, Query: query, Count: shouldCount(ctx), diff --git a/graphql/resolvers/tribe_change.go b/graphql/resolvers/tribe_change.go index 0956daa..b510421 100644 --- a/graphql/resolvers/tribe_change.go +++ b/graphql/resolvers/tribe_change.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/tribechange" @@ -43,8 +44,8 @@ func (r *Resolver) TribeChanges(ctx context.Context, list.Items, list.Total, err = r.TribeChangeUcase.Fetch(ctx, tribechange.FetchConfig{ Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), Server: server, }) diff --git a/graphql/resolvers/tribe_history.go b/graphql/resolvers/tribe_history.go index c7c5458..f450bc6 100644 --- a/graphql/resolvers/tribe_history.go +++ b/graphql/resolvers/tribe_history.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/tribehistory" @@ -27,8 +28,8 @@ func (r *Resolver) TribeHistory(ctx context.Context, list.Items, list.Total, err = r.TribeHistoryUcase.Fetch(ctx, tribehistory.FetchConfig{ Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), Server: server, }) diff --git a/graphql/resolvers/version.go b/graphql/resolvers/version.go index 670cbe5..eef57aa 100644 --- a/graphql/resolvers/version.go +++ b/graphql/resolvers/version.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/version" @@ -18,8 +19,8 @@ func (r *queryResolver) Versions(ctx context.Context, list.Items, list.Total, err = r.VersionUcase.Fetch(ctx, version.FetchConfig{ Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), }) return list, err diff --git a/graphql/resolvers/village.go b/graphql/resolvers/village.go index 3c2825c..7dcf51f 100644 --- a/graphql/resolvers/village.go +++ b/graphql/resolvers/village.go @@ -2,6 +2,7 @@ package resolvers import ( "context" + "github.com/tribalwarshelp/api/utils" "github.com/tribalwarshelp/api/graphql/generated" "github.com/tribalwarshelp/api/village" @@ -27,8 +28,8 @@ func (r *queryResolver) Villages(ctx context.Context, list.Items, list.Total, err = r.VillageUcase.Fetch(ctx, village.FetchConfig{ Filter: f, Sort: sort, - Limit: safeIntPointer(limit, 0), - Offset: safeIntPointer(offset, 0), + Limit: utils.SafeIntPointer(limit, 0), + Offset: utils.SafeIntPointer(offset, 0), Count: shouldCount(ctx), Server: server, }) diff --git a/utils/safe_pointer.go b/utils/safe_pointer.go new file mode 100644 index 0000000..3b9a464 --- /dev/null +++ b/utils/safe_pointer.go @@ -0,0 +1,22 @@ +package utils + +func SafeBoolPointer(value *bool, defaultValue bool) bool { + if value == nil { + return defaultValue + } + return *value +} + +func SafeIntPointer(value *int, defaultValue int) int { + if value == nil { + return defaultValue + } + return *value +} + +func SafeStrPointer(value *string, defaultValue string) string { + if value == nil { + return defaultValue + } + return *value +}