From 33d8e26c9b745014b1ede6132bb0b8e046d0993b Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Sat, 11 Feb 2023 17:22:25 +0000
Subject: [PATCH] Use cachalot to invalidate caches

---
 app/settings.py                                |  2 ++
 core/models.py                                 | 18 +-----------------
 core/templates/partials/account-list.html      |  4 +++-
 core/templates/partials/assetgroup-list.html   |  8 +++-----
 .../partials/assetrestriction-list.html        |  4 +++-
 core/templates/partials/callback-list.html     |  4 +++-
 core/templates/partials/hook-list.html         |  4 +++-
 core/templates/partials/product-list.html      |  5 +++--
 core/templates/partials/risk-list.html         |  4 +++-
 core/templates/partials/signal-list.html       |  4 +++-
 core/templates/partials/strategy-list.html     |  4 +++-
 core/templates/partials/trade-list.html        |  4 +++-
 core/templates/partials/trading-time-list.html |  4 +++-
 .../partials/trend-direction-list.html         |  4 +++-
 core/tests/lib/__init__.py                     |  0
 .../test_crossfilter.py}                       |  2 +-
 core/trading/assetfilter.py                    |  7 +++++++
 core/trading/market.py                         |  3 +++
 requirements.txt                               |  1 +
 19 files changed, 51 insertions(+), 35 deletions(-)
 delete mode 100644 core/tests/lib/__init__.py
 rename core/tests/{lib/test_market.py => trading/test_crossfilter.py} (99%)
 create mode 100644 core/trading/assetfilter.py

diff --git a/app/settings.py b/app/settings.py
index 9754174..efc08e0 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -53,6 +53,7 @@ INSTALLED_APPS = [
     # "two_factor.plugins.yubikey",
     # "otp_yubikey",
     "mixins",
+    "cachalot",
 ]
 
 
@@ -202,6 +203,7 @@ DEBUG_TOOLBAR_PANELS = [
     "debug_toolbar.panels.logging.LoggingPanel",
     "debug_toolbar.panels.redirects.RedirectsPanel",
     "debug_toolbar.panels.profiling.ProfilingPanel",
+    "cachalot.panels.CachalotPanel",
 ]
 
 from app.local_settings import *  # noqa
diff --git a/core/models.py b/core/models.py
index 414602c..5ba1a7d 100644
--- a/core/models.py
+++ b/core/models.py
@@ -418,23 +418,7 @@ class AssetGroup(models.Model):
     allowed = models.JSONField(null=True, blank=True, default=dict)
 
     def __str__(self):
-        return f"{self.name} ({self.restrictions})"
-
-    @property
-    def matches(self):
-        """
-        Get the total number of matches for this group.
-        """
-        if isinstance(self.allowed, dict):
-            truthy_values = [x for x in self.allowed.values() if x is True]
-            return f"{len(truthy_values)}/{len(self.allowed)}"
-
-    @property
-    def restrictions(self):
-        """
-        Get the total number of restrictions for this group.
-        """
-        return self.assetrestriction_set.count()
+        return f"{self.name}"
 
 
 class AssetRestriction(models.Model):
