@opengis/fastify-table 2.0.55 → 2.0.56

package/dist/server/routes/file/controllers/export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,IAAI,EACJ,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBAmVpB"}
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,IAAI,EACJ,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBAgWpB"}

package/dist/server/routes/file/controllers/export.js

@@ -51,7 +51,7 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         return reply.status(400).send("param format is invalid");
     }
     const date = new Date();
-    const sufixName = `${filter}-${cols || "all"}-${search}-${query.limit || "unlimited"}`;
+    const sufixName = `${filter}-${cols || "all"}-${search}-${query.limit || "unlimited"}-${id}`;
     const sufixDate = [
         date.getFullYear(),
         date.getMonth(),
@@ -91,7 +91,8 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
     }
     const loadTable = await getTemplate("table", table);
     const meta = await getMeta({ pg, table: loadTable?.table || table });
-    if (!meta?.pk && !meta?.view && !tableSql) {
+    const viewSql = await getTemplate("view", loadTable?.table || table);
+    if (!meta?.pk && !meta?.view && !tableSql && !viewSql) {
         return reply.status(404).send("table not found");
     }
     if (format === "geojson" && !meta?.geom) {
@@ -110,9 +111,11 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         sufix: false,
     };
     // check total count, debug sql etc.
-    const result = tableSql
+    const result = tableSql || viewSql
         ? await pg
-            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (${tableSql})q`)
+            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (${tableSql || viewSql})q where ${loadTable?.key && id
+            ? `${loadTable?.key}::text = '${id}'`
+            : "true"}`)
             .then((el) => el.rows?.[0] || {})
         : await getData(options, reply, true);
     if (sql)
@@ -174,8 +177,10 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         while (+filtered - offset > 0 && !res?.error) {
             try {
                 send(`Оброблено: ${offset}/${filtered}`);
-                const { rows = [] } = tableSql
-                    ? await pg.query(`select * from (${tableSql})q limit ${options.limit} offset ${offset}`)
+                const { rows = [] } = tableSql || viewSql
+                    ? await pg.query(`select * from (${tableSql || viewSql})q where ${loadTable?.key && id
+                        ? `${loadTable?.key}::text = '${id}'`
+                        : "true"} limit ${options.limit} offset ${offset}`)
                     : await getData({ ...options, page }, reply, true);
                 send(`seq: ${++seq}`);
                 send(`Обробка ${rows.length} об'єктів...`);

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAgzBb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAwzBb"}

package/dist/server/routes/table/functions/getData.js

@@ -137,13 +137,16 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             user,
         }, null)) || {};
     const tableMeta = await getMeta({ pg, table: table1 });
+    const viewSql = await getTemplate("view", table1);
     timeArr.push(Date.now());
     if (tableMeta?.view) {
         if (!loadTable?.key && !tokenData?.key)
             return { message: `key not found: ${table1}`, status: 404 };
         Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
     }
-    const { pk, columns: dbColumns = [] } = tableMeta || {};
+    const { pk, columns: dbColumns = [] } = (viewSql
+        ? { pk: loadTable?.key, columns: loadTable?.columns }
+        : tableMeta) || {};
     const columns1 = columns ||
         dbColumns.map(({ name, title, dataTypeID }) => ({
             name,
@@ -176,9 +179,9 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         ?.filter?.((el) => el.inline)
         ?.map((el) => `,(${el.sql})`)
         ?.join("") || "";
-    const { fields = [] } = pg.queryCache
-        ? await pg.queryCache(`select * ${sqlInline} from ${table1} t ${sqlTable} ${cardSqlTable} limit 0`)
-        : {};
+    const { fields = [] } = !viewSql
+        ? await pg.query(`select * ${sqlInline} from ${table1} t ${sqlTable} ${cardSqlTable} limit 0`)
+        : await pg.query(`select * from (${viewSql})q limit 0`);
     const dbColumnsTable = fields.map((el) => el.name);
     const cols = columns
         .filter((el) => el.name !== "geom" && dbColumnsTable.includes(el.name))
@@ -295,7 +298,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                      from (select * ${sql
         ?.filter((el) => el.inline)
         .map((el) => `,(${el.sql})`)
-        .join("") || ""} from ${table1} t  ${sqlTable} ) t 
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t  ${sqlTable} ) t 
                       
                      ${objectId ? cardSqlTable : ""} 
                      where ${where.join(" and ") || "true"} 
@@ -373,7 +376,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             from (select * ${sql
         ?.filter((el) => el.inline)
         .map((el) => `,(${el.sql})`)
-        .join("") || ""} from ${table1} t ${sqlTable})q 
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})q 
             where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
         .filter(Boolean)
         .filter((el) => checkQuery(el))

package/package.json

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