Skip to content

Commit 04ffdca

Browse files
authored
Merge pull request #42 from MozillaSecurity/skip-reports-without-category
Skip importing reports without a breakage_category set
2 parents 5e03be8 + ae21217 commit 04ffdca

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

server/frontend/src/components/Buckets/ReportPreviewRow.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</td>
1212
<td class="wrap-normal comments-col">
1313
<div>
14-
<strong>{{ report.breakage_category }}</strong
14+
<strong>{{ report.breakage_category ?? "unknown" }}</strong
1515
>: {{ maybeTranslatedComments(report) }}
1616
</div>
1717
</td>

server/reportmanager/management/commands/import_reports_from_bigquery.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,19 @@ def handle(self, *args, **options):
3333
)
3434

3535
client = bigquery.Client(**params)
36+
37+
# For importing, we ignore reports that have no URL or no comment. In
38+
# theory, a NULL URL shouldn't even be possible, but we have a few
39+
# reports like that. Reports without a comment are very unlikely to be
40+
# actionable.
3641
result = client.query_and_wait(
3742
f"""SELECT r.*, t.language_code, t.translated_text
3843
FROM `{settings.BIGQUERY_TABLE}` as r
3944
LEFT JOIN `{settings.BIGQUERY_TRANSLATIONS_TABLE}` t
4045
ON r.uuid = t.report_uuid
41-
WHERE r.reported_at >= @since;""",
46+
WHERE r.url IS NOT NULL
47+
AND r.comments IS NOT NULL
48+
AND r.reported_at >= @since;""",
4249
job_config=bigquery.QueryJobConfig(
4350
query_parameters=[
4451
bigquery.ScalarQueryParameter("since", "DATETIME", options["since"])
@@ -47,8 +54,6 @@ def handle(self, *args, **options):
4754
)
4855

4956
for row in result:
50-
if row.comments is None:
51-
continue
5257
report_obj = Report(
5358
app_name=row.app_name,
5459
app_channel=row.app_channel,

server/reportmanager/serializers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ class ReportEntrySerializer(serializers.ModelSerializer):
185185
app_name = serializers.CharField(source="app.name")
186186
app_channel = serializers.CharField(source="app.channel")
187187
app_version = serializers.CharField(source="app.version")
188-
breakage_category = serializers.CharField(source="breakage_category.value")
188+
breakage_category = serializers.CharField(
189+
source="breakage_category.value", allow_null=True
190+
)
189191
os = serializers.CharField(source="os.name", max_length=63)
190192

191193
class Meta:

0 commit comments

Comments
 (0)