@opengis/bi 1.2.32 → 1.2.34

package/server/routes/dashboard/controllers/dashboard.import.js

@@ -1,103 +1,103 @@
-import path from 'node:path';
-
-import {
-    config, logger, pgClients, getTemplate, getTemplatePath, dataInsert, dataUpdate,
-} from '@opengis/fastify-table/utils.js';
-
-export default async function dashboardImport({ pg = pgClients.client, query = {}, user = {} }, reply) {
-    const time = Date.now();
-
-    if (!query?.dashboard) {
-        return reply.status(400).send('not enough query params: dashboard');
-    }
-
-    const list = getTemplatePath('dashboard').filter(el => el[0] === query.dashboard);
-
-    if (!list?.length) {
-        return reply.status(404).send(`dashboard not found`);
-    }
-
-    const client = await pg.connect();
-    Object.assign(client, {
-        options: pg.options,
-        pk: pg.pk,
-        pgType: pg.pgType,
-        tlist: pg.tlist,
-    });
-
-    const ids = [];
-    try {
-        await client.query('BEGIN');
-        const rows = await Promise.all(list.map(async ([filename]) => {
-
-            const obj = await getTemplate('dashboard', filename);
-            const index = obj?.find((el) => el[0] === 'index.yml')?.[1];
-            const { db = pg.options?.database, description, filters, panels, table_name, title, tags, style, grid } = index || {};
-
-            const dashboardId = await dataInsert({
-                pg,
-                table: 'bi.dashboard',
-                data: {
-                    db,
-                    name: filename,
-                    description,
-                    filters,
-                    panels,
-                    table_name,
-                    title,
-                    words: tags?.join(','),
-                    style,
-                    grid,
-                    source: 'file',
-                },
-                uid: user?.uid,
-            }).then(el => el.rows?.[0]?.dashboard_id);
-            ids.push(dashboardId);
-
-            const widgetList = panels?.reduce((acc, curr) => {
-                curr.widgets?.forEach(item => acc.push(item));
-                if (curr.widget) acc.push(curr.widget);
-                return acc;
-            }, []).filter(el => el) || [];
-
-            const widgets = widgetList.length
-                ? await Promise.all(obj.filter(el => widgetList.includes(path.parse(el[0]).name)).map(async ([widget, widgetData]) => {
-                    const { ext, name } = path.parse(widget);
-                    const data = ext === '.yml' ? widgetData : { type: 'text', data: { text: widgetData } };
-                    Object.assign(data, { name, x: widgetData?.data?.x, table_name: widgetData?.data?.table, dashboard_id: dashboardId });
-
-                    const res = await dataInsert({
-                        pg: client,
-                        table: 'bi.widget',
-                        data,
-                        uid: user?.uid,
-                    }).then(el => el.rows?.[0] || {});
-                    return res;
-                }))
-                : [];
-            const test = await dataUpdate({
-                pg: client,
-                table: 'bi.dashboard',
-                id: dashboardId,
-                data: {
-                    widgets,
-                },
-                uid: user?.uid,
-            });
-            return { dashboardId, name: filename, widgets };
-        }));
-
-        await client.query('COMMIT');
-        return { time: Date.now() - time, rows };
-    } catch (err) {
-        await client.query('ROLLBACK');
-        if (ids.length) {
-            const { rowCount = 0 } = await pg.query('delete from bi.dashboard where dashboard_id = any($1)', [ids]);
-            console.log('ROLLBACK delete', rowCount, 'dashboard');
-            // const { rowCount: rowCount1 = 0 } = await pg.query('delete from bi.widget where dashboard_id = any($1)', [ids]);
-            // console.log('delete', rowCount1, 'widget');
-        }
-        logger.file('bi/dashboardImport/error', { error: err.toString(), stack: err.stack, ids });
-        return reply.status(500).send(config.debug ? err.toString() : 'import error');
-    }
-}
+import path from 'node:path';
+
+import {
+    config, logger, pgClients, getTemplate, getTemplatePath, dataInsert, dataUpdate,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function dashboardImport({ pg = pgClients.client, query = {}, user = {} }, reply) {
+    const time = Date.now();
+
+    if (!query?.dashboard) {
+        return reply.status(400).send('not enough query params: dashboard');
+    }
+
+    const list = getTemplatePath('dashboard').filter(el => el[0] === query.dashboard);
+
+    if (!list?.length) {
+        return reply.status(404).send(`dashboard not found`);
+    }
+
+    const client = await pg.connect();
+    Object.assign(client, {
+        options: pg.options,
+        pk: pg.pk,
+        pgType: pg.pgType,
+        tlist: pg.tlist,
+    });
+
+    const ids = [];
+    try {
+        await client.query('BEGIN');
+        const rows = await Promise.all(list.map(async ([filename]) => {
+
+            const obj = await getTemplate('dashboard', filename);
+            const index = obj?.find((el) => el[0] === 'index.yml')?.[1];
+            const { db = pg.options?.database, description, filters, panels, table_name, title, tags, style, grid } = index || {};
+
+            const dashboardId = await dataInsert({
+                pg,
+                table: 'bi.dashboard',
+                data: {
+                    db,
+                    name: filename,
+                    description,
+                    filters,
+                    panels,
+                    table_name,
+                    title,
+                    words: tags?.join(','),
+                    style,
+                    grid,
+                    source: 'file',
+                },
+                uid: user?.uid,
+            }).then(el => el.rows?.[0]?.dashboard_id);
+            ids.push(dashboardId);
+
+            const widgetList = panels?.reduce((acc, curr) => {
+                curr.widgets?.forEach(item => acc.push(item));
+                if (curr.widget) acc.push(curr.widget);
+                return acc;
+            }, []).filter(el => el) || [];
+
+            const widgets = widgetList.length
+                ? await Promise.all(obj.filter(el => widgetList.includes(path.parse(el[0]).name)).map(async ([widget, widgetData]) => {
+                    const { ext, name } = path.parse(widget);
+                    const data = ext === '.yml' ? widgetData : { type: 'text', data: { text: widgetData } };
+                    Object.assign(data, { name, x: widgetData?.data?.x, table_name: widgetData?.data?.table, dashboard_id: dashboardId });
+
+                    const res = await dataInsert({
+                        pg: client,
+                        table: 'bi.widget',
+                        data,
+                        uid: user?.uid,
+                    }).then(el => el.rows?.[0] || {});
+                    return res;
+                }))
+                : [];
+            const test = await dataUpdate({
+                pg: client,
+                table: 'bi.dashboard',
+                id: dashboardId,
+                data: {
+                    widgets,
+                },
+                uid: user?.uid,
+            });
+            return { dashboardId, name: filename, widgets };
+        }));
+
+        await client.query('COMMIT');
+        return { time: Date.now() - time, rows };
+    } catch (err) {
+        await client.query('ROLLBACK');
+        if (ids.length) {
+            const { rowCount = 0 } = await pg.query('delete from bi.dashboard where dashboard_id = any($1)', [ids]);
+            console.log('ROLLBACK delete', rowCount, 'dashboard');
+            // const { rowCount: rowCount1 = 0 } = await pg.query('delete from bi.widget where dashboard_id = any($1)', [ids]);
+            // console.log('delete', rowCount1, 'widget');
+        }
+        logger.file('bi/dashboardImport/error', { error: err.toString(), stack: err.stack, ids });
+        return reply.status(500).send(config.debug ? err.toString() : 'import error');
+    }
+}

package/server/routes/dashboard/controllers/dashboard.js

@@ -1,158 +1,158 @@
-import yaml from 'js-yaml';
-import {
-  pgClients,
-  getTemplatePath,
-  getTemplate,
-  getPGAsync,
-  getMeta,
-} from '@opengis/fastify-table/utils.js';
-
-export default async function dashboard({
-  pg: pg1 = pgClients.client, params = {},
-}) {
-  const time = Date.now();
-  const { id } = params;
-
-  if (!id) {
-    return { message: 'not enough params: dashboard required', status: 400 };
-  }
-  const dashboards = getTemplatePath('dashboard');
-
-  const fileDashboard = dashboards.find((el) => el[0] === id);
-  if (!fileDashboard) {
-    const sql = `select title, description, table_name, panels, grid, widgets, filters, style, words, db, public, updated_at as last_update 
-    from bi.dashboard where $1 in (dashboard_id, name)`;
-
-    const data = await pg1.query(sql, [id]).then(el => el.rows?.[0] || {});
-
-    let pg = pg1;
-    try {
-      const db = typeof data.db === 'string' && data.db.startsWith('{') ? JSON.parse(data.db) : { database: data.db };
-      pg = data.pg || (data.db ? await getPGAsync(db) : null) || pg1;
-    } catch (err) {
-      data.error = err.toString();
-    }
-
-    data.type = 'bd';
-    const { table_name: table } = data;
-
-    if (!table) {
-      return { message: 'not enough params: table required', status: 400 };
-    }
-
-    const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
-      'select body from admin.doc_template where doc_type=5 and title=$1',
-      [table]
-    ).then(el => el.rows?.[0]?.body) : null;
-
-    const sqlList = loadTemplate?.sql ? loadTemplate?.sql
-      ?.filter?.(el => !el.disabled && el?.sql?.replace)
-      ?.map?.((el, i) => `left join lateral (${el.sql.replace(/limit 1/ig, '')}) t${i} on 1=1`)?.join?.(' ') : '';
-
-    const { fields = [] } = table && pg.pk?.[loadTemplate?.table || table] ? await pg.query(`select * from ${loadTemplate?.table || table} t ${sqlList || ''} limit 0`) : {};
-
-    data?.widgets?.forEach?.(el => {
-      const { style, data = {}, type, title, x, metrics } = el;
-      el.yml = yaml.dump({ title, type, data: { x, metrics, ...data }, style, })
-      // el.yml = yaml.dump({ style, data, type, title });
-    });
-
-    data.panels?.forEach?.(el => {
-      const { title, type } = data?.widgets?.find(item => item.name === el.widget) || {};
-      Object.assign(el, { title, type });
-    });
-
-    const meta = table ? await getMeta({ pg, table: loadTemplate?.table || table }) : {};
-    const columnIndexes = meta?.columns?.reduce((acc, curr, idx) => Object.assign(acc, { [curr.name]: idx }), {}) || [];
-
-    const columns = fields?.map(el => ({ name: el.name, title: meta?.columns[columnIndexes[el.name]]?.title || el.name, type: pg.pgType?.[el.dataTypeID] }));
-
-    return {
-      ...data || {},
-      widgets: data?.widgets?.filter?.(el => el?.widget_id) || [],
-      panels: data?.panels?.filter?.(el => el?.widget) || [],
-      geom: !meta?.geom,
-      error:
-        table && !pg.pk?.[loadTemplate?.table || table] ? `table pkey not found: ${loadTemplate?.table || table}` : undefined,
-      table_name: table,
-      templateTable: loadTemplate?.table,
-      time: Date.now() - time,
-      columns,
-    };
-  }
-
-  const fileData = await getTemplate('dashboard', id);
-  const index = fileData.find((el) => el[0] === 'index.yml')[1];
-
-  if (!index) {
-    return { message: `not found ${id}`, status: 404 };
-  }
-
-  const data = index;
-  data.type = 'file';
-  const { table } = data?.data || { table: data?.table_name };
-
-  let pg = pg1;
-  try {
-    pg = data.pg || (data.db ? await getPGAsync(data.db) : null) || pg1;
-  } catch (err) {
-    data.error = err.toString();
-  }
-
-  const { fields = [] } = table ? await pg.query(`select * from ${table} limit 0`) : {};
-
-  const meta = await getMeta({ pg: pg1, table });
-
-  const columns = meta?.columns
-    ?.filter(el => fields.map(field => field.name).includes(el.name))
-    ?.map(el => ({ name: el.name, title: el.title, type: pg.pgType?.[el.dataTypeID] }));
-
-  const checks = index?.filters?.filter((el) => el?.id && fields.map((el) => el?.name).includes(el?.id) && el?.type === 'Check');
-  if (checks?.length) {
-    await Promise.all(checks.map(async (el) => {
-      if (el?.data) {
-        const options = await getTemplate('cls', el.data);
-        Object.assign(el, { options });
-      } else if (index?.table_name || index?.table) {
-        const { rows = [] } = await pg.query(`select "${el.id}" as id, count(*) from ${index?.table_name || index?.table} group by "${el.id}"`);
-        Object.assign(el, { options: rows });
-      }
-    }));
-  }
-  const ranges = index?.filters?.filter((el) => el?.id && fields.map((el) => el?.name).includes(el?.id) && el?.type === 'Range');
-  if (ranges?.length) {
-    await Promise.all(ranges.map(async (el) => {
-      const rows = await pg.query(`select array[
-        percentile_cont(0) within group (order by ${el.id}), percentile_cont(0.25) within group (order by ${el.id}), 
-        percentile_cont(0.5) within group (order by ${el.id}), percentile_cont(0.75) within group (order by ${el.id}), 
-        percentile_cont(1.0) within group (order by ${el.id})
-      ] from ${index?.table_name || index?.table}`).then(el => el.rows?.[0]?.array || []);
-      Object.assign(el, { options: rows });
-    }));
-  }
-
-  // console.log(fileData)
-  const widgets = fileData
-    .filter((el) => el[0] !== 'index.yml')
-    .map((el) =>
-      el[1].data
-        ? {
-          name: el[0].split('.')[0],
-          type: el[1].type,
-          title: el[1].title,
-          style: el[1].style,
-          data: el[1].data,
-
-        }
-        : { name: el[0].split('.')[0], title: el[1] }
-    );
-
-  return {
-    ...data,
-    geom: !!meta?.geom,
-    table_name: table,
-    time: Date.now() - time,
-    columns,
-    widgets,
-  };
-}
+import yaml from 'js-yaml';
+import {
+  pgClients,
+  getTemplatePath,
+  getTemplate,
+  getPGAsync,
+  getMeta,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function dashboard({
+  pg: pg1 = pgClients.client, params = {},
+}) {
+  const time = Date.now();
+  const { id } = params;
+
+  if (!id) {
+    return { message: 'not enough params: dashboard required', status: 400 };
+  }
+  const dashboards = getTemplatePath('dashboard');
+
+  const fileDashboard = dashboards.find((el) => el[0] === id);
+  if (!fileDashboard) {
+    const sql = `select title, description, table_name, panels, grid, widgets, filters, style, words, db, public, updated_at as last_update 
+    from bi.dashboard where $1 in (dashboard_id, name)`;
+
+    const data = await pg1.query(sql, [id]).then(el => el.rows?.[0] || {});
+
+    let pg = pg1;
+    try {
+      const db = typeof data.db === 'string' && data.db.startsWith('{') ? JSON.parse(data.db) : { database: data.db };
+      pg = data.pg || (data.db ? await getPGAsync(db) : null) || pg1;
+    } catch (err) {
+      data.error = err.toString();
+    }
+
+    data.type = 'bd';
+    const { table_name: table } = data;
+
+    if (!table) {
+      return { message: 'not enough params: table required', status: 400 };
+    }
+
+    const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
+      'select body from admin.doc_template where doc_type=5 and title=$1',
+      [table]
+    ).then(el => el.rows?.[0]?.body) : null;
+
+    const sqlList = loadTemplate?.sql ? loadTemplate?.sql
+      ?.filter?.(el => !el.disabled && el?.sql?.replace)
+      ?.map?.((el, i) => `left join lateral (${el.sql.replace(/limit 1/ig, '')}) t${i} on 1=1`)?.join?.(' ') : '';
+
+    const { fields = [] } = table && pg.pk?.[loadTemplate?.table || table] ? await pg.query(`select * from ${loadTemplate?.table || table} t ${sqlList || ''} limit 0`) : {};
+
+    data?.widgets?.forEach?.(el => {
+      const { style, data = {}, type, title, x, metrics } = el;
+      el.yml = yaml.dump({ title, type, data: { x, metrics, ...data }, style, })
+      // el.yml = yaml.dump({ style, data, type, title });
+    });
+
+    data.panels?.forEach?.(el => {
+      const { title, type } = data?.widgets?.find(item => item.name === el.widget) || {};
+      Object.assign(el, { title, type });
+    });
+
+    const meta = table ? await getMeta({ pg, table: loadTemplate?.table || table }) : {};
+    const columnIndexes = meta?.columns?.reduce((acc, curr, idx) => Object.assign(acc, { [curr.name]: idx }), {}) || [];
+
+    const columns = fields?.map(el => ({ name: el.name, title: meta?.columns[columnIndexes[el.name]]?.title || el.name, type: pg.pgType?.[el.dataTypeID] }));
+
+    return {
+      ...data || {},
+      widgets: data?.widgets?.filter?.(el => el?.widget_id) || [],
+      panels: data?.panels?.filter?.(el => el?.widget) || [],
+      geom: !meta?.geom,
+      error:
+        table && !pg.pk?.[loadTemplate?.table || table] ? `table pkey not found: ${loadTemplate?.table || table}` : undefined,
+      table_name: table,
+      templateTable: loadTemplate?.table,
+      time: Date.now() - time,
+      columns,
+    };
+  }
+
+  const fileData = await getTemplate('dashboard', id);
+  const index = fileData.find((el) => el[0] === 'index.yml')[1];
+
+  if (!index) {
+    return { message: `not found ${id}`, status: 404 };
+  }
+
+  const data = index;
+  data.type = 'file';
+  const { table } = data?.data || { table: data?.table_name };
+
+  let pg = pg1;
+  try {
+    pg = data.pg || (data.db ? await getPGAsync(data.db) : null) || pg1;
+  } catch (err) {
+    data.error = err.toString();
+  }
+
+  const { fields = [] } = table ? await pg.query(`select * from ${table} limit 0`) : {};
+
+  const meta = await getMeta({ pg: pg1, table });
+
+  const columns = meta?.columns
+    ?.filter(el => fields.map(field => field.name).includes(el.name))
+    ?.map(el => ({ name: el.name, title: el.title, type: pg.pgType?.[el.dataTypeID] }));
+
+  const checks = index?.filters?.filter((el) => el?.id && fields.map((el) => el?.name).includes(el?.id) && el?.type === 'Check');
+  if (checks?.length) {
+    await Promise.all(checks.map(async (el) => {
+      if (el?.data) {
+        const options = await getTemplate('cls', el.data);
+        Object.assign(el, { options });
+      } else if (index?.table_name || index?.table) {
+        const { rows = [] } = await pg.query(`select "${el.id}" as id, count(*) from ${index?.table_name || index?.table} group by "${el.id}"`);
+        Object.assign(el, { options: rows });
+      }
+    }));
+  }
+  const ranges = index?.filters?.filter((el) => el?.id && fields.map((el) => el?.name).includes(el?.id) && el?.type === 'Range');
+  if (ranges?.length) {
+    await Promise.all(ranges.map(async (el) => {
+      const rows = await pg.query(`select array[
+        percentile_cont(0) within group (order by ${el.id}), percentile_cont(0.25) within group (order by ${el.id}), 
+        percentile_cont(0.5) within group (order by ${el.id}), percentile_cont(0.75) within group (order by ${el.id}), 
+        percentile_cont(1.0) within group (order by ${el.id})
+      ] from ${index?.table_name || index?.table}`).then(el => el.rows?.[0]?.array || []);
+      Object.assign(el, { options: rows });
+    }));
+  }
+
+  // console.log(fileData)
+  const widgets = fileData
+    .filter((el) => el[0] !== 'index.yml')
+    .map((el) =>
+      el[1].data
+        ? {
+          name: el[0].split('.')[0],
+          type: el[1].type,
+          title: el[1].title,
+          style: el[1].style,
+          data: el[1].data,
+
+        }
+        : { name: el[0].split('.')[0], title: el[1] }
+    );
+
+  return {
+    ...data,
+    geom: !!meta?.geom,
+    table_name: table,
+    time: Date.now() - time,
+    columns,
+    widgets,
+  };
+}

