From c80e6f324074dedd36ba0b3bbeebce2fe9663316 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 21 Feb 2025 10:38:28 +0100
Subject: [PATCH 1/2] fix: refs #7759 mockDate and increased myt version

---
 db/dump/mockDate.sql                        |  4 ++--
 db/routines/util/functions/mockTime.sql     |  2 +-
 db/routines/util/functions/mockTimeBase.sql | 26 ---------------------
 db/routines/util/functions/mockUtcTime.sql  | 14 +----------
 package.json                                |  2 +-
 5 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 db/routines/util/functions/mockTimeBase.sql

diff --git a/db/dump/mockDate.sql b/db/dump/mockDate.sql
index 1ed5d76bef..b74bc9bb6f 100644
--- a/db/dump/mockDate.sql
+++ b/db/dump/mockDate.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockTime()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION util.mockTime()
 	RETURNS DATETIME
 	DETERMINISTIC
 BEGIN
@@ -8,7 +8,7 @@ END$$
 DELIMITER ;
 
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockUtcTime()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION util.mockUtcTime()
 	RETURNS DATETIME
 	DETERMINISTIC
 BEGIN
diff --git a/db/routines/util/functions/mockTime.sql b/db/routines/util/functions/mockTime.sql
index cbdac99e66..4dd050cf2d 100644
--- a/db/routines/util/functions/mockTime.sql
+++ b/db/routines/util/functions/mockTime.sql
@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`mockTime`()
 BEGIN
 /**
  * Returns current dateTime
-  *
+ *
  * @return current datetime
  */
 	RETURN NOW();
diff --git a/db/routines/util/functions/mockTimeBase.sql b/db/routines/util/functions/mockTimeBase.sql
deleted file mode 100644
index f1cba9e17e..0000000000
--- a/db/routines/util/functions/mockTimeBase.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`mockTimeBase`(vIsUtc BOOL)
-	RETURNS datetime
-	DETERMINISTIC
-BEGIN
-/**
- * Returns the date formatted to utc if vIsUtc or config.mocTz if not
- *
- * @param vIsUtc If date must be returned as UTC format
- * @return The formatted mock time
- */
-DECLARE vMockUtcTime DATETIME;
-	DECLARE vMockTz VARCHAR(255);
-
-	SELECT mockUtcTime, mockTz
-		INTO vMockUtcTime, vMockTz
-		FROM config
-		LIMIT 1;
-
-	IF vIsUtc OR vMockTz IS NULL THEN
-		RETURN vMockUtcTime;
-	ELSE
-		RETURN CONVERT_TZ(vMockUtcTime, '+00:00', vMockTz);
-	END IF;
-END$$
-DELIMITER ;
diff --git a/db/routines/util/functions/mockUtcTime.sql b/db/routines/util/functions/mockUtcTime.sql
index 3132760ab7..1a11872a26 100644
--- a/db/routines/util/functions/mockUtcTime.sql
+++ b/db/routines/util/functions/mockUtcTime.sql
@@ -4,22 +4,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`mockUtcTime`()
 	DETERMINISTIC
 BEGIN
 /**
- * Returns the UTC datetime in mockTime format or timeStamp depending on config table
+ * Returns current UTC dateTime
  *
  * @return The UTC datetime format
  */
--- FIXME: #5041 Commented because there is slowness when querying a table
-/*
-	DECLARE vMockEnabled BOOL;
-
-	SELECT mockEnabled INTO vMockEnabled FROM config LIMIT 1;
-
-	IF vMockEnabled THEN
-		RETURN mockTimeBase(TRUE);
-	ELSE
-		RETURN UTC_TIMESTAMP();
-	END IF;
-*/
 	RETURN UTC_TIMESTAMP();
 END$$
 DELIMITER ;
diff --git a/package.json b/package.json
index 9e7683bc0a..8e64b82528 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "@babel/register": "^7.7.7",
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@verdnatura/myt": "^1.6.12",
+        "@verdnatura/myt": "^1.6.13",
         "angular-mocks": "^1.7.9",
         "babel-jest": "^26.0.1",
         "babel-loader": "^8.2.4",

From 2059b8eaa625db00bcfa3c6970b18f1774592d33 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 21 Feb 2025 10:48:05 +0100
Subject: [PATCH 2/2] fix: refs #7759 mockDate and increased myt version

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 042b91fe02..22dbce27ea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -143,8 +143,8 @@ devDependencies:
     specifier: ^19.1.0
     version: 19.1.0
   '@verdnatura/myt':
-    specifier: ^1.6.12
-    version: 1.6.12
+    specifier: ^1.6.13
+    version: 1.6.13
   angular-mocks:
     specifier: ^1.7.9
     version: 1.8.3
@@ -2846,8 +2846,8 @@ packages:
     dev: false
     optional: true
 
-  /@verdnatura/myt@1.6.12:
-    resolution: {integrity: sha512-t/SiDuQW9KJkcjhwQ9AkrcoTwghxQ7IyQ56e+88eYdoMi24l6bQGF0wHzMaIPRfQAoR8hqgfMOief4OAqW4Iqw==}
+  /@verdnatura/myt@1.6.13:
+    resolution: {integrity: sha512-Qw5cfXa2FnjrMBbzP3InYc3vIjbNhyHhmle12Y7FaYFeYE+CXlerryuMqtcoe4+9PsCqwDCKlW37YKmipy2cnQ==}
     hasBin: true
     dependencies:
       '@sqltools/formatter': 1.2.5