@chevre/domain 24.0.0-alpha.2 → 24.0.0-alpha.20

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -42,14 +42,14 @@ function voidTransactionByActionId(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['typeOf']);
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.purpose.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
         const action = await repos.action.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');

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts

@@ -1,16 +1,27 @@
 import type * as COA from '@motionpicture/coa-service';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { EventRepo } from '../../../repo/event';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 interface IAcceptRepos {
-    action: ActionRepo;
+    action: AcceptCOAOfferActionRepo;
     event: EventRepo;
     orderNumber: OrderNumberRepo;
     project: ProjectRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
+    reserveService: COA.service.Reserve;
+    masterService: COA.service.Master;
+}
+interface IReAcceptRepos {
+    action: AcceptCOAOfferActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
+    event: EventRepo;
+    orderNumber: OrderNumberRepo;
+    project: ProjectRepo;
+    placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }
@@ -34,5 +45,5 @@ declare function reAcceptOffer(params: IAccepteOfferParams & {
          */
         id: string;
     };
-}): (repos: IAcceptRepos) => Promise<void>;
+}): (repos: IReAcceptRepos) => Promise<void>;
 export { acceptOffer, reAcceptOffer };

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -27,7 +27,7 @@ exports.acceptOffer = acceptOffer;
 exports.reAcceptOffer = reAcceptOffer;
 const errorHandler_1 = require("../../../errorHandler");
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const authorize_1 = require("./acceptOffer/authorize");
 const factory_1 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
@@ -58,12 +58,12 @@ function acceptOffer(params) {
         if (typeof params.sameAs.id !== 'string' || params.sameAs.id === '') {
             throw new factory.errors.ArgumentNull('sameAs.id');
         }
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        // publishOrderNumber(2025-03-11~)
-        await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        // issueOrderNumber(2025-03-11~)
+        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
@@ -144,18 +144,18 @@ function reAcceptOffer(params) {
         if (typeof params.potentialActions?.id !== 'string' || params.potentialActions.id === '') {
             throw new factory.errors.ArgumentNull('potentialActions.id');
         }
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');
         }
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         // 承認アクション存在検証
-        await repos.action.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['id'], []);
+        await repos.authorizeOfferAction.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['id'], []);
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,

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

@@ -1,21 +1,23 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { CategoryCodeRepo } from '../../../repo/categoryCode';
 import type { EventRepo } from '../../../repo/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { IRequestBody, IResponseBody } from './authorize/factory';
 import { IAcceptedOfferBeforeAuthorize4COA } from './authorize/validateAcceptedOffers';
 import * as factory from '../../../factory';
 export { IRequestBody, IResponseBody };
 export type IAuthorizeActionResult = factory.action.authorize.offer.eventService.IResult;
 export interface IAuthorizeRepos {
-    action: ActionRepo;
+    action: AuthorizeOfferActionRepo;
+    accpetCOAOfferAction: AcceptCOAOfferActionRepo;
     categoryCode: CategoryCodeRepo;
     event: EventRepo;
     offer: OfferRepo;
     orderInTransaction: OrderInTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;

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

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const moment_1 = __importDefault(require("moment"));
-// import { publishOrderNumberIfNotExist } from '../../transaction/placeOrder/publishOrderNumberIfNotExist';
 const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
@@ -38,7 +37,7 @@ const factory = __importStar(require("../../../factory"));
  */
 function authorize(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'instrument']);
@@ -104,15 +103,9 @@ function authorize(params) {
             await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
         }
-        // const now = new Date();
-        // const orderNumber = await publishOrderNumberIfNotExist({
-        //     project: { id: transaction.project.id },
-        //     id: transaction.id,
-        //     object: { orderDate: now }
-        // })(repos);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず
+            // 事前に発行されているはず(acceptCOAOfferにて)
             throw new factory.errors.NotFound('transaction.object.orderNumber');
         }
         let result;

package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.js