package/server/routes/dashboard/controllers/dashboard.list.js

@@ -1,60 +1,60 @@
-import { pgClients, getTemplatePath, getTemplate, getTemplateSync } from '@opengis/fastify-table/utils.js';
-
-const dirContent = getTemplatePath('dashboard').map(([filename, filepath]) => {
-  const obj = getTemplateSync('dashboard', filename);
-  const index = obj?.find?.((el) => el[0] === 'index.yml')?.[1];
-  const { table_name, description, title } = index || {};
-
-  return { name: filename, path: filepath, type: 'file', title, description, table_name };
-});
-
-const maxLimit = 100;
-
-export default async function dashboardList({
-  pg = pgClients.client, query = {}, user = {}
-}) {
-  const time = Date.now();
-  const { type = 'file', page, search, sql } = query;
-
-  const limit = Math.min(maxLimit, +(query.limit || 15));
-  const offset = page && page > 0 ? (page - 1) * limit : 0;
-
-  const dir = type === 'file' ? dirContent : [];
-
-  const where = [search ? `lower(title) ~ $1` : null, type === 'viewer' ? `left(table_name,5)='demo.'` : null].filter(Boolean).join(' and ') || 'true';
-  const q1 = `select count(*)::int as total, count(*) filter(where ${where})::int as filtered from bi.dashboard`;
-
-  const q = `select dashboard_id as name, 'db' as type, title, description, table_name, words, public, updated_at as last_update from bi.dashboard where ${where} limit ${limit} offset ${offset}`;
-
-  if (user?.user_type?.includes('admin') && ['db', 'viewer'].includes(type) && sql) {
-    return `${q1};${q}`;
-  }
-
-  const args = [search].filter(Boolean);
-  const { total = 0, filtered = 0 } = ['db', 'viewer'].includes(type) ? await pg.query(q1, args).then(el => el.rows?.[0] || {}) : {};
-
-  const rows = ['db', 'viewer'].includes(type) ? await pg.query(q, args).then(el => el.rows || []) : [];
-
-  if (type === 'viewer') {
-    return {
-      time: Date.now() - time,
-      db: pg.options?.database,
-      total,
-      filtered,
-      count: rows.length,
-      rows,
-    };
-  }
-
-  const list = (user?.user_type?.includes('admin') ? dir : dir.map(el => ({ ...el, path: undefined }))).concat(rows);
-
-  const res = {
-    time: Date.now() - time,
-    db: pg.options?.database,
-    total,
-    filtered,
-    count: rows.length,
-    rows: list,
-  };
-  return res;
-}
+import { pgClients, getTemplatePath, getTemplate, getTemplateSync } from '@opengis/fastify-table/utils.js';
+
+const dirContent = getTemplatePath('dashboard').map(([filename, filepath]) => {
+  const obj = getTemplateSync('dashboard', filename);
+  const index = obj?.find?.((el) => el[0] === 'index.yml')?.[1];
+  const { table_name, description, title } = index || {};
+
+  return { name: filename, path: filepath, type: 'file', title, description, table_name };
+});
+
+const maxLimit = 100;
+
+export default async function dashboardList({
+  pg = pgClients.client, query = {}, user = {}
+}) {
+  const time = Date.now();
+  const { type = 'file', page, search, sql } = query;
+
+  const limit = Math.min(maxLimit, +(query.limit || 15));
+  const offset = page && page > 0 ? (page - 1) * limit : 0;
+
+  const dir = type === 'file' ? dirContent : [];
+
+  const where = [search ? `lower(title) ~ $1` : null, type === 'viewer' ? `left(table_name,5)='demo.'` : null].filter(Boolean).join(' and ') || 'true';
+  const q1 = `select count(*)::int as total, count(*) filter(where ${where})::int as filtered from bi.dashboard`;
+
+  const q = `select dashboard_id as name, 'db' as type, title, description, table_name, words, public, updated_at as last_update from bi.dashboard where ${where} limit ${limit} offset ${offset}`;
+
+  if (user?.user_type?.includes('admin') && ['db', 'viewer'].includes(type) && sql) {
+    return `${q1};${q}`;
+  }
+
+  const args = [search].filter(Boolean);
+  const { total = 0, filtered = 0 } = ['db', 'viewer'].includes(type) ? await pg.query(q1, args).then(el => el.rows?.[0] || {}) : {};
+
+  const rows = ['db', 'viewer'].includes(type) ? await pg.query(q, args).then(el => el.rows || []) : [];
+
+  if (type === 'viewer') {
+    return {
+      time: Date.now() - time,
+      db: pg.options?.database,
+      total,
+      filtered,
+      count: rows.length,
+      rows,
+    };
+  }
+
+  const list = (user?.user_type?.includes('admin') ? dir : dir.map(el => ({ ...el, path: undefined }))).concat(rows);
+
+  const res = {
+    time: Date.now() - time,
+    db: pg.options?.database,
+    total,
+    filtered,
+    count: rows.length,
+    rows: list,
+  };
+  return res;
+}