@chevre/domain 20.4.0-alpha.0 → 20.4.0-alpha.10

package/lib/chevre/service/accountTransaction/transfer.js

@@ -47,13 +47,15 @@ function start(params) {
                 amount: params.object.amount,
                 fromLocation: {
                     typeOf: fromAccount.typeOf,
-                    accountType: fromAccount.accountType,
+                    // 廃止(2023-02-16~)
+                    // accountType: fromAccount.accountType,
                     accountNumber: fromAccount.accountNumber,
                     name: fromAccount.name
                 },
                 toLocation: {
                     typeOf: toAccount.typeOf,
-                    accountType: toAccount.accountType,
+                    // 廃止(2023-02-16~)
+                    // accountType: toAccount.accountType,
                     accountNumber: toAccount.accountNumber,
                     name: toAccount.name
                 },
@@ -95,10 +97,6 @@ function start(params) {
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
-        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
-        // アクション開始
-        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
-        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });

package/lib/chevre/service/accountTransaction/withdraw.js

@@ -36,7 +36,8 @@ function start(params) {
                 amount: params.object.amount,
                 fromLocation: {
                     typeOf: fromAccount.typeOf,
-                    accountType: fromAccount.accountType,
+                    // 廃止(2023-02-16~)
+                    // accountType: fromAccount.accountType,
                     accountNumber: fromAccount.accountNumber,
                     name: fromAccount.name
                 },
@@ -74,10 +75,6 @@ function start(params) {
             transaction: pendingTransaction,
             force: forcibly
         });
-        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
-        // アクション開始
-        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
-        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });

package/lib/chevre/service/accountTransaction.js

