@opengis/pay 1.1.12 → 1.1.14

package/server/migrations/5_payments.sql

@@ -1,37 +1,37 @@
-create schema if not exists billing;
-
-CREATE TABLE if not exists billing.payments();
-alter table billing.payments drop constraint if exists billing_payments_payment_id_pkey cascade;
-alter table billing.payments drop constraint if exists billing_payments_payment_id_account_id_fkey cascade;
-
-alter table billing.payments add column if not exists payment_id text NOT NULL default next_id();
-alter table billing.payments add column if not exists account_id text;
-alter table billing.payments alter column account_id drop NOT NULL;
-alter table billing.payments add column if not exists payment_status text NOT NULL DEFAULT 'inprogress'::text;
-alter table billing.payments add column if not exists success_date timestamp with time zone;
-alter table billing.payments add column if not exists payment_data json;
-alter table billing.payments add column if not exists payment_amount numeric;
-alter table billing.payments add column if not exists total_balance numeric;
-alter table billing.payments add column if not exists referer_url text;
-alter table billing.payments add column if not exists cdate timestamp without time zone DEFAULT now();
-alter table billing.payments add column if not exists uid text NOT NULL;
-alter table billing.payments add column if not exists editor_id text;
-alter table billing.payments add column if not exists editor_date timestamp without time zone;
-alter table billing.payments add column if not exists files json;
-
-COMMENT ON TABLE billing.payments IS 'Платежі';
-COMMENT ON COLUMN billing.payments.payment_id IS 'ID';
-COMMENT ON COLUMN billing.payments.account_id IS 'ID акаунту клієнта';
-COMMENT ON COLUMN billing.payments.payment_status IS 'Статус транзації';
-COMMENT ON COLUMN billing.payments.success_date IS 'Дата успішного завершення транзакції';
-COMMENT ON COLUMN billing.payments.payment_data IS 'Дані від portmone';
-COMMENT ON COLUMN billing.payments.payment_amount IS 'Сума поповнення рахунку';
-COMMENT ON COLUMN billing.payments.total_balance IS 'Поточний баланс';
-COMMENT ON COLUMN billing.payments.referer_url IS 'Посилання';
-
-CREATE INDEX if not exists billing_payments_account_id_btree_idx ON billing.payments USING btree (account_id COLLATE pg_catalog."default");
-CREATE INDEX if not exists billing_payments_account_id_trgm_idx ON billing.payments USING gin (account_id COLLATE pg_catalog."default" gin_trgm_ops);
-CREATE INDEX if not exists billing_payments_payments_status_btree_idx ON billing.payments USING btree (payment_status COLLATE pg_catalog."default");
-
-alter table billing.payments add CONSTRAINT billing_payments_payment_id_pkey PRIMARY KEY (payment_id);
+create schema if not exists billing;
+
+CREATE TABLE if not exists billing.payments();
+alter table billing.payments drop constraint if exists billing_payments_payment_id_pkey cascade;
+alter table billing.payments drop constraint if exists billing_payments_payment_id_account_id_fkey cascade;
+
+alter table billing.payments add column if not exists payment_id text NOT NULL default next_id();
+alter table billing.payments add column if not exists account_id text;
+alter table billing.payments alter column account_id drop NOT NULL;
+alter table billing.payments add column if not exists payment_status text NOT NULL DEFAULT 'inprogress'::text;
+alter table billing.payments add column if not exists success_date timestamp with time zone;
+alter table billing.payments add column if not exists payment_data json;
+alter table billing.payments add column if not exists payment_amount numeric;
+alter table billing.payments add column if not exists total_balance numeric;
+alter table billing.payments add column if not exists referer_url text;
+alter table billing.payments add column if not exists cdate timestamp without time zone DEFAULT now();
+alter table billing.payments add column if not exists uid text NOT NULL;
+alter table billing.payments add column if not exists editor_id text;
+alter table billing.payments add column if not exists editor_date timestamp without time zone;
+alter table billing.payments add column if not exists files json;
+
+COMMENT ON TABLE billing.payments IS 'Платежі';
+COMMENT ON COLUMN billing.payments.payment_id IS 'ID';
+COMMENT ON COLUMN billing.payments.account_id IS 'ID акаунту клієнта';
+COMMENT ON COLUMN billing.payments.payment_status IS 'Статус транзації';
+COMMENT ON COLUMN billing.payments.success_date IS 'Дата успішного завершення транзакції';
+COMMENT ON COLUMN billing.payments.payment_data IS 'Дані від portmone';
+COMMENT ON COLUMN billing.payments.payment_amount IS 'Сума поповнення рахунку';
+COMMENT ON COLUMN billing.payments.total_balance IS 'Поточний баланс';
+COMMENT ON COLUMN billing.payments.referer_url IS 'Посилання';
+
+CREATE INDEX if not exists billing_payments_account_id_btree_idx ON billing.payments USING btree (account_id COLLATE pg_catalog."default");
+CREATE INDEX if not exists billing_payments_account_id_trgm_idx ON billing.payments USING gin (account_id COLLATE pg_catalog."default" gin_trgm_ops);
+CREATE INDEX if not exists billing_payments_payments_status_btree_idx ON billing.payments USING btree (payment_status COLLATE pg_catalog."default");
+
+alter table billing.payments add CONSTRAINT billing_payments_payment_id_pkey PRIMARY KEY (payment_id);
 alter table billing.payments add CONSTRAINT billing_payments_payment_id_account_id_fkey FOREIGN KEY (account_id) REFERENCES billing.accounts (account_id);

