Release 0.9.2

- Update metadata_ext table add REFERENCES and image_url
- Add stays_ext, new table to store vessel extended stays from user
- Update metadata_update_configuration_trigger, make sure it runs only when need.
- Create update_stays_ext_decode_base64_image_trigger_fn to decode base64 image
- Update function public.autodiscovery_config_fn and cron_process_autodiscovery_fn, hanlde no metric available
- Create api.stays_image to fetch stays image
- Update api.vessel_image to fetch boat image
- Update public.stay_active_geojson_fn function to produce a GeoJSON with the last position and stay details and anchor details
- Update api.monitoring_live, add anchor support
- Create view api.noteshistory_view, List stays and moorages notes order by stays
- Udpate public.process_stay_queue_fn, replace '0 day' stay name by 'short stay' name
- Create view api.logs_geojson_view, List logs with geojson
- Create view api.moorages_geojson_view, List moorages with geojson
- Create api.export_vessel_geojson_fn, export vessel as geojson
- Update api.export_logbook_geojson_linestring_trip_fn, add more trip properties to geojson
- Update api.export_logbook_geojson_trip_fn, add more trip properties to geojson
- Update api.export_logbooks_geojson_linestring_trips_fn, add more trip properties to geojson
- Update TABLE api.stays_ext with ROW LEVEL SECURITY

README.md

