@opengis/cms 0.0.61 → 0.0.62

package/server/routes/feedback/controllers/feedback.js

@@ -1,49 +1,49 @@
-import { pgClients, dataInsert, config } from '@opengis/fastify-table/utils.js';
-
-const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
-
-function checkReferer(headers) {
-    if (config?.local) return true;
-    if (!headers?.referer) return false;
-    return refererAllow.some(allowed => headers.referer.includes(allowed));
-}
-
-export default async function feedback({ body = {}, pg = pgClients.client, headers, params }, reply) {
-    reply
-        .header('Access-Control-Allow-Origin', '*')
-        .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-        .header('Access-Control-Allow-Headers', 'Content-Type');
-
-    if (!checkReferer(headers)) {
-        return reply.status(403).send('access restricted');
-    }
-
-    if ((params?.type !== 'vacancy') && (!body?.message_text || !body?.email)) {
-        return reply.status(400).send('message_text and email is required');
-    }
-
-    if ((params?.type === 'vacancy') && !body?.user_name) {
-        return reply.status(400).send('user_name is required');
-    }
-
-    const allowedFields = ['title', 'message_text', 'email', 'phone', 'user_name', 'resume_link', 'linkedin_link', 'portfolio_link', 'telegram_link'];
-    const data = Object.fromEntries(
-        Object.entries(body).filter(([key]) => allowedFields.includes(key))
-    );
-    data["feedback_type"] = params?.type;
-
-    const { rows } = await dataInsert({
-        table: 'site.feedback',
-        data: {
-            ...data,
-            headers
-        },
-        pg
-    });
-
-    if (!rows?.length) {
-        return reply.status(500).send('insert error');
-    }
-
-    return reply.status(200).send('Звернення додано успішно');
+import { pgClients, dataInsert, config } from '@opengis/fastify-table/utils.js';
+
+const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
+
+function checkReferer(headers) {
+    if (config?.local) return true;
+    if (!headers?.referer) return false;
+    return refererAllow.some(allowed => headers.referer.includes(allowed));
+}
+
+export default async function feedback({ body = {}, pg = pgClients.client, headers, params }, reply) {
+    reply
+        .header('Access-Control-Allow-Origin', '*')
+        .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+        .header('Access-Control-Allow-Headers', 'Content-Type');
+
+    if (!checkReferer(headers)) {
+        return reply.status(403).send('access restricted');
+    }
+
+    if ((params?.type !== 'vacancy') && (!body?.message_text || !body?.email)) {
+        return reply.status(400).send('message_text and email is required');
+    }
+
+    if ((params?.type === 'vacancy') && !body?.user_name) {
+        return reply.status(400).send('user_name is required');
+    }
+
+    const allowedFields = ['title', 'message_text', 'email', 'phone', 'user_name', 'resume_link', 'linkedin_link', 'portfolio_link', 'telegram_link'];
+    const data = Object.fromEntries(
+        Object.entries(body).filter(([key]) => allowedFields.includes(key))
+    );
+    data["feedback_type"] = params?.type;
+
+    const { rows } = await dataInsert({
+        table: 'site.feedback',
+        data: {
+            ...data,
+            headers
+        },
+        pg
+    });
+
+    if (!rows?.length) {
+        return reply.status(500).send('insert error');
+    }
+
+    return reply.status(200).send('Звернення додано успішно');
 }

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

@@ -1,38 +1,38 @@
-import { getFilterSQL } from '@opengis/fastify-table/utils.js';
-
-export default async function feedbackList(req, reply) {
-    const { pg, user = {}, query } = req;
-    const { uid } = user;
-    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
-
-    const { page = 1, limit = 16, filter = null } = query;
-    const offset = limit * (page - 1) || 0;
-
-    const { q: filterQuery } = await getFilterSQL({
-        filter, table: 'site.feedback'
-    });
-
-    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from site.feedback`)
-
-    const { rows = [] } = await pg.query(`
-        select 
-            row_number() over(order by created_at desc) as num,
-            email,
-            message_id,
-            user_name,
-            message_text,
-            feedback_type,
-            phone,
-            created_at,
-            linkedin_link,
-            portfolio_link,
-            telegram_link
-        from site.feedback
-        where created_at is not null ${filterQuery ? `and ${filterQuery}` : ''}
-        order by created_at desc
-        limit ${limit} offset ${offset}
-        `);
-
-    const status = rows?.length ? 200 : 204;
-    return reply.code(status).send({ message: { total, filtered, rows }, status })
+import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+export default async function feedbackList(req, reply) {
+    const { pg, user = {}, query } = req;
+    const { uid } = user;
+    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
+
+    const { page = 1, limit = 16, filter = null } = query;
+    const offset = limit * (page - 1) || 0;
+
+    const { q: filterQuery } = await getFilterSQL({
+        filter, table: 'site.feedback'
+    });
+
+    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from site.feedback`)
+
+    const { rows = [] } = await pg.query(`
+        select 
+            row_number() over(order by created_at desc) as num,
+            email,
+            message_id,
+            user_name,
+            message_text,
+            feedback_type,
+            phone,
+            created_at,
+            linkedin_link,
+            portfolio_link,
+            telegram_link
+        from site.feedback
+        where created_at is not null ${filterQuery ? `and ${filterQuery}` : ''}
+        order by created_at desc
+        limit ${limit} offset ${offset}
+        `);
+
+    const status = rows?.length ? 200 : 204;
+    return reply.code(status).send({ message: { total, filtered, rows }, status })
 }

