Purge user when projects or releases change

Author: di

tests/unit/packaging/test_init.py

@@ -17,7 +17,7 @@
 
 from warehouse import packaging
 from warehouse.packaging.interfaces import IDownloadStatService, IFileStorage
-from warehouse.packaging.models import Project, Release
+from warehouse.packaging.models import Project, Release, User
 from warehouse.packaging.tasks import compute_trending
 
 
@@ -34,7 +34,7 @@ def test_includme(monkeypatch, with_trending):
     )
 
     def key_factory(keystring, iterate_on=None):
-        return pretend.call(keystring, iterate_on=None)
+        return pretend.call(keystring, iterate_on=iterate_on)
 
     monkeypatch.setattr(packaging, 'key_factory', key_factory)
 
@@ -78,22 +78,35 @@ def key_factory(keystring, iterate_on=None):
             Project,
             cache_keys=[
                 key_factory("project/{obj.normalized_name}"),
+                key_factory("user/{itr.username}", iterate_on='users'),
             ],
             purge_keys=[
                 key_factory("project/{obj.normalized_name}"),
+                key_factory("user/{itr.username}", iterate_on='users'),
                 key_factory("all-projects"),
             ],
         ),
         pretend.call(
             Release,
             cache_keys=[
                 key_factory("project/{obj.project.normalized_name}"),
+                key_factory("user/{itr.username}", iterate_on='project.users'),
             ],
             purge_keys=[
                 key_factory("project/{obj.project.normalized_name}"),
+                key_factory("user/{itr.username}", iterate_on='project.users'),
                 key_factory("all-projects"),
             ],
         ),
+        pretend.call(
+            User,
+            cache_keys=[
+                key_factory("user/{obj.username}"),
+            ],
+            purge_keys=[
+                key_factory("user/{obj.username}"),
+            ],
+        ),
     ]
 
     if with_trending:

warehouse/packaging/__init__.py

@@ -12,6 +12,7 @@
 
 from celery.schedules import crontab
 
+from warehouse.accounts.models import User
 from warehouse.cache.origin import key_factory
 from warehouse.packaging.interfaces import IDownloadStatService, IFileStorage
 from warehouse.packaging.services import RedisDownloadStatService
@@ -45,6 +46,7 @@ def includeme(config):
         ],
         purge_keys=[
             key_factory("project/{obj.normalized_name}"),
+            key_factory("user/{itr.username}", iterate_on='users'),
             key_factory("all-projects"),
         ],
     )
@@ -56,9 +58,19 @@ def includeme(config):
         ],
         purge_keys=[
             key_factory("project/{obj.project.normalized_name}"),
+            key_factory("user/{itr.username}", iterate_on='project.users'),
             key_factory("all-projects"),
         ],
     )
+    config.register_origin_cache_keys(
+        User,
+        cache_keys=[
+            key_factory("user/{obj.username}"),
+        ],
+        purge_keys=[
+            key_factory("user/{obj.username}"),
+        ],
+    )
 
     # Add a periodic task to compute trending once a day, assuming we have
     # been configured to be able to access BigQuery.