package/server/migrations/6_invoices.sql

@@ -1,55 +1,55 @@
-create schema if not exists billing;
-
-CREATE TABLE if not exists billing.invoices();
-alter table billing.invoices drop constraint if exists billing_invoices_invoice_id_pkey cascade;
-alter table billing.invoices drop constraint if exists billing_invoices_subscription_id_fkey cascade;
-
-alter table billing.invoices add column if not exists invoice_id text NOT NULL default next_id();
-alter table billing.invoices add column if not exists account_id text NOT NULL;
-alter table billing.invoices add column if not exists subscription_id text;
-alter table billing.invoices add column if not exists total_amount numeric;
-alter table billing.invoices add column if not exists cdate timestamp without time zone DEFAULT now();
-alter table billing.invoices add column if not exists uid text NOT NULL;
-alter table billing.invoices add column if not exists editor_id text;
-alter table billing.invoices add column if not exists editor_date timestamp without time zone;
-alter table billing.invoices add column if not exists files json;
-
-COMMENT ON TABLE billing.invoices IS 'Накладні (рахунки)';
-COMMENT ON COLUMN billing.invoices.invoice_id IS 'ID';
-COMMENT ON COLUMN billing.invoices.account_id IS 'ID акаунту клієнта';
-COMMENT ON COLUMN billing.invoices.total_amount IS 'Сума списання';
-COMMENT ON COLUMN billing.invoices.subscription_id IS 'ID підписки';
-
-CREATE TABLE if not exists billing.invoices_subscribe();
-alter table billing.invoices_subscribe drop constraint if exists billing_invoices_subscribe_id_pkey cascade;
-alter table billing.invoices_subscribe drop constraint if exists billing_invoices_subscribe_invoice_id_fkey cascade;
-
-alter table billing.invoices_subscribe add column if not exists is_id text NOT NULL default next_id();
-alter table billing.invoices_subscribe add column if not exists invoice_id text NOT NULL;
-alter table billing.invoices_subscribe add column if not exists list_price numeric not null default 0;
-alter table billing.invoices_subscribe add column if not exists dicsounts numeric not null default 0;
-alter table billing.invoices_subscribe add column if not exists amount_excl_tax numeric not null default 0;
-alter table billing.invoices_subscribe add column if not exists tax numeric not null default 0;
-alter table billing.invoices_subscribe add column if not exists amount numeric not null default 0;
-alter table billing.invoices_subscribe add column if not exists cdate timestamp without time zone DEFAULT now();
-alter table billing.invoices_subscribe add column if not exists uid text NOT NULL;
-alter table billing.invoices_subscribe add column if not exists editor_id text;
-alter table billing.invoices_subscribe add column if not exists editor_date timestamp without time zone;
-alter table billing.invoices_subscribe add column if not exists files json;
-
-COMMENT ON TABLE billing.invoices_subscribe IS 'Складові накладних (рахунків)';
-COMMENT ON COLUMN billing.invoices_subscribe.is_id IS 'ID';
-COMMENT ON COLUMN billing.invoices_subscribe.invoice_id IS 'ID накладної (рахунку)';
-COMMENT ON COLUMN billing.invoices_subscribe.list_price IS 'Встановлена вартість';
-COMMENT ON COLUMN billing.invoices_subscribe.dicsounts IS 'Знижка';
-COMMENT ON COLUMN billing.invoices_subscribe.amount_excl_tax IS 'Сума, без податків';
-COMMENT ON COLUMN billing.invoices_subscribe.tax IS 'Сума податків';
-COMMENT ON COLUMN billing.invoices_subscribe.amount IS 'Сума';
-
-alter table billing.invoices add CONSTRAINT billing_invoices_invoice_id_pkey PRIMARY KEY (invoice_id);
-alter table billing.invoices add CONSTRAINT billing_invoices_subscription_id_fkey FOREIGN KEY (subscription_id)
-REFERENCES billing.subscriptions (subscription_id);
-
-alter table billing.invoices_subscribe add CONSTRAINT billing_invoices_subscribe_id_pkey PRIMARY KEY (is_id);
-alter table billing.invoices_subscribe add CONSTRAINT billing_invoices_subscribe_invoice_id_fkey FOREIGN KEY (invoice_id)
+create schema if not exists billing;
+
+CREATE TABLE if not exists billing.invoices();
+alter table billing.invoices drop constraint if exists billing_invoices_invoice_id_pkey cascade;
+alter table billing.invoices drop constraint if exists billing_invoices_subscription_id_fkey cascade;
+
+alter table billing.invoices add column if not exists invoice_id text NOT NULL default next_id();
+alter table billing.invoices add column if not exists account_id text NOT NULL;
+alter table billing.invoices add column if not exists subscription_id text;
+alter table billing.invoices add column if not exists total_amount numeric;
+alter table billing.invoices add column if not exists cdate timestamp without time zone DEFAULT now();
+alter table billing.invoices add column if not exists uid text NOT NULL;
+alter table billing.invoices add column if not exists editor_id text;
+alter table billing.invoices add column if not exists editor_date timestamp without time zone;
+alter table billing.invoices add column if not exists files json;
+
+COMMENT ON TABLE billing.invoices IS 'Накладні (рахунки)';
+COMMENT ON COLUMN billing.invoices.invoice_id IS 'ID';
+COMMENT ON COLUMN billing.invoices.account_id IS 'ID акаунту клієнта';
+COMMENT ON COLUMN billing.invoices.total_amount IS 'Сума списання';
+COMMENT ON COLUMN billing.invoices.subscription_id IS 'ID підписки';
+
+CREATE TABLE if not exists billing.invoices_subscribe();
+alter table billing.invoices_subscribe drop constraint if exists billing_invoices_subscribe_id_pkey cascade;
+alter table billing.invoices_subscribe drop constraint if exists billing_invoices_subscribe_invoice_id_fkey cascade;
+
+alter table billing.invoices_subscribe add column if not exists is_id text NOT NULL default next_id();
+alter table billing.invoices_subscribe add column if not exists invoice_id text NOT NULL;
+alter table billing.invoices_subscribe add column if not exists list_price numeric not null default 0;
+alter table billing.invoices_subscribe add column if not exists dicsounts numeric not null default 0;
+alter table billing.invoices_subscribe add column if not exists amount_excl_tax numeric not null default 0;
+alter table billing.invoices_subscribe add column if not exists tax numeric not null default 0;
+alter table billing.invoices_subscribe add column if not exists amount numeric not null default 0;
+alter table billing.invoices_subscribe add column if not exists cdate timestamp without time zone DEFAULT now();
+alter table billing.invoices_subscribe add column if not exists uid text NOT NULL;
+alter table billing.invoices_subscribe add column if not exists editor_id text;
+alter table billing.invoices_subscribe add column if not exists editor_date timestamp without time zone;
+alter table billing.invoices_subscribe add column if not exists files json;
+
+COMMENT ON TABLE billing.invoices_subscribe IS 'Складові накладних (рахунків)';
+COMMENT ON COLUMN billing.invoices_subscribe.is_id IS 'ID';
+COMMENT ON COLUMN billing.invoices_subscribe.invoice_id IS 'ID накладної (рахунку)';
+COMMENT ON COLUMN billing.invoices_subscribe.list_price IS 'Встановлена вартість';
+COMMENT ON COLUMN billing.invoices_subscribe.dicsounts IS 'Знижка';
+COMMENT ON COLUMN billing.invoices_subscribe.amount_excl_tax IS 'Сума, без податків';
+COMMENT ON COLUMN billing.invoices_subscribe.tax IS 'Сума податків';
+COMMENT ON COLUMN billing.invoices_subscribe.amount IS 'Сума';
+
+alter table billing.invoices add CONSTRAINT billing_invoices_invoice_id_pkey PRIMARY KEY (invoice_id);
+alter table billing.invoices add CONSTRAINT billing_invoices_subscription_id_fkey FOREIGN KEY (subscription_id)
+REFERENCES billing.subscriptions (subscription_id);
+
+alter table billing.invoices_subscribe add CONSTRAINT billing_invoices_subscribe_id_pkey PRIMARY KEY (is_id);
+alter table billing.invoices_subscribe add CONSTRAINT billing_invoices_subscribe_invoice_id_fkey FOREIGN KEY (invoice_id)
 REFERENCES billing.invoices (invoice_id);