package/server/routes/feedback/controllers/news.subscriptions.js

@@ -1,44 +1,44 @@
-import { pgClients, config } from '@opengis/fastify-table/utils.js';
-
-const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
-
-function checkReferer(headers) {
-  if (config?.local) return true;
-  if (!headers?.referer) return false;
-  return refererAllow.some(allowed => headers.referer.includes(allowed));
-}
-
-export default async function subscribeToNews({
-  body = {},
-  pg = pgClients.client,
-  headers
-}, reply) {
-  reply
-    .header('Access-Control-Allow-Origin', '*')
-    .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-    .header('Access-Control-Allow-Headers', 'Content-Type');
-
-  if (!checkReferer(headers)) {
-    return reply.status(403).send('access restricted');
-  }
-
-  const { email } = body;
-  if (!email) return reply.status(400).send('email is required');
-
-  const { rows: subscriptions } = await pg.query(`
-    SELECT subscription_id
-    FROM site.subscription
-    WHERE email = $1
-    LIMIT 1
-  `, [email]);
-
-  if (subscriptions?.length === 0) {
-    await pg.query(`
-      INSERT INTO site.subscription (email)
-      VALUES ($1)
-    `, [email]);
-
-  } 
-
-  return reply.status(200).send('Успішно');
-}
+import { pgClients, config } from '@opengis/fastify-table/utils.js';
+
+const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
+
+function checkReferer(headers) {
+  if (config?.local) return true;
+  if (!headers?.referer) return false;
+  return refererAllow.some(allowed => headers.referer.includes(allowed));
+}
+
+export default async function subscribeToNews({
+  body = {},
+  pg = pgClients.client,
+  headers
+}, reply) {
+  reply
+    .header('Access-Control-Allow-Origin', '*')
+    .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+    .header('Access-Control-Allow-Headers', 'Content-Type');
+
+  if (!checkReferer(headers)) {
+    return reply.status(403).send('access restricted');
+  }
+
+  const { email } = body;
+  if (!email) return reply.status(400).send('email is required');
+
+  const { rows: subscriptions } = await pg.query(`
+    SELECT subscription_id
+    FROM site.subscription
+    WHERE email = $1
+    LIMIT 1
+  `, [email]);
+
+  if (subscriptions?.length === 0) {
+    await pg.query(`
+      INSERT INTO site.subscription (email)
+      VALUES ($1)
+    `, [email]);
+
+  } 
+
+  return reply.status(200).send('Успішно');
+}

package/server/routes/feedback/index.mjs

