Skip to content

Commit 3f5ef58

Browse files
committed
Handled some errors in import script
1 parent 88ac639 commit 3f5ef58

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

src/signals/resources.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class SignalBaseResource(ModelResource):
227227
source = Field(
228228
attribute="source",
229229
column_name="Source Subdivision",
230-
widget=ForeignKeyWidget(SourceSubdivision),
230+
widget=ForeignKeyWidget(SourceSubdivision, field="name"),
231231
)
232232

233233
class Meta:
@@ -427,8 +427,14 @@ def after_import_row(self, row, row_result, **kwargs):
427427
for link in row["Links"]:
428428
signal_obj.related_links.add(link)
429429
process_available_geographies(row)
430-
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
431-
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
430+
try:
431+
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
432+
except ValueError:
433+
signal_obj.severity_pyramid_rung = None
434+
try:
435+
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
436+
except ValueError:
437+
signal_obj.format_type = None
432438
signal_obj.save()
433439
except Signal.DoesNotExist as e:
434440
print(f"Signal.DoesNotExist: {e}")
@@ -621,8 +627,14 @@ def after_import_row(self, row, row_result, **kwargs):
621627
for link in row["Links"]:
622628
signal_obj.related_links.add(link)
623629
process_available_geographies(row)
624-
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
625-
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
630+
try:
631+
signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
632+
except ValueError:
633+
signal_obj.severity_pyramid_rung = None
634+
try:
635+
signal_obj.format_type = FormatType.objects.get(id=row["Format"])
636+
except ValueError:
637+
signal_obj.format_type = None
626638
signal_obj.save()
627639
except Signal.DoesNotExist as e:
628640
print(f"Signal.DoesNotExist: {e}")

0 commit comments

Comments
 (0)