@@ -32,18 +32,26 @@ const factory = __importStar(require("../../../factory"));
  */
 function authorizeByAcceptAction(params) {
     return async (repos) => {
-        const acceptAction = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            id: { $in: [params.object.id] },
-            typeOf: { $eq: factory.actionType.AcceptAction },
-            purpose: { id: { $in: [params.purpose.id] } },
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
-        }, ['result', 'object', 'potentialActions'])).shift();
-        if (acceptAction === undefined) {
-            throw new factory.errors.NotFound(factory.actionType.AcceptAction);
-        }
+        // const acceptAction = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: params.project.id } },
+        //         id: { $in: [params.object.id] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction },
+        //         purpose: { id: { $in: [params.purpose.id] } },
+        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
+        //     },
+        //     ['result', 'object', 'potentialActions']
+        // )).shift();
+        // if (acceptAction === undefined) {
+        //     throw new factory.errors.NotFound(factory.actionType.AcceptAction);
+        // }
+        const acceptAction = await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: params.project.id },
+            id: params.object.id,
+            purpose: { id: params.purpose.id },
+        }, ['result', 'object', 'potentialActions']);
         const acceptResult = acceptAction.result;
         if (acceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
@@ -67,7 +75,7 @@ function authorizeByAcceptAction(params) {
         }
         else {
             // recipe依存へ変更(2024-06-11~)
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: params.object.id }
             });

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -32,19 +32,20 @@ const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
 const factory = __importStar(require("../../../factory"));
+// type IAcceptAction = Pick<factory.action.accept.coaOffer.IAction, 'result'>;
 /**
  * COA興行オファー承認のオファーを変更
  */
 function changeOffers(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['typeOf', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');
@@ -61,13 +62,21 @@ function changeOffers(params) {
         if (typeof originalAcceptActionId !== 'string' || originalAcceptActionId === '') {
             throw new factory.errors.NotFound('authorizeAction.object.id');
         }
-        const originalAcceptResult = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: authorizeAction.project.id } },
-            id: { $in: [originalAcceptActionId] },
-            typeOf: { $eq: factory.actionType.AcceptAction }
-        }, ['result'])).shift()?.result;
+        // const originalAcceptResult = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: authorizeAction.project.id } },
+        //         id: { $in: [originalAcceptActionId] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction }
+        //     },
+        //     ['result']
+        // )).shift()?.result;
+        const originalAcceptResult = (await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: authorizeAction.project.id },
+            id: originalAcceptActionId,
+            purpose: { id: authorizeAction.purpose.id },
+        }, ['result'])).result;
         if (originalAcceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
         }