@@ -1,72 +1,72 @@
-import feedback from './controllers/feedback.js';
-import newsSubs from './controllers/news.subscriptions.js';
-import feedbackList from './controllers/feedback.list.js';
-import emailList from './controllers/email.list.js';
-
-export default async function route(fastify) {
-    fastify.route({
-        method: 'POST',
-        url: '/cms-feedback/:type',
-        handler: feedback,
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'GET',
-        url: '/feedback',
-        handler: feedbackList,
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'GET',
-        url: '/email-list',
-        handler: emailList,
-        config: {
-            policy: ['public'],
-        },
-    });
-    
-    fastify.route({
-        method: 'OPTIONS',
-        url: '/cms-feedback/:type',
-        handler: (req, reply) => {
-            reply
-                .header('Access-Control-Allow-Origin', '*')
-                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-                .header('Access-Control-Allow-Headers', 'Content-Type')
-                .send();
-        },
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'POST',
-        url: '/cms-subscribtion',
-        handler: newsSubs,
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'OPTIONS',
-        url: '/cms-subscribtion',
-        handler: (req, reply) => {
-            reply
-                .header('Access-Control-Allow-Origin', '*')
-                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-                .header('Access-Control-Allow-Headers', 'Content-Type')
-                .send();
-        },
-        config: {
-            policy: ['public'],
-        },
-    });
+import feedback from './controllers/feedback.js';
+import newsSubs from './controllers/news.subscriptions.js';
+import feedbackList from './controllers/feedback.list.js';
+import emailList from './controllers/email.list.js';
+
+export default async function route(fastify) {
+    fastify.route({
+        method: 'POST',
+        url: '/cms-feedback/:type',
+        handler: feedback,
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'GET',
+        url: '/feedback',
+        handler: feedbackList,
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'GET',
+        url: '/email-list',
+        handler: emailList,
+        config: {
+            policy: ['public'],
+        },
+    });
+    
+    fastify.route({
+        method: 'OPTIONS',
+        url: '/cms-feedback/:type',
+        handler: (req, reply) => {
+            reply
+                .header('Access-Control-Allow-Origin', '*')
+                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+                .header('Access-Control-Allow-Headers', 'Content-Type')
+                .send();
+        },
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'POST',
+        url: '/cms-subscribtion',
+        handler: newsSubs,
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'OPTIONS',
+        url: '/cms-subscribtion',
+        handler: (req, reply) => {
+            reply
+                .header('Access-Control-Allow-Origin', '*')
+                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+                .header('Access-Control-Allow-Headers', 'Content-Type')
+                .send();
+        },
+        config: {
+            policy: ['public'],
+        },
+    });
 }

package/server/routes/logs/controllers/export.user.logs.js

@@ -1,78 +1,78 @@
-import path from 'node:path';
-import { mkdir, writeFile } from 'node:fs/promises';
-import { createReadStream } from 'node:fs';
-import { config, getFolder, jsonToCsv, getFilterSQL } from '@opengis/fastify-table/utils.js';
-
-const rootDir = getFolder(config, 'local');
-
-export default async function exportUserLogs(req, reply) {
-    const { pg, query, user = {} } = req;
-    const { uid } = user;
-    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
-
-    const { filter = null } = query;
-
-    const { q: filterQuery } = await getFilterSQL({
-        filter, table: 'log.table_changes'
-    });
-
-    const { rows = [] } = await pg.query(`
-        select 
-        row_number() over(order by cdate desc) as num,
-        change_id,
-        change_type,
-        cdate,
-        entity_type,
-        entity_id,
-        b.data_log 
-        from log.table_changes a
-        left join lateral (
-            select json_agg(
-                row_to_json(q)
-                ) as data_log 
-            from log.table_changes_data q 
-            where change_id=a.change_id 
-            
-        )b on 1=1
-
-        where change_user_id='${uid}' 
-        ${filterQuery ? `and ${filterQuery}` : ''}
-        order by cdate desc
-    `);
-
-    const filePath = path.join(rootDir, `/files/tmp/logs_${uid}.csv`);
-    const ext = path.extname(filePath);
-    const filePathJSON = filePath.replace(ext, '.json');
-
-    await mkdir(path.dirname(filePathJSON), { recursive: true });
-    await writeFile(filePathJSON, JSON.stringify(rows));
-
-    await jsonToCsv({
-        filePath: filePathJSON,
-        colmodel: [
-            { name: 'num', title: '№', ua: '№' },
-            { name: 'change_id', title: 'Ідентифікатор зміни', ua: 'Ідентифікатор зміни' },
-            { name: 'change_type', title: 'Тип зміни', ua: 'Тип зміни' },
-            { name: 'cdate', title: 'Дата та час зміни', ua: 'Дата та час зміни' },
-            { name: 'entity_type', title: 'Тип об\'єкта', ua: 'Тип об\'єкта' },
-            { name: 'entity_id', title: 'Ідентифікатор об\'єкта', ua: 'Ідентифікатор об\'єкта' },
-            { name: 'data_log', title: 'Дані зміни', ua: 'Дані зміни' }
-        ],
-        columnList: [
-            'num',
-            'change_id',
-            'change_type',
-            'cdate',
-            'entity_type',
-            'entity_id',
-            'data_log'
-        ],
-    });
-
-    reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(filePath))}`);
-    reply.header('Content-Type', 'text/csv');
-
-    const fileStream = createReadStream(filePath);
-    return reply.send(fileStream);
-
+import path from 'node:path';
+import { mkdir, writeFile } from 'node:fs/promises';
+import { createReadStream } from 'node:fs';
+import { config, getFolder, jsonToCsv, getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+const rootDir = getFolder(config, 'local');
+
+export default async function exportUserLogs(req, reply) {
+    const { pg, query, user = {} } = req;
+    const { uid } = user;
+    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
+
+    const { filter = null } = query;
+
+    const { q: filterQuery } = await getFilterSQL({
+        filter, table: 'log.table_changes'
+    });
+
+    const { rows = [] } = await pg.query(`
+        select 
+        row_number() over(order by cdate desc) as num,
+        change_id,
+        change_type,
+        cdate,
+        entity_type,
+        entity_id,
+        b.data_log 
+        from log.table_changes a
+        left join lateral (
+            select json_agg(
+                row_to_json(q)
+                ) as data_log 
+            from log.table_changes_data q 
+            where change_id=a.change_id 
+            
+        )b on 1=1
+
+        where change_user_id='${uid}' 
+        ${filterQuery ? `and ${filterQuery}` : ''}
+        order by cdate desc
+    `);
+
+    const filePath = path.join(rootDir, `/files/tmp/logs_${uid}.csv`);
+    const ext = path.extname(filePath);
+    const filePathJSON = filePath.replace(ext, '.json');
+
+    await mkdir(path.dirname(filePathJSON), { recursive: true });
+    await writeFile(filePathJSON, JSON.stringify(rows));
+
+    await jsonToCsv({
+        filePath: filePathJSON,
+        colmodel: [
+            { name: 'num', title: '№', ua: '№' },
+            { name: 'change_id', title: 'Ідентифікатор зміни', ua: 'Ідентифікатор зміни' },
+            { name: 'change_type', title: 'Тип зміни', ua: 'Тип зміни' },
+            { name: 'cdate', title: 'Дата та час зміни', ua: 'Дата та час зміни' },
+            { name: 'entity_type', title: 'Тип об\'єкта', ua: 'Тип об\'єкта' },
+            { name: 'entity_id', title: 'Ідентифікатор об\'єкта', ua: 'Ідентифікатор об\'єкта' },
+            { name: 'data_log', title: 'Дані зміни', ua: 'Дані зміни' }
+        ],
+        columnList: [
+            'num',
+            'change_id',
+            'change_type',
+            'cdate',
+            'entity_type',
+            'entity_id',
+            'data_log'
+        ],
+    });
+
+    reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(filePath))}`);
+    reply.header('Content-Type', 'text/csv');
+
+    const fileStream = createReadStream(filePath);
+    return reply.send(fileStream);
+
 }

