From e9a09ec2ae36675726f62717d8f53c593c8ca528 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 7 Jun 2021 17:12:30 +0200
Subject: [PATCH] fixing automatic confirmation

---
 .../resources/action/views/trade.py           | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/ereuse_devicehub/resources/action/views/trade.py b/ereuse_devicehub/resources/action/views/trade.py
index eeda7327..68360713 100644
--- a/ereuse_devicehub/resources/action/views/trade.py
+++ b/ereuse_devicehub/resources/action/views/trade.py
@@ -12,7 +12,7 @@ from ereuse_devicehub.resources.lot.views import delete_from_trade
 
 class TradeView():
     """Handler for manager the trade action register from post
- 
+
        request_post = {
            'type': 'Trade',
            'devices': [device_id],
@@ -29,14 +29,14 @@ class TradeView():
 
     def __init__(self, data, resource_def, schema):
         self.schema = schema
-        a = resource_def.schema.load(data)
-        a.pop('user_to_email', '')
-        a.pop('user_from_email', '')
-        self.trade = Trade(**a)
+        self.data = resource_def.schema.load(data)
+        self.data.pop('user_to_email', '')
+        self.data.pop('user_from_email', '')
         self.create_phantom_account()
+        self.trade = Trade(**self.data)
         db.session.add(self.trade)
-        self.create_automatic_trade()
         self.create_confirmations()
+        self.create_automatic_trade()
 
     def post(self):
         db.session().final_flush()
@@ -52,7 +52,7 @@ class TradeView():
         # owner of the lot
         if self.trade.confirm:
             confirm = Confirm(user=g.user,
-                              action=self.trade, 
+                              action=self.trade,
                               devices=self.trade.devices)
             db.session.add(confirm)
             return
@@ -63,11 +63,11 @@ class TradeView():
             txt = "You do not participate in this trading"
             raise ValidationError(txt)
 
-        confirm_from = Confirm(user=self.trade.user_from, 
-                               action=self.trade, 
+        confirm_from = Confirm(user=self.trade.user_from,
+                               action=self.trade,
                                devices=self.trade.devices)
-        confirm_to = Confirm(user=self.trade.user_to, 
-                             action=self.trade, 
+        confirm_to = Confirm(user=self.trade.user_to,
+                             action=self.trade,
                              devices=self.trade.devices)
         db.session.add(confirm_from)
         db.session.add(confirm_to)
@@ -82,36 +82,40 @@ class TradeView():
         The same if exist to but not from
 
         """
-        if self.trade.user_from and self.trade.user_to:
+        user_from = self.data.get('user_from')
+        user_to = self.data.get('user_to')
+        code = self.data.get('code')
+
+        if user_from and user_to:
             return
 
-        if self.trade.confirm:
+        if self.data['confirm']:
             return
 
-        if self.trade.user_from and not self.trade.user_to:
-            assert g.user == self.trade.user_from
-            email = "{}_{}@dhub.com".format(str(self.trade.user_from.id), self.trade.code)
+        if user_from and not user_to:
+            assert g.user == user_from
+            email = "{}_{}@dhub.com".format(str(user_from.id), code)
             users = User.query.filter_by(email=email)
             if users.first():
                 user = users.first()
-                self.trade.user_to = user
+                self.data['user_to'] = user
                 return
 
             user = User(email=email, password='', active=False, phantom=True)
             db.session.add(user)
-            self.trade.user_to = user
+            self.data['user_to'] = user
 
-        if not self.trade.user_from and self.trade.user_to:
-            email = "{}_{}@dhub.com".format(str(self.trade.user_to.id), self.trade.code)
+        if not user_from and user_to:
+            email = "{}_{}@dhub.com".format(str(user_to.id), code)
             users = User.query.filter_by(email=email)
             if users.first():
                 user = users.first()
-                self.trade.user_from = user
+                self.data['user_from'] = user
                 return
 
             user = User(email=email, password='', active=False, phantom=True)
             db.session.add(user)
-            self.trade.user_from = user
+            self.data['user_from'] = user
 
     def create_automatic_trade(self) -> None:
         # not do nothing if it's neccesary confirmation explicity
@@ -120,10 +124,7 @@ class TradeView():
 
         # Change the owner for every devices
         for dev in self.trade.devices:
-            dev.owner = self.trade.user_to
-            if hasattr(dev, 'components'):
-                for c in dev.components:
-                    c.owner = self.trade.user_to
+            dev.change_owner(self.trade.user_to)
 
 
 class ConfirmMixin():