issue purge when projects are transferred to/between orgs (#13532)

* issue purge when projects are transferred to/between orgs

Co-authored-by: Nina Zakharenko <[email protected]>

* Update warehouse/organizations/services.py

Co-authored-by: chrysle <[email protected]>

* Autoformatting

* Move bin/flushes check to later in linting check

* fix translations

---------

Co-authored-by: Nina Zakharenko <[email protected]>
Co-authored-by: chrysle <[email protected]>
Co-authored-by: Dustin Ingram <[email protected]>

Author: 4 people

bin/lint

@@ -12,10 +12,10 @@ set -x
 
 # Actually run our tests.
 find . -name '*.py' -exec python -m pyupgrade --py311-plus {} +
-./bin/flushes
 python -m flake8 .
 python -m black --check *.py warehouse/ tests/
 python -m isort --check *.py warehouse/ tests/
 python -m doc8 --allow-long-titles README.rst CONTRIBUTING.rst docs/ --ignore-path "docs/**/_build/"
 python -m curlylint ./warehouse/templates ./docs/blog
 python -m mypy -p warehouse
+./bin/flushes

tests/unit/packaging/test_init.py

@@ -140,7 +140,13 @@ def key_factory(keystring, iterate_on=None, if_attr_exists=None):
                 ),
             ],
         ),
-        pretend.call(Organization, cache_keys=["org/{obj.normalized_name}"]),
+        pretend.call(
+            Organization,
+            cache_keys=["org/{obj.normalized_name}"],
+            purge_keys=[
+                key_factory("org/{obj.normalized_name}"),
+            ],
+        ),
         pretend.call(
             Organization.name,
             purge_keys=[

warehouse/locale/messages.pot

@@ -463,12 +463,12 @@ msgid ""
 msgstr ""
 
 #: warehouse/manage/views/__init__.py:2278
-#: warehouse/manage/views/organizations.py:881
+#: warehouse/manage/views/organizations.py:882
 msgid "User '${username}' already has an active invite. Please try again later."
 msgstr ""
 
 #: warehouse/manage/views/__init__.py:2344
-#: warehouse/manage/views/organizations.py:946
+#: warehouse/manage/views/organizations.py:947
 msgid "Invitation sent to '${username}'"
 msgstr ""
 
@@ -481,30 +481,30 @@ msgid "Invitation already expired."
 msgstr ""
 
 #: warehouse/manage/views/__init__.py:2421
-#: warehouse/manage/views/organizations.py:1133
+#: warehouse/manage/views/organizations.py:1134
 msgid "Invitation revoked from '${username}'."
 msgstr ""
 
-#: warehouse/manage/views/organizations.py:857
+#: warehouse/manage/views/organizations.py:858
 msgid "User '${username}' already has ${role_name} role for organization"
 msgstr ""
 
-#: warehouse/manage/views/organizations.py:868
+#: warehouse/manage/views/organizations.py:869
 msgid ""
 "User '${username}' does not have a verified primary email address and "
 "cannot be added as a ${role_name} for organization"
 msgstr ""
 
-#: warehouse/manage/views/organizations.py:1029
-#: warehouse/manage/views/organizations.py:1071
+#: warehouse/manage/views/organizations.py:1030
+#: warehouse/manage/views/organizations.py:1072
 msgid "Could not find organization invitation."
 msgstr ""
 
-#: warehouse/manage/views/organizations.py:1039
+#: warehouse/manage/views/organizations.py:1040
 msgid "Organization invitation could not be re-sent."
 msgstr ""
 
-#: warehouse/manage/views/organizations.py:1086
+#: warehouse/manage/views/organizations.py:1087
 msgid "Expired invitation for '${username}' deleted."
 msgstr ""
 

warehouse/manage/views/organizations.py

@@ -19,6 +19,7 @@
     HTTPSeeOther,
 )
 from pyramid.view import view_config, view_defaults
+from sqlalchemy import orm
 
 from warehouse.accounts.interfaces import ITokenService, IUserService, TokenExpired
 from warehouse.accounts.models import User
@@ -1572,6 +1573,9 @@ def transfer_organization_project(project, request):
             project_name=project.name,
         )
 
+        # Mark Organization as dirty, so purges will happen
+        orm.attributes.flag_dirty(organization)
+
     # Add project to selected organization.
     organization = organization_service.get_organization_by_name(form.organization.data)
     organization_service.add_organization_project(organization.id, project.id)
@@ -1592,6 +1596,9 @@ def transfer_organization_project(project, request):
         },
     )
 
+    # Mark Organization as dirty, so purges will happen
+    orm.attributes.flag_dirty(organization)
+
     # Send notification emails.
     owner_users = set(
         organization_owners(request, organization) + project_owners(request, project)

warehouse/organizations/services.py

@@ -12,7 +12,7 @@
 
 import datetime
 
-from sqlalchemy import delete, func, select
+from sqlalchemy import delete, func, orm, select
 from sqlalchemy.exc import NoResultFound
 from zope.interface import implementer
 
@@ -396,6 +396,10 @@ def add_organization_project(self, organization_id, project_id):
         )
 
         self.db.add(organization_project)
+        self.db.flush()  # Flush db so we can address the organization related object
+
+        # Mark Organization as dirty, so purges will happen
+        orm.attributes.flag_dirty(organization_project.organization)
 
         return organization_project
 

warehouse/packaging/__init__.py

@@ -156,7 +156,11 @@ def includeme(config):
         ],
     )
     config.register_origin_cache_keys(
-        Organization, cache_keys=["org/{obj.normalized_name}"]
+        Organization,
+        cache_keys=["org/{obj.normalized_name}"],
+        purge_keys=[
+            key_factory("org/{obj.normalized_name}"),
+        ],
     )
     config.register_origin_cache_keys(
         Organization.name,