package/server/plugins/cron.js

@@ -0,0 +1,22 @@
+import { addCron, pgClients } from '@opengis/fastify-table/utils.js';
+
+import updateTrxStatus from '../routes/utils/portmone.check.status.js';
+
+async function updateOldTrxsStatus() {
+  const inprogress = pgClients.client.pk?.['billing.payments']
+    ? await pgClients.client.query(`select array_agg(payment_id) as inprogress from billing.payments 
+        where payment_status = 'inprogress' and (now() - cdate) > '1 hour'::interval`).then(el => el.rows?.[0]?.inprogress || [])
+    : [];
+
+  if (!inprogress?.length) return 'empty rows';
+
+  const res = await Promise.all(inprogress.map(async (paymentId) => {
+    const data = await updateTrxStatus({ paymentId });
+    return { paymentId, data };
+  }));
+  return res;
+}
+
+export default async function cron() {
+//   addCron(updateOldTrxsStatus, 60 * 60 * 24);
+}

package/server/routes/payment.info.js

@@ -0,0 +1,45 @@
+import { metaFormat, pgClients } from '@opengis/fastify-table/utils.js';
+
+/**
+ * Апі для отримання інформації за ID
+ *
+ * @method GET
+ * @alias paymentInfo
+ * @type api
+ * @param {String} params.id - ID платежу
+ * @returns {Number} status - номер помилки. Повертається, якщо була допущенна помилка в отриманих параметрах, або з бази. Це може бути 400 або 500
+ * @returns {String} error - опис помилки
+ * @returns {String} message - повідомлення про успішне виконання і передача певних даних або помилку
+ */
+
+export default async function paymentInfo({
+  pg = pgClients.client, user = {}, params = {},
+}) {
+  if (!user?.uid) {
+    return { message: 'unauthorized', status: 401 };
+  }
+
+  if (!params?.id) {
+    return { message: 'not enough query params: id', status: 400 };
+  }
+
+  const { rows = [] } = await pg.query(`select 
+    payment_id,
+    account_id,
+    payment_amount,
+    payment_status,
+    total_balance,
+    payment_num,
+    subscription_id
+  from billing.payments
+  where payment_id = $1
+  and   account_id in (select account_id from billing.account_user where user_id = $2)`, [params.id, user.uid]);
+
+  if (!rows.length) {
+    return { message: 'payment not found', status: 404 };
+  }
+
+  await metaFormat({ rows, cls: { account_id: 'billing.account_id', payment_status: 'billing.payment_status', subscription_id: 'billing.subscription_id' } });
+
+  return rows[0];
+}

