From ea0b0dc779f027491ce6c2eccea1ba4b3e32d493 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 24 Jun 2024 08:08:39 +0200
Subject: [PATCH] fix: business overlapping

---
 .../vn/triggers/business_beforeUpdate.sql     | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/db/routines/vn/triggers/business_beforeUpdate.sql b/db/routines/vn/triggers/business_beforeUpdate.sql
index 4b7a10041..7dc69bc75 100644
--- a/db/routines/vn/triggers/business_beforeUpdate.sql
+++ b/db/routines/vn/triggers/business_beforeUpdate.sql
@@ -12,23 +12,21 @@ BEGIN
 	END IF;
 
 	IF !(OLD.started <=> NEW.started AND OLD.ended <=> NEW.ended) THEN
-		
-		SELECT COUNT(*) > 0 INTO isOverlapping
-			FROM business b
-			WHERE (util.hasDateOverlapped(
-						NEW.started, 
-						IFNULL(NEW.ended, b.started),
-						b.started,
-						IFNULL(b.ended, NEW.started))
-					OR (NEW.ended <=> NULL AND b.ended <=> NULL))
-				AND b.id <> OLD.id
-				AND workerFk = OLD.workerFk;
+		SELECT util.hasDateOverlapped(
+					started,
+					ended,
+					NEW.started, 
+					IFNULL(NEW.ended, b.started)
+				) isOverlapped INTO isOverlapping
+			FROM vn.business b
+			WHERE workerFk = NEW.workerFK
+				AND b.id <> NEW.id
+			ORDER BY isOverlapped DESC 
+			LIMIT 1;
 			
 		IF isOverlapping THEN 
 			CALL util.throw ('IS_OVERLAPPING');
 		END IF;
-
 	END IF;
-
 END$$
 DELIMITER ;