Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/signals/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class SignalBaseResource(ModelResource):
source = Field(
attribute="source",
column_name="Source Subdivision",
widget=ForeignKeyWidget(SourceSubdivision),
widget=ForeignKeyWidget(SourceSubdivision, field="name"),
)

class Meta:
Expand Down Expand Up @@ -427,8 +427,14 @@ def after_import_row(self, row, row_result, **kwargs):
for link in row["Links"]:
signal_obj.related_links.add(link)
process_available_geographies(row)
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
try:
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
except ValueError:
signal_obj.severity_pyramid_rung = None
try:
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
except ValueError:
signal_obj.format_type = None
signal_obj.save()
except Signal.DoesNotExist as e:
print(f"Signal.DoesNotExist: {e}")
Expand All @@ -441,7 +447,7 @@ class OtherEndpointSignalResource(ModelResource):

name = Field(attribute="name", column_name="Indicator")
display_name = Field(attribute="display_name", column_name="Name")
member_name = Field(attribute="member_name", column_name="Member API Name")
member_name = Field(attribute="member_name", column_name="Member Name")
member_short_name = Field(
attribute="member_short_name", column_name="Member Short Name"
)
Expand Down Expand Up @@ -621,8 +627,14 @@ def after_import_row(self, row, row_result, **kwargs):
for link in row["Links"]:
signal_obj.related_links.add(link)
process_available_geographies(row)
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
try:
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
except ValueError:
signal_obj.severity_pyramid_rung = None
try:
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
except ValueError:
signal_obj.format_type = None
signal_obj.save()
except Signal.DoesNotExist as e:
print(f"Signal.DoesNotExist: {e}")
Loading