@chevre/domain 20.4.0-alpha.1 → 20.4.0-alpha.11

package/lib/chevre/repo/offer.js

@@ -35,7 +35,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_OFFER_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -184,8 +184,16 @@ class MongoRepository {
                 }
             });
         }
+        const appliesToMovieTicketServiceOutputTypeOfNin = (_4 = (_3 = (_2 = (_1 = params.priceSpecification) === null || _1 === void 0 ? void 0 : _1.appliesToMovieTicket) === null || _2 === void 0 ? void 0 : _2.serviceOutput) === null || _3 === void 0 ? void 0 : _3.typeOf) === null || _4 === void 0 ? void 0 : _4.$nin;
+        if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfNin)) {
+            andConditions.push({
+                'priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
+                    $nin: appliesToMovieTicketServiceOutputTypeOfNin
+                }
+            });
+        }
         if (params.priceSpecification !== undefined && params.priceSpecification !== null) {
-            const priceSpecificationPriceGte = (_1 = params.priceSpecification.price) === null || _1 === void 0 ? void 0 : _1.$gte;
+            const priceSpecificationPriceGte = (_5 = params.priceSpecification.price) === null || _5 === void 0 ? void 0 : _5.$gte;
             if (typeof priceSpecificationPriceGte === 'number') {
                 andConditions.push({
                     'priceSpecification.price': {
@@ -194,7 +202,7 @@ class MongoRepository {
                     }
                 });
             }
-            const priceSpecificationPriceLte = (_2 = params.priceSpecification.price) === null || _2 === void 0 ? void 0 : _2.$lte;
+            const priceSpecificationPriceLte = (_6 = params.priceSpecification.price) === null || _6 === void 0 ? void 0 : _6.$lte;
             if (typeof priceSpecificationPriceLte === 'number') {
                 andConditions.push({
                     'priceSpecification.price': {
@@ -203,7 +211,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountsReceivableGte = (_4 = (_3 = params.priceSpecification.accounting) === null || _3 === void 0 ? void 0 : _3.accountsReceivable) === null || _4 === void 0 ? void 0 : _4.$gte;
+            const accountsReceivableGte = (_8 = (_7 = params.priceSpecification.accounting) === null || _7 === void 0 ? void 0 : _7.accountsReceivable) === null || _8 === void 0 ? void 0 : _8.$gte;
             if (typeof accountsReceivableGte === 'number') {
                 andConditions.push({
                     'priceSpecification.accounting.accountsReceivable': {
@@ -212,7 +220,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountsReceivableLte = (_6 = (_5 = params.priceSpecification.accounting) === null || _5 === void 0 ? void 0 : _5.accountsReceivable) === null || _6 === void 0 ? void 0 : _6.$lte;
+            const accountsReceivableLte = (_10 = (_9 = params.priceSpecification.accounting) === null || _9 === void 0 ? void 0 : _9.accountsReceivable) === null || _10 === void 0 ? void 0 : _10.$lte;
             if (typeof accountsReceivableLte === 'number') {
                 andConditions.push({
                     'priceSpecification.accounting.accountsReceivable': {
@@ -221,7 +229,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountingCodeValueEq = (_9 = (_8 = (_7 = params.priceSpecification.accounting) === null || _7 === void 0 ? void 0 : _7.operatingRevenue) === null || _8 === void 0 ? void 0 : _8.codeValue) === null || _9 === void 0 ? void 0 : _9.$eq;
+            const accountingCodeValueEq = (_13 = (_12 = (_11 = params.priceSpecification.accounting) === null || _11 === void 0 ? void 0 : _11.operatingRevenue) === null || _12 === void 0 ? void 0 : _12.codeValue) === null || _13 === void 0 ? void 0 : _13.$eq;
             if (typeof accountingCodeValueEq === 'string') {
                 andConditions.push({
                     'priceSpecification.accounting.operatingRevenue.codeValue': {
@@ -230,7 +238,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountingCodeValueIn = (_12 = (_11 = (_10 = params.priceSpecification.accounting) === null || _10 === void 0 ? void 0 : _10.operatingRevenue) === null || _11 === void 0 ? void 0 : _11.codeValue) === null || _12 === void 0 ? void 0 : _12.$in;
+            const accountingCodeValueIn = (_16 = (_15 = (_14 = params.priceSpecification.accounting) === null || _14 === void 0 ? void 0 : _14.operatingRevenue) === null || _15 === void 0 ? void 0 : _15.codeValue) === null || _16 === void 0 ? void 0 : _16.$in;
             if (Array.isArray(accountingCodeValueIn)) {
                 andConditions.push({
                     'priceSpecification.accounting.operatingRevenue.codeValue': {
@@ -239,7 +247,7 @@ class MongoRepository {
                     }
                 });
             }
-            const referenceQuantityValueEq = (_14 = (_13 = params.priceSpecification.referenceQuantity) === null || _13 === void 0 ? void 0 : _13.value) === null || _14 === void 0 ? void 0 : _14.$eq;
+            const referenceQuantityValueEq = (_18 = (_17 = params.priceSpecification.referenceQuantity) === null || _17 === void 0 ? void 0 : _17.value) === null || _18 === void 0 ? void 0 : _18.$eq;
             if (typeof referenceQuantityValueEq === 'number') {
                 andConditions.push({
                     'priceSpecification.referenceQuantity.value': {
@@ -249,7 +257,7 @@ class MongoRepository {
                 });
             }
         }
-        const availableAtOrFromIdEq = (_16 = (_15 = params.availableAtOrFrom) === null || _15 === void 0 ? void 0 : _15.id) === null || _16 === void 0 ? void 0 : _16.$eq;
+        const availableAtOrFromIdEq = (_20 = (_19 = params.availableAtOrFrom) === null || _19 === void 0 ? void 0 : _19.id) === null || _20 === void 0 ? void 0 : _20.$eq;
         if (typeof availableAtOrFromIdEq === 'string') {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -258,7 +266,7 @@ class MongoRepository {
                 }
             });
         }
-        const availableAtOrFromIdIn = (_18 = (_17 = params.availableAtOrFrom) === null || _17 === void 0 ? void 0 : _17.id) === null || _18 === void 0 ? void 0 : _18.$in;
+        const availableAtOrFromIdIn = (_22 = (_21 = params.availableAtOrFrom) === null || _21 === void 0 ? void 0 : _21.id) === null || _22 === void 0 ? void 0 : _22.$in;
         if (Array.isArray(availableAtOrFromIdIn)) {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -267,7 +275,7 @@ class MongoRepository {
                 }
             });
         }
-        const addOnItemOfferedIdEq = (_21 = (_20 = (_19 = params.addOn) === null || _19 === void 0 ? void 0 : _19.itemOffered) === null || _20 === void 0 ? void 0 : _20.id) === null || _21 === void 0 ? void 0 : _21.$eq;
+        const addOnItemOfferedIdEq = (_25 = (_24 = (_23 = params.addOn) === null || _23 === void 0 ? void 0 : _23.itemOffered) === null || _24 === void 0 ? void 0 : _24.id) === null || _25 === void 0 ? void 0 : _25.$eq;
         if (typeof addOnItemOfferedIdEq === 'string') {
             andConditions.push({
                 'addOn.itemOffered.id': {
@@ -276,7 +284,7 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_23 = (_22 = params.hasMerchantReturnPolicy) === null || _22 === void 0 ? void 0 : _22.id) === null || _23 === void 0 ? void 0 : _23.$eq;
+        const hasMerchantReturnPolicyIdEq = (_27 = (_26 = params.hasMerchantReturnPolicy) === null || _26 === void 0 ? void 0 : _26.id) === null || _27 === void 0 ? void 0 : _27.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.id': {
@@ -285,7 +293,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_24 = params.additionalProperty) === null || _24 === void 0 ? void 0 : _24.$elemMatch;
+        const additionalPropertyElemMatch = (_28 = params.additionalProperty) === null || _28 === void 0 ? void 0 : _28.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -324,31 +332,22 @@ class MongoRepository {
             const sortedOfferIds = (Array.isArray(itemListElements))
                 ? itemListElements.map((element) => element.id)
                 : [];
-            // const offerCatalog = await this.offerCatalogModel.findById(
-            //     params.offerCatalog.id,
-            //     {
-            //         itemListElement: 1
-            //     }
-            // )
-            //     .exec()
-            //     .then((doc) => {
-            //         if (doc === null) {
-            //             throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
-            //         }
-            //         return <Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>doc.toObject();
-            //     });
-            // let sortedOfferIds: string[] = (Array.isArray(offerCatalog.itemListElement))
-            //     ? offerCatalog.itemListElement.map((element) => element.id)
-            //     : [];
-            // const filteredIds = params.ids;
-            // if (Array.isArray(filteredIds)) {
-            //     sortedOfferIds = sortedOfferIds.filter((id) => filteredIds.includes(id));
-            // }
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                offers = yield this.search(Object.assign({ id: { $in: sortedOfferIds } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                const searchOffersConditions = Object.assign(Object.assign({ id: { $in: sortedOfferIds } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
-                    : undefined));
+                    : undefined), (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+                    ? {
+                        priceSpecification: {
+                            appliesToMovieTicket: {
+                                serviceOutput: {
+                                    typeOf: { $nin: params.unacceptedPaymentMethod }
+                                }
+                            }
+                        }
+                    }
+                    : undefined);
+                offers = yield this.search(searchOffersConditions);
                 if (params.sort) {
                     // sorting
                     offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));

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/repository.d.ts

@@ -11,6 +11,7 @@ import { MongoRepository as AggregationRepo } from './repo/aggregation';
 import { MongoRepository as AssetTransactionRepo } from './repo/assetTransaction';
 import { MongoRepository as CategoryCodeRepo } from './repo/categoryCode';
 import { MongoRepository as CodeRepo } from './repo/code';
+import { MongoRepository as CommentRepo } from './repo/comment';
 import { MongoRepository as CreativeWorkRepo } from './repo/creativeWork';
 import { MongoRepository as CustomerRepo } from './repo/customer';
 import { MongoRepository as EmailMessageRepo } from './repo/emailMessage';
@@ -48,9 +49,6 @@ import { CognitoRepository as PersonRepo } from './repo/person';
  */
 export declare class Account extends AccountRepo {
 }
-/**
- * 口座アクションリポジトリ
- */
 /**
  * 経理レポートリポジトリ
  */
@@ -85,6 +83,11 @@ export declare class CategoryCode extends CategoryCodeRepo {
  */
 export declare class Code extends CodeRepo {
 }
+/**
+ * コメントリポジトリ
+ */
+export declare class Comment extends CommentRepo {
+}
 /**
  * 確認番号リポジトリ
  */

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -15,6 +15,7 @@ const aggregation_1 = require("./repo/aggregation");
 const assetTransaction_1 = require("./repo/assetTransaction");
 const categoryCode_1 = require("./repo/categoryCode");
 const code_1 = require("./repo/code");
+const comment_1 = require("./repo/comment");
 const creativeWork_1 = require("./repo/creativeWork");
 const customer_1 = require("./repo/customer");
 const emailMessage_1 = require("./repo/emailMessage");
@@ -53,10 +54,6 @@ const person_1 = require("./repo/person");
 class Account extends account_1.MongoRepository {
 }
 exports.Account = Account;
-/**
- * 口座アクションリポジトリ
- */
-// export class AccountAction extends AccountActionRepo { }
 /**
  * 経理レポートリポジトリ
  */
@@ -102,6 +99,12 @@ exports.CategoryCode = CategoryCode;
 class Code extends code_1.MongoRepository {
 }
 exports.Code = Code;
+/**
+ * コメントリポジトリ
+ */
+class Comment extends comment_1.MongoRepository {
+}
+exports.Comment = Comment;
 /**
  * 確認番号リポジトリ
  */

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,27 +38,27 @@ 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()
+//         });
+//     };
+// }
 /**
  * 転送する
  * 確定取引結果から、実際の転送アクションを実行します。
  */
 function transferMoney(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
-        // let action = await repos.accountAction.startByIdentifier<factory.actionType.MoneyTransfer>(actionAttributes);
-        // すでに完了していれば何もしない
-        // if (action.actionStatus === factory.actionStatusType.CompletedActionStatus) {
-        //     return;
-        // }
         const action = actionAttributes;
         let fromAccountNumber;
         let toAccountNumber;
@@ -81,18 +81,8 @@ function transferMoney(actionAttributes) {
             });
         }
         catch (error) {
-            // actionにエラー結果を追加
-            // try {
-            //     const actionError = { ...error, message: error.message, name: error.name };
-            //     await repos.accountAction.giveUp(action.typeOf, action.id, actionError);
-            // } catch (__) {
-            //     // 失敗したら仕方ない
-            // }
             throw error;
         }
-        // アクション完了
-        // const actionResult: factory.account.action.moneyTransfer.IResult = {};
-        // action = await repos.accountAction.complete(action.typeOf, action.id, actionResult);
     });
 }
 exports.transferMoney = transferMoney;
@@ -133,17 +123,6 @@ function cancelMoneyTransfer(params) {
                 : transaction.object.amount.value,
             transactionId: transaction.id
         });
-        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
-        // アクション取得
-        // const actions = await repos.accountAction.searchTransferActions({
-        //     purpose: {
-        //         typeOf: { $eq: transaction.typeOf },
-        //         id: { $eq: transaction.id }
-        //     }
-        // });
-        // await Promise.all(actions.map(async (action) => {
-        //     await repos.accountAction.cancel(action.typeOf, action.id);
-        // }));
     });
 }
 exports.cancelMoneyTransfer = cancelMoneyTransfer;

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
                 },
@@ -63,10 +64,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/factory.js

@@ -8,9 +8,7 @@ const factory = require("../../factory");
 /**
  * 転送アクション属性作成
  */
-// tslint:disable-next-line:max-func-body-length
 function createMoneyTransferActionAttributes(params) {
-    var _a, _b;
     const transaction = params.transaction;
     let fromLocation = {
         typeOf: transaction.agent.typeOf,
@@ -22,14 +20,10 @@ function createMoneyTransferActionAttributes(params) {
     };
     switch (transaction.typeOf) {
         case factory.account.transactionType.Deposit:
-            if (typeof ((_a = transaction.object.fromLocation) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-                fromLocation = Object.assign({ typeOf: transaction.object.fromLocation.typeOf, name: transaction.agent.name }, (typeof transaction.object.fromLocation.id === 'string')
-                    ? { id: transaction.object.fromLocation.id }
-                    : undefined);
-            }
             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
             };
@@ -37,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
             };
@@ -51,56 +47,56 @@ 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
             };
-            if (typeof ((_b = transaction.object.toLocation) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
-                toLocation = Object.assign({ typeOf: transaction.object.toLocation.typeOf, name: transaction.recipient.name }, (typeof transaction.object.toLocation.id === 'string')
-                    ? { id: transaction.object.toLocation.id }
-                    : undefined);
-            }
             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,
+        transactionNumber: transaction.transactionNumber
+        // ...(typeof transaction.identifier === 'string')
+        //     ? { identifier: transaction.identifier }
+        //     : /* istanbul ignore next */ undefined
+    };
     return {
         project: transaction.project,
         typeOf: factory.actionType.MoneyTransfer,
-        identifier: `${factory.actionType.MoneyTransfer}-${transaction.typeOf}-${transaction.id}`,
+        // identifier: `${factory.actionType.MoneyTransfer}-${transaction.typeOf}-${transaction.id}`,
         description: transaction.object.description,
-        // result: {
-        //     amount: transaction.object.amount
-        // },
-        object: {},
+        // object: {},
         agent: transaction.agent,
         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
         },
         fromLocation: fromLocation,
         toLocation: toLocation,
-        purpose: Object.assign({ typeOf: transaction.typeOf, id: transaction.id, transactionNumber: transaction.transactionNumber }, (typeof transaction.identifier === 'string')
-            ? { identifier: transaction.identifier }
-            : /* istanbul ignore next */ undefined)
+        purpose
     };
 }
 exports.createMoneyTransferActionAttributes = createMoneyTransferActionAttributes;

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) {