From ea83e3e1ac2ad2a28d4e717ddbeeaad15137156e Mon Sep 17 00:00:00 2001
From: Christian Anetzberger <christian@prothmann.com>
Date: Thu, 7 Sep 2023 06:29:01 +0000
Subject: [PATCH] Redone status generation and caching improvements

---
 manufacturing_overview/__init__.py            |  2 +-
 .../manufacturing_overview/api.py             | 20 ++++++++++++-------
 .../public/js/manufacturing_overview_desk.vue |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/manufacturing_overview/__init__.py b/manufacturing_overview/__init__.py
index c161d2f..c8744ec 100644
--- a/manufacturing_overview/__init__.py
+++ b/manufacturing_overview/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = '14.1.0'
+__version__ = '14.38.0'
diff --git a/manufacturing_overview/manufacturing_overview/api.py b/manufacturing_overview/manufacturing_overview/api.py
index d1e5e71..5073a88 100644
--- a/manufacturing_overview/manufacturing_overview/api.py
+++ b/manufacturing_overview/manufacturing_overview/api.py
@@ -2,9 +2,9 @@ import frappe
 from functools import reduce
 from datetime import date
 
-# frappe.utils.logger.set_log_level("DEBUG")
-# logger = frappe.logger("manufacturing_overview",
-#                        allow_site=True, file_count=10000)
+frappe.utils.logger.set_log_level("DEBUG")
+logger = frappe.logger("manufacturing_overview",
+                       allow_site=True, file_count=10000)
 
 
 def getDueInDays(d):
@@ -33,7 +33,8 @@ def shortenCustomerName(customer):
         return customer
 
 
-def generateProductionOverviewCache():
+def generateProductionOverviewCacheData():
+    logger.debug(f"Generating")
     salesOrderItems = frappe.db.sql(
         """
         SELECT
@@ -78,7 +79,7 @@ def generateProductionOverviewCache():
         soItem.qty = soItem.qty - soItem.delivered_qty
         soItem.link = '/app/sales-order/' + soItem.parent
 
-    frappe.cache().set_value("production_overview", salesOrderItems)
+    return salesOrderItems
 
 
 def calculateCurrentWarehouseQty(item_code, qty, currentWarehouseQtyList):
@@ -117,7 +118,12 @@ def calculateStatus(item):
 
 @frappe.whitelist()
 def getSalesorderOverviewList():
-    salesOrderItems = frappe.cache().get_value(
-        "production_overview", generateProductionOverviewCache())
+    logger.debug(f"Fetching Cache")
+    salesOrderItems = frappe.cache().get_value('production_overview')
+
+    if salesOrderItems is None:
+        logger.debug(f"Cache not found")
+        salesOrderItems = generateProductionOverviewCacheData()
+        frappe.cache().set_value('production_overview', salesOrderItems, expires_in_sec=120)
 
     return salesOrderItems
diff --git a/manufacturing_overview/public/js/manufacturing_overview_desk.vue b/manufacturing_overview/public/js/manufacturing_overview_desk.vue
index ce7ceda..4902276 100644
--- a/manufacturing_overview/public/js/manufacturing_overview_desk.vue
+++ b/manufacturing_overview/public/js/manufacturing_overview_desk.vue
@@ -58,7 +58,7 @@ export default {
   },
   created() {
     this.fetchEventsList();
-    this.timer = setInterval(this.fetchEventsList, 30000);
+    this.timer = setInterval(this.fetchEventsList, 60000);
   },
   methods: {
     fetchEventsList() {