@@ -52,7 +52,7 @@ function confirm(params) {
         return repos.accountTransaction.confirm({
             typeOf: transaction.typeOf,
             id: transaction.id,
-            result: {},
+            // result: {},
             potentialActions
         });
     });

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -62,20 +62,29 @@ function start(params) {
             recipient: params.recipient,
             object: Object.assign(Object.assign({ amount,
                 fromLocation,
-                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, id: '', transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
+                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
             expires: params.expires
         };
         // 取引開始
         let transaction;
         try {
             transaction = yield repos.assetTransaction.start(startParams);
-            const pendingTransaction = yield authorizeAccount({ transaction })(repos);
-            yield repos.assetTransaction.findByIdAndUpdate({
-                id: transaction.id,
-                update: {
-                    'object.pendingTransaction': Object.assign({ typeOf: pendingTransaction.typeOf, id: pendingTransaction.id, transactionNumber: pendingTransaction.transactionNumber }, (typeof pendingTransaction.identifier === 'string') ? { identifier: pendingTransaction.identifier } : undefined)
-                }
-            });
+            // const pendingTransaction = await authorizeAccount({ transaction })(repos);
+            yield authorizeAccount({ transaction })(repos);
+            // 更新不要(2023-02-20~)
+            // await repos.assetTransaction.findByIdAndUpdate<factory.assetTransactionType.MoneyTransfer>({
+            //     id: transaction.id,
+            //     update: {
+            //         'object.pendingTransaction': {
+            //             typeOf: pendingTransaction.typeOf,
+            //             id: pendingTransaction.id,
+            //             transactionNumber: pendingTransaction.transactionNumber,
+            //             ...(typeof pendingTransaction.identifier === 'string')
+            //                 ? { identifier: pendingTransaction.identifier }
+            //                 : undefined
+            //         }
+            //     }
+            // });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -113,13 +122,12 @@ function authorizeAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const transaction = params.transaction;
-        let pendingTransaction;
         const fromLocation = transaction.object.fromLocation;
         const toLocation = transaction.object.toLocation;
         if (typeof ((_a = transaction.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string') {
             throw new factory.errors.NotFound('transaction.object.pendingTransaction.typeOf');
         }
-        pendingTransaction = yield MoneyTransferService.authorize({
+        yield MoneyTransferService.authorize({
             typeOf: transaction.object.pendingTransaction.typeOf,
             identifier: transaction.object.pendingTransaction.identifier,
             transactionNumber: transaction.object.pendingTransaction.transactionNumber,
@@ -143,7 +151,7 @@ function authorizeAccount(params) {
             recipient: transaction.recipient,
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         })(repos);
-        return pendingTransaction;
+        // return pendingTransaction;
     });
 }
 function fixMonetaryAmount(params, product) {

package/lib/chevre/service/assetTransaction/pay.js

@@ -220,26 +220,32 @@ function validateSeller(params) {
 }
 function processAuthorizeAccount(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
+        if (typeof amount !== 'number') {
+            throw new factory.errors.ArgumentNull('object.paymentMethod?.amount');
+        }
         yield (0, validation_1.validateAccount)(params)(repos);
-        const authorizeResult = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
+        const { pendingTransaction, currency, accountNumber } = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
         const totalPaymentDue = {
             typeOf: 'MonetaryAmount',
-            currency: authorizeResult.object.fromLocation.accountType,
-            value: (typeof authorizeResult.object.amount === 'number')
-                ? authorizeResult.object.amount
-                : authorizeResult.object.amount.value
+            currency,
+            value: amount
+            // value: (typeof pendingTransaction.object.amount === 'number')
+            //     ? pendingTransaction.object.amount
+            //     : pendingTransaction.object.amount.value
         };
-        const pendingTransaction = {
-            typeOf: authorizeResult.typeOf,
-            id: authorizeResult.id,
-            transactionNumber: authorizeResult.transactionNumber,
-            object: { fromLocation: { accountNumber: authorizeResult.object.fromLocation.accountNumber } }
+        const savingPendingTransaction = {
+            typeOf: pendingTransaction.typeOf,
+            id: pendingTransaction.id,
+            transactionNumber: pendingTransaction.transactionNumber,
+            object: { fromLocation: { accountNumber } }
         };
         return saveAuthorizeResult({
             id: transaction.id,
             update: {
                 'object.paymentMethod.totalPaymentDue': totalPaymentDue,
-                'object.pendingTransaction': pendingTransaction
+                'object.pendingTransaction': savingPendingTransaction
             }
         })(repos);
     });

package/lib/chevre/service/assetTransaction/registerService/factory.js

@@ -58,13 +58,15 @@ function createServiceOutput(params) {
                 throw new factory.errors.ArgumentNull('object.itemOffered.serviceOutput.accessCode');
             }
             paymentAccount = {
-                project: { typeOf: product.project.typeOf, id: product.project.id },
+                // 廃止(2023-02-20~)
+                // project: { typeOf: product.project.typeOf, id: product.project.id },
                 // ひとまず固定
                 // 口座は複数のプロダクトに結合する可能性もあり、どのように利用されるかは知らない。ただbalanceを管理するだけ。通貨は知っている。
                 typeOf: factory.accountType.Account,
                 // ひとまずPermit識別子と口座番号は同一
-                accountNumber: identifier,
-                accountType: amount.currency
+                accountNumber: identifier
+                // 廃止(2023-02-16~)
+                // accountType: amount.currency
             };
             break;
         case factory.product.ProductType.MembershipService:
@@ -73,7 +75,10 @@ function createServiceOutput(params) {
         default:
             throw new factory.errors.NotImplemented(`Product type ${product.typeOf} not implemented`);
     }
-    const issuedThrough = Object.assign({ project: { typeOf: product.project.typeOf, id: product.project.id }, typeOf: product.typeOf, id: product.id }, (typeof ((_m = product.serviceType) === null || _m === void 0 ? void 0 : _m.typeOf) === 'string') ? { serviceType: product.serviceType } : undefined);
+    const issuedThrough = Object.assign({ 
+        // 廃止(2023-02-20~)
+        // project: { typeOf: product.project.typeOf, id: product.project.id },
+        typeOf: product.typeOf, id: product.id }, (typeof ((_m = product.serviceType) === null || _m === void 0 ? void 0 : _m.typeOf) === 'string') ? { serviceType: product.serviceType } : undefined);
     return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project: { typeOf: product.project.typeOf, id: product.project.id }, identifier: identifier, issuedThrough, typeOf: serviceOutputType, dateIssued: params.dateIssued }, (typeof accessCode === 'string') ? { accessCode } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof validFor === 'string') ? { validFor } : undefined), (name !== undefined) ? { name } : undefined), (amount !== undefined) ? { amount } : undefined), (depositAmount !== undefined) ? { depositAmount } : undefined), (paymentAmount !== undefined) ? { paymentAmount } : undefined), (paymentAccount !== undefined) ? { paymentAccount } : undefined), (issuedBy !== undefined) ? { issuedBy } : undefined);
 }
 exports.createServiceOutput = createServiceOutput;

