mirrors/postgsail
1
0
Fork 0
mirror of https://github.com/xbgmsharp/postgsail.git synced 2025-09-17 19:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update vessel check, remove mmsi dependency to vessel_id

Browse Source
This commit is contained in:
xbgmsharp
2023-02-05 01:16:26 +01:00
parent 13d8ad9b3d
commit 4342e29c69
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
initdb/02_3_2_signalk_public_functions.sql
View File

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