diff --git a/core/templates/partials/account-list.html b/core/templates/partials/account-list.html
index 348dedd..9a3d0b1 100644
--- a/core/templates/partials/account-list.html
+++ b/core/templates/partials/account-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Account' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_accounts request.user.id object_list %}
+{% cache 600 objects_accounts request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/assetgroup-list.html b/core/templates/partials/assetgroup-list.html
index 71ffbf2..e60eaf0 100644
--- a/core/templates/partials/assetgroup-list.html
+++ b/core/templates/partials/assetgroup-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.AssetGroup' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_assetgroups request.user.id object_list %}
+{% cache 600 objects_assetgroups request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
@@ -14,8 +16,6 @@
       <th>name</th>
       <th>description</th>
       <th>account</th>
-      <th>status</th>
-      <th>restrictions</th>
       <th>actions</th>
     </thead>
     {% for item in object_list %}
@@ -25,8 +25,6 @@
         <td>{{ item.name }}</td>
         <td>{{ item.description }}</td>
         <td>{{ item.account }}</td>
-        <td>{{ item.matches }}</td>
-        <td>{{ item.restrictions }}</td>
         <td>
           <div class="buttons">
             <button
diff --git a/core/templates/partials/assetrestriction-list.html b/core/templates/partials/assetrestriction-list.html
index d47c813..fa7a00a 100644
--- a/core/templates/partials/assetrestriction-list.html
+++ b/core/templates/partials/assetrestriction-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.AssetRestriction' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_assetrestrictions request.user.id object_list %}
+{% cache 600 objects_assetrestrictions request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/callback-list.html b/core/templates/partials/callback-list.html
index 6ce48e1..01cd2ea 100644
--- a/core/templates/partials/callback-list.html
+++ b/core/templates/partials/callback-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Callback' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_callbacks request.user.id object_list %}
+{% cache 600 objects_callbacks request.user.id object_list last %}
   <table class="table is-fullwidth is-hoverable" id="callbacks-table">
     <thead>
       <th>id</th>
diff --git a/core/templates/partials/hook-list.html b/core/templates/partials/hook-list.html
index 7650b5f..ffef953 100644
--- a/core/templates/partials/hook-list.html
+++ b/core/templates/partials/hook-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Hook' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_hooks request.user.id object_list %}
+{% cache 600 objects_hooks request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/product-list.html b/core/templates/partials/product-list.html
index c3127c0..1965594 100644
--- a/core/templates/partials/product-list.html
+++ b/core/templates/partials/product-list.html
@@ -1,7 +1,8 @@
 {% load static %}
 {% load cache %}
-
-{% cache 600 objects_plans request.user.id plans %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Plan' as last %}
+{% cache 600 objects_plans request.user.id plans last %}
 
   {% for plan in plans %}
     <div class="box">
diff --git a/core/templates/partials/risk-list.html b/core/templates/partials/risk-list.html
index d447c67..5e7321e 100644
--- a/core/templates/partials/risk-list.html
+++ b/core/templates/partials/risk-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.RiskModel' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_risk request.user.id object_list %}
+{% cache 600 objects_risk request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/signal-list.html b/core/templates/partials/signal-list.html
index 938cb0d..d7a7e4d 100644
--- a/core/templates/partials/signal-list.html
+++ b/core/templates/partials/signal-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Signal' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_signals request.user.id object_list %}
+{% cache 600 objects_signals request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/strategy-list.html b/core/templates/partials/strategy-list.html
index efe3e04..058a8cb 100644
--- a/core/templates/partials/strategy-list.html
+++ b/core/templates/partials/strategy-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Strategy' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_strategies request.user.id object_list %}
+{% cache 600 objects_strategies request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/trade-list.html b/core/templates/partials/trade-list.html
index 6254978..7798c86 100644
--- a/core/templates/partials/trade-list.html
+++ b/core/templates/partials/trade-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Trade' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_trades request.user.id object_list %}
+{% cache 600 objects_trades request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/trading-time-list.html b/core/templates/partials/trading-time-list.html
index c637201..2760cc8 100644
--- a/core/templates/partials/trading-time-list.html
+++ b/core/templates/partials/trading-time-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.TradingTime' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_tradingtimes request.user.id object_list %}
+{% cache 600 objects_tradingtimes request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/templates/partials/trend-direction-list.html b/core/templates/partials/trend-direction-list.html
index 349770b..3eaf154 100644
--- a/core/templates/partials/trend-direction-list.html
+++ b/core/templates/partials/trend-direction-list.html
@@ -1,6 +1,8 @@
 {% load cache %}
+{% load cachalot cache %}
+{% get_last_invalidation 'core.Strategy' as last %}
 {% include 'mixins/partials/notify.html' %}
-{% cache 600 objects_trenddirections request.user.id object_list %}
+{% cache 600 objects_trenddirections request.user.id object_list last %}
   <table
     class="table is-fullwidth is-hoverable"
     hx-target="#{{ context_object_name }}-table"
diff --git a/core/tests/lib/__init__.py b/core/tests/lib/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/core/tests/lib/test_market.py b/core/tests/trading/test_crossfilter.py
similarity index 99%
rename from core/tests/lib/test_market.py
rename to core/tests/trading/test_crossfilter.py
index 696345a..2427148 100644
--- a/core/tests/lib/test_market.py
+++ b/core/tests/trading/test_crossfilter.py
@@ -3,7 +3,7 @@ from django.test import TestCase
 from core.trading.crossfilter import check_conflicting_position, check_existing_position
 
 
-class MarketTestCase(TestCase):
+class CrossfilterTestCase(TestCase):
     def test_conflict_position(self):
         position = {
             "symbol": "EUR_USD",
diff --git a/core/trading/assetfilter.py b/core/trading/assetfilter.py
new file mode 100644
index 0000000..851a9c6
--- /dev/null
+++ b/core/trading/assetfilter.py
@@ -0,0 +1,7 @@
+def get_allowed(strategy, symbol, direction):
+    """
+    Determine whether the trade is allowed according to the Asset Groups
+    linked to the strategy.
+    """
+
+    #asset_group = strategy.
\ No newline at end of file
diff --git a/core/trading/market.py b/core/trading/market.py
index ba75a1d..38a5b16 100644
--- a/core/trading/market.py
+++ b/core/trading/market.py
@@ -5,6 +5,7 @@ from core.exchanges import common
 from core.exchanges.convert import get_price, side_to_direction
 from core.lib.notify import sendmsg
 from core.models import Account, Strategy, Trade
+from core.trading import assetfilter
 from core.trading.crossfilter import crossfilter
 from core.trading.risk import check_risk
 from core.util import logs
@@ -325,6 +326,8 @@ def execute_strategy(callback, strategy, func):
     price_bound = round(price_bound, display_precision)
 
     # Callback now verified
+    if func == "entry":
+        allowed = assetfilter.get_allowed(strategy, symbol, direction)
     if func == "exit":
         check_exit = crossfilter(account, symbol, direction, func)
         if check_exit is None:
diff --git a/requirements.txt b/requirements.txt
index be29c87..e2b0ad0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,3 +26,4 @@ git+https://git.zm.is/XF/django-crud-mixins
 # For caching
 redis
 hiredis
+django-cachalot