From 4342e29c69eb87f77901ab0c2d81666131a09d59 Mon Sep 17 00:00:00 2001
From: xbgmsharp <xbgmsharp@gmail.com>
Date: Sun, 5 Feb 2023 01:16:26 +0100
Subject: [PATCH] Update vessel check, remove mmsi dependency to vessel_id

---
 initdb/02_3_2_signalk_public_functions.sql | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/initdb/02_3_2_signalk_public_functions.sql b/initdb/02_3_2_signalk_public_functions.sql
index 19ac038..2abf7ea 100644
--- a/initdb/02_3_2_signalk_public_functions.sql
+++ b/initdb/02_3_2_signalk_public_functions.sql
@@ -364,7 +364,7 @@ CREATE OR REPLACE FUNCTION process_account_queue_fn(IN _email TEXT) RETURNS void
     BEGIN
         IF _email IS NULL OR _email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
         SELECT * INTO account_rec
@@ -372,7 +372,7 @@ CREATE OR REPLACE FUNCTION process_account_queue_fn(IN _email TEXT) RETURNS void
             WHERE email = _email;
         IF account_rec.email IS NULL OR account_rec.email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
         -- Gather email and pushover app settings
@@ -403,7 +403,7 @@ CREATE OR REPLACE FUNCTION process_account_otp_validation_queue_fn(IN _email TEX
     BEGIN
         IF _email IS NULL OR _email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
         SELECT * INTO account_rec
@@ -411,7 +411,7 @@ CREATE OR REPLACE FUNCTION process_account_otp_validation_queue_fn(IN _email TEX
             WHERE email = _email;
         IF account_rec.email IS NULL OR account_rec.email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
         -- Gather email and pushover app settings
@@ -444,7 +444,7 @@ AS $process_notification_queue$
     BEGIN
         IF _email IS NULL OR _email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
         SELECT * INTO account_rec
@@ -452,7 +452,7 @@ AS $process_notification_queue$
             WHERE email = _email;
         IF account_rec.email IS NULL OR account_rec.email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
 
@@ -469,7 +469,7 @@ AS $process_notification_queue$
                 WHERE owner_email = _email;
             IF vessel_rec.owner_email IS NULL OR vessel_rec.owner_email = '' THEN
                 RAISE EXCEPTION 'Invalid email'
-                    USING HINT = 'Unkown email';
+                    USING HINT = 'Unknown email';
                 RETURN;
             END IF;
             user_settings := '{"email": "' || vessel_rec.owner_email || '", "boat": "' || vessel_rec.name || '"}';
@@ -495,7 +495,7 @@ CREATE OR REPLACE FUNCTION process_vessel_queue_fn(IN _email TEXT) RETURNS void
     BEGIN
         IF _email IS NULL OR _email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
         SELECT * INTO vessel_rec
@@ -503,7 +503,7 @@ CREATE OR REPLACE FUNCTION process_vessel_queue_fn(IN _email TEXT) RETURNS void
             WHERE owner_email = _email;
         IF vessel_rec.owner_email IS NULL OR vessel_rec.owner_email = '' THEN
             RAISE EXCEPTION 'Invalid email'
-                USING HINT = 'Unkown email';
+                USING HINT = 'Unknown email';
             RETURN;
         END IF;
         -- Gather email and pushover app settings
@@ -762,7 +762,7 @@ BEGIN
         WHERE auth.accounts.email = _email;
     IF account_rec.email IS NULL THEN
         RAISE EXCEPTION 'Invalid user'
-            USING HINT = 'Unkown user or password';
+            USING HINT = 'Unknown user or password';
     END IF;
     --RAISE WARNING 'req path %', current_setting('request.path', true);
     -- Function allow without defined vessel
@@ -786,13 +786,13 @@ BEGIN
 		RAISE sqlstate 'PT551' using
 		  message = 'Vessel Required',
 		  detail = 'Invalid vessel',
-		  hint = 'Unkown vessel';
+		  hint = 'Unknown vessel';
         --RETURN; -- ignore if not exist
     END IF;
     -- Redundant?
-    IF vessel_rec.mmsi IS NULL THEN
+    IF vessel_rec.vessel_id IS NULL THEN
         RAISE EXCEPTION 'Invalid vessel'
-            USING HINT = 'Unkown vessel mmsi';
+            USING HINT = 'Unknown vessel id';
     END IF;
     -- Set session variables
     PERFORM set_config('vessel.id', vessel_rec.vessel_id, false);
@@ -820,7 +820,7 @@ BEGIN
             AND auth.vessels.vessel_id = _vid;
     IF vessel_rec.owner_email IS NULL THEN
         RAISE EXCEPTION 'Invalid vessel'
-            USING HINT = 'Unkown vessel owner_email';
+            USING HINT = 'Unknown vessel owner_email';
     END IF;
     PERFORM set_config('vessel.id', vessel_rec.vessel_id, false);
     PERFORM set_config('vessel.name', vessel_rec.name, false);