@@ -55,7 +55,7 @@ postgsail-telegram-bot:
 - [About The Project](#about-the-project)
 - [Features](#features)
 - [Cloud-hosted PostgSail](#cloud-hosted-postgsail)
-- [On-Premise (for free)](#on-premise-for-free)
+- [On-Premise](#on-premise)
 - [Roadmap](#roadmap)
 - [Contributing](#contributing)
   - [Creating A Pull Request](#creating-a-pull-request)
@@ -104,10 +104,16 @@ To understand the why and how, you might want to read [Why.md](https://github.co
 
 Remove the hassle of running PostgSail yourself. Here you can skip the technical setup, the maintenance work and server costs by getting PostgSail on our reliable and secure PostgSail Cloud. Register and try for free at [iot.openplotter.cloud](https://iot.openplotter.cloud/).
 
-## On-Premise (for free)
+PostgSail Cloud is Open Source and free for personal use with a single vessel. If wish to manage multiple boats contact us.
+
+PostgSail is free to use, but is not free to make or host. The stability and accuracy of PostgSail depends on its volunteers and donations from its users. Please consider making an annual recurring gift to PostgSail.
+
+## On-Premise
 
 Self host postgSail where you want and how you want. There are no restrictions, you’re in full control. [Install Guide](https://github.com/xbgmsharp/postgsail/blob/main/docs/README.md)
 
+PostgSail is free to use, but is not free to make or host. The stability and accuracy of PostgSail depends on its volunteers and donations from its users. Please consider making an annual recurring gift to PostgSail.
+
 ## Roadmap
 
 See the [open issues](https://github.com/xbgmsharp/postgsail/issues) for a list of proposed features (and known issues).

docs/ERD/postgsail.md

@@ -26,11 +26,15 @@ erDiagram
         tfloat trip_batt_voltage "Battery Voltage"
         tfloat trip_cog "courseovergroundtrue"
         tfloat trip_depth "Depth"
+        tfloat trip_heading "heading True"
         tfloat trip_hum_out "Humidity outside"
         ttext trip_notes 
         tfloat trip_pres_out "Pressure outside"
         tfloat trip_sog "speedoverground"
+        tfloat trip_solar_power "solar powerPanel"
+        tfloat trip_solar_voltage "solar voltage"
         ttext trip_status 
+        tfloat trip_tank_level "Tank currentLevel"
         tfloat trip_temp_out "Temperature outside"
         tfloat trip_temp_water "Temperature water"
         tfloat trip_twa "windspeedapparent"
@@ -45,15 +49,14 @@ erDiagram
         jsonb available_keys "Signalk paths with unit for custom mapping"
         jsonb available_keys 
         double_precision beam 
-        text client_id "Deprecated client_id to be removed"
-        text client_id 
         jsonb configuration "Signalk path mapping for metrics"
         jsonb configuration 
         timestamp_with_time_zone created_at "{NOT_NULL}"
         double_precision height 
-        integer id "{NOT_NULL}"
+        text ip "Store vessel ip address"
+        text ip 
         double_precision length 
-        numeric mmsi 
+        text mmsi 
         text name 
         text platform 
         text plugin_version "{NOT_NULL}"
@@ -65,6 +68,19 @@ erDiagram
         text vessel_id "{NOT_NULL}"
     }
 
+    api_metadata_ext {
+        timestamp_with_time_zone created_at "{NOT_NULL}"
+        bytea image "Store user boat image in bytea format"
+        text image_b64 
+        text image_type "Store user boat image type in text format"
+        timestamp_with_time_zone image_updated_at 
+        text image_url 
+        text make_model "Store user make & model in text format"
+        text polar "Store polar data in CSV notation as used on ORC sailboat data"
+        timestamp_with_time_zone polar_updated_at 
+        text vessel_id "{NOT_NULL}"
+    }
+
     api_metrics {
         double_precision anglespeedapparent 
         text client_id "Deprecated client_id to be removed"
@@ -115,6 +131,17 @@ erDiagram
         integer stay_code "{NOT_NULL}"
     }
 
+    api_stays_ext {
+        timestamp_with_time_zone created_at "{NOT_NULL}"
+        bytea image "Store stays image in bytea format"
+        text image_b64 
+        text image_type "Store stays image type in text format"
+        timestamp_with_time_zone image_updated_at 
+        text image_url 
+        integer stay_id "{NOT_NULL}"
+        text vessel_id "{NOT_NULL}"
+    }
+
     auth_accounts {
         timestamp_with_time_zone connected_at "{NOT_NULL}"
         timestamp_with_time_zone created_at "{NOT_NULL}"
@@ -273,12 +300,15 @@ erDiagram
     api_logbook }o--|| api_moorages : ""
     api_logbook }o--|| api_moorages : ""
     api_metadata }o--|| auth_vessels : ""
+    api_metadata_ext |o--|| api_metadata : ""
     api_metrics }o--|| api_metadata : ""
     api_moorages }o--|| api_metadata : ""
     api_stays }o--|| api_metadata : ""
+    api_stays_ext }o--|| api_metadata : ""
     api_moorages }o--|| api_stays_at : ""
     api_stays }o--|| api_moorages : ""
     api_stays }o--|| api_stays_at : ""
+    api_stays_ext |o--|| api_stays : ""
     auth_otp |o--|| auth_accounts : ""
     auth_vessels }o--|| auth_accounts : ""
 ```

initdb/99_migrations_202412.sql

@@ -248,7 +248,7 @@ RETURNS TABLE (
 ) AS $$
 DECLARE
 BEGIN
-    -- Aggregate all metrics as trip ios short.
+    -- Aggregate all metrics as trip is short.
     RETURN QUERY
     WITH metrics AS (
         -- Extract metrics

initdb/99_migrations_202501.sql

@@ -17,19 +17,21 @@ select current_database();
 \echo 'Force timezone, just in case'
 set timezone to 'UTC';
 
--- Mark client_id as deprecated
+-- Update metadata table, mark client_id as deprecated
 COMMENT ON COLUMN api.metadata.client_id IS 'Deprecated client_id to be removed';
+-- Update metrics table, mark client_id as deprecated
 COMMENT ON COLUMN api.metrics.client_id IS 'Deprecated client_id to be removed';
 
--- Update metadata table COLUMN type to jsonb
+-- Update metadata table update configuration column type to jsonb and comment
 ALTER TABLE api.metadata ALTER COLUMN "configuration" TYPE jsonb USING "configuration"::jsonb;
 COMMENT ON COLUMN api.metadata.configuration IS 'Signalk path mapping for metrics';
 
--- Add new column available_keys
+-- Update metadata table add new column available_keys and comment
 ALTER TABLE api.metadata ADD available_keys jsonb NULL;
 COMMENT ON COLUMN api.metadata.available_keys IS 'Signalk paths with unit for custom mapping';
 
 --DROP FUNCTION public.metadata_upsert_trigger_fn();
+-- Update metadata_upsert_trigger_fn to metadata table to support configuration and available_keys and deprecated client_id
 CREATE OR REPLACE FUNCTION public.metadata_upsert_trigger_fn()
  RETURNS trigger
  LANGUAGE plpgsql
@@ -92,6 +94,7 @@ $function$
 COMMENT ON FUNCTION public.metadata_upsert_trigger_fn() IS 'process metadata from vessel, upsert';
 
 -- Create or replace the function that will be executed by the trigger
+-- Add metadata table trigger for update_metadata_configuration
 CREATE OR REPLACE FUNCTION api.update_metadata_configuration()
 RETURNS TRIGGER AS $$
 BEGIN
@@ -118,7 +121,7 @@ BEFORE UPDATE ON api.metadata
 FOR EACH ROW
 EXECUTE FUNCTION api.update_metadata_configuration();
 
--- Update api.export_logbook_geojson_linestring_trip_fn, add metadata
+-- Update api.export_logbook_geojson_linestring_trip_fn, add metadata properties
 CREATE OR REPLACE FUNCTION api.export_logbooks_geojson_linestring_trips_fn(
     start_log integer DEFAULT NULL::integer,
     end_log integer DEFAULT NULL::integer,

initdb/PGSAIL_VERSION

@@ -1 +1 @@
-0.9.0
+0.9.2

tests/index.js

@@ -199,7 +199,7 @@ let configtime = new Date().toISOString();
     preferences: { key: '{email_notifications}', value: false }, /* Disable email_notifications */
     vessel_metadata: {
             name: "aava",
-            mmsi: "787654321",
+            mmsi: "n/a",
             //client_id: "vessels.urn:mrn:imo:mmsi:787654321",
             length: "12",
             beam: "10",
@@ -343,6 +343,18 @@ let configtime = new Date().toISOString();
           obj_name: 'settings'
         }
       },
+    ],
+    meta_ext_fn: [
+      { url: '/metadata_ext?',
+        res: {
+          obj_name: 'configuration'
+        }
+      },
+      { url: `/metadata_ext?`,
+        res: {
+          obj_name: 'image'
+        }
+      },
     ]
   }
 ].forEach( function(test){
@@ -621,7 +633,7 @@ request.set('User-Agent', 'PostgSail unit tests');
         .set('Authorization', `Bearer ${vessel_jwt}`)
         .set('Accept', 'application/json')
         .set('Content-Type', 'application/json')
-        .set('Prefer', 'return=headers-only,resolution=merge-duplicates')
+        .set('Prefer', 'missing=default,return=headers-only,resolution=merge-duplicates')
         .end(function(err,res){
           res.status.should.equal(201);
           //console.log(res.header);
@@ -636,14 +648,15 @@ request.set('User-Agent', 'PostgSail unit tests');
   describe("Vessel POST metrics, JWT vessel_role", function(){
 
     let data = [];
-    //console.log(vessel_metrics['metrics'][0]);
+    //console.log(test.vessel_metrics['metrics'][0]);
     let i;
     for (i = 0; i < test.vessel_metrics['metrics'].length; i++) {
       data[i] = test.vessel_metrics['metrics'][i];
       // Override time, -2h to allow to new data later without delay.
       data[i]['time'] = moment.utc().subtract(1, 'day').add(i, 'minutes').format();
       // Override client_id
-      data[i]['client_id'] = test.vessel_metadata.client_id;
+      //data[i]['client_id'] = test.vessel_metadata.client_id;
+      data[i]['client_id'] = null;
     }
     // The last entry are invalid and should be ignore.
     // - Invalid status

tests/index2.js

@@ -413,19 +413,19 @@ request.set('User-Agent', 'PostgSail unit tests');
 
   describe("Vessel POST metadata, JWT vessel_role", function(){
 
-    it('/metadata', function(done) {
+    it('/metadata?on_conflict=vessel_id', function(done) {
       request = supertest.agent(test.cname);
       request
-        .post('/metadata')
+        .post('/metadata?on_conflict=vessel_id')
         .send(test.vessel_metadata)
         .set('Authorization', `Bearer ${vessel_jwt}`)
         .set('Accept', 'application/json')
         .set('Content-Type', 'application/json')
-        .set('Prefer', 'return=headers-only')
+        .set('Prefer', 'missing=default,return=headers-only,resolution=merge-duplicates')
         .end(function(err,res){
           //console.log(res.body);
           //console.log(res.header);
-          res.status.should.equal(201);
+          res.status.should.equal(200);
           should.exist(res.header['server']);
           res.header['server'].should.match(new RegExp('postgrest','g'));
           done(err);
@@ -444,7 +444,8 @@ request.set('User-Agent', 'PostgSail unit tests');
       // Override time, +1h because previous sample include 47 entry.
       data[i]['time'] = moment.utc().subtract(2, 'hours').add(i, 'minutes').format();
       // Override client_id
-      data[i]['client_id'] = test.vessel_metadata.client_id;
+      //data[i]['client_id'] = test.vessel_metadata.client_id;
+      data[i]['client_id'] = null;
     }
     //console.log(data[0]);
 

tests/index4.js

@@ -163,6 +163,10 @@ var moment = require("moment");
         url: "/rpc/update_user_preferences_fn",
         payload: { key: "{public_monitoring}", value: true },
       },
+      {
+        url: "/rpc/update_user_preferences_fn",
+        payload: { key: "{public_timelapse}", value: true },
+      },
     ],
   },
   {
@@ -685,7 +689,7 @@ var moment = require("moment");
             let event = res.body;
             //console.log(event);
             // minimum events log for kapla & aava 13 + 4 email_otp = 17
-            event.length.should.be.aboveOrEqual(13);
+            event.length.should.be.aboveOrEqual(11);
             done(err);
           });
       });

tests/index5.js

@@ -151,7 +151,7 @@ var moment = require("moment");
     request.set("User-Agent", "PostgSail unit tests");
 
     describe("With no JWT as api_anonymous", function () {
-      it("/logs_view, api_anonymous no jwt token", function (done) {
+      it("/logs_view, api_anonymous no jwt token, x-is-public header", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request
@@ -167,7 +167,7 @@ var moment = require("moment");
             done(err);
           });
       });
-      it("/log_view, api_anonymous no jwt token", function (done) {
+      it("/log_view, api_anonymous no jwt token, x-is-public header", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request
@@ -183,7 +183,7 @@ var moment = require("moment");
             done(err);
           });
       });
-      it("/monitoring_view, api_anonymous no jwt token", function (done) {
+      it("/monitoring_view, api_anonymous no jwt token, x-is-public header", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request
@@ -200,7 +200,7 @@ var moment = require("moment");
             done(err);
           });
       });
-      it("/rpc/export_logbooks_geojson_linestring_trips_fn, api_anonymous no jwt token", function (done) {
+      it("/rpc/export_logbooks_geojson_linestring_trips_fn, api_anonymous no jwt token, x-is-public header", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request
@@ -214,10 +214,18 @@ var moment = require("moment");
             should.exist(res.header["server"]);
             res.header["content-type"].should.match(new RegExp("json", "g"));
             res.header["server"].should.match(new RegExp("postgrest", "g"));
+            should.exist(res.body.geojson);
+            /*
+            if (res.body.geojson.features == null) { // aava
+              //res.body.geojson.features.should.not.be.ok();
+              done(err);
+            }
+            res.body.geojson.features.length.should.be.equal(4);
+            */
             done(err);
           });
       });
-      it("/rpc/export_logbooks_geojson_point_trips_fn, api_anonymous no jwt token", function (done) {
+      it("/rpc/export_logbooks_geojson_point_trips_fn, api_anonymous no jwt token, x-is-public header", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request
@@ -231,6 +239,14 @@ var moment = require("moment");
             should.exist(res.header["server"]);
             res.header["content-type"].should.match(new RegExp("json", "g"));
             res.header["server"].should.match(new RegExp("postgrest", "g"));
+            should.exist(res.body.geojson);
+            /*
+            if (res.body.geojson.features == null) { // aava
+              //res.body.geojson.features.should.not.be.ok();
+              done(err);
+            }
+            res.body.geojson.features.length.should.be.equal(53);
+            */
             done(err);
           });
       });

tests/index6.js

@@ -183,6 +183,7 @@ var moment = require("moment");
             should.exist(res.header["server"]);
             res.header["content-type"].should.match(new RegExp("json", "g"));
             res.header["server"].should.match(new RegExp("postgrest", "g"));
+            should.exist(res.body.geojson);
             done(err);
           });
       });
@@ -193,12 +194,13 @@ var moment = require("moment");
           .post(test.replay_full.url)
           .set("Accept", "application/json")
           .end(function (err, res) {
-            console.log(res.text);
+            console.log(res.body);
             res.status.should.equal(200);
             should.exist(res.header["content-type"]);
             should.exist(res.header["server"]);
             res.header["content-type"].should.match(new RegExp("json", "g"));
             res.header["server"].should.match(new RegExp("postgrest", "g"));
+            should.exist(res.body.geojson);
             done(err);
           });
       });

tests/sql/anonymous.sql

@@ -18,3 +18,10 @@ SELECT api.ispublic_fn('kapla', 'public_logs', 1);
 SELECT api.ispublic_fn('kapla', 'public_logs', 3);
 SELECT api.ispublic_fn('kapla', 'public_monitoring');
 SELECT api.ispublic_fn('kapla', 'public_timelapse');
+
+SELECT api.ispublic_fn('aava', 'public_test');
+SELECT api.ispublic_fn('aava', 'public_logs_list');
+SELECT api.ispublic_fn('aava', 'public_logs', 1);
+SELECT api.ispublic_fn('aava', 'public_logs', 3);
+SELECT api.ispublic_fn('aava', 'public_monitoring');
+SELECT api.ispublic_fn('aava', 'public_timelapse');

tests/sql/anonymous.sql.output

@@ -21,6 +21,24 @@ ispublic_fn | f
 -[ RECORD 1 ]--
 ispublic_fn | t
 
+-[ RECORD 1 ]--
+ispublic_fn | t
+
+-[ RECORD 1 ]--
+ispublic_fn | f
+
+-[ RECORD 1 ]--
+ispublic_fn | f
+
+-[ RECORD 1 ]--
+ispublic_fn | f
+
+-[ RECORD 1 ]--
+ispublic_fn | t
+
+-[ RECORD 1 ]--
+ispublic_fn | t
+
 -[ RECORD 1 ]--
 ispublic_fn | f
 

tests/sql/cron_post_jobs.sql

@@ -21,6 +21,9 @@ SELECT v.vessel_id as "vessel_id" FROM auth.vessels v WHERE v.owner_email = 'dem
 --\echo :"vessel_id"
 SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id;
 
+-- user_role
+SET ROLE user_role;
+
 -- Test logbook for user
 \echo 'logbook'
 SELECT count(*) FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
@@ -38,7 +41,7 @@ SELECT active,name IS NOT NULL AS name,geog,stay_code FROM api.stays WHERE vesse
 \echo 'eventlogs_view'
 SELECT count(*) from api.eventlogs_view;
 
--- Test event logs view for user
+-- Test stats logs view for user
 \echo 'stats_logs_fn'
 SELECT api.stats_logs_fn(null, null) INTO stats_jsonb;
 SELECT stats_logs_fn->'name' AS name,

tests/sql/cron_post_jobs.sql.output

@@ -11,6 +11,7 @@ user_id | t
 -[ RECORD 1 ]
 vessel_id | t
 
+SET
 logbook
 -[ RECORD 1 ]
 count | 2
@@ -66,23 +67,23 @@ stay_code | 4
 
 eventlogs_view
 -[ RECORD 1 ]
-count | 11
+count | 12
 
 stats_logs_fn
 SELECT 1
--[ RECORD 1 ]+----------
-name         | "aava"
-count        | 4
-max_speed    | 9.5
-max_distance | 68.8677
-max_duration | "PT1H11M"
-?column?     | 3
-?column?     | 90.6030
-?column?     | "PT2H44M"
-?column?     | 44.2
-?column?     | 3
-?column?     | 4
-?column?     | 4
+-[ RECORD 1 ]+--------
+name         | "kapla"
+count        | 2
+max_speed    | 6.5
+max_distance | 8.8968
+max_duration | "PT27M"
+?column?     | 2
+?column?     | 16.5415
+?column?     | "PT47M"
+?column?     | 37.2
+?column?     | 2
+?column?     | 1
+?column?     | 2
 first_date   | t
 last_date    | t
 

tests/sql/cron_run_jobs.sql

@@ -15,7 +15,12 @@ select current_database();
 \echo 'Check the number of process pending'
 -- Should be 24
 SELECT count(*) as jobs from public.process_queue pq where pq.processed is null;
---set role scheduler
+-- Switch to the scheduler role
+--\echo 'Switch to the scheduler role'
+--SET ROLE scheduler;
+-- Should be 24
+SELECT count(*) as jobs from public.process_queue pq where pq.processed is null;
+-- Run the cron jobs
 SELECT public.run_cron_jobs();
 -- Check any pending job
 SELECT count(*) as any_pending_jobs from public.process_queue pq where pq.processed is null;

tests/sql/cron_run_jobs.sql.output

@@ -7,7 +7,10 @@ You are now connected to database "signalk" as user "username".
 Expanded display is on.
 Check the number of process pending
 -[ RECORD 1 ]
-jobs | 24
+jobs | 26
+
+-[ RECORD 1 ]
+jobs | 26
 
 -[ RECORD 1 ]-+-
 run_cron_jobs | 

tests/sql/grafana.sql

@@ -29,7 +29,7 @@ SELECT a.user_id IS NOT NULL AS user_id, a.email, a.first, a.last, a.pass IS NOT
 SELECT v.vessel_id IS NOT NULL AS vessel_id, v.owner_email, v.mmsi, v.name, v.role FROM auth.vessels AS v;
 \echo 'api.metadata details'
 --
-SELECT m.id, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration IS NOT NULL AS configuration, available_keys FROM api.metadata AS m ORDER BY m.name DESC;
+SELECT vessel_id IS NOT NULL AS vessel_id_not_null, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration IS NOT NULL AS configuration_not_null, available_keys FROM api.metadata AS m ORDER BY m.name DESC;
 
 --
 -- grafana
@@ -55,7 +55,7 @@ SELECT v.name AS __text, m.vessel_id IS NOT NULL AS __value FROM auth.vessels v
 SELECT v.vessel_id IS NOT NULL AS vessel_id, v.owner_email, v.mmsi, v.name, v.role FROM auth.vessels AS v;
 --SELECT * FROM api.metadata m;
 \echo 'api.metadata details'
-SELECT m.id, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration IS NOT NULL AS configuration, available_keys FROM api.metadata AS m;
+SELECT vessel_id IS NOT NULL AS vessel_id_not_null, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration IS NOT NULL AS configuration_not_null, available_keys FROM api.metadata AS m;
 
 \echo 'api.logs_view'
 --SELECT * FROM api.logbook l;

tests/sql/grafana.sql.output

@@ -55,34 +55,34 @@ name        | aava
 role        | vessel_role
 
 api.metadata details
--[ RECORD 1 ]---+----------------
-id              | 1
-name            | kapla
-mmsi            | 123456789
-length          | 12
-beam            | 10
-height          | 24
-ship_type       | 36
-plugin_version  | 0.0.1
-signalk_version | signalk_version
-time            | t
-active          | t
-configuration   | t
-available_keys  | 
--[ RECORD 2 ]---+----------------
-id              | 2
-name            | aava
-mmsi            | 787654321
-length          | 12
-beam            | 10
-height          | 24
-ship_type       | 37
-plugin_version  | 1.0.2
-signalk_version | 1.20.0
-time            | t
-active          | t
-configuration   | f
-available_keys  | []
+-[ RECORD 1 ]----------+----------------
+vessel_id_not_null     | t
+name                   | kapla
+mmsi                   | 123456789
+length                 | 12
+beam                   | 10
+height                 | 24
+ship_type              | 36
+plugin_version         | 0.0.1
+signalk_version        | signalk_version
+time                   | t
+active                 | t
+configuration_not_null | t
+available_keys         | 
+-[ RECORD 2 ]----------+----------------
+vessel_id_not_null     | t
+name                   | aava
+mmsi                   | 787654321
+length                 | 12
+beam                   | 10
+height                 | 24
+ship_type              | 37
+plugin_version         | 1.0.2
+signalk_version        | 1.20.0
+time                   | t
+active                 | t
+configuration_not_null | t
+available_keys         | []
 
 SET
 ROLE grafana current_setting
@@ -108,20 +108,20 @@ name        | kapla
 role        | vessel_role
 
 api.metadata details
--[ RECORD 1 ]---+----------------
-id              | 1
-name            | kapla
-mmsi            | 123456789
-length          | 12
-beam            | 10
-height          | 24
-ship_type       | 36
-plugin_version  | 0.0.1
-signalk_version | signalk_version
-time            | t
-active          | t
-configuration   | t
-available_keys  | 
+-[ RECORD 1 ]----------+----------------
+vessel_id_not_null     | t
+name                   | kapla
+mmsi                   | 123456789
+length                 | 12
+beam                   | 10
+height                 | 24
+ship_type              | 36
+plugin_version         | 0.0.1
+signalk_version        | signalk_version
+time                   | t
+active                 | t
+configuration_not_null | t
+available_keys         | 
 
 api.logs_view
 -[ RECORD 1 ]----+-----------------------

tests/sql/metadata.sql

@@ -11,22 +11,74 @@ select current_database();
 -- output display format
 \x on
 
+SELECT count(*) as count_eq_2 FROM api.metadata m;
+
 SELECT v.vessel_id as "vessel_id" FROM auth.vessels v WHERE v.owner_email = 'demo+kapla@openplotter.cloud' \gset
 --\echo :"vessel_id"
 SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id;
 
---SELECT * FROM api.metadata m;
+-- user_role
+SET ROLE user_role;
+
 \echo 'api.metadata details'
-SELECT m.id, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration, available_keys FROM api.metadata AS m ORDER BY m.name ASC;
+SELECT vessel_id IS NOT NULL AS vessel_id_not_null, m.name, m.mmsi, m.length, m.beam, m.height, m.ship_type, m.plugin_version, m.signalk_version, m.time IS NOT NULL AS time, m.active, configuration, available_keys FROM api.metadata AS m ORDER BY m.name ASC;
 
 \echo 'api.metadata get configuration'
-select configuration from api.metadata WHERE vessel_id = current_setting('vessel.id', false);
+select configuration from api.metadata; --WHERE vessel_id = current_setting('vessel.id', false);
 
 \echo 'api.metadata update configuration'
-UPDATE api.metadata SET configuration = '{ "depthKey": "environment.depth.belowTransducer" }' WHERE vessel_id = current_setting('vessel.id', false);
+UPDATE api.metadata SET configuration = '{ "depthKey": "environment.depth.belowTransducer" }'; --WHERE vessel_id = current_setting('vessel.id', false);
 
 \echo 'api.metadata get configuration with new value'
-select configuration->'depthKey' AS depthKey, configuration->'update_at' IS NOT NULL AS update_at from api.metadata WHERE vessel_id = current_setting('vessel.id', false);
+select configuration->'depthKey' AS depthKey, configuration->'update_at' IS NOT NULL AS update_at_not_null from api.metadata; --WHERE vessel_id = current_setting('vessel.id', false);
 
 \echo 'api.metadata get configuration base on update_at value'
-select configuration->'depthKey' AS depthKey, configuration->'update_at' IS NOT NULL AS update_at from api.metadata WHERE vessel_id = current_setting('vessel.id', false) AND configuration->>'update_at' = to_char(NOW(), 'YYYY-MM-DD"T"HH24:MI:SS"Z"');
+select configuration->'depthKey' AS depthKey, configuration->'update_at' IS NOT NULL AS update_at_not_null from api.metadata WHERE vessel_id = current_setting('vessel.id', false) AND configuration->>'update_at' <= to_char(NOW(), 'YYYY-MM-DD"T"HH24:MI:SS"Z"');
+
+-- Upsert make_model on metadata_ext table
+\echo 'api.metadata_ext set make_model'
+INSERT INTO api.metadata_ext (vessel_id, make_model)
+    VALUES (current_setting('vessel.id', false), 'my super yacht')
+    ON CONFLICT (vessel_id) DO UPDATE
+    SET make_model = EXCLUDED.make_model;
+
+-- Upsert polar on metadata_ext table
+\echo 'api.metadata_ext set polar'
+INSERT INTO api.metadata_ext (vessel_id, polar)
+    VALUES (current_setting('vessel.id', false), 'twa/tws;4;6;8;10;12;14;16;20;24\n0;0;0;0;0;0;0;0;0;0')
+    ON CONFLICT (vessel_id) DO UPDATE
+    SET polar = EXCLUDED.polar;
+
+-- Upsert image on metadata_ext table
+\echo 'api.metadata_ext set image/image_b64'
+INSERT INTO api.metadata_ext (vessel_id, image_b64)
+    VALUES (current_setting('vessel.id', false), 'iVBORw0KGgoAAAANSUhEUgAAAMgAAAAyCAIAAACWMwO2AAABNklEQVR4nO3bwY6CMBiF0XYy7//KzIKk6VBjiMMNk59zVljRIH6WsrBv29bgal93HwA1CYsIYREhLCKERYSwiBAWEcIiQlhECIsIYREhLCKERYSwiBAWEcIiQlhECIsIYREhLCK+7z6A/6j33lq75G8m')
+    ON CONFLICT (vessel_id) DO UPDATE
+    SET image_b64 = EXCLUDED.image_b64;
+
+-- Ensure make_model on metadata_ext table is updated
+\echo 'api.metadata_ext get make_model'
+SELECT make_model FROM api.metadata_ext; --WHERE vessel_id = current_setting('vessel.id', false);
+
+-- Ensure polar_updated_at on metadata_ext table is updated by trigger
+\echo 'api.metadata_ext get polar_updated_at'
+SELECT polar,polar_updated_at IS NOT NULL AS polar_updated_at_not_null FROM api.metadata_ext; --WHERE vessel_id = current_setting('vessel.id', false);
+
+-- Ensure image_updated_at on metadata_ext table is updated by trigger
+\echo 'api.metadata_ext get image_updated_at'
+SELECT image_b64 IS NULL AS image_b64_is_null,image IS NOT NULL AS image_not_null,image_updated_at IS NOT NULL AS image_updated_at_not_null FROM api.metadata_ext; --WHERE vessel_id = current_setting('vessel.id', false);
+
+-- vessel_role
+SET ROLE vessel_role;
+
+\echo 'api.metadata get configuration with new value as vessel'
+select configuration->'depthKey' AS depthKey, configuration->'update_at' IS NOT NULL AS update_at_not_null from api.metadata; -- WHERE vessel_id = current_setting('vessel.id', false);
+
+\echo 'api.metadata get configuration base on update_at value as vessel'
+select configuration->'depthKey' AS depthKey, configuration->'update_at' IS NOT NULL AS update_at_not_null from api.metadata WHERE vessel_id = current_setting('vessel.id', false) AND configuration->>'update_at' <= to_char(NOW(), 'YYYY-MM-DD"T"HH24:MI:SS"Z"');
+
+-- api_anonymous
+SET ROLE api_anonymous;
+
+\echo 'api_anonymous get vessel image'
+SELECT api.vessel_image(current_setting('vessel.id', false)) IS NOT NULL AS vessel_image_not_null;

tests/sql/metadata.sql.output

@@ -5,38 +5,28 @@
 
 You are now connected to database "signalk" as user "username".
 Expanded display is on.
+-[ RECORD 1 ]-
+count_eq_2 | 2
+
 -[ RECORD 1 ]
 vessel_id | t
 
+SET
 api.metadata details
--[ RECORD 1 ]---+----------------
-id              | 2
-name            | aava
-mmsi            | 787654321
-length          | 12
-beam            | 10
-height          | 24
-ship_type       | 37
-plugin_version  | 1.0.2
-signalk_version | 1.20.0
-time            | t
-active          | t
-configuration   | 
-available_keys  | []
--[ RECORD 2 ]---+----------------
-id              | 1
-name            | kapla
-mmsi            | 123456789
-length          | 12
-beam            | 10
-height          | 24
-ship_type       | 36
-plugin_version  | 0.0.1
-signalk_version | signalk_version
-time            | t
-active          | t
-configuration   | 
-available_keys  | 
+-[ RECORD 1 ]------+----------------
+vessel_id_not_null | t
+name               | kapla
+mmsi               | 123456789
+length             | 12
+beam               | 10
+height             | 24
+ship_type          | 36
+plugin_version     | 0.0.1
+signalk_version    | signalk_version
+time               | t
+active             | t
+configuration      | 
+available_keys     | 
 
 api.metadata get configuration
 -[ RECORD 1 ]-+-
@@ -45,12 +35,49 @@ configuration |
 api.metadata update configuration
 UPDATE 1
 api.metadata get configuration with new value
--[ RECORD 1 ]----------------------------------
-depthkey  | "environment.depth.belowTransducer"
-update_at | t
+-[ RECORD 1 ]------+------------------------------------
+depthkey           | "environment.depth.belowTransducer"
+update_at_not_null | t
 
 api.metadata get configuration base on update_at value
--[ RECORD 1 ]----------------------------------
-depthkey  | "environment.depth.belowTransducer"
-update_at | t
+-[ RECORD 1 ]------+------------------------------------
+depthkey           | "environment.depth.belowTransducer"
+update_at_not_null | t
+
+api.metadata_ext set make_model
+INSERT 0 1
+api.metadata_ext set polar
+INSERT 0 1
+api.metadata_ext set image/image_b64
+INSERT 0 1
+api.metadata_ext get make_model
+-[ RECORD 1 ]--------------
+make_model | my super yacht
+
+api.metadata_ext get polar_updated_at
+-[ RECORD 1 ]-------------+-----------------------------------------------------
+polar                     | twa/tws;4;6;8;10;12;14;16;20;24\n0;0;0;0;0;0;0;0;0;0
+polar_updated_at_not_null | t
+
+api.metadata_ext get image_updated_at
+-[ RECORD 1 ]-------------+--
+image_b64_is_null         | f
+image_not_null            | t
+image_updated_at_not_null | t
+
+SET
+api.metadata get configuration with new value as vessel
+-[ RECORD 1 ]------+------------------------------------
+depthkey           | "environment.depth.belowTransducer"
+update_at_not_null | t
+
+api.metadata get configuration base on update_at value as vessel
+-[ RECORD 1 ]------+------------------------------------
+depthkey           | "environment.depth.belowTransducer"
+update_at_not_null | t
+
+SET
+api_anonymous get vessel image
+-[ RECORD 1 ]---------+--
+vessel_image_not_null | t
 

tests/sql/mobilitydb.sql.output

@@ -54,7 +54,7 @@ vessel_id | t
 Export timelapse as Geometry LineString from a trip
 -[ RECORD 1 ]--+-----------
 geometry_type  | LineString
-num_properties | 22
+num_properties | 35
 
 Export timelapse as Geometry Point from a trip
 -[ RECORD 1 ]

tests/sql/summary.sql.output

@@ -6,10 +6,10 @@
 You are now connected to database "signalk" as user "username".
 Expanded display is on.
 -[ RECORD 1 ]--+-------------------------------
-server_version | 16.8 (Debian 16.8-1.pgdg120+1)
+server_version | 16.9 (Debian 16.9-1.pgdg120+1)
 
 -[ RECORD 1 ]--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-postgis_full_version | POSTGIS="3.5.2 dea6d0a" [EXTENSION] PGSQL="160" GEOS="3.11.1-CAPI-1.17.1" PROJ="9.1.1 NETWORK_ENABLED=OFF URL_ENDPOINT=https://cdn.proj.org USER_WRITABLE_DIRECTORY=/var/lib/postgresql/.local/share/proj DATABASE_PATH=/usr/share/proj/proj.db" (compiled against PROJ 9.1.1) LIBXML="2.9.14" LIBJSON="0.16" LIBPROTOBUF="1.4.1" WAGYU="0.5.0 (Internal)"
+postgis_full_version | POSTGIS="3.5.3 aab5f55" [EXTENSION] PGSQL="160" GEOS="3.11.1-CAPI-1.17.1" PROJ="9.1.1 NETWORK_ENABLED=OFF URL_ENDPOINT=https://cdn.proj.org USER_WRITABLE_DIRECTORY=/var/lib/postgresql/.local/share/proj DATABASE_PATH=/usr/share/proj/proj.db" (compiled against PROJ 9.1.1) LIBXML="2.9.14" LIBJSON="0.16" LIBPROTOBUF="1.4.1" WAGYU="0.5.0 (Internal)"
 
 -[ RECORD 1 ]--------------------------------------------------------------------------------------
 Name        | citext
@@ -53,15 +53,20 @@ Schema      | pg_catalog
 Description | PL/Python3U untrusted procedural language
 -[ RECORD 9 ]--------------------------------------------------------------------------------------
 Name        | postgis
-Version     | 3.5.2
+Version     | 3.5.3
 Schema      | public
 Description | PostGIS geometry and geography spatial types and functions
 -[ RECORD 10 ]-------------------------------------------------------------------------------------
 Name        | timescaledb
-Version     | 2.19.0
+Version     | 2.20.3
 Schema      | public
 Description | Enables scalable inserts and complex queries for time-series data (Community Edition)
 -[ RECORD 11 ]-------------------------------------------------------------------------------------
+Name        | timescaledb_toolkit
+Version     | 1.21.0
+Schema      | public
+Description | Library of analytical hyperfunctions, time-series pipelining, and other SQL utilities
+-[ RECORD 12 ]-------------------------------------------------------------------------------------
 Name        | uuid-ossp
 Version     | 1.1
 Schema      | public
@@ -111,14 +116,14 @@ laninline     | 13566
 lanvalidator  | 13567
 lanacl        | 
 -[ RECORD 5 ]-+-----------
-oid           | 18225
+oid           | 18245
 lanname       | plpython3u
 lanowner      | 10
 lanispl       | t
 lanpltrusted  | t
-lanplcallfoid | 18222
-laninline     | 18223
-lanvalidator  | 18224
+lanplcallfoid | 18242
+laninline     | 18243
+lanvalidator  | 18244
 lanacl        | 
 
 -[ RECORD 1 ]+-----------
@@ -214,18 +219,22 @@ Name   | spatial_ref_sys
 Type   | table
 Owner  | username
 
--[ RECORD 1 ]--------
+-[ RECORD 1 ]------------
 schema_api | logbook
--[ RECORD 2 ]--------
+-[ RECORD 2 ]------------
 schema_api | metadata
--[ RECORD 3 ]--------
+-[ RECORD 3 ]------------
+schema_api | metadata_ext
+-[ RECORD 4 ]------------
 schema_api | metrics
--[ RECORD 4 ]--------
+-[ RECORD 5 ]------------
 schema_api | moorages
--[ RECORD 5 ]--------
+-[ RECORD 6 ]------------
 schema_api | stays
--[ RECORD 6 ]--------
+-[ RECORD 7 ]------------
 schema_api | stays_at
+-[ RECORD 8 ]------------
+schema_api | stays_ext
 
 -[ RECORD 1 ]-+------------------------------
 schema_public | aistypes
@@ -274,31 +283,13 @@ with_check | true
 -[ RECORD 2 ]------------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | metadata
-policyname | api_vessel_role
-permissive | PERMISSIVE
-roles      | {vessel_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | true
--[ RECORD 3 ]------------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metadata
-policyname | api_user_role
-permissive | PERMISSIVE
-roles      | {user_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, true))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 4 ]------------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metadata
 policyname | api_scheduler_role
 permissive | PERMISSIVE
 roles      | {scheduler}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 5 ]------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 3 ]------------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | metadata
 policyname | grafana_role
@@ -307,7 +298,7 @@ roles      | {grafana}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 6 ]------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 4 ]------------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | metadata
 policyname | grafana_proxy_role
@@ -316,52 +307,34 @@ roles      | {grafana_auth}
 cmd        | ALL
 qual       | true
 with_check | false
+-[ RECORD 5 ]------------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metrics
+policyname | admin_all
+permissive | PERMISSIVE
+roles      | {username}
+cmd        | ALL
+qual       | true
+with_check | true
+-[ RECORD 6 ]------------------------------------------------------------------------------------------------------------------------------
+schemaname | auth
+tablename  | vessels
+policyname | grafana_proxy_role
+permissive | PERMISSIVE
+roles      | {grafana_auth}
+cmd        | ALL
+qual       | true
+with_check | false
 -[ RECORD 7 ]------------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | metrics
-policyname | admin_all
-permissive | PERMISSIVE
-roles      | {username}
-cmd        | ALL
-qual       | true
-with_check | true
--[ RECORD 8 ]------------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metrics
-policyname | api_vessel_role
-permissive | PERMISSIVE
-roles      | {vessel_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, false))
-with_check | true
--[ RECORD 9 ]------------------------------------------------------------------------------------------------------------------------------
-schemaname | auth
-tablename  | vessels
-policyname | grafana_proxy_role
-permissive | PERMISSIVE
-roles      | {grafana_auth}
-cmd        | ALL
-qual       | true
-with_check | false
--[ RECORD 10 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metrics
-policyname | api_user_role
-permissive | PERMISSIVE
-roles      | {user_role}
-cmd        | ALL
-qual       | (vessel_id = current_setting('vessel.id'::text, true))
-with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 11 ]-----------------------------------------------------------------------------------------------------------------------------
-schemaname | api
-tablename  | metrics
 policyname | api_scheduler_role
 permissive | PERMISSIVE
 roles      | {scheduler}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 12 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 8 ]------------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | metrics
 policyname | grafana_role
@@ -370,7 +343,7 @@ roles      | {grafana}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 13 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 9 ]------------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | metrics
 policyname | api_anonymous_role
@@ -379,7 +352,7 @@ roles      | {api_anonymous}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 14 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 10 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | logbook
 policyname | admin_all
@@ -388,7 +361,7 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
--[ RECORD 15 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 11 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | logbook
 policyname | api_vessel_role
@@ -397,7 +370,7 @@ roles      | {vessel_role}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | true
--[ RECORD 16 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 12 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | accounts
 policyname | admin_all
@@ -406,7 +379,7 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
--[ RECORD 17 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 13 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | logbook
 policyname | api_user_role
@@ -415,7 +388,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, true))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 18 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 14 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | logbook
 policyname | api_scheduler_role
@@ -424,7 +397,7 @@ roles      | {scheduler}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 19 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 15 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | logbook
 policyname | grafana_role
@@ -433,7 +406,7 @@ roles      | {grafana}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 20 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 16 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | logbook
 policyname | api_anonymous_role
@@ -442,7 +415,7 @@ roles      | {api_anonymous}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 21 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 17 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | stays
 policyname | admin_all
@@ -451,7 +424,7 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
--[ RECORD 22 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 18 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | stays
 policyname | api_vessel_role
@@ -460,7 +433,7 @@ roles      | {vessel_role}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | true
--[ RECORD 23 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 19 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | logbook
 policyname | logbook_qgis_role
@@ -469,7 +442,7 @@ roles      | {qgis_role}
 cmd        | ALL
 qual       | true
 with_check | false
--[ RECORD 24 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 20 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | public_maplapse_role
@@ -478,7 +451,7 @@ roles      | {maplapse_role}
 cmd        | ALL
 qual       | true
 with_check | true
--[ RECORD 25 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 21 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | stays
 policyname | api_user_role
@@ -487,7 +460,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, true))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 26 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 22 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | stays
 policyname | api_scheduler_role
@@ -496,7 +469,7 @@ roles      | {scheduler}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 27 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 23 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | stays
 policyname | grafana_role
@@ -505,7 +478,7 @@ roles      | {grafana}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 28 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 24 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | stays
 policyname | api_anonymous_role
@@ -514,7 +487,7 @@ roles      | {api_anonymous}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 29 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 25 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | moorages
 policyname | admin_all
@@ -523,7 +496,7 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
--[ RECORD 30 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 26 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | moorages
 policyname | api_vessel_role
@@ -532,7 +505,16 @@ roles      | {vessel_role}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | true
--[ RECORD 31 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 27 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays_ext
+policyname | admin_all
+permissive | PERMISSIVE
+roles      | {username}
+cmd        | ALL
+qual       | true
+with_check | true
+-[ RECORD 28 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | moorages
 policyname | api_user_role
@@ -541,7 +523,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, true))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 32 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 29 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | moorages
 policyname | api_scheduler_role
@@ -550,7 +532,7 @@ roles      | {scheduler}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | (vessel_id = current_setting('vessel.id'::text, false))
--[ RECORD 33 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 30 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | moorages
 policyname | grafana_role
@@ -559,7 +541,7 @@ roles      | {grafana}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 34 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 31 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | api
 tablename  | moorages
 policyname | api_anonymous_role
@@ -568,7 +550,7 @@ roles      | {api_anonymous}
 cmd        | ALL
 qual       | (vessel_id = current_setting('vessel.id'::text, false))
 with_check | false
--[ RECORD 35 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 32 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | vessels
 policyname | admin_all
@@ -577,7 +559,7 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
--[ RECORD 36 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 33 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | vessels
 policyname | api_user_role
@@ -586,7 +568,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | ((vessel_id = current_setting('vessel.id'::text, true)) AND ((owner_email)::text = current_setting('user.email'::text, true)))
 with_check | ((vessel_id = current_setting('vessel.id'::text, true)) AND ((owner_email)::text = current_setting('user.email'::text, true)))
--[ RECORD 37 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 34 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | vessels
 policyname | grafana_role
@@ -595,7 +577,7 @@ roles      | {grafana}
 cmd        | ALL
 qual       | ((owner_email)::text = current_setting('user.email'::text, true))
 with_check | false
--[ RECORD 38 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 35 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | accounts
 policyname | api_user_role
@@ -604,7 +586,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | ((email)::text = current_setting('user.email'::text, true))
 with_check | ((email)::text = current_setting('user.email'::text, true))
--[ RECORD 39 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 36 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | accounts
 policyname | api_scheduler_role
@@ -613,7 +595,7 @@ roles      | {scheduler}
 cmd        | ALL
 qual       | ((email)::text = current_setting('user.email'::text, true))
 with_check | ((email)::text = current_setting('user.email'::text, true))
--[ RECORD 40 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 37 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | auth
 tablename  | accounts
 policyname | grafana_proxy_role
@@ -622,7 +604,7 @@ roles      | {grafana_auth}
 cmd        | ALL
 qual       | true
 with_check | false
--[ RECORD 41 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 38 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | admin_all
@@ -631,7 +613,7 @@ roles      | {username}
 cmd        | ALL
 qual       | true
 with_check | true
--[ RECORD 42 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 39 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | api_vessel_role
@@ -640,7 +622,7 @@ roles      | {vessel_role}
 cmd        | ALL
 qual       | ((ref_id = current_setting('user.id'::text, true)) OR (ref_id = current_setting('vessel.id'::text, true)))
 with_check | true
--[ RECORD 43 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 40 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | api_user_role
@@ -649,7 +631,7 @@ roles      | {user_role}
 cmd        | ALL
 qual       | ((ref_id = current_setting('user.id'::text, true)) OR (ref_id = current_setting('vessel.id'::text, true)))
 with_check | ((ref_id = current_setting('user.id'::text, true)) OR (ref_id = current_setting('vessel.id'::text, true)))
--[ RECORD 44 ]-----------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 41 ]-----------------------------------------------------------------------------------------------------------------------------
 schemaname | public
 tablename  | process_queue
 policyname | api_scheduler_role
@@ -658,6 +640,105 @@ roles      | {scheduler}
 cmd        | ALL
 qual       | true
 with_check | false
+-[ RECORD 42 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays_ext
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 43 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays_ext
+policyname | api_anonymous_role
+permissive | PERMISSIVE
+roles      | {api_anonymous}
+cmd        | ALL
+qual       | true
+with_check | false
+-[ RECORD 44 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | stays_ext
+policyname | api_vessel_role
+permissive | PERMISSIVE
+roles      | {vessel_role}
+cmd        | ALL
+qual       | false
+with_check | false
+-[ RECORD 45 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metadata_ext
+policyname | admin_all
+permissive | PERMISSIVE
+roles      | {username}
+cmd        | ALL
+qual       | true
+with_check | true
+-[ RECORD 46 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metadata_ext
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 47 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metadata_ext
+policyname | api_anonymous_role
+permissive | PERMISSIVE
+roles      | {api_anonymous}
+cmd        | ALL
+qual       | true
+with_check | false
+-[ RECORD 48 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metadata_ext
+policyname | api_vessel_role
+permissive | PERMISSIVE
+roles      | {vessel_role}
+cmd        | ALL
+qual       | false
+with_check | false
+-[ RECORD 49 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metrics
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | false
+-[ RECORD 50 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metrics
+policyname | api_vessel_role
+permissive | PERMISSIVE
+roles      | {vessel_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 51 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metadata
+policyname | api_vessel_role
+permissive | PERMISSIVE
+roles      | {vessel_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
+-[ RECORD 52 ]-----------------------------------------------------------------------------------------------------------------------------
+schemaname | api
+tablename  | metadata
+policyname | api_user_role
+permissive | PERMISSIVE
+roles      | {user_role}
+cmd        | ALL
+qual       | (vessel_id = current_setting('vessel.id'::text, false))
+with_check | (vessel_id = current_setting('vessel.id'::text, false))
 
 Test nominatim reverse_geocode_py_fn
 -[ RECORD 1 ]---------+----------------------------------------
@@ -671,16 +752,16 @@ overpass_py_fn | {"fee": "yes", "vhf": "09", "name": "Port Olímpic", "phone": "
 -[ RECORD 1 ]--+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 overpass_py_fn | {"name": "Port de la Ginesta", "type": "multipolygon", "leisure": "marina", "name:ca": "Port de la Ginesta", "wikidata": "Q16621038", "wikipedia": "ca:Port Ginesta", "check_date": "2024-08-23"}
 
--[ RECORD 1 ]--+----------------------------------------------
-overpass_py_fn | {"name": "Norra hamnen", "leisure": "marina"}
+-[ RECORD 1 ]--+---------------------------------------------------------------------------------------------------------------
+overpass_py_fn | {"name": "Norra hamnen", "leisure": "marina", "seamark:type": "harbour", "seamark:harbour:category": "marina"}
 
 -[ RECORD 1 ]----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-versions_fn | {"api_version" : "0.9.0", "sys_version" : "PostgreSQL 16.8", "mobilitydb" : "1.2.0", "timescaledb" : "2.19.0", "postgis" : "3.5.2", "postgrest" : "PostgREST 12.2.8"}
+versions_fn | {"api_version" : "0.9.2", "sys_version" : "PostgreSQL 16.9", "mobilitydb" : "1.2.0", "timescaledb" : "2.20.3", "postgis" : "3.5.3", "postgrest" : "PostgREST 13.0.2"}
 
 -[ RECORD 1 ]-----------------
-api_version | 0.9.0
-sys_version | PostgreSQL 16.8
-timescaledb | 2.19.0
-postgis     | 3.5.2
-postgrest   | PostgREST 12.2.8
+api_version | 0.9.2
+sys_version | PostgreSQL 16.9
+timescaledb | 2.20.3
+postgis     | 3.5.3
+postgrest   | PostgREST 13.0.2