From 6308d32f8e9311c0f4f7752a517048c501a07e8d Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Wed, 3 Jul 2024 11:20:03 -0500 Subject: [PATCH] Migrate from PATCH /players to PUT --- cogs/admins.py | 6 +++--- cogs/draft.py | 10 +++++----- cogs/players.py | 30 +++++++++++++++--------------- cogs/transactions.py | 6 +++--- db_calls.py | 12 ++++++------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cogs/admins.py b/cogs/admins.py index 2e2a5e0..8a2a610 100644 --- a/cogs/admins.py +++ b/cogs/admins.py @@ -1,7 +1,7 @@ import copy from helpers import * -from db_calls import db_get, db_patch, db_post, patch_player, get_player_by_name, patch_draftpick +from db_calls import db_get, db_patch, db_post, put_player, get_player_by_name, patch_draftpick import csv import math @@ -255,7 +255,7 @@ class Admins(commands.Cog): player = p_query['players'][0] player['demotion_week'] = week_num - await patch_player(player) + await put_player(player) await ctx.send(random_conf_gif()) @app_commands.command(name='set-keepers', description='Post final keepers') @@ -382,7 +382,7 @@ class Admins(commands.Cog): for x in p_query['players']: if x['id'] not in k_ids: x['team'] = fa_team - await patch_player(x) + await put_player(x) output_string += f'\nNon-kept players have been booted\nBuilding embeds...' await interaction.edit_original_response(content=output_string) diff --git a/cogs/draft.py b/cogs/draft.py index 3e3748d..ed425fa 100644 --- a/cogs/draft.py +++ b/cogs/draft.py @@ -3,7 +3,7 @@ import math import re from helpers import * -from db_calls import db_get, db_patch, patch_draftpick, patch_player, db_post, get_player_by_name +from db_calls import db_get, db_patch, patch_draftpick, put_player, db_post, get_player_by_name from discord.ext import commands, tasks from discord import TextChannel, app_commands @@ -396,7 +396,7 @@ class Draft(commands.Cog): player['team'] = draft_pick['owner'] player['demotion_week'] = 2 # await patch_player(player['id'], team_id=draft_pick['owner']['id'], demotion_week=2) - await patch_player(player) # TODO: uncomment for live draft + await put_player(player) # TODO: uncomment for live draft # await post_transactions([{ # 'week': -1, @@ -699,7 +699,7 @@ class Draft(commands.Cog): this_pick['player'] = None await patch_draftpick(this_pick) this_pick['player']['team'] = fa_team - this_player = await patch_player(this_pick['player']) + this_player = await put_player(this_pick['player']) # this_player = await get_player_by_name(current['season'], this_pick['player']['id']) # this_player = await db_get('players', object_id=this_pick['player']['id']) @@ -1210,7 +1210,7 @@ class Draft(commands.Cog): f'pick #{draft_pick["overall"]}') await patch_draftpick(draft_pick) - await patch_player(this_player) + await put_player(this_player) # await post_transactions([{ # 'week': -1, # 'player_id': x['id'], @@ -1244,7 +1244,7 @@ class Draft(commands.Cog): keeper_count += 1 else: this_player['team'] = {'id': 400} - await patch_player(this_player) + await put_player(this_player) await db_post('transactions', payload={'count': len(all_moves), 'moves': all_moves}) await db_post('keepers', payload={'count': len(all_keepers), 'keepers': all_keepers}) diff --git a/cogs/players.py b/cogs/players.py index e3d3710..b65ea60 100644 --- a/cogs/players.py +++ b/cogs/players.py @@ -10,7 +10,7 @@ from discord.ext import tasks from discord.app_commands import Choice from helpers import * -from db_calls import db_get, db_patch, get_team_by_abbrev, get_team_by_owner, patch_player, get_player_by_name, db_post, \ +from db_calls import db_get, db_patch, get_team_by_abbrev, get_team_by_owner, put_player, get_player_by_name, db_post, \ db_delete from typing import Literal, Optional @@ -945,19 +945,19 @@ class Players(commands.Cog): async def get_division_standings(self, current) -> discord.Embed: d1_query = await db_get('standings', params=[ - ('season', current['season']), ('division_abbrev', 'GOLD') + ('season', current['season']), ('division_abbrev', 'SWW') ]) div_one = d1_query['standings'] d2_query = await db_get('standings', params=[ - ('season', current['season']), ('division_abbrev', 'CHOAS') + ('season', current['season']), ('division_abbrev', 'BBVW') ]) div_two = d2_query['standings'] d3_query = await db_get('standings', params=[ - ('season', current['season']), ('division_abbrev', 'WHACK') + ('season', current['season']), ('division_abbrev', 'WN') ]) div_three = d3_query['standings'] d4_query = await db_get('standings', params=[ - ('season', current['season']), ('division_abbrev', 'STAB') + ('season', current['season']), ('division_abbrev', 'PP') ]) div_four = d4_query['standings'] @@ -987,10 +987,10 @@ class Players(commands.Cog): f'{progress["games_played"]}/{progress["game_count"]} games played', color=0xB70000) embed.add_field(name=f'**Full Standings**', value=SBA_STANDINGS_URL, inline=False) - embed.add_field(name=f'**Golden Oldies**', value=div_one_standings, inline=False) - embed.add_field(name=f'**Choas**', value=div_two_standings, inline=False) - embed.add_field(name=f'**Whack**', value=div_three_standings, inline=False) - embed.add_field(name=f'**Stab**', value=div_four_standings, inline=False) + embed.add_field(name=f'**Ice Cream**', value=div_one_standings, inline=False) + embed.add_field(name=f'**Hobgoblins**', value=div_two_standings, inline=False) + embed.add_field(name=f'**Dinger Central**', value=div_three_standings, inline=False) + embed.add_field(name=f'**Milkshakes**', value=div_four_standings, inline=False) return embed @@ -1131,7 +1131,7 @@ class Players(commands.Cog): return_date = f'w{return_week:>02}g{return_game:>02}' player['il_return'] = return_date - if await patch_player(player): + if await put_player(player): embed = get_team_embed(f'Injury Update', team=team) embed.add_field( name=f'{player["name"]}', @@ -1195,7 +1195,7 @@ class Players(commands.Cog): view=None ) player['il_return'] = None - if await patch_player(player): + if await put_player(player): embed = get_team_embed(f'Injury Update', team=team) embed.add_field( name=f'{player["name"]}', @@ -2020,7 +2020,7 @@ class Players(commands.Cog): return else: player['headshot'] = url - await patch_player(player) + await put_player(player) await ctx.send(random_conf_word()) @commands.command(name='fancycard', aliases=['fc'], help='Set vanity card') @@ -2056,7 +2056,7 @@ class Players(commands.Cog): return else: player['vanity_card'] = url - await patch_player(player) + await put_player(player) await ctx.send(random_conf_word()) @commands.command(name='getfc', help='Get last season vanity card') @@ -2084,7 +2084,7 @@ class Players(commands.Cog): return player['vanity_card'] = p_query['players'][0]['vanity_card'] - await patch_player(player) + await put_player(player) player_embed = await get_player_embed(player, current) await ctx.send(content=None, embed=player_embed) @@ -2461,7 +2461,7 @@ class Players(commands.Cog): await view.wait() if view.value: - if await patch_player(this_player) is not None: + if await put_player(this_player) is not None: await interaction.edit_original_response( content=f'{this_player["name"]} has been updated', embed=p_embed, diff --git a/cogs/transactions.py b/cogs/transactions.py index 265b31b..faa6418 100644 --- a/cogs/transactions.py +++ b/cogs/transactions.py @@ -2,7 +2,7 @@ import re import copy from helpers import * -from db_calls import db_get, db_patch, get_team_by_owner, get_team_by_abbrev, get_player_by_name, patch_player, db_post +from db_calls import db_get, db_patch, get_team_by_owner, get_team_by_abbrev, get_player_by_name, put_player, db_post from discord.ext import commands, tasks OFFSEASON_FLAG = False @@ -411,7 +411,7 @@ class Transactions(commands.Cog): x['player']['team'] = x['newteam'] x['player']['demotion_week'] = dem_week - await patch_player(x['player']) + await put_player(x['player']) async def notify_cancel(self, trans_data): team = trans_data[1] @@ -1873,7 +1873,7 @@ class Transactions(commands.Cog): this_guy = copy.deepcopy(player_move['player']) this_guy['team'] = player_move['to'] this_guy['demotion_week'] = current['week'] - await patch_player(this_guy) + await put_player(this_guy) await send_to_channel(self.bot, 'transaction-log', embed=await dropadd.show_moves(here=False)) diff --git a/db_calls.py b/db_calls.py index 0d1f0b2..6a64027 100644 --- a/db_calls.py +++ b/db_calls.py @@ -98,9 +98,9 @@ async def db_post(endpoint: str, api_ver: int = 3, payload: dict = None, timeout raise ValueError(f'DB: {e}') -async def db_put(endpoint: str, api_ver: int = 2, payload: dict = None, timeout: int = 3): - req_url = get_req_url(endpoint, api_ver=api_ver) - log_string = f'post:\n{endpoint} payload: {payload}\ntype: {type(payload)}' +async def db_put(endpoint: str, api_ver: int = 2, payload: dict = None, object_id: int = None, timeout: int = 3): + req_url = get_req_url(endpoint, api_ver=api_ver, object_id=object_id) + log_string = f'post:\n{endpoint} payload: {payload}\nobject_id: {object_id}\ntype: {type(payload)}' logging.info(log_string) if master_debug else logging.debug(log_string) async with aiohttp.ClientSession(headers=AUTH_TOKEN) as session: @@ -182,14 +182,14 @@ async def get_player_by_name(season: int, player_name: str): player = p_query['players'][0] if player['demotion_week'] is None: player['demotion_week'] = 0 - await patch_player(player) + await put_player(player) return player -async def patch_player(this_player: dict): +async def put_player(this_player: dict): this_player['team_id'] = this_player['team']['id'] - return await db_patch('players', object_id=this_player['id'], params=[], payload=this_player) + return await db_put('players', object_id=this_player['id'], params=[], payload=this_player) async def patch_draftpick(this_pick: dict):