diff --git a/README.md b/README.md index 8a5a3c1..5c0c52f 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,9 @@ if err != nil { players, err := client.Players.List(ctx, rudder.ListPlayersParameters{Limit: 100}) ``` +Публичные типы живут в пакете `rudder`. Пакет `models` — сгенерированный +wire-формат, в прикладном коде его импортировать не нужно. + ## Handles `client.Player(id)` и `client.Leaderboard(slug)` создают handle без @@ -87,13 +90,13 @@ err = player.Delete(ctx, "") board := client.Leaderboard("weekly") entries, err := board.List(ctx, rudder.ListLeaderboardEntriesParameters{Limit: 100}) -// entries.Entries []models.RankEntry, entries.NextCursor +// entries.Entries []rudder.Rank, entries.NextCursor -entry, err := board.Get(ctx, "p1") // *models.RankEntry с rank -around, err := board.GetAround(ctx, "p1", 10) // []models.RankEntry вокруг игрока +entry, err := board.Get(ctx, "p1") // *rudder.Rank с rank +around, err := board.GetAround(ctx, "p1", 10) // []rudder.Rank вокруг игрока -err = board.Submit(ctx, []models.BatchLeaderboardEntry{{PlayerID: "p1", Score: 1500}}) -err = board.Update(ctx, []models.BatchLeaderboardEntry{{PlayerID: "p1", Score: 1600}}) +err = board.Submit(ctx, []rudder.LeaderboardScore{{PlayerID: "p1", Score: 1500}}) +err = board.Update(ctx, []rudder.LeaderboardScore{{PlayerID: "p1", Score: 1600}}) err = board.Delete(ctx, []string{"p1", "p2"}) ``` @@ -106,52 +109,52 @@ err = board.Delete(ctx, []string{"p1", "p2"}) ```go wallets, err := client.Wallet.Adjust(ctx, rudder.AdjustWalletParameters{ IdempotencyKey: "grant-001", - Items: []models.BatchAdjustPlayerWalletsItem{ + Items: []rudder.WalletAdjustment{ {PlayerID: "p1", CurrencyCode: "coins", Amount: 100, Reason: "compensation"}, {PlayerID: "p2", CurrencyCode: "coins", Amount: 100, Reason: "compensation"}, }, }) items, err := client.Inventory.Adjust(ctx, rudder.AdjustInventoryParameters{ - Items: []models.BatchAdjustPlayerInventoryItemsItem{ + Items: []rudder.InventoryAdjustment{ {PlayerID: "p1", Slug: "sword", Amount: 1, Reason: "quest reward"}, }, }) updated, err := client.Players.Update(ctx, rudder.UpdatePlayersParameters{ - Items: []models.BatchUpdatePlayersItem{ + Items: []rudder.PlayerUpdate{ {PlayerID: "p1", Nickname: "Neo"}, }, }) banned, err := client.Players.Ban(ctx, rudder.BanPlayersParameters{ - Items: []models.BatchBanPlayersItem{ + Items: []rudder.PlayerBan{ {PlayerID: "p2", Reason: "cheating", BannedUntil: "2030-01-01T00:00:00Z"}, }, }) unbanned, err := client.Players.Unban(ctx, rudder.UnbanPlayersParameters{ - Items: []models.BatchPlayerItem{{PlayerID: "p2"}}, + PlayerIDs: []string{"p2"}, }) err = client.Players.Delete(ctx, rudder.DeletePlayersParameters{ - Items: []models.BatchPlayerItem{{PlayerID: "p3"}}, + PlayerIDs: []string{"p3"}, }) -err = client.Quests.Reset(ctx, rudder.ResetPlayerQuestsParameters{ - Items: []models.BatchPlayerQuestsItem{ +err = client.Quests.Reset(ctx, rudder.PlayerQuestsParameters{ + Items: []rudder.PlayerQuestRef{ {PlayerID: "p1", QuestID: "daily-1"}, }, }) // ForceComplete и ForceClaim — аналогично -err = client.Leaderboards.Submit(ctx, "weekly", []models.BatchLeaderboardEntry{ +err = client.Leaderboards.Submit(ctx, "weekly", []rudder.LeaderboardScore{ {PlayerID: "p1", Score: 1500}, }) // Update и Delete — аналогично err = client.Storage.Upsert(ctx, rudder.UpsertStorageParameters{ - Items: []models.AdminProjectStorageItem{ + Items: []rudder.ProjectStorageInput{ {Type: "config", Data: `{"event":"x2"}`}, }, }) @@ -168,24 +171,24 @@ err = client.Storage.Delete(ctx, rudder.DeleteStorageParameters{ ```go boards, err := client.Leaderboards.List(ctx, rudder.ListLeaderboardsParameters{Limit: 100}) -// boards.Items []models.LeaderboardDefinition, boards.NextCursor +// boards.Items []rudder.Leaderboard, boards.NextCursor quests, err := client.Quests.List(ctx, rudder.ListQuestsParameters{ Status: &status, // "active" или "archived", optional Limit: 100, }) -// quests.Items []models.QuestDefinition, quests.NextCursor +// quests.Items []rudder.Quest, quests.NextCursor history, err := client.Wallet.History(ctx, playerID, rudder.WalletHistoryParameters{ Currency: ¤cy, // optional Limit: 50, }) -// history.Entries []models.WalletAudit, history.NextCursor +// history.Entries []rudder.WalletTransaction, history.NextCursor inventory, err := client.Inventory.List(ctx, playerID, rudder.ListInventoryParameters{ Limit: 50, }) -// inventory.Items []models.InventoryItem, inventory.NextCursor +// inventory.Items []rudder.InventoryItem, inventory.NextCursor storage, err := client.Storage.List(ctx, rudder.ListStorageParameters{ Limit: 100, @@ -209,3 +212,4 @@ if errors.As(err, &apiErr) { `models/` генерируется apigen'ом из `liveops-gateway/openapi.yaml` (`make generate-openapi` в liveops-gateway). Руками не править. +Публичные имена — aliases в корне пакета `rudder` (`types.go`). diff --git a/inventory.go b/inventory.go index 7cd363b..50e926a 100644 --- a/inventory.go +++ b/inventory.go @@ -15,10 +15,10 @@ type InventoryService struct { type AdjustInventoryParameters struct { IdempotencyKey string - Items []models.BatchAdjustPlayerInventoryItemsItem + Items []InventoryAdjustment } -func (s *InventoryService) Adjust(ctx context.Context, parameters AdjustInventoryParameters) ([]models.InventoryItem, error) { +func (s *InventoryService) Adjust(ctx context.Context, parameters AdjustInventoryParameters) ([]InventoryItem, error) { body := models.BatchAdjustPlayerInventoryItemsRequest{ IdempotencyKey: parameters.IdempotencyKey, Items: parameters.Items, @@ -36,7 +36,7 @@ type ListInventoryParameters struct { Cursor *string } -func (s *InventoryService) List(ctx context.Context, playerID string, parameters ListInventoryParameters) (*models.GetPlayerInventoryResponse, error) { +func (s *InventoryService) List(ctx context.Context, playerID string, parameters ListInventoryParameters) (*InventoryList, error) { query := url.Values{} if parameters.Limit > 0 { query.Set("limit", strconv.Itoa(parameters.Limit)) @@ -45,7 +45,7 @@ func (s *InventoryService) List(ctx context.Context, playerID string, parameters query.Set("cursor", *parameters.Cursor) } - var response models.GetPlayerInventoryResponse + var response InventoryList if err := s.transport.do(ctx, http.MethodGet, "/players/"+url.PathEscape(playerID)+"/inventory", query, nil, &response); err != nil { return nil, err } diff --git a/leaderboard.go b/leaderboard.go index 5d9d417..c363419 100644 --- a/leaderboard.go +++ b/leaderboard.go @@ -20,7 +20,7 @@ type ListLeaderboardEntriesParameters struct { Cursor *string } -func (h *LeaderboardHandle) List(ctx context.Context, parameters ListLeaderboardEntriesParameters) (*models.ListLeaderboardEntriesResponse, error) { +func (h *LeaderboardHandle) List(ctx context.Context, parameters ListLeaderboardEntriesParameters) (*RankList, error) { query := url.Values{} if parameters.Limit > 0 { query.Set("limit", strconv.Itoa(parameters.Limit)) @@ -29,22 +29,22 @@ func (h *LeaderboardHandle) List(ctx context.Context, parameters ListLeaderboard query.Set("cursor", *parameters.Cursor) } - var response models.ListLeaderboardEntriesResponse + var response RankList if err := h.transport.do(ctx, http.MethodGet, "/leaderboards/"+url.PathEscape(h.slug)+"/entries", query, nil, &response); err != nil { return nil, err } return &response, nil } -func (h *LeaderboardHandle) Get(ctx context.Context, playerID string) (*models.RankEntry, error) { - var response models.RankEntry +func (h *LeaderboardHandle) Get(ctx context.Context, playerID string) (*Rank, error) { + var response Rank if err := h.transport.do(ctx, http.MethodGet, "/leaderboards/"+url.PathEscape(h.slug)+"/entries/"+url.PathEscape(playerID), nil, nil, &response); err != nil { return nil, err } return &response, nil } -func (h *LeaderboardHandle) GetAround(ctx context.Context, playerID string, limit int) ([]models.RankEntry, error) { +func (h *LeaderboardHandle) GetAround(ctx context.Context, playerID string, limit int) ([]Rank, error) { query := url.Values{} if limit > 0 { query.Set("limit", strconv.Itoa(limit)) @@ -57,11 +57,11 @@ func (h *LeaderboardHandle) GetAround(ctx context.Context, playerID string, limi return response.Entries, nil } -func (h *LeaderboardHandle) Submit(ctx context.Context, items []models.BatchLeaderboardEntry) error { +func (h *LeaderboardHandle) Submit(ctx context.Context, items []LeaderboardScore) error { return h.leaderboards.Submit(ctx, h.slug, items) } -func (h *LeaderboardHandle) Update(ctx context.Context, items []models.BatchLeaderboardEntry) error { +func (h *LeaderboardHandle) Update(ctx context.Context, items []LeaderboardScore) error { return h.leaderboards.Update(ctx, h.slug, items) } diff --git a/leaderboards.go b/leaderboards.go index bfaa233..0b2b6b3 100644 --- a/leaderboards.go +++ b/leaderboards.go @@ -18,7 +18,7 @@ type ListLeaderboardsParameters struct { Cursor *string } -func (s *LeaderboardsService) List(ctx context.Context, parameters ListLeaderboardsParameters) (*models.ListLeaderboardsResponse, error) { +func (s *LeaderboardsService) List(ctx context.Context, parameters ListLeaderboardsParameters) (*LeaderboardList, error) { query := url.Values{} if parameters.Limit > 0 { query.Set("limit", strconv.Itoa(parameters.Limit)) @@ -27,21 +27,21 @@ func (s *LeaderboardsService) List(ctx context.Context, parameters ListLeaderboa query.Set("cursor", *parameters.Cursor) } - var response models.ListLeaderboardsResponse + var response LeaderboardList if err := s.transport.do(ctx, http.MethodGet, "/leaderboards", query, nil, &response); err != nil { return nil, err } return &response, nil } -func (s *LeaderboardsService) Submit(ctx context.Context, slug string, items []models.BatchLeaderboardEntry) error { +func (s *LeaderboardsService) Submit(ctx context.Context, slug string, items []LeaderboardScore) error { body := models.BatchSubmitLeaderboardEntriesRequest{ Items: items, } return s.transport.do(ctx, http.MethodPost, "/leaderboards/"+url.PathEscape(slug)+"/entries", nil, body, nil) } -func (s *LeaderboardsService) Update(ctx context.Context, slug string, items []models.BatchLeaderboardEntry) error { +func (s *LeaderboardsService) Update(ctx context.Context, slug string, items []LeaderboardScore) error { body := models.BatchUpdateLeaderboardEntriesRequest{ Items: items, } diff --git a/player.go b/player.go index acbd1b5..97485c5 100644 --- a/player.go +++ b/player.go @@ -3,8 +3,6 @@ package rudder import ( "context" "encoding/json" - - "hub.rudder.build/rudder/rudder-go-sdk/models" ) type PlayerHandle struct { @@ -38,10 +36,10 @@ type UpdatePlayerParameters struct { Data json.RawMessage } -func (h *PlayerHandle) Update(ctx context.Context, parameters UpdatePlayerParameters) (*models.AdminPlayer, error) { +func (h *PlayerHandle) Update(ctx context.Context, parameters UpdatePlayerParameters) (*Player, error) { players, err := h.players.Update(ctx, UpdatePlayersParameters{ IdempotencyKey: parameters.IdempotencyKey, - Items: []models.BatchUpdatePlayersItem{{ + Items: []PlayerUpdate{{ PlayerID: h.playerID, Nickname: parameters.Nickname, Data: parameters.Data, @@ -59,10 +57,10 @@ type BanPlayerParameters struct { BannedUntil string } -func (h *PlayerHandle) Ban(ctx context.Context, parameters BanPlayerParameters) (*models.AdminPlayer, error) { +func (h *PlayerHandle) Ban(ctx context.Context, parameters BanPlayerParameters) (*Player, error) { players, err := h.players.Ban(ctx, BanPlayersParameters{ IdempotencyKey: parameters.IdempotencyKey, - Items: []models.BatchBanPlayersItem{{ + Items: []PlayerBan{{ PlayerID: h.playerID, Reason: parameters.Reason, BannedUntil: parameters.BannedUntil, @@ -74,10 +72,10 @@ func (h *PlayerHandle) Ban(ctx context.Context, parameters BanPlayerParameters) return &players[0], nil } -func (h *PlayerHandle) Unban(ctx context.Context, idempotencyKey string) (*models.AdminPlayer, error) { +func (h *PlayerHandle) Unban(ctx context.Context, idempotencyKey string) (*Player, error) { players, err := h.players.Unban(ctx, UnbanPlayersParameters{ IdempotencyKey: idempotencyKey, - Items: []models.BatchPlayerItem{{PlayerID: h.playerID}}, + PlayerIDs: []string{h.playerID}, }) if err != nil { return nil, err @@ -88,6 +86,6 @@ func (h *PlayerHandle) Unban(ctx context.Context, idempotencyKey string) (*model func (h *PlayerHandle) Delete(ctx context.Context, idempotencyKey string) error { return h.players.Delete(ctx, DeletePlayersParameters{ IdempotencyKey: idempotencyKey, - Items: []models.BatchPlayerItem{{PlayerID: h.playerID}}, + PlayerIDs: []string{h.playerID}, }) } diff --git a/player_inventory.go b/player_inventory.go index f0726bf..c4b326e 100644 --- a/player_inventory.go +++ b/player_inventory.go @@ -1,10 +1,6 @@ package rudder -import ( - "context" - - "hub.rudder.build/rudder/rudder-go-sdk/models" -) +import "context" type PlayerInventoryHandle struct { playerID string @@ -18,10 +14,10 @@ type AdjustPlayerInventoryParameters struct { Reason string } -func (h *PlayerInventoryHandle) Adjust(ctx context.Context, parameters AdjustPlayerInventoryParameters) (*models.InventoryItem, error) { +func (h *PlayerInventoryHandle) Adjust(ctx context.Context, parameters AdjustPlayerInventoryParameters) (*InventoryItem, error) { items, err := h.inventory.Adjust(ctx, AdjustInventoryParameters{ IdempotencyKey: parameters.IdempotencyKey, - Items: []models.BatchAdjustPlayerInventoryItemsItem{{ + Items: []InventoryAdjustment{{ PlayerID: h.playerID, Slug: parameters.Slug, Amount: parameters.Amount, @@ -34,6 +30,6 @@ func (h *PlayerInventoryHandle) Adjust(ctx context.Context, parameters AdjustPla return &items[0], nil } -func (h *PlayerInventoryHandle) List(ctx context.Context, parameters ListInventoryParameters) (*models.GetPlayerInventoryResponse, error) { +func (h *PlayerInventoryHandle) List(ctx context.Context, parameters ListInventoryParameters) (*InventoryList, error) { return h.inventory.List(ctx, h.playerID, parameters) } diff --git a/player_quests.go b/player_quests.go index 1028595..b1dd63b 100644 --- a/player_quests.go +++ b/player_quests.go @@ -14,7 +14,7 @@ type PlayerQuestsHandle struct { quests *QuestsService } -func (h *PlayerQuestsHandle) List(ctx context.Context) ([]models.AdminPlayerQuest, error) { +func (h *PlayerQuestsHandle) List(ctx context.Context) ([]PlayerQuest, error) { var response models.ListPlayerQuestsResponse if err := h.transport.do(ctx, http.MethodGet, "/players/"+url.PathEscape(h.playerID)+"/quests", nil, nil, &response); err != nil { return nil, err @@ -28,22 +28,22 @@ type PlayerQuestParameters struct { } func (h *PlayerQuestsHandle) Reset(ctx context.Context, parameters PlayerQuestParameters) error { - return h.quests.Reset(ctx, ResetPlayerQuestsParameters{ + return h.quests.Reset(ctx, PlayerQuestsParameters{ IdempotencyKey: parameters.IdempotencyKey, - Items: []models.BatchPlayerQuestsItem{{PlayerID: h.playerID, QuestID: parameters.QuestID}}, + Items: []PlayerQuestRef{{PlayerID: h.playerID, QuestID: parameters.QuestID}}, }) } func (h *PlayerQuestsHandle) ForceComplete(ctx context.Context, parameters PlayerQuestParameters) error { - return h.quests.ForceComplete(ctx, ForceCompletePlayerQuestsParameters{ + return h.quests.ForceComplete(ctx, PlayerQuestsParameters{ IdempotencyKey: parameters.IdempotencyKey, - Items: []models.BatchPlayerQuestsItem{{PlayerID: h.playerID, QuestID: parameters.QuestID}}, + Items: []PlayerQuestRef{{PlayerID: h.playerID, QuestID: parameters.QuestID}}, }) } func (h *PlayerQuestsHandle) ForceClaim(ctx context.Context, parameters PlayerQuestParameters) error { - return h.quests.ForceClaim(ctx, ForceClaimPlayerQuestsParameters{ + return h.quests.ForceClaim(ctx, PlayerQuestsParameters{ IdempotencyKey: parameters.IdempotencyKey, - Items: []models.BatchPlayerQuestsItem{{PlayerID: h.playerID, QuestID: parameters.QuestID}}, + Items: []PlayerQuestRef{{PlayerID: h.playerID, QuestID: parameters.QuestID}}, }) } diff --git a/player_storage.go b/player_storage.go index 5f2a3fd..edaedd2 100644 --- a/player_storage.go +++ b/player_storage.go @@ -13,8 +13,8 @@ type PlayerStorageHandle struct { transport *transport } -func (h *PlayerStorageHandle) Get(ctx context.Context, storageType string) (*models.PlayerStorage, error) { - var response models.PlayerStorage +func (h *PlayerStorageHandle) Get(ctx context.Context, storageType string) (*PlayerStorage, error) { + var response PlayerStorage if err := h.transport.do(ctx, http.MethodGet, "/players/"+url.PathEscape(h.playerID)+"/storage/"+url.PathEscape(storageType), nil, nil, &response); err != nil { return nil, err } @@ -28,7 +28,7 @@ type UpsertPlayerStorageParameters struct { ExpiresAt string } -func (h *PlayerStorageHandle) Upsert(ctx context.Context, parameters UpsertPlayerStorageParameters) (*models.PlayerStorage, error) { +func (h *PlayerStorageHandle) Upsert(ctx context.Context, parameters UpsertPlayerStorageParameters) (*PlayerStorage, error) { body := models.BatchUpsertPlayerStoragesRequest{ IdempotencyKey: parameters.IdempotencyKey, Items: []models.BatchUpsertPlayerStoragesItem{{ diff --git a/player_wallet.go b/player_wallet.go index 4da4bbd..b999d7c 100644 --- a/player_wallet.go +++ b/player_wallet.go @@ -1,10 +1,6 @@ package rudder -import ( - "context" - - "hub.rudder.build/rudder/rudder-go-sdk/models" -) +import "context" type PlayerWalletHandle struct { playerID string @@ -18,10 +14,10 @@ type AdjustPlayerWalletParameters struct { Reason string } -func (h *PlayerWalletHandle) Adjust(ctx context.Context, parameters AdjustPlayerWalletParameters) (*models.WalletDetails, error) { +func (h *PlayerWalletHandle) Adjust(ctx context.Context, parameters AdjustPlayerWalletParameters) (*WalletBalance, error) { wallets, err := h.wallet.Adjust(ctx, AdjustWalletParameters{ IdempotencyKey: parameters.IdempotencyKey, - Items: []models.BatchAdjustPlayerWalletsItem{{ + Items: []WalletAdjustment{{ PlayerID: h.playerID, CurrencyCode: parameters.CurrencyCode, Amount: parameters.Amount, @@ -34,6 +30,6 @@ func (h *PlayerWalletHandle) Adjust(ctx context.Context, parameters AdjustPlayer return &wallets[0], nil } -func (h *PlayerWalletHandle) History(ctx context.Context, parameters WalletHistoryParameters) (*models.GetWalletHistoryResponse, error) { +func (h *PlayerWalletHandle) History(ctx context.Context, parameters WalletHistoryParameters) (*WalletHistory, error) { return h.wallet.History(ctx, h.playerID, parameters) } diff --git a/players.go b/players.go index e411f25..14ba979 100644 --- a/players.go +++ b/players.go @@ -19,7 +19,7 @@ type ListPlayersParameters struct { Search string } -func (s *PlayersService) List(ctx context.Context, parameters ListPlayersParameters) (*models.ListPlayersResponse, error) { +func (s *PlayersService) List(ctx context.Context, parameters ListPlayersParameters) (*PlayerList, error) { query := url.Values{} if parameters.Limit > 0 { query.Set("limit", strconv.Itoa(parameters.Limit)) @@ -31,15 +31,15 @@ func (s *PlayersService) List(ctx context.Context, parameters ListPlayersParamet query.Set("search", parameters.Search) } - var response models.ListPlayersResponse + var response PlayerList if err := s.transport.do(ctx, http.MethodGet, "/players/list", query, nil, &response); err != nil { return nil, err } return &response, nil } -func (s *PlayersService) Get(ctx context.Context, playerID string) (*models.AdminPlayerDetails, error) { - var response models.AdminPlayerDetails +func (s *PlayersService) Get(ctx context.Context, playerID string) (*PlayerDetails, error) { + var response PlayerDetails if err := s.transport.do(ctx, http.MethodGet, "/players/"+url.PathEscape(playerID), nil, nil, &response); err != nil { return nil, err } @@ -48,10 +48,10 @@ func (s *PlayersService) Get(ctx context.Context, playerID string) (*models.Admi type UpdatePlayersParameters struct { IdempotencyKey string - Items []models.BatchUpdatePlayersItem + Items []PlayerUpdate } -func (s *PlayersService) Update(ctx context.Context, parameters UpdatePlayersParameters) ([]models.AdminPlayer, error) { +func (s *PlayersService) Update(ctx context.Context, parameters UpdatePlayersParameters) ([]Player, error) { body := models.BatchUpdatePlayersRequest{ IdempotencyKey: parameters.IdempotencyKey, Items: parameters.Items, @@ -66,10 +66,10 @@ func (s *PlayersService) Update(ctx context.Context, parameters UpdatePlayersPar type BanPlayersParameters struct { IdempotencyKey string - Items []models.BatchBanPlayersItem + Items []PlayerBan } -func (s *PlayersService) Ban(ctx context.Context, parameters BanPlayersParameters) ([]models.AdminPlayer, error) { +func (s *PlayersService) Ban(ctx context.Context, parameters BanPlayersParameters) ([]Player, error) { body := models.BatchBanPlayersRequest{ IdempotencyKey: parameters.IdempotencyKey, Items: parameters.Items, @@ -84,13 +84,13 @@ func (s *PlayersService) Ban(ctx context.Context, parameters BanPlayersParameter type UnbanPlayersParameters struct { IdempotencyKey string - Items []models.BatchPlayerItem + PlayerIDs []string } -func (s *PlayersService) Unban(ctx context.Context, parameters UnbanPlayersParameters) ([]models.AdminPlayer, error) { +func (s *PlayersService) Unban(ctx context.Context, parameters UnbanPlayersParameters) ([]Player, error) { body := models.BatchUnbanPlayersRequest{ IdempotencyKey: parameters.IdempotencyKey, - Items: parameters.Items, + Items: batchPlayerItems(parameters.PlayerIDs), } var response models.BatchPlayersResponse @@ -102,13 +102,21 @@ func (s *PlayersService) Unban(ctx context.Context, parameters UnbanPlayersParam type DeletePlayersParameters struct { IdempotencyKey string - Items []models.BatchPlayerItem + PlayerIDs []string } func (s *PlayersService) Delete(ctx context.Context, parameters DeletePlayersParameters) error { body := models.BatchDeletePlayersRequest{ IdempotencyKey: parameters.IdempotencyKey, - Items: parameters.Items, + Items: batchPlayerItems(parameters.PlayerIDs), } return s.transport.do(ctx, http.MethodDelete, "/players", nil, body, nil) } + +func batchPlayerItems(playerIDs []string) []models.BatchPlayerItem { + items := make([]models.BatchPlayerItem, len(playerIDs)) + for i, id := range playerIDs { + items[i] = models.BatchPlayerItem{PlayerID: id} + } + return items +} diff --git a/quests.go b/quests.go index a0f6d8f..f494c1b 100644 --- a/quests.go +++ b/quests.go @@ -19,7 +19,7 @@ type ListQuestsParameters struct { Cursor *string } -func (s *QuestsService) List(ctx context.Context, parameters ListQuestsParameters) (*models.AdminListQuestsResponse, error) { +func (s *QuestsService) List(ctx context.Context, parameters ListQuestsParameters) (*QuestList, error) { query := url.Values{} if parameters.Status != nil { query.Set("status", *parameters.Status) @@ -31,48 +31,34 @@ func (s *QuestsService) List(ctx context.Context, parameters ListQuestsParameter query.Set("cursor", *parameters.Cursor) } - var response models.AdminListQuestsResponse + var response QuestList if err := s.transport.do(ctx, http.MethodGet, "/quests", query, nil, &response); err != nil { return nil, err } return &response, nil } -type ResetPlayerQuestsParameters struct { +type PlayerQuestsParameters struct { IdempotencyKey string - Items []models.BatchPlayerQuestsItem + Items []PlayerQuestRef } -func (s *QuestsService) Reset(ctx context.Context, parameters ResetPlayerQuestsParameters) error { +func (s *QuestsService) Reset(ctx context.Context, parameters PlayerQuestsParameters) error { + return s.postPlayerQuests(ctx, "/players/quests/reset", parameters) +} + +func (s *QuestsService) ForceComplete(ctx context.Context, parameters PlayerQuestsParameters) error { + return s.postPlayerQuests(ctx, "/players/quests/force-complete", parameters) +} + +func (s *QuestsService) ForceClaim(ctx context.Context, parameters PlayerQuestsParameters) error { + return s.postPlayerQuests(ctx, "/players/quests/force-claim", parameters) +} + +func (s *QuestsService) postPlayerQuests(ctx context.Context, path string, parameters PlayerQuestsParameters) error { body := models.BatchPlayerQuestsRequest{ IdempotencyKey: parameters.IdempotencyKey, Items: parameters.Items, } - return s.transport.do(ctx, http.MethodPost, "/players/quests/reset", nil, body, nil) -} - -type ForceCompletePlayerQuestsParameters struct { - IdempotencyKey string - Items []models.BatchPlayerQuestsItem -} - -func (s *QuestsService) ForceComplete(ctx context.Context, parameters ForceCompletePlayerQuestsParameters) error { - body := models.BatchPlayerQuestsRequest{ - IdempotencyKey: parameters.IdempotencyKey, - Items: parameters.Items, - } - return s.transport.do(ctx, http.MethodPost, "/players/quests/force-complete", nil, body, nil) -} - -type ForceClaimPlayerQuestsParameters struct { - IdempotencyKey string - Items []models.BatchPlayerQuestsItem -} - -func (s *QuestsService) ForceClaim(ctx context.Context, parameters ForceClaimPlayerQuestsParameters) error { - body := models.BatchPlayerQuestsRequest{ - IdempotencyKey: parameters.IdempotencyKey, - Items: parameters.Items, - } - return s.transport.do(ctx, http.MethodPost, "/players/quests/force-claim", nil, body, nil) + return s.transport.do(ctx, http.MethodPost, path, nil, body, nil) } diff --git a/storage.go b/storage.go index 5a0ce91..88aa56b 100644 --- a/storage.go +++ b/storage.go @@ -19,7 +19,7 @@ type ListStorageParameters struct { Search string } -func (s *StorageService) List(ctx context.Context, parameters ListStorageParameters) (*models.GetProjectStorageResponse, error) { +func (s *StorageService) List(ctx context.Context, parameters ListStorageParameters) (*ProjectStorageList, error) { query := url.Values{} if parameters.Limit > 0 { query.Set("limit", strconv.Itoa(parameters.Limit)) @@ -31,14 +31,14 @@ func (s *StorageService) List(ctx context.Context, parameters ListStorageParamet query.Set("search", parameters.Search) } - var response models.GetProjectStorageResponse + var response ProjectStorageList if err := s.transport.do(ctx, http.MethodGet, "/project-storage", query, nil, &response); err != nil { return nil, err } return &response, nil } -func (s *StorageService) Get(ctx context.Context, itemType string) (*models.ProjectStorageItem, error) { +func (s *StorageService) Get(ctx context.Context, itemType string) (*ProjectStorage, error) { var response models.AdminGetProjectStorageResponse if err := s.transport.do(ctx, http.MethodGet, "/project-storage/"+url.PathEscape(itemType), nil, nil, &response); err != nil { return nil, err @@ -48,7 +48,7 @@ func (s *StorageService) Get(ctx context.Context, itemType string) (*models.Proj type UpsertStorageParameters struct { IdempotencyKey string - Items []models.AdminProjectStorageItem + Items []ProjectStorageInput } func (s *StorageService) Upsert(ctx context.Context, parameters UpsertStorageParameters) error { diff --git a/types.go b/types.go new file mode 100644 index 0000000..3be66fe --- /dev/null +++ b/types.go @@ -0,0 +1,40 @@ +package rudder + +import "hub.rudder.build/rudder/rudder-go-sdk/models" + +// Domain types are aliases of generated OpenAPI models so callers import +// only this package. models/ is wire format and is not part of the public API. + +type Player = models.AdminPlayer +type PlayerDetails = models.AdminPlayerDetails +type PlayerList = models.ListPlayersResponse +type PlayerUpdate = models.BatchUpdatePlayersItem +type PlayerBan = models.BatchBanPlayersItem + +type WalletBalance = models.WalletDetails +type WalletTransaction = models.WalletAudit +type WalletHistory = models.GetWalletHistoryResponse +type WalletAdjustment = models.BatchAdjustPlayerWalletsItem + +type InventoryItem = models.InventoryItem +type InventoryList = models.GetPlayerInventoryResponse +type InventoryAdjustment = models.BatchAdjustPlayerInventoryItemsItem + +type PlayerStorage = models.PlayerStorage +type ProjectStorage = models.ProjectStorageItem +type ProjectStorageList = models.GetProjectStorageResponse +type ProjectStorageInput = models.AdminProjectStorageItem + +type PlayerQuest = models.AdminPlayerQuest +type PlayerQuestObjective = models.AdminPlayerQuestObjective +type PlayerQuestRef = models.BatchPlayerQuestsItem +type Quest = models.QuestDefinition +type QuestObjective = models.QuestObjective +type QuestReward = models.QuestRewardDefinition +type QuestList = models.AdminListQuestsResponse + +type Leaderboard = models.LeaderboardDefinition +type LeaderboardList = models.ListLeaderboardsResponse +type LeaderboardScore = models.BatchLeaderboardEntry +type Rank = models.RankEntry +type RankList = models.ListLeaderboardEntriesResponse diff --git a/wallet.go b/wallet.go index 0b266ac..1f9c814 100644 --- a/wallet.go +++ b/wallet.go @@ -15,10 +15,10 @@ type WalletService struct { type AdjustWalletParameters struct { IdempotencyKey string - Items []models.BatchAdjustPlayerWalletsItem + Items []WalletAdjustment } -func (s *WalletService) Adjust(ctx context.Context, parameters AdjustWalletParameters) ([]models.WalletDetails, error) { +func (s *WalletService) Adjust(ctx context.Context, parameters AdjustWalletParameters) ([]WalletBalance, error) { body := models.BatchAdjustPlayerWalletsRequest{ IdempotencyKey: parameters.IdempotencyKey, Items: parameters.Items, @@ -37,7 +37,7 @@ type WalletHistoryParameters struct { Cursor *string } -func (s *WalletService) History(ctx context.Context, playerID string, parameters WalletHistoryParameters) (*models.GetWalletHistoryResponse, error) { +func (s *WalletService) History(ctx context.Context, playerID string, parameters WalletHistoryParameters) (*WalletHistory, error) { query := url.Values{} if parameters.Currency != nil { query.Set("currency", *parameters.Currency) @@ -49,7 +49,7 @@ func (s *WalletService) History(ctx context.Context, playerID string, parameters query.Set("cursor", *parameters.Cursor) } - var response models.GetWalletHistoryResponse + var response WalletHistory if err := s.transport.do(ctx, http.MethodGet, "/players/"+url.PathEscape(playerID)+"/wallet/history", query, nil, &response); err != nil { return nil, err }