Skip to content

Commit

Permalink
Adjust user setting when generating workbooks (#2583)
Browse files Browse the repository at this point in the history
* don't try to create a fake user

* we do need a user afterall

* linter
  • Loading branch information
danswick authored Nov 9, 2023
1 parent 59f35f5 commit f6040d0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@

class Command(BaseCommand):
def add_arguments(self, parser):
parser.add_argument("--email", type=str, required=False)
parser.add_argument(
"--email", type=str, required=False, default=CYPRESS_TEST_EMAIL_ADDR
)
parser.add_argument("--dbkeys", type=str, required=False, default="")
parser.add_argument("--years", type=str, required=False, default="")

def handle(self, *args, **options):
dbkeys_str = options["dbkeys"]
years_str = options["years"]
email_str = options["email"]
dbkeys = dbkeys_str.split(",")
years = years_str.split(",")

Expand All @@ -35,8 +38,6 @@ def handle(self, *args, **options):
logger.error("Years must be two digits. Exiting.")
sys.exit(-2)

email = options.get("email", CYPRESS_TEST_EMAIL_ADDR)

defaults = [
(182926, 22),
(181744, 22),
Expand All @@ -49,11 +50,11 @@ def handle(self, *args, **options):
f"Generating test reports for DBKEYS: {dbkeys_str} and YEARS: {years_str}"
)
for dbkey, year in zip(dbkeys, years):
run_end_to_end(email, dbkey, year)
run_end_to_end(email_str, dbkey, year)
else:
for pair in defaults:
logger.info("Running {}-{} end-to-end".format(pair[0], pair[1]))
run_end_to_end(email, str(pair[0]), str(pair[1]))
run_end_to_end(email_str, str(pair[0]), str(pair[1]))
else:
logger.error(
"Cannot run end-to-end workbook generation in production. Exiting."
Expand Down
8 changes: 6 additions & 2 deletions backend/dissemination/workbooklib/workbook_creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from dissemination.workbooklib.additional_eins import generate_additional_eins
from dissemination.workbooklib.secondary_auditors import generate_secondary_auditors

from model_bakery import baker
from django.contrib.auth import get_user_model

import logging
Expand Down Expand Up @@ -61,7 +60,12 @@ def setup_sac(user, test_name, dbkey):
else:
sac = SingleAuditChecklist()
User = get_user_model()
user = baker.make(User)
email = "[email protected]"
User.objects.get_or_create(
username="test_data",
email=email,
)
user = User.objects.get(email=email)
sac.submitted_by = user
sac.general_information = {}
sac.general_information["auditee_name"] = test_name
Expand Down

0 comments on commit f6040d0

Please sign in to comment.