mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-26 12:38:36 +02:00
Remove transaction.atomic() from fixtures
This commit is contained in:
parent
7c613a01f8
commit
c2eacbfcdb
5 changed files with 26 additions and 42 deletions
|
@ -30,7 +30,6 @@ class DomainFixture(DomainRequestFixture):
|
||||||
# Lumped under .atomic to ensure we don't make redundant DB calls.
|
# Lumped under .atomic to ensure we don't make redundant DB calls.
|
||||||
# This bundles them all together, and then saves it in a single call.
|
# This bundles them all together, and then saves it in a single call.
|
||||||
try:
|
try:
|
||||||
with transaction.atomic():
|
|
||||||
# Get the usernames of users created in the UserFixture
|
# Get the usernames of users created in the UserFixture
|
||||||
created_usernames = [user_data["username"] for user_data in UserFixture.ADMINS + UserFixture.STAFF]
|
created_usernames = [user_data["username"] for user_data in UserFixture.ADMINS + UserFixture.STAFF]
|
||||||
|
|
||||||
|
|
|
@ -84,11 +84,7 @@ class PortfolioFixture:
|
||||||
def load(cls):
|
def load(cls):
|
||||||
"""Creates portfolios."""
|
"""Creates portfolios."""
|
||||||
logger.info("Going to load %s portfolios" % len(cls.PORTFOLIOS))
|
logger.info("Going to load %s portfolios" % len(cls.PORTFOLIOS))
|
||||||
|
|
||||||
# Lumped under .atomic to ensure we don't make redundant DB calls.
|
|
||||||
# This bundles them all together, and then saves it in a single call.
|
|
||||||
try:
|
try:
|
||||||
with transaction.atomic():
|
|
||||||
user = User.objects.all().last()
|
user = User.objects.all().last()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(e)
|
logger.warning(e)
|
||||||
|
@ -106,7 +102,6 @@ class PortfolioFixture:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with transaction.atomic():
|
|
||||||
portfolio = Portfolio(
|
portfolio = Portfolio(
|
||||||
creator=user,
|
creator=user,
|
||||||
organization_name=portfolio_data["organization_name"],
|
organization_name=portfolio_data["organization_name"],
|
||||||
|
|
|
@ -303,14 +303,7 @@ class DomainRequestFixture:
|
||||||
def load(cls):
|
def load(cls):
|
||||||
"""Creates domain requests for each user in the database."""
|
"""Creates domain requests for each user in the database."""
|
||||||
logger.info("Going to load %s domain requests" % len(cls.DOMAINREQUESTS))
|
logger.info("Going to load %s domain requests" % len(cls.DOMAINREQUESTS))
|
||||||
|
|
||||||
# Lumped under .atomic to ensure we don't make redundant DB calls.
|
|
||||||
# This bundles them all together, and then saves it in a single call.
|
|
||||||
# The atomic block will cause the code to stop executing if one instance in the
|
|
||||||
# nested iteration fails, which will cause an early exit and make it hard to debug.
|
|
||||||
# Comment out with transaction.atomic() when debugging.
|
|
||||||
try:
|
try:
|
||||||
with transaction.atomic():
|
|
||||||
# Get the usernames of users created in the UserFixture
|
# Get the usernames of users created in the UserFixture
|
||||||
created_usernames = [user_data["username"] for user_data in UserFixture.ADMINS + UserFixture.STAFF]
|
created_usernames = [user_data["username"] for user_data in UserFixture.ADMINS + UserFixture.STAFF]
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,6 @@ class SuborganizationFixture:
|
||||||
def load(cls):
|
def load(cls):
|
||||||
"""Creates suborganizations."""
|
"""Creates suborganizations."""
|
||||||
logger.info(f"Going to load {len(cls.SUBORGS)} suborgs")
|
logger.info(f"Going to load {len(cls.SUBORGS)} suborgs")
|
||||||
|
|
||||||
with transaction.atomic():
|
|
||||||
portfolios = cls._get_portfolios()
|
portfolios = cls._get_portfolios()
|
||||||
if not portfolios:
|
if not portfolios:
|
||||||
return
|
return
|
||||||
|
|
|
@ -430,7 +430,6 @@ class UserFixture:
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def load(cls):
|
def load(cls):
|
||||||
with transaction.atomic():
|
|
||||||
cls.load_users(cls.ADMINS, "full_access_group", are_superusers=True)
|
cls.load_users(cls.ADMINS, "full_access_group", are_superusers=True)
|
||||||
cls.load_users(cls.STAFF, "cisa_analysts_group")
|
cls.load_users(cls.STAFF, "cisa_analysts_group")
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue