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

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

@@ -34,7 +34,6 @@ export declare class MongoRepository {
     confirm<T extends factory.account.transactionType>(params: {
         typeOf?: T;
         id: string;
-        result: factory.account.transaction.IResult;
         potentialActions: factory.account.transaction.IPotentialActions;
     }): Promise<factory.account.transaction.ITransaction<T>>;
     /**

package/lib/chevre/repo/accountTransaction.js

@@ -154,7 +154,7 @@ class MongoRepository {
             const doc = yield this.transactionModel.findOneAndUpdate(Object.assign({ _id: params.id, status: factory.transactionStatusType.InProgress }, (typeof params.typeOf === 'string') ? { typeOf: params.typeOf } : undefined), {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
-                result: params.result,
+                // result: params.result, // resultを更新
                 potentialActions: params.potentialActions
             }, { new: true })
                 .exec();

package/lib/chevre/repo/event.js

@@ -466,14 +466,18 @@ class MongoRepository {
             if (Array.isArray(params)) {
                 params.forEach((creatingEventParams) => {
                     var _a, _b;
+                    if (creatingEventParams.attributes.typeOf !== factory.eventType.ScreeningEvent) {
+                        throw new factory.errors.NotImplemented(`${factory.eventType.ScreeningEventSeries} not implemented`);
+                    }
                     const additionalPropertyValue = (_b = (_a = creatingEventParams.attributes.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === creatingEventParams.filter.name)) === null || _b === void 0 ? void 0 : _b.value;
                     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"]);
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                typeOf: creatingEventParams.attributes.typeOf,
+                                typeOf,
                                 // 追加特性をキーに更新
                                 additionalProperty: {
                                     $exists: true,
@@ -481,7 +485,18 @@ class MongoRepository {
                                 }
                             },
                             update: {
-                                $setOnInsert: Object.assign({ _id: uniqid() }, creatingEventParams.attributes)
+                                $setOnInsert: {
+                                    _id: uniqid(),
+                                    typeOf,
+                                    project,
+                                    superEvent,
+                                    workPerformed,
+                                    location,
+                                    name
+                                    // ...creatingEventParams.attributes
+                                },
+                                // 変更可能な属性のみ上書き
+                                $set: updateFields
                             },
                             upsert: true
                         }

package/lib/chevre/repository.d.ts

@@ -48,9 +48,6 @@ import { CognitoRepository as PersonRepo } from './repo/person';
  */
 export declare class Account extends AccountRepo {
 }
-/**
- * 口座アクションリポジトリ
- */
 /**
  * 経理レポートリポジトリ
  */

package/lib/chevre/repository.js

@@ -53,10 +53,6 @@ const person_1 = require("./repo/person");
 class Account extends account_1.MongoRepository {
 }
 exports.Account = Account;
-/**
- * 口座アクションリポジトリ
- */
-// export class AccountAction extends AccountActionRepo { }
 /**
  * 経理レポートリポジトリ
  */

package/lib/chevre/service/account.js

@@ -53,12 +53,6 @@ exports.close = close;
  */
 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 +75,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 +117,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

@@ -63,10 +63,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,11 +20,6 @@ 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,
@@ -55,11 +48,6 @@ function createMoneyTransferActionAttributes(params) {
                 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:
     }
@@ -78,15 +66,20 @@ function createMoneyTransferActionAttributes(params) {
         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: {
@@ -98,9 +91,7 @@ function createMoneyTransferActionAttributes(params) {
         },
         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

@@ -95,10 +95,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

@@ -74,10 +74,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/moneyTransfer.js

@@ -513,7 +513,7 @@ function processDepositFromNow(params, permitServiceCredentials, transactionNumb
             recipient, object: {
                 amount: { value: amount },
                 description: description,
-                fromLocation: params.fromLocation,
+                // fromLocation: params.fromLocation,
                 toLocation: { accountNumber: String((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber) }
             } }, (typeof accountTransactionIdentifier === 'string') ? { identifier: accountTransactionIdentifier } : undefined));
         try {

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

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

package/package.json

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

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

@@ -1,42 +0,0 @@
-import { Connection } from 'mongoose';
-import * as factory from '../factory';
-import { modelName } from './mongoose/model/accountAction';
-export { modelName };
-export declare type IAction<T extends factory.actionType> = T extends factory.actionType.MoneyTransfer ? factory.account.action.moneyTransfer.IAction : never;
-/**
- * 口座アクションリポジトリ
- */
-export declare class MongoRepository {
-    private readonly actionModel;
-    constructor(connection: Connection);
-    /**
-     * アクション開始
-     */
-    /**
-     * アクション完了
-     */
-    /**
-     * アクション中止
-     */
-    /**
-     * アクション失敗
-     */
-    /**
-     * アクション検索
-     */
-    /**
-     * 転送アクションを検索する
-     */
-    /**
-     * アクションを検索する
-     * @param searchConditions 検索条件
-     */
-    clean(params: {
-        project?: {
-            id?: string;
-        };
-        startDate: {
-            $lt: Date;
-        };
-    }): Promise<void>;
-}

package/lib/chevre/repo/accountAction.js

@@ -1,474 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoRepository = exports.modelName = void 0;
-const factory = require("../factory");
-const accountAction_1 = require("./mongoose/model/accountAction");
-Object.defineProperty(exports, "modelName", { enumerable: true, get: function () { return accountAction_1.modelName; } });
-/**
- * 口座アクションリポジトリ
- */
-class MongoRepository {
-    constructor(connection) {
-        this.actionModel = connection.model(accountAction_1.modelName);
-    }
-    // tslint:disable-next-line:max-func-body-length
-    // public static CREATE_MONEY_TRANSFER_ACTIONS_MONGO_CONDITIONS(
-    //     params: factory.account.action.moneyTransfer.ISearchConditions
-    // ) {
-    //     const andConditions: any[] = [
-    //         { typeOf: factory.actionType.MoneyTransfer }
-    //     ];
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.project !== undefined && params.project !== null) {
-    //         // tslint:disable-next-line:no-single-line-block-comment
-    //         /* istanbul ignore else */
-    //         if (params.project.id !== undefined && params.project.id !== null) {
-    //             // tslint:disable-next-line:no-single-line-block-comment
-    //             /* istanbul ignore else */
-    //             if (typeof params.project.id.$eq === 'string') {
-    //                 andConditions.push({
-    //                     'project.id': {
-    //                         $eq: params.project.id.$eq
-    //                     }
-    //                 });
-    //             }
-    //             // tslint:disable-next-line:no-single-line-block-comment
-    //             /* istanbul ignore else */
-    //             if (typeof params.project.id.$ne === 'string') {
-    //                 andConditions.push({
-    //                     'project.id': {
-    //                         $ne: params.project.id.$ne
-    //                     }
-    //                 });
-    //             }
-    //         }
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     // if (typeof params.accountNumber === 'string') {
-    //     //     andConditions.push({
-    //     //         $or: [
-    //     //             {
-    //     //                 'fromLocation.accountNumber': {
-    //     //                     $exists: true,
-    //     //                     $eq: params.accountNumber
-    //     //                 }
-    //     //             },
-    //     //             {
-    //     //                 'toLocation.accountNumber': {
-    //     //                     $exists: true,
-    //     //                     $eq: params.accountNumber
-    //     //                 }
-    //     //             }
-    //     //         ]
-    //     //     });
-    //     // }
-    //     const actionStatusIn = params.actionStatus?.$in;
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (Array.isArray(actionStatusIn)) {
-    //         andConditions.push({
-    //             actionStatus: { $in: actionStatusIn }
-    //         });
-    //     }
-    //     const amountCurrencyEq = params.amount?.currency?.$eq;
-    //     if (typeof amountCurrencyEq === 'string') {
-    //         andConditions.push({
-    //             'amount.currency': {
-    //                 $exists: true,
-    //                 $eq: amountCurrencyEq
-    //             }
-    //         });
-    //     }
-    //     const locationAccountNumberEq = params.location?.accountNumber?.$eq;
-    //     if (typeof locationAccountNumberEq === 'string') {
-    //         andConditions.push({
-    //             $or: [
-    //                 {
-    //                     'fromLocation.accountNumber': {
-    //                         $exists: true,
-    //                         $eq: locationAccountNumberEq
-    //                     }
-    //                 },
-    //                 {
-    //                     'toLocation.accountNumber': {
-    //                         $exists: true,
-    //                         $eq: locationAccountNumberEq
-    //                     }
-    //                 }
-    //             ]
-    //         });
-    //     }
-    //     const locationTypeOfEq = params.location?.typeOf?.$eq;
-    //     if (typeof locationTypeOfEq === 'string') {
-    //         andConditions.push({
-    //             $or: [
-    //                 {
-    //                     'fromLocation.typeOf': {
-    //                         $exists: true,
-    //                         $eq: locationTypeOfEq
-    //                     }
-    //                 },
-    //                 {
-    //                     'toLocation.typeOf': {
-    //                         $exists: true,
-    //                         $eq: locationTypeOfEq
-    //                     }
-    //                 }
-    //             ]
-    //         });
-    //     }
-    //     const purposeTypeOfEq = params.purpose?.typeOf?.$eq;
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (typeof purposeTypeOfEq === 'string') {
-    //         andConditions.push({
-    //             'purpose.typeOf': {
-    //                 $exists: true,
-    //                 $eq: purposeTypeOfEq
-    //             }
-    //         });
-    //     }
-    //     const purposeIdEq = params.purpose?.id?.$eq;
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (typeof purposeIdEq === 'string') {
-    //         andConditions.push({
-    //             'purpose.id': {
-    //                 $exists: true,
-    //                 $eq: purposeIdEq
-    //             }
-    //         });
-    //     }
-    //     const purposeIdentifierEq = params.purpose?.identifier?.$eq;
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (typeof purposeIdentifierEq === 'string') {
-    //         andConditions.push({
-    //             'purpose.identifier': {
-    //                 $exists: true,
-    //                 $eq: purposeIdentifierEq
-    //             }
-    //         });
-    //     }
-    //     const purposeTransactionNumberEq = params.purpose?.transactionNumber?.$eq;
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (typeof purposeTransactionNumberEq === 'string') {
-    //         andConditions.push({
-    //             'purpose.transactionNumber': {
-    //                 $exists: true,
-    //                 $eq: purposeTransactionNumberEq
-    //             }
-    //         });
-    //     }
-    //     const startDateGte = params.startDate?.$gte;
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (startDateGte instanceof Date) {
-    //         andConditions.push({
-    //             startDate: { $gte: startDateGte }
-    //         });
-    //     }
-    //     const startDateLte = params.startDate?.$lte;
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (startDateLte instanceof Date) {
-    //         andConditions.push({
-    //             startDate: { $lte: startDateLte }
-    //         });
-    //     }
-    //     return andConditions;
-    // }
-    /**
-     * アクション開始
-     */
-    // public async start<T extends factory.actionType>(
-    //     params: factory.account.action.moneyTransfer.IAttributes
-    // ): Promise<IAction<T>> {
-    //     return this.actionModel.create({
-    //         ...params,
-    //         actionStatus: factory.actionStatusType.ActiveActionStatus,
-    //         startDate: new Date()
-    //     })
-    //         .then(
-    //             (doc) => doc.toObject()
-    //         );
-    // }
-    // public async startByIdentifier<T extends factory.actionType>(
-    //     params: factory.account.action.moneyTransfer.IAttributes
-    // ): Promise<IAction<T>> {
-    //     if (typeof params.identifier === 'string') {
-    //         return this.actionModel.findOneAndUpdate(
-    //             {
-    //                 identifier: {
-    //                     $exists: true,
-    //                     $eq: params.identifier
-    //                 }
-    //             },
-    //             {
-    //                 $setOnInsert: {
-    //                     ...params,
-    //                     actionStatus: factory.actionStatusType.ActiveActionStatus,
-    //                     startDate: new Date()
-    //                 }
-    //             },
-    //             {
-    //                 new: true,
-    //                 upsert: true
-    //             }
-    //         )
-    //             .exec()
-    //             .then((doc) => {
-    //                 if (doc === null) {
-    //                     throw new factory.errors.NotFound(this.actionModel.modelName);
-    //                 }
-    //                 return doc.toObject();
-    //             });
-    //     } else {
-    //         return this.actionModel.create({
-    //             ...params,
-    //             actionStatus: factory.actionStatusType.ActiveActionStatus,
-    //             startDate: new Date()
-    //         })
-    //             .then(
-    //                 (doc) => doc.toObject()
-    //             );
-    //     }
-    // }
-    /**
-     * アクション完了
-     */
-    // public async complete<T extends factory.actionType>(
-    //     typeOf: T,
-    //     actionId: string,
-    //     result: any
-    // ): Promise<IAction<T>> {
-    //     return this.actionModel.findOneAndUpdate(
-    //         {
-    //             typeOf: typeOf,
-    //             _id: actionId
-    //         },
-    //         {
-    //             actionStatus: factory.actionStatusType.CompletedActionStatus,
-    //             result: result,
-    //             endDate: new Date()
-    //         },
-    //         { new: true }
-    //     )
-    //         .exec()
-    //         .then((doc) => {
-    //             if (doc === null) {
-    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
-    //             }
-    //             return doc.toObject();
-    //         });
-    // }
-    /**
-     * アクション中止
-     */
-    // public async cancel<T extends factory.actionType>(
-    //     typeOf: T,
-    //     actionId: string
-    // ): Promise<IAction<T>> {
-    //     return this.actionModel.findOneAndUpdate(
-    //         {
-    //             typeOf: typeOf,
-    //             _id: actionId
-    //         },
-    //         { actionStatus: factory.actionStatusType.CanceledActionStatus },
-    //         { new: true }
-    //     )
-    //         .exec()
-    //         .then((doc) => {
-    //             if (doc === null) {
-    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
-    //             }
-    //             return doc.toObject();
-    //         });
-    // }
-    /**
-     * アクション失敗
-     */
-    // public async giveUp<T extends factory.actionType>(
-    //     typeOf: T,
-    //     actionId: string,
-    //     error: any
-    // ): Promise<IAction<T>> {
-    //     return this.actionModel.findOneAndUpdate(
-    //         {
-    //             typeOf: typeOf,
-    //             _id: actionId
-    //         },
-    //         {
-    //             actionStatus: factory.actionStatusType.FailedActionStatus,
-    //             error: error,
-    //             endDate: new Date()
-    //         },
-    //         { new: true }
-    //     )
-    //         .exec()
-    //         .then((doc) => {
-    //             if (doc === null) {
-    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
-    //             }
-    //             return doc.toObject();
-    //         });
-    // }
-    /**
-     * アクション検索
-     */
-    // public async findById<T extends factory.actionType>(
-    //     typeOf: T,
-    //     actionId: string
-    // ): Promise<IAction<T>> {
-    //     return this.actionModel.findOne(
-    //         {
-    //             typeOf: typeOf,
-    //             _id: actionId
-    //         }
-    //     )
-    //         .exec()
-    //         .then((doc) => {
-    //             if (doc === null) {
-    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
-    //             }
-    //             return doc.toObject();
-    //         });
-    // }
-    // public async countTransferActions(
-    //     params: factory.account.action.moneyTransfer.ISearchConditions
-    // ): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONEY_TRANSFER_ACTIONS_MONGO_CONDITIONS(params);
-    //     return this.actionModel.countDocuments({ $and: conditions })
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
-    /**
-     * 転送アクションを検索する
-     */
-    // public async searchTransferActions(
-    //     params: factory.account.action.moneyTransfer.ISearchConditions
-    // ): Promise<factory.account.action.moneyTransfer.IAction[]> {
-    //     const conditions = MongoRepository.CREATE_MONEY_TRANSFER_ACTIONS_MONGO_CONDITIONS(params);
-    //     const query = this.actionModel.find(
-    //         { $and: conditions },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     );
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.limit !== undefined && params.page !== undefined) {
-    //         query.limit(params.limit)
-    //             .skip(params.limit * (params.page - 1));
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.sort !== undefined) {
-    //         query.sort(params.sort);
-    //     }
-    //     return query.setOptions({ maxTimeMS: 10000 })
-    //         .exec()
-    //         .then((docs) => docs.map((doc) => doc.toObject()));
-    // }
-    /**
-     * アクションを検索する
-     * @param searchConditions 検索条件
-     */
-    // public async search<T extends factory.actionType>(searchConditions: {
-    //     typeOf: T;
-    //     actionStatuses?: factory.account.AccountStatusType[];
-    //     startDateFrom?: Date;
-    //     startDateThrough?: Date;
-    //     purposeTypeOfs?: factory.account.transactionType[];
-    //     fromLocationAccountNumbers?: string[];
-    //     toLocationAccountNumbers?: string[];
-    //     limit: number;
-    // }): Promise<IAction<T>[]> {
-    //     const andConditions: any[] = [
-    //         { typeOf: searchConditions.typeOf },
-    //         {
-    //             startDate: {
-    //                 $exists: true,
-    //                 $gte: searchConditions.startDateFrom,
-    //                 $lte: searchConditions.startDateThrough
-    //             }
-    //         }
-    //     ];
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (Array.isArray(searchConditions.actionStatuses) && searchConditions.actionStatuses.length > 0) {
-    //         andConditions.push({
-    //             actionStatus: { $in: searchConditions.actionStatuses }
-    //         });
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (Array.isArray(searchConditions.purposeTypeOfs) && searchConditions.purposeTypeOfs.length > 0) {
-    //         andConditions.push({
-    //             'purpose.typeOf': {
-    //                 $exists: true,
-    //                 $in: searchConditions.purposeTypeOfs
-    //             }
-    //         });
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (Array.isArray(searchConditions.fromLocationAccountNumbers) && searchConditions.fromLocationAccountNumbers.length > 0) {
-    //         andConditions.push({
-    //             'fromLocation.accountNumber': {
-    //                 $exists: true,
-    //                 $in: searchConditions.fromLocationAccountNumbers
-    //             }
-    //         });
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (Array.isArray(searchConditions.toLocationAccountNumbers) && searchConditions.toLocationAccountNumbers.length > 0) {
-    //         andConditions.push({
-    //             'toLocation.accountNumber': {
-    //                 $exists: true,
-    //                 $in: searchConditions.toLocationAccountNumbers
-    //             }
-    //         });
-    //     }
-    //     return this.actionModel.find(
-    //         { $and: andConditions },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     )
-    //         .limit(searchConditions.limit)
-    //         .exec()
-    //         .then((docs) => docs.map((doc) => doc.toObject()));
-    // }
-    clean(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.actionModel.deleteMany(Object.assign({ actionStatus: {
-                    $in: [
-                        factory.actionStatusType.CanceledActionStatus,
-                        factory.actionStatusType.CompletedActionStatus,
-                        factory.actionStatusType.FailedActionStatus
-                    ]
-                }, startDate: { $lt: params.startDate.$lt } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { 'project.id': { $eq: params.project.id } } : undefined))
-                .exec();
-        });
-    }
-}
-exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/mongoose/model/accountAction.d.ts

@@ -1,7 +0,0 @@
-import * as mongoose from 'mongoose';
-declare const modelName = "AccountAction";
-/**
- * アクションスキーマ
- */
-declare const schema: mongoose.Schema<mongoose.Document<any, any, any>, mongoose.Model<mongoose.Document<any, any, any>, any, any>, undefined, {}>;
-export { modelName, schema };

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

@@ -1,177 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.schema = exports.modelName = void 0;
-const mongoose = require("mongoose");
-const modelName = 'AccountAction';
-exports.modelName = modelName;
-const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
-/**
- * アクションスキーマ
- */
-const schema = new mongoose.Schema({
-    project: mongoose.SchemaTypes.Mixed,
-    actionStatus: String,
-    typeOf: String,
-    identifier: String,
-    description: String,
-    agent: mongoose.SchemaTypes.Mixed,
-    recipient: mongoose.SchemaTypes.Mixed,
-    result: mongoose.SchemaTypes.Mixed,
-    error: mongoose.SchemaTypes.Mixed,
-    object: mongoose.SchemaTypes.Mixed,
-    startDate: Date,
-    endDate: Date,
-    purpose: mongoose.SchemaTypes.Mixed,
-    potentialActions: mongoose.SchemaTypes.Mixed,
-    amount: mongoose.SchemaTypes.Mixed,
-    fromLocation: mongoose.SchemaTypes.Mixed,
-    toLocation: mongoose.SchemaTypes.Mixed,
-    instrument: mongoose.SchemaTypes.Mixed
-}, {
-    collection: 'accountActions',
-    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({ identifier: 1 }, {
-    unique: true,
-    partialFilterExpression: {
-        identifier: { $exists: true }
-    }
-});
-schema.index({ identifier: 1, startDate: -1 }, {
-    partialFilterExpression: {
-        identifier: { $exists: true }
-    }
-});
-schema.index({ 'project.id': 1, startDate: -1 }, {
-    name: 'searchByProjectId-v20220721'
-});
-schema.index({ typeOf: 1, startDate: -1 }, { name: 'searchByTypeOf-v2' });
-schema.index({ actionStatus: 1, startDate: -1 }, { name: 'searchByActionStatus-v2' });
-schema.index({ startDate: -1 }, { name: 'searchByStartDate-v2' });
-schema.index({ endDate: -1, startDate: -1 }, {
-    name: 'searchByEndDate-v2',
-    partialFilterExpression: {
-        endDate: { $exists: true }
-    }
-});
-schema.index({ 'amount.currency': 1, startDate: -1 }, {
-    name: 'searchByAmountCurrency',
-    partialFilterExpression: {
-        'amount.currency': { $exists: true }
-    }
-});
-schema.index({ 'purpose.typeOf': 1, startDate: -1 }, {
-    name: 'searchByPurposeTypeOf-v2',
-    partialFilterExpression: {
-        'purpose.typeOf': { $exists: true }
-    }
-});
-schema.index({ 'purpose.id': 1, startDate: -1 }, {
-    name: 'searchByPurposeId-v2',
-    partialFilterExpression: {
-        'purpose.id': { $exists: true }
-    }
-});
-schema.index({ 'purpose.identifier': 1, startDate: -1 }, {
-    name: 'searchByPurposeIdentifier',
-    partialFilterExpression: {
-        'purpose.identifier': { $exists: true }
-    }
-});
-schema.index({ 'purpose.transactionNumber': 1, startDate: -1 }, {
-    name: 'searchByPurposeTransactionNumber',
-    partialFilterExpression: {
-        'purpose.transactionNumber': { $exists: true }
-    }
-});
-schema.index({ 'object.typeOf': 1, startDate: -1 }, {
-    name: 'searchByObjectTypeOf-v2',
-    partialFilterExpression: {
-        'object.typeOf': { $exists: true }
-    }
-});
-schema.index({ 'fromLocation.typeOf': 1, startDate: -1 }, {
-    name: 'searchByFromLocationTypeOf-v2',
-    partialFilterExpression: {
-        'fromLocation.typeOf': { $exists: true }
-    }
-});
-schema.index({ 'fromLocation.accountNumber': 1, startDate: -1 }, {
-    name: 'searchByFromLocationAccountNumber-v2',
-    partialFilterExpression: {
-        'fromLocation.accountNumber': { $exists: true }
-    }
-});
-schema.index({ 'fromLocation.accountType': 1, startDate: -1 }, {
-    name: 'searchByFromLocationAccountType-v2',
-    partialFilterExpression: {
-        'fromLocation.accountType': { $exists: true }
-    }
-});
-schema.index({ 'toLocation.typeOf': 1, startDate: -1 }, {
-    name: 'searchByToLocationTypeOf-v2',
-    partialFilterExpression: {
-        'toLocation.typeOf': { $exists: true }
-    }
-});
-schema.index({ 'toLocation.accountNumber': 1, startDate: -1 }, {
-    name: 'searchByToLocationAccountNumber-v2',
-    partialFilterExpression: {
-        'toLocation.accountNumber': { $exists: true }
-    }
-});
-schema.index({ 'toLocation.accountType': 1, startDate: -1 }, {
-    name: 'searchByToLocationAccountType-v2',
-    partialFilterExpression: {
-        'toLocation.accountType': { $exists: true }
-    }
-});
-schema.index({ 'fromLocation.typeOf': 1, 'fromLocation.accountType': 1, 'fromLocation.accountNumber': 1, endDate: -1 }, {
-    name: 'searchTransferActionsByFromAccountLocation',
-    partialFilterExpression: {
-        'fromLocation.typeOf': { $exists: true },
-        'fromLocation.accountType': { $exists: true },
-        'fromLocation.accountNumber': { $exists: true }
-    }
-});
-schema.index({ 'toLocation.typeOf': 1, 'toLocation.accountType': 1, 'toLocation.accountNumber': 1, endDate: -1 }, {
-    name: 'searchTransferActionsByToAccountLocation',
-    partialFilterExpression: {
-        'toLocation.typeOf': { $exists: true },
-        'toLocation.accountType': { $exists: true },
-        'toLocation.accountNumber': { $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);
-    }
-});