@@ -126,7 +135,7 @@ function changeOffers(params) {
         // authorizeAction.object.acceptedOffer = acceptedOffers; // discontinue acceptedOffers(2024-06-21~)
         // recipe依存へ変更(2024-06-11~)
         // const updTmpReserveSeatResult = authorizeAction.result?.responseBody;
-        const recipe = await repos.action.findRecipeByAction({
+        const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
             project: { id: transaction.project.id },
             recipeFor: { id: originalAcceptActionId }
         });

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
@@ -35,7 +35,7 @@ declare function findAcceptAction(params: {
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action: AcceptCOAOfferActionRepo;
     task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction };

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

@@ -5,7 +5,7 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProductRepo } from '../../../repo/product';
 import type { ProjectRepo } from '../../../repo/project';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
     action: ActionRepo;
@@ -14,7 +14,7 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;

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

@@ -30,11 +30,14 @@ exports.authorize = authorize;
 const moment_1 = __importDefault(require("moment"));
 const factory = __importStar(require("../../../factory"));
 const MoneyTransferAssetTransactionService = __importStar(require("../../assetTransaction/moneyTransfer"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 function authorize(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf: ${params.purpose.typeOf} not implemented`);
+        }
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['seller', 'project', 'agent', 'typeOf']);
@@ -42,7 +45,7 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         const now = new Date();
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }

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

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

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

@@ -28,9 +28,12 @@ const factory = __importStar(require("../../../factory"));
 const MoneyTransferAssetTransactionService = __importStar(require("../../assetTransaction/moneyTransfer"));
 function voidTransaction(params) {
     return async (repos) => {
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf: ${params.purpose.typeOf} not implemented`);
+        }
         let transaction;
         if (params.agent !== undefined && params.agent !== null && typeof params.agent.id === 'string') {
-            transaction = await repos.transaction.projectFieldsInProgressById({
+            transaction = await repos.placeOrder.findPlaceOrderInProgressById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             }, ['typeOf']);

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

@@ -11,7 +11,7 @@ import type { ProductRepo } from '../../repo/product';
 import type { ProjectRepo } from '../../repo/project';
 import type { ServiceOutputRepo } from '../../repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 export interface IAuthorizeOperationRepos {
     account: AccountRepo;
@@ -26,7 +26,7 @@ export interface IAuthorizeOperationRepos {
     project: ProjectRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeOperationRepos) => Promise<T>;
@@ -96,5 +96,5 @@ export declare function authorize(params: {
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidRegisterServiceTransaction>): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

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

@@ -31,7 +31,7 @@ const factory = __importStar(require("../../factory"));
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 const availableProductTypes_1 = require("../../factory/availableProductTypes");
 const RegisterServiceTransaction = __importStar(require("../assetTransaction/registerService"));
-const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("./any");
 const factory_1 = require("./product/factory");
 const searchProductOffers_1 = require("./product/searchProductOffers");
@@ -99,7 +99,7 @@ function search(params) {
 function authorize(params) {
     return async (repos) => {
         const now = new Date();
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
@@ -117,7 +117,7 @@ function authorize(params) {
             })(repos);
         }
         // ポイント特典の識別子に利用するため注文番号を先に発行
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
@@ -214,7 +214,7 @@ function fixProductAndOffers(params) {
 }
 function voidTransaction(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['agent', 'status', 'typeOf']);

package/lib/chevre/service/order/confirmPayTransaction.d.ts

@@ -7,7 +7,6 @@ import type { EventRepo } from '../../repo/event';
 import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
 declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction> & {
     project: {
         id: string;
@@ -22,6 +21,5 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
     event: EventRepo;
     project: ProjectRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
 }) => Promise<void>;
 export { confirmPayTransaction };

package/lib/chevre/service/order/confirmPayTransaction.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = confirmPayTransaction;
 const factory = __importStar(require("../../factory"));
+// import type { TransactionRepo } from '../../repo/transaction';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
 function confirmPayTransaction(data, options) {
     return async (repos) => {

package/lib/chevre/service/order/findPlaceOrderTransaction.d.ts

@@ -1,4 +1,4 @@
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 type ITransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'potentialActions' | 'project' | 'typeOf'>;
 export declare function findPlaceOrderTransaction(params: {
@@ -8,6 +8,6 @@ export declare function findPlaceOrderTransaction(params: {
     confirmationNumber: string;
     orderNumber: string;
 }): (repos: {
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<ITransaction>;
 export {};

package/lib/chevre/service/order/findPlaceOrderTransaction.js

@@ -27,7 +27,7 @@ exports.findPlaceOrderTransaction = findPlaceOrderTransaction;
 const factory = __importStar(require("../../factory"));
 function findPlaceOrderTransaction(params) {
     return async (repos) => {
-        const placeOrderTransactions = await repos.transaction.projectFields({
+        const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/order/onAssetTransactionStatusChanged/isDeliverable.d.ts

@@ -0,0 +1,16 @@
+import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { OrderRepo } from '../../../repo/order';
+import * as factory from '../../../factory';
+declare function isDeliverable(params: {
+    project: {
+        id: string;
+    };
+    orderNumber: string;
+    assetTransactionType: factory.assetTransactionType.Reserve | factory.assetTransactionType.MoneyTransfer | factory.assetTransactionType.RegisterService;
+}): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}) => Promise<boolean>;
+export { isDeliverable };

package/lib/chevre/service/order/onAssetTransactionStatusChanged/isDeliverable.js

@@ -0,0 +1,97 @@
+"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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDeliverable = isDeliverable;
+const debug_1 = __importDefault(require("debug"));
+const factory = __importStar(require("../../../factory"));
+const debug = (0, debug_1.default)('chevre-domain:service:order');
+function isDeliverable(params) {
+    return async (repos) => {
+        let allReserveTransactionConfirmed = false;
+        let allMoneyTransferTransactionConfirmed = false;
+        let allRegisterServiceTransactionConfirmed = false;
+        if (params.assetTransactionType === factory.assetTransactionType.Reserve) {
+            allMoneyTransferTransactionConfirmed = true;
+            allRegisterServiceTransactionConfirmed = true;
+            // 注文のreservationNumberを取得
+            const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+            if (reservationNumbers.length > 0) {
+                const referencedReserveTransactions = await repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.Reserve,
+                    transactionNumber: { $in: reservationNumbers }
+                }, ['status']);
+                allReserveTransactionConfirmed =
+                    referencedReserveTransactions.length === reservationNumbers.length
+                        && referencedReserveTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allReserveTransactionConfirmed = true;
+            }
+        }
+        else if (params.assetTransactionType === factory.assetTransactionType.MoneyTransfer) {
+            allReserveTransactionConfirmed = true;
+            allRegisterServiceTransactionConfirmed = true;
+            // 注文のMoneyTransferTransaction.transactionNumberを取得
+            const moneyTransferTransactionNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            if (moneyTransferTransactionNumbers.length > 0) {
+                debug('is deliverable?...', params.orderNumber, 'moneyTransferTransactionNumbers:', moneyTransferTransactionNumbers);
+                const referencedMoneyTransferTransactions = await repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.MoneyTransfer,
+                    transactionNumber: { $in: moneyTransferTransactionNumbers }
+                }, ['status']);
+                allMoneyTransferTransactionConfirmed =
+                    referencedMoneyTransferTransactions.length === moneyTransferTransactionNumbers.length
+                        && referencedMoneyTransferTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allMoneyTransferTransactionConfirmed = true;
+            }
+        }
+        else if (params.assetTransactionType === factory.assetTransactionType.RegisterService) {
+            allReserveTransactionConfirmed = true;
+            allMoneyTransferTransactionConfirmed = true;
+            const registerServiceTransactionNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            if (registerServiceTransactionNumbers.length > 0) {
+                const referencedRegisterServiceTransactions = await repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.RegisterService,
+                    transactionNumber: { $in: registerServiceTransactionNumbers }
+                }, ['status']);
+                allRegisterServiceTransactionConfirmed =
+                    referencedRegisterServiceTransactions.length === registerServiceTransactionNumbers.length
+                        && referencedRegisterServiceTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allRegisterServiceTransactionConfirmed = true;
+            }
+        }
+        return allReserveTransactionConfirmed && allMoneyTransferTransactionConfirmed && allRegisterServiceTransactionConfirmed;
+    };
+}

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.d.ts

@@ -0,0 +1,21 @@
+import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { OrderRepo } from '../../../repo/order';
+import type { SettingRepo } from '../../../repo/setting';
+import type { TaskRepo } from '../../../repo/task';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
+import * as factory from '../../../factory';
+interface IOnPayTransactionCanceledRepos {
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+    setting: SettingRepo;
+    task: TaskRepo;
+    placeOrder: PlaceOrderRepo;
+}
+declare function onPayTransactionCanceled(params: factory.task.onAssetTransactionStatusChanged.IData & {
+    object: factory.task.onAssetTransactionStatusChanged.IObjectAsPayTransaction & {
+        status: factory.transactionStatusType.Canceled | factory.transactionStatusType.Expired;
+    };
+}): (repos: IOnPayTransactionCanceledRepos) => Promise<void>;
+export { IOnPayTransactionCanceledRepos, onPayTransactionCanceled, };