package/server/routes/portmone.redirect.js

@@ -1,7 +1,7 @@
 import request from 'request-promise';
 
 import {
-  config, pgClients, logger, dataInsert, dataUpdate,
+  config, pgClients, logger, dataInsert, dataUpdate, handlebarsSync,
 } from '@opengis/fastify-table/utils.js';
 
 /**
@@ -25,7 +25,7 @@ export default async function PortmoneRedirect(req, reply) {
     pg = pgClients.client, user = {}, query = {}, headers = {},
   } = req;
 
-  const { host, payeeId } = config.integrations?.pay || {};
+  const { host, payeeId, paymentRedirect = config.paymentRedirect } = config.integrations?.pay || {};
   const domain = req.hostname.split(':').shift();
 
   if (!host) {
@@ -63,31 +63,32 @@ export default async function PortmoneRedirect(req, reply) {
     if (!config.auth?.disableRestricted) return { message: 'access restricted: referer', status: 403 };
   }
 
-  const { payment_id: paymentId } = data.payment_id
-    ? await dataUpdate({
-      table: 'billing.payments',
-      id: data.payment_id,
-      data: {
-        referer_url: headers?.referer,
-        payment_status: 'inprogress',
-      },
-      uid: user?.uid || '0',
-    })
-    : await dataInsert({
+  const { payment_id: paymentId } = !data.payment_id
+    ? await dataInsert({
       table: 'billing.payments',
       data: {
         payment_amount: paymentAmount,
         account_id: accountId,
-        referer_url: headers?.referer,
         payment_status: 'inprogress',
       },
       uid: user?.uid || '0',
-    }).then(el => el.rows?.[0] || {});
+    }).then(el => el.rows?.[0] || {})
+    : { payment_id: data.payment_id };
 
   if (!paymentId) {
     return { message: 'payment not found', status: 404 };
   }
 
+  await dataUpdate({
+    table: 'billing.payments',
+    id: paymentId,
+    data: {
+      referer_url: paymentRedirect ? handlebarsSync.compile(paymentRedirect)({ id: paymentId }) : headers?.referer,
+      payment_status: 'inprogress',
+    },
+    uid: user?.uid || '0',
+  });
+
   const protocol = headers?.referer.split('://').shift();
 
   const formData = {
@@ -107,6 +108,7 @@ export default async function PortmoneRedirect(req, reply) {
     accountId,
     price: paymentAmount,
     domain,
+    paymentRedirectUrl: paymentRedirect ? handlebarsSync.compile(paymentRedirect)({ id: paymentId }) : headers?.referer,
     uid: user?.uid || '0',
   };
 

package/server/routes/portmone.status.js

@@ -23,7 +23,7 @@ import { sendNotification } from '@opengis/admin/utils.js';
 
 export default async function portmoneStatus(req, reply) {
   const {
-    pg = pgClients.client, params = {}, headers = {}, body = {}, user = {},
+    pg = pgClients.client, params = {}, headers = {}, body = {}, user = {}, unittest,
   } = req;
   const { host } = config.integrations?.pay || {};
 
@@ -62,7 +62,7 @@ export default async function portmoneStatus(req, reply) {
       return { message: 'Transaction not found', status: 400 };
     }
 
-    const refill = body?.billAmount || refillSum || 0;
+    const refill = responseStatus === 'success' ? (body?.billAmount || refillSum || 0) : 0;
 
     // request portmone trx info to recheck request data is valid?
     if (!origin?.startsWith(host)) {
@@ -89,7 +89,7 @@ export default async function portmoneStatus(req, reply) {
 
     // last trx contains total balance
     const { total_balance: totalBalance } = await pg.query(`select total_balance from billing.payments 
-    where account_id=$1 and total_balance is not null order by cdate desc limit 1`, [accountId])
+        where account_id=$1 and payment_status in ('success', 'error') and total_balance is not null order by cdate desc limit 1`, [accountId])
       .then(el => el.rows?.[0] || {});
 
     await dataUpdate({
@@ -97,13 +97,17 @@ export default async function portmoneStatus(req, reply) {
       data: {
         payment_data: body,
         payment_status: responseStatus,
-        total_balance: +(refill || 0) + (+totalBalance || 0),
+        total_balance: +(refill) + (+totalBalance || 0),
         success_date: new Date(),
       },
       id: paymentId,
       uid: user?.uid || '0',
     });
 
+    if (unittest) {
+      console.log(`id:${trx}, status: ${responseStatus}, before: ${totalBalance || 0}, after: ${+(refill) + (+totalBalance || 0)} (${body?.billAmount || refillSum || 0})`);
+    }
+
     const { account_email: to } = await pg.query('select account_email from billing.accounts where account_id=$1', [accountId])
       .then(el => el.rows?.[0] || {});
 

package/server/routes/utils/portmone.check.status.js

@@ -0,0 +1,33 @@
+import request from 'request-promise';
+
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+const { host, payeeId } = config.integrations?.pay || {};
+
+export default async function updateTrxStatus({
+  pg = pgClients.client, paymentId,
+}) {
+  const data = pg.pk?.['billing.payments'] && paymentId ? await pg.query('select * from billing.payments where payment_id=$1', [paymentId]).then(el => el.rows?.[0] || {}) : undefined;
+  if (!paymentId || !host || !payeeId || !data) throw new Error('not enough params');
+
+  const formData = {
+    method: 'result',
+    login: 'WDISHOP',
+    password: 'wdi451',
+    payeeId,
+    shopOrderNumber: paymentId,
+    // shopbillId,
+    id: paymentId,
+  };
+  const response = await request({
+    url: `${host}/gateway/`,
+    method: 'POST',
+    formData,
+    followAllRedirects: false,
+    jar: true,
+    timeout: 6000,
+    simple: false, // prevent not 2xx code trigger catch
+    resolveWithFullResponse: true,
+  });
+  return response;
+}