@chevre/domain 20.4.0-alpha.3 → 20.4.0-alpha.5

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const accountRepo = new chevre.repository.Account(mongoose.connection);
+    const permitRepo = new chevre.repository.ServiceOutput(mongoose.connection);
+
+    let updateResult = await accountRepo.unsetUnnecessaryFields({
+        filter: { status: { $exists: true } },
+        $unset: { status: 1 }
+    });
+    console.log('accounts unset.', updateResult);
+    updateResult = await permitRepo.unsetUnnecessaryFields({
+        filter: { 'paymentAccount.accountType': { $exists: true } },
+        $unset: { 'paymentAccount.accountType': 1 }
+    });
+    console.log('permits unset', updateResult);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/account.d.ts

@@ -45,16 +45,6 @@ export declare class MongoRepository {
     /**
      * 口座を解約する
      */
-    close(params: {
-        /**
-         * 口座番号
-         */
-        accountNumber: string;
-        /**
-         * 解約日時
-         */
-        closeDate: Date;
-    }): Promise<void>;
     /**
      * 口座番号で検索する
      */
@@ -134,4 +124,8 @@ export declare class MongoRepository {
      * 口座を検索する
      */
     search(params: factory.account.ISearchConditions): Promise<factory.account.IAccount[]>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/account.js

@@ -10,11 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = exports.modelName = void 0;
-const createDebug = require("debug");
 const account_1 = require("./mongoose/model/account");
 Object.defineProperty(exports, "modelName", { enumerable: true, get: function () { return account_1.modelName; } });
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:repository');
 /**
  * 口座リポジトリ
  */
@@ -93,11 +91,11 @@ class MongoRepository {
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        if (Array.isArray(params.statuses) && params.statuses.length > 0) {
-            andConditions.push({
-                status: { $in: params.statuses }
-            });
-        }
+        // if (Array.isArray(params.statuses) && params.statuses.length > 0) {
+        //     andConditions.push({
+        //         status: { $in: params.statuses }
+        //     });
+        // }
         const nameRegex = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$regex;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -159,8 +157,8 @@ class MongoRepository {
                         balance: p.initialBalance,
                         availableBalance: p.initialBalance,
                         pendingTransactions: [],
-                        openDate: p.openDate,
-                        status: factory.account.AccountStatusType.Opened
+                        openDate: p.openDate
+                        // status: factory.account.AccountStatusType.Opened
                     };
                 });
                 // const doc = await this.accountModel.create(account);
@@ -179,39 +177,47 @@ class MongoRepository {
     /**
      * 口座を解約する
      */
-    close(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug('closing account...');
-            const doc = yield this.accountModel.findOneAndUpdate({
-                accountNumber: params.accountNumber,
-                pendingTransactions: { $size: 0 },
-                status: factory.account.AccountStatusType.Opened
-            }, {
-                closeDate: params.closeDate,
-                status: factory.account.AccountStatusType.Closed
-            }, {
-                new: true
-            })
-                .exec();
-            // NotFoundであれば口座状態確認
-            if (doc === null) {
-                const account = yield this.findByAccountNumber({
-                    accountNumber: params.accountNumber
-                });
-                if (account.status === factory.account.AccountStatusType.Closed) {
-                    // すでに口座解約済の場合
-                    return;
-                }
-                else if (Array.isArray(account.pendingTransactions) && account.pendingTransactions.length > 0) {
-                    // 進行中取引が存在する場合の場合
-                    throw new factory.errors.Argument('accountNumber', 'Pending transactions exist');
-                }
-                else {
-                    throw new factory.errors.NotFound(this.accountModel.modelName);
-                }
-            }
-        });
-    }
+    // public async close(params: {
+    //     /**
+    //      * 口座番号
+    //      */
+    //     accountNumber: string;
+    //     /**
+    //      * 解約日時
+    //      */
+    //     closeDate: Date;
+    // }) {
+    //     const doc = await this.accountModel.findOneAndUpdate(
+    //         {
+    //             accountNumber: params.accountNumber,
+    //             pendingTransactions: { $size: 0 },
+    //             status: factory.account.AccountStatusType.Opened
+    //         },
+    //         {
+    //             closeDate: params.closeDate,
+    //             status: factory.account.AccountStatusType.Closed
+    //         },
+    //         {
+    //             new: true
+    //         }
+    //     )
+    //         .exec();
+    //     // NotFoundであれば口座状態確認
+    //     if (doc === null) {
+    //         const account = await this.findByAccountNumber({
+    //             accountNumber: params.accountNumber
+    //         });
+    //         if (account.status === factory.account.AccountStatusType.Closed) {
+    //             // すでに口座解約済の場合
+    //             return;
+    //         } else if (Array.isArray(account.pendingTransactions) && account.pendingTransactions.length > 0) {
+    //             // 進行中取引が存在する場合の場合
+    //             throw new factory.errors.Argument('accountNumber', 'Pending transactions exist');
+    //         } else {
+    //             throw new factory.errors.NotFound(this.accountModel.modelName);
+    //         }
+    //     }
+    // }
     /**
      * 口座番号で検索する
      */
