@opengis/fastify-table 1.0.36 → 1.0.37

package/test/funcs/notification.test.js

@@ -1,31 +1,31 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-import config from '../config.js';
-
-import addNotification from '../../notification/funcs/addNotification.js';
-
-import pgClients from '../../pg/pgClients.js';
-
-test('notification funcs', async (t) => {
-  await build(t);
-  const pg = pgClients.client;
-  let resp;
-  await t.test('addNotification', async () => {
-    resp = await addNotification({
-      pg,
-
-      title: 'test title',
-      body: 'test body',
-      link: 'http://link',
-      notificationType: 'mention',
-      uid: config.testUser?.uid || '1',
-    });
-    assert.ok(resp.id);
-  });
-  await t.test('clean up after test, before pool is closed', async () => {
-    await pg.query('delete from crm.notification where notification_id=$1', [resp.id]);
-    console.log(resp.id, 'deleted');
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+import config from '../config.js';
+
+import addNotification from '../../notification/funcs/addNotification.js';
+
+import pgClients from '../../pg/pgClients.js';
+
+test('notification funcs', async (t) => {
+  await build(t);
+  const pg = pgClients.client;
+  let resp;
+  await t.test('addNotification', async () => {
+    resp = await addNotification({
+      pg,
+
+      title: 'test title',
+      body: 'test body',
+      link: 'http://link',
+      notificationType: 'mention',
+      uid: config.testUser?.uid || '1',
+    });
+    assert.ok(resp.id);
+  });
+  await t.test('clean up after test, before pool is closed', async () => {
+    await pg.query('delete from crm.notification where notification_id=$1', [resp.id]);
+    console.log(resp.id, 'deleted');
+  });
+});

package/widget/controllers/utils/historyFormat.js

@@ -1,76 +1,76 @@
-import { readdir } from 'fs/promises';
-import { existsSync, readFileSync } from 'fs';
-
-// import getTemplate from '../../../table/controllers/utils/getTemplate.js';
-import getSelect from '../../../table/controllers/utils/getSelect.js';
-
-const dbData = {};
-
-// from config??
-const allTemplates = { table: {} };
-
-const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
-from pg_attribute a
-left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-JOIN pg_class AS i
-  ON i.oid = a.attrelid 
-JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
-where a.attnum > 0 
-and not a.attisdropped
-group by nspname||'.'||relname`;
-
-export default async function historyFormat(rows, table, pg) {
-  if (!rows?.[0]?.changes) return rows; // old structure
-  // on startup
-  if (!allTemplates.table.length) {
-    const templateDir = './server/templates/table';
-    const templates = existsSync(templateDir) ? await readdir(templateDir) : [];
-    templates.forEach((template) => {
-      const body = JSON.parse(readFileSync(`${templateDir}/${template}`) || '{}');
-      Object.assign(allTemplates.table, { [template]: body });
-    });
-  }
-
-  const progrid = Object.keys(allTemplates.table).find((key) => key.replace('.json', '') === table);
-  if (!progrid) return rows;
-  // const body = await getTemplate('table', progrid);
-  const body = allTemplates.table[progrid];
-  const tableName = body?.table || table;
-  if (!tableName) return rows;
-
-  // get DB column description
-  if (!dbData?.[body.table]?.length) {
-    const { rows: rows1 } = await pg.query(historyQ);
-    rows1.forEach((row) => {
-      dbData[row.table_name] = row.columns;
-    });
-  }
-
-  // rewrite!!!
-  await Promise.all(rows?.map(async (op) => {
-    op.changes?.map(async (el) => {
-      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[body?.table]?.find((col1) => col1.name === el.attr);
-      if (el.attr === 'geom') {
-        el.title = 'Геометрія';
-      }
-      el.title = col?.ua || col?.title || el.attr;
-      if (!col) return;
-      el.type = col.type;
-      el.format = col.format;
-      const select = col.data || col.option || col.select;
-
-      // getSelect not equals to node
-      if (select && false) {
-        el.select = select;
-        const cls = await getSelect(select, {
-          val: [el.old, el.new],
-        });
-
-        el.oldf = cls[0] || el.old;
-        el.newf = cls[1] || el.new;
-      }
-    });
-  }));
-
-  return rows;
-}
+import { readdir } from 'fs/promises';
+import { existsSync, readFileSync } from 'fs';
+
+// import getTemplate from '../../../table/controllers/utils/getTemplate.js';
+import getSelect from '../../../table/controllers/utils/getSelect.js';
+
+const dbData = {};
+
+// from config??
+const allTemplates = { table: {} };
+
+const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
+from pg_attribute a
+left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+JOIN pg_class AS i
+  ON i.oid = a.attrelid 
+JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
+where a.attnum > 0 
+and not a.attisdropped
+group by nspname||'.'||relname`;
+
+export default async function historyFormat(rows, table, pg) {
+  if (!rows?.[0]?.changes) return rows; // old structure
+  // on startup
+  if (!allTemplates.table.length) {
+    const templateDir = './server/templates/table';
+    const templates = existsSync(templateDir) ? await readdir(templateDir) : [];
+    templates.forEach((template) => {
+      const body = JSON.parse(readFileSync(`${templateDir}/${template}`) || '{}');
+      Object.assign(allTemplates.table, { [template]: body });
+    });
+  }
+
+  const progrid = Object.keys(allTemplates.table).find((key) => key.replace('.json', '') === table);
+  if (!progrid) return rows;
+  // const body = await getTemplate('table', progrid);
+  const body = allTemplates.table[progrid];
+  const tableName = body?.table || table;
+  if (!tableName) return rows;
+
+  // get DB column description
+  if (!dbData?.[body.table]?.length) {
+    const { rows: rows1 } = await pg.query(historyQ);
+    rows1.forEach((row) => {
+      dbData[row.table_name] = row.columns;
+    });
+  }
+
+  // rewrite!!!
+  await Promise.all(rows?.map(async (op) => {
+    op.changes?.map(async (el) => {
+      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[body?.table]?.find((col1) => col1.name === el.attr);
+      if (el.attr === 'geom') {
+        el.title = 'Геометрія';
+      }
+      el.title = col?.ua || col?.title || el.attr;
+      if (!col) return;
+      el.type = col.type;
+      el.format = col.format;
+      const select = col.data || col.option || col.select;
+
+      // getSelect not equals to node
+      if (select && false) {
+        el.select = select;
+        const cls = await getSelect(select, {
+          val: [el.old, el.new],
+        });
+
+        el.oldf = cls[0] || el.old;
+        el.newf = cls[1] || el.new;
+      }
+    });
+  }));
+
+  return rows;
+}

package/widget/controllers/utils/obj2db.js

@@ -1,13 +1,13 @@
-export default function obj2db(data, nonexistCol) {
-  if (
-    typeof data !== 'object'
-        || Array.isArray(data)
-        || !Object.keys(data || {}).length
-  ) return { error: 'invalid data type' };
-
-  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
-  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
-  const args = columns?.map((col) => data[col]);
-
-  return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };
-}
+export default function obj2db(data, nonexistCol) {
+  if (
+    typeof data !== 'object'
+        || Array.isArray(data)
+        || !Object.keys(data || {}).length
+  ) return { error: 'invalid data type' };
+
+  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
+  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
+  const args = columns?.map((col) => data[col]);
+
+  return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };
+}

package/widget/controllers/widget.del.js

@@ -1,41 +1,44 @@
-/**
- * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
- *
- * @method DELETE
- * @summary CRM дані для обраного віджета.
- * @priority 2
- * @tag table
- * @type api
- * @requires setTokenById
- * @requires getSelect
- * @param {String} id Ідентифікатор для хешування
- * @param {Any} sql Використовується для повернення sql запиту
- * @param {String} type Тип для хешування даних
- * @errors 400, 500
- * @returns {Number} status Номер помилки
- * @returns {String|Object} error Опис помилки
- * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
- */
-
-export default async function widgetDel({
-  pg, params = {}, session = {},
-}) {
-  const { user = {} } = session.passport || {};
-  if (!user.uid) return { error: 'access restricted', status: 403 };
-  const { type, objectid, id } = params;
-  if (!['comment', 'checklist', 'file'].includes(type)) return { error: 'type not valid', status: 401 };
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sql = {
-    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
-    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
-    file: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
-  };
-  try {
-    await pg.query(sql[type], [objectid, user.uid, id]);
-    return { data: { id }, user: { uid: user.uid, name: user.user_name } };
-  }
-  catch (err) {
-    return { message: err.toString(), status: 500 };
-  }
-}
+/**
+ * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
+ *
+ * @method DELETE
+ * @summary CRM дані для обраного віджета.
+ * @priority 2
+ * @tag table
+ * @type api
+ * @requires setTokenById
+ * @requires getSelect
+ * @param {String} id Ідентифікатор для хешування
+ * @param {Any} sql Використовується для повернення sql запиту
+ * @param {String} type Тип для хешування даних
+ * @errors 400, 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+
+export default async function widgetDel({
+  pg, params = {}, session = {},
+}) {
+  const { user = {} } = session.passport || {};
+  if (!user.uid) return { error: 'access restricted', status: 403 };
+  const { type, objectid, id } = params;
+
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sqls = {
+    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
+    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
+    file: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
+    gallery: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
+  };
+  const sql = sqls[type];
+  if (!sql) return { error: 'type not valid', status: 401 };
+  try {
+    await pg.query(sql, [objectid, user.uid, id]);
+    return { data: { id }, user: { uid: user.uid, name: user.user_name } };
+  }
+  catch (err) {
+    return { message: err.toString(), status: 500 };
+  }
+}

package/widget/controllers/widget.get.js

@@ -1,77 +1,86 @@
-import getToken from '../../crud/funcs/getToken.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import historyFormat from './utils/historyFormat.js';
-
-/**
- * Дістає CRM для widget
- *
- */
-
-export default async function widgetGet({
-  pg, session = {}, params = {}, query = {},
-}) {
-  const { user = {} } = session.passport || {};
-  console.log('test');
-
-  const param = user?.uid ? await getToken({
-    token: params.objectid, mode: 'w', uid: user.uid,
-  }) : null;
-
-  const objectid = param ? JSON.parse(param)?.id : params.objectid;
-
-  if (!['comment', 'history', 'file', 'checklist'].includes(params.type)) return { error: 'param type not valid', status: 400 };
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sql = {
-    comment: `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
-    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, avatar 
-    from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
-
-    history: `SELECT table_change_id, entity_id, entity_type, change_key, change_date, json_old, json_new, date_old, 
-    date_new, number_old, number_new, bool_old, bool_new, text_old, 
-    text_new, uid, cdate FROM log.table_changes where entity_id=$1 order by cdate desc, change_key limit 100`,
-
-    checklist: `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
-    avatar FROM crm.checklists c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
-
-    file: `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
-    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
-    avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 order by cdate desc`,
-
-  };
-  try {
-    /* data */
-    const time = [Date.now()];
-    const { rows } = await pg.query(sql[params.type], [objectid]);
-    time.push(Date.now());
-
-    /* Object info  */
-    const { tableName } = await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]);
-    const { pk } = await getMeta({ table: tableName });
-
-    const q = `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
-    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1`;
-    const data = pk ? await pg.one(q, [objectid]) : {};
-
-    if (query.debug && user?.user_type === 'admin') {
-      return {
-        sql, type: params.type, q, id: objectid, data,
-      };
-    }
-
-    time.push(Date.now());
-    return {
-      time: { data: time[1] - time[0], format: time[2] - time[1] },
-      rows: params.type === 'history' ? await historyFormat(rows, tableName, pg) : rows,
-      user: { uid: user?.uid, name: user?.user_name },
-      data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
-      objectid: params.objectid,
-    };
-  }
-  catch (err) {
-    // 'history', 'file',  'checklist'
-    /* 'document', 'image' - Макс на клиенте */
-    return { message: err.toString(), status: 500 };
-  }
-}
+import getToken from '../../crud/funcs/getToken.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import historyFormat from './utils/historyFormat.js';
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+/**
+ * Дістає CRM для widget
+ *
+ */
+
+export default async function widgetGet({
+  pg, session = {}, params = {}, query = {},
+}) {
+  const { user = {} } = session.passport || {};
+
+  const param = user?.uid ? await getToken({
+    token: params.objectid, mode: 'w', uid: user.uid,
+  }) : null;
+
+  const objectid = param ? JSON.parse(param)?.id : params.objectid;
+
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sqls = {
+    comment: `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
+    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, avatar 
+    from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
+
+    history: `SELECT table_change_id, entity_id, entity_type, change_key, change_date, json_old, json_new, date_old, 
+    date_new, number_old, number_new, bool_old, bool_new, text_old, 
+    text_new, uid, cdate FROM log.table_changes where entity_id=$1 order by cdate desc, change_key limit 100`,
+
+    checklist: `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
+    avatar FROM crm.checklists c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
+
+    file: `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
+    avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
+    where entity_id=$1 and file_status<>3 order by cdate desc`,
+    gallery: `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
+    avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
+    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
+
+  };
+  const sql = sqls[params.type];
+  if (!sql) {
+    return { error: 'param type not valid', status: 400 };
+  }
+
+  try {
+    /* data */
+    const time = [Date.now()];
+    const { rows } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
+    time.push(Date.now());
+
+    /* Object info  */
+    const { tableName } = await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]);
+    const { pk } = await getMeta({ table: tableName });
+
+    const q = `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
+    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1`;
+    const data = pk ? await pg.one(q, [objectid]) : {};
+
+    if (query.debug && user?.user_type === 'admin') {
+      return {
+        sql, type: params.type, q, id: objectid, data,
+      };
+    }
+
+    time.push(Date.now());
+    return {
+      time: { data: time[1] - time[0], format: time[2] - time[1] },
+      rows: params.type === 'history' ? await historyFormat(rows, tableName, pg) : rows,
+      user: { uid: user?.uid, name: user?.user_name },
+      data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
+      objectid: params.objectid,
+    };
+  }
+  catch (err) {
+    // 'history', 'file',  'checklist'
+    /* 'document', 'image' - Макс на клиенте */
+    return { message: err.toString(), status: 500 };
+  }
+}

package/widget/controllers/widget.set.js

@@ -1,64 +1,70 @@
-import path from 'path';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-import dataInsert from '../../crud/funcs/dataInsert.js';
-import dataUpdate from '../../crud/funcs/dataUpdate.js';
-
-const tableList = {
-  comment: 'crm.communications',
-  checklist: 'crm.checklists',
-};
-const pkList = {
-  comment: 'communication_id',
-  checklist: 'checklist_id',
-};
-
-export default async function widgetSet(req) {
-  const {
-    pg, params = {}, session = {}, body = {}, funcs, log,
-  } = req;
-  const { user = {} } = session.passport || {};
-  const { type, id, objectid } = params;
-  if (!['comment', 'checklist', 'file'].includes(type)) return { error: 'param type not valid', status: 400 };
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const table = tableList[type];
-
-  try {
-    if (type === 'file') {
-      const file = await funcs.uploadMultiPart(req);
-      const extName = path.extname(file.filepath).slice(1).toLowerCase();
-
-      const data = { 
-        uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
-        file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
-        ext: extName,
-        size: file?.size,
-        file_status: 1,
-        uid: user?.uid || 1,
-        entity_id: objectid,
-      };
-  
-      const { rows = [] } = await dataInsert({ table: 'crm.files', data });
-      return {
-        rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
-      };
-    }
-    const { pk } = await getMeta({ pg, table });
-    if (!pk) return { message: 'table not found', status: 404 };
-
-   const data = { ...body, uid: user?.uid, entity_id: objectid };
-
-    const result = id 
-    ? await dataUpdate({ table, data, id }) 
-    : await dataInsert({ table, data });
-
-    return {
-      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
-    };
-  }
-  catch (err) {
-    log.error('widget/upload', { error: err.toString(), params });
-    return { error: err.toString(), status: 500 };
-  }
-}
+import path from 'path';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+import dataInsert from '../../crud/funcs/dataInsert.js';
+import dataUpdate from '../../crud/funcs/dataUpdate.js';
+
+const tableList = {
+  comment: 'crm.communications',
+  checklist: 'crm.checklists',
+};
+const pkList = {
+  comment: 'communication_id',
+  checklist: 'checklist_id',
+};
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+export default async function widgetSet(req) {
+  const {
+    pg, params = {}, session = {}, body = {}, funcs, log,
+  } = req;
+  const { user = {} } = session.passport || {};
+  const { type, id, objectid } = params;
+  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { error: 'param type not valid', status: 400 };
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const table = tableList[type];
+
+  try {
+    if (['gallery', 'file'].includes(type)) {
+      const file = await funcs.uploadMultiPart(req);
+      const extName = path.extname(file.filepath).slice(1).toLowerCase();
+
+      const data = {
+        uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
+        file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
+        ext: extName,
+        size: file?.size,
+        file_status: 1,
+        uid: user?.uid || 1,
+        entity_id: objectid,
+      };
+
+      if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
+        return { message: 'invalid file extension', status: 400 };
+      }
+
+      const { rows = [] } = await dataInsert({ table: 'crm.files', data });
+      return {
+        rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
+      };
+    }
+    const { pk } = await getMeta({ pg, table });
+    if (!pk) return { message: 'table not found', status: 404 };
+
+    const data = { ...body, uid: user?.uid, entity_id: objectid };
+
+    const result = id
+      ? await dataUpdate({ table, data, id })
+      : await dataInsert({ table, data });
+
+    return {
+      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
+    };
+  }
+  catch (err) {
+    log.error('widget/upload', { error: err.toString(), params });
+    return { error: err.toString(), status: 500 };
+  }
+}