@things-factory/saas 10.1.236 → 10.1.239

package/dist-server/service/saas-service.js

@@ -12,10 +12,13 @@ exports.billsOf = billsOf;
 exports.saasBillsOf = saasBillsOf;
 exports.saasExpected = saasExpected;
 exports.saasCostTrend = saasCostTrend;
-exports.bankPaymentsOf = bankPaymentsOf;
+exports.vendorLinesOf = vendorLinesOf;
 exports.saasPaymentsOf = saasPaymentsOf;
 exports.saasTrendsOf = saasTrendsOf;
 exports.saasChangesOf = saasChangesOf;
+exports.saasCandidatesOf = saasCandidatesOf;
+exports.createSaasAccountsFromCandidates = createSaasAccountsFromCandidates;
+exports.hideSaasCandidates = hideSaasCandidates;
 const accounting_1 = require("@things-factory/accounting");
 const asset_1 = require("@things-factory/asset");
 /* The register grids' save, the asset module's - this module saves its grids the same way (one implementation). */
@@ -28,6 +31,7 @@ const typeorm_1 = require("typeorm");
 const saas_access_1 = require("./saas-access");
 const saas_account_1 = require("./saas-account");
 const saas_bill_1 = require("./saas-bill");
+const saas_hidden_vendor_1 = require("./saas-hidden-vendor");
 const saas_rules_1 = require("./saas-rules");
 const saas_seat_1 = require("./saas-seat");
 const saas_subscription_1 = require("./saas-subscription");
@@ -63,7 +67,7 @@ const field = (patch, name, old) => (patch[name] !== undefined ? patch[name] : o
 exports.SAAS_ACCOUNT_FACT = 'saas-account';
 exports.SAAS_SUBSCRIPTION_FACT = 'saas-subscription';
 const ACCOUNT_TRACKED = ['name', 'counterpartyId', 'identifier', 'parentId', 'paymentAccountId', 'currency', 'billingDay', 'increaseAlertRate', 'status', 'closedOn'];
-const SUBSCRIPTION_TRACKED = ['name', 'billing', 'quantity', 'unitPrice', 'amount', 'budget', 'everyMonths', 'startOn', 'renewalOn', 'autoRenew', 'noticeDays', 'departmentId', 'assetId', 'status', 'endedOn'];
+const SUBSCRIPTION_TRACKED = ['name', 'billing', 'vendorKey', 'trial', 'quantity', 'unitPrice', 'amount', 'budget', 'everyMonths', 'startOn', 'renewalOn', 'autoRenew', 'noticeDays', 'departmentId', 'assetId', 'status', 'endedOn'];
 const idsOf = (row) => Object.fromEntries(Object.entries(row).map(([key, value]) => (value && typeof value === 'object' && 'id' in value ? [`${key}Id`, value.id] : value === null && ['counterparty', 'parent', 'paymentAccount', 'department', 'asset'].includes(key) ? [`${key}Id`, null] : [key, value])));
 async function recordChanges(tx, domain, user, factKind, old, row, fields) {
     if (!old)
@@ -73,8 +77,8 @@ async function recordChanges(tx, domain, user, factKind, old, row, fields) {
 }
 /* ----------------------------------------------------------------------------------------------------------------- */
 /* Accounts (decision 2) - kept by `saas` keepers only */
-function saveSaasAccounts(tx, domain, user, patches) {
-    return (0, patches_js_1.applyPatches)(tx, saas_account_1.SaasAccount, domain, user, patches, async (patch, old) => {
+async function saveSaasAccounts(tx, domain, user, patches) {
+    const saved = await (0, patches_js_1.applyPatches)(tx, saas_account_1.SaasAccount, domain, user, patches, async (patch, old) => {
         const row = {};
         const name = (0, patches_js_1.touched)(patch, 'name', old) ? (0, patches_js_1.textOf)(patch.name) : old.name;
         if (!name)
@@ -121,6 +125,11 @@ function saveSaasAccounts(tx, domain, user, patches) {
         await recordChanges(tx, domain, user, exports.SAAS_ACCOUNT_FACT, old, row, ACCOUNT_TRACKED);
         return row;
     }, 'saas-account-not-found');
+    /* The vendor's lines written with its name and not linked yet are the account's months (개정 1). */
+    const vendors = patches.filter(one => one.cuFlag !== '-' && one.counterpartyId).map(one => one.counterpartyId);
+    if (vendors.length)
+        await (0, accounting_1.linkLinesByName)(tx, domain, user, vendors);
+    return saved;
 }
 /* ----------------------------------------------------------------------------------------------------------------- */
 /* Subscriptions (decision 3) - by keepers, and by the account's admins */
@@ -141,8 +150,15 @@ async function saveSaasSubscriptions(tx, domain, user, scope, accountId, patches
         for (const one of ['quantity', 'unitPrice', 'amount', 'budget'])
             if ((0, patches_js_1.touched)(patch, one, old))
                 row[one] = (0, patches_js_1.amountOf)(patch[one], 'saas-amount-invalid');
+        /* `vendorKey` and `trial` are a sync's (개정 2) - the GraphQL patch does not carry them. */
+        if ((0, patches_js_1.touched)(patch, 'vendorKey', old))
+            row.vendorKey = (0, patches_js_1.textOf)(patch.vendorKey);
+        if ((0, patches_js_1.touched)(patch, 'trial', old))
+            row.trial = patch.trial === true;
         const value = (name) => (row[name] !== undefined ? row[name] : old?.[name]);
-        if (billing === saas_rules_1.SaasBilling.SEAT && !(Number(value('quantity')) > 0 && value('unitPrice') !== null && value('unitPrice') !== undefined))
+        /* A plan read from the vendor's tenant may wait for its price (개정 2) - it is expected at nothing until then. */
+        const priced = value('unitPrice') !== null && value('unitPrice') !== undefined;
+        if (billing === saas_rules_1.SaasBilling.SEAT && !(Number(value('quantity')) > 0 && (priced || value('vendorKey'))))
             throw new shell_1.Refusal('saas-seat-price-required', {}, 'A seat plan takes its seats and the price of one');
         if ((billing === saas_rules_1.SaasBilling.FIXED || billing === saas_rules_1.SaasBilling.COMMITMENT) && (value('amount') === null || value('amount') === undefined))
             throw new shell_1.Refusal('saas-amount-required', {}, 'Give what one billing costs');
@@ -203,7 +219,8 @@ async function saveSaasSeats(tx, domain, user, scope, subscriptionId, patches) {
         const row = old ? {} : { subscription };
         if ((0, patches_js_1.touched)(patch, 'employeeId', old))
             row.employee = await oneOf(tx, organization_1.Employee, domain, patch.employeeId, 'saas-seat-employee-not-found');
-        for (const one of ['holder', 'description'])
+        /* `login` is a sync's (개정 2) - the GraphQL patch does not carry it. */
+        for (const one of ['holder', 'login', 'description'])
             if ((0, patches_js_1.touched)(patch, one, old))
                 row[one] = (0, patches_js_1.textOf)(patch[one]);
         if (!(row.employee !== undefined ? row.employee : old?.employeeId) && !(row.holder !== undefined ? row.holder : old?.holder))
@@ -254,6 +271,8 @@ async function saveSaasBill(tx, domain, user, scope, accountId, input) {
         month,
         billedOn: (0, patches_js_1.dayOf)(input.billedOn, 'saas-day-invalid'),
         description: (0, patches_js_1.textOf)(input.description),
+        /* Whoever writes it owns it: a person's save keeps a later sync off it (a sync marks its own, 개정 3). */
+        synced: false,
         updater: user
     });
     await tx.getRepository(saas_bill_1.SaasBillLine).delete({ bill: { id: bill.id } });
@@ -419,18 +438,20 @@ async function saasCostTrend(tx, domain, from, to) {
 /* ----------------------------------------------------------------------------------------------------------------- */
 /* A row's months for the list and the 360 (decision 10) and what moved on it (decision 11) */
 /**
- * What left the bank for an account's vendor (ADR-0177 decision 10, the user 2026-10-30: 「이테크 입금 이력이 있을텐데」)
- * - the bank lines (accounting, confirmed) of money out to the account's counterparty, newest first. Only lines in the
- * account's currency count toward its months.
+ * What went out to an account's vendor (ADR-0177 decision 10, the user 2026-10-30: 「이테크 입금 이력이 있을텐데」;
+ * 개정 1) - the bank withdrawals and the card charges (accounting, CONFIRMED and CARD) to the account's counterparty,
+ * newest first. A line takes its counterparty when it lands (accounting `saveTransactions`), so a vendor's lines are
+ * its linked ones. Only lines in the account's currency count toward its months.
  */
-async function bankPaymentsOf(tx, domain, counterpartyIds, from, to) {
+async function vendorLinesOf(tx, domain, counterpartyIds, from, to) {
     if (!counterpartyIds.length)
         return [];
     const query = tx
         .getRepository(accounting_1.Transaction)
         .createQueryBuilder('line')
+        .leftJoinAndSelect('line.bankAccount', 'bankAccount')
         .where('line.domain = :domain', { domain: domain.id })
-        .andWhere('line.category = :category', { category: accounting_1.TransactionCategory.CONFIRMED })
+        .andWhere('line.category IN (:...categories)', { categories: [accounting_1.TransactionCategory.CONFIRMED, accounting_1.TransactionCategory.CARD] })
         .andWhere('line.type = :type', { type: accounting_1.CashFlowType.EXPENSE })
         .andWhere('line.counterparty IN (:...parties)', { parties: counterpartyIds });
     if (from)
@@ -439,15 +460,15 @@ async function bankPaymentsOf(tx, domain, counterpartyIds, from, to) {
         query.andWhere('line.transactionDate <= :to', { to });
     return query.orderBy('line.transactionDate', 'DESC').addOrderBy('line.amount', 'DESC').getMany();
 }
-/** The bank lines that paid an account's vendor, every one - for its 360. */
+/** The bank and card lines that paid an account's vendor, every one - for its 360. */
 async function saasPaymentsOf(tx, domain, scope, accountId) {
     const account = await (0, saas_access_1.accountIn)(tx, domain, scope, accountId);
-    return account.counterpartyId ? bankPaymentsOf(tx, domain, [account.counterpartyId]) : [];
+    return account.counterpartyId ? vendorLinesOf(tx, domain, [account.counterpartyId]) : [];
 }
 /**
  * Each account's last twelve months before this one and the next three expected (`saasExpected`). A month is its bill
- * when one is written; else, for a reader of the bank lines (`withBank`), what left the bank for its vendor that month
- * (decision 10); else empty. One read for all the accounts of a list.
+ * when one is written; else, for a reader of the bank lines (`withBank`), what went out to its vendor that month from
+ * the bank or a card (decision 10, 개정 1); else empty. One read for all the accounts of a list.
  */
 async function saasTrendsOf(tx, domain, accounts, today, withBank = false) {
     const trends = new Map();
@@ -459,7 +480,7 @@ async function saasTrendsOf(tx, domain, accounts, today, withBank = false) {
     const bills = await billsOf(tx, domain, accounts.map(one => one.id), months[0], months[months.length - 1]);
     const expected = await saasExpected(tx, domain, nextMonths[0], nextMonths[nextMonths.length - 1]);
     const parties = [...new Set(accounts.map(one => one.counterpartyId).filter(Boolean))];
-    const paid = withBank ? await bankPaymentsOf(tx, domain, parties, `${months[0]}-01`, `${months[months.length - 1]}-31`) : [];
+    const paid = withBank ? await vendorLinesOf(tx, domain, parties, `${months[0]}-01`, `${months[months.length - 1]}-31`) : [];
     for (const account of accounts) {
         const own = bills.filter(one => one.accountId === account.id);
         const lines = paid.filter(line => line.counterpartyId === account.counterpartyId && (line.currency || 'KRW') === account.currency);
@@ -471,7 +492,13 @@ async function saasTrendsOf(tx, domain, accounts, today, withBank = false) {
         trends.set(account.id, {
             months,
             values,
-            sources: months.map((month, i) => (own.some(one => one.month === month) ? 'bill' : values[i] === null ? null : 'bank')),
+            sources: months.map((month, i) => own.some(one => one.month === month)
+                ? 'bill'
+                : values[i] === null
+                    ? null
+                    : lines.some(line => line.transactionDate?.slice(0, 7) === month && line.category === accounting_1.TransactionCategory.CONFIRMED)
+                        ? 'bank'
+                        : 'card'),
             nextMonths,
             expected: nextMonths.map(month => expected.find(one => one.accountId === account.id && one.month === month)?.amount ?? null),
             currency: account.currency
@@ -489,4 +516,96 @@ async function saasChangesOf(tx, domain, scope, accountId) {
     ];
     return rows.sort((a, b) => new Date(b.at).getTime() - new Date(a.at).getTime());
 }
+/**
+ * Whom the bank and card lines of the last twelve months show paid month after month that is no account yet and no
+ * recurring item - what a keeper may make an account of with one press. A line on a subject outside profit and loss
+ * (a card bill, a tax, a transfer, a loan) pays no vendor, and a person (salary, expenses) is no vendor. With `hidden`,
+ * the ones a keeper hid instead.
+ */
+async function saasCandidatesOf(tx, domain, today, hidden = false) {
+    const now = today.slice(0, 7);
+    const from = `${(0, saas_rules_1.shiftMonth)(now, -12)}-01`;
+    const lines = await tx
+        .getRepository(accounting_1.Transaction)
+        .createQueryBuilder('line')
+        .leftJoinAndSelect('line.account', 'subject')
+        .where('line.domain = :domain', { domain: domain.id })
+        .andWhere('line.category IN (:...categories)', { categories: [accounting_1.TransactionCategory.CONFIRMED, accounting_1.TransactionCategory.CARD] })
+        .andWhere('line.type = :type', { type: accounting_1.CashFlowType.EXPENSE })
+        .andWhere('line.transactionDate >= :from', { from })
+        .getMany();
+    const accounts = await tx.getRepository(saas_account_1.SaasAccount).find({ where: { domain: { id: domain.id } } });
+    const recurring = await tx.getRepository(accounting_1.RecurringCashItem).find({ where: { domain: { id: domain.id } } });
+    const hiddenKeys = new Set((await tx.getRepository(saas_hidden_vendor_1.SaasHiddenVendor).find({ where: { domain: { id: domain.id } } })).map(one => one.counterpartyId ?? `name:${one.nameKey}`));
+    const skip = new Set([...accounts.map(one => one.counterpartyId), ...recurring.map(one => one.counterpartyId), ...(hidden ? [] : hiddenKeys)].filter(Boolean));
+    const parties = await tx.getRepository(biz_base_1.Counterparty).find({ where: { domain: { id: domain.id } }, select: ['id', 'name', 'aliases', 'kind'] });
+    const named = (0, biz_base_1.partyNamed)(parties);
+    const people = new Set(parties.filter(one => one.kind === biz_base_1.CounterpartyKind.PERSON).map(one => one.id));
+    /* Whom a line paid: its counterparty, else the one its written name is (the rule a line is linked by), else the name. */
+    const vendorOf = (line) => {
+        const id = line.counterpartyId ?? named(line.counterpartyName)?.id;
+        if (id)
+            return people.has(id) ? null : { key: id, counterpartyId: id };
+        const key = (0, biz_base_1.nameKey)(line.counterpartyName);
+        return key && !(0, biz_base_1.looksLikePersonName)(line.counterpartyName) ? { key: `name:${key}`, counterpartyId: null } : null;
+    };
+    const found = (0, saas_rules_1.candidatesOf)(lines
+        .filter(line => line.account?.profitAndLoss !== false)
+        .flatMap(line => {
+        const vendor = vendorOf(line);
+        return vendor ? [{ ...vendor, name: line.counterpartyName, transactionDate: line.transactionDate, amount: Number(line.amount), currency: line.currency, bankAccountId: line.bankAccountId }] : [];
+    }), skip).filter(one => hiddenKeys.has(one.key) === hidden);
+    return found.map(one => ({ ...one, counterpartyName: parties.find(party => party.id === one.counterpartyId)?.name ?? one.name ?? '', hidden }));
+}
+/**
+ * Make an account of each candidate - named after the vendor, paid from where it was paid most, on the day it was paid
+ * most - with one usage subscription budgeted at the monthly average, so the months to come are expected at it until
+ * bills say otherwise. A vendor the lines only name is registered as a counterparty first; the lines written with its
+ * name are linked to it (accounting `linkLinesByName`). One that is no candidate any more is refused.
+ */
+async function createSaasAccountsFromCandidates(tx, domain, user, keys, today) {
+    const candidates = await saasCandidatesOf(tx, domain, today);
+    const made = [];
+    for (const key of [...new Set(keys)]) {
+        const one = candidates.find(candidate => candidate.key === key);
+        if (!one)
+            throw new shell_1.Refusal('saas-candidate-not-found', {}, 'It is no candidate any more - reload and try again');
+        const counterpartyId = one.counterpartyId ?? (await (0, biz_base_1.saveCounterparties)(tx, domain, user, [{ cuFlag: '+', name: one.counterpartyName, kind: biz_base_1.CounterpartyKind.COMPANY }]))[0].id;
+        /* Its lines written with its name and not linked yet are its months. */
+        await (0, accounting_1.linkLinesByName)(tx, domain, user, [counterpartyId]);
+        const [account] = await saveSaasAccounts(tx, domain, user, [
+            { cuFlag: '+', name: one.counterpartyName, counterpartyId, paymentAccountId: one.paymentAccountId, currency: one.currency, billingDay: one.billingDay, status: saas_rules_1.SaasAccountStatus.ACTIVE }
+        ]);
+        await saveSaasSubscriptions(tx, domain, user, 'all', account.id, [
+            { cuFlag: '+', name: one.counterpartyName, billing: saas_rules_1.SaasBilling.USAGE, budget: one.average, startOn: one.firstDate, status: saas_rules_1.SaasSubscriptionStatus.ACTIVE }
+        ]);
+        made.push(account);
+    }
+    return made;
+}
+/** Hide candidates - by their keys - or show them again. */
+async function hideSaasCandidates(tx, domain, user, keys, hide) {
+    const repo = tx.getRepository(saas_hidden_vendor_1.SaasHiddenVendor);
+    const wanted = [...new Set(keys)].filter(Boolean);
+    const names = wanted.filter(key => key.startsWith('name:')).map(key => key.slice(5));
+    const ids = wanted.filter(key => !key.startsWith('name:'));
+    const parties = ids.length ? await tx.getRepository(biz_base_1.Counterparty).find({ where: { domain: { id: domain.id }, id: (0, typeorm_1.In)(ids) } }) : [];
+    if (parties.length !== ids.length)
+        throw new shell_1.Refusal('saas-counterparty-not-found', {}, 'The vendor was not found - reload and try again');
+    const rows = await repo.find({ where: { domain: { id: domain.id } } });
+    const held = (row) => (row.counterpartyId ? ids.includes(row.counterpartyId) : names.includes(row.nameKey));
+    if (!hide) {
+        const gone = rows.filter(held);
+        if (gone.length)
+            await repo.remove(gone);
+        return true;
+    }
+    for (const party of parties)
+        if (!rows.some(row => row.counterpartyId === party.id))
+            await repo.save({ domain, counterparty: party, creator: user });
+    for (const key of names)
+        if (!rows.some(row => !row.counterpartyId && row.nameKey === key))
+            await repo.save({ domain, nameKey: key, creator: user });
+    return true;
+}
 //# sourceMappingURL=saas-service.js.map