@opengis/fastify-table 1.0.84 → 1.0.86
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Changelog.md +4 -0
- package/package.json +1 -1
- package/server/templates/table/test.dataset.table.json +4 -0
- package/table/controllers/data.js +102 -97
- package/table/funcs/metaFormat/index.js +28 -27
- package/table/index.js +1 -1
- package/test/api/table.test.js +76 -57
package/Changelog.md
CHANGED
package/package.json
CHANGED
|
@@ -1,97 +1,102 @@
|
|
|
1
|
-
import getTemplate from './utils/getTemplate.js';
|
|
2
|
-
import getFilterSQL from '../funcs/getFilterSQL/index.js';
|
|
3
|
-
import getMeta from '../../pg/funcs/getMeta.js';
|
|
4
|
-
import metaFormat from '../funcs/metaFormat/index.js';
|
|
5
|
-
import getAccess from '../../crud/funcs/getAccess.js';
|
|
6
|
-
import setToken from '../../crud/funcs/setToken.js';
|
|
7
|
-
import gisIRColumn from './utils/gisIRColumn.js';
|
|
8
|
-
|
|
9
|
-
const maxLimit = 100;
|
|
10
|
-
export default async function dataAPI({
|
|
11
|
-
pg, params, funcs = {}, query = {}, opt = {}, uid: uid1, req, session,
|
|
12
|
-
}) {
|
|
13
|
-
const time = Date.now();
|
|
14
|
-
|
|
15
|
-
const uid = session?.passport?.user?.uid || uid1 || query.uid || 0;
|
|
16
|
-
|
|
17
|
-
const loadTable = await getTemplate('table', params.table);
|
|
18
|
-
|
|
19
|
-
if (!loadTable) { return { message: 'template not found', status: 404 }; }
|
|
20
|
-
|
|
21
|
-
const {
|
|
22
|
-
table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
|
|
23
|
-
} = loadTable;
|
|
24
|
-
const { pk, columns: dbColumns = [] } = await getMeta(table);
|
|
25
|
-
|
|
26
|
-
if (!pk) return { message: `table not found: ${table}`, status: 404 };
|
|
27
|
-
|
|
28
|
-
const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
const
|
|
61
|
-
const
|
|
62
|
-
const
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
};
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
1
|
+
import getTemplate from './utils/getTemplate.js';
|
|
2
|
+
import getFilterSQL from '../funcs/getFilterSQL/index.js';
|
|
3
|
+
import getMeta from '../../pg/funcs/getMeta.js';
|
|
4
|
+
import metaFormat from '../funcs/metaFormat/index.js';
|
|
5
|
+
import getAccess from '../../crud/funcs/getAccess.js';
|
|
6
|
+
import setToken from '../../crud/funcs/setToken.js';
|
|
7
|
+
import gisIRColumn from './utils/gisIRColumn.js';
|
|
8
|
+
|
|
9
|
+
const maxLimit = 100;
|
|
10
|
+
export default async function dataAPI({
|
|
11
|
+
pg, params, funcs = {}, query = {}, opt = {}, uid: uid1, req, session,
|
|
12
|
+
}) {
|
|
13
|
+
const time = Date.now();
|
|
14
|
+
|
|
15
|
+
const uid = session?.passport?.user?.uid || uid1 || query.uid || 0;
|
|
16
|
+
|
|
17
|
+
const loadTable = await getTemplate('table', params.table);
|
|
18
|
+
|
|
19
|
+
if (!loadTable) { return { message: 'template not found', status: 404 }; }
|
|
20
|
+
|
|
21
|
+
const {
|
|
22
|
+
table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
|
|
23
|
+
} = loadTable;
|
|
24
|
+
const { pk, columns: dbColumns = [] } = await getMeta(table);
|
|
25
|
+
|
|
26
|
+
if (!pk) return { message: `table not found: ${table}`, status: 404 };
|
|
27
|
+
|
|
28
|
+
const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
|
|
29
|
+
const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
|
|
30
|
+
? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
|
|
31
|
+
: '';
|
|
32
|
+
const columnList = dbColumns.map((el) => el.name || el).join(',');
|
|
33
|
+
const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
|
|
34
|
+
const cardSqlFiltered = opt?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
|
|
35
|
+
const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i} on 1=1 `).join('') || '' : '';
|
|
36
|
+
|
|
37
|
+
if (params.id && columnList.includes(params.id)) {
|
|
38
|
+
return gisIRColumn({
|
|
39
|
+
pg, funcs, layer: params.table, column: params.id, sql: query.sql,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const fData = query.filter || query.search ? await getFilterSQL({
|
|
44
|
+
filter: query.filter,
|
|
45
|
+
search: query.search,
|
|
46
|
+
table: params.table,
|
|
47
|
+
json: 1,
|
|
48
|
+
}) : {};
|
|
49
|
+
|
|
50
|
+
const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
|
|
51
|
+
|
|
52
|
+
const limit = Math.min(maxLimit, +(query.limit || 20));
|
|
53
|
+
|
|
54
|
+
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
55
|
+
// id, query, filter
|
|
56
|
+
const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
|
|
57
|
+
|
|
58
|
+
const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
|
|
59
|
+
const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
|
|
60
|
+
const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
|
|
61
|
+
const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
|
|
62
|
+
const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
|
|
63
|
+
const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
|
|
64
|
+
|
|
65
|
+
const access = await getAccess(req, params.table);
|
|
66
|
+
const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox].filter((el) => el);
|
|
67
|
+
const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
|
|
68
|
+
const q = `select ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
|
|
69
|
+
|
|
70
|
+
if (query.sql === '1') { return q; }
|
|
71
|
+
|
|
72
|
+
const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
|
|
73
|
+
|
|
74
|
+
const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
|
|
75
|
+
|
|
76
|
+
await metaFormat({ rows, table: params.table });
|
|
77
|
+
const res = {
|
|
78
|
+
time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
if (!funcs.config?.security?.disableToken) {
|
|
82
|
+
const addTokens = setToken({
|
|
83
|
+
ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
|
|
84
|
+
mode: 'a',
|
|
85
|
+
uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
|
|
86
|
+
array: 1,
|
|
87
|
+
});
|
|
88
|
+
Object.assign(res, { addToken: addTokens[0] });
|
|
89
|
+
|
|
90
|
+
rows.forEach((row) => {
|
|
91
|
+
const editTokens = setToken({
|
|
92
|
+
ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
|
|
93
|
+
mode: 'w',
|
|
94
|
+
uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
|
|
95
|
+
array: 1,
|
|
96
|
+
});
|
|
97
|
+
Object.assign(row, { token: editTokens[0] });
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
return res;
|
|
102
|
+
}
|
|
@@ -1,27 +1,28 @@
|
|
|
1
|
-
import getTemplate from '../../controllers/utils/getTemplate.js';
|
|
2
|
-
import getSelectVal from './getSelectVal.js';
|
|
3
|
-
|
|
4
|
-
export default async function metaFormat({ rows, table }) {
|
|
5
|
-
const loadTable = await getTemplate('table', table);
|
|
6
|
-
const selectCols = loadTable?.columns?.filter((e) => e.data);
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
1
|
+
import getTemplate from '../../controllers/utils/getTemplate.js';
|
|
2
|
+
import getSelectVal from './getSelectVal.js';
|
|
3
|
+
|
|
4
|
+
export default async function metaFormat({ rows, table }) {
|
|
5
|
+
const loadTable = await getTemplate('table', table);
|
|
6
|
+
const selectCols = loadTable?.columns?.filter((e) => e.data);
|
|
7
|
+
const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
|
|
8
|
+
if (!selectCols?.length && !metaCls?.length) return rows;
|
|
9
|
+
|
|
10
|
+
// cls & select format
|
|
11
|
+
|
|
12
|
+
await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
|
|
13
|
+
const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
|
|
14
|
+
if (!values.length) return null;
|
|
15
|
+
|
|
16
|
+
const cls = await getSelectVal({ name: attr.data, values });
|
|
17
|
+
if (!cls) return null;
|
|
18
|
+
rows.forEach(el => {
|
|
19
|
+
const val = el[attr.name]?.map?.(c => cls[c] || c) || cls[el[attr.name]] || el[attr.name];
|
|
20
|
+
if (!val) return;
|
|
21
|
+
Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
return null;
|
|
25
|
+
}));
|
|
26
|
+
|
|
27
|
+
return rows;
|
|
28
|
+
}
|
package/table/index.js
CHANGED
|
@@ -11,7 +11,7 @@ import getTemplate from './controllers/utils/getTemplate.js';
|
|
|
11
11
|
import getSelect from './controllers/utils/getSelect.js';
|
|
12
12
|
|
|
13
13
|
const tableSchema = {
|
|
14
|
-
|
|
14
|
+
querystring1: {
|
|
15
15
|
page: { type: 'string', pattern: '^(\\d+)$' },
|
|
16
16
|
order: { type: 'string', pattern: '^(\\d+)$' },
|
|
17
17
|
filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },
|
package/test/api/table.test.js
CHANGED
|
@@ -1,57 +1,76 @@
|
|
|
1
|
-
import { test } from 'node:test';
|
|
2
|
-
import assert from 'node:assert';
|
|
3
|
-
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
1
|
+
import { test } from 'node:test';
|
|
2
|
+
import assert from 'node:assert';
|
|
3
|
+
import pgClients from '../../pg/pgClients.js';
|
|
4
|
+
import init from '../../pg/funcs/init.js';
|
|
5
|
+
|
|
6
|
+
import build from '../../helper.js';
|
|
7
|
+
import config from '../config.js';
|
|
8
|
+
|
|
9
|
+
test('api table', async (t) => {
|
|
10
|
+
const app = await build(t);
|
|
11
|
+
await init(pgClients.client);
|
|
12
|
+
|
|
13
|
+
const bbox = '20.276526313524393 40.6651677831094,35.27752631352439 50.66616778310941';
|
|
14
|
+
const { count = 0 } = await pgClients.client.query(`select count(*) from gis.dataset
|
|
15
|
+
where geom && 'box(${bbox})'::box2d`)
|
|
16
|
+
.then((res) => res.rows[0] || {});
|
|
17
|
+
|
|
18
|
+
await t.test('GET /data (meta bbox / cls)', async () => {
|
|
19
|
+
const res = await app.inject({
|
|
20
|
+
method: 'GET',
|
|
21
|
+
url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}`,
|
|
22
|
+
});
|
|
23
|
+
const json = res.json();
|
|
24
|
+
assert.ok(json?.rows?.length === +count, 'meta bbox - not ok');
|
|
25
|
+
assert.ok(json?.rows?.[0]?.dataset_id_text, 'meta cls - not ok');
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
/* await t.test('GET /suggest', async () => {
|
|
29
|
+
const res = await app.inject({
|
|
30
|
+
method: 'GET',
|
|
31
|
+
url: '/api/suggest/test.storage.data',
|
|
32
|
+
});
|
|
33
|
+
// console.log(res?.body);
|
|
34
|
+
const rep = JSON.parse(res?.body);
|
|
35
|
+
// console.log(rep.total);
|
|
36
|
+
assert.ok(rep.total);
|
|
37
|
+
}); */
|
|
38
|
+
/* await t.test('GET /data', async () => {
|
|
39
|
+
const res = await app.inject({
|
|
40
|
+
method: 'GET',
|
|
41
|
+
url: '/api/data/test.dataset.table',
|
|
42
|
+
});
|
|
43
|
+
// console.log(res);
|
|
44
|
+
const rep = JSON.parse(res?.body);
|
|
45
|
+
// console.log(rep.total);
|
|
46
|
+
assert.ok(rep.total);
|
|
47
|
+
}); */
|
|
48
|
+
/* await t.test('GET /search', async () => {
|
|
49
|
+
const res = await app.inject({
|
|
50
|
+
method: 'GET',
|
|
51
|
+
url: '/api/search?table=test.dataset.table&key=0',
|
|
52
|
+
});
|
|
53
|
+
const rep = JSON.parse(res?.body);
|
|
54
|
+
assert.ok(rep.total);
|
|
55
|
+
}); */
|
|
56
|
+
await t.test('GET /form', async () => {
|
|
57
|
+
const res = await app.inject({
|
|
58
|
+
method: 'GET',
|
|
59
|
+
url: '/api/form/test.dataset.form',
|
|
60
|
+
});
|
|
61
|
+
// console.log(res);
|
|
62
|
+
const rep = JSON.parse(res?.body);
|
|
63
|
+
// console.log(rep.total);
|
|
64
|
+
assert.ok(rep);
|
|
65
|
+
});
|
|
66
|
+
await t.test('GET /filter', async () => {
|
|
67
|
+
const res = await app.inject({
|
|
68
|
+
method: 'GET',
|
|
69
|
+
url: '/api/filter/test.dataset.table',
|
|
70
|
+
});
|
|
71
|
+
// console.log(res);
|
|
72
|
+
const rep = JSON.parse(res?.body);
|
|
73
|
+
// console.log(rep.total);
|
|
74
|
+
assert.ok(rep);
|
|
75
|
+
});
|
|
76
|
+
});
|