Skip to content

Commit

Permalink
add coins to trade - draft
Browse files Browse the repository at this point in the history
  • Loading branch information
flaree committed Jul 30, 2024
1 parent fb28805 commit c112f22
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 2 additions & 0 deletions ballsdex/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ballsdex/packages/trade/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 6 additions & 0 deletions migrations/models/31_20240723114727_update.sql
Original file line number Diff line number Diff line change
@@ -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";

0 comments on commit c112f22

Please sign in to comment.