@chevre/domain 24.0.0-alpha.29 → 24.0.0-alpha.30

package/lib/chevre/repo/action/actionProcess.d.ts

@@ -130,7 +130,7 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
         };
         object?: {
             typeOf?: {
-                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
+                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer | factory.offerType.Offer;
             };
             paymentMethodId?: {
                 $eq?: string;

package/lib/chevre/repo/action/authorizeMoneyTransferOffer.d.ts

@@ -0,0 +1,40 @@
+import * as factory from '../../factory';
+import { ActionProcessRepo } from './actionProcess';
+export type IAuthorizeMoneyTransferOfferAction = factory.action.authorize.offer.moneyTransfer.IAction;
+/**
+ * 通貨転送オファー承認リポジトリ
+ */
+export declare class AuthorizeMoneyTransferOfferActionRepo extends ActionProcessRepo<IAuthorizeMoneyTransferOfferAction, never> {
+    /**
+     * 取引に対する通貨転送オファー承認アクションを検索する
+     */
+    findAuthorizeMoneyTransferOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        /**
+         * アクションステータスでフィルター
+         */
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+    }): Promise<IAuthorizeMoneyTransferOfferAction[]>;
+    /**
+     * アクションに資産取引情報を保管する
+     */
+    saveAssetTransactionNumber(params: {
+        id: string;
+        update: {
+            'object.itemOffered.amount.currency': string;
+            'object.itemOffered.object.pendingTransaction': {
+                typeOf: factory.assetTransactionType.MoneyTransfer;
+                id: string;
+                transactionNumber: string;
+            };
+        };
+    }): Promise<void>;
+}

package/lib/chevre/repo/action/authorizeMoneyTransferOffer.js

@@ -0,0 +1,61 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthorizeMoneyTransferOfferActionRepo = void 0;
+const factory = __importStar(require("../../factory"));
+// import { MONGO_MAX_TIME_MS } from '../settings';
+const actionProcess_1 = require("./actionProcess");
+/**
+ * 通貨転送オファー承認リポジトリ
+ */
+class AuthorizeMoneyTransferOfferActionRepo extends actionProcess_1.ActionProcessRepo {
+    /**
+     * 取引に対する通貨転送オファー承認アクションを検索する
+     */
+    async findAuthorizeMoneyTransferOfferActionsByPurpose(params) {
+        const authorizeActions = await this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AuthorizeAction,
+            object: {
+                typeOf: { $eq: factory.offerType.Offer }
+            }
+        });
+        return authorizeActions.filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
+    }
+    /**
+     * アクションに資産取引情報を保管する
+     */
+    async saveAssetTransactionNumber(params) {
+        await this.actionModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { projection: { _id: 1 } })
+            .lean()
+            .exec()
+            .then((doc) => {
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.actionModel.modelName);
+            }
+        });
+    }
+}
+exports.AuthorizeMoneyTransferOfferActionRepo = AuthorizeMoneyTransferOfferActionRepo;

package/lib/chevre/repo/action/authorizeProductOffer.d.ts

@@ -0,0 +1,26 @@
+import * as factory from '../../factory';
+import { ActionProcessRepo } from './actionProcess';
+export type IAuthorizeProductOfferAction = factory.action.authorize.offer.product.IAction;
+/**
+ * プロダクトオファー承認リポジトリ
+ */
+export declare class AuthorizeProductOfferActionRepo extends ActionProcessRepo<IAuthorizeProductOfferAction, never> {
+    /**
+     * 取引に対するプロダクトオファー承認アクションを検索する
+     */
+    findAuthorizeProductOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        /**
+         * アクションステータスでフィルター
+         */
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+    }): Promise<IAuthorizeProductOfferAction[]>;
+}

package/lib/chevre/repo/action/authorizeProductOffer.js

@@ -0,0 +1,52 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthorizeProductOfferActionRepo = void 0;
+const factory = __importStar(require("../../factory"));
+// import { MONGO_MAX_TIME_MS } from '../settings';
+const availableProductTypes_1 = require("../../factory/availableProductTypes");
+const actionProcess_1 = require("./actionProcess");
+/**
+ * プロダクトオファー承認リポジトリ
+ */
+class AuthorizeProductOfferActionRepo extends actionProcess_1.ActionProcessRepo {
+    /**
+     * 取引に対するプロダクトオファー承認アクションを検索する
+     */
+    async findAuthorizeProductOfferActionsByPurpose(params) {
+        const authorizeActions = await this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AuthorizeAction,
+            object: {
+                typeOf: { $eq: factory.offerType.Offer }
+            }
+        });
+        return authorizeActions.filter((a) => Array.isArray(a.object)
+            && a.object.length > 0
+            // && a.object[0].typeOf === factory.offerType.Offer
+            && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0);
+    }
+}
+exports.AuthorizeProductOfferActionRepo = AuthorizeProductOfferActionRepo;

package/lib/chevre/repo/mongoose/schemas/productModel.d.ts

@@ -2,7 +2,7 @@ import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from '
 import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 export interface IProductModel {
-    id?: string;
+    id: string;
     project: {
         id: string;
         typeOf: factory.organizationType.Project;

package/lib/chevre/repo/place/hasPOS.js

@@ -109,7 +109,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.AlreadyInUse('hasPOS', ['id']);
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     async updateByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
@@ -133,7 +133,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     async deleteByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
@@ -149,7 +149,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
 }
 exports.HasPOSRepo = HasPOSRepo;

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

@@ -33,7 +33,9 @@ export declare class ProductModelRepo {
          * idを指定すれば更新
          */
         id?: string;
-        $set: IProductModel;
+        $set: Omit<IProductModel, 'id'> & {
+            id?: never;
+        };
     }): Promise<{
         id: string;
     }>;

package/lib/chevre/repo/productModel.js

@@ -93,7 +93,7 @@ class ProductModelRepo {
         // }
         return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec()
-            .then((docs) => docs.map((doc) => doc.toObject()));
+            .then((docs) => docs.map((doc) => doc.toObject({ virtuals: true })));
     }
     async deleteById(params) {
         await this.productModelModel.findOneAndDelete({ _id: params.id })
@@ -103,24 +103,28 @@ class ProductModelRepo {
      * プロダクトを保管する
      */
     async save(params) {
-        let doc;
+        let savedId;
         if (typeof params.id === 'string') {
             // 上書き禁止属性を除外
             const { category, id, project, typeOf, ...setFields } = params.$set;
-            doc = await this.productModelModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const updatedDoc = await this.productModelModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: setFields
-                // $unset: params.$unset
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (updatedDoc === null) {
+                throw new factory.errors.NotFound(this.productModelModel.modelName);
+            }
+            savedId = updatedDoc.id;
         }
         else {
             const { id, ...createParams } = params.$set;
-            doc = await this.productModelModel.create(createParams);
+            const createdDoc = await this.productModelModel.create(createParams);
+            savedId = createdDoc.id;
         }
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.productModelModel.modelName);
-        }
-        return doc.toObject();
+        // if (doc === null) {
+        //     throw new factory.errors.NotFound(this.productModelModel.modelName);
+        // }
+        return { id: savedId };
     }
     /**
      * 区分から同期する
@@ -139,7 +143,7 @@ class ProductModelRepo {
                     typeOf: factory.offerType.Offer
                 }]
         };
-        const { id, project, typeOf, offers, category, ...setFields } = upsertingProductModel;
+        const { project, typeOf, offers, category, ...setFields } = upsertingProductModel;
         const doc = await this.productModelModel.findOneAndUpdate({
             'project.id': { $eq: upsertingProductModel.project.id },
             'category.id': { $exists: true, $eq: upsertingProductModel.category.id }
@@ -151,7 +155,7 @@ class ProductModelRepo {
         if (doc === null) {
             throw new factory.errors.NotFound(this.productModelModel.modelName);
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     /**
      * 区分から削除する

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

@@ -141,13 +141,13 @@ class MoneyTransferRepo {
         if (typeof tasksExportActionStatusEq === 'string') {
             andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
         }
-        switch (params.typeOf) {
-            case factory.transactionType.PlaceOrder:
-                throw new factory.errors.NotImplemented(`use PlaceOrderRepo`);
-            case factory.transactionType.ReturnOrder:
-                throw new factory.errors.NotImplemented(`use ReturnOrderRepo`);
-            default:
-        }
+        // switch (params.typeOf) {
+        //     case factory.transactionType.PlaceOrder:
+        //         throw new factory.errors.NotImplemented(`use PlaceOrderRepo`);
+        //     case factory.transactionType.ReturnOrder:
+        //         throw new factory.errors.NotImplemented(`use ReturnOrderRepo`);
+        //     default:
+        // }
         return andConditions;
     }
     /**

package/lib/chevre/repository.d.ts

@@ -11,7 +11,9 @@ import type { ActionRepo } from './repo/action';
 import type { AcceptCOAOfferActionRepo } from './repo/action/acceptCOAOffer';
 import type { AcceptPayActionRepo } from './repo/action/acceptPay';
 import type { AuthorizeInvoiceActionRepo } from './repo/action/authorizeInvoice';
+import type { AuthorizeMoneyTransferOfferActionRepo } from './repo/action/authorizeMoneyTransferOffer';
 import type { AuthorizeOfferActionRepo } from './repo/action/authorizeOffer';
+import type { AuthorizeProductOfferActionRepo } from './repo/action/authorizeProductOffer';
 import type { AuthorizePaymentMethodActionRepo } from './repo/action/authorizePaymentMethod';
 import type { CheckMovieTicketActionRepo } from './repo/action/checkMovieTicket';
 import type { CheckThingActionRepo } from './repo/action/checkThing';
@@ -144,12 +146,20 @@ export declare namespace action {
     namespace AuthorizeInvoice {
         function createInstance(...params: ConstructorParameters<typeof AuthorizeInvoiceActionRepo>): Promise<AuthorizeInvoiceActionRepo>;
     }
+    type AuthorizeMoneyTransferOffer = AuthorizeMoneyTransferOfferActionRepo;
+    namespace AuthorizeMoneyTransferOffer {
+        function createInstance(...params: ConstructorParameters<typeof AuthorizeMoneyTransferOfferActionRepo>): Promise<AuthorizeMoneyTransferOfferActionRepo>;
+    }
     type AuthorizeOffer = AuthorizeOfferActionRepo;
     namespace AuthorizeOffer {
         function createInstance(...params: ConstructorParameters<typeof AuthorizeOfferActionRepo>): Promise<AuthorizeOfferActionRepo>;
     }
-    type AuthorizePaymentMethodAction = AuthorizePaymentMethodActionRepo;
-    namespace AuthorizePaymentMethodAction {
+    type AuthorizeProductOffer = AuthorizeProductOfferActionRepo;
+    namespace AuthorizeProductOffer {
+        function createInstance(...params: ConstructorParameters<typeof AuthorizeProductOfferActionRepo>): Promise<AuthorizeProductOfferActionRepo>;
+    }
+    type AuthorizePaymentMethod = AuthorizePaymentMethodActionRepo;
+    namespace AuthorizePaymentMethod {
         function createInstance(...params: ConstructorParameters<typeof AuthorizePaymentMethodActionRepo>): Promise<AuthorizePaymentMethodActionRepo>;
     }
     type CheckMovieTicket = CheckMovieTicketActionRepo;

package/lib/chevre/repository.js

@@ -137,6 +137,17 @@ var action;
         }
         AuthorizeInvoice.createInstance = createInstance;
     })(AuthorizeInvoice = action.AuthorizeInvoice || (action.AuthorizeInvoice = {}));
+    let AuthorizeMoneyTransferOffer;
+    (function (AuthorizeMoneyTransferOffer) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/action/authorizeMoneyTransferOffer')))).AuthorizeMoneyTransferOfferActionRepo;
+            }
+            return new repo(...params);
+        }
+        AuthorizeMoneyTransferOffer.createInstance = createInstance;
+    })(AuthorizeMoneyTransferOffer = action.AuthorizeMoneyTransferOffer || (action.AuthorizeMoneyTransferOffer = {}));
     let AuthorizeOffer;
     (function (AuthorizeOffer) {
         let repo;
@@ -148,8 +159,19 @@ var action;
         }
         AuthorizeOffer.createInstance = createInstance;
     })(AuthorizeOffer = action.AuthorizeOffer || (action.AuthorizeOffer = {}));
-    let AuthorizePaymentMethodAction;
-    (function (AuthorizePaymentMethodAction) {
+    let AuthorizeProductOffer;
+    (function (AuthorizeProductOffer) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/action/authorizeProductOffer')))).AuthorizeProductOfferActionRepo;
+            }
+            return new repo(...params);
+        }
+        AuthorizeProductOffer.createInstance = createInstance;
+    })(AuthorizeProductOffer = action.AuthorizeProductOffer || (action.AuthorizeProductOffer = {}));
+    let AuthorizePaymentMethod;
+    (function (AuthorizePaymentMethod) {
         let repo;
         async function createInstance(...params) {
             if (repo === undefined) {
@@ -157,8 +179,8 @@ var action;
             }
             return new repo(...params);
         }
-        AuthorizePaymentMethodAction.createInstance = createInstance;
-    })(AuthorizePaymentMethodAction = action.AuthorizePaymentMethodAction || (action.AuthorizePaymentMethodAction = {}));
+        AuthorizePaymentMethod.createInstance = createInstance;
+    })(AuthorizePaymentMethod = action.AuthorizePaymentMethod || (action.AuthorizePaymentMethod = {}));
     let CheckMovieTicket;
     (function (CheckMovieTicket) {
         let repo;

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeMoneyTransferOfferActionRepo } from '../../../repo/action/authorizeMoneyTransferOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
@@ -8,7 +8,8 @@ import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
-    action: ActionRepo;
+    action?: never;
+    authorizeMoneyTransferOfferAction: AuthorizeMoneyTransferOfferActionRepo;
     product: ProductRepo;
     project: ProjectRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -61,7 +61,7 @@ function authorize(params) {
             object: params.object,
             transactionNumber
         });
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.authorizeMoneyTransferOfferAction.start(actionAttributes);
         // priceを確定する
         let price = 0;
         try {
@@ -86,7 +86,7 @@ function authorize(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.authorizeMoneyTransferOfferAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -100,7 +100,7 @@ function authorize(params) {
             responseBody
             // acceptedOffers: acceptedOffers4result // discontinue(2024-06-17~)
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.authorizeMoneyTransferOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
     };
 }

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

@@ -1,9 +1,10 @@
 import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeMoneyTransferOfferActionRepo } from '../../../repo/action/authorizeMoneyTransferOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidMoneyTransferTransaction>): (repos: {
-    action: ActionRepo;
+    action?: never;
+    authorizeMoneyTransferOfferAction: AuthorizeMoneyTransferOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

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

@@ -40,7 +40,7 @@ function voidTransaction(params) {
         }
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const authorizeAction = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+            const authorizeAction = await repos.authorizeMoneyTransferOfferAction.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
             // 取引内のアクションかどうか確認
             if (transaction !== undefined) {
                 if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
@@ -50,8 +50,8 @@ function voidTransaction(params) {
             authorizeActions = [authorizeAction];
         }
         else {
-            authorizeActions = await repos.action.searchByPurpose({
-                typeOf: factory.actionType.AuthorizeAction,
+            authorizeActions = await repos.authorizeMoneyTransferOfferAction.findAuthorizeMoneyTransferOfferActionsByPurpose({
+                // typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
                     typeOf: params.purpose.typeOf,
                     id: params.purpose.id
@@ -61,7 +61,7 @@ function voidTransaction(params) {
                 .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
         }
         await Promise.all(authorizeActions.map(async (action) => {
-            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            await repos.authorizeMoneyTransferOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             const pendingTransactionTransactionNumber = action.object.itemOffered.object?.pendingTransaction?.transactionNumber;
             if (typeof pendingTransactionTransactionNumber === 'string') {
                 // 取引が存在すれば中止

package/lib/chevre/service/offer/product.d.ts

@@ -1,6 +1,6 @@
 import * as factory from '../../factory';
 import type { AccountRepo } from '../../repo/account';
-import type { ActionRepo } from '../../repo/action';
+import type { AuthorizeProductOfferActionRepo } from '../../repo/action/authorizeProductOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { OfferRepo } from '../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../repo/offerCatalog';
@@ -15,7 +15,8 @@ import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 export interface IAuthorizeOperationRepos {
     account: AccountRepo;
-    action: ActionRepo;
+    action?: never;
+    authorizeProductOfferAction: AuthorizeProductOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -94,7 +95,8 @@ export declare function authorize(params: {
     result: IAuthorizeOfferAction['result'];
 }>;
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidRegisterServiceTransaction>): (repos: {
-    action: ActionRepo;
+    action?: never;
+    authorizeProductOfferAction: AuthorizeProductOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

package/lib/chevre/service/offer/product.js

@@ -142,7 +142,7 @@ function authorize(params) {
             transaction: transaction,
             transactionNumber: transactionNumber
         });
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.authorizeProductOfferAction.start(actionAttributes);
         try {
             // 会員の場合のみ排他ロック
             // if (params.agent.typeOf === factory.personType.Person) {
@@ -168,14 +168,14 @@ function authorize(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.authorizeProductOfferAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
             }
             throw error;
         }
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.authorizeProductOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
     };
 }
@@ -230,15 +230,15 @@ function voidTransaction(params) {
         }
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+            const action = await repos.authorizeProductOfferAction.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
             if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
                 throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
             }
             authorizeActions = [action];
         }
         else {
-            authorizeActions = await repos.action.searchByPurpose({
-                typeOf: factory.actionType.AuthorizeAction,
+            authorizeActions = await repos.authorizeProductOfferAction.findAuthorizeProductOfferActionsByPurpose({
+                // typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
                     typeOf: params.purpose.typeOf,
                     id: params.purpose.id
@@ -260,7 +260,7 @@ function voidTransaction(params) {
                 //     purpose: params.purpose
                 // })(repos);
             }
-            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            await repos.authorizeProductOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             await processVoidRegisterServiceTransaction({
                 action,
                 project: params.project

package/lib/chevre/service/task/voidMoneyTransferTransaction.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const authorizeMoneyTransferOffer_1 = require("../../repo/action/authorizeMoneyTransferOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 // import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -11,12 +12,13 @@ const voidTransaction_1 = require("../offer/moneyTransfer/voidTransaction");
  */
 function call(data) {
     return async ({ connection }) => {
-        const actionRepo = new action_1.ActionRepo(connection);
+        // const actionRepo = new ActionRepo(connection);
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const placeOrderRepo = new placeOrder_1.PlaceOrderRepo(connection);
         // const transactionRepo = new TransactionRepo(connection);
         await (0, voidTransaction_1.voidTransaction)(data)({
-            action: actionRepo,
+            // action: actionRepo,
+            authorizeMoneyTransferOfferAction: new authorizeMoneyTransferOffer_1.AuthorizeMoneyTransferOfferActionRepo(connection),
             assetTransaction: assetTransactionRepo,
             placeOrder: placeOrderRepo
             // transaction: transactionRepo

package/lib/chevre/service/task/voidRegisterServiceTransaction.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const authorizeProductOffer_1 = require("../../repo/action/authorizeProductOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const product_1 = require("../offer/product");
@@ -10,11 +11,11 @@ const product_1 = require("../offer/product");
  */
 function call(data) {
     return async ({ connection }) => {
-        const actionRepo = new action_1.ActionRepo(connection);
+        // const actionRepo = new ActionRepo(connection);
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const placeOrderRepo = new placeOrder_1.PlaceOrderRepo(connection);
         await (0, product_1.voidTransaction)(data)({
-            action: actionRepo,
+            authorizeProductOfferAction: new authorizeProductOffer_1.AuthorizeProductOfferActionRepo(connection),
             assetTransaction: assetTransactionRepo,
             placeOrder: placeOrderRepo
         });

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

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../repo/action';
+import type { AuthorizeMoneyTransferOfferActionRepo } from '../../repo/action/authorizeMoneyTransferOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
@@ -13,7 +13,8 @@ import type { IStartedTransaction, MoneyTransferRepo } from '../../repo/transact
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 import { moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
 export interface IStartOperationRepos {
-    action: ActionRepo;
+    action?: never;
+    authorizeMoneyTransferOfferAction: AuthorizeMoneyTransferOfferActionRepo;
     authorization: AuthorizationRepo;
     order: OrderRepo;
     passport: PassportRepo;
@@ -32,7 +33,8 @@ export type ITaskAndTransactionOperation<T> = (repos: {
     moneyTransfer: MoneyTransferRepo;
 }) => Promise<T>;
 export type IConfirmOperation<T> = (repos: {
-    action: ActionRepo;
+    action?: never;
+    authorizeMoneyTransferOfferAction: AuthorizeMoneyTransferOfferActionRepo;
     moneyTransfer: MoneyTransferRepo;
 }) => Promise<T>;
 export type IStartParams = MoneyTransferFactory.IStartParams;
@@ -42,7 +44,8 @@ export type IStartParams = MoneyTransferFactory.IStartParams;
  */
 export declare function start(params: IStartParams): IStartOperation<IStartedTransaction>;
 export type IAuthorizeOperation<T> = (repos: {
-    action: ActionRepo;
+    action?: never;
+    authorizeMoneyTransferOfferAction: AuthorizeMoneyTransferOfferActionRepo;
     authorization: AuthorizationRepo;
     order: OrderRepo;
     product: ProductRepo;

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

@@ -225,7 +225,7 @@ function processAuthorizePaymentCard(params) {
             transaction,
             transactionNumber
         });
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.authorizeMoneyTransferOfferAction.start(actionAttributes);
         // 口座取引開始
         let responseBody;
         try {
@@ -237,7 +237,7 @@ function processAuthorizePaymentCard(params) {
                 transactionNumber
             })(repos);
             // アクションにchevre取引情報を保管
-            await repos.action.findByIdAndUpdate({
+            await repos.authorizeMoneyTransferOfferAction.saveAssetTransactionNumber({
                 id: action.id,
                 update: {
                     'object.itemOffered.amount.currency': params.object.itemOffered.amount.currency,
@@ -251,7 +251,7 @@ function processAuthorizePaymentCard(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.authorizeMoneyTransferOfferAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -265,7 +265,7 @@ function processAuthorizePaymentCard(params) {
             responseBody: responseBody
             // acceptedOffers: [] // PlaceOrderではないのでacceptedOffersとしては空 // discontinue(2024-06-17~)
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.authorizeMoneyTransferOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
     };
 }
 function createAuthorizeMoneyTransferOfferActionAttributes(params) {
@@ -601,8 +601,8 @@ function confirm(params) {
 }
 function searchAuthorizeActions(params) {
     return async (repos) => {
-        let authorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
+        let authorizeActions = await repos.authorizeMoneyTransferOfferAction.findAuthorizeMoneyTransferOfferActionsByPurpose({
+            // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.transaction.typeOf,
                 id: params.transaction.id

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.29"
+  "version": "24.0.0-alpha.30"
 }