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

Update export functiond to order by date rether than id.

Browse Source 
Update delete logbook to return a boolean
This commit is contained in:
xbgmsharp
2023-10-29 21:31:15 +01:00
parent d13f096d4f
commit 3eafa2e13f
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
initdb/02_1_2_signalk_api_functions.sql
View File

@@ -29,8 +29,7 @@ CREATE OR REPLACE FUNCTION api.timelapse_fn(
WHERE id >= start_log WHERE id >= start_log
AND id <= end_log AND id <= end_log
AND track_geom IS NOT NULL AND track_geom IS NOT NULL
GROUP BY id ORDER BY _from_time ASC
ORDER BY id ASC
) )
SELECT ST_AsGeoJSON(geo.*) INTO _geojson FROM ( SELECT ST_AsGeoJSON(geo.*) INTO _geojson FROM (
SELECT ST_Collect( SELECT ST_Collect(
@@ -45,8 +44,7 @@ CREATE OR REPLACE FUNCTION api.timelapse_fn(
WHERE _from_time >= start_log::TIMESTAMP WITHOUT TIME ZONE WHERE _from_time >= start_log::TIMESTAMP WITHOUT TIME ZONE
AND _to_time <= end_date::TIMESTAMP WITHOUT TIME ZONE + interval '23 hours 59 minutes' AND _to_time <= end_date::TIMESTAMP WITHOUT TIME ZONE + interval '23 hours 59 minutes'
AND track_geom IS NOT NULL AND track_geom IS NOT NULL
GROUP BY id ORDER BY _from_time ASC
ORDER BY id ASC
) )
SELECT ST_AsGeoJSON(geo.*) INTO _geojson FROM ( SELECT ST_AsGeoJSON(geo.*) INTO _geojson FROM (
SELECT ST_Collect( SELECT ST_Collect(
@@ -59,8 +57,7 @@ CREATE OR REPLACE FUNCTION api.timelapse_fn(
SELECT track_geom SELECT track_geom
FROM api.logbook FROM api.logbook
WHERE track_geom IS NOT NULL WHERE track_geom IS NOT NULL
GROUP BY id ORDER BY _from_time ASC
ORDER BY id ASC
) )
SELECT ST_AsGeoJSON(geo.*) INTO _geojson FROM ( SELECT ST_AsGeoJSON(geo.*) INTO _geojson FROM (
SELECT ST_Collect( SELECT ST_Collect(
@@ -232,8 +229,7 @@ AS $export_logbooks_gpx$
WHERE id >= start_log WHERE id >= start_log
AND id <= end_log AND id <= end_log
AND track_geojson IS NOT NULL AND track_geojson IS NOT NULL
GROUP BY id ORDER BY _from_time ASC
ORDER BY id ASC
) AS sub ) AS sub
WHERE (f->'geometry'->>'type') = 'Point'; WHERE (f->'geometry'->>'type') = 'Point';
ELSE ELSE
@@ -244,8 +240,7 @@ AS $export_logbooks_gpx$
SELECT jsonb_array_elements(track_geojson->'features') AS f SELECT jsonb_array_elements(track_geojson->'features') AS f
FROM api.logbook FROM api.logbook
WHERE track_geojson IS NOT NULL WHERE track_geojson IS NOT NULL
GROUP BY id ORDER BY _from_time ASC
ORDER BY id ASC
) AS sub ) AS sub
WHERE (f->'geometry'->>'type') = 'Point'; WHERE (f->'geometry'->>'type') = 'Point';
END IF; END IF;
@@ -295,8 +290,7 @@ BEGIN
WHERE id >= start_log WHERE id >= start_log
AND id <= end_log AND id <= end_log
AND track_geom IS NOT NULL AND track_geom IS NOT NULL
GROUP BY id ORDER BY _from_time ASC
ORDER BY id ASC
) )
SELECT ST_Collect( SELECT ST_Collect(
ARRAY( ARRAY(
@@ -307,8 +301,7 @@ BEGIN
SELECT track_geom SELECT track_geom
FROM api.logbook FROM api.logbook
WHERE track_geom IS NOT NULL WHERE track_geom IS NOT NULL
GROUP BY id ORDER BY _from_time ASC
ORDER BY id ASC
) )
SELECT ST_Collect( SELECT ST_Collect(
ARRAY( ARRAY(
@@ -731,7 +724,7 @@ COMMENT ON FUNCTION
IS 'Stays/Moorages stats by date'; IS 'Stays/Moorages stats by date';
DROP FUNCTION IF EXISTS api.delete_logbook_fn; DROP FUNCTION IF EXISTS api.delete_logbook_fn;
CREATE OR REPLACE FUNCTION api.delete_logbook_fn(IN _id integer) RETURNS void AS $delete_logbook$ CREATE OR REPLACE FUNCTION api.delete_logbook_fn(IN _id integer) RETURNS BOOLEAN AS $delete_logbook$
DECLARE DECLARE
logbook_rec record; logbook_rec record;
previous_stays_id numeric; previous_stays_id numeric;
@@ -742,7 +735,7 @@ CREATE OR REPLACE FUNCTION api.delete_logbook_fn(IN _id integer) RETURNS void AS
-- If _id is not NULL -- If _id is not NULL
IF _id IS NULL OR _id < 1 THEN IF _id IS NULL OR _id < 1 THEN
RAISE WARNING '-> delete_logbook_fn invalid input %', _id; RAISE WARNING '-> delete_logbook_fn invalid input %', _id;
RETURN; RETURN FALSE;
END IF; END IF;
-- Update logbook -- Update logbook
UPDATE api.logbook l UPDATE api.logbook l
@@ -778,7 +771,7 @@ CREATE OR REPLACE FUNCTION api.delete_logbook_fn(IN _id integer) RETURNS void AS
DELETE FROM api.stays WHERE id = current_stays_id; DELETE FROM api.stays WHERE id = current_stays_id;
RAISE WARNING '-> delete_logbook_fn delete stays [%]', current_stays_id; RAISE WARNING '-> delete_logbook_fn delete stays [%]', current_stays_id;
-- TODO should we subtract (-1) moorages ref count or reprocess it?!? -- TODO should we subtract (-1) moorages ref count or reprocess it?!?
return; RETURN TRUE;
END; END;
$delete_logbook$ LANGUAGE plpgsql; $delete_logbook$ LANGUAGE plpgsql;
-- Description -- Description