package/lib/chevre/service/delivery.js

@@ -88,7 +88,10 @@ function createGivePointAwardStartParams4moneyTransfer(params, transactionNumber
                 : params.purpose.typeOf,
             fromLocation: agent,
             toLocation,
-            pendingTransaction: { typeOf: factory.account.transactionType.Deposit, id: '', transactionNumber }
+            pendingTransaction: {
+                typeOf: factory.account.transactionType.Deposit,
+                transactionNumber
+            }
         } }, (typeof params.object.identifier === 'string') ? { identifier: params.object.identifier } : undefined);
 }
 /**
@@ -181,7 +184,10 @@ function processReturnPointAwardByTransactionIdentifier(params) {
                     fromLocation,
                     toLocation: depositTransaction.object.fromLocation,
                     description: `[Return Award]${depositTransaction.object.description}`,
-                    pendingTransaction: { typeOf: factory.account.transactionType.Withdraw, id: '', transactionNumber },
+                    pendingTransaction: {
+                        typeOf: factory.account.transactionType.Withdraw,
+                        transactionNumber
+                    },
                     force: true
                 }
             })(repos);
@@ -260,7 +266,10 @@ function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
                         // },
                         toLocation,
                         description: `[Return Award]${returningTransaction.object.description}`,
-                        pendingTransaction: { typeOf: factory.account.transactionType.Transfer, id: '', transactionNumber },
+                        pendingTransaction: {
+                            typeOf: factory.account.transactionType.Transfer,
+                            transactionNumber
+                        },
                         force: true
                     }
                 })(repos);

package/lib/chevre/service/event.js

@@ -21,6 +21,7 @@ const difference = require("lodash.difference");
 const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 const offer_1 = require("./offer");
 // const customsearch = google.customsearch('v1');
 const debug = createDebug('chevre-domain:service:event');
@@ -449,32 +450,11 @@ function createScreeningEventFromCOA(params) {
         priceCurrency: factory.priceCurrency.JPY
     };
     const { additionalProperty, coaInfo } = createScreeningEventAdditionalPropertyFromCOA(params);
-    return {
-        project: { typeOf: params.project.typeOf, id: params.project.id },
-        typeOf: factory.eventType.ScreeningEvent,
-        id: id,
-        identifier: id,
-        name: params.superEvent.name,
-        eventStatus: factory.eventStatusType.EventScheduled,
-        workPerformed: params.superEvent.workPerformed,
-        location: {
-            // 不要なので廃止(2022-12-19~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
+    return Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.eventType.ScreeningEvent, id: id, identifier: id, name: params.superEvent.name, eventStatus: factory.eventStatusType.EventScheduled, location: {
             typeOf: params.screenRoom.typeOf,
             branchCode: params.screenRoom.branchCode,
             name: params.screenRoom.name
-        },
-        endDate: endDate,
-        startDate: startDate,
-        superEvent: params.superEvent,
-        coaInfo,
-        offers: offers,
-        checkInCount: 0,
-        attendeeCount: 0,
-        maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
-        remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
-        additionalProperty
-    };
+        }, endDate: endDate, startDate: startDate, superEvent: params.superEvent, coaInfo, offers: offers, checkInCount: 0, attendeeCount: 0, maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity, remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity, additionalProperty }, (settings_1.settings.useEventWorkPerformed) ? { workPerformed: params.superEvent.workPerformed } : undefined);
 }
 function createScreeningEventAdditionalPropertyFromCOA(params) {
     const coaInfo = {

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

@@ -52,7 +52,7 @@ export declare function authorize(params: {
         typeOf: factory.assetTransactionType;
         id: string;
     };
-}): IAuthorizeOperation<factory.action.transfer.moneyTransfer.IPendingTransaction>;
+}): IAuthorizeOperation<void>;
 /**
  * 口座承認取消
  */

package/lib/chevre/service/moneyTransfer.js

@@ -28,9 +28,9 @@ function authorize(params) {
             id: params.purpose.id
         });
         // 口座取引開始
-        let pendingTransaction;
+        // let pendingTransaction: factory.action.transfer.moneyTransfer.IPendingTransaction;
         try {
-            pendingTransaction = yield processAccountTransaction({
+            yield processAccountTransaction({
                 typeOf: params.typeOf,
                 identifier: params.identifier,
                 transactionNumber: params.transactionNumber,
@@ -46,13 +46,12 @@ function authorize(params) {
             error = (0, errorHandler_1.handlePecorinoError)(error);
             throw error;
         }
-        return pendingTransaction;
+        // return pendingTransaction;
     });
 }
 exports.authorize = authorize;
 function processAccountTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let pendingTransaction;
         const transaction = params.transaction;
         const agent = createAccountTransactionAgent(params);
         const recipient = createAccountTransactionRecipient(params);
@@ -75,7 +74,7 @@ function processAccountTransaction(params) {
         });
         switch (params.typeOf) {
             case factory.account.transactionType.Deposit:
-                pendingTransaction = yield processDepositTransaction({
+                yield processDepositTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -88,7 +87,7 @@ function processAccountTransaction(params) {
                 })({ permit: permitService });
                 break;
             case factory.account.transactionType.Transfer:
-                pendingTransaction = yield processTransferTransaction({
+                yield processTransferTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -101,7 +100,7 @@ function processAccountTransaction(params) {
                 })({ permit: permitService });
                 break;
             case factory.account.transactionType.Withdraw:
-                pendingTransaction = yield processWithdrawTransaction({
+                yield processWithdrawTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -116,7 +115,7 @@ function processAccountTransaction(params) {
             default:
                 throw new factory.errors.Argument('Object', 'At least one of accounts from and to must be specified');
         }
-        return pendingTransaction;
+        // return pendingTransaction;
     });
 }
 function processDepositTransaction(params) {
@@ -513,7 +512,7 @@ function processDepositFromNow(params, permitServiceCredentials, transactionNumb
             recipient, object: {
                 amount: { value: amount },
                 description: description,
-                fromLocation: params.fromLocation,
+                // fromLocation: params.fromLocation,
                 toLocation: { accountNumber: String((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber) }
             } }, (typeof accountTransactionIdentifier === 'string') ? { identifier: accountTransactionIdentifier } : undefined));
         try {

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -158,7 +158,6 @@ function processStartDepositTransaction(params) {
                     description: description,
                     pendingTransaction: {
                         typeOf: factory.account.transactionType.Deposit,
-                        id: '',
                         transactionNumber: params.transactionNumber
                     }
                 },

package/lib/chevre/service/offer/moneyTransfer/returnMoneyTransfer.js

@@ -57,7 +57,6 @@ function returnMoneyTransfer(params) {
                         toLocation: depositTransaction.object.fromLocation,
                         pendingTransaction: {
                             typeOf: factory.account.transactionType.Withdraw,
-                            id: '',
                             transactionNumber: publishTransactionNumber4returnMoneyTransferResult.transactionNumber
                         }
                     }

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

@@ -6,11 +6,15 @@ import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
-declare type IPendingTransaction = factory.account.transaction.withdraw.ITransaction;
+declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'transactionNumber' | 'typeOf'>;
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
     product: ProductRepo;
     project: ProjectRepo;
-}) => Promise<IPendingTransaction>;
+}) => Promise<{
+    pendingTransaction: IPendingTransaction;
+    currency: string;
+    accountNumber: string;
+}>;
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     product: ProductRepo;
 }) => Promise<void>;

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

@@ -29,7 +29,7 @@ function authorize(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         // 決済方法検証
-        const permit = yield validatePaymentMethod(params, paymentServiceId)(repos);
+        const { permit, currency } = yield validatePaymentMethod(params, paymentServiceId)(repos);
         const accountNumber = (_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber;
         if (typeof accountNumber !== 'string') {
             throw new factory.errors.ArgumentNull('permit.paymentAccount.accountNumber');
@@ -55,13 +55,13 @@ function authorize(params, paymentServiceId) {
             // PecorinoAPIのエラーをハンドリング
             throw (0, errorHandler_1.handlePecorinoError)(error);
         }
-        return pendingTransaction;
+        return { pendingTransaction, currency, accountNumber };
     });
 }
 exports.authorize = authorize;
 function validatePaymentMethod(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const serviceOutputIdentifier = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.accountId;
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
         const paymentMethodType = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.typeOf;
@@ -74,6 +74,14 @@ function validatePaymentMethod(params, paymentServiceId) {
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
+        // プロダクトから通貨区分を取得
+        const paymentCatdProduct = yield repos.product.findById({
+            id: paymentServiceId
+        });
+        const currency = (_e = (_d = paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
+        if (typeof currency !== 'string') {
+            throw new factory.errors.NotFound('product.serviceOutput.amount.currency');
+        }
         // プロダクトのavailableChannelを取得する
         const availableChannel = yield repos.product.findAvailableChannel({
             project: { id: params.project.id },
@@ -83,9 +91,9 @@ function validatePaymentMethod(params, paymentServiceId) {
         const permitService = new pecorinoapi.service.Permit({
             endpoint: String(availableChannel.serviceUrl),
             auth: new pecorinoapi.auth.ClientCredentials({
-                domain: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.authorizeServerDomain),
-                clientId: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.clientId),
-                clientSecret: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.clientSecret),
+                domain: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.authorizeServerDomain),
+                clientId: String((_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.clientId),
+                clientSecret: String((_h = availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.clientSecret),
                 scopes: [],
                 state: ''
             })
@@ -97,7 +105,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
         });
         // サービスタイプを確認
-        if (((_h = (_g = serviceOutput.issuedThrough) === null || _g === void 0 ? void 0 : _g.serviceType) === null || _h === void 0 ? void 0 : _h.codeValue) !== paymentMethodType) {
+        if (((_k = (_j = serviceOutput.issuedThrough) === null || _j === void 0 ? void 0 : _j.serviceType) === null || _k === void 0 ? void 0 : _k.codeValue) !== paymentMethodType) {
             throw new factory.errors.Argument('object.paymentMethod.accountId', 'paymentMethodType not matched');
         }
         // 出金金額設定を確認
@@ -112,7 +120,7 @@ function validatePaymentMethod(params, paymentServiceId) {
                 throw new factory.errors.Argument('object.paymentMethod.amount', `maximum payment amount requirement not satisfied`);
             }
         }
-        return serviceOutput;
+        return { permit: serviceOutput, currency };
     });
 }
 function processAccountTransaction(params) {

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

@@ -30,6 +30,9 @@ export declare function activate(params: {
 }): (repos: {
     serviceOutput: ServiceOutputRepo;
 }) => Promise<factory.permit.IPermit>;
+declare type IPermitWithAccountDetail = Omit<factory.permit.IPermit, 'paymentAccount'> & {
+    paymentAccount?: factory.permit.IPaymentAccountWithDetail;
+};
 /**
  * プロジェクト指定で、許可証を検索する(ペイメントカードプロダクトの場合、口座詳細込み)
  */
@@ -38,4 +41,5 @@ export declare function search(project: {
 }, params: factory.product.IServiceOutputSearchConditions, projection?: any): (repos: {
     account: AccountRepo;
     serviceOutput: ServiceOutputRepo;
-}) => Promise<factory.permit.IPermit[]>;
+}) => Promise<IPermitWithAccountDetail[]>;
+export {};

package/lib/chevre/service/permit.js

@@ -78,33 +78,40 @@ exports.activate = activate;
 function search(project, params, projection) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let serviceOutputs;
+        let permitsWithAccountDetail;
         // アウトプット検索条件のプロジェクトは強制的に上書き
         const searchConditions = Object.assign(Object.assign({}, params), { project: { id: { $eq: project.id } } });
         const productType = (_b = (_a = params.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq;
         switch (productType) {
             case factory.product.ProductType.PaymentCard:
-                serviceOutputs = yield repos.serviceOutput.search(searchConditions, projection);
+                const permits = yield repos.serviceOutput.search(searchConditions, projection);
+                permitsWithAccountDetail = permits;
                 // 口座詳細取得
-                const accountNumbers = serviceOutputs.map((s) => { var _a; return (_a = s.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber; })
-                    .filter((a) => typeof a === 'string');
+                const accountNumbers = permits.map((permit) => { var _a; return (_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber; })
+                    .filter((accountNumber) => typeof accountNumber === 'string');
                 if (accountNumbers.length > 0) {
                     const accounts = yield repos.account.search({
                         project: { id: { $eq: project.id } },
                         accountNumbers: accountNumbers
                     });
-                    serviceOutputs = serviceOutputs.map((s) => {
-                        const account = accounts.find((a) => { var _a; return a.accountNumber === ((_a = s.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber); });
-                        return Object.assign(Object.assign({}, s), (account !== undefined)
-                            ? { paymentAccount: account }
-                            : undefined);
+                    permitsWithAccountDetail = permits.map((permit) => {
+                        const account = accounts.find((a) => { var _a; return a.accountNumber === ((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber); });
+                        const paymentAccount = (typeof (account === null || account === void 0 ? void 0 : account.typeOf) === 'string')
+                            ? {
+                                accountNumber: account.accountNumber,
+                                availableBalance: account.availableBalance,
+                                balance: account.balance,
+                                typeOf: account.typeOf
+                            }
+                            : undefined;
+                        return Object.assign(Object.assign({}, permit), { paymentAccount });
                     });
                 }
                 break;
             default:
-                serviceOutputs = yield repos.serviceOutput.search(searchConditions, projection);
+                permitsWithAccountDetail = (yield repos.serviceOutput.search(searchConditions, projection));
         }
-        return serviceOutputs;
+        return permitsWithAccountDetail;
     });
 }
 exports.search = search;

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -328,7 +328,6 @@ function processMoneyTransferTransaction(params) {
                     toLocation,
                     pendingTransaction: {
                         typeOf: factory.account.transactionType.Transfer,
-                        id: '',
                         transactionNumber: params.transactionNumber
                     },
                     force: false

package/lib/chevre/settings.d.ts

@@ -21,6 +21,7 @@ export declare type ISettings = factory.project.ISettings & {
     userPoolIdOld: string;
     userPoolIdNew: string;
     maxNumCreditCardPaymentMethod?: number;
+    useEventWorkPerformed: boolean;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;

package/lib/chevre/settings.js

@@ -54,7 +54,7 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 /**
  * グローバル設定
  */
-exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged: {
+exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrderStatusChanged: {
         informOrder: informOrderUrls
             .filter((url) => url.length > 0)
             .map((url) => {
@@ -94,4 +94,4 @@ exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged:
         timeout: triggerWebhookTimeout
     }, maximumReservationGracePeriodInDays: MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS, userPoolIdOld: String(process.env.USERPOOL_ID_OLD), userPoolIdNew: String(process.env.USERPOOL_ID_NEW) }, (typeof MAX_NUM_CREDIT_CARD_PAYMENT_METHOD === 'number')
     ? { maxNumCreditCardPaymentMethod: MAX_NUM_CREDIT_CARD_PAYMENT_METHOD }
-    : undefined);
+    : undefined), { useEventWorkPerformed: process.env.USE_EVENT_WORK_PERFORMED === '1' });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.0",
-    "@cinerino/sdk": "3.139.0",
+    "@chevre/factory": "4.289.0-alpha.9",
+    "@cinerino/sdk": "3.140.0-alpha.11",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.0"
+  "version": "20.4.0-alpha.10"
 }