@things-factory/accounting 10.1.134 → 10.1.136

package/dist-server/service/payment/payment-mutation.js

@@ -3,89 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentMutation = void 0;
 const tslib_1 = require("tslib");
 const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
 const shell_1 = require("@things-factory/shell");
 const payment_1 = require("./payment");
+const payment_service_1 = require("./payment-service");
 const payment_type_1 = require("./payment-type");
 let PaymentMutation = class PaymentMutation {
     async createPayment(payment, context) {
         const { domain, user, tx } = context.state;
-        const result = await (0, shell_1.getRepository)(payment_1.Payment, tx).save({
-            ...payment,
-            domain,
-            creator: user,
-            updater: user
-        });
-        return result;
+        const [saved] = await (0, payment_service_1.savePayments)(tx, domain, user, [{ ...payment, cuFlag: '+' }]);
+        return saved;
     }
     async updatePayment(id, patch, context) {
         const { domain, user, tx } = context.state;
-        const repository = (0, shell_1.getRepository)(payment_1.Payment, tx);
-        const payment = await repository.findOne({
-            where: { domain: { id: domain.id }, id }
-        });
-        const result = await repository.save({
-            ...payment,
-            ...patch,
-            updater: user
-        });
-        return result;
+        const [saved] = await (0, payment_service_1.savePayments)(tx, domain, user, [{ ...patch, id, cuFlag: 'M' }]);
+        return saved;
     }
     async updateMultiplePayment(patches, context) {
         const { domain, user, tx } = context.state;
-        let results = [];
-        const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
-        const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
-        const paymentRepo = (0, shell_1.getRepository)(payment_1.Payment, tx);
-        if (_createRecords.length > 0) {
-            for (let i = 0; i < _createRecords.length; i++) {
-                const newRecord = _createRecords[i];
-                const result = await paymentRepo.save({
-                    ...newRecord,
-                    domain,
-                    creator: user,
-                    updater: user
-                });
-                results.push({ ...result, cuFlag: '+' });
-            }
-        }
-        if (_updateRecords.length > 0) {
-            for (let i = 0; i < _updateRecords.length; i++) {
-                const updateRecord = _updateRecords[i];
-                const payment = await paymentRepo.findOne({
-                    where: { domain: { id: domain.id }, id: updateRecord.id }
-                });
-                if (!payment) {
-                    throw new Error(`failed to find payment to update: ${updateRecord.id}`);
-                }
-                const result = await paymentRepo.save({
-                    ...payment,
-                    ...updateRecord,
-                    updater: user
-                });
-                results.push({ ...result, cuFlag: 'M' });
-            }
-        }
-        return results;
+        return await (0, payment_service_1.savePayments)(tx, domain, user, patches);
     }
     async deletePayment(id, context) {
-        const { domain, tx } = context.state;
-        await (0, shell_1.getRepository)(payment_1.Payment, tx).delete({ domain: { id: domain.id }, id });
+        const { domain, user, tx } = context.state;
+        await (0, payment_service_1.savePayments)(tx, domain, user, [{ id, cuFlag: '-' }]);
         return true;
     }
     async deletePayments(ids, context) {
-        const { domain, tx } = context.state;
-        await (0, shell_1.getRepository)(payment_1.Payment, tx).delete({
-            domain: { id: domain.id },
-            id: (0, typeorm_1.In)(ids)
-        });
-        return true;
-    }
-    async importPayments(payments, context) {
-        const { domain, tx } = context.state;
-        await Promise.all(payments.map(async (payment) => {
-            const createdPayment = await (0, shell_1.getRepository)(payment_1.Payment, tx).save({ domain, ...payment });
-        }));
+        const { domain, user, tx } = context.state;
+        await (0, payment_service_1.savePayments)(tx, domain, user, ids.map(id => ({ id, cuFlag: '-' })));
         return true;
     }
 };
@@ -93,7 +37,7 @@ exports.PaymentMutation = PaymentMutation;
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Directive)('@privilege(category: "accounting", privilege: "mutation", domainOwnerGranted: true)'),
-    (0, type_graphql_1.Mutation)(returns => payment_1.Payment, { description: 'To create new Payment' }),
+    (0, type_graphql_1.Mutation)(returns => payment_1.Payment, { description: 'To put a part of a transaction on what it paid' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('payment')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
@@ -114,7 +58,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Directive)('@privilege(category: "accounting", privilege: "mutation", domainOwnerGranted: true)'),
-    (0, type_graphql_1.Mutation)(returns => [payment_1.Payment], { description: "To modify multiple Payments' information" }),
+    (0, type_graphql_1.Mutation)(returns => [payment_1.Payment], { description: 'To add, modify and delete multiple Payments' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('patches', type => [payment_type_1.PaymentPatch])),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
@@ -141,17 +85,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Array, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], PaymentMutation.prototype, "deletePayments", null);
-tslib_1.__decorate([
-    (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Directive)('@privilege(category: "accounting", privilege: "mutation", domainOwnerGranted: true)'),
-    (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To import multiple Payments' }),
-    tslib_1.__param(0, (0, type_graphql_1.Arg)('payments', type => [payment_type_1.PaymentPatch])),
-    tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Array, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], PaymentMutation.prototype, "importPayments", null);
 exports.PaymentMutation = PaymentMutation = tslib_1.__decorate([
-    (0, type_graphql_1.Resolver)(payment_1.Payment)
+    (0, type_graphql_1.Resolver)(payment_1.Payment),
+    (0, type_graphql_1.UseMiddleware)(shell_1.SpeakRefusals)
 ], PaymentMutation);
 //# sourceMappingURL=payment-mutation.js.map

package/dist-server/service/payment/payment-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-mutation.js","sourceRoot":"","sources":["../../../server/service/payment/payment-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'\nimport { In } from 'typeorm'\nimport { getRepository } from '@things-factory/shell'\n\nimport { Payment } from './payment'\nimport { NewPayment, PaymentPatch } from './payment-type'\n\n@Resolver(Payment)\nexport class PaymentMutation {\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Payment, { description: 'To create new Payment' })\n  async createPayment(@Arg('payment') payment: NewPayment, @Ctx() context: ResolverContext): Promise<Payment> {\n    const { domain, user, tx } = context.state\n\n    const result = await getRepository(Payment, tx).save({\n      ...payment,\n      domain,\n      creator: user,\n      updater: user\n    })\n\n    return result\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Payment, { description: 'To modify Payment information' })\n  async updatePayment(\n    @Arg('id') id: string,\n    @Arg('patch') patch: PaymentPatch,\n    @Ctx() context: ResolverContext\n  ): Promise<Payment> {\n    const { domain, user, tx } = context.state\n\n    const repository = getRepository(Payment, tx)\n    const payment = await repository.findOne({\n      where: { domain: { id: domain.id }, id }\n    })\n\n    const result = await repository.save({\n      ...payment,\n      ...patch,\n      updater: user\n    })\n\n    return result\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => [Payment], { description: \"To modify multiple Payments' information\" })\n  async updateMultiplePayment(\n    @Arg('patches', type => [PaymentPatch]) patches: PaymentPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<Payment[]> {\n    const { domain, user, tx } = context.state\n\n    let results = []\n    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')\n    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')\n    const paymentRepo = getRepository(Payment, tx)\n\n    if (_createRecords.length > 0) {\n      for (let i = 0; i < _createRecords.length; i++) {\n        const newRecord = _createRecords[i]\n\n        const result = await paymentRepo.save({\n          ...newRecord,\n          domain,\n          creator: user,\n          updater: user\n        })\n\n        results.push({ ...result, cuFlag: '+' })\n      }\n    }\n\n    if (_updateRecords.length > 0) {\n      for (let i = 0; i < _updateRecords.length; i++) {\n        const updateRecord = _updateRecords[i]\n        const payment = await paymentRepo.findOne({\n          where: { domain: { id: domain.id }, id: updateRecord.id }\n        })\n\n        if (!payment) {\n          throw new Error(`failed to find payment to update: ${updateRecord.id}`)\n        }\n\n        const result = await paymentRepo.save({\n          ...payment,\n          ...updateRecord,\n          updater: user\n        })\n\n        results.push({ ...result, cuFlag: 'M' })\n      }\n    }\n\n    return results\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Boolean, { description: 'To delete Payment' })\n  async deletePayment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await getRepository(Payment, tx).delete({ domain: { id: domain.id }, id })\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Boolean, { description: 'To delete multiple Payments' })\n  async deletePayments(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await getRepository(Payment, tx).delete({\n      domain: { id: domain.id },\n      id: In(ids)\n    })\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Boolean, { description: 'To import multiple Payments' })\n  async importPayments(\n    @Arg('payments', type => [PaymentPatch]) payments: PaymentPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await Promise.all(\n      payments.map(async (payment: PaymentPatch) => {\n        const createdPayment: Payment = await getRepository(Payment, tx).save({ domain, ...payment })\n      })\n    )\n\n    return true\n  }\n}\n"]}
+{"version":3,"file":"payment-mutation.js","sourceRoot":"","sources":["../../../server/service/payment/payment-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Resolver, Mutation, Arg, Ctx, Directive, UseMiddleware } from 'type-graphql'\n\nimport { SpeakRefusals } from '@things-factory/shell'\n\nimport { Payment } from './payment'\nimport { savePayments } from './payment-service'\nimport { NewPayment, PaymentPatch } from './payment-type'\n\n@Resolver(Payment)\n@UseMiddleware(SpeakRefusals)\nexport class PaymentMutation {\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Payment, { description: 'To put a part of a transaction on what it paid' })\n  async createPayment(@Arg('payment') payment: NewPayment, @Ctx() context: ResolverContext): Promise<Payment> {\n    const { domain, user, tx } = context.state\n    const [saved] = await savePayments(tx, domain, user, [{ ...payment, cuFlag: '+' }])\n\n    return saved\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Payment, { description: 'To modify Payment information' })\n  async updatePayment(\n    @Arg('id') id: string,\n    @Arg('patch') patch: PaymentPatch,\n    @Ctx() context: ResolverContext\n  ): Promise<Payment> {\n    const { domain, user, tx } = context.state\n    const [saved] = await savePayments(tx, domain, user, [{ ...patch, id, cuFlag: 'M' }])\n\n    return saved\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => [Payment], { description: 'To add, modify and delete multiple Payments' })\n  async updateMultiplePayment(\n    @Arg('patches', type => [PaymentPatch]) patches: PaymentPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<Payment[]> {\n    const { domain, user, tx } = context.state\n\n    return await savePayments(tx, domain, user, patches)\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Boolean, { description: 'To delete Payment' })\n  async deletePayment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {\n    const { domain, user, tx } = context.state\n    await savePayments(tx, domain, user, [{ id, cuFlag: '-' }])\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(category: \"accounting\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Mutation(returns => Boolean, { description: 'To delete multiple Payments' })\n  async deletePayments(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<boolean> {\n    const { domain, user, tx } = context.state\n    await savePayments(\n      tx,\n      domain,\n      user,\n      ids.map(id => ({ id, cuFlag: '-' }))\n    )\n\n    return true\n  }\n}\n"]}

package/dist-server/service/payment/payment-query.d.ts

@@ -1,10 +1,13 @@
 import { Domain, ListParam } from '@things-factory/shell';
 import { User } from '@things-factory/auth-base';
+import { Transaction } from '../transaction/transaction';
 import { Payment } from './payment';
 import { PaymentList } from './payment-type';
 export declare class PaymentQuery {
     payment(id: string, context: ResolverContext): Promise<Payment>;
     payments(params: ListParam, context: ResolverContext): Promise<PaymentList>;
+    transaction(payment: Payment): Promise<Transaction>;
+    targetLabel(payment: Payment): Promise<string | null>;
     domain(payment: Payment): Promise<Domain>;
     updater(payment: Payment): Promise<User>;
     creator(payment: Payment): Promise<User>;

package/dist-server/service/payment/payment-query.js

@@ -5,7 +5,9 @@ const tslib_1 = require("tslib");
 const type_graphql_1 = require("type-graphql");
 const shell_1 = require("@things-factory/shell");
 const auth_base_1 = require("@things-factory/auth-base");
+const transaction_1 = require("../transaction/transaction");
 const payment_1 = require("./payment");
+const payment_targets_1 = require("./payment-targets");
 const payment_type_1 = require("./payment-type");
 let PaymentQuery = class PaymentQuery {
     async payment(id, context) {
@@ -20,11 +22,21 @@ let PaymentQuery = class PaymentQuery {
             domain,
             params,
             repository: await (0, shell_1.getRepository)(payment_1.Payment),
-            searchables: []
+            searchables: ['targetType', 'basis', 'notes']
         });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }
+    async transaction(payment) {
+        return payment.transaction ?? (await (0, shell_1.getRepository)(transaction_1.Transaction).findOneBy({ id: payment.transactionId }));
+    }
+    async targetLabel(payment) {
+        const label = (0, payment_targets_1.paymentTargetOf)(payment.targetType)?.label;
+        if (!label)
+            return null;
+        const labels = await label((0, shell_1.getRepository)(payment_1.Payment).manager, { id: payment.domainId }, [payment.targetId]);
+        return labels.get(payment.targetId) ?? null;
+    }
     async domain(payment) {
         return payment.domainId && (await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: payment.domainId }));
     }
@@ -54,6 +66,23 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], PaymentQuery.prototype, "payments", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => transaction_1.Transaction),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [payment_1.Payment]),
+    tslib_1.__metadata("design:returntype", Promise)
+], PaymentQuery.prototype, "transaction", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => String, {
+        nullable: true,
+        description: 'What people call what was paid, as its module names it'
+    }),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [payment_1.Payment]),
+    tslib_1.__metadata("design:returntype", Promise)
+], PaymentQuery.prototype, "targetLabel", null);
 tslib_1.__decorate([
     (0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
     tslib_1.__param(0, (0, type_graphql_1.Root)()),

package/dist-server/service/payment/payment-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-query.js","sourceRoot":"","sources":["../../../server/service/payment/payment-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\nimport { Payment } from './payment'\nimport { PaymentList } from './payment-type'\n\n@Resolver(Payment)\nexport class PaymentQuery {\n  @Directive('@privilege(category: \"accounting\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => Payment!, { nullable: true, description: 'To fetch a Payment' })\n  async payment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Payment> {\n    const { domain } = context.state\n\n    return await getRepository(Payment).findOne({\n      where: { domain: { id: domain.id }, id }\n    })\n  }\n\n  @Directive('@privilege(category: \"accounting\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => PaymentList, { description: 'To fetch multiple Payments' })\n  async payments(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<PaymentList> {\n    const { domain } = context.state\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      domain,\n      params,\n      repository: await getRepository(Payment),\n      searchables: []\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() payment: Payment): Promise<Domain> {\n    return payment.domainId && (await getRepository(Domain).findOneBy({ id: payment.domainId }))\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() payment: Payment): Promise<User> {\n    return payment.updaterId && (await getRepository(User).findOneBy({ id: payment.updaterId }))\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() payment: Payment): Promise<User> {\n    return payment.creatorId && (await getRepository(User).findOneBy({ id: payment.creatorId }))\n  }\n}\n"]}
+{"version":3,"file":"payment-query.js","sourceRoot":"","sources":["../../../server/service/payment/payment-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'\n\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\n\nimport { Transaction } from '../transaction/transaction'\nimport { Payment } from './payment'\nimport { paymentTargetOf } from './payment-targets'\nimport { PaymentList } from './payment-type'\n\n@Resolver(Payment)\nexport class PaymentQuery {\n  @Directive('@privilege(category: \"accounting\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => Payment!, { nullable: true, description: 'To fetch a Payment' })\n  async payment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Payment> {\n    const { domain } = context.state\n\n    return await getRepository(Payment).findOne({\n      where: { domain: { id: domain.id }, id }\n    })\n  }\n\n  @Directive('@privilege(category: \"accounting\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => PaymentList, { description: 'To fetch multiple Payments' })\n  async payments(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<PaymentList> {\n    const { domain } = context.state\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      domain,\n      params,\n      repository: await getRepository(Payment),\n      searchables: ['targetType', 'basis', 'notes']\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Transaction)\n  async transaction(@Root() payment: Payment): Promise<Transaction> {\n    return payment.transaction ?? (await getRepository(Transaction).findOneBy({ id: payment.transactionId }))\n  }\n\n  @FieldResolver(type => String, {\n    nullable: true,\n    description: 'What people call what was paid, as its module names it'\n  })\n  async targetLabel(@Root() payment: Payment): Promise<string | null> {\n    const label = paymentTargetOf(payment.targetType)?.label\n    if (!label) return null\n    const labels = await label(getRepository(Payment).manager, { id: payment.domainId }, [payment.targetId])\n\n    return labels.get(payment.targetId) ?? null\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() payment: Payment): Promise<Domain> {\n    return payment.domainId && (await getRepository(Domain).findOneBy({ id: payment.domainId }))\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() payment: Payment): Promise<User> {\n    return payment.updaterId && (await getRepository(User).findOneBy({ id: payment.updaterId }))\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() payment: Payment): Promise<User> {\n    return payment.creatorId && (await getRepository(User).findOneBy({ id: payment.creatorId }))\n  }\n}\n"]}

package/dist-server/service/payment/payment-service.d.ts

@@ -0,0 +1,16 @@
+import { EntityManager } from 'typeorm';
+import { Payment } from './payment';
+import { PaymentPatch } from './payment-type';
+/**
+ * Within one purpose a transaction pays no more than itself. Run after its payments or its amount change.
+ */
+export declare function checkPaymentsWithin(tx: EntityManager, domain: {
+    id: string;
+}, transactionIds: string[]): Promise<void>;
+/**
+ * Apply rows to a domain's payments: `+` (or no id) adds, `M` changes, `-` deletes (softly). Then the general rule
+ * (§`checkPaymentsWithin`) and each touched kind's own rules run, in the same database transaction.
+ */
+export declare function savePayments(tx: EntityManager, domain: {
+    id: string;
+}, user: any, patches: PaymentPatch[]): Promise<Payment[]>;

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

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkPaymentsWithin = checkPaymentsWithin;
+exports.savePayments = savePayments;
+const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
+const transaction_1 = require("../transaction/transaction");
+const payment_1 = require("./payment");
+const payment_targets_1 = require("./payment-targets");
+/** Amounts are decimals; a sum within half a cent of the transaction is the transaction. */
+const CENT = 0.005;
+/**
+ * Within one purpose a transaction pays no more than itself. Run after its payments or its amount change.
+ */
+async function checkPaymentsWithin(tx, domain, transactionIds) {
+    const ids = [...new Set(transactionIds)];
+    if (!ids.length)
+        return;
+    const transactions = await tx
+        .getRepository(transaction_1.Transaction)
+        .find({ where: { domain: { id: domain.id }, id: (0, typeorm_1.In)(ids) }, select: ['id', 'amount'] });
+    const payments = await tx
+        .getRepository(payment_1.Payment)
+        .find({ where: { domain: { id: domain.id }, transaction: { id: (0, typeorm_1.In)(ids) } }, relations: ['transaction'] });
+    const paid = new Map();
+    for (const payment of payments) {
+        const key = `${payment.transaction.id}|${payment.purpose}`;
+        paid.set(key, (paid.get(key) ?? 0) + Number(payment.amount));
+    }
+    for (const transaction of transactions) {
+        for (const [key, sum] of paid) {
+            const [id, purpose] = key.split('|');
+            if (id !== transaction.id)
+                continue;
+            const amount = Math.abs(Number(transaction.amount));
+            if (sum > amount + CENT) {
+                throw new shell_1.Refusal('payment-over-transaction', { purpose, paid: sum, amount }, `${purpose}: ${sum} put on a transaction of ${amount}`);
+            }
+        }
+    }
+}
+/** A patch as the row it writes: the target kind known, the amount more than zero, the purpose the kind's. */
+function rowOf(patch, isNew) {
+    const row = {};
+    const transactionId = patch.transaction?.id;
+    if (isNew && !transactionId)
+        throw new shell_1.Refusal('payment-transaction-required', {}, 'a payment needs the transaction it is a part of');
+    if (transactionId)
+        row.transactionId = transactionId;
+    if (patch.targetType !== undefined || isNew) {
+        const target = (0, payment_targets_1.paymentTargetOf)(String(patch.targetType ?? ''));
+        if (!target)
+            throw new shell_1.Refusal('payment-target-unknown', { targetType: patch.targetType }, `'${patch.targetType}' is not a kind of target any module registered`);
+        row.targetType = patch.targetType;
+        row.purpose = target.purpose;
+    }
+    if (patch.targetId !== undefined || isNew) {
+        if (!patch.targetId)
+            throw new shell_1.Refusal('payment-target-required', {}, 'a payment needs what it paid');
+        row.targetId = patch.targetId;
+    }
+    if (patch.amount !== undefined || isNew) {
+        const amount = Number(patch.amount);
+        if (!(amount > 0))
+            throw new shell_1.Refusal('payment-amount-not-positive', {}, 'amount: must be more than zero');
+        row.amount = amount;
+    }
+    if (patch.method !== undefined)
+        row.method = patch.method ?? payment_1.PaymentMethod.PERSON;
+    if (patch.basis !== undefined)
+        row.basis = patch.basis || null;
+    if (patch.notes !== undefined)
+        row.notes = patch.notes || null;
+    return row;
+}
+/**
+ * Apply rows to a domain's payments: `+` (or no id) adds, `M` changes, `-` deletes (softly). Then the general rule
+ * (§`checkPaymentsWithin`) and each touched kind's own rules run, in the same database transaction.
+ */
+async function savePayments(tx, domain, user, patches) {
+    const repo = tx.getRepository(payment_1.Payment);
+    const transactions = tx.getRepository(transaction_1.Transaction);
+    const touched = new Map();
+    const touch = (payment) => {
+        const kind = touched.get(payment.targetType) ?? { targetIds: new Set(), transactionIds: new Set() };
+        kind.targetIds.add(payment.targetId);
+        if (payment.transactionId)
+            kind.transactionIds.add(payment.transactionId);
+        touched.set(payment.targetType, kind);
+    };
+    const deletes = patches.filter(one => one.cuFlag === '-' && one.id).map(one => one.id);
+    if (deletes.length) {
+        const owned = await repo.find({ where: { domain: { id: domain.id }, id: (0, typeorm_1.In)(deletes) }, relations: ['transaction'] });
+        if (owned.length !== new Set(deletes).size)
+            throw new shell_1.Refusal('payment-not-found', {}, 'a payment was not found - reload and try again');
+        for (const one of owned)
+            touch({ ...one, transactionId: one.transaction.id });
+        await repo.softDelete({ id: (0, typeorm_1.In)(deletes) });
+    }
+    const saved = [];
+    for (const patch of patches.filter(one => one.cuFlag !== '-')) {
+        const isNew = !patch.id || patch.cuFlag === '+';
+        const { transactionId, ...row } = rowOf(patch, isNew);
+        const current = isNew
+            ? undefined
+            : await repo.findOne({ where: { domain: { id: domain.id }, id: patch.id }, relations: ['transaction'] });
+        if (!isNew && !current)
+            throw new shell_1.Refusal('payment-not-found', {}, 'a payment was not found - reload and try again');
+        const transactionOf = transactionId ?? current.transaction.id;
+        const transaction = await transactions.findOne({ where: { domain: { id: domain.id }, id: transactionOf } });
+        if (!transaction)
+            throw new shell_1.Refusal('payment-transaction-not-found', {}, 'the transaction was not found - reload and try again');
+        const targetType = row.targetType ?? current.targetType;
+        const targetId = row.targetId ?? current.targetId;
+        const twin = await repo.findOne({
+            where: { domain: { id: domain.id }, transaction: { id: transaction.id }, targetType, targetId }
+        });
+        if (twin && twin.id !== current?.id)
+            throw new shell_1.Refusal('payment-twice', { targetType, targetId }, 'the transaction already pays this - change that payment instead');
+        if (current)
+            touch({ ...current, transactionId: current.transaction.id });
+        const written = await repo.save({
+            ...(current ?? { domain, creator: user }),
+            ...row,
+            transaction,
+            updater: user
+        });
+        touch({ targetType: written.targetType, targetId: written.targetId, transactionId: transaction.id });
+        saved.push(written);
+    }
+    await checkPaymentsWithin(tx, domain, [...touched.values()].flatMap(kind => [...kind.transactionIds]));
+    for (const [targetType, kind] of touched) {
+        await (0, payment_targets_1.paymentTargetOf)(targetType)?.validate?.(tx, domain, {
+            targetIds: [...kind.targetIds],
+            transactionIds: [...kind.transactionIds]
+        });
+    }
+    return saved;
+}
+//# sourceMappingURL=payment-service.js.map

package/dist-server/service/payment/payment-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payment-service.js","sourceRoot":"","sources":["../../../server/service/payment/payment-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager, In } from 'typeorm'\n\nimport { Refusal } from '@things-factory/shell'\n\nimport { Transaction } from '../transaction/transaction'\nimport { Payment, PaymentMethod } from './payment'\nimport { paymentTargetOf } from './payment-targets'\nimport { PaymentPatch } from './payment-type'\n\n/** Amounts are decimals; a sum within half a cent of the transaction is the transaction. */\nconst CENT = 0.005\n\n/**\n * Within one purpose a transaction pays no more than itself. Run after its payments or its amount change.\n */\nexport async function checkPaymentsWithin(\n  tx: EntityManager,\n  domain: { id: string },\n  transactionIds: string[]\n): Promise<void> {\n  const ids = [...new Set(transactionIds)]\n  if (!ids.length) return\n\n  const transactions = await tx\n    .getRepository(Transaction)\n    .find({ where: { domain: { id: domain.id }, id: In(ids) }, select: ['id', 'amount'] })\n  const payments = await tx\n    .getRepository(Payment)\n    .find({ where: { domain: { id: domain.id }, transaction: { id: In(ids) } }, relations: ['transaction'] })\n  const paid = new Map<string, number>()\n  for (const payment of payments) {\n    const key = `${payment.transaction.id}|${payment.purpose}`\n    paid.set(key, (paid.get(key) ?? 0) + Number(payment.amount))\n  }\n  for (const transaction of transactions) {\n    for (const [key, sum] of paid) {\n      const [id, purpose] = key.split('|')\n      if (id !== transaction.id) continue\n      const amount = Math.abs(Number(transaction.amount))\n      if (sum > amount + CENT) {\n        throw new Refusal(\n          'payment-over-transaction',\n          { purpose, paid: sum, amount },\n          `${purpose}: ${sum} put on a transaction of ${amount}`\n        )\n      }\n    }\n  }\n}\n\n/** A patch as the row it writes: the target kind known, the amount more than zero, the purpose the kind's. */\nfunction rowOf(patch: PaymentPatch, isNew: boolean): Partial<Payment> & { transactionId?: string } {\n  const row: Record<string, any> = {}\n  const transactionId = patch.transaction?.id\n  if (isNew && !transactionId)\n    throw new Refusal('payment-transaction-required', {}, 'a payment needs the transaction it is a part of')\n  if (transactionId) row.transactionId = transactionId\n\n  if (patch.targetType !== undefined || isNew) {\n    const target = paymentTargetOf(String(patch.targetType ?? ''))\n    if (!target)\n      throw new Refusal(\n        'payment-target-unknown',\n        { targetType: patch.targetType },\n        `'${patch.targetType}' is not a kind of target any module registered`\n      )\n    row.targetType = patch.targetType\n    row.purpose = target.purpose\n  }\n  if (patch.targetId !== undefined || isNew) {\n    if (!patch.targetId) throw new Refusal('payment-target-required', {}, 'a payment needs what it paid')\n    row.targetId = patch.targetId\n  }\n  if (patch.amount !== undefined || isNew) {\n    const amount = Number(patch.amount)\n    if (!(amount > 0)) throw new Refusal('payment-amount-not-positive', {}, 'amount: must be more than zero')\n    row.amount = amount\n  }\n  if (patch.method !== undefined) row.method = patch.method ?? PaymentMethod.PERSON\n  if (patch.basis !== undefined) row.basis = patch.basis || null\n  if (patch.notes !== undefined) row.notes = patch.notes || null\n  return row\n}\n\n/**\n * Apply rows to a domain's payments: `+` (or no id) adds, `M` changes, `-` deletes (softly). Then the general rule\n * (§`checkPaymentsWithin`) and each touched kind's own rules run, in the same database transaction.\n */\nexport async function savePayments(\n  tx: EntityManager,\n  domain: { id: string },\n  user: any,\n  patches: PaymentPatch[]\n): Promise<Payment[]> {\n  const repo = tx.getRepository(Payment)\n  const transactions = tx.getRepository(Transaction)\n  const touched = new Map<string, { targetIds: Set<string>; transactionIds: Set<string> }>()\n  const touch = (payment: { targetType: string; targetId: string; transactionId?: string }) => {\n    const kind = touched.get(payment.targetType) ?? { targetIds: new Set<string>(), transactionIds: new Set<string>() }\n    kind.targetIds.add(payment.targetId)\n    if (payment.transactionId) kind.transactionIds.add(payment.transactionId)\n    touched.set(payment.targetType, kind)\n  }\n\n  const deletes = patches.filter(one => one.cuFlag === '-' && one.id).map(one => one.id!)\n  if (deletes.length) {\n    const owned = await repo.find({ where: { domain: { id: domain.id }, id: In(deletes) }, relations: ['transaction'] })\n    if (owned.length !== new Set(deletes).size)\n      throw new Refusal('payment-not-found', {}, 'a payment was not found - reload and try again')\n    for (const one of owned) touch({ ...one, transactionId: one.transaction.id })\n    await repo.softDelete({ id: In(deletes) })\n  }\n\n  const saved: Payment[] = []\n  for (const patch of patches.filter(one => one.cuFlag !== '-')) {\n    const isNew = !patch.id || patch.cuFlag === '+'\n    const { transactionId, ...row } = rowOf(patch, isNew)\n    const current = isNew\n      ? undefined\n      : await repo.findOne({ where: { domain: { id: domain.id }, id: patch.id }, relations: ['transaction'] })\n    if (!isNew && !current) throw new Refusal('payment-not-found', {}, 'a payment was not found - reload and try again')\n\n    const transactionOf = transactionId ?? current!.transaction.id\n    const transaction = await transactions.findOne({ where: { domain: { id: domain.id }, id: transactionOf } })\n    if (!transaction)\n      throw new Refusal('payment-transaction-not-found', {}, 'the transaction was not found - reload and try again')\n\n    const targetType = row.targetType ?? current!.targetType\n    const targetId = row.targetId ?? current!.targetId\n    const twin = await repo.findOne({\n      where: { domain: { id: domain.id }, transaction: { id: transaction.id }, targetType, targetId }\n    })\n    if (twin && twin.id !== current?.id)\n      throw new Refusal(\n        'payment-twice',\n        { targetType, targetId },\n        'the transaction already pays this - change that payment instead'\n      )\n\n    if (current) touch({ ...current, transactionId: current.transaction.id })\n    const written = await repo.save({\n      ...(current ?? { domain, creator: user }),\n      ...row,\n      transaction,\n      updater: user\n    } as Payment)\n    touch({ targetType: written.targetType, targetId: written.targetId, transactionId: transaction.id })\n    saved.push(written)\n  }\n\n  await checkPaymentsWithin(\n    tx,\n    domain,\n    [...touched.values()].flatMap(kind => [...kind.transactionIds])\n  )\n  for (const [targetType, kind] of touched) {\n    await paymentTargetOf(targetType)?.validate?.(tx, domain, {\n      targetIds: [...kind.targetIds],\n      transactionIds: [...kind.transactionIds]\n    })\n  }\n\n  return saved\n}\n"]}

package/dist-server/service/payment/payment-targets.d.ts

@@ -0,0 +1,31 @@
+import { EntityManager } from 'typeorm';
+import { PaymentPurpose } from './payment';
+/**
+ * The kinds of thing a transaction can pay, registered by the module that owns them.
+ *
+ * accounting keeps the general rules - the target kind is known, a transaction pays no more than itself within one
+ * purpose. What a target may take (a contract round's capacity, one VAT period per withdrawal) is the owner's rule,
+ * run in the same database transaction after the payments are written.
+ */
+export interface PaymentTarget {
+    /** What a payment on this kind tells of its transaction. */
+    purpose: PaymentPurpose;
+    /** What people call each target - 「H2026021 3차」 - for the screens that list what a transaction paid. */
+    label?: (tx: EntityManager, domain: {
+        id: string;
+    }, targetIds: string[]) => Promise<Map<string, string>>;
+    /**
+     * The owner's rules on the payments of its targets, given the targets and transactions a save touched. Throw a
+     * `Refusal` to refuse the save.
+     */
+    validate?: (tx: EntityManager, domain: {
+        id: string;
+    }, touched: {
+        targetIds: string[];
+        transactionIds: string[];
+    }) => Promise<void>;
+}
+/** Register a kind of target. A kind is registered once; registering it again is a mistake in the app. */
+export declare function registerPaymentTarget(targetType: string, target: PaymentTarget): void;
+export declare function paymentTargetOf(targetType: string): PaymentTarget | undefined;
+export declare function registeredPaymentTargets(): string[];

package/dist-server/service/payment/payment-targets.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerPaymentTarget = registerPaymentTarget;
+exports.paymentTargetOf = paymentTargetOf;
+exports.registeredPaymentTargets = registeredPaymentTargets;
+const targets = new Map();
+/** Register a kind of target. A kind is registered once; registering it again is a mistake in the app. */
+function registerPaymentTarget(targetType, target) {
+    if (targets.has(targetType))
+        throw new Error(`payment target '${targetType}' is registered twice`);
+    targets.set(targetType, target);
+}
+function paymentTargetOf(targetType) {
+    return targets.get(targetType);
+}
+function registeredPaymentTargets() {
+    return [...targets.keys()];
+}
+//# sourceMappingURL=payment-targets.js.map

package/dist-server/service/payment/payment-targets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payment-targets.js","sourceRoot":"","sources":["../../../server/service/payment/payment-targets.ts"],"names":[],"mappings":";;AA8BA,sDAGC;AAED,0CAEC;AAED,4DAEC;AAdD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAA;AAEhD,0GAA0G;AAC1G,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,MAAqB;IAC7E,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,UAAU,uBAAuB,CAAC,CAAA;IAClG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;AACjC,CAAC;AAED,SAAgB,eAAe,CAAC,UAAkB;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;AAChC,CAAC;AAED,SAAgB,wBAAwB;IACtC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;AAC5B,CAAC","sourcesContent":["import { EntityManager } from 'typeorm'\n\nimport { PaymentPurpose } from './payment'\n\n/**\n * The kinds of thing a transaction can pay, registered by the module that owns them.\n *\n * accounting keeps the general rules - the target kind is known, a transaction pays no more than itself within one\n * purpose. What a target may take (a contract round's capacity, one VAT period per withdrawal) is the owner's rule,\n * run in the same database transaction after the payments are written.\n */\nexport interface PaymentTarget {\n  /** What a payment on this kind tells of its transaction. */\n  purpose: PaymentPurpose\n  /** What people call each target - 「H2026021 3차」 - for the screens that list what a transaction paid. */\n  label?: (tx: EntityManager, domain: { id: string }, targetIds: string[]) => Promise<Map<string, string>>\n  /**\n   * The owner's rules on the payments of its targets, given the targets and transactions a save touched. Throw a\n   * `Refusal` to refuse the save.\n   */\n  validate?: (\n    tx: EntityManager,\n    domain: { id: string },\n    touched: { targetIds: string[]; transactionIds: string[] }\n  ) => Promise<void>\n}\n\nconst targets = new Map<string, PaymentTarget>()\n\n/** Register a kind of target. A kind is registered once; registering it again is a mistake in the app. */\nexport function registerPaymentTarget(targetType: string, target: PaymentTarget): void {\n  if (targets.has(targetType)) throw new Error(`payment target '${targetType}' is registered twice`)\n  targets.set(targetType, target)\n}\n\nexport function paymentTargetOf(targetType: string): PaymentTarget | undefined {\n  return targets.get(targetType)\n}\n\nexport function registeredPaymentTargets(): string[] {\n  return [...targets.keys()]\n}\n"]}

package/dist-server/service/payment/payment-type.d.ts

@@ -1,27 +1,23 @@
 import { ObjectRef } from '@things-factory/shell';
-import { Payment, PaymentDirection, PaymentType } from './payment';
+import { Payment, PaymentMethod } from './payment';
 export declare class NewPayment {
     transaction: ObjectRef;
-    currency?: string;
+    targetType: string;
+    targetId: string;
     amount: number;
-    paidAt: Date;
-    direction: PaymentDirection;
-    paymentType: PaymentType;
-    sourceBankAccount?: ObjectRef;
-    destinationBankAccount?: ObjectRef;
-    note?: string;
+    method?: PaymentMethod;
+    basis?: string;
+    notes?: string;
 }
 export declare class PaymentPatch {
     id?: string;
-    transaction: ObjectRef;
-    currency?: string;
-    amount: number;
-    paidAt: Date;
-    direction: PaymentDirection;
-    paymentType: PaymentType;
-    sourceBankAccount?: ObjectRef;
-    destinationBankAccount?: ObjectRef;
-    note?: string;
+    transaction?: ObjectRef;
+    targetType?: string;
+    targetId?: string;
+    amount?: number;
+    method?: PaymentMethod;
+    basis?: string;
+    notes?: string;
     cuFlag?: string;
 }
 export declare class PaymentList {