mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-23 09:41:05 +02:00
Try a different test approach
This commit is contained in:
parent
0aa1309843
commit
7d88a13676
2 changed files with 15 additions and 31 deletions
|
@ -230,7 +230,10 @@ class BaseExport(ABC):
|
|||
cls.write_csv_before(writer, **export_kwargs)
|
||||
|
||||
# Write the csv file
|
||||
cls.write_csv(writer, columns, models_dict)
|
||||
rows = cls.write_csv(writer, columns, models_dict)
|
||||
|
||||
# Return rows that for easier parsing and testing
|
||||
return rows
|
||||
|
||||
@classmethod
|
||||
def write_csv(
|
||||
|
@ -257,6 +260,9 @@ class BaseExport(ABC):
|
|||
|
||||
writer.writerows(rows)
|
||||
|
||||
# Return rows for easier parsing and testing
|
||||
return rows
|
||||
|
||||
@classmethod
|
||||
@abstractmethod
|
||||
def parse_row(cls, columns, model):
|
||||
|
@ -559,11 +565,6 @@ class DomainDataTypeUser(DomainDataType):
|
|||
The DomainDataType report, but sliced on the current request user
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
def export_data_to_csv(cls, csv_file, request=None):
|
||||
logger.warning("in export_data_to_csv")
|
||||
super().export_data_to_csv(csv_file, request=request)
|
||||
|
||||
@classmethod
|
||||
def get_filter_conditions(cls, request=None):
|
||||
"""
|
||||
|
@ -571,12 +572,10 @@ class DomainDataTypeUser(DomainDataType):
|
|||
"""
|
||||
if request is None or not hasattr(request, "user") or not request.user:
|
||||
# Return nothing
|
||||
logger.warning(f"returning nothing: {request}")
|
||||
return Q(id__in=[])
|
||||
|
||||
user_domain_roles = UserDomainRole.objects.filter(user=request.user)
|
||||
domain_ids = user_domain_roles.values_list("domain_id", flat=True)
|
||||
logger.warning(f"roles: {user_domain_roles} ids: {domain_ids}")
|
||||
return Q(id__in=domain_ids)
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue