@opengis/pay 1.1.11 → 1.1.13

package/server/migrations/2_accounts.sql

@@ -1,59 +1,59 @@
-create schema if not exists billing;
-
-CREATE TABLE if not exists billing.accounts();
-
-ALTER TABLE billing.accounts DROP CONSTRAINT if exists billing_account_account_id_pkey cascade;
-ALTER TABLE billing.accounts DROP CONSTRAINT if exists billing_account_account_edrpou_unique cascade;
-
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_id text NOT NULL DEFAULT next_id();
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_name text NOT NULL;
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_edrpou text;
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_email text;
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS enabled boolean not null default true;
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS uid text NOT NULL;
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS files json;
-
-COMMENT ON TABLE billing.accounts IS 'Акаунти';
-COMMENT ON COLUMN billing.accounts.account_id IS 'ID';
-COMMENT ON COLUMN billing.accounts.account_name IS 'Назва';
-COMMENT ON COLUMN billing.accounts.account_edrpou IS 'Код ЄДРПОУ';
-COMMENT ON COLUMN billing.accounts.enabled IS 'On / Off';
-
-CREATE TABLE IF NOT EXISTS billing.account_user();
-
-ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_au_id_pkey cascade;
-ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_account_id_fkey cascade;
-ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_user_id_fkey;
-ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_account_id_user_id_unique;
-
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS au_id text NOT NULL DEFAULT next_id();
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS account_id text NOT NULL;
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS user_id text NOT NULL;
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS uid text NOT NULL;
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS files json;
-
-COMMENT ON TABLE billing.account_user IS 'Відношення акаунтів та користувачів';
-COMMENT ON COLUMN billing.account_user.au_id IS 'ID';
-COMMENT ON COLUMN billing.account_user.account_id IS 'Акаунт організації';
-COMMENT ON COLUMN billing.account_user.user_id IS 'Акаунт користувача';
-
-CREATE INDEX if not exists billing_account_user_account_id_btree_idx ON billing.account_user USING btree (account_id COLLATE pg_catalog."default");
-CREATE INDEX if not exists billing_account_user_account_id_trgm_idx ON billing.account_user USING gin (account_id COLLATE pg_catalog."default" gin_trgm_ops);
-CREATE INDEX if not exists billing_account_user_user_id_btree_idx ON billing.account_user USING btree (user_id COLLATE pg_catalog."default");
-CREATE INDEX if not exists billing_account_user_user_id_trgm_idx ON billing.account_user USING gin (user_id COLLATE pg_catalog."default" gin_trgm_ops);
-
-ALTER TABLE billing.accounts ADD CONSTRAINT billing_account_account_id_pkey PRIMARY KEY (account_id);
-ALTER TABLE billing.accounts ADD CONSTRAINT billing_account_account_edrpou_unique UNIQUE (account_edrpou);
-
-ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_au_id_pkey PRIMARY KEY (au_id);
-ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_account_id_fkey FOREIGN KEY (account_id)
-REFERENCES billing.accounts (account_id);
-ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_user_id_fkey FOREIGN KEY (user_id)
-REFERENCES billing.users (user_id);
-ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_account_id_user_id_unique UNIQUE (account_id,user_id);
+create schema if not exists billing;
+
+CREATE TABLE if not exists billing.accounts();
+
+ALTER TABLE billing.accounts DROP CONSTRAINT if exists billing_account_account_id_pkey cascade;
+ALTER TABLE billing.accounts DROP CONSTRAINT if exists billing_account_account_edrpou_unique cascade;
+
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_id text NOT NULL DEFAULT next_id();
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_name text NOT NULL;
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_edrpou text;
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS account_email text;
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS enabled boolean not null default true;
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS uid text NOT NULL;
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE billing.accounts ADD COLUMN IF NOT EXISTS files json;
+
+COMMENT ON TABLE billing.accounts IS 'Акаунти';
+COMMENT ON COLUMN billing.accounts.account_id IS 'ID';
+COMMENT ON COLUMN billing.accounts.account_name IS 'Назва';
+COMMENT ON COLUMN billing.accounts.account_edrpou IS 'Код ЄДРПОУ';
+COMMENT ON COLUMN billing.accounts.enabled IS 'On / Off';
+
+CREATE TABLE IF NOT EXISTS billing.account_user();
+
+ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_au_id_pkey cascade;
+ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_account_id_fkey cascade;
+ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_user_id_fkey;
+ALTER TABLE billing.account_user DROP CONSTRAINT if exists billing_account_user_account_id_user_id_unique;
+
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS au_id text NOT NULL DEFAULT next_id();
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS account_id text NOT NULL;
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS user_id text NOT NULL;
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS uid text NOT NULL;
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE billing.account_user ADD COLUMN IF NOT EXISTS files json;
+
+COMMENT ON TABLE billing.account_user IS 'Відношення акаунтів та користувачів';
+COMMENT ON COLUMN billing.account_user.au_id IS 'ID';
+COMMENT ON COLUMN billing.account_user.account_id IS 'Акаунт організації';
+COMMENT ON COLUMN billing.account_user.user_id IS 'Акаунт користувача';
+
+CREATE INDEX if not exists billing_account_user_account_id_btree_idx ON billing.account_user USING btree (account_id COLLATE pg_catalog."default");
+CREATE INDEX if not exists billing_account_user_account_id_trgm_idx ON billing.account_user USING gin (account_id COLLATE pg_catalog."default" gin_trgm_ops);
+CREATE INDEX if not exists billing_account_user_user_id_btree_idx ON billing.account_user USING btree (user_id COLLATE pg_catalog."default");
+CREATE INDEX if not exists billing_account_user_user_id_trgm_idx ON billing.account_user USING gin (user_id COLLATE pg_catalog."default" gin_trgm_ops);
+
+ALTER TABLE billing.accounts ADD CONSTRAINT billing_account_account_id_pkey PRIMARY KEY (account_id);
+ALTER TABLE billing.accounts ADD CONSTRAINT billing_account_account_edrpou_unique UNIQUE (account_edrpou);
+
+ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_au_id_pkey PRIMARY KEY (au_id);
+ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_account_id_fkey FOREIGN KEY (account_id)
+REFERENCES billing.accounts (account_id);
+ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_user_id_fkey FOREIGN KEY (user_id)
+REFERENCES billing.users (user_id);
+ALTER TABLE billing.account_user ADD CONSTRAINT billing_account_user_account_id_user_id_unique UNIQUE (account_id,user_id);

package/server/migrations/3_utils.sql

@@ -1,74 +1,74 @@
-create schema if not exists billing;
-
-CREATE TABLE IF NOT EXISTS billing.products();
-ALTER TABLE billing.products DROP CONSTRAINT IF EXISTS billing_product_id_pkey CASCADE;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS product_id text not null default next_id();
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS name text not null;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS description text;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS price_type text;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS image text;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS enabled boolean not null default true;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS uid text NOT NULL;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS files json;
-
-CREATE TABLE IF NOT EXISTS billing.plans();
-ALTER TABLE billing.plans DROP CONSTRAINT IF EXISTS billing_plan_id_pkey CASCADE;
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS plan_id text not null default next_id();
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS name text not null;
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS enabled boolean not null default true;
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS multiplier numeric not null default 0;
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS uid text NOT NULL;
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS files json;
-
-CREATE TABLE IF NOT EXISTS billing.product_plans();
-ALTER TABLE billing.product_plans DROP CONSTRAINT IF EXISTS billing_product_plan_id_pkey CASCADE;
-ALTER TABLE billing.product_plans DROP CONSTRAINT IF EXISTS billing_product_product_id_fkey CASCADE;
-ALTER TABLE billing.product_plans DROP CONSTRAINT IF EXISTS billing_product_plan_id_fkey CASCADE;
-
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS product_plan_id text not null default next_id();
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS product_id text not null;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS plan_id text not null;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS price numeric not null default 0;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS max_unit numeric not null default 1;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS enabled boolean default true;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS uid text NOT NULL;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS files json;
-
-ALTER TABLE billing.products ADD CONSTRAINT billing_product_id_pkey PRIMARY KEY (product_id);
-ALTER TABLE billing.plans ADD CONSTRAINT billing_plan_id_pkey PRIMARY KEY (plan_id);
-
-ALTER TABLE billing.product_plans ADD CONSTRAINT billing_product_plan_id_pkey PRIMARY KEY (product_plan_id);
-ALTER TABLE billing.product_plans ADD CONSTRAINT billing_product_product_id_fkey FOREIGN KEY (product_id)
-REFERENCES billing.products (product_id);
-ALTER TABLE billing.product_plans ADD CONSTRAINT billing_product_plan_id_fkey FOREIGN KEY (plan_id)
-REFERENCES billing.plans (plan_id);
-
-COMMENT ON TABLE billing.products IS 'Товари (послуги)';
-COMMENT ON COLUMN billing.products.product_id IS 'ID';
-COMMENT ON COLUMN billing.products.name IS 'Назва';
-COMMENT ON COLUMN billing.products.description IS 'Опис';
-COMMENT ON COLUMN billing.products.price_type IS 'Тип плати (account/unit)';
-COMMENT ON COLUMN billing.products.image is 'Зображення';
-COMMENT ON COLUMN billing.products.enabled is 'On / Off';
-
-COMMENT ON TABLE billing.plans IS 'Перелік тарифних планів';
-COMMENT ON COLUMN billing.plans.plan_id IS 'ID';
-COMMENT ON COLUMN billing.plans.name IS 'Назва';
-COMMENT ON COLUMN billing.plans.enabled is 'On / Off';
-
-COMMENT ON TABLE billing.product_plans IS 'Відношення планів та товарів (послуг)';
-COMMENT ON COLUMN billing.product_plans.product_plan_id is 'ID';
-COMMENT ON COLUMN billing.product_plans.product_id is 'ID товару (послуги)';
-COMMENT ON COLUMN billing.product_plans.plan_id is 'ID тарифного плану';
-COMMENT ON COLUMN billing.product_plans.price is 'Вартість';
-COMMENT ON COLUMN billing.product_plans.max_unit is 'Максимальна кількість користувачів в межах тарифу';
+create schema if not exists billing;
+
+CREATE TABLE IF NOT EXISTS billing.products();
+ALTER TABLE billing.products DROP CONSTRAINT IF EXISTS billing_product_id_pkey CASCADE;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS product_id text not null default next_id();
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS name text not null;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS description text;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS price_type text;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS image text;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS enabled boolean not null default true;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS uid text NOT NULL;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE billing.products ADD COLUMN IF NOT EXISTS files json;
+
+CREATE TABLE IF NOT EXISTS billing.plans();
+ALTER TABLE billing.plans DROP CONSTRAINT IF EXISTS billing_plan_id_pkey CASCADE;
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS plan_id text not null default next_id();
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS name text not null;
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS enabled boolean not null default true;
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS multiplier numeric not null default 0;
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS uid text NOT NULL;
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE billing.plans ADD COLUMN IF NOT EXISTS files json;
+
+CREATE TABLE IF NOT EXISTS billing.product_plans();
+ALTER TABLE billing.product_plans DROP CONSTRAINT IF EXISTS billing_product_plan_id_pkey CASCADE;
+ALTER TABLE billing.product_plans DROP CONSTRAINT IF EXISTS billing_product_product_id_fkey CASCADE;
+ALTER TABLE billing.product_plans DROP CONSTRAINT IF EXISTS billing_product_plan_id_fkey CASCADE;
+
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS product_plan_id text not null default next_id();
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS product_id text not null;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS plan_id text not null;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS price numeric not null default 0;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS max_unit numeric not null default 1;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS enabled boolean default true;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS uid text NOT NULL;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE billing.product_plans ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE billing.products ADD CONSTRAINT billing_product_id_pkey PRIMARY KEY (product_id);
+ALTER TABLE billing.plans ADD CONSTRAINT billing_plan_id_pkey PRIMARY KEY (plan_id);
+
+ALTER TABLE billing.product_plans ADD CONSTRAINT billing_product_plan_id_pkey PRIMARY KEY (product_plan_id);
+ALTER TABLE billing.product_plans ADD CONSTRAINT billing_product_product_id_fkey FOREIGN KEY (product_id)
+REFERENCES billing.products (product_id);
+ALTER TABLE billing.product_plans ADD CONSTRAINT billing_product_plan_id_fkey FOREIGN KEY (plan_id)
+REFERENCES billing.plans (plan_id);
+
+COMMENT ON TABLE billing.products IS 'Товари (послуги)';
+COMMENT ON COLUMN billing.products.product_id IS 'ID';
+COMMENT ON COLUMN billing.products.name IS 'Назва';
+COMMENT ON COLUMN billing.products.description IS 'Опис';
+COMMENT ON COLUMN billing.products.price_type IS 'Тип плати (account/unit)';
+COMMENT ON COLUMN billing.products.image is 'Зображення';
+COMMENT ON COLUMN billing.products.enabled is 'On / Off';
+
+COMMENT ON TABLE billing.plans IS 'Перелік тарифних планів';
+COMMENT ON COLUMN billing.plans.plan_id IS 'ID';
+COMMENT ON COLUMN billing.plans.name IS 'Назва';
+COMMENT ON COLUMN billing.plans.enabled is 'On / Off';
+
+COMMENT ON TABLE billing.product_plans IS 'Відношення планів та товарів (послуг)';
+COMMENT ON COLUMN billing.product_plans.product_plan_id is 'ID';
+COMMENT ON COLUMN billing.product_plans.product_id is 'ID товару (послуги)';
+COMMENT ON COLUMN billing.product_plans.plan_id is 'ID тарифного плану';
+COMMENT ON COLUMN billing.product_plans.price is 'Вартість';
+COMMENT ON COLUMN billing.product_plans.max_unit is 'Максимальна кількість користувачів в межах тарифу';
 COMMENT ON COLUMN billing.product_plans.enabled is 'On / Off';

