diff --git a/swh/web/save_code_now/migrations/0013_saveoriginrequest_from_webhook.py b/swh/web/save_code_now/migrations/0013_saveoriginrequest_from_webhook.py
new file mode 100644
--- /dev/null
+++ b/swh/web/save_code_now/migrations/0013_saveoriginrequest_from_webhook.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2022 The Software Heritage developers
+# See the AUTHORS file at the top-level directory of this distribution
+# License: GNU General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("swh_web_save_code_now", "0012_saveoriginrequest_note"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="saveoriginrequest",
+ name="from_webhook",
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/swh/web/save_code_now/models.py b/swh/web/save_code_now/models.py
--- a/swh/web/save_code_now/models.py
+++ b/swh/web/save_code_now/models.py
@@ -103,6 +103,7 @@
# store ids of users that submitted the request as string list
user_ids = models.TextField(null=True)
note = models.TextField(null=True)
+ from_webhook = models.BooleanField(default=False)
class Meta:
app_label = "swh_web_save_code_now"
@@ -129,6 +130,7 @@
visit_date=visit_date.isoformat() if visit_date else None,
loading_task_id=self.loading_task_id,
note=self.note,
+ from_webhook=self.from_webhook,
)
def __str__(self) -> str:
diff --git a/swh/web/save_code_now/origin_save.py b/swh/web/save_code_now/origin_save.py
--- a/swh/web/save_code_now/origin_save.py
+++ b/swh/web/save_code_now/origin_save.py
@@ -404,6 +404,7 @@
origin_url: str,
privileged_user: bool = False,
user_id: Optional[int] = None,
+ from_webhook: bool = False,
**kwargs,
) -> SaveOriginRequestInfo:
"""Create a loading task to save a software origin into the archive.
@@ -426,6 +427,7 @@
privileged: Whether the user has some more privilege than other (bypass
review, access to privileged other visit types)
user_id: User identifier (provided when authenticated)
+ from_webhook: Indicates if the save request is created from a webhook receiver
kwargs: Optional parameters (e.g. artifact_url, artifact_filename,
artifact_version)
@@ -545,6 +547,7 @@
status=save_request_status,
loading_task_id=task["id"],
user_ids=f'"{user_id}"' if user_id else None,
+ from_webhook=from_webhook,
)
# save request must be manually reviewed for acceptation
@@ -568,6 +571,7 @@
origin_url=origin_url,
status=save_request_status,
user_ids=f'"{user_id}"' if user_id else None,
+ from_webhook=from_webhook,
)
# origin can not be saved as its url is blacklisted,
# log the request to the database anyway
@@ -577,6 +581,7 @@
origin_url=origin_url,
status=save_request_status,
user_ids=f'"{user_id}"' if user_id else None,
+ from_webhook=from_webhook,
)
if save_request_status == SAVE_REQUEST_REJECTED:
diff --git a/swh/web/save_code_now/tests/test_migrations.py b/swh/web/save_code_now/tests/test_migrations.py
--- a/swh/web/save_code_now/tests/test_migrations.py
+++ b/swh/web/save_code_now/tests/test_migrations.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 The Software Heritage developers
+# Copyright (C) 2021-2022 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
@@ -10,6 +10,7 @@
MIGRATION_0010 = "0010_saveoriginrequest_user_id"
MIGRATION_0011 = "0011_saveoriginrequest_user_ids"
MIGRATION_0012 = "0012_saveoriginrequest_note"
+MIGRATION_0013 = "0013_saveoriginrequest_from_webhook"
def test_migrations_09_add_visit_status_to_sor_model(migrator):
@@ -58,3 +59,19 @@
new_model = new_state.apps.get_model(APP_NAME, "SaveOriginRequest")
assert hasattr(new_model, "note") is True
+
+
+def test_migrations_13_add_from_webhook_to_sor_model(migrator):
+ """Ensures the migration adds the from_webhook field to SaveOriginRequest table"""
+
+ old_state = migrator.apply_initial_migration(
+ (APP_NAME, MIGRATION_0012),
+ )
+ old_model = old_state.apps.get_model(APP_NAME, "SaveOriginRequest")
+
+ assert hasattr(old_model, "from_webhook") is False
+
+ new_state = migrator.apply_tested_migration((APP_NAME, MIGRATION_0013))
+ new_model = new_state.apps.get_model(APP_NAME, "SaveOriginRequest")
+
+ assert hasattr(new_model, "from_webhook") is True
diff --git a/swh/web/save_code_now/tests/test_origin_save.py b/swh/web/save_code_now/tests/test_origin_save.py
--- a/swh/web/save_code_now/tests/test_origin_save.py
+++ b/swh/web/save_code_now/tests/test_origin_save.py
@@ -338,6 +338,7 @@
visit_date=_visit_date.isoformat() if _visit_date else None,
loading_task_id=sor.loading_task_id,
note=note,
+ from_webhook=False,
)
diff --git a/swh/web/save_origin_webhooks/generic_receiver.py b/swh/web/save_origin_webhooks/generic_receiver.py
--- a/swh/web/save_origin_webhooks/generic_receiver.py
+++ b/swh/web/save_origin_webhooks/generic_receiver.py
@@ -118,7 +118,7 @@
)
save_request = create_save_origin_request(
- visit_type=visit_type, origin_url=repo_url
+ visit_type=visit_type, origin_url=repo_url, from_webhook=True
)
return {
diff --git a/swh/web/save_origin_webhooks/tests/utils.py b/swh/web/save_origin_webhooks/tests/utils.py
--- a/swh/web/save_origin_webhooks/tests/utils.py
+++ b/swh/web/save_origin_webhooks/tests/utils.py
@@ -5,6 +5,7 @@
from typing import Any, Dict
+from swh.web.save_code_now.models import SaveOriginRequest
from swh.web.tests.helpers import check_api_post_responses
from swh.web.utils import reverse
@@ -40,6 +41,11 @@
task = dict(tasks[0].items())
assert task["arguments"]["kwargs"]["url"] == expected_origin_url
+ request = SaveOriginRequest.objects.get(
+ origin_url=expected_origin_url, visit_type=expected_visit_type
+ )
+ assert request.from_webhook
+
def origin_save_webhook_receiver_invalid_request_test(
forge_type: str,
diff --git a/swh/web/utils/typing.py b/swh/web/utils/typing.py
--- a/swh/web/utils/typing.py
+++ b/swh/web/utils/typing.py
@@ -248,6 +248,8 @@
"""Status of the scheduled task"""
note: Optional[str]
"""Optional note associated to the request, for instance rejection reason"""
+ from_webhook: bool
+ """Indicates if request was created from a webhook receiver"""
class OriginExistenceCheckInfo(TypedDict):