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

Fix send email query #4281

Merged
merged 2 commits into from
May 7, 2024
Merged

Conversation

sarayourfriend
Copy link
Collaborator

Fixes

Related to #3742 by @sarayourfriend

Description

See #2037 (comment) for a description of the problem needing solving in this PR.

I've marked this as critical because we need to get this email sent as soon as possible, which means we need to deploy this to production ASAP so we can run the command there.

Testing Instructions

Confirm your understanding of the problem as described in the linked comment, then check whether the modified query would solve the issue. For clarity, I have run the query in production as follows:

select count(distinct email) from api_oauth2registration where 'name' in (select 'name' 
 from api_throttledapplication where verified = true);

This returns 1628 rather than the 2 that the original query returned.

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).
  • 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 (just catalog/generate-docs for catalog
    PRs) or the media properties generator (just catalog/generate-docs media-props
    for the catalog or 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.

@sarayourfriend sarayourfriend added 🟥 priority: critical Must be addressed ASAP 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository 🧱 stack: api Related to the Django API labels May 7, 2024
@sarayourfriend sarayourfriend requested a review from a team as a code owner May 7, 2024 06:01
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

The code changes make sense and work as expected.

@@ -33,6 +33,18 @@ class Meta:
description = Faker("catch_phrase")
email = Faker("email")

@factory.post_generation
def application(obj, create, extracted, **kwargs):
# Only create the application if creating, and either
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# Only create the application if creating, and either
# Only create the application if creating ??, and either

If creating ThrottledApplication ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

If creating the registration. create refers to the factory's state: https://factoryboy.readthedocs.io/en/stable/reference.html#postgeneration

create is a boolean indicating which strategy was used

@sarayourfriend sarayourfriend merged commit d5a9e39 into main May 7, 2024
72 checks passed
@sarayourfriend sarayourfriend deleted the fix/apimoveannouncement-query-fix branch May 7, 2024 23:56
obulat pushed a commit that referenced this pull request May 8, 2024
* Fix send email query

* Fix doc strings
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: fix Bug fix 🟥 priority: critical Must be addressed ASAP 🧱 stack: api Related to the Django API
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants