@chevre/domain 24.0.0-alpha.4 → 24.0.0-alpha.40

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

@@ -50,15 +50,32 @@ function createDeleteTransactionTasksByAgentId(params) {
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
         if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
             const transactionTypeOf = params.object.typeOf;
-            const transactions = await repos.transaction.projectFields({
-                project: { id: { $eq: params.object.project.id } },
-                agent: {
-                    ids: [agentIdSpecified],
-                    typeOf: factory.personType.Person
-                },
-                typeOf: transactionTypeOf,
-                inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
-            });
+            let transactions;
+            if (transactionTypeOf === factory.transactionType.PlaceOrder) {
+                transactions = await repos.placeOrder.findPlaceOrderTransactions({
+                    project: { id: { $eq: params.object.project.id } },
+                    agent: {
+                        ids: [agentIdSpecified],
+                        typeOf: factory.personType.Person
+                    },
+                    typeOf: transactionTypeOf,
+                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
+                });
+            }
+            else if (transactionTypeOf === factory.transactionType.ReturnOrder) {
+                transactions = await repos.returnOrder.findReturnOrderTransactions({
+                    project: { id: { $eq: params.object.project.id } },
+                    agent: {
+                        ids: [agentIdSpecified],
+                        typeOf: factory.personType.Person
+                    },
+                    typeOf: transactionTypeOf,
+                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
+                });
+            }
+            else {
+                throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
+            }
             const deleteAt = new Date();
             let deleteTransactionTasks;
             switch (transactionTypeOf) {
@@ -119,34 +136,6 @@ function createDeleteTransactionTasksByAgentId(params) {
                         };
                     });
                     break;
-                case factory.transactionType.MoneyTransfer:
-                    deleteTransactionTasks = transactions.map((transaction) => {
-                        return {
-                            project: transaction.project,
-                            name: factory.taskName.DeleteTransaction,
-                            status: factory.taskStatus.Ready,
-                            runsAt: deleteAt,
-                            remainingNumberOfTries: 3,
-                            numberOfTried: 0,
-                            executionResults: [],
-                            data: {
-                                object: {
-                                    specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
-                                    id: transaction.id,
-                                    object: {
-                                        ...(transaction.object.pendingTransaction !== undefined)
-                                            ? { pendingTransaction: transaction.object.pendingTransaction }
-                                            : undefined
-                                    },
-                                    project: transaction.project,
-                                    startDate: transaction.startDate,
-                                    typeOf: transaction.typeOf,
-                                    ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
-                                }
-                            }
-                        };
-                    });
-                    break;
                 default:
                     throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
             }
@@ -166,11 +155,24 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory.errors.ArgumentNull('object.id');
         }
-        const transaction = (await repos.transaction.projectFields({
-            ids: [deletingTransactionId],
-            typeOf: params.object.typeOf,
-            inclusion: ['typeOf', 'project', 'status', 'result']
-        })).shift();
+        let transaction;
+        if (params.object.typeOf === factory.transactionType.PlaceOrder) {
+            transaction = (await repos.placeOrder.findPlaceOrderTransactions({
+                ids: [deletingTransactionId],
+                typeOf: params.object.typeOf,
+                inclusion: ['typeOf', 'project', 'status', 'result']
+            })).shift();
+        }
+        else if (params.object.typeOf === factory.transactionType.ReturnOrder) {
+            transaction = (await repos.returnOrder.findReturnOrderTransactions({
+                ids: [deletingTransactionId],
+                typeOf: params.object.typeOf,
+                inclusion: ['typeOf', 'project', 'status', 'result']
+            })).shift();
+        }
+        else {
+            throw new factory.errors.NotImplemented(`object not implemented. typeOf:${params.object.typeOf}`);
+        }
         if (transaction === undefined) {
             // すでに削除済
             return;
@@ -219,6 +221,7 @@ function deleteTransactionById(params) {
                         default:
                             throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                     }
+                    // eslint-disable-next-line no-warning-comments
                     // TODO サービス登録取引を削除
                     // 決済取引を削除
                     const deletePayTransactionsByPlaceOrderResult = await deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
@@ -258,11 +261,6 @@ function deleteTransactionById(params) {
                     // 取引削除
                     await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
-                // implemented(2022-06-09~)
-                case factory.transactionType.MoneyTransfer:
-                    // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
-                    break;
                 default:
                     throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
             }

package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.d.ts

@@ -2,8 +2,8 @@ import * as factory from '../../../../../factory';
 export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
-export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
 export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
     object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
+    instrument?: never;
 };
 export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validatePrice.d.ts

@@ -1,3 +1,3 @@
-import { IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer } from './factory';
-declare function validatePrice(authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[]): void;
+import { IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IAuthorizeProductOffer } from './factory';
+declare function validatePrice(authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[]): void;
 export { validatePrice };

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validatePrice.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePrice = validatePrice;
 const factory = __importStar(require("../../../../../factory"));
-function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions) {
+function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions) {
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -42,8 +42,7 @@ function validatePrice(authorizePaymentActions, authorizeEventServiceOfferAction
     // 販売者が提供するアイテムの発生金額
     [
         ...authorizeEventServiceOfferActions,
-        ...authorizeProductOfferActions,
-        ...authorizeMoneyTansferActions
+        ...authorizeProductOfferActions
     ].forEach(({ id, result }) => {
         const priceByAction = result?.price;
         if (typeof priceByAction === 'number' && priceByAction >= 0) {

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -1,11 +1,11 @@
 import * as factory from '../../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../../factory/transaction';
-import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction } from './validation/factory';
-export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction };
+import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction } from './validation/factory';
+export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction };
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -44,10 +44,10 @@ const debug = (0, debug_1.default)('chevre-domain:service:transaction');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
+function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
     // validateProfile(transaction);
     validateProfile({ customer });
-    (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
+    (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions);
     // 請求のreferencesOrder検証(2025-11-23~)
     (0, validateInvoiceReferencesOrder_1.validateInvoiceReferencesOrder)(authorizePaymentActions, eventReservationAcceptedOffers);
     // 利用可能な通貨単位に対して取引検証
@@ -274,8 +274,7 @@ function validateAcceptedOffers(params) {
     // チケット識別子ユニークネス検証(2024-04-16~)
     let ticketIdentifiers = [];
     params.acceptedOffers.forEach(({ itemOffered }) => {
-        if (itemOffered.typeOf === factory.reservationType.BusReservation
-            || itemOffered.typeOf === factory.reservationType.EventReservation) {
+        if (itemOffered.typeOf === factory.reservationType.EventReservation) {
             if (typeof itemOffered.reservedTicket.identifier === 'string') {
                 ticketIdentifiers.push(itemOffered.reservedTicket.identifier);
             }
@@ -292,8 +291,7 @@ function validateAcceptedOffers(params) {
     // チケット識別子ユニークネス検証(2024-04-15~)
     let ticketNumbers = [];
     params.acceptedOffers.forEach(({ itemOffered }) => {
-        if (itemOffered.typeOf === factory.reservationType.BusReservation
-            || itemOffered.typeOf === factory.reservationType.EventReservation) {
+        if (itemOffered.typeOf === factory.reservationType.EventReservation) {
             if (typeof itemOffered.reservedTicket.ticketNumber === 'string') {
                 ticketNumbers.push(itemOffered.reservedTicket.ticketNumber);
             }

package/lib/chevre/service/transaction/placeOrder/confirm.d.ts

@@ -1,4 +1,6 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
+import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
@@ -8,17 +10,20 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { SettingRepo } from '../../../repo/setting';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
-    action: ActionRepo;
+    action?: never;
+    acceptPayAction: AcceptPayActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     confirmationNumber: ConfirmationNumberRepo;
@@ -57,4 +62,4 @@ interface IConfirmResult {
  * 注文取引を確定する
  */
 declare function confirm(params: IConfirmParams, options: IConfirmOptions): IConfirmOperation<IConfirmResult>;
-export { confirm };
+export { IConfirmOperationRepos, confirm };

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -31,7 +31,6 @@ const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../../../errorHandler");
 const factory = __importStar(require("../../../factory"));
-const availableProductTypes_1 = require("../../../factory/availableProductTypes");
 // import { Settings } from '../../../settings';
 const factory_1 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
@@ -40,19 +39,20 @@ const potentialActions_1 = require("./confirm/potentialActions");
 const publishCode_1 = require("./confirm/publishCode");
 const validation_1 = require("./confirm/validation");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
-const publishOrderNumberIfNotExist_1 = require("./publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 const debug = (0, debug_1.default)('chevre-domain:service:transaction');
+/**
+ * 進行中でない取引を処理する
+ */
 function processTransactionNotInProgress(transaction) {
     return async (repos) => {
         if (transaction.status === factory.transactionStatusType.Confirmed) {
-            // retrieve customer from orderInTransaction(2024-06-24~)
-            // let resultCustomer: factory.order.ICustomer | undefined = createCustomer({ transaction });
             const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
                 orderNumber: { $eq: String(transaction.object.orderNumber) }
             });
-            if (resultCustomer === undefined) {
-                throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
-            }
+            // if (resultCustomer === undefined) {
+            //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
+            // }
             // すでに確定済の場合
             return {
                 ...transaction.result,
@@ -65,6 +65,7 @@ function processTransactionNotInProgress(transaction) {
         else if (transaction.status === factory.transactionStatusType.Canceled) {
             throw new factory.errors.Argument('transactionId', 'Transaction already canceled');
         }
+        return;
     };
 }
 /**
@@ -80,7 +81,7 @@ function confirm(params, options) {
             status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
         const confirmResult = await processTransactionNotInProgress(transaction)(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
@@ -95,7 +96,7 @@ function confirm(params, options) {
             acceptPayActions = await searchAcceptPayActions(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: params.result.order.orderDate }
@@ -117,7 +118,7 @@ function confirm(params, options) {
         }
         const { 
         // acceptedOffersFromAuthorizeAction, // discontinue(2024-06-17~)
-        authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
+        authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
         const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
@@ -140,7 +141,7 @@ function confirm(params, options) {
             ...params,
             orderNumber, transaction,
             acceptPayActions,
-            authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions,
+            authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions,
             acceptedOffers, payTransactions, customer,
             ...(typeof code === 'string') ? { code } : undefined
         }, options);
@@ -179,7 +180,7 @@ function confirm(params, options) {
         })(repos);
         // ステータス変更
         try {
-            await repos.transaction.confirm({
+            await repos.placeOrder.confirmPlaceOrder({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
                 result: result,
@@ -239,31 +240,33 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
     // const acceptedOffersFromAuthorizeAction: IOrderAcceptedOffer[] = []; // discontinue(2024-06-17~)
     const authorizePaymentActions = [];
     const authorizeEventServiceOfferActions = [];
-    const authorizeMoneyTansferActions = [];
     const authorizeProductOfferActions = [];
     const serialNumbers = [];
     completedAuthorizeActions.forEach((a) => {
         let serialNumber;
         if (Array.isArray(a.object)) {
-            if (a.object.length > 0
-                && a.object.every(({ typeOf }) => typeOf === factory.offerType.Offer)
-                && a.object.every(({ itemOffered }) => availableProductTypes_1.availableProductTypes.indexOf(itemOffered.typeOf) >= 0)) {
-                authorizeProductOfferActions.push(a);
-                serialNumber = a.instrument.transactionNumber;
-            }
+            throw new factory.errors.NotImplemented('authorizeAction object as an array discontinued.'); // discontinue(2026-03-13~)
+            // if (
+            //     a.object.length > 0
+            //     && a.object.every(({ typeOf }) => typeOf === factory.offerType.Offer)
+            //     && a.object.every(({ itemOffered }) => availableProductTypes.indexOf(itemOffered.typeOf) >= 0)
+            // ) {
+            //     authorizeProductOfferActions.push(<IAuthorizeProductOffer>a);
+            //     serialNumber = (<IAuthorizeProductOffer>a).instrument.transactionNumber;
+            // }
         }
         else {
             if (a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation) {
                 authorizeEventServiceOfferActions.push(a);
-                const assetTransactionNumber = a.instrument.transactionNumber;
+                const assetTransactionNumber = a.instrument?.transactionNumber;
                 if (typeof assetTransactionNumber !== 'string') {
                     throw new factory.errors.NotFound('instrument.transactionNumber', `action.instrument.transactionNumber not found. [${a.id}]`);
                 }
                 serialNumber = assetTransactionNumber;
             }
-            else if (a.object.typeOf === factory.offerType.Offer
-                && a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer) {
-                authorizeMoneyTansferActions.push(a);
+            else if (a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
+                && a.instrument?.typeOf === factory.assetTransactionType.RegisterService) {
+                authorizeProductOfferActions.push(a);
                 serialNumber = a.instrument.transactionNumber;
             }
             else if (a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment) {
@@ -279,7 +282,6 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
         authorizePaymentActions,
         authorizeEventServiceOfferActions,
         authorizeProductOfferActions,
-        authorizeMoneyTansferActions,
         serialNumbers
     };
 }
@@ -297,8 +299,7 @@ function createReservationIdsResult(order, acceptedOffers) {
             eventId = eventIdsByOrder[0];
             if (Array.isArray(acceptedOffers)) {
                 acceptedOffers.forEach((o) => {
-                    if (o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation) {
+                    if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
                         reservationIds.push(o.itemOffered.id);
                     }
                 });
@@ -311,31 +312,27 @@ function createResult(params, options) {
     const transaction = params.transaction;
     const eventReservationAcceptedOffers = [];
     const productAcceptedOffers = [];
-    const moneyTransferAcceptedOffers = [];
+    // const moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[] = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
-            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 eventReservationAcceptedOffers.push(acceptedOffer);
                 break;
             case factory.permit.PermitType.Permit:
                 productAcceptedOffers.push(acceptedOffer);
                 break;
-            case factory.actionType.MoneyTransfer:
-                moneyTransferAcceptedOffers.push(acceptedOffer);
-                break;
             default:
                 throw new factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer);
+    (0, validation_1.validateTransaction)(transaction, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer);
     const { paymentMethods, price } = (0, factory_1.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,
         productAcceptedOffers,
-        moneyTransferAcceptedOffers
+        // moneyTransferAcceptedOffers
     });
     // 注文作成
     const orderAsResult = (0, result_1.createOrderAsResult)({
@@ -374,8 +371,7 @@ function createResult(params, options) {
     const authorizeActions = [
         ...params.authorizePaymentActions.map(({ id }) => ({ id })),
         ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
-        ...params.authorizeProductOfferActions.map(({ id }) => ({ id })),
-        ...params.authorizeMoneyTansferActions.map(({ id }) => ({ id }))
+        ...params.authorizeProductOfferActions.map(({ id }) => ({ id }))
     ];
     let eventId;
     let reservationIds;
@@ -402,16 +398,26 @@ function createResult(params, options) {
 }
 function searchAcceptPayActions(params) {
     return async (repos) => {
-        let acceptPayActions = await repos.action.search({
-            project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.actionType.AcceptAction },
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+        // let acceptPayActions = <IAcceptPayAction[]>await repos.action.search(
+        //     {
+        //         project: { id: { $eq: params.project.id } },
+        //         typeOf: { $eq: factory.actionType.AcceptAction },
+        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+        //         purpose: {
+        //             id: { $in: [params.id] },
+        //             typeOf: { $in: [factory.transactionType.PlaceOrder] }
+        //         },
+        //         object: {
+        //             typeOf: { $eq: factory.assetTransactionType.Pay }
+        //         }
+        //     },
+        //     ['object', 'endDate', 'result']
+        // );
+        let acceptPayActions = await repos.acceptPayAction.findAcceptActionsByPurpose({
+            project: { id: params.project.id },
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
             purpose: {
-                id: { $in: [params.id] },
-                typeOf: { $in: [factory.transactionType.PlaceOrder] }
-            },
-            object: {
-                typeOf: { $eq: factory.assetTransactionType.Pay }
+                id: params.id
             }
         }, ['object', 'endDate', 'result']);
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
@@ -425,15 +431,33 @@ function searchAcceptPayActions(params) {
 function searchAuthorizeActions(params) {
     return async (repos) => {
         // 取引に対する全ての承認アクションをマージ
-        let authorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
-            purpose: {
-                typeOf: factory.transactionType.PlaceOrder,
-                id: params.id
-            },
-            // Completedに絞る(2023-05-16~)
-            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        });
+        // let authorizeActions = <IAuthorizeOfferOrPaymentAction[]>await repos.action.searchByPurpose({
+        //     typeOf: factory.actionType.AuthorizeAction,
+        //     purpose: {
+        //         typeOf: factory.transactionType.PlaceOrder,
+        //         id: params.id
+        //     },
+        //     // Completedに絞る(2023-05-16~)
+        //     actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+        // });
+        let authorizeActions = [
+            ...await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
+                purpose: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    id: params.id
+                },
+                // Completedに絞る(2023-05-16~)
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            }),
+            ...await repos.authorizeOfferAction.findAuthorizeAnyOfferActionsByPurpose({
+                purpose: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    id: params.id
+                },
+                // Completedに絞る(2023-05-16~)
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            }),
+        ];
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {
             return (a.endDate instanceof Date) && (0, moment_1.default)(a.endDate)

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -29,8 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTasks = createTasks;
 const moment_1 = __importDefault(require("moment"));
 const factory = __importStar(require("../../../../factory"));
-// | factory.task.IAttributes<factory.taskName.VoidRegisterServiceTransaction>
-// | factory.task.IAttributes<factory.taskName.VoidMoneyTransferTransaction>;
+// | factory.task.IAttributes<factory.taskName.VoidRegisterServiceTransaction>;
 /**
  * 取引のタスクを作成する
  */
@@ -215,6 +214,7 @@ function createTasks(params, setting
             else {
                 taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             }
+            // eslint-disable-next-line no-warning-comments
             // TODO reimplement
             // temporarily discontinue VoidRegisterServiceTransaction VoidMoneyTransferTransaction(2025-02-25~)
             // const voidRegisterServiceTaskAttributes: factory.task.IAttributes<factory.taskName.VoidRegisterServiceTransaction> = {
@@ -230,19 +230,6 @@ function createTasks(params, setting
             //         purpose: { typeOf: transaction.typeOf, id: transaction.id }
             //     }
             // };
-            // const voidMoneyTransferTaskAttributes: factory.task.IAttributes<factory.taskName.VoidMoneyTransferTransaction> = {
-            //     project: transaction.project,
-            //     name: factory.taskName.VoidMoneyTransferTransaction,
-            //     status: factory.taskStatus.Ready,
-            //     runsAt: taskRunsAt,
-            //     remainingNumberOfTries: 10,
-            //     numberOfTried: 0,
-            //     executionResults: [],
-            //     data: {
-            //         project: transaction.project,
-            //         purpose: { typeOf: transaction.typeOf, id: transaction.id }
-            //     }
-            // };
             // taskAttributes.push(
             //     voidRegisterServiceTaskAttributes,
             //     voidMoneyTransferTaskAttributes

package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts

@@ -1,15 +1,16 @@
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
-type ITaskAndTransactionOperation<T> = (repos: {
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
+interface IExportTasksByIdRepos {
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
-}) => Promise<T>;
+    placeOrder: PlaceOrderRepo;
+}
+type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise<T>;
 /**
  * 取引のタスクを出力します
  */
-export declare function exportTasksById(params: {
+declare function exportTasksById(params: {
     id: string;
     /**
      * タスク実行日時バッファ
@@ -20,4 +21,4 @@ export declare function exportTasksById(params: {
      */
     optimizeRedundantTasks: boolean;
 }): ITaskAndTransactionOperation<void>;
-export {};
+export { IExportTasksByIdRepos, exportTasksById };

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -38,7 +38,7 @@ function exportTasksById(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);

package/lib/chevre/service/transaction/placeOrder/{publishOrderNumberIfNotExist.d.ts → issueOrderNumberIfNotExist.d.ts}

@@ -1,10 +1,10 @@
 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';
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
-declare function publishOrderNumberIfNotExist(params: {
+declare function issueOrderNumberIfNotExist(params: {
     project: {
         id: string;
     };
@@ -17,7 +17,7 @@ declare function publishOrderNumberIfNotExist(params: {
     };
 }): (repos: {
     project: ProjectRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     orderNumber: OrderNumberRepo;
 }) => Promise<string>;
-export { publishOrderNumberIfNotExist };
+export { issueOrderNumberIfNotExist };