Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Umar/4903 external resources false broken #2249

Merged
merged 3 commits into from
Aug 2, 2024
Merged

Umar/4903 external resources false broken #2249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bdfbcb
fixed logic for broken status marking in external resource check
umar8hassan Jul 22, 2024
eda040e
updated unit test
umar8hassan Jul 22, 2024
3f7dbc8
updated unit test and added comment
umar8hassan Jul 22, 2024
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
12 changes: 8 additions & 4 deletions external_resources/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,24 @@ def check_external_resources(resources: list[int]):
log.debug(ex)
state.status = ExternalResourceState.Status.CHECK_FAILED
else:
# Status and flag should be updated if codes are not in ignored cases
if (
url_status not in RESOURCE_UNCHECKED_STATUSES
or backup_url_status not in RESOURCE_UNCHECKED_STATUSES
):
if is_url_broken and is_backup_url_broken:
is_broken = is_url_broken and (
backup_url_status is None or is_backup_url_broken
)
if is_broken:
# both external_url and backup_url are broken.
state.status = ExternalResourceState.Status.BROKEN
else:
# Either external_url or backup_url is valid.
state.status = ExternalResourceState.Status.VALID

if is_url_broken and not resource.metadata.get("is_broken", False):
resource.metadata["is_broken"] = True
resource.save()
if resource.metadata.get("is_broken") != is_broken:
resource.metadata["is_broken"] = is_broken
resource.save()
finally:
state.last_checked = timezone.now()

Expand Down
12 changes: 10 additions & 2 deletions external_resources/tasks_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
HTTP_401_UNAUTHORIZED,
)

from external_resources.constants import RESOURCE_UNCHECKED_STATUSES
from external_resources.exceptions import CheckFailedError
from external_resources.factories import ExternalResourceStateFactory
from external_resources.models import ExternalResourceState
Expand Down Expand Up @@ -148,7 +149,6 @@ def test_check_external_resources( # noqa: PLR0913

updated_state = ExternalResourceState.objects.get(id=external_resource_state.id)

assert updated_state.status == resource_status
assert updated_state.last_checked is not None

assert updated_state.is_external_url_broken is url_status
Expand All @@ -157,7 +157,15 @@ def test_check_external_resources( # noqa: PLR0913
assert updated_state.external_url_response_code == url_status_code
assert updated_state.backup_url_response_code == backup_url_status_code

assert updated_state.content.metadata.get("is_broken", False) is url_status
# Status and flag are updated if codes are not in ignored cases
if (
url_status_code not in RESOURCE_UNCHECKED_STATUSES
or backup_url_status_code not in RESOURCE_UNCHECKED_STATUSES
):
assert updated_state.status == resource_status
assert updated_state.content.metadata.get("is_broken", False) == (
url_status and (backup_url_status_code is None or backup_url_status)
)


@pytest.mark.django_db()
Expand Down