package/server/migrations/4_subscriptions.sql

@@ -1,36 +1,36 @@
-create schema if not exists billing;
-
-CREATE TABLE if not exists billing.subscriptions();
-alter table billing.subscriptions drop constraint if exists billing_subscriptions_subscription_id_pkey cascade;
-alter table billing.subscriptions drop constraint if exists billing_subscriptions_account_id_fkey cascade;
-alter table billing.subscriptions drop constraint if exists billing_subscriptions_product_id_fkey cascade;
-alter table billing.subscriptions drop constraint if exists billing_subscriptions_plan_id_fkey cascade;
-
-alter table billing.subscriptions add column if not exists subscription_id text not null default next_id();
-alter table billing.subscriptions add column if not exists account_id text not null;
-alter table billing.subscriptions add column if not exists product_id text not null;
-alter table billing.subscriptions add column if not exists product_plan_id text not null;
-alter table billing.subscriptions add column if not exists is_trial boolean not null default false;
-alter table billing.subscriptions add column if not exists start_date date not null default CURRENT_DATE;
-alter table billing.subscriptions add column if not exists cdate timestamp without time zone default date_trunc('seconds'::text, now());
-alter table billing.subscriptions add column if not exists uid text not null;
-alter table billing.subscriptions add column if not exists editor_id text;
-alter table billing.subscriptions add column if not exists editor_date timestamp without time zone;
-alter table billing.subscriptions add column if not exists files json;
-
-ALTER TABLE billing.subscriptions add constraint billing_subscriptions_subscription_id_pkey PRIMARY KEY(subscription_id);
-ALTER TABLE billing.subscriptions add constraint billing_subscriptions_account_id_fkey FOREIGN KEY(account_id)
-REFERENCES billing.accounts (account_id);
-ALTER TABLE billing.subscriptions add constraint billing_subscriptions_product_id_fkey FOREIGN KEY(product_id)
-REFERENCES billing.products (product_id);
-ALTER TABLE billing.subscriptions add constraint billing_subscriptions_plan_id_fkey FOREIGN KEY(product_plan_id)
-REFERENCES billing.product_plans (product_plan_id);
-
-COMMENT ON TABLE billing.subscriptions IS 'Підписки';
-COMMENT ON COLUMN billing.subscriptions.subscription_id IS 'ID';
-
-COMMENT ON COLUMN billing.subscriptions.account_id IS 'ID акаунту';
-COMMENT ON COLUMN billing.subscriptions.product_id IS 'ID товару';
-COMMENT ON COLUMN billing.subscriptions.product_plan_id IS 'ID тарифного плану';
-COMMENT ON COLUMN billing.subscriptions.is_trial IS 'Випробувальний строк';
+create schema if not exists billing;
+
+CREATE TABLE if not exists billing.subscriptions();
+alter table billing.subscriptions drop constraint if exists billing_subscriptions_subscription_id_pkey cascade;
+alter table billing.subscriptions drop constraint if exists billing_subscriptions_account_id_fkey cascade;
+alter table billing.subscriptions drop constraint if exists billing_subscriptions_product_id_fkey cascade;
+alter table billing.subscriptions drop constraint if exists billing_subscriptions_plan_id_fkey cascade;
+
+alter table billing.subscriptions add column if not exists subscription_id text not null default next_id();
+alter table billing.subscriptions add column if not exists account_id text not null;
+alter table billing.subscriptions add column if not exists product_id text not null;
+alter table billing.subscriptions add column if not exists product_plan_id text not null;
+alter table billing.subscriptions add column if not exists is_trial boolean not null default false;
+alter table billing.subscriptions add column if not exists start_date date not null default CURRENT_DATE;
+alter table billing.subscriptions add column if not exists cdate timestamp without time zone default date_trunc('seconds'::text, now());
+alter table billing.subscriptions add column if not exists uid text not null;
+alter table billing.subscriptions add column if not exists editor_id text;
+alter table billing.subscriptions add column if not exists editor_date timestamp without time zone;
+alter table billing.subscriptions add column if not exists files json;
+
+ALTER TABLE billing.subscriptions add constraint billing_subscriptions_subscription_id_pkey PRIMARY KEY(subscription_id);
+ALTER TABLE billing.subscriptions add constraint billing_subscriptions_account_id_fkey FOREIGN KEY(account_id)
+REFERENCES billing.accounts (account_id);
+ALTER TABLE billing.subscriptions add constraint billing_subscriptions_product_id_fkey FOREIGN KEY(product_id)
+REFERENCES billing.products (product_id);
+ALTER TABLE billing.subscriptions add constraint billing_subscriptions_plan_id_fkey FOREIGN KEY(product_plan_id)
+REFERENCES billing.product_plans (product_plan_id);
+
+COMMENT ON TABLE billing.subscriptions IS 'Підписки';
+COMMENT ON COLUMN billing.subscriptions.subscription_id IS 'ID';
+
+COMMENT ON COLUMN billing.subscriptions.account_id IS 'ID акаунту';
+COMMENT ON COLUMN billing.subscriptions.product_id IS 'ID товару';
+COMMENT ON COLUMN billing.subscriptions.product_plan_id IS 'ID тарифного плану';
+COMMENT ON COLUMN billing.subscriptions.is_trial IS 'Випробувальний строк';
 COMMENT ON COLUMN billing.subscriptions.start_date IS 'Дата початку дії підписки';

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/portmone.redirect.js

@@ -88,13 +88,15 @@ export default async function PortmoneRedirect(req, reply) {
     return { message: 'payment not found', status: 404 };
   }
 
+  const protocol = headers?.referer.split('://').shift();
+
   const formData = {
     payee_id: payeeId,
     description: `Послуга - поповнення рахунку на суму ${paymentAmount} грн`,
     shop_order_number: paymentId,
     bill_amount: paymentAmount,
-    success_url: `http://${domain}${config?.prefix || '/api'}/portmone/${paymentId}/success`,
-    failure_url: `http://${domain}${config?.prefix || '/api'}/portmone/${paymentId}/error`,
+    success_url: `${protocol || 'https'}://${domain}${config?.prefix || '/api'}/portmone/${paymentId}/success`,
+    failure_url: `${protocol || 'https'}://${domain}${config?.prefix || '/api'}/portmone/${paymentId}/error`,
     lang: 'ua',
   };
 

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] || {});