@@ -233,7 +239,7 @@ class MongoRepository {
      */
     authorizeAmount(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.accountModel.findOneAndUpdate(Object.assign({ accountNumber: params.accountNumber, status: factory.account.AccountStatusType.Opened }, (params.force === true) ? undefined : { availableBalance: { $gte: params.amount } } // 利用可能金額確認
+            const doc = yield this.accountModel.findOneAndUpdate(Object.assign({ accountNumber: params.accountNumber }, (params.force === true) ? undefined : { availableBalance: { $gte: params.amount } } // 利用可能金額確認
             ), {
                 $inc: { availableBalance: -params.amount },
                 $push: { pendingTransactions: params.transaction } // 進行中取引追加
@@ -244,11 +250,11 @@ class MongoRepository {
                 const account = yield this.findByAccountNumber({
                     accountNumber: params.accountNumber
                 });
-                if (account.status === factory.account.AccountStatusType.Closed) {
-                    // 口座解約済の場合
-                    throw new factory.errors.Argument('accountNumber', 'Account already closed');
-                }
-                else if (typeof account.availableBalance === 'number' && account.availableBalance < params.amount) {
+                // if (account.status === factory.account.AccountStatusType.Closed) {
+                //     // 口座解約済の場合
+                //     throw new factory.errors.Argument('accountNumber', 'Account already closed');
+                // } else
+                if (typeof account.availableBalance === 'number' && account.availableBalance < params.amount) {
                     // 残高不足の場合
                     throw new factory.errors.Argument('accountNumber', 'Insufficient balance');
                 }
@@ -264,22 +270,22 @@ class MongoRepository {
     startTransaction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.accountModel.findOneAndUpdate({
-                accountNumber: params.accountNumber,
-                status: factory.account.AccountStatusType.Opened // 開いている口座
+                accountNumber: params.accountNumber
+                // status: factory.account.AccountStatusType.Opened // 開いている口座
             }, { $push: { pendingTransactions: params.transaction } })
                 .exec();
             // NotFoundであれば口座状態確認
             if (doc === null) {
-                const account = yield this.findByAccountNumber({
-                    accountNumber: params.accountNumber
-                });
-                if (account.status === factory.account.AccountStatusType.Closed) {
-                    // 口座解約済の場合
-                    throw new factory.errors.Argument('accountNumber', 'Account already closed');
-                }
-                else {
-                    throw new factory.errors.NotFound(this.accountModel.modelName);
-                }
+                // const account = await this.findByAccountNumber({
+                //     accountNumber: params.accountNumber
+                // });
+                // if (account.status === factory.account.AccountStatusType.Closed) {
+                //     // 口座解約済の場合
+                //     throw new factory.errors.Argument('accountNumber', 'Account already closed');
+                // } else {
+                //     throw new factory.errors.NotFound(this.accountModel.modelName);
+                // }
+                throw new factory.errors.NotFound(this.accountModel.modelName);
             }
         });
     }
@@ -419,5 +425,11 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.accountModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/event.js

@@ -473,11 +473,11 @@ class MongoRepository {
                     if (typeof additionalPropertyValue !== 'string') {
                         throw new factory.errors.NotFound('additionalProperty.value');
                     }
-                    const _c = creatingEventParams.attributes, { identifier, project, superEvent, workPerformed, typeOf, location, name, remainingAttendeeCapacity, maximumAttendeeCapacity } = _c, updateFields = __rest(_c, ["identifier", "project", "superEvent", "workPerformed", "typeOf", "location", "name", "remainingAttendeeCapacity", "maximumAttendeeCapacity"]);
+                    const _c = creatingEventParams.attributes, { eventStatus } = _c, setOnInsertFields = __rest(_c, ["eventStatus"]);
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                typeOf,
+                                typeOf: creatingEventParams.attributes.typeOf,
                                 // 追加特性をキーに更新
                                 additionalProperty: {
                                     $exists: true,
@@ -485,18 +485,9 @@ class MongoRepository {
                                 }
                             },
                             update: {
-                                $setOnInsert: {
-                                    _id: uniqid(),
-                                    typeOf,
-                                    project,
-                                    superEvent,
-                                    workPerformed,
-                                    location,
-                                    name
-                                    // ...creatingEventParams.attributes
-                                },
+                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() }),
                                 // 変更可能な属性のみ上書き
-                                $set: updateFields
+                                $set: { eventStatus }
                             },
                             upsert: true
                         }

package/lib/chevre/repo/serviceOutput.d.ts

@@ -29,4 +29,8 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/serviceOutput.js

@@ -169,5 +169,11 @@ class MongoRepository {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.serviceOutputModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -37,14 +37,6 @@ export declare function open(params: {
 /**
  * 口座を解約する
  */
-export declare function close(params: {
-    /**
-     * 口座番号
-     */
-    accountNumber: string;
-}): (repos: {
-    account: AccountRepo;
-}) => Promise<void>;
 /**
  * 転送する
  * 確定取引結果から、実際の転送アクションを実行します。

package/lib/chevre/service/account.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cancelMoneyTransfer = exports.transferMoney = exports.close = exports.open = void 0;
+exports.cancelMoneyTransfer = exports.transferMoney = exports.open = void 0;
 /**
  * 口座サービス
  * 開設、閉鎖等、口座アクション実行など
@@ -38,15 +38,21 @@ exports.open = open;
 /**
  * 口座を解約する
  */
-function close(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.account.close({
-            accountNumber: params.accountNumber,
-            closeDate: new Date()
-        });
-    });
-}
-exports.close = close;
+// export function close(params: {
+//     /**
+//      * 口座番号
+//      */
+//     accountNumber: string;
+// }) {
+//     return async (repos: {
+//         account: AccountRepo;
+//     }) => {
+//         await repos.account.close({
+//             accountNumber: params.accountNumber,
+//             closeDate: new Date()
+//         });
+//     };
+// }
 /**
  * 転送する
  * 確定取引結果から、実際の転送アクションを実行します。

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

@@ -29,7 +29,8 @@ function start(params) {
                 amount: params.object.amount,
                 toLocation: {
                     typeOf: account.typeOf,
-                    accountType: account.accountType,
+                    // 廃止(2023-02-16~)
+                    // accountType: account.accountType,
                     accountNumber: account.accountNumber,
                     name: account.name
                 },

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

@@ -22,7 +22,8 @@ function createMoneyTransferActionAttributes(params) {
         case factory.account.transactionType.Deposit:
             toLocation = {
                 typeOf: transaction.object.toLocation.typeOf,
-                accountType: transaction.object.toLocation.accountType,
+                // 廃止(2023-02-16~)
+                // accountType: transaction.object.toLocation.accountType,
                 accountNumber: transaction.object.toLocation.accountNumber,
                 name: transaction.recipient.name
             };
@@ -30,13 +31,15 @@ function createMoneyTransferActionAttributes(params) {
         case factory.account.transactionType.Transfer:
             fromLocation = {
                 typeOf: transaction.object.fromLocation.typeOf,
-                accountType: transaction.object.fromLocation.accountType,
+                // 廃止(2023-02-16~)
+                // accountType: transaction.object.fromLocation.accountType,
                 accountNumber: transaction.object.fromLocation.accountNumber,
                 name: transaction.agent.name
             };
             toLocation = {
                 typeOf: transaction.object.toLocation.typeOf,
-                accountType: transaction.object.toLocation.accountType,
+                // 廃止(2023-02-16~)
+                // accountType: transaction.object.toLocation.accountType,
                 accountNumber: transaction.object.toLocation.accountNumber,
                 name: transaction.recipient.name
             };
@@ -44,28 +47,29 @@ function createMoneyTransferActionAttributes(params) {
         case factory.account.transactionType.Withdraw:
             fromLocation = {
                 typeOf: transaction.object.fromLocation.typeOf,
-                accountType: transaction.object.fromLocation.accountType,
+                // 廃止(2023-02-16~)
+                // accountType: transaction.object.fromLocation.accountType,
                 accountNumber: transaction.object.fromLocation.accountNumber,
                 name: transaction.agent.name
             };
             break;
         default:
     }
-    let accountType;
-    const transactionType = params.transaction.typeOf;
-    switch (transactionType) {
-        case factory.account.transactionType.Deposit:
-            accountType = params.transaction.object.toLocation.accountType;
-            break;
-        case factory.account.transactionType.Transfer:
-            accountType = params.transaction.object.fromLocation.accountType;
-            break;
-        case factory.account.transactionType.Withdraw:
-            accountType = params.transaction.object.fromLocation.accountType;
-            break;
-        default:
-            throw new factory.errors.NotImplemented(`transaction type ${transactionType} not implemented`);
-    }
+    // let accountType: string;
+    // const transactionType = params.transaction.typeOf;
+    // switch (transactionType) {
+    //     case factory.account.transactionType.Deposit:
+    //         accountType = params.transaction.object.toLocation.accountType;
+    //         break;
+    //     case factory.account.transactionType.Transfer:
+    //         accountType = params.transaction.object.fromLocation.accountType;
+    //         break;
+    //     case factory.account.transactionType.Withdraw:
+    //         accountType = params.transaction.object.fromLocation.accountType;
+    //         break;
+    //     default:
+    //         throw new factory.errors.NotImplemented(`transaction type ${transactionType} not implemented`);
+    // }
     const purpose = {
         typeOf: transaction.typeOf,
         id: transaction.id,
@@ -84,7 +88,8 @@ function createMoneyTransferActionAttributes(params) {
         recipient: transaction.recipient,
         amount: {
             typeOf: 'MonetaryAmount',
-            currency: accountType,
+            // 廃止(2023-02-16~)
+            // currency: accountType,
             value: (typeof transaction.object.amount === 'number')
                 ? transaction.object.amount
                 : transaction.object.amount.value

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
                 },

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
                 },

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

@@ -221,25 +221,25 @@ function validateSeller(params) {
 function processAuthorizeAccount(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         yield (0, validation_1.validateAccount)(params)(repos);
-        const authorizeResult = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
+        const { pendingTransaction, currency } = 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: (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: pendingTransaction.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

@@ -63,8 +63,9 @@ function createServiceOutput(params) {
                 // 口座は複数のプロダクトに結合する可能性もあり、どのように利用されるかは知らない。ただ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:

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

@@ -10,7 +10,10 @@ declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITr
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
     product: ProductRepo;
     project: ProjectRepo;
-}) => Promise<IPendingTransaction>;
+}) => Promise<{
+    pendingTransaction: IPendingTransaction;
+    currency: 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 };
     });
 }
 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/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.5",
-    "@cinerino/sdk": "3.140.0-alpha.6",
+    "@chevre/factory": "4.289.0-alpha.6",
+    "@cinerino/sdk": "3.140.0-alpha.7",
     "@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.3"
+  "version": "20.4.0-alpha.5"
 }

package/example/src/chevre/migrateProjectSubscription.ts

@@ -1,51 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const projectRepo = new chevre.repository.Project(mongoose.connection);
-
-    const cursor = projectRepo.getCursor(
-        {
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('projects found');
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const project: chevre.factory.project.IProject = doc.toObject();
-
-        const useEventServiceAsProduct = project.subscription?.useEventServiceAsProduct;
-        const alreadyMigrated = useEventServiceAsProduct === true;
-
-        if (alreadyMigrated) {
-            console.log('already migrated.', project.id, i);
-        } else {
-            console.log(
-                'updating product...', project.id, i);
-            await projectRepo.findByIdAndIUpdate({
-                id: project.id,
-                subscription: { useEventServiceAsProduct: true }
-            });
-            updateCount += 1;
-            console.log('updated...', project.id, i);
-        }
-    });
-    console.log(i, 'projects checked');
-    console.log(updateCount, 'projects updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateSection.ts

@@ -1,105 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const client = redis.createClient({
-        host: <string>process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: <string>process.env.REDIS_KEY
-    });
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const events = await eventRepo.search({
-        typeOf: chevre.factory.eventType.ScreeningEvent,
-        project: { id: { $eq: '' } },
-        startFrom: new Date()
-        // startThrough: moment().add(4, 'day').toDate()
-    });
-    console.log(events.length, 'events found');
-
-    const sectionCode = 'Default';
-    await Promise.all(events.map(async (event) => {
-        await new Promise<void>((resolve) => {
-            const key = `chevre:itemAvailability:screeningEvent:${event.id}`;
-            client.hgetall(key, async (__, reply) => {
-                if (reply !== null && Object.keys(reply).length > 0) {
-
-                    const fieldAndValues = reply;
-                    for (const field of Object.keys(fieldAndValues)) {
-                        // セクションがなければキーを更新
-                        if (field.slice(0, 7) !== sectionCode) {
-                            console.log(event.id, field);
-                            const newField = `${sectionCode}${field}`;
-                            const newValue = fieldAndValues[field];
-                            console.log('saving...', newField, newValue);
-
-                            await new Promise<void>((resolveSet) => {
-                                client.hsetnx(key, newField, newValue, (___, setReply) => {
-                                    console.log('set', setReply, newField, newValue);
-
-                                    resolveSet();
-                                });
-                            });
-
-                            // 元のフィールドを削除
-                            await new Promise<void>((resolveSet) => {
-                                client.hdel(key, field, (___, setReply) => {
-                                    console.log('deleted', setReply, field);
-
-                                    resolveSet();
-                                });
-                            });
-                        }
-                    }
-                }
-
-                resolve();
-                // if (err !== null) {
-                //     reject(err);
-                // } else {
-                //     if (reply !== null) {
-                //         client.ttl(targetKey, (ttlErr, ttl) => {
-                //             console.log('ttl:', ttl);
-                //             const args = Object.keys(reply)
-                //                 .reduce(
-                //                     (a, b) => {
-                //                         return [...a, b, reply[b]];
-                //                     },
-                //                     []
-                //                 );
-                //             console.log(args.length, 'args ready');
-
-                //             newClient.multi()
-                //                 .hmset(newKey, ...args)
-                //                 .expire(newKey, ttl)
-                //                 .exec((hmsetErr, reply) => {
-                //                     console.log('hmset result:', hmsetErr, reply);
-                //                     resolve();
-                //                 });
-                //         });
-                //     } else {
-                //         console.error('targetKey not found');
-                //     }
-                // }
-            });
-        });
-    }));
-
-    // client.keys('chevre:itemAvailability:screeningEvent:*', async (err, reply) => {
-    //     console.log(err, reply.length, 'keys found');
-    //     const targetKeys = reply;
-
-    // });
-
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);