@opengis/fastify-table 1.1.147 → 1.1.149

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.147",
+  "version": "1.1.149",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/migrations/properties.sql

@@ -1,5 +1,6 @@
 create schema if not exists admin;
 create schema if not exists crm;
+create schema if not exists setting;
 
 -- drop old
 DROP TABLE IF EXISTS setting.extra_data;
@@ -142,3 +143,42 @@ CREATE INDEX IF NOT EXISTS crm_extra_data_cdate_btree_idx ON crm.extra_data USIN
 CREATE INDEX IF NOT EXISTS crm_extra_data_property_id_btree_idx ON crm.extra_data USING btree (property_id COLLATE pg_catalog."default");
 CREATE INDEX IF NOT EXISTS crm_extra_data_property_entity_btree_idx ON crm.extra_data USING btree (property_entity COLLATE pg_catalog."default");
 CREATE INDEX IF NOT EXISTS crm_extra_data_object_id_btree_idx ON crm.extra_data USING btree (object_id COLLATE pg_catalog."default");
+
+
+CREATE TABLE IF NOT EXISTS setting.property ();
+ALTER TABLE setting.property DROP CONSTRAINT IF EXISTS setting_property_pkey;
+
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_id text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_entity text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_key text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_text text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_json json;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_int integer;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS level text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS object_id text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS category text;
+
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
+ALTER TABLE setting.property ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE setting.property ADD CONSTRAINT setting_property_pkey PRIMARY KEY (property_id);
+
+COMMENT ON TABLE setting.property IS 'Налаштування';
+COMMENT ON COLUMN setting.property.property_entity IS 'Сутність';
+COMMENT ON COLUMN setting.property.property_key IS 'Ключ';
+COMMENT ON COLUMN setting.property.property_text IS 'Текстове значення налаштування';
+COMMENT ON COLUMN setting.property.property_json IS 'Значення налаштування';
+COMMENT ON COLUMN setting.property.level IS 'Рівень (user/system)';
+COMMENT ON COLUMN setting.property.object_id IS 'ID Об''єкту';
+COMMENT ON COLUMN setting.property.category IS 'Категорія (filter/menu/...)';
+COMMENT ON COLUMN setting.property.property_int IS 'Цілочислове значения';
+
+CREATE INDEX if not exists setting_property_object_id_gin_idx ON setting.property USING gin (object_id COLLATE pg_catalog."default" gin_trgm_ops);
+CREATE INDEX if not exists setting_property_property_entity_gin_idx ON setting.property USING gin (property_entity COLLATE pg_catalog."default" gin_trgm_ops);
+CREATE INDEX if not exists setting_property_property_int_btree_idx ON setting.property USING btree (property_int);
+CREATE INDEX if not exists setting_property_property_key_gin_idx ON setting.property USING gin (property_key COLLATE pg_catalog."default" gin_trgm_ops);
+CREATE INDEX if not exists setting_property_property_text_gin_idx ON setting.property USING gin (property_text COLLATE pg_catalog."default" gin_trgm_ops);

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -1,5 +1,9 @@
-const dateTypeList = ['date', 'timestamp', 'timestamp without time zone'];
+const dateTypeList = ['date', 'timestamp', 'timestamp without time zone', 'timestamp with time zone'];
 const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
+const isValidDate = (dateStr) => {
+  const [dd, mm, yyyy] = dateStr.split('.');
+  return new Date(mm + '/' + dd + '/' + yyyy).toString() !== 'Invalid Date';
+};
 
 function dt(y, m, d) {
   return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
@@ -53,6 +57,10 @@ function formatValue({
     const [startDate, endDate] = value.split('-');
     const min = formatDateISOString(startDate);
     const max = formatDateISOString(endDate);
+
+    if (!isValidDate(startDate) || !isValidDate(endDate)) {
+      return { op: 'between', query: 'false', extra };
+    }
     const query = extra && pk
       ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
       : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;