@chevre/domain 25.0.0-alpha.8 → 25.0.0

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const factory_1 = require("../../../factory");
-const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 const defaultOffer_1 = require("./authorize/defaultOffer");
 const factory_2 = require("./authorize/factory");
@@ -25,11 +24,11 @@ function authorize(params, options) {
         })(repos);
         let acceptedOffers4result;
         const now = new Date();
-        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+        // 注文ドキュメントを参照(2026-06-24~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: transaction.id,
             project: { id: params.project.id },
-            id: transaction.id,
-            object: { orderDate: now }
-        })(repos);
+        }, { onlyPlaceOrder: true });
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({
@@ -64,10 +63,9 @@ function authorize(params, options) {
                     };
                 });
                 await (0, any_1.acceptOffer)({
-                    orderNumber,
                     project: transaction.project,
-                    acceptedOffers: minimizedAcceptedOffers,
-                    ...((typeof params.object.broker?.typeOf === 'string') && { broker: params.object.broker })
+                    placeOrderId: transaction.id,
+                    acceptedOffers: minimizedAcceptedOffers
                 })(repos);
             }
         }

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

@@ -48,23 +48,35 @@ function voidTransaction(params) {
             default:
             // no op
         }
-        // add orderInTransaction(2024-01-15~)
-        // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        const orderNumberByTransaction = transaction.object.orderNumber;
-        if (typeof orderNumberByTransaction === 'string') {
-            switch (transaction.status) {
-                case factory_1.factory.transactionStatusType.Confirmed:
-                    // 確定取引の場合、不要なオファーのみ除外
-                    await (0, any_1.voidAcceptedOffer)({
-                        // authorizeActions,
-                        authorizeActionsWithInstrument: authorizeActions,
-                        orderNumber: orderNumberByTransaction
-                    })(repos);
-                    break;
-                default:
-                    // orderInTransaction自体を削除
-                    await repos.orderInTransaction.deleteByOrderNumber({ orderNumber: orderNumberByTransaction });
-            }
+        // // add orderInTransaction(2024-01-15~)
+        // // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+        // const orderNumberByTransaction = transaction.object.orderNumber;
+        // if (typeof orderNumberByTransaction === 'string') {
+        //     switch (transaction.status) {
+        //         case factory.transactionStatusType.Confirmed:
+        //             // 確定取引の場合、不要なオファーのみ除外
+        //             await voidAcceptedOffer({
+        //                 // authorizeActions,
+        //                 authorizeActionsWithInstrument: authorizeActions,
+        //                 orderNumber: orderNumberByTransaction
+        //             })(repos);
+        //             break;
+        //         default:
+        //             // orderInTransaction自体を削除
+        //             await repos.orderInTransaction.deleteByOrderNumber({ orderNumber: orderNumberByTransaction });
+        //     }
+        // }
+        switch (transaction.status) {
+            case factory_1.factory.transactionStatusType.Confirmed:
+                // 確定取引の場合、不要なオファーのみ除外
+                await (0, any_1.voidAcceptedOffer)({
+                    authorizeActionsWithInstrument: authorizeActions,
+                    placeOrderId: params.purpose.id
+                })(repos);
+                break;
+            default:
+                // orderInTransaction自体を削除
+                await repos.orderInTransaction.deleteByIdentifier({ identifier: params.purpose.id });
         }
         await Promise.all(authorizeActions.map(async (action) => {
             await repos.authorizeOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });

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

@@ -26,7 +26,7 @@ function voidTransactionByActionId(params) {
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
-        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
+        // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
         const action = await repos.authorizeOfferAction.findById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory_1.factory.errors.Argument('Transaction', 'Action not found in the transaction');
@@ -34,17 +34,21 @@ function voidTransactionByActionId(params) {
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
         await repos.authorizeOfferAction.cancelWithVoid({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id, cancelAction });
-        // add orderInTransaction(2024-01-15~)
-        // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        // const orderNumberByTransaction = transaction.object.orderNumber;
-        const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
-        if (typeof orderNumberByTransaction === 'string') {
-            await (0, any_1.voidAcceptedOffer)({
-                // authorizeActions: [action],
-                authorizeActionsWithInstrument: [action],
-                orderNumber: orderNumberByTransaction
-            })(repos);
-        }
+        // // add orderInTransaction(2024-01-15~)
+        // // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+        // // const orderNumberByTransaction = transaction.object.orderNumber;
+        // const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
+        // if (typeof orderNumberByTransaction === 'string') {
+        //     await voidAcceptedOffer({
+        //         // authorizeActions: [action],
+        //         authorizeActionsWithInstrument: [action],
+        //         orderNumber: orderNumberByTransaction
+        //     })(repos);
+        // }
+        await (0, any_1.voidAcceptedOffer)({
+            authorizeActionsWithInstrument: [action],
+            placeOrderId: params.purpose.id
+        })(repos);
         switch (action.instrument.typeOf) {
             case factory_1.factory.assetTransactionType.COAReserveTransaction: {
                 const { reserveService } = repos;

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

@@ -2,15 +2,11 @@ import type { COA } from '@motionpicture/coa-service';
 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 { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 interface IAcceptRepos {
     action: AcceptCOAOfferActionRepo;
     event: EventRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
@@ -19,8 +15,6 @@ interface IReAcceptRepos {
     action: AcceptCOAOfferActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     event: EventRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;

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

@@ -4,7 +4,6 @@ exports.acceptOffer = acceptOffer;
 exports.reAcceptOffer = reAcceptOffer;
 const errorHandler_1 = require("../../../errorHandler");
 const factory_1 = require("../../../factory");
-const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const authorize_1 = require("./acceptOffer/authorize");
 const factory_2 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
@@ -39,12 +38,11 @@ function acceptOffer(params) {
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        // issueOrderNumber(2025-03-11~)
-        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-            project: { id: transaction.project.id },
-            id: transaction.id,
-            object: { orderDate: new Date() }
-        })(repos);
+        // // 注文ドキュメントを参照(2026-06-24~)
+        // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+        //     identifier: transaction.id,
+        //     project: { id: transaction.project.id },
+        // });
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         const updTmpReserveSeatArgs = (0, factory_2.createUpdTmpReserveSeatArgs)({ object: params.object, coaInfo });
         let updTmpReserveSeatResult;
@@ -125,11 +123,11 @@ function reAcceptOffer(params) {
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
-        if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず
-            throw new factory_1.factory.errors.NotFound('transaction.object.orderNumber');
-        }
+        // 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.authorizeOfferAction.findById({ id: params.potentialActions.id, typeOf: factory_1.factory.actionType.AuthorizeAction }, ['id'], []);

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

@@ -32,7 +32,7 @@ export declare function responseBody2acceptedOffers4result(params: {
     responseBody: IResponseBody;
     acceptedOffer: IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
-    seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
+    seller?: never;
     bookingTime: Date;
     totalPrice: number;
 }): IResultAcceptedOffer[];

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

@@ -80,11 +80,11 @@ function authorize(params) {
             await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
         }
-        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
-        if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず(acceptCOAOfferにて)
-            throw new factory_2.factory.errors.NotFound('transaction.object.orderNumber');
-        }
+        // 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;
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
@@ -103,7 +103,7 @@ function authorize(params) {
                 responseBody: params.result.responseBody,
                 acceptedOffer: acceptedOffers,
                 event: screeningEvent,
-                seller: transaction.seller,
+                // seller: transaction.seller,
                 bookingTime: (0, moment_1.default)(action.startDate)
                     .toDate(),
                 totalPrice: price
@@ -117,8 +117,8 @@ function authorize(params) {
             // add orderInTransaction(2024-01-15~)
             // if (params.options.useCreateOrderOnOfferAccepted) {
             await (0, any_1.acceptOffer)({
-                orderNumber,
                 project: transaction.project,
+                placeOrderId: params.transaction.id,
                 acceptedOffers: acceptedOffers4result
             })(repos);
             // }

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

@@ -22,11 +22,11 @@ function changeOffers(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory_2.factory.errors.Forbidden('Transaction not yours');
         }
-        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
-        if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず
-            throw new factory_2.factory.errors.NotFound('transaction.object.orderNumber');
-        }
+        // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
+        // if (typeof orderNumber !== 'string') {
+        //     // 事前に発行されているはず
+        //     throw new factory.errors.NotFound('transaction.object.orderNumber');
+        // }
         // 取引内のアクションかどうか確認
         const authorizeAction = await repos.action.findById({ typeOf: factory_2.factory.actionType.AuthorizeAction, id: params.id });
         if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
@@ -126,7 +126,7 @@ function changeOffers(params) {
             responseBody: updTmpReserveSeatResult,
             acceptedOffer: acceptedOffers,
             event: screeningEvent,
-            seller: transaction.seller,
+            // seller: transaction.seller,
             bookingTime: (0, moment_1.default)(authorizeAction.startDate)
                 .toDate(),
             totalPrice: price
@@ -139,21 +139,25 @@ function changeOffers(params) {
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
         await repos.action.reStart({ id: authorizeAction.id, typeOf: authorizeAction.typeOf });
         try {
-            // まずvoidAcceptedOffer
-            // const orderNumberByTransaction = transaction.object.orderNumber;
-            const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
-            if (typeof orderNumberByTransaction === 'string') {
-                await (0, any_1.voidAcceptedOffer)({
-                    // authorizeActions: [authorizeAction],
-                    authorizeActionsWithInstrument: [authorizeAction],
-                    orderNumber: orderNumberByTransaction
-                })(repos);
-            }
+            // // まずvoidAcceptedOffer
+            // // const orderNumberByTransaction = transaction.object.orderNumber;
+            // const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
+            // if (typeof orderNumberByTransaction === 'string') {
+            //     await voidAcceptedOffer({
+            //         // authorizeActions: [authorizeAction],
+            //         authorizeActionsWithInstrument: [authorizeAction],
+            //         orderNumber: orderNumberByTransaction
+            //     })(repos);
+            // }
+            await (0, any_1.voidAcceptedOffer)({
+                authorizeActionsWithInstrument: [authorizeAction],
+                placeOrderId: params.transaction.id
+            })(repos);
             // add orderInTransaction(2024-01-15~)
             // if (params.options.useCreateOrderOnOfferAccepted) {
             await (0, any_1.acceptOffer)({
-                orderNumber,
                 project: transaction.project,
+                placeOrderId: params.transaction.id,
                 acceptedOffers: acceptedOffers4result
             })(repos);
             // }

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

@@ -1,28 +1,24 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { EventRepo } from '../../repo/event';
 import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
-import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { ReservationRepo } from '../../repo/reservation';
-import type { SettingRepo } from '../../repo/setting';
-import type { TaskRepo } from '../../repo/task';
-import { factory } from '../../factory';
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
  */
 declare function deleteOrder(params: {
-    object: Pick<factory.order.IOrder, 'orderNumber'>;
+    object: {
+        /**
+         * 注文取引ID
+         */
+        identifier: string;
+    };
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
-    event: EventRepo;
     note: NoteRepo;
     order: OrderRepo;
-    ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
 }) => Promise<void>;
 export { deleteOrder };

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

@@ -9,23 +9,26 @@ const factory_1 = require("../../factory");
  */
 function deleteOrder(params) {
     return async (repos) => {
+        if (typeof params.object.identifier !== 'string' || params.object.identifier === '') {
+            throw new factory_1.factory.errors.ArgumentNull('object.identifier');
+        }
         const orders = await repos.order.projectFields({
             limit: 1,
             page: 1,
-            orderNumbers: [params.object.orderNumber]
-        }, { inclusion: ['orderDate', 'project', 'customer', 'orderNumber', 'seller', 'broker'] });
+            // orderNumbers: [params.object.orderNumber],
+            identifier: { $eq: params.object.identifier }
+        }, { inclusion: ['project', 'orderNumber'] });
         const order = orders.shift();
         if (order === undefined) {
             // すでに削除済
             return;
         }
         if (typeof order.id !== 'string') {
-            throw new factory_1.factory.errors.Internal(`order.id undefined. orderNumber: ${params.object.orderNumber}`);
+            throw new factory_1.factory.errors.Internal(`order.id undefined. orderNumber: ${order.orderNumber}`);
         }
         // 注文アイテムの予約を削除
         await deleteReservationsByOrder(order)(repos);
         // 所有権は所有期限でcleanされるので、注文削除時連動はひとまず廃止(2026-05-17~)
-        // // 所有権削除
         // try {
         //     await deleteOwnershipInfosByOrder(order)(repos);
         // } catch (error) {
@@ -42,50 +45,6 @@ function deleteOrder(params) {
         });
         // 注文削除
         await repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
-        // deletePerson(2024-12-25~)
-        await deletePersonIfNecessary(order)(repos);
-    };
-}
-function deletePersonIfNecessary(order) {
-    return async (repos) => {
-        // 代理注文を除く
-        const isCustomerPerson = order.customer.typeOf === factory_1.factory.personType.Person
-            && typeof order.broker?.typeOf !== 'string';
-        if (isCustomerPerson) {
-            const ordersByPerson = await repos.order.projectFields({
-                limit: 1,
-                page: 1,
-                customer: { ids: [order.customer.id] }
-            }, { inclusion: ['orderNumber'] });
-            if (ordersByPerson.length === 0) {
-                const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
-                if (typeof setting?.userPoolIdNew !== 'string') {
-                    throw new factory_1.factory.errors.NotFound('setting.userPoolIdNew');
-                }
-                const deletePersonTask = {
-                    project: { typeOf: factory_1.factory.organizationType.Project, id: order.project.id },
-                    name: factory_1.factory.taskName.DeletePerson,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: new Date(),
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: {
-                        id: order.customer.id,
-                        agent: {
-                            id: order.project.id,
-                            typeOf: factory_1.factory.organizationType.Project,
-                            name: factory_1.factory.organizationType.Project
-                        },
-                        physically: true,
-                        userPoolId: setting.userPoolIdNew,
-                        // migrate: false,
-                        executeBackground: true
-                    }
-                };
-                await repos.task.saveMany([deletePersonTask], { emitImmediately: true });
-            }
-        }
     };
 }
 function deleteReservationsByOrder(order) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled/factory.d.ts

@@ -7,5 +7,5 @@ import { factory } from '../../../../factory';
  */
 declare function createOnOrderCancelledTasksByTransaction(params: {
     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deletePerson").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
 export { createOnOrderCancelledTasksByTransaction };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts

@@ -18,5 +18,5 @@ declare function createInformTasks(params: {
 }, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deletePerson").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createNextSendOrderTasks, IInTransitOrder };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.d.ts

@@ -1,7 +1,10 @@
+/**
+ * 注文決済時処理
+ */
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 declare function onOrderPaymentDue(params: {
-    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'orderDate' | 'seller' | 'typeOf' | 'price' | 'priceCurrency'> & {
+    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'orderDate' | 'typeOf'> & {
         orderStatus: factory.orderStatus.OrderPaymentDue;
     };
 }): (repos: {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -1,32 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderPaymentDue = onOrderPaymentDue;
-/**
- * 注文決済時処理
- */
-const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { createMaskedCustomer } from '../../../factory/order';
-const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderPaymentDue(params) {
     return async (repos) => {
-        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
-        // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
-            // seller: {
-            //     id: params.order.seller.id,
-            //     typeOf: params.order.seller.typeOf,
-            //     name: params.order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: params.order.orderNumber,
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         switch (params.order.orderStatus) {
@@ -62,12 +43,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     object: { transactionNumber: { $eq: invoice.paymentMethodId } },
                     purpose: { orderNumber: { $eq: order.orderNumber } }
                 }
-            }, ['id']
-            // {
-            //     data: 0, executionResults: 0, name: 0, numberOfTried: 0,
-            //     remainingNumberOfTries: 0, runsAt: 0, status: 0
-            // }
-            );
+            }, ['id']);
             if (existingTasks.length === 0) {
                 const data = {
                     project: order.project,
@@ -114,7 +90,6 @@ function createCreateAccountingReportTask(order) {
         executionResults: [],
         data: {
             object: { mainEntity: { orderNumber: order.orderNumber } }
-            // project: { id: order.project.id }
         }
     };
     return [task];

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts

@@ -11,5 +11,5 @@ declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IRe
 declare function createOnOrderReturnedTasksByTransaction(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deletePerson").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction, IReturnAction };

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -89,8 +89,9 @@ function createPlacingOrderFromExistingTransaction(params) {
             .map(({ instrument }) => String(instrument.transactionNumber));
         try {
             // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
-            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
-                orderNumber,
+            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
+                // orderNumber,
+                identifier: placeOrderTransactionWithResult.id,
                 project: { id: params.project.id }
             }))
                 .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));

package/lib/chevre/service/order/placeOrder/factory.d.ts

@@ -10,7 +10,7 @@ declare function createPaymentMethods(params: {
 };
 declare function createSeller(params: {
     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'seller'>;
-}): factory.order.ISeller;
+}): Pick<factory.order.ISeller, 'id' | 'name' | 'typeOf'>;
 declare function createPlacingOrder(params: {
     transaction: IPlaceOrderTransaction;
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];

package/lib/chevre/service/order/placeOrder/factory.js

@@ -61,9 +61,9 @@ function createSeller(params) {
     return {
         id: seller.id,
         name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
-        typeOf: seller.typeOf,
-        // 追加特性を追加(2023-08-08~)
-        additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
+        typeOf: seller.typeOf
+        // // 追加特性を追加(2023-08-08~)
+        // additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
     };
 }
 function createPlacingOrder(params) {
@@ -79,7 +79,7 @@ function createPlacingOrder(params) {
         throw new factory_1.factory.errors.Internal('object.orderNumber undefined');
     }
     if (orderDate === undefined) {
-        orderDateByTransaction = transaction.result?.order?.orderDate;
+        // orderDateByTransaction = transaction.result?.order?.orderDate
     }
     else {
         orderDateByTransaction = orderDate;
@@ -91,7 +91,7 @@ function createPlacingOrder(params) {
     // if (orderByTransaction === undefined) {
     //     throw new factory.errors.NotFound('transaction.result.order');
     // }
-    const seller = createSeller({ transaction });
+    // const seller = createSeller({ transaction });
     // discontinue(2026-06-11~)
     // const name: string | undefined =
     //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
@@ -119,7 +119,7 @@ function createPlacingOrder(params) {
         orderNumber,
         typeOf: factory_1.factory.order.OrderType.Order, // 取引保管を廃止するためにここで指定(2026-06-14~)
         orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 取引保管を廃止するためにここで指定(2026-06-14~)
-        seller, // 2024-06-17~
+        // seller, // 取引開始時の注文ドキュメント作成へ移行(2026-06-25~)
         paymentMethods, // 2024-06-17~
         price, // 2024-06-17~
         priceCurrency: factory_1.factory.priceCurrency.JPY, // 取引保管を廃止するためにここで指定(2026-06-14~)

package/lib/chevre/service/order/placeOrder/voidAcceptedOfferIfNecessary.d.ts

@@ -1,8 +1,6 @@
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 declare function voidAcceptedOfferIfNecessary(params: {
-    object: {
-        orderNumber: string;
-    };
+    placeOrderId: string;
     serialNumbers: string[];
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;