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

package/lib/chevre/repo/mongoose/model/comments.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.modelName = void 0;
+const mongoose = require("mongoose");
+const modelName = 'Comment';
+exports.modelName = modelName;
+const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
+/**
+ * コメントスキーマ
+ */
+const schema = new mongoose.Schema({
+    project: mongoose.SchemaTypes.Mixed,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    about: mongoose.SchemaTypes.Mixed,
+    additionalProperty: [mongoose.SchemaTypes.Mixed],
+    author: mongoose.SchemaTypes.Mixed,
+    // commnet: Comment[]
+    commentCount: { type: Number, default: 0 },
+    dateCreated: Date,
+    dateModified: Date,
+    text: {
+        type: String,
+        required: true
+    }
+}, {
+    collection: 'comments',
+    id: true,
+    read: 'primaryPreferred',
+    writeConcern: writeConcern,
+    strict: true,
+    useNestedStrict: true,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+});
+exports.schema = schema;
+schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
+schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
+schema.index({ dateCreated: 1 }, {
+    name: 'searchByDateCreated'
+});
+schema.index({ 'project.id': 1, dateCreated: 1 }, {
+    name: 'searchByProjectId'
+});
+schema.index({ 'about.id': 1, dateCreated: 1 }, {
+    name: 'searchByAboutId',
+    partialFilterExpression: {
+        'about.id': { $exists: true }
+    }
+});
+schema.index({ additionalProperty: 1, dateCreated: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
+mongoose.model(modelName, schema)
+    .on('index', 
+// tslint:disable-next-line:no-single-line-block-comment
+/* istanbul ignore next */
+(error) => {
+    if (error !== undefined) {
+        // tslint:disable-next-line:no-console
+        console.error(error);
+    }
+});

package/lib/chevre/repo/mongoose/model/order.js

@@ -32,8 +32,8 @@ const schema = new mongoose.Schema({
     orderDate: Date,
     isGift: Boolean,
     dateReturned: Date,
-    // ↓追加(2022-04-15~)
-    orderedItem: [mongoose.SchemaTypes.Mixed]
+    orderedItem: [mongoose.SchemaTypes.Mixed],
+    additionalProperty: [mongoose.SchemaTypes.Mixed] // 追加(2023-02-13~)
 }, {
     collection: 'orders',
     id: true,
@@ -297,6 +297,12 @@ schema.index({ price: 1, orderDate: -1 }, {
         price: { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, orderDate: -1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

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

@@ -33,9 +33,15 @@ export declare class MongoRepository {
      * 変更可能な属性を更新する
      */
     updateChangeableAttributes(params: {
+        additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
         name?: string;
         orderNumber: string;
     }): Promise<void>;
+    findById(params: {
+        id: string;
+        inclusion: string[];
+        exclusion: string[];
+    }): Promise<factory.order.IOrder>;
     /**
      * 注文番号から注文を取得する
      */

package/lib/chevre/repo/order.js

@@ -24,7 +24,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_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;
+        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;
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -39,6 +39,22 @@ class MongoRepository {
                 }
             }
         }
+        const additionalPropertyAll = (_a = params.additionalProperty) === null || _a === void 0 ? void 0 : _a.$all;
+        if (Array.isArray(additionalPropertyAll)) {
+            andConditions.push({ additionalProperty: { $exists: true, $all: additionalPropertyAll } });
+        }
+        const additionalPropertyIn = (_b = params.additionalProperty) === null || _b === void 0 ? void 0 : _b.$in;
+        if (Array.isArray(additionalPropertyIn)) {
+            andConditions.push({ additionalProperty: { $exists: true, $in: additionalPropertyIn } });
+        }
+        const additionalPropertyNin = (_c = params.additionalProperty) === null || _c === void 0 ? void 0 : _c.$nin;
+        if (Array.isArray(additionalPropertyNin)) {
+            andConditions.push({ additionalProperty: { $nin: additionalPropertyNin } });
+        }
+        const additionalPropertyElemMatch = (_d = params.additionalProperty) === null || _d === void 0 ? void 0 : _d.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.identifier !== undefined) {
@@ -87,7 +103,7 @@ class MongoRepository {
                 });
             }
         }
-        const brokerIdEq = (_b = (_a = params.broker) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        const brokerIdEq = (_f = (_e = params.broker) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
         if (typeof brokerIdEq === 'string') {
             andConditions.push({
                 'broker.id': {
@@ -304,7 +320,7 @@ class MongoRepository {
                 }
             }
         }
-        const nameEq = (_c = params.name) === null || _c === void 0 ? void 0 : _c.$eq;
+        const nameEq = (_g = params.name) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof nameEq === 'string') {
             andConditions.push({
                 name: {
@@ -313,7 +329,7 @@ class MongoRepository {
                 }
             });
         }
-        const nameRegex = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$regex;
+        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 name: {
@@ -346,7 +362,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIdentifierIn = (_g = (_f = (_e = params.acceptedOffers) === null || _e === void 0 ? void 0 : _e.itemOffered) === null || _f === void 0 ? void 0 : _f.identifier) === null || _g === void 0 ? void 0 : _g.$in;
+        const itemOfferedIdentifierIn = (_l = (_k = (_j = params.acceptedOffers) === null || _j === void 0 ? void 0 : _j.itemOffered) === null || _k === void 0 ? void 0 : _k.identifier) === null || _l === void 0 ? void 0 : _l.$in;
         if (Array.isArray(itemOfferedIdentifierIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.identifier': {
@@ -355,7 +371,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedTypeOfIn = (_k = (_j = (_h = params.acceptedOffers) === null || _h === void 0 ? void 0 : _h.itemOffered) === null || _j === void 0 ? void 0 : _j.typeOf) === null || _k === void 0 ? void 0 : _k.$in;
+        const itemOfferedTypeOfIn = (_p = (_o = (_m = params.acceptedOffers) === null || _m === void 0 ? void 0 : _m.itemOffered) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$in;
         if (Array.isArray(itemOfferedTypeOfIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.typeOf': {
@@ -364,7 +380,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughTypeOfEq = (_p = (_o = (_m = (_l = params.acceptedOffers) === null || _l === void 0 ? void 0 : _l.itemOffered) === null || _m === void 0 ? void 0 : _m.issuedThrough) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$eq;
+        const itemOfferedIssuedThroughTypeOfEq = (_t = (_s = (_r = (_q = params.acceptedOffers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.issuedThrough) === null || _s === void 0 ? void 0 : _s.typeOf) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.typeOf': {
@@ -373,7 +389,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughIdIn = (_t = (_s = (_r = (_q = params.acceptedOffers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.issuedThrough) === null || _s === void 0 ? void 0 : _s.id) === null || _t === void 0 ? void 0 : _t.$in;
+        const itemOfferedIssuedThroughIdIn = (_x = (_w = (_v = (_u = params.acceptedOffers) === null || _u === void 0 ? void 0 : _u.itemOffered) === null || _v === void 0 ? void 0 : _v.issuedThrough) === null || _w === void 0 ? void 0 : _w.id) === null || _x === void 0 ? void 0 : _x.$in;
         if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.id': {
@@ -382,7 +398,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIdentifierEq = (_x = (_w = (_v = (_u = params.acceptedOffers) === null || _u === void 0 ? void 0 : _u.itemOffered) === null || _v === void 0 ? void 0 : _v.programMembershipUsed) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$eq;
+        const itemOfferedProgramMembershipUsedIdentifierEq = (_1 = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.programMembershipUsed) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$eq;
         if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
@@ -391,7 +407,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_3 = (_2 = (_1 = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.programMembershipUsed) === null || _0 === void 0 ? void 0 : _0.issuedThrough) === null || _1 === void 0 ? void 0 : _1.serviceType) === null || _2 === void 0 ? void 0 : _2.codeValue) === null || _3 === void 0 ? void 0 : _3.$eq;
+        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_7 = (_6 = (_5 = (_4 = (_3 = (_2 = params.acceptedOffers) === null || _2 === void 0 ? void 0 : _2.itemOffered) === null || _3 === void 0 ? void 0 : _3.programMembershipUsed) === null || _4 === void 0 ? void 0 : _4.issuedThrough) === null || _5 === void 0 ? void 0 : _5.serviceType) === null || _6 === void 0 ? void 0 : _6.codeValue) === null || _7 === void 0 ? void 0 : _7.$eq;
         if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -587,7 +603,7 @@ class MongoRepository {
                 });
             }
         }
-        const paymentMethodAdditionalPropertyAll = (_5 = (_4 = params.paymentMethods) === null || _4 === void 0 ? void 0 : _4.additionalProperty) === null || _5 === void 0 ? void 0 : _5.$all;
+        const paymentMethodAdditionalPropertyAll = (_9 = (_8 = params.paymentMethods) === null || _8 === void 0 ? void 0 : _8.additionalProperty) === null || _9 === void 0 ? void 0 : _9.$all;
         if (Array.isArray(paymentMethodAdditionalPropertyAll)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -596,7 +612,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodAdditionalPropertyIn = (_7 = (_6 = params.paymentMethods) === null || _6 === void 0 ? void 0 : _6.additionalProperty) === null || _7 === void 0 ? void 0 : _7.$in;
+        const paymentMethodAdditionalPropertyIn = (_11 = (_10 = params.paymentMethods) === null || _10 === void 0 ? void 0 : _10.additionalProperty) === null || _11 === void 0 ? void 0 : _11.$in;
         if (Array.isArray(paymentMethodAdditionalPropertyIn)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -761,17 +777,45 @@ class MongoRepository {
      */
     updateChangeableAttributes(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.orderModel.findOneAndUpdate({ orderNumber: { $eq: params.orderNumber } }, Object.assign({}, (typeof params.name === 'string') ? { name: params.name } : undefined), {
+            const doc = yield this.orderModel.findOneAndUpdate({ orderNumber: { $eq: params.orderNumber } }, {
+                $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
+            }, {
                 projection: {
+                    _id: 1
+                }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.orderModel.modelName);
+            }
+        });
+    }
+    findById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
                     __v: 0,
                     createdAt: 0,
                     updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
                 }
-            })
+            }
+            const doc = yield this.orderModel.findById({ _id: params.id }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
             }
+            return doc.toObject();
         });
     }
     /**

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;