Release v0.2.0

Cleanup metrics trigger from http api call
Update logging for api.metrics trigger.
2025-09-17 19:27:49 +00:00 · 2023-06-26 17:31:10 +02:00 · 2023-06-26 17:30:44 +02:00 · 2023-06-26 13:31:44 +02:00 · 2023-06-26 12:26:33 +02:00 · 2023-06-26 12:25:47 +02:00
18 changed files with 637 additions and 215 deletions
--- a/ERD/ERD_schema_api.png
+++ b/ERD/ERD_schema_api.png
--- a/ERD/ERD_schema_auth.png
+++ b/ERD/ERD_schema_auth.png
--- a/ERD/ERD_schema_public.png
+++ b/ERD/ERD_schema_public.png
--- a/ERD/README.md
+++ b/ERD/README.md
@@ -13,7 +13,7 @@ There is 3 main schemas:
      - ...
    - functions
      - ...
-![API Schem](https://raw.githubusercontent.com/xbgmsharp/postgsail/main/ERD/ERD_schema_api.png "API Schema")
+![API Schem](https://raw.githubusercontent.com/xbgmsharp/postgsail/main/ERD/signalk - api.png "API Schema")

 - Auth Schema ERD
  - tables
@@ -22,7 +22,7 @@ There is 3 main schemas:
    - ...
  - functions
    - ...
-![Auth Schema](https://raw.githubusercontent.com/xbgmsharp/postgsail/main/ERD/ERD_schema_auth.png "Auth Schema")
+![Auth Schema](https://raw.githubusercontent.com/xbgmsharp/postgsail/main/ERD/signalk - auth.png "Auth Schema")

 - Public Schema ERD
  - tables
@@ -31,5 +31,5 @@ There is 3 main schemas:
    - ...
  - functions
    - ...
-![Public Schema](https://raw.githubusercontent.com/xbgmsharp/postgsail/main/ERD/ERD_schema_public.png "Public Schema")
+![Public Schema](https://raw.githubusercontent.com/xbgmsharp/postgsail/main/ERD/signalk - public.png "Public Schema")

--- a/ERD/signalk
+++ b/ERD/signalk
--- a/ERD/signalk
+++ b/ERD/signalk
--- a/ERD/signalk
+++ b/ERD/signalk
--- a/initdb/02_1_signalk_api.sql
+++ b/initdb/02_1_signalk_api.sql
@@ -82,9 +82,11 @@ UPDATE pg_language SET lanpltrusted = true WHERE lanname = 'plpython3u';
 -- Metadata from signalk
 CREATE TABLE IF NOT EXISTS api.metadata(
  id SERIAL PRIMARY KEY,
-  name VARCHAR(150) NULL,
+  name TEXT NULL,
  mmsi NUMERIC NULL,
-  client_id VARCHAR(255) UNIQUE NOT NULL,
+  client_id TEXT NULL,
+  -- vessel_id link auth.vessels with api.metadata
+  vessel_id TEXT NOT NULL UNIQUE,
  length DOUBLE PRECISION NULL,
  beam DOUBLE PRECISION NULL,
  height DOUBLE PRECISION NULL,
@@ -93,7 +95,6 @@ CREATE TABLE IF NOT EXISTS api.metadata(
  signalk_version TEXT NOT NULL,
  time TIMESTAMP WITHOUT TIME ZONE NOT NULL, -- should be rename to last_update !?
  active BOOLEAN DEFAULT True, -- trigger monitor online/offline
-  -- vessel_id link auth.vessels with api.metadata
  created_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT NOW(),
  updated_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT NOW()
 );
@@ -103,8 +104,8 @@ COMMENT ON TABLE
    IS 'Stores metadata from vessel';
 COMMENT ON COLUMN api.metadata.active IS 'trigger monitor online/offline';
 -- Index
-CREATE INDEX metadata_client_id_idx ON api.metadata (client_id);
-CREATE INDEX metadata_mmsi_idx ON api.metadata (mmsi);
+CREATE INDEX metadata_vessel_id_idx ON api.metadata (vessel_id);
+--CREATE INDEX metadata_mmsi_idx ON api.metadata (mmsi);
 CREATE INDEX metadata_name_idx ON api.metadata (name);

 ---------------------------------------------------------------------------
@@ -114,7 +115,9 @@ CREATE TYPE status AS ENUM ('sailing', 'motoring', 'moored', 'anchored');
 -- Table api.metrics
 CREATE TABLE IF NOT EXISTS api.metrics (
  time TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-  client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
+  --client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
+  client_id TEXT NULL,
+  vessel_id TEXT NOT NULL REFERENCES api.metadata(vessel_id) ON DELETE RESTRICT,
  latitude DOUBLE PRECISION NULL,
  longitude DOUBLE PRECISION NULL,
  speedOverGround DOUBLE PRECISION NULL,
@@ -123,7 +126,7 @@ CREATE TABLE IF NOT EXISTS api.metrics (
  angleSpeedApparent DOUBLE PRECISION NULL,
  status status NULL,
  metrics jsonb NULL,
-  CONSTRAINT valid_client_id CHECK (length(client_id) > 10),
+  --CONSTRAINT valid_client_id CHECK (length(client_id) > 10),
  CONSTRAINT valid_latitude CHECK (latitude >= -90 and latitude <= 90),
  CONSTRAINT valid_longitude CHECK (longitude >= -180 and longitude <= 180)
 );
@@ -135,21 +138,22 @@ COMMENT ON COLUMN api.metrics.latitude IS 'With CONSTRAINT but allow NULL value
 COMMENT ON COLUMN api.metrics.longitude IS 'With CONSTRAINT but allow NULL value to be ignored silently by trigger';

 -- Index
-CREATE INDEX ON api.metrics (client_id, time DESC);
+CREATE INDEX ON api.metrics (vessel_id, time DESC);
 CREATE INDEX ON api.metrics (status, time DESC);
 -- json index??
 CREATE INDEX ON api.metrics using GIN (metrics);
 -- timescaledb hypertable
--SELECT create_hypertable('api.metrics', 'time');
+SELECT create_hypertable('api.metrics', 'time', chunk_time_interval => INTERVAL '7 day');
 -- timescaledb hypertable with space partitions
-SELECT create_hypertable('api.metrics', 'time', 'client_id',
-    number_partitions => 2,
-    chunk_time_interval => INTERVAL '7 day',
-    if_not_exists => true);
+-- ERROR:  new row for relation "_hyper_1_2_chunk" violates check constraint "constraint_4"
+-- ((_timescaledb_internal.get_partition_hash(vessel_id) < 1073741823))
+--SELECT create_hypertable('api.metrics', 'time', 'vessel_id',
+--    number_partitions => 2,
+--    chunk_time_interval => INTERVAL '7 day',
+--    if_not_exists => true);

 ---------------------------------------------------------------------------
 -- Logbook
-- todo add clientid ref
 -- todo add cosumption fuel?
 -- todo add engine hour?
 -- todo add geom object http://epsg.io/4326 EPSG:4326 Unit: degres
@@ -162,8 +166,9 @@ SELECT create_hypertable('api.metrics', 'time', 'client_id',
 -- https://www.reddit.com/r/PostgreSQL/comments/di5mbr/postgresql_12_foreign_keys_and_partitioned_tables/f3tsoop/
 CREATE TABLE IF NOT EXISTS api.logbook(
  id SERIAL PRIMARY KEY,
-  client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
--  client_id VARCHAR(255) NOT NULL,
+  --client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
+  --client_id VARCHAR(255) NULL,
+  vessel_id TEXT NOT NULL REFERENCES api.metadata(vessel_id) ON DELETE RESTRICT,
  active BOOLEAN DEFAULT false,
  name VARCHAR(255),
  _from VARCHAR(255),
@@ -176,7 +181,7 @@ CREATE TABLE IF NOT EXISTS api.logbook(
  track_geom geometry(LINESTRING,4326) NULL,
  track_geog geography(LINESTRING) NULL,
  track_geojson JSON NULL,
--  track_gpx XML NULL,
+  track_gpx XML NULL,
  _from_time TIMESTAMP WITHOUT TIME ZONE NOT NULL,
  _to_time TIMESTAMP WITHOUT TIME ZONE NULL,
  distance NUMERIC, -- meters?
@@ -193,24 +198,23 @@ COMMENT ON TABLE
 COMMENT ON COLUMN api.logbook.distance IS 'in NM';

 -- Index todo!
-CREATE INDEX logbook_client_id_idx ON api.logbook (client_id);
+CREATE INDEX logbook_vessel_id_idx ON api.logbook (vessel_id);
 CREATE INDEX ON api.logbook USING GIST ( track_geom );
 COMMENT ON COLUMN api.logbook.track_geom IS 'postgis geometry type EPSG:4326 Unit: degres';
 CREATE INDEX ON api.logbook USING GIST ( track_geog );
 COMMENT ON COLUMN api.logbook.track_geog IS 'postgis geography type default SRID 4326 Unit: degres';
 -- Otherwise -- ERROR:  Only lon/lat coordinate systems are supported in geography.
 COMMENT ON COLUMN api.logbook.track_geojson IS 'store the geojson track metrics data, can not depend api.metrics table, should be generate from linetring to save disk space?';
--COMMENT ON COLUMN api.logbook.track_gpx IS 'store the gpx track metrics data, can not depend api.metrics table, should be generate from linetring to save disk space?';
+COMMENT ON COLUMN api.logbook.track_gpx IS 'store the gpx track metrics data, can not depend api.metrics table, should be generate from linetring to save disk space?';

 ---------------------------------------------------------------------------
 -- Stays
-- todo add clientid ref
-- todo add FOREIGN KEY?
 -- virtual logbook by boat? 
 CREATE TABLE IF NOT EXISTS api.stays(
  id SERIAL PRIMARY KEY,
-  client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
--  client_id VARCHAR(255) NOT NULL,
+  --client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
+  --client_id VARCHAR(255) NULL,
+  vessel_id TEXT NOT NULL REFERENCES api.metadata(vessel_id) ON DELETE RESTRICT,
  active BOOLEAN DEFAULT false,
  name VARCHAR(255),
  latitude DOUBLE PRECISION NULL,
@@ -228,21 +232,21 @@ COMMENT ON TABLE
    IS 'Stores generated stays';

 -- Index
-CREATE INDEX stays_client_id_idx ON api.stays (client_id);
+CREATE INDEX stays_vessel_id_idx ON api.stays (vessel_id);
 CREATE INDEX ON api.stays USING GIST ( geog );
 COMMENT ON COLUMN api.stays.geog IS 'postgis geography type default SRID 4326 Unit: degres';
 -- With other SRID ERROR: Only lon/lat coordinate systems are supported in geography.

 ---------------------------------------------------------------------------
 -- Moorages
-- todo add clientid ref
 -- virtual logbook by boat? 
 CREATE TABLE IF NOT EXISTS api.moorages(
  id SERIAL PRIMARY KEY,
-  client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
--  client_id VARCHAR(255) NOT NULL,
-  name VARCHAR(255),
-  country VARCHAR(255), -- todo need to update reverse_geocode_py_fn
+  --client_id VARCHAR(255) NOT NULL REFERENCES api.metadata(client_id) ON DELETE RESTRICT,
+  --client_id VARCHAR(255) NULL,
+  vessel_id TEXT NOT NULL REFERENCES api.metadata(vessel_id) ON DELETE RESTRICT,
+  name TEXT,
+  country TEXT, -- todo need to update reverse_geocode_py_fn
  stay_id INT NOT NULL, -- needed?
  stay_code INT DEFAULT 1, -- needed?  REFERENCES api.stays_at(stay_code)
  stay_duration INTERVAL NULL,
@@ -259,7 +263,7 @@ COMMENT ON TABLE
    IS 'Stores generated moorages';

 -- Index
-CREATE INDEX moorages_client_id_idx ON api.moorages (client_id);
+CREATE INDEX moorages_vessel_id_idx ON api.moorages (vessel_id);
 CREATE INDEX ON api.moorages USING GIST ( geog );
 COMMENT ON COLUMN api.moorages.geog IS 'postgis geography type default SRID 4326 Unit: degres';
 -- With other SRID ERROR: Only lon/lat coordinate systems are supported in geography.
@@ -290,20 +294,21 @@ CREATE FUNCTION metadata_upsert_trigger_fn() RETURNS trigger AS $metadata_upsert
        metadata_active boolean;
    BEGIN
        -- Set client_id to new value to allow RLS
-        PERFORM set_config('vessel.client_id', NEW.client_id, false);
+        --PERFORM set_config('vessel.client_id', NEW.client_id, false);
        -- UPSERT - Insert vs Update for Metadata
        RAISE NOTICE 'metadata_upsert_trigger_fn';
+        --PERFORM set_config('vessel.id', NEW.vessel_id, true);
+        RAISE WARNING 'metadata_upsert_trigger_fn [%] [%]', current_setting('vessel.id', true), NEW;
        SELECT m.id,m.active INTO metadata_id, metadata_active
            FROM api.metadata m
-            WHERE (m.vessel_id IS NOT NULL AND m.vessel_id = current_setting('vessel.id', true))
-                    OR (m.client_id IS NOT NULL AND m.client_id = NEW.client_id);
+            WHERE m.vessel_id IS NOT NULL AND m.vessel_id = current_setting('vessel.id', true);
        RAISE NOTICE 'metadata_id %', metadata_id;
        IF metadata_id IS NOT NULL THEN
            -- send notifitacion if boat is back online
            IF metadata_active is False THEN
                -- Add monitor online entry to process queue for later notification
-                INSERT INTO process_queue (channel, payload, stored) 
-                    VALUES ('monitoring_online', metadata_id, now());
+                INSERT INTO process_queue (channel, payload, stored, ref_id)
+                    VALUES ('monitoring_online', metadata_id, now(), current_setting('vessel.id', true));
            END IF;
            -- Update vessel metadata
            UPDATE api.metadata
@@ -351,8 +356,8 @@ CREATE FUNCTION metadata_notification_trigger_fn() RETURNS trigger AS $metadata_
    DECLARE
    BEGIN
        RAISE NOTICE 'metadata_notification_trigger_fn [%]', NEW;
-        INSERT INTO process_queue (channel, payload, stored) 
-            VALUES ('monitoring_online', NEW.id, now());
+        INSERT INTO process_queue (channel, payload, stored, ref_id)
+            VALUES ('monitoring_online', NEW.id, now(), NEW.vessel_id);
        RETURN NULL;
    END;
 $metadata_notification$ LANGUAGE plpgsql;
@@ -395,55 +400,57 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
        logbook_id integer;
        stay_id integer;
        valid_status BOOLEAN;
+        _vessel_id TEXT;
    BEGIN
        -- Set client_id to new value to allow RLS
-        PERFORM set_config('vessel.client_id', NEW.client_id, false);
+        --PERFORM set_config('vessel.client_id', NEW.client_id, false);
+        NEW.vessel_id = current_setting('vessel.id', true);
        --RAISE NOTICE 'metrics_trigger_fn client_id [%]', NEW.client_id;
        -- Boat metadata are check using api.metrics REFERENCES to api.metadata
        -- Fetch the latest entry to compare status against the new status to be insert
        SELECT coalesce(m.status, 'moored'), m.time INTO previous_status, previous_time
            FROM api.metrics m 
-            WHERE m.client_id IS NOT NULL
-                AND m.client_id = NEW.client_id
+            WHERE m.vessel_id IS NOT NULL
+                AND m.vessel_id = current_setting('vessel.id', true)
            ORDER BY m.time DESC LIMIT 1;
        --RAISE NOTICE 'Metrics Status, New:[%] Previous:[%]', NEW.status, previous_status;
        IF previous_time = NEW.time THEN
            -- Ignore entry if same time
-            RAISE WARNING 'Metrics Ignoring metric, duplicate time [%] = [%]', previous_time, NEW.time;
+            RAISE WARNING 'Metrics Ignoring metric, vessel_id [%], duplicate time [%] = [%]', NEW.vessel_id, previous_time, NEW.time;
            RETURN NULL;
        END IF;
        IF previous_time > NEW.time THEN
            -- Ignore entry if new time is later than previous time
-            RAISE WARNING 'Metrics Ignoring metric, new time is older [%] > [%]', previous_time, NEW.time;
+            RAISE WARNING 'Metrics Ignoring metric, vessel_id [%], new time is older [%] > [%]', NEW.vessel_id, previous_time, NEW.time;
            RETURN NULL;
        END IF;
        -- Check if latitude or longitude are null
        IF NEW.latitude IS NULL OR NEW.longitude IS NULL THEN
            -- Ignore entry if null latitude,longitude
-            RAISE WARNING 'Metrics Ignoring metric, null latitude,longitude [%] [%]', NEW.latitude, NEW.longitude;
+            RAISE WARNING 'Metrics Ignoring metric, vessel_id [%], null latitude,longitude [%] [%]', NEW.vessel_id, NEW.latitude, NEW.longitude;
            RETURN NULL;
        END IF;
        -- Check if status is null
        IF NEW.status IS NULL THEN
-            RAISE WARNING 'Metrics Unknow NEW.status from vessel [%], set to default moored', NEW.status;
+            RAISE WARNING 'Metrics Unknow NEW.status, vessel_id [%], null status, set to default moored from [%]', NEW.vessel_id, NEW.status;
            NEW.status := 'moored';
        END IF;
        IF previous_status IS NULL THEN
            IF NEW.status = 'anchored' THEN
-                RAISE WARNING 'Metrics Unknow previous_status from vessel [%], set to default current status [%]', previous_status, NEW.status;
+                RAISE WARNING 'Metrics Unknow previous_status from vessel_id [%], [%] set to default current status [%]', NEW.vessel_id, previous_status, NEW.status;
                previous_status := NEW.status;
            ELSE
-                RAISE WARNING 'Metrics Unknow previous_status from vessel [%], set to default status moored vs [%]', previous_status, NEW.status;
+                RAISE WARNING 'Metrics Unknow previous_status from vessel_id [%], [%] set to default status moored vs [%]', NEW.vessel_id, previous_status, NEW.status;
                previous_status := 'moored';
            END IF;
            -- Add new stay as no previous entry exist
            INSERT INTO api.stays 
-                (client_id, active, arrived, latitude, longitude, stay_code) 
-                VALUES (NEW.client_id, true, NEW.time, NEW.latitude, NEW.longitude, 1)
+                (vessel_id, active, arrived, latitude, longitude, stay_code)
+                VALUES (current_setting('vessel.id', true), true, NEW.time, NEW.latitude, NEW.longitude, 1)
                RETURNING id INTO stay_id;
            -- Add stay entry to process queue for further processing
-            INSERT INTO process_queue (channel, payload, stored)
-                VALUES ('new_stay', stay_id, now());
+            INSERT INTO process_queue (channel, payload, stored, ref_id)
+                VALUES ('new_stay', stay_id, now(), current_setting('vessel.id', true));
            RAISE WARNING 'Metrics Insert first stay as no previous metrics exist, stay_id %', stay_id;
        END IF;
        -- Check if status is valid enum
@@ -461,11 +468,11 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
             OR (NEW.status::TEXT = 'motoring' AND previous_status::TEXT <> 'sailing') ) THEN
            RAISE WARNING 'Metrics Update status, try new logbook, New:[%] Previous:[%]', NEW.status, previous_status;
            -- Start new log
-            logbook_id := public.trip_in_progress_fn(NEW.client_id::TEXT);
+            logbook_id := public.trip_in_progress_fn(current_setting('vessel.id', true)::TEXT);
            IF logbook_id IS NULL THEN
                INSERT INTO api.logbook
-                    (client_id, active, _from_time, _from_lat, _from_lng)
-                    VALUES (NEW.client_id, true, NEW.time, NEW.latitude, NEW.longitude)
+                    (vessel_id, active, _from_time, _from_lat, _from_lng)
+                    VALUES (current_setting('vessel.id', true), true, NEW.time, NEW.latitude, NEW.longitude)
                    RETURNING id INTO logbook_id;
                RAISE WARNING 'Metrics Insert new logbook, logbook_id %', logbook_id;
            ELSE
@@ -480,7 +487,7 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
            END IF;

            -- End current stay
-            stay_id := public.stay_in_progress_fn(NEW.client_id::TEXT);
+            stay_id := public.stay_in_progress_fn(current_setting('vessel.id', true)::TEXT);
            IF stay_id IS NOT NULL THEN
                UPDATE api.stays
                    SET
@@ -489,8 +496,8 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
                    WHERE id = stay_id;
                RAISE WARNING 'Metrics Updating Stay end current stay_id [%] [%] [%]', stay_id, NEW.status, NEW.time;
                -- Add moorage entry to process queue for further processing
-                INSERT INTO process_queue (channel, payload, stored)
-                    VALUES ('new_moorage', stay_id, now());
+                INSERT INTO process_queue (channel, payload, stored, ref_id)
+                    VALUES ('new_moorage', stay_id, now(), current_setting('vessel.id', true));
            ELSE
                RAISE WARNING 'Metrics Invalid stay_id [%] [%]', stay_id, NEW.time;
            END IF;
@@ -501,7 +508,7 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
             OR (NEW.status::TEXT = 'anchored' AND previous_status::TEXT <> 'moored') ) THEN
            -- Start new stays
            RAISE WARNING 'Metrics Update status, try new stay, New:[%] Previous:[%]', NEW.status, previous_status;
-            stay_id := public.stay_in_progress_fn(NEW.client_id::TEXT);
+            stay_id := public.stay_in_progress_fn(current_setting('vessel.id', true)::TEXT);
            IF stay_id IS NULL THEN
                RAISE WARNING 'Metrics Inserting new stay [%]', NEW.status;
                -- If metric status is anchored set stay_code accordingly
@@ -511,12 +518,12 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
                END IF;
                -- Add new stay
                INSERT INTO api.stays
-                    (client_id, active, arrived, latitude, longitude, stay_code)
-                    VALUES (NEW.client_id, true, NEW.time, NEW.latitude, NEW.longitude, stay_code)
+                    (vessel_id, active, arrived, latitude, longitude, stay_code)
+                    VALUES (current_setting('vessel.id', true), true, NEW.time, NEW.latitude, NEW.longitude, stay_code)
                    RETURNING id INTO stay_id;
                -- Add stay entry to process queue for further processing
-                INSERT INTO process_queue (channel, payload, stored)
-                    VALUES ('new_stay', stay_id, now());
+                INSERT INTO process_queue (channel, payload, stored, ref_id)
+                    VALUES ('new_stay', stay_id, now(), current_setting('vessel.id', true));
            ELSE
                RAISE WARNING 'Metrics Invalid stay_id [%] [%]', stay_id, NEW.time;
                UPDATE api.stays
@@ -527,8 +534,8 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
            END IF;

            -- End current log/trip
-            -- Fetch logbook_id by client_id
-            logbook_id := public.trip_in_progress_fn(NEW.client_id::TEXT);
+            -- Fetch logbook_id by vessel_id
+            logbook_id := public.trip_in_progress_fn(current_setting('vessel.id', true)::TEXT);
            IF logbook_id IS NOT NULL THEN
                -- todo check on time start vs end
                RAISE WARNING 'Metrics Updating logbook status [%] [%] [%]', logbook_id, NEW.status, NEW.time;
@@ -540,8 +547,8 @@ CREATE FUNCTION metrics_trigger_fn() RETURNS trigger AS $metrics$
                        _to_lng = NEW.longitude
                    WHERE id = logbook_id;
                -- Add logbook entry to process queue for later processing
-                INSERT INTO process_queue (channel, payload, stored)
-                    VALUEs ('new_logbook', logbook_id, now());
+                INSERT INTO process_queue (channel, payload, stored, ref_id)
+                    VALUEs ('new_logbook', logbook_id, now(), current_setting('vessel.id', true));
            ELSE
                RAISE WARNING 'Metrics Invalid logbook_id [%] [%]', logbook_id, NEW.time;
            END IF;
@@ -628,7 +635,7 @@ CREATE FUNCTION api.export_logbook_geojson_fn(IN _id integer, OUT geojson JSON)
        SELECT * INTO logbook_rec
            FROM api.logbook WHERE id = _id;
        -- Ensure the query is successful
-        IF logbook_rec.client_id IS NULL THEN
+        IF logbook_rec.vessel_id IS NULL THEN
            RAISE WARNING '-> export_logbook_geojson_fn invalid logbook %', _id;
            RETURN;
        END IF;
@@ -660,7 +667,7 @@ AS $export_logbook_gpx$
            api.logbook l
            WHERE l.id = _id;
        -- Ensure the query is successful
-        IF log_rec.client_id IS NULL THEN
+        IF log_rec.vessel_id IS NULL THEN
            RAISE WARNING '-> export_logbook_gpx_fn invalid logbook %', _id;
            RETURN '';
        END IF;
@@ -696,7 +703,7 @@ AS $export_logbook_gpx$
                AND m.longitude IS NOT NULL
                AND m.time >= log_rec._from_time::TIMESTAMP WITHOUT TIME ZONE
                AND m.time <= log_rec._to_time::TIMESTAMP WITHOUT TIME ZONE
-                AND client_id = log_rec.client_id;
+                AND vessel_id = log_rec.vessel_id;
            -- ERROR:  column "m.time" must appear in the GROUP BY clause or be used in an aggregate function at character 2304
            --ORDER BY m.time ASC;
    END;
@@ -808,14 +815,14 @@ COMMENT ON FUNCTION

 -- trip_in_progress_fn
 DROP FUNCTION IF EXISTS public.trip_in_progress_fn;
-CREATE FUNCTION public.trip_in_progress_fn(IN _client_id TEXT) RETURNS INT AS $trip_in_progress$
+CREATE FUNCTION public.trip_in_progress_fn(IN _vessel_id TEXT) RETURNS INT AS $trip_in_progress$
    DECLARE
        logbook_id INT := NULL;
    BEGIN
        SELECT id INTO logbook_id
            FROM api.logbook l
-            WHERE l.client_id IS NOT NULL
-                AND l.client_id = _client_id
+            WHERE l.vessel_id IS NOT NULL
+                AND l.vessel_id = _vessel_id
                AND active IS true
            LIMIT 1;
        RETURN logbook_id;
@@ -828,14 +835,14 @@ COMMENT ON FUNCTION

 -- stay_in_progress_fn
 DROP FUNCTION IF EXISTS public.stay_in_progress_fn;
-CREATE FUNCTION public.stay_in_progress_fn(IN _client_id TEXT) RETURNS INT AS $stay_in_progress$
+CREATE FUNCTION public.stay_in_progress_fn(IN _vessel_id TEXT) RETURNS INT AS $stay_in_progress$
    DECLARE
        stay_id INT := NULL;
    BEGIN
        SELECT id INTO stay_id
                FROM api.stays s
-                WHERE s.client_id IS NOT NULL
-                    AND s.client_id = _client_id
+                WHERE s.vessel_id IS NOT NULL
+                    AND s.vessel_id = _vessel_id
                    AND active IS true
                LIMIT 1;
        RETURN stay_id;
--- a/initdb/02_2_signalk_cron.sql
+++ b/initdb/02_2_signalk_cron.sql
@@ -18,7 +18,7 @@ begin
    FOR process_rec in 
        SELECT * FROM process_queue 
            WHERE channel = 'new_logbook' AND processed IS NULL
-            ORDER BY stored ASC
+            ORDER BY stored ASC LIMIT 100
    LOOP
        RAISE NOTICE '-> cron_process_new_logbook_fn [%]', process_rec.payload;
        -- update logbook
@@ -47,7 +47,7 @@ begin
    FOR process_rec in 
        SELECT * FROM process_queue 
            WHERE channel = 'new_stay' AND processed IS NULL
-            ORDER BY stored ASC
+            ORDER BY stored ASC LIMIT 100
    LOOP
        RAISE NOTICE '-> cron_process_new_stay_fn [%]', process_rec.payload;
        -- update stay
@@ -77,7 +77,7 @@ begin
    FOR process_rec in 
        SELECT * FROM process_queue 
            WHERE channel = 'new_moorage' AND processed IS NULL
-            ORDER BY stored ASC
+            ORDER BY stored ASC LIMIT 100
    LOOP
        RAISE NOTICE '-> cron_process_new_moorage_fn [%]', process_rec.payload;
        -- update moorage
@@ -124,30 +124,30 @@ begin
                active = False
            WHERE id = metadata_rec.id;

-        IF metadata_rec.client_id IS NULL OR metadata_rec.client_id = '' THEN
-            RAISE WARNING '-> cron_process_monitor_offline_fn invalid metadata record client_id %', client_id;
+        IF metadata_rec.vessel_id IS NULL OR metadata_rec.vessel_id = '' THEN
+            RAISE WARNING '-> cron_process_monitor_offline_fn invalid metadata record vessel_id %', vessel_id;
            RAISE EXCEPTION 'Invalid metadata'
-                USING HINT = 'Unknow client_id';
+                USING HINT = 'Unknow vessel_id';
            RETURN;
        END IF;
-        PERFORM set_config('vessel.client_id', metadata_rec.client_id, false);
-        RAISE DEBUG '-> DEBUG cron_process_monitor_offline_fn vessel.client_id %', current_setting('vessel.client_id', false);
-        RAISE NOTICE '-> cron_process_monitor_offline_fn updated api.metadata table to inactive for [%] [%]', metadata_rec.id, metadata_rec.client_id;
+        PERFORM set_config('vessel.id', metadata_rec.vessel_id, false);
+        RAISE DEBUG '-> DEBUG cron_process_monitor_offline_fn vessel.id %', current_setting('vessel.id', false);
+        RAISE NOTICE '-> cron_process_monitor_offline_fn updated api.metadata table to inactive for [%] [%]', metadata_rec.id, metadata_rec.vessel_id;

        -- Gather email and pushover app settings
        --app_settings = get_app_settings_fn();
        -- Gather user settings
-        user_settings := get_user_settings_from_clientid_fn(metadata_rec.client_id::TEXT);
-        RAISE DEBUG '-> cron_process_monitor_offline_fn get_user_settings_from_clientid_fn [%]', user_settings;
+        user_settings := get_user_settings_from_vesselid_fn(metadata_rec.vessel_id::TEXT);
+        RAISE DEBUG '-> cron_process_monitor_offline_fn get_user_settings_from_vesselid_fn [%]', user_settings;
        -- Send notification
        PERFORM send_notification_fn('monitor_offline'::TEXT, user_settings::JSONB);
        --PERFORM send_email_py_fn('monitor_offline'::TEXT, user_settings::JSONB, app_settings::JSONB);
        --PERFORM send_pushover_py_fn('monitor_offline'::TEXT, user_settings::JSONB, app_settings::JSONB);
        -- log/insert/update process_queue table with processed
        INSERT INTO process_queue
-            (channel, payload, stored, processed) 
+            (channel, payload, stored, processed, ref_id)
            VALUES 
-                ('monitoring_offline', metadata_rec.id, metadata_rec.interval, now())
+                ('monitoring_offline', metadata_rec.id, metadata_rec.interval, now(), metadata_rec.vessel_id)
            RETURNING id INTO process_id;
        RAISE NOTICE '-> cron_process_monitor_offline_fn updated process_queue table [%]', process_id;
    END LOOP;
@@ -179,20 +179,20 @@ begin
            FROM api.metadata
            WHERE id = process_rec.payload::INTEGER;

-        IF metadata_rec.client_id IS NULL OR metadata_rec.client_id = '' THEN
-            RAISE WARNING '-> cron_process_monitor_online_fn invalid metadata record client_id %', client_id;
+        IF metadata_rec.vessel_id IS NULL OR metadata_rec.vessel_id = '' THEN
+            RAISE WARNING '-> cron_process_monitor_online_fn invalid metadata record vessel_id %', vessel_id;
            RAISE EXCEPTION 'Invalid metadata'
-                USING HINT = 'Unknow client_id';
+                USING HINT = 'Unknow vessel_id';
            RETURN;
        END IF;
-        PERFORM set_config('vessel.client_id', metadata_rec.client_id, false);
-        RAISE DEBUG '-> DEBUG cron_process_monitor_online_fn vessel.client_id %', current_setting('vessel.client_id', false);
+        PERFORM set_config('vessel.id', metadata_rec.vessel_id, false);
+        RAISE DEBUG '-> DEBUG cron_process_monitor_online_fn vessel_id %', current_setting('vessel.id', false);

        -- Gather email and pushover app settings
        --app_settings = get_app_settings_fn();
        -- Gather user settings
-        user_settings := get_user_settings_from_clientid_fn(metadata_rec.client_id::TEXT);
-        RAISE DEBUG '-> DEBUG cron_process_monitor_online_fn get_user_settings_from_clientid_fn [%]', user_settings;
+        user_settings := get_user_settings_from_vesselid_fn(metadata_rec.vessel_id::TEXT);
+        RAISE DEBUG '-> DEBUG cron_process_monitor_online_fn get_user_settings_from_vesselid_fn [%]', user_settings;
        -- Send notification
        PERFORM send_notification_fn('monitor_online'::TEXT, user_settings::JSONB);
        --PERFORM send_email_py_fn('monitor_online'::TEXT, user_settings::JSONB, app_settings::JSONB);
@@ -362,3 +362,27 @@ $$ language plpgsql;
 COMMENT ON FUNCTION
    public.cron_vaccum_fn
    IS 'init by pg_cron to cleanup job_run_details table on schema public postgras db';
+
+-- CRON for alerts notification
+CREATE FUNCTION cron_process_alerts_fn() RETURNS void AS $$
+DECLARE
+    alert_rec record;
+BEGIN
+    -- Check for new event notification pending update
+    RAISE NOTICE 'cron_process_alerts_fn';
+    FOR alert_rec in
+        SELECT
+            a.user_id,a.email,v.vessel_id
+            FROM auth.accounts a, auth.vessels v, api.metadata m
+            WHERE m.vessel_id = v.vessel_id
+                AND a.email = v.owner_email
+                AND (preferences->'alerting'->'enabled')::boolean = false
+    LOOP
+        RAISE NOTICE '-> cron_process_alert_rec_fn for [%]', alert_rec;
+    END LOOP;
+END;
+$$ language plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.cron_process_alerts_fn
+    IS 'init by pg_cron to check for alerts, if so perform process_alerts_queue_fn';
--- a/initdb/02_3_1_signalk_public_tables.sql
+++ b/initdb/02_3_1_signalk_public_tables.sql
@@ -133,6 +133,7 @@ CREATE TABLE IF NOT EXISTS public.process_queue (
    id SERIAL PRIMARY KEY,
    channel TEXT NOT NULL,
    payload TEXT NOT NULL,
+    ref_id TEXT NOT NULL,
    stored TIMESTAMP WITHOUT TIME ZONE NOT NULL,
    processed TIMESTAMP WITHOUT TIME ZONE DEFAULT NULL
 );
@@ -145,24 +146,26 @@ CREATE INDEX ON public.process_queue (channel);
 CREATE INDEX ON public.process_queue (stored);
 CREATE INDEX ON public.process_queue (processed);

+COMMENT ON COLUMN public.process_queue.ref_id IS 'either user_id or vessel_id';
+
 -- Function process_queue helpers
 create function new_account_entry_fn() returns trigger as $new_account_entry$
 begin
-    insert into process_queue (channel, payload, stored) values ('new_account', NEW.email, now());
+    insert into process_queue (channel, payload, stored, ref_id) values ('new_account', NEW.email, now(), NEW.user_id);
    return NEW;
 END;
 $new_account_entry$ language plpgsql;

 create function new_account_otp_validation_entry_fn() returns trigger as $new_account_otp_validation_entry$
 begin
-    insert into process_queue (channel, payload, stored) values ('email_otp', NEW.email, now());
+    insert into process_queue (channel, payload, stored, ref_id) values ('email_otp', NEW.email, now(), NEW.user_id);
    return NEW;
 END;
 $new_account_otp_validation_entry$ language plpgsql;

 create function new_vessel_entry_fn() returns trigger as $new_vessel_entry$
 begin
-    insert into process_queue (channel, payload, stored) values ('new_vessel', NEW.owner_email, now());
+    insert into process_queue (channel, payload, stored, ref_id) values ('new_vessel', NEW.owner_email, now(), NEW.vessel_id);
    return NEW;
 END;
 $new_vessel_entry$ language plpgsql;
--- a/initdb/02_3_2_signalk_public_functions.sql
+++ b/initdb/02_3_2_signalk_public_functions.sql
@@ -29,7 +29,7 @@ CREATE OR REPLACE FUNCTION logbook_metrics_dwithin_fn(
                AND m.longitude IS NOT NULL
                AND m.time >= _start::TIMESTAMP WITHOUT TIME ZONE
                AND m.time <= _end::TIMESTAMP WITHOUT TIME ZONE
-                AND client_id = current_setting('vessel.client_id', false)
+                AND vessel_id = current_setting('vessel.id', false)
                AND ST_DWithin(
                    Geography(ST_MakePoint(m.longitude, m.latitude)),
                    Geography(ST_MakePoint(lgn, lat)),
@@ -62,7 +62,7 @@ CREATE OR REPLACE FUNCTION logbook_update_avg_fn(
                AND m.longitude IS NOT NULL
                AND m.time >= _start::TIMESTAMP WITHOUT TIME ZONE
                AND m.time <= _end::TIMESTAMP WITHOUT TIME ZONE
-                AND client_id = current_setting('vessel.client_id', false);
+                AND vessel_id = current_setting('vessel.id', false);
        RAISE NOTICE '-> Updated avg for logbook id=%, avg_speed:%, max_speed:%, max_wind_speed:%, count:%', _id, avg_speed, max_speed, max_wind_speed, count_metric;
    END;
 $logbook_update_avg$ LANGUAGE plpgsql;
@@ -89,7 +89,7 @@ CREATE FUNCTION logbook_update_geom_distance_fn(IN _id integer, IN _start text,
                        AND m.longitude IS NOT NULL
                        AND m.time >= _start::TIMESTAMP WITHOUT TIME ZONE
                        AND m.time <= _end::TIMESTAMP WITHOUT TIME ZONE
-                        AND client_id = current_setting('vessel.client_id', false)
+                        AND vessel_id = current_setting('vessel.id', false)
                    ORDER BY m.time ASC
            )
        ) INTO _track_geom;
@@ -150,7 +150,7 @@ CREATE FUNCTION logbook_update_geojson_fn(IN _id integer, IN _start text, IN _en
 		        AND m.longitude IS NOT NULL
                AND time >= _start::TIMESTAMP WITHOUT TIME ZONE
                AND time <= _end::TIMESTAMP WITHOUT TIME ZONE
-                AND client_id = current_setting('vessel.client_id', false)
+                AND vessel_id = current_setting('vessel.id', false)
 		    ORDER BY m.time ASC
 		   )  
 		) AS t;
@@ -207,13 +207,13 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
                AND _to_lng IS NOT NULL
                AND _to_lat IS NOT NULL;
        -- Ensure the query is successful
-        IF logbook_rec.client_id IS NULL THEN
+        IF logbook_rec.vessel_id IS NULL THEN
            RAISE WARNING '-> process_logbook_queue_fn invalid logbook %', _id;
            RETURN;
        END IF;

-        PERFORM set_config('vessel.client_id', logbook_rec.client_id, false);
-        --RAISE WARNING 'public.process_logbook_queue_fn() scheduler vessel.client_id %, user.id', current_setting('vessel.client_id', false), current_setting('user.id', false);
+        PERFORM set_config('vessel.id', logbook_rec.vessel_id, false);
+        --RAISE WARNING 'public.process_logbook_queue_fn() scheduler vessel.id %, user.id', current_setting('vessel.id', false), current_setting('user.id', false);

        -- Check if all metrics are within 10meters base on geo loc
        count_metric := logbook_metrics_dwithin_fn(logbook_rec._from_time::TEXT, logbook_rec._to_time::TEXT, logbook_rec._from_lng::NUMERIC, logbook_rec._from_lat::NUMERIC);
@@ -240,7 +240,7 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
                SET status = 'moored'
                WHERE time >= logbook_rec._from_time::TIMESTAMP WITHOUT TIME ZONE
                    AND time <= logbook_rec._to_time::TIMESTAMP WITHOUT TIME ZONE
-                    AND client_id = current_setting('vessel.client_id', false);
+                    AND vessel_id = current_setting('vessel.id', false);
            -- Update logbook
            UPDATE api.logbook
                SET notes = 'invalid logbook data, stationary need to fix metrics?'
@@ -248,17 +248,17 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
            -- Get related stays
            SELECT id,departed,active INTO current_stays_id,current_stays_departed,current_stays_active
                FROM api.stays s
-                WHERE s.client_id = current_setting('vessel.client_id', false)
+                WHERE s.vessel_id = current_setting('vessel.id', false)
                    AND s.arrived = logbook_rec._to_time;
            -- Update related stays
            UPDATE api.stays
                SET notes = 'invalid stays data, stationary need to fix metrics?'
-                WHERE client_id = current_setting('vessel.client_id', false)
+                WHERE vessel_id = current_setting('vessel.id', false)
                    AND arrived = logbook_rec._to_time;
            -- Find previous stays
            SELECT id INTO previous_stays_id
 				FROM api.stays s
-                WHERE s.client_id = current_setting('vessel.client_id', false)
+                WHERE s.vessel_id = current_setting('vessel.id', false)
                    AND s.arrived < logbook_rec._to_time
                    ORDER BY s.arrived DESC LIMIT 1;
            -- Update previous stays with the departed time from current stays
@@ -266,7 +266,7 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
            UPDATE api.stays
                SET departed = current_stays_departed::timestamp without time zone,
                    active = current_stays_active
-                WHERE client_id = current_setting('vessel.client_id', false)
+                WHERE vessel_id = current_setting('vessel.id', false)
                    AND id = previous_stays_id;
            -- Clean u, remove invalid logbook and stay entry
            DELETE FROM api.logbook WHERE id = logbook_rec.id;
@@ -307,9 +307,9 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void

        -- Prepare notification, gather user settings
        SELECT json_build_object('logbook_name', log_name, 'logbook_link', logbook_rec.id) into log_settings;
-        user_settings := get_user_settings_from_clientid_fn(logbook_rec.client_id::TEXT);
+        user_settings := get_user_settings_from_vesselid_fn(logbook_rec.vessel_id::TEXT);
        SELECT user_settings::JSONB || log_settings::JSONB into user_settings;
-        RAISE DEBUG '-> debug process_logbook_queue_fn get_user_settings_from_clientid_fn [%]', user_settings;
+        RAISE DEBUG '-> debug process_logbook_queue_fn get_user_settings_from_vesselid_fn [%]', user_settings;
        RAISE DEBUG '-> debug process_logbook_queue_fn log_settings [%]', log_settings;
        -- Send notification
        PERFORM send_notification_fn('logbook'::TEXT, user_settings::JSONB);
@@ -345,12 +345,12 @@ CREATE OR REPLACE FUNCTION process_stay_queue_fn(IN _id integer) RETURNS void AS
                AND longitude IS NOT NULL
                AND latitude IS NOT NULL;
        -- Ensure the query is successful
-        IF stay_rec.client_id IS NULL THEN
+        IF stay_rec.vessel_id IS NULL THEN
            RAISE WARNING '-> process_stay_queue_fn invalid stay %', _id;
            RETURN;
        END IF;

-        PERFORM set_config('vessel.client_id', stay_rec.client_id, false);
+        PERFORM set_config('vessel.id', stay_rec.vessel_id, false);
        -- geo reverse _lng _lat
        _name := reverse_geocode_py_fn('nominatim', stay_rec.longitude::NUMERIC, stay_rec.latitude::NUMERIC);

@@ -395,12 +395,12 @@ CREATE OR REPLACE FUNCTION process_moorage_queue_fn(IN _id integer) RETURNS void
                AND latitude IS NOT NULL
                AND id = _id;
        -- Ensure the query is successful
-        IF stay_rec.client_id IS NULL THEN
+        IF stay_rec.vessel_id IS NULL THEN
            RAISE WARNING '-> process_moorage_queue_fn invalid stay %', _id;
            RETURN;
        END IF;

-        PERFORM set_config('vessel.client_id', stay_rec.client_id, false);
+        PERFORM set_config('vessel.id', stay_rec.vessel_id, false);

        -- Do we have an existing stay within 100m of the new moorage
 	    FOR moorage_rec in 
@@ -446,9 +446,9 @@ CREATE OR REPLACE FUNCTION process_moorage_queue_fn(IN _id integer) RETURNS void
            END IF;
            -- Insert new moorage from stay
 	        INSERT INTO api.moorages
-	                (client_id, name, stay_id, stay_code, stay_duration, reference_count, latitude, longitude, geog)
+	                (vessel_id, name, stay_id, stay_code, stay_duration, reference_count, latitude, longitude, geog)
 	                VALUES (
-                        stay_rec.client_id,
+                        stay_rec.vessel_id,
 	               		stay_rec.name,
 						stay_rec.id,
 						stay_rec.stay_code,
@@ -627,7 +627,7 @@ CREATE OR REPLACE FUNCTION process_vessel_queue_fn(IN _email TEXT) RETURNS void
        PERFORM set_config('user.email', vessel_rec.owner_email, false);
        -- Gather user settings
        user_settings := '{"email": "' || vessel_rec.owner_email || '", "boat": "' || vessel_rec.name || '"}';
-        --user_settings := get_user_settings_from_clientid_fn();
+        --user_settings := get_user_settings_from_vesselid_fn();
        -- Send notification email, pushover
        --PERFORM send_notification_fn('vessel'::TEXT, vessel_rec::RECORD);
        PERFORM send_email_py_fn('new_vessel'::TEXT, user_settings::JSONB, app_settings::JSONB);
@@ -730,17 +730,17 @@ COMMENT ON FUNCTION
    public.send_notification_fn
    IS 'Send notifications via email, pushover, telegram to user base on user preferences';

-DROP FUNCTION IF EXISTS get_user_settings_from_clientid_fn;
-CREATE OR REPLACE FUNCTION get_user_settings_from_clientid_fn(
-    IN clientid TEXT,
+DROP FUNCTION IF EXISTS get_user_settings_from_vesselid_fn;
+CREATE OR REPLACE FUNCTION get_user_settings_from_vesselid_fn(
+    IN vesselid TEXT,
    OUT user_settings JSONB
    ) RETURNS JSONB
-AS $get_user_settings_from_clientid$
+AS $get_user_settings_from_vesselid$
    DECLARE
    BEGIN
-        -- If client_id is not NULL
-        IF clientid IS NULL OR clientid = '' THEN
-            RAISE WARNING '-> get_user_settings_from_clientid_fn invalid input %', clientid;
+        -- If vessel_id is not NULL
+        IF vesselid IS NULL OR vesselid = '' THEN
+            RAISE WARNING '-> get_user_settings_from_vesselid_fn invalid input %', vesselid;
        END IF;
        SELECT 
            json_build_object( 
@@ -753,16 +753,16 @@ AS $get_user_settings_from_clientid$
                    ) INTO user_settings
            FROM auth.accounts a, auth.vessels v, api.metadata m
            WHERE m.vessel_id = v.vessel_id
-                AND m.client_id = clientid
+                AND m.vessel_id = vesselid
                AND lower(a.email) = lower(v.owner_email);
        PERFORM set_config('user.email', user_settings->>'email'::TEXT, false);
        PERFORM set_config('user.recipient', user_settings->>'recipient'::TEXT, false);
    END;
-$get_user_settings_from_clientid$ LANGUAGE plpgsql;
+$get_user_settings_from_vesselid$ LANGUAGE plpgsql;
 -- Description
 COMMENT ON FUNCTION
-    public.get_user_settings_from_clientid_fn
-    IS 'get user settings details from a clientid, initiate for notifications';
+    public.get_user_settings_from_vesselid_fn
+    IS 'get user settings details from a vesselid initiate for notifications';

 DROP FUNCTION IF EXISTS set_vessel_settings_from_vesselid_fn;
 CREATE OR REPLACE FUNCTION set_vessel_settings_from_vesselid_fn(
@@ -772,7 +772,7 @@ CREATE OR REPLACE FUNCTION set_vessel_settings_from_vesselid_fn(
 AS $set_vessel_settings_from_vesselid$
    DECLARE
    BEGIN
-        -- If client_id is not NULL
+        -- If vessel_id is not NULL
        IF vesselid IS NULL OR vesselid = '' THEN
            RAISE WARNING '-> set_vessel_settings_from_vesselid_fn invalid input %', vesselid;
        END IF;
@@ -784,10 +784,10 @@ AS $set_vessel_settings_from_vesselid$
                    ) INTO vessel_settings
            FROM auth.accounts a, auth.vessels v, api.metadata m
            WHERE m.vessel_id = v.vessel_id
-                AND m.client_id = clientid;
+                AND m.vessel_id = vesselid;
        PERFORM set_config('vessel.name', vessel_settings->>'name'::TEXT, false);
        PERFORM set_config('vessel.client_id', vessel_settings->>'client_id'::TEXT, false);
-        PERFORM set_config('vessel.vessel_id', vessel_settings->>'vessel_id'::TEXT, false);
+        PERFORM set_config('vessel.id', vessel_settings->>'vessel_id'::TEXT, false);
    END;
 $set_vessel_settings_from_vesselid$ LANGUAGE plpgsql;
 -- Description
@@ -813,7 +813,7 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
        SELECT (preferences->'badges'->'Helmsman') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
        if _exist is false THEN
            -- is first logbook?
-            select count(*) into total from api.logbook l where client_id = current_setting('vessel.client_id', false);
+            select count(*) into total from api.logbook l where vessel_id = current_setting('vessel.id', false);
            if total >= 1 then
                -- Add badge
                badge := '{"Helmsman": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
@@ -824,19 +824,19 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
                -- Update badges
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Helmsman"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

        -- Wake Maker = windspeeds above 15kts
        SELECT (preferences->'badges'->'Wake Maker') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
-        RAISE WARNING '-> Wake Maker %', _exist;
+        --RAISE WARNING '-> Wake Maker %', _exist;
        if _exist is false then
            -- is 15 knot+ logbook?
-            select l.max_wind_speed into max_wind_speed from api.logbook l where l.id = logbook_id AND l.max_wind_speed >= 15 and client_id = current_setting('vessel.client_id', false);
+            select l.max_wind_speed into max_wind_speed from api.logbook l where l.id = logbook_id AND l.max_wind_speed >= 15 and vessel_id = current_setting('vessel.id', false);
            --RAISE WARNING '-> Wake Maker max_wind_speed %', max_wind_speed;
           if max_wind_speed >= 15 then
                -- Create badge
@@ -850,10 +850,10 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
                -- Update badges for user
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Wake Maker"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

@@ -861,7 +861,7 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
        SELECT (preferences->'badges'->'Stormtrooper') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
        if _exist is false then
            --RAISE WARNING '-> Stormtrooper %', _exist;
-            select l.max_wind_speed into max_wind_speed from api.logbook l where l.id = logbook_id AND l.max_wind_speed >= 30 and client_id = current_setting('vessel.client_id', false);
+            select l.max_wind_speed into max_wind_speed from api.logbook l where l.id = logbook_id AND l.max_wind_speed >= 30 and vessel_id = current_setting('vessel.id', false);
            --RAISE WARNING '-> Stormtrooper max_wind_speed %', max_wind_speed;
            if max_wind_speed >= 30 then
                -- Create badge
@@ -875,17 +875,17 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
                -- Update badges for user
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Stormtrooper"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

        -- Navigator Award = one logbook with distance over 100NM
        SELECT (preferences->'badges'->'Navigator Award') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
        if _exist is false then
-            select l.distance into distance from api.logbook l where l.id = logbook_id AND l.distance >= 100 and client_id = current_setting('vessel.client_id', false);
+            select l.distance into distance from api.logbook l where l.id = logbook_id AND l.distance >= 100 and vessel_id = current_setting('vessel.id', false);
            if distance >= 100 then
                -- Create badge
                badge := '{"Navigator Award": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
@@ -896,17 +896,17 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
                -- Update badges for user
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Navigator Award"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

        -- Captain Award = total logbook distance over 1000NM
        SELECT (preferences->'badges'->'Captain Award') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
        if _exist is false then
-            select sum(l.distance) into distance from api.logbook l where client_id = current_setting('vessel.client_id', false);
+            select sum(l.distance) into distance from api.logbook l where vessel_id = current_setting('vessel.id', false);
            if distance >= 1000 then
                -- Create badge
                badge := '{"Captain Award": {"log": '|| logbook_id ||', "date":"' || NOW()::timestamp || '"}}';
@@ -917,10 +917,10 @@ CREATE OR REPLACE FUNCTION public.badges_logbook_fn(IN logbook_id integer) RETUR
                -- Update badges for user
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Captain Award"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

@@ -940,14 +940,14 @@ CREATE OR REPLACE FUNCTION public.badges_moorages_fn() RETURNS VOID AS $badges_m
        user_settings jsonb;
    BEGIN
        -- Check and set environment
-        user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+        user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
        PERFORM set_config('user.email', user_settings->>'email'::TEXT, false);

        -- Explorer = 10 days away from home port
        SELECT (preferences->'badges'->'Explorer') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
        if _exist is false then
            --select sum(m.stay_duration) from api.moorages m where home_flag is false;
-            SELECT extract(day from (select sum(m.stay_duration) INTO duration FROM api.moorages m WHERE home_flag IS false AND client_id = current_setting('vessel.client_id', false) ));
+            SELECT extract(day from (select sum(m.stay_duration) INTO duration FROM api.moorages m WHERE home_flag IS false AND vessel_id = current_setting('vessel.id', false) ));
            if duration >= 10 then
                -- Create badge
                badge := '{"Explorer": {"date":"' || NOW()::timestamp || '"}}';
@@ -958,10 +958,10 @@ CREATE OR REPLACE FUNCTION public.badges_moorages_fn() RETURNS VOID AS $badges_m
                -- Update badges for user
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Explorer"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

@@ -969,7 +969,7 @@ CREATE OR REPLACE FUNCTION public.badges_moorages_fn() RETURNS VOID AS $badges_m
        SELECT (preferences->'badges'->'Mooring Pro') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
        if _exist is false then
            -- select sum(m.stay_duration) from api.moorages m where stay_code = 3;
-            SELECT extract(day from (select sum(m.stay_duration) INTO duration FROM api.moorages m WHERE stay_code = 3 AND client_id = current_setting('vessel.client_id', false) ));
+            SELECT extract(day from (select sum(m.stay_duration) INTO duration FROM api.moorages m WHERE stay_code = 3 AND vessel_id = current_setting('vessel.id', false) ));
            if duration >= 10 then
                -- Create badge
                badge := '{"Mooring Pro": {"date":"' || NOW()::timestamp || '"}}';
@@ -980,10 +980,10 @@ CREATE OR REPLACE FUNCTION public.badges_moorages_fn() RETURNS VOID AS $badges_m
                -- Update badges for user
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Mooring Pro"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

@@ -991,7 +991,7 @@ CREATE OR REPLACE FUNCTION public.badges_moorages_fn() RETURNS VOID AS $badges_m
        SELECT (preferences->'badges'->'Anchormaster') IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
        if _exist is false then
            -- select sum(m.stay_duration) from api.moorages m where stay_code = 2;
-            SELECT extract(day from (select sum(m.stay_duration) INTO duration FROM api.moorages m WHERE stay_code = 2 AND client_id = current_setting('vessel.client_id', false) ));
+            SELECT extract(day from (select sum(m.stay_duration) INTO duration FROM api.moorages m WHERE stay_code = 2 AND vessel_id = current_setting('vessel.id', false) ));
            if duration >= 25 then
                -- Create badge
                badge := '{"Anchormaster": {"date":"' || NOW()::timestamp || '"}}';
@@ -1002,10 +1002,10 @@ CREATE OR REPLACE FUNCTION public.badges_moorages_fn() RETURNS VOID AS $badges_m
                -- Update badges for user
                PERFORM api.update_user_preferences_fn('{badges}'::TEXT, badge::TEXT);
                -- Gather user settings
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || '{"badge": "Anchormaster"}'::JSONB into user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
        end if;

@@ -1025,13 +1025,13 @@ CREATE OR REPLACE FUNCTION public.badges_geom_fn(IN logbook_id integer) RETURNS
        user_settings jsonb;
        badge_tmp text;
    begin
-	    RAISE WARNING '--> user.email [%], vessel.client_id [%]', current_setting('user.email', false), current_setting('vessel.client_id', false);
+	    RAISE WARNING '--> user.email [%], vessel.id [%]', current_setting('user.email', false), current_setting('vessel.id', false);
        -- Tropical & Alaska zone manualy add into ne_10m_geography_marine_polys
        -- Check if each geographic marine zone exist as a badge
 	    FOR marine_rec IN
 	        WITH log AS (
 		            SELECT l.track_geom AS track_geom FROM api.logbook l
-                        WHERE l.id = logbook_id AND client_id = current_setting('vessel.client_id', false)
+                        WHERE l.id = logbook_id AND vessel_id = current_setting('vessel.id', false)
 		            )
 	        SELECT name from log, public.ne_10m_geography_marine_polys
                WHERE ST_Intersects(
@@ -1055,10 +1055,10 @@ CREATE OR REPLACE FUNCTION public.badges_geom_fn(IN logbook_id integer) RETURNS
                --RAISE WARNING '--> badges_geom_fn [%]', badge;
                -- Gather user settings
                badge_tmp := '{"badge": "' || marine_rec.name || '"}';
-                user_settings := get_user_settings_from_clientid_fn(current_setting('vessel.client_id', false));
+                user_settings := get_user_settings_from_vesselid_fn(current_setting('vessel.id', false));
                SELECT user_settings::JSONB || badge_tmp::JSONB INTO user_settings;
                -- Send notification
-                PERFORM send_notification_fn('badge'::TEXT, user_settings::JSONB);
+                PERFORM send_notification_fn('new_badge'::TEXT, user_settings::JSONB);
            end if;
 	    END LOOP;
    END;
@@ -1150,7 +1150,7 @@ BEGIN
            AND m.vessel_id = v.vessel_id
            AND v.owner_email = _email;
    -- Set session variables
-    PERFORM set_config('vessel.client_id', _clientid, false);
+    --PERFORM set_config('vessel.client_id', _clientid, false);
    --RAISE WARNING 'public.check_jwt() user_role vessel.client_id [%]', current_setting('vessel.client_id', false);
    --RAISE WARNING 'public.check_jwt() user_role vessel.id [%]', current_setting('vessel.id', false);
    --RAISE WARNING 'public.check_jwt() user_role vessel.name [%]', current_setting('vessel.name', false);
@@ -1172,7 +1172,7 @@ BEGIN
    --PERFORM set_config('vessel.client_id', vessel_rec.client_id, false);
    --RAISE WARNING 'public.check_jwt() user_role vessel.mmsi %', current_setting('vessel.mmsi', false);
    --RAISE WARNING 'public.check_jwt() user_role vessel.name %', current_setting('vessel.name', false);
-    --RAISE WARNING 'public.check_jwt() user_role vessel.client_id %', current_setting('vessel.client_id', false);
+    --RAISE WARNING 'public.check_jwt() user_role vessel.id %', current_setting('vessel.id', false);
  ELSIF _role <> 'api_anonymous' THEN
    RAISE EXCEPTION 'Invalid role'
      USING HINT = 'Stop being so evil and maybe you can log in';
--- a/initdb/02_4_signalk_auth.sql
+++ b/initdb/02_4_signalk_auth.sql
@@ -192,10 +192,11 @@ begin
              FROM auth.accounts a
              WHERE a.email = _email;
  IF _email_valid is null or _email_valid is False THEN
-    INSERT INTO process_queue (channel, payload, stored)
-      VALUES ('email_otp', email, now());
+    INSERT INTO process_queue (channel, payload, stored, ref_id)
+      VALUES ('email_otp', email, now(), _user_id);
  END IF;

+  --RAISE WARNING 'api.login debug: [%],[%],[%]', app_jwt_secret, _role, login.email;
  -- Generate jwt
  select jwt.sign(
  --    row_to_json(r), ''
@@ -204,7 +205,7 @@ begin
    ) as token
    from (
      select _role as role, login.email as email,  -- TODO replace with user_id
-    --  select _role as role, user_id as uid,
+    --  select _role as role, user_id as uid, -- add support in check_jwt
         extract(epoch from now())::integer + 60*60 as exp
    ) r
    into result;
--- a/initdb/02_5_signalk_api_deps.sql
+++ b/initdb/02_5_signalk_api_deps.sql
@@ -9,7 +9,8 @@ select current_database();
 \c signalk

 -- Link auth.vessels with api.metadata
-ALTER TABLE api.metadata ADD vessel_id TEXT NOT NULL REFERENCES auth.vessels(vessel_id) ON DELETE RESTRICT;
+--ALTER TABLE api.metadata ADD vessel_id TEXT NOT NULL REFERENCES auth.vessels(vessel_id) ON DELETE RESTRICT;
+ALTER TABLE api.metadata ADD FOREIGN KEY (vessel_id) REFERENCES auth.vessels(vessel_id) ON DELETE RESTRICT;
 COMMENT ON COLUMN api.metadata.vessel_id IS 'Link auth.vessels with api.metadata';

 -- Link auth.vessels with auth.accounts
@@ -93,7 +94,7 @@ AS $vessel$
                        WHERE
                            latitude IS NOT NULL
                            AND longitude IS NOT NULL
-                            AND client_id = current_setting('vessel.client_id', false)
+                            AND vessel_id = current_setting('vessel.id', false)
                        ORDER BY time DESC
                ) AS geojson_t
            WHERE
@@ -206,7 +207,7 @@ $vessel_details$
 DECLARE
 BEGIN
     RETURN ( WITH tbl AS (
-                SELECT mmsi,ship_type,length,beam,height FROM api.metadata WHERE client_id = current_setting('vessel.client_id', false)
+                SELECT mmsi,ship_type,length,beam,height FROM api.metadata WHERE vessel_id = current_setting('vessel.id', false)
                )
                SELECT json_build_object(
                        'ship_type', (SELECT ais.description FROM aistypes ais, tbl WHERE t.ship_type = ais.id),
--- a/initdb/02_5_signalk_auth_otp.sql
+++ b/initdb/02_5_signalk_auth_otp.sql
@@ -360,8 +360,8 @@ AS $telegram$
            DELETE FROM auth.otp
                WHERE user_email = _email;
            -- Send Notification async
-            INSERT INTO process_queue (channel, payload, stored)
-                VALUES ('telegram_valid', _email, now());
+            --INSERT INTO process_queue (channel, payload, stored)
+            --    VALUES ('telegram_valid', _email, now());
 			RETURN True;
 		END IF;
 		RETURN False;
--- a/initdb/02_6_signalk_roles.sql
+++ b/initdb/02_6_signalk_roles.sql
@@ -185,19 +185,19 @@ CREATE POLICY admin_all ON api.metadata TO current_user
    WITH CHECK (true);
 -- Allow vessel_role to insert and select on their own records
 CREATE POLICY api_vessel_role ON api.metadata TO vessel_role
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (true);
 -- Allow user_role to update and select on their own records
 CREATE POLICY api_user_role ON api.metadata TO user_role
-    USING (client_id = current_setting('vessel.client_id', true))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow scheduler to update and select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', true))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow scheduler to update and select based on the vessel.id
 CREATE POLICY api_scheduler_role ON api.metadata TO scheduler
-    USING (client_id = current_setting('vessel.client_id', false))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
+    USING (vessel_id = current_setting('vessel.id', false))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
 -- Allow grafana to select based on email
 CREATE POLICY grafana_role ON api.metadata TO grafana
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (false);
 -- Allow grafana_auth to select
 CREATE POLICY grafana_proxy_role ON api.metadata TO grafana_auth
@@ -211,19 +211,19 @@ CREATE POLICY admin_all ON api.metrics TO current_user
    WITH CHECK (true);
 -- Allow vessel_role to insert and select on their own records
 CREATE POLICY api_vessel_role ON api.metrics TO vessel_role
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (true);
 -- Allow user_role to update and select on their own records
 CREATE POLICY api_user_role ON api.metrics TO user_role
-    USING (client_id = current_setting('vessel.client_id', true))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow scheduler to update and select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', true))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow scheduler to update and select based on the vessel.id
 CREATE POLICY api_scheduler_role ON api.metrics TO scheduler
-    USING (client_id = current_setting('vessel.client_id', false))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow grafana to select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', false))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow grafana to select based on the vessel.id
 CREATE POLICY grafana_role ON api.metrics TO grafana
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (false);

 -- Be sure to enable row level security on the table
@@ -235,19 +235,19 @@ CREATE POLICY admin_all ON api.logbook TO current_user
    WITH CHECK (true);
 -- Allow vessel_role to insert and select on their own records
 CREATE POLICY api_vessel_role ON api.logbook TO vessel_role
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (true);
 -- Allow user_role to update and select on their own records
 CREATE POLICY api_user_role ON api.logbook TO user_role
-    USING (client_id = current_setting('vessel.client_id', true))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow scheduler to update and select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', true))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow scheduler to update and select based on the vessel.id
 CREATE POLICY api_scheduler_role ON api.logbook TO scheduler
-    USING (client_id = current_setting('vessel.client_id', false))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow grafana to select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', false))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow grafana to select based on the vessel.id
 CREATE POLICY grafana_role ON api.logbook TO grafana
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (false);

 -- Be sure to enable row level security on the table
@@ -258,19 +258,19 @@ CREATE POLICY admin_all ON api.stays TO current_user
    WITH CHECK (true);
 -- Allow vessel_role to insert and select on their own records
 CREATE POLICY api_vessel_role ON api.stays TO vessel_role
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (true);
 -- Allow user_role to update and select on their own records
 CREATE POLICY api_user_role ON api.stays TO user_role
-    USING (client_id = current_setting('vessel.client_id', true))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow scheduler to update and select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', true))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow scheduler to update and select based on the vessel_id
 CREATE POLICY api_scheduler_role ON api.stays TO scheduler
-    USING (client_id = current_setting('vessel.client_id', false))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow grafana to select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', false))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow grafana to select based on the vessel_id
 CREATE POLICY grafana_role ON api.stays TO grafana
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (false);

 -- Be sure to enable row level security on the table
@@ -281,19 +281,19 @@ CREATE POLICY admin_all ON api.moorages TO current_user
    WITH CHECK (true);
 -- Allow vessel_role to insert and select on their own records
 CREATE POLICY api_vessel_role ON api.moorages TO vessel_role
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (true);
 -- Allow user_role to update and select on their own records
 CREATE POLICY api_user_role ON api.moorages TO user_role
-    USING (client_id = current_setting('vessel.client_id', true))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow scheduler to update and select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', true))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow scheduler to update and select based on the vessel_id
 CREATE POLICY api_scheduler_role ON api.moorages TO scheduler
-    USING (client_id = current_setting('vessel.client_id', false))
-    WITH CHECK (client_id = current_setting('vessel.client_id', false));
-- Allow grafana to select based on the client_id
+    USING (vessel_id = current_setting('vessel.id', false))
+    WITH CHECK (vessel_id = current_setting('vessel.id', false));
+-- Allow grafana to select based on the vessel_id
 CREATE POLICY grafana_role ON api.moorages TO grafana
-    USING (client_id = current_setting('vessel.client_id', false))
+    USING (vessel_id = current_setting('vessel.id', false))
    WITH CHECK (false);

 -- Be sure to enable row level security on the table
--- a/initdb/07naturalearthdata.sql
+++ b/initdb/07naturalearthdata.sql
@@ -0,0 +1,76 @@
+---------------------------------------------------------------------------
+-- https://www.naturalearthdata.com
+--
+-- https://naciscdn.org/naturalearth/10m/physical/ne_10m_geography_marine_polys.zip
+--
+-- https://github.com/nvkelso/natural-earth-vector/raw/master/10m_physical/ne_10m_geography_marine_polys.shp
+--
+
+-- Import from shapefile
+-- # shp2pgsql ne_10m_geography_marine_polys.shp public.ne_10m_geography_marine_polys | psql -U ${POSTGRES_USER} signalk
+--
+-- PostgSail Customization, add tropics and alaska area.
+
+-- List current database
+select current_database();
+
+-- connect to the DB
+\c signalk
+
+CREATE TABLE public.ne_10m_geography_marine_polys (
+	gid serial4 NOT NULL,
+	featurecla TEXT NULL,
+	"name" TEXT NULL,
+	namealt TEXT NULL,
+	changed TEXT NULL,
+	note TEXT NULL,
+	name_fr TEXT NULL,
+	min_label float8 NULL,
+	max_label float8 NULL,
+	scalerank int2 NULL,
+	"label" TEXT NULL,
+	wikidataid TEXT NULL,
+	name_ar TEXT NULL,
+	name_bn TEXT NULL,
+	name_de TEXT NULL,
+	name_en TEXT NULL,
+	name_es TEXT NULL,
+	name_el TEXT NULL,
+	name_hi TEXT NULL,
+	name_hu TEXT NULL,
+	name_id TEXT NULL,
+	name_it TEXT NULL,
+	name_ja TEXT NULL,
+	name_ko TEXT NULL,
+	name_nl TEXT NULL,
+	name_pl TEXT NULL,
+	name_pt TEXT NULL,
+	name_ru TEXT NULL,
+	name_sv TEXT NULL,
+	name_tr TEXT NULL,
+	name_vi TEXT NULL,
+	name_zh TEXT NULL,
+	ne_id int8 NULL,
+	name_fa TEXT NULL,
+	name_he TEXT NULL,
+	name_uk TEXT NULL,
+	name_ur TEXT NULL,
+	name_zht TEXT NULL,
+	geom geometry(multipolygon,4326) NULL,
+	CONSTRAINT ne_10m_geography_marine_polys_pkey PRIMARY KEY (gid)
+);
+-- Add GIST index
+CREATE INDEX ne_10m_geography_marine_polys_geom_idx
+  ON public.ne_10m_geography_marine_polys
+  USING GIST (geom);
+
+-- Description
+COMMENT ON TABLE
+    public.ne_10m_geography_marine_polys
+    IS 'imperfect but light weight geographic marine areas from https://www.naturalearthdata.com';
+
+-- Import data
+COPY public.ne_10m_geography_marine_polys(gid,featurecla,"name",namealt,changed,note,name_fr,min_label,max_label,scalerank,"label",wikidataid,name_ar,name_bn,name_de,name_en,name_es,name_el,name_hi,name_hu,name_id,name_it,name_ja,name_ko,name_nl,name_pl,name_pt,name_ru,name_sv,name_tr,name_vi,name_zh,ne_id,name_fa,name_he,name_uk,name_ur,name_zht,geom)
+FROM '/docker-entrypoint-initdb.d/ne_10m_geography_marine_polys.csv'
+DELIMITER ','
+CSV HEADER;
--- a/initdb/PGSAIL_VERSION
+++ b/initdb/PGSAIL_VERSION
@@ -1 +1 @@
-0.1.0
+0.2.0
--- a/initdb/ne_10m_geography_marine_polys.csv
+++ b/initdb/ne_10m_geography_marine_polys.csv
Author	SHA1	Message	Date
xbgmsharp	c7c14fa5a1	Release v0.2.0	2023-06-26 17:31:10 +02:00
xbgmsharp	4fc68ae805	Cleanup metrics trigger from http api call	2023-06-26 17:30:44 +02:00
xbgmsharp	3eb67abedb	Update logging for api.metrics trigger. Force vessel_id to import from SQL cli run as username role	2023-06-26 13:31:44 +02:00
xbgmsharp	894dbf0667	Limit cron processing per bath of 100	2023-06-26 12:26:33 +02:00
xbgmsharp	f526b99853	Cleanup logging for badges processing	2023-06-26 12:25:47 +02:00
xbgmsharp	a670038f28	Update ERD with vessel_id	2023-06-25 21:49:13 +02:00
xbgmsharp	2599f40f7b	Add ref_id to process_queue table to allow timeline per user_id and/or vessel_id	2023-06-25 15:12:04 +02:00
xbgmsharp	4d833999e8	Update vessel dependency to vessel.id instead of client_id. Large commit, to fix a long pending issue for vessel wihtout a proper client_id from signalk.	2023-06-25 09:53:25 +02:00
xbgmsharp	b4dc93ba0e	Update comment	2023-06-25 09:51:07 +02:00
xbgmsharp	764a6d6457	Add postgis geography marine areas	2023-06-25 00:40:58 +02:00
xbgmsharp	2e9ede6da2	Fix badge notification	2023-06-24 13:10:48 +02:00
@@ -1 +1 @@
 .1.0
 .2.0