From 6775a336e1490f02a7cd5e49f3b5674dcc63b161 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sun, 2 Oct 2022 16:17:55 +0100
Subject: [PATCH] Revert "Add the ability to cache model attributes in redis"

This reverts commit 7c008c2149f0f2cc067810ff88d6d6fa7c63ef2c.
---
 website/common/models.py |  5 ++--
 website/utils/cache.py   | 61 ----------------------------------------
 2 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 website/utils/cache.py

diff --git a/website/common/models.py b/website/common/models.py
index 9ee1e25..0040360 100644
--- a/website/common/models.py
+++ b/website/common/models.py
@@ -25,7 +25,6 @@ from wagtail.snippets.models import register_snippet
 from wagtailmetadata.models import MetadataMixin
 
 from website.contrib.unsplash.widgets import UnsplashPhotoChooser
-from website.utils.cache import cached_model_property
 
 from .serializers import PaginationSerializer
 from .streamfield import add_heading_anchors, get_blocks, get_content_html
@@ -128,11 +127,11 @@ class BaseContentPage(BasePage, MetadataMixin):
     def _body_html(self) -> str:
         return str(self.body)
 
-    @cached_model_property
+    @cached_property
     def content_html(self) -> str:
         return get_content_html(self._body_html)
 
-    @cached_model_property
+    @cached_property
     def plain_text(self) -> str:
         return extract_text(self.content_html)
 
diff --git a/website/utils/cache.py b/website/utils/cache.py
deleted file mode 100644
index bb79dd1..0000000
--- a/website/utils/cache.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import inspect
-from functools import wraps
-from typing import Callable, Type, TypeVar
-
-from django.core.cache import cache
-from django.db.models import Model
-from django.db.models.signals import post_save
-from django.dispatch import receiver
-from django.utils.functional import cached_property
-
-T = TypeVar("T")
-
-
-def get_cache_key(instance: Model, method: Callable) -> str:
-    return f"page_{method.__name__}_{instance.pk}"
-
-
-def get_cached_model_properties(model: Type[Model]) -> list[str]:
-    return [
-        name
-        for name, _ in inspect.getmembers(
-            model, predicate=lambda p: hasattr(p, "__cached__")
-        )
-    ]
-
-
-def cached_model_property(f: Callable[[Model], T]) -> T:
-    @cached_property
-    @wraps(f)
-    def wrapped(self: Model) -> T:
-        cache_key = get_cache_key(self, f)
-        value = cache.get(cache_key)
-
-        if value is None:
-            value = f(self)
-            # Cache for 1 week
-            cache.set(cache_key, value, 604800)
-
-        return value
-
-    wrapped.__cached__ = True
-    return wrapped
-
-
-@receiver(post_save)
-def clear_cached_model_properties(
-    sender: Type, instance: Model, **kwargs: dict
-) -> None:
-    cached_model_properties = get_cached_model_properties(instance.__class__)
-
-    if cached_model_properties:
-        cache.delete_many(
-            [
-                get_cache_key(instance, getattr(instance.__class__, name).real_func)
-                for name in cached_model_properties
-            ]
-        )
-
-        # Prime caches again
-        for name in cached_model_properties:
-            getattr(instance, name)