package/server/routes/logs/controllers/user.logs.js

@@ -1,45 +1,45 @@
-import { getFilterSQL } from '@opengis/fastify-table/utils.js';
-
-export default async function userLogs(req, reply) {
-    const { pg, user = {}, query } = req;
-    const { uid } = user;
-    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
-
-    const { page = 1, limit = 16, filter = null } = query;
-    const offset = limit * (page - 1) || 0;
-
-    const { q: filterQuery } = await getFilterSQL({
-        filter, table: 'log.table_changes', filterList: [{ name: 'cdate', type: 'date' }, { name: 'change_type', type: 'check' }]
-    });
-    //return filterData
-
-    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from log.table_changes where change_user_id=$1`, [uid])
-
-    const { rows = [] } = await pg.query(`
-        select 
-        row_number() over(order by cdate desc) as num,
-        change_id,
-        change_type,
-        cdate,
-        entity_type,
-        entity_id,
-        b.data_log 
-        from log.table_changes a
-        left join lateral (
-            select json_agg(
-                row_to_json(q)
-                ) as data_log 
-            from log.table_changes_data q 
-            where change_id=a.change_id 
-            
-        )b on 1=1
-
-        where change_user_id='${uid}' 
-        ${filterQuery ? `and ${filterQuery}` : ''}
-        order by cdate desc
-        limit ${limit} offset ${offset}
-        `);
-
-    const status = rows?.length ? 200 : 204;
-    return reply.code(status).send({ message: { total, filtered, rows }, status })
+import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+export default async function userLogs(req, reply) {
+    const { pg, user = {}, query } = req;
+    const { uid } = user;
+    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
+
+    const { page = 1, limit = 16, filter = null } = query;
+    const offset = limit * (page - 1) || 0;
+
+    const { q: filterQuery } = await getFilterSQL({
+        filter, table: 'log.table_changes', filterList: [{ name: 'cdate', type: 'date' }, { name: 'change_type', type: 'check' }]
+    });
+    //return filterData
+
+    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from log.table_changes where change_user_id=$1`, [uid])
+
+    const { rows = [] } = await pg.query(`
+        select 
+        row_number() over(order by cdate desc) as num,
+        change_id,
+        change_type,
+        cdate,
+        entity_type,
+        entity_id,
+        b.data_log 
+        from log.table_changes a
+        left join lateral (
+            select json_agg(
+                row_to_json(q)
+                ) as data_log 
+            from log.table_changes_data q 
+            where change_id=a.change_id 
+            
+        )b on 1=1
+
+        where change_user_id='${uid}' 
+        ${filterQuery ? `and ${filterQuery}` : ''}
+        order by cdate desc
+        limit ${limit} offset ${offset}
+        `);
+
+    const status = rows?.length ? 200 : 204;
+    return reply.code(status).send({ message: { total, filtered, rows }, status })
 }