From 8ab7745e3abea3476beda4a293f788b203ed96d7 Mon Sep 17 00:00:00 2001
From: Yago Marques <yagomarquesja@gmail.com>
Date: Tue, 26 Jan 2021 16:57:01 -0300
Subject: [PATCH] WIP Inclusion of the EE option in the payloads within the
 Organization and Projects. (#9145)

* add ee option on factories for organizations

* add new lines

* remove inventory from the options

* remove line

* remove line from projects

* fix the tuple

* fix lint problems
---
 awxkit/awxkit/api/pages/organizations.py | 12 +++++++++++-
 awxkit/awxkit/api/pages/projects.py      | 10 ++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/awxkit/awxkit/api/pages/organizations.py b/awxkit/awxkit/api/pages/organizations.py
index e1d13a0013..fe34eb07e7 100644
--- a/awxkit/awxkit/api/pages/organizations.py
+++ b/awxkit/awxkit/api/pages/organizations.py
@@ -39,10 +39,20 @@ class Organization(HasCreate, HasInstanceGroups, HasNotifications, base.Base):
                 "disassociate": True,
             })
 
-
     def payload(self, **kwargs):
         payload = PseudoNamespace(name=kwargs.get('name') or 'Organization - {}'.format(random_title()),
                                   description=kwargs.get('description') or random_title(10))
+
+        for fk_field in ('default_environment',):
+            rel_obj = kwargs.get(fk_field)
+            if rel_obj is None:
+                continue
+            elif isinstance(rel_obj, int):
+                payload.update(**{fk_field: int(rel_obj)})
+            elif hasattr(rel_obj, 'id'):
+                payload.update(**{fk_field: rel_obj.id})
+            else:
+                raise AttributeError(f'Related field {fk_field} must be either integer of pkid or object')
         return payload
 
     def create_payload(self, name='', description='', **kwargs):
diff --git a/awxkit/awxkit/api/pages/projects.py b/awxkit/awxkit/api/pages/projects.py
index e40191260c..bc46f5edb3 100644
--- a/awxkit/awxkit/api/pages/projects.py
+++ b/awxkit/awxkit/api/pages/projects.py
@@ -43,6 +43,16 @@ class Project(HasCopy, HasCreate, HasNotifications, UnifiedJobTemplate):
             'allow_override')
         update_payload(payload, fields, kwargs)
 
+        for fk_field in ('execution_environment', 'default_environment'):
+            rel_obj = kwargs.get(fk_field)
+            if rel_obj is None:
+                continue
+            elif isinstance(rel_obj, int):
+                payload.update(**{fk_field: int(rel_obj)})
+            elif hasattr(rel_obj, 'id'):
+                payload.update(**{fk_field: rel_obj.id})
+            else:
+                raise AttributeError(f'Related field {fk_field} must be either integer of pkid or object')
         return payload
 
     def create_payload(