Overlapping self owned user polygons now union each other

api/res/setup_sql.sql

@@ -53,6 +53,35 @@ BEGIN
 END //
 DELIMITER ;
 
+DELIMITER //
+CREATE PROCEDURE selectUserPolygon
+(IN gID VARCHAR(6),
+IN usID VARCHAR(6))
+BEGIN
+    SELECT * FROM `polygonPoints`
+    JOIN `polygonArea` ON
+    `polygonArea`.polygonID = polygonPoints.polygonID
+    JOIN (SELECT * FROM `userJoinedGames` WHERE gameID = gID) AS userColour ON
+    `polygonArea`.userID = userColour.UserID
+    WHERE
+        polygonArea.gameID = gID AND polygonArea.userID = usID;
+END //
+DELIMITER ;
+
+DELIMITER //
+CREATE PROCEDURE selectNonUserPolygon
+(IN gID VARCHAR(6),
+IN usID VARCHAR(6))
+BEGIN
+    SELECT * FROM `polygonPoints`
+    JOIN `polygonArea` ON
+    `polygonArea`.polygonID = polygonPoints.polygonID
+    JOIN (SELECT * FROM `userJoinedGames` WHERE gameID = gID) AS userColour ON
+    `polygonArea`.userID = userColour.UserID
+    WHERE
+        polygonArea.gameID = gID AND polygonArea.userID != usID;
+END //
+DELIMITER ;
 
 DELIMITER //
 CREATE PROCEDURE insertPolygon
@@ -70,6 +99,15 @@ BEGIN
 END //
 DELIMITER ;
 
+DELIMITER //
+CREATE PROCEDURE deletePolygon
+(IN id VARCHAR(36))
+BEGIN
+    DELETE FROM `polygonPoints` WHERE polygonID = id;
+    DELETE FROM `polygonArea` WHERE polygonID = id;
+END //
+DELIMITER ;
+
 INSERT INTO `gameInstances` (gameID) VALUES ("samdum");
 INSERT INTO `users` (userID, nickname) VALUES ("samded", "Lesmaux");
 INSERT INTO `users` (userID, nickname) VALUES ("fanded", "Umbra Sheep");
@@ -80,7 +118,8 @@ INSERT INTO `polygonPoints` (polygonID, lat, lng) VALUES
 ("someuniqueid", -43.5623, 172.5655),
 ("someuniqueid", -43.5623, 172.5650),
 ("someuniqueid", -43.5628, 172.5650),
-("someuniqueid", -43.5628, 172.5655);
+("someuniqueid", -43.5628, 172.5655),
+("someuniqueid", -43.5623, 172.5655);
 -- TODO CREATE PROCEDURE FOR GENERATING GAME ID
 -- concat(substring('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', rand()*36+1, 1),
 -- substring('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', rand()*36+1, 1),