Change Environment.creator relation from ApplicationRole to User

tests/domain/test_applications.py

@@ -21,7 +21,7 @@ from tests.factories import (
 def test_create_application_with_multiple_environments():
     portfolio = PortfolioFactory.create()
     application = Applications.create(
-        portfolio, "My Test Application", "Test", ["dev", "prod"]
+        portfolio.owner, portfolio, "My Test Application", "Test", ["dev", "prod"]
     )
 
     assert application.portfolio == portfolio

tests/domain/test_environments.py

@@ -21,7 +21,9 @@ from tests.factories import (
 @pytest.mark.skip(reason="Reinstate and update once jobs api is up")
 def test_create_environments():
     application = ApplicationFactory.create()
-    environments = Environments.create_many(application, ["Staging", "Production"])
+    environments = Environments.create_many(
+        application.portfolio.owner, application, ["Staging", "Production"]
+    )
     for env in environments:
         assert env.cloud_id is not None
 

tests/domain/test_portfolios.py

@@ -71,7 +71,11 @@ def test_update_portfolio_role_role(portfolio, portfolio_owner):
 
 def test_scoped_portfolio_for_admin_missing_view_apps_perms(portfolio_owner, portfolio):
     Applications.create(
-        portfolio, "My Application 2", "My application 2", ["dev", "staging", "prod"]
+        portfolio.owner,
+        portfolio,
+        "My Application 2",
+        "My application 2",
+        ["dev", "staging", "prod"],
     )
     restricted_admin = UserFactory.create()
     PortfolioRoleFactory.create(
@@ -90,7 +94,11 @@ def test_scoped_portfolio_returns_all_applications_for_portfolio_admin(
 ):
     for _ in range(5):
         Applications.create(
-            portfolio, "My Application", "My application", ["dev", "staging", "prod"]
+            portfolio.owner,
+            portfolio,
+            "My Application",
+            "My application",
+            ["dev", "staging", "prod"],
         )
 
     admin = UserFactory.create()
@@ -109,7 +117,11 @@ def test_scoped_portfolio_returns_all_applications_for_portfolio_owner(
 ):
     for _ in range(5):
         Applications.create(
-            portfolio, "My Application", "My application", ["dev", "staging", "prod"]
+            portfolio.owner,
+            portfolio,
+            "My Application",
+            "My application",
+            ["dev", "staging", "prod"],
         )
 
     scoped_portfolio = Portfolios.get(portfolio_owner, portfolio.id)

tests/factories.py

@@ -185,6 +185,7 @@ class EnvironmentFactory(Base):
 
     name = factory.Faker("domain_word")
     application = factory.SubFactory(ApplicationFactory)
+    creator = factory.SubFactory(UserFactory)
 
     @classmethod
     def _create(cls, model_class, *args, **kwargs):

tests/models/test_environments.py

@@ -12,7 +12,11 @@ def test_add_user_to_environment():
 
     portfolio = PortfolioFactory.create(owner=owner)
     application = Applications.create(
-        portfolio, "my test application", "It's mine.", ["dev", "staging", "prod"]
+        portfolio.owner,
+        portfolio,
+        "my test application",
+        "It's mine.",
+        ["dev", "staging", "prod"],
     )
     dev_environment = application.environments[0]
 

tests/routes/applications/test_settings.py

@@ -71,6 +71,7 @@ def test_update_environment_failure(client, user_session):
 def test_application_settings(client, user_session):
     portfolio = PortfolioFactory.create()
     application = Applications.create(
+        portfolio.owner,
         portfolio,
         "Snazzy Application",
         "A new application for me and my friends",
@@ -86,6 +87,7 @@ def test_application_settings(client, user_session):
 def test_edit_application_environments_obj(app, client, user_session):
     portfolio = PortfolioFactory.create()
     application = Applications.create(
+        portfolio.owner,
         portfolio,
         "Snazzy Application",
         "A new application for me and my friends",
@@ -127,6 +129,7 @@ def test_edit_application_environments_obj(app, client, user_session):
 def test_data_for_app_env_roles_form(app, client, user_session):
     portfolio = PortfolioFactory.create()
     application = Applications.create(
+        portfolio.owner,
         portfolio,
         "Snazzy Application",
         "A new application for me and my friends",