From c112f22f8245e95c631eade77db2cb50380ae53c Mon Sep 17 00:00:00 2001 From: flaree Date: Tue, 30 Jul 2024 14:08:38 +0100 Subject: [PATCH] add coins to trade - draft --- ballsdex/core/models.py | 2 ++ ballsdex/packages/trade/menu.py | 4 ++-- migrations/models/31_20240723114727_update.sql | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 migrations/models/31_20240723114727_update.sql diff --git a/ballsdex/core/models.py b/ballsdex/core/models.py index c3f3cdaa..ddeefb5e 100755 --- a/ballsdex/core/models.py +++ b/ballsdex/core/models.py @@ -456,6 +456,8 @@ class Trade(models.Model): ) date = fields.DatetimeField(auto_now_add=True) tradeobjects: fields.ReverseRelation[TradeObject] + player1_coins = fields.IntField(default=0) + player2_coins = fields.IntField(default=0) def __str__(self) -> str: return str(self.pk) diff --git a/ballsdex/packages/trade/menu.py b/ballsdex/packages/trade/menu.py index c26d4113..d96f2968 100644 --- a/ballsdex/packages/trade/menu.py +++ b/ballsdex/packages/trade/menu.py @@ -283,8 +283,8 @@ async def user_cancel(self, trader: TradingUser): async def perform_trade(self): valid_transferable_countryballs: list[BallInstance] = [] - - trade = await Trade.create(player1=self.trader1.player, player2=self.trader2.player) + + trade = await Trade.create(player1=self.trader1.player, player2=self.trader2.player, player1_coins=self.trader1.coins, player2_coins=self.trader2.coins) for countryball in self.trader1.proposal: await countryball.refresh_from_db() diff --git a/migrations/models/31_20240723114727_update.sql b/migrations/models/31_20240723114727_update.sql new file mode 100644 index 00000000..5bbea61f --- /dev/null +++ b/migrations/models/31_20240723114727_update.sql @@ -0,0 +1,6 @@ +-- upgrade -- +ALTER TABLE "trade" ADD "player1_coins" INT NOT NULL DEFAULT 0; +ALTER TABLE "trade" ADD "player2_coins" INT NOT NULL DEFAULT 0; +-- downgrade -- +ALTER TABLE "trade" DROP COLUMN "player1_coins"; +ALTER TABLE "trade" DROP COLUMN "player2_coins";