✨ add trade accepted message

host/nation/trade.py

@@ -28,6 +28,7 @@ class TradeAcceptResponses(IntEnum):
     SUCCESS = auto()
     TOO_MANY_ACTIVE_AGREEMENTS = auto()
     TRADE_PARTNER_FULL = auto()
+    NOT_FOUND = auto()
 
 
 class TradeSentResponses(IntEnum):
@@ -247,9 +248,11 @@ def _accept(self, trade_request: TradeRequest) -> None:
         self._session.commit()
         trade_request.invalidate()
 
-    def accept(self, trade_request: TradeRequest) -> TradeAcceptResponses:
-        if self._identifier != trade_request.recipient:
-            raise TradeError("not a recipient of this request")
+    def accept(self, sponsor: base_types.UserId) -> TradeAcceptResponses:
+        requests = list(filter(lambda x: x.sponsor == sponsor, self.requests))
+        if not requests:
+            return TradeAcceptResponses.NOT_FOUND
+        trade_request = requests[0]
 
         if len(self.active_agreements) >= GameplaySettings.trade.maximum_active_agreements:
             return TradeAcceptResponses.TOO_MANY_ACTIVE_AGREEMENTS

templates/trade.xml

@@ -168,7 +168,29 @@
       <view></view>
     </message>
     <message key="trade_accepted">
-
+      <embed>
+        <title>:currency_exchange: Trade Accepted</title>
+        <colour>teal</colour>
+        <description>You {{recipient.metadata.emoji}}**{{recipient.metadata.nation_name}}** accepted the trade from {{sponsor.metadata.emoji}}**{{sponsor.metadata.nation_name}}**.</description>
+        <fields>
+          <field>
+            <name>:outbox_tray: Your offering</name>
+            <value>
+              {% for resource in sponsor.trade.resources -%}
+              - {{ Resources[resource].emoji }} {{resource}}
+              {% endfor -%}
+              </value>
+          </field>
+          <field>
+            <name>:inbox_tray: Receiving</name>
+            <value>
+              {%- for resource in recipient.trade.resources -%}
+              - {{ Resources[resource].emoji }} {{resource}} 
+              {% endfor -%}
+            </value>
+          </field>
+        </fields>
+      </embed>
     </message>
     <message key="trade_declined">
     </message>

view/cogs/trade.py

@@ -8,7 +8,7 @@
 from qalib.template_engines.jinja2 import Jinja2
 
 from host.nation import Nation
-from host.nation.trade import TradeSelectResponses, TradeSentResponses
+from host.nation.trade import TradeAcceptResponses, TradeSelectResponses, TradeSentResponses
 from lon import LeagueOfNations, interaction_morph
 from view.cogs.custom_jinja2 import ENVIRONMENT
 
@@ -31,6 +31,11 @@
     TradeSelectResponses.ACTIVE_AGREEMENT: "select_trade_active_agreement",
 }
 
+TradeAcceptMapping: Dict[TradeAcceptResponses, str] = {
+    TradeAcceptResponses.SUCCESS: "trade_accept",
+    TradeAcceptResponses.NOT_FOUND: "trade_not_found",
+}
+
 
 class Trade(commands.Cog):
     def __init__(self, bot: LeagueOfNations):
@@ -114,14 +119,25 @@ async def decline(i: discord.Interaction):
     async def requests(self, ctx: qalib.interaction.QalibInteraction) -> None:
         nation = self.bot.get_nation(ctx.user.id)
 
-        def on_select_request(request: Nation):
-            async def callback(select: discord.ui.Select, interaction): ...
-
-            return callback
+        async def on_trade_request_select(
+            select: discord.ui.Select, interaction: discord.Interaction
+        ):
+            await interaction.response.defer()
+            target = self.bot.get_nation(int(select.values[0]))
+            response = nation.trade.accept(target.identifier)
+            if response != TradeAcceptResponses.SUCCESS:
+                await ctx.display(TradeAcceptMapping[response])
+                return
+
+            await ctx.display(
+                TradeAcceptMapping[response], keywords={"recipient": nation, "sponsor": target}
+            )
+            # TODO: send notification to the sponsor of the agreement that it has been accepted
 
         await ctx.display(
             "trade_requests",
             keywords={"nation": nation, "Resources": Resources},
+            callables={"trade_identifier": on_trade_request_select},
         )