@chevre/domain 24.0.0-alpha.7 → 24.0.0-alpha.71

package/lib/chevre/service/payment/paymentCard.d.ts

@@ -1,6 +1,7 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { ActionRepo } from '../../repo/action';
+import type { PayActionRepo } from '../../repo/action/pay';
+import type { RefundActionRepo } from '../../repo/action/refund';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { ProductRepo } from '../../repo/product';
 import type { TaskRepo } from '../../repo/task';
@@ -17,13 +18,21 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
     product: ProductRepo;
 }) => Promise<void>;
 declare function payPaymentCard(params: factory.action.trade.pay.IAttributes): (repos: {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
 }) => Promise<void>;
 declare function refundPaymentCard(params: factory.task.refund.IData): (repos: {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;

package/lib/chevre/service/payment/paymentCard.js

@@ -36,7 +36,7 @@ exports.voidTransaction = voidTransaction;
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
 const pecorinoapi = __importStar(require("../../pecorinoapi"));
 const errorHandler_1 = require("../../errorHandler");
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const onPayActionCompleted_1 = require("./any/onPayActionCompleted");
 const onRefundActionCompletedOrFailed_1 = require("./any/onRefundActionCompletedOrFailed");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
@@ -44,13 +44,13 @@ function authorize(params, paymentServiceId) {
     return async (repos) => {
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string') {
-            throw new factory.errors.ArgumentNull('transactionNumber');
+            throw new factory_1.factory.errors.ArgumentNull('transactionNumber');
         }
         // 決済方法検証
         const { permit, currency } = await validatePaymentMethod(params, paymentServiceId)(repos);
         const accountNumber = permit.paymentAccount?.accountNumber;
         if (typeof accountNumber !== 'string') {
-            throw new factory.errors.ArgumentNull('permit.paymentAccount.accountNumber');
+            throw new factory_1.factory.errors.ArgumentNull('permit.paymentAccount.accountNumber');
         }
         // 口座取引開始
         let pendingTransaction;
@@ -60,7 +60,7 @@ function authorize(params, paymentServiceId) {
                 .toDate();
             pendingTransaction = await processAccountTransaction({
                 transactionNumber,
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 paymentMethod: params.object.paymentMethod,
                 agent: params.agent,
                 recipient: params.recipient,
@@ -82,31 +82,31 @@ function validatePaymentMethod(params, paymentServiceId) {
         const amount = params.object.paymentMethod?.amount;
         const paymentMethodType = params.object.paymentMethod?.identifier;
         if (typeof serviceOutputIdentifier !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.accountId');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.accountId');
         }
         if (typeof amount !== 'number') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.amount');
         }
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
         const paymentCatdProduct = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: paymentServiceId },
-            typeOf: { $eq: factory.product.ProductType.PaymentCard }
+            typeOf: { $eq: factory_1.factory.product.ProductType.PaymentCard }
         }, ['serviceOutput']
         // []
         )).shift();
         const currency = paymentCatdProduct?.serviceOutput?.amount?.currency;
         if (typeof currency !== 'string') {
-            throw new factory.errors.NotFound('product.serviceOutput.amount.currency');
+            throw new factory_1.factory.errors.NotFound('product.serviceOutput.amount.currency');
         }
         // プロダクトのavailableChannelを取得する
         const availableChannel = await repos.product.findAvailableChannel({
             project: { id: params.project.id },
-            typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
+            typeOf: factory_1.factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: paymentServiceId
         });
         const permitService = new (await pecorinoapi.loadPecorino()).service.Permit({
@@ -123,25 +123,25 @@ function validatePaymentMethod(params, paymentServiceId) {
         const serviceOutput = await permitService.findByIdentifier({
             project: { id: params.project.id },
             identifier: serviceOutputIdentifier,
-            issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
+            issuedThrough: { typeOf: factory_1.factory.product.ProductType.PaymentCard }
         });
         // サービスタイプを確認
-        if (serviceOutput.issuedThrough?.typeOf !== factory.product.ProductType.PaymentCard) {
-            throw new factory.errors.Argument('object.paymentMethod.accountId', 'serviceOutput.issuedThrough?.typeOf must be PaymentCard');
+        if (serviceOutput.issuedThrough?.typeOf !== factory_1.factory.product.ProductType.PaymentCard) {
+            throw new factory_1.factory.errors.Argument('object.paymentMethod.accountId', 'serviceOutput.issuedThrough?.typeOf must be PaymentCard');
         }
         if (serviceOutput.issuedThrough?.serviceType?.codeValue !== paymentMethodType) {
-            throw new factory.errors.Argument('object.paymentMethod.accountId', 'paymentMethodType not matched');
+            throw new factory_1.factory.errors.Argument('object.paymentMethod.accountId', 'paymentMethodType not matched');
         }
         // 出金金額設定を確認
         const paymentAmount = serviceOutput.paymentAmount;
         if (typeof paymentAmount?.minValue === 'number') {
             if (amount < paymentAmount.minValue) {
-                throw new factory.errors.Argument('object.paymentMethod.amount', `mininum payment amount requirement not satisfied`);
+                throw new factory_1.factory.errors.Argument('object.paymentMethod.amount', `mininum payment amount requirement not satisfied`);
             }
         }
         if (typeof paymentAmount?.maxValue === 'number') {
             if (amount > paymentAmount.maxValue) {
-                throw new factory.errors.Argument('object.paymentMethod.amount', `maximum payment amount requirement not satisfied`);
+                throw new factory_1.factory.errors.Argument('object.paymentMethod.amount', `maximum payment amount requirement not satisfied`);
             }
         }
         return { permit: serviceOutput, currency };
@@ -149,7 +149,7 @@ function validatePaymentMethod(params, paymentServiceId) {
 }
 function processAccountTransaction(params) {
     return async (repos) => {
-        const defaultName = `${factory.assetTransactionType.Pay} Transaction ${params.transactionNumber}`;
+        const defaultName = `${factory_1.factory.assetTransactionType.Pay} Transaction ${params.transactionNumber}`;
         const agent = {
             // ...params.agent,
             name: (typeof params.agent.name === 'string') ? params.agent.name : defaultName,
@@ -171,7 +171,7 @@ function processAccountTransaction(params) {
         // プロダクトのavailableChannelを取得する
         const availableChannel = await repos.product.findAvailableChannel({
             project: { id: params.project.id },
-            typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
+            typeOf: factory_1.factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: params.paymentServiceId
         });
         const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
@@ -188,7 +188,7 @@ function processAccountTransaction(params) {
         const pendingTransaction = await accountTransactionService.start({
             transactionNumber: params.transactionNumber,
             project: { typeOf: params.project.typeOf, id: params.project.id },
-            typeOf: factory.account.transactionType.Withdraw,
+            typeOf: factory_1.factory.account.transactionType.Withdraw,
             agent: agent,
             expires: params.expires,
             recipient: recipient,
@@ -214,14 +214,14 @@ function voidTransaction(params) {
         // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
         const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethodId');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
         // アクションステータスに関係なく取消処理実行
         // プロダクトのavailableChannelを取得する
         const availableChannel = await repos.product.findAvailableChannel({
             project: { id: transaction.project.id },
-            typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
+            typeOf: factory_1.factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: paymentServiceId
         });
         // 汎用中止サービスを使用(2022-09-27~)
@@ -250,12 +250,12 @@ function payPaymentCard(params) {
     return async (repos) => {
         const payObject = params.object;
         const paymentServiceId = payObject[0].id;
-        const action = await repos.action.start(params);
+        const action = await repos.actions.pay.start(params);
         try {
             const transactionNumber = payObject[0].paymentMethod.paymentMethodId;
             const availableChannel = await repos.product.findAvailableChannel({
                 project: { id: params.project.id },
-                typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
+                typeOf: factory_1.factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
             const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
@@ -272,7 +272,7 @@ function payPaymentCard(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.pay.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -280,7 +280,7 @@ function payPaymentCard(params) {
             throw error;
         }
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.pay.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -289,7 +289,11 @@ function payPaymentCard(params) {
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }
@@ -298,20 +302,20 @@ function refundPaymentCard(params) {
         const paymentMethodId = params.object[0]?.paymentMethod.paymentMethodId;
         const paymentServiceId = params.object[0]?.id;
         const payTransaction = await repos.assetTransaction.findByTransactionNumber({
-            typeOf: factory.assetTransactionType.Pay,
+            typeOf: factory_1.factory.assetTransactionType.Pay,
             transactionNumber: paymentMethodId
         });
         // accountNumberをpendingTransactionから取得する
         const accountNumber = payTransaction.object.pendingTransaction?.object.fromLocation?.accountNumber;
         if (typeof accountNumber !== 'string') {
-            throw new factory.errors.ArgumentNull('serviceOutput.paymentAccount.accountNumber');
+            throw new factory_1.factory.errors.ArgumentNull('serviceOutput.paymentAccount.accountNumber');
         }
-        const action = await repos.action.start(params);
+        const action = await repos.actions.refund.start(params);
         let accountTransactionNumber4refund;
         try {
             const availableChannel = await repos.product.findAvailableChannel({
                 project: { id: params.project.id },
-                typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
+                typeOf: factory_1.factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
             const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
@@ -340,7 +344,7 @@ function refundPaymentCard(params) {
                 });
                 const existingAccountTransactions = searchAccountTransactionsResult.data;
                 for (const existingAccountTransaction of existingAccountTransactions) {
-                    if (existingAccountTransaction.status === factory.transactionStatusType.Confirmed) {
+                    if (existingAccountTransaction.status === factory_1.factory.transactionStatusType.Confirmed) {
                         confirmedAccountTransactionNumber = existingAccountTransaction.transactionNumber;
                     }
                     else {
@@ -363,7 +367,7 @@ function refundPaymentCard(params) {
                 await accountTransactionService.start({
                     transactionNumber: transactionNumber,
                     project: { typeOf: params.project.typeOf, id: params.project.id },
-                    typeOf: factory.account.transactionType.Deposit,
+                    typeOf: factory_1.factory.account.transactionType.Deposit,
                     agent: agent,
                     expires: expires,
                     recipient: recipient,
@@ -388,7 +392,7 @@ function refundPaymentCard(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.refund.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -398,16 +402,20 @@ function refundPaymentCard(params) {
         const result = {
             accountTransaction: { transactionNumber: accountTransactionNumber4refund }
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.actions.refund.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
         await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
-            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
             potentialActions: params.potentialActions,
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }
@@ -422,7 +430,7 @@ function createAgent4refund(params) {
 }
 function createRecipient4refund(params) {
     if (typeof params.recipient?.typeOf !== 'string') {
-        throw new factory.errors.NotFound('recipient.typeOf');
+        throw new factory_1.factory.errors.NotFound('recipient.typeOf');
     }
     return {
         // ...<factory.person.IPerson | factory.creativeWork.softwareApplication.webApplication.ICreativeWork>params.recipient,

package/lib/chevre/service/permit.d.ts

@@ -1,7 +1,7 @@
 /**
  * 許可証サービス
  */
-import * as factory from '../factory';
+import { factory } from '../factory';
 import type { AccountRepo } from '../repo/account';
 import type { ServiceOutputRepo } from '../repo/serviceOutput';
 /**

package/lib/chevre/service/permit.js

@@ -29,7 +29,7 @@ exports.search = search;
 /**
  * 許可証サービス
  */
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const AccountService = __importStar(require("./account"));
 /**
  * 許可証発行
@@ -37,7 +37,7 @@ const AccountService = __importStar(require("./account"));
 function issue(params) {
     return async (repos) => {
         switch (params.issuedThrough.typeOf) {
-            case factory.product.ProductType.PaymentCard:
+            case factory_1.factory.product.ProductType.PaymentCard: {
                 // 口座開設
                 const openAccountParams = params.serviceOutputs.map((serviceOutput) => {
                     const accountTypeOf = serviceOutput?.paymentAccount?.typeOf;
@@ -46,13 +46,13 @@ function issue(params) {
                     const accountType = serviceOutput?.amount?.currency;
                     const initialBalance = serviceOutput?.amount?.value;
                     if (typeof accountTypeOf !== 'string' || accountTypeOf.length === 0) {
-                        throw new factory.errors.Internal('serviceOutput.paymentAccount.typeOf undefined');
+                        throw new factory_1.factory.errors.Internal('serviceOutput.paymentAccount.typeOf undefined');
                     }
                     if (typeof accountNumber !== 'string' || accountNumber.length === 0) {
-                        throw new factory.errors.Internal('serviceOutput.paymentAccount.accountNumber undefined');
+                        throw new factory_1.factory.errors.Internal('serviceOutput.paymentAccount.accountNumber undefined');
                     }
                     if (typeof accountType !== 'string' || accountType.length === 0) {
-                        throw new factory.errors.Internal('Account currency undefined');
+                        throw new factory_1.factory.errors.Internal('Account currency undefined');
                     }
                     return {
                         project: { id: params.project.id },
@@ -76,6 +76,7 @@ function issue(params) {
                     account: repos.account
                 });
                 break;
+            }
             default:
             // no op
         }
@@ -105,7 +106,7 @@ function search(project, params, projection) {
         };
         const productType = params.issuedThrough?.typeOf?.$eq;
         switch (productType) {
-            case factory.product.ProductType.PaymentCard:
+            case factory_1.factory.product.ProductType.PaymentCard: {
                 const permits = await repos.serviceOutput.search(searchConditions, projection);
                 permitsWithAccountDetail = permits;
                 // 口座詳細取得
@@ -138,6 +139,7 @@ function search(project, params, projection) {
                     });
                 }
                 break;
+            }
             default:
                 permitsWithAccountDetail = await repos.serviceOutput.search(searchConditions, projection);
         }

package/lib/chevre/service/product.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../factory';
+import { factory } from '../factory';
 import type { ActionRepo } from '../repo/action';
 import type { ServiceOutputRepo } from '../repo/serviceOutput';
 import type { TaskRepo } from '../repo/task';

package/lib/chevre/service/product.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,7 +8,7 @@ exports.registerService = registerService;
  * プロダクトサービス
  */
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const permit_1 = require("./permit");
 function registerService(params) {
     return async (repos) => {
@@ -83,8 +60,8 @@ function onRegistered(actionAttributes, __) {
                 taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
                     return {
                         project: a.project,
-                        name: factory.taskName.MoneyTransfer,
-                        status: factory.taskStatus.Ready,
+                        name: factory_1.factory.taskName.MoneyTransfer,
+                        status: factory_1.factory.taskStatus.Ready,
                         runsAt: now,
                         remainingNumberOfTries: 10,
                         numberOfTried: 0,

package/lib/chevre/service/reserve/cancelReservation.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { OfferRateLimitRepo } from '../../repo/rateLimit/offer';
@@ -36,9 +36,9 @@ declare function processUnlockOfferRateLimit(params: {
     };
     reservation: {
         reservationNumber: string;
-        reservedTicket: factory.reservation.ITicket;
+        reservedTicket: Pick<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'>;
     };
-    reservationFor: factory.assetTransaction.reserve.IReservationFor;
+    reservationFor: Pick<factory.assetTransaction.reserve.IReservationFor, 'id' | 'typeOf' | 'startDate'>;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;
 }) => Promise<void>;