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.

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

Drop status column from media reports #4590

Merged
merged 3 commits into from
Jul 3, 2024
Merged

Drop status column from media reports #4590

merged 3 commits into from
Jul 3, 2024

Conversation

krysal
Copy link
Member

@krysal krysal commented Jul 1, 2024

Fixes

Fixes #3642 by @sarayourfriend

Description

As title says, the column is removed, making the AbstractMediaReport.STATUS_CHOICES unnecessary, so they're also removed.

Testing Instructions

Try creating a new report to confirm it still works.

curl --request POST \
  --url http://localhost:50280/v1/images/<uuid>/report/ \
  --header 'Content-Type: application/json' \
  --data '{
	"reason": "[dmca|mature|other]",
	"description": "Test"
}'

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • [N/A] I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • [N/A] I ran the DAG documentation generator (./ov just catalog/generate-docs for catalog PRs) or the media properties generator (./ov just catalog/generate-docs media-props for the catalog or ./ov just api/generate-docs for the API) where applicable.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@krysal krysal requested a review from a team as a code owner July 1, 2024 22:58
@openverse-bot openverse-bot added 🧱 stack: api Related to the Django API migrations Modifications to Django migrations 🟨 priority: medium Not blocking but should be addressed soon 🧰 goal: internal improvement Improvement that benefits maintainers, not users 💻 aspect: code Concerns the software code in the repository labels Jul 1, 2024
Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, except there are usages of status and the status choice constants that we should also remove.

If you search for status= in test_media_report.py there are three more related to the report factory usage that should be removed.

After that it should be possible to also remove the status choices constants from api/models/media.py.

@@ -41,7 +40,7 @@ def test_pending_reports_have_no_subreport_models(
media = media_type_config.model_factory.create()
report = media_type_config.report_factory.create(media_obj=media, reason=reason)

assert report.status == PENDING
assert report.decision is None
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this can also be assert report.is_pending, to be more directly relevant to the previous expression.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good observation! Changes applied.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this might have gotten mixed up in commits? Left a comment with suggested change.

Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Looks like maybe a small mix up with commits and a commented assertion, but an easy fix and non-blocker really.

api/test/unit/models/test_media_report.py Outdated Show resolved Hide resolved
@@ -41,7 +40,7 @@ def test_pending_reports_have_no_subreport_models(
media = media_type_config.model_factory.create()
report = media_type_config.report_factory.create(media_obj=media, reason=reason)

assert report.status == PENDING
assert report.decision is None
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this might have gotten mixed up in commits? Left a comment with suggested change.

Copy link
Collaborator

@stacimc stacimc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, other than the comment Sara noticed 👍

Copy link

github-actions bot commented Jul 3, 2024

This PR has migrations. Please rebase it before merging to ensure that conflicting migrations are not introduced.

@WordPress WordPress deleted a comment from github-actions bot Jul 3, 2024
@krysal krysal merged commit d599fd7 into main Jul 3, 2024
46 checks passed
@krysal krysal deleted the drop/report_status branch July 3, 2024 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🧰 goal: internal improvement Improvement that benefits maintainers, not users migrations Modifications to Django migrations 🟨 priority: medium Not blocking but should be addressed soon 🧱 stack: api Related to the Django API
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Drop status column from content report tables
4 participants