Merge pull request #198 from NIAEFEUP/fix/unable-to-accept-direct-exc…

…hange-from-marketplace fix: unable to accept direct exchanges from marketplace
NIAEFEUP · Feb 9, 2025 · 1530a4d · 1530a4d
2 parents b0d870f + f5447b4
commit 1530a4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/django/university/routes/exchange/DirectExchangeView.py b/django/university/routes/exchange/DirectExchangeView.py
@@ -214,7 +214,10 @@ def put(self, request, id):
                         StudentController.populate_user_course_unit_data(int(participant.participant_nmec), erase_previous=True)
 
                     if exchange.marketplace_exchange:
-                        exchange.marketplace_exchange.delete() 
+                        marketplace_exchange = exchange.marketplace_exchange
+                        exchange.marketplace_exchange = None
+                        exchange.save()
+                        marketplace_exchange.delete()
 
                     ExchangeValidationController().cancel_conflicting_exchanges(int(exchange.id))
 

diff --git a/django/university/routes/exchange/verify/ExchangeVerifyView.py b/django/university/routes/exchange/verify/ExchangeVerifyView.py
@@ -54,7 +54,10 @@ def post(self, request, token):
                         StudentController.populate_user_course_unit_data(int(participant.participant_nmec), erase_previous=True)
 
                     if direct_exchange.marketplace_exchange:
-                        direct_exchange.marketplace_exchange.delete() 
+                        marketplace_exchange = direct_exchange.marketplace_exchange
+                        direct_exchange.marketplace_exchange = None
+                        direct_exchange.save()
+                        marketplace_exchange.delete()
 
                     ExchangeValidationController().cancel_conflicting_exchanges(int(exchange_info["exchange_id"]))