From 141cbedff569143aa8618cdc6513e3647fc2c07b Mon Sep 17 00:00:00 2001 From: richard-dds Date: Tue, 25 Sep 2018 11:20:50 -0400 Subject: [PATCH] Shuffle commits around to fix audit log ordering --- atst/domain/environments.py | 1 - atst/domain/projects.py | 7 +++++-- atst/models/project.py | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/atst/domain/environments.py b/atst/domain/environments.py index eebc6c15..74976544 100644 --- a/atst/domain/environments.py +++ b/atst/domain/environments.py @@ -24,7 +24,6 @@ class Environments(object): for name in names: environment = Environment(project=project, name=name) db.session.add(environment) - db.session.commit() @classmethod def add_member(cls, environment, user, role): diff --git a/atst/domain/projects.py b/atst/domain/projects.py index 36c1168d..663a12f4 100644 --- a/atst/domain/projects.py +++ b/atst/domain/projects.py @@ -12,11 +12,14 @@ class Projects(object): @classmethod def create(cls, user, workspace, name, description, environment_names): project = Project(workspace=workspace, name=name, description=description) + db.session.add(project) + Environments.create_many(project, environment_names) - db.session.add(project) - db.session.commit() + for environment in project.environments: + Environments.add_member(user, environment, user) + db.session.commit() return project @classmethod diff --git a/atst/models/project.py b/atst/models/project.py index cd9ab019..4d795fea 100644 --- a/atst/models/project.py +++ b/atst/models/project.py @@ -17,7 +17,6 @@ class Project(Base, mixins.TimestampsMixin, mixins.AuditableMixin): workspace = relationship("Workspace") environments = relationship("Environment", back_populates="project") - @property def displayname(self): return self.name