@chevre/domain 25.0.0-alpha.20 → 25.0.0-alpha.22

package/lib/chevre/service/taskHandler.js

@@ -54,7 +54,6 @@ function executeTask(task, next) {
                 case factory_1.factory.taskName.CheckMovieTicket:
                 case factory_1.factory.taskName.CheckResource:
                 case factory_1.factory.taskName.CreateAccountingReport:
-                case factory_1.factory.taskName.DeletePerson:
                 case factory_1.factory.taskName.HandleNotification:
                 case factory_1.factory.taskName.ImportEventCapacitiesFromCOA:
                 case factory_1.factory.taskName.ImportEventsFromCOA:

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

@@ -3,35 +3,29 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
-import type { EventRepo } from '../../repo/event';
 import type { MessageRepo } from '../../repo/message';
 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 type { TransactionRepo } from '../../repo/transaction';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
-/**
- * 取引に関わるリソースを削除する
- * 冪等性を確保すること
- */
-export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
+interface IDeleteTransactionRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    event: EventRepo;
     message: MessageRepo;
     note: NoteRepo;
     order: OrderRepo;
-    ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
     transaction: TransactionRepo;
     placeOrder: PlaceOrderRepo;
     returnOrder: ReturnOrderRepo;
-}) => Promise<void>;
+}
+/**
+ * 取引に関わるリソースを削除する
+ * 冪等性を確保すること
+ */
+export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: IDeleteTransactionRepos) => Promise<void>;
+export {};

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

@@ -11,118 +11,15 @@ const deleteOrder_1 = require("../order/deleteOrder");
 function deleteTransaction(params) {
     return async (repos) => {
         if (params.object.specifyingMethod === factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
-            // transaction.agent.id指定による取引削除に対応(2023-06-30~)
-            await createDeleteTransactionTasksByAgentId(params)(repos);
+            throw new factory_1.factory.errors.NotImplemented('deleteTransaction by agentId discontinued'); // discontinue(2026-06-28~)
+            // // transaction.agent.id指定による取引削除に対応(2023-06-30~)
+            // await createDeleteTransactionTasksByAgentId(params)(repos);
         }
         else {
             await deleteTransactionById(params)(repos);
         }
     };
 }
-function createDeleteTransactionTasksByAgentId(params) {
-    return async (repos) => {
-        if (params.object.specifyingMethod !== factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
-            throw new factory_1.factory.errors.Argument('object.specifyingMethod', `must be ${factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId}`);
-        }
-        const agentIdSpecified = params.object.agent.id;
-        // agentIdによる全取引についてDeleteTransactionタスクを作成する
-        if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
-            const transactionTypeOf = params.object.typeOf;
-            let transactions;
-            if (transactionTypeOf === factory_1.factory.transactionType.PlaceOrder) {
-                transactions = await repos.placeOrder.findPlaceOrderTransactions({
-                    project: { id: { $eq: params.object.project.id } },
-                    agent: {
-                        ids: [agentIdSpecified],
-                        typeOf: factory_1.factory.personType.Person
-                    },
-                    typeOf: transactionTypeOf,
-                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
-                });
-            }
-            else if (transactionTypeOf === factory_1.factory.transactionType.ReturnOrder) {
-                transactions = await repos.returnOrder.findReturnOrderTransactions({
-                    project: { id: { $eq: params.object.project.id } },
-                    agent: {
-                        ids: [agentIdSpecified],
-                        typeOf: factory_1.factory.personType.Person
-                    },
-                    typeOf: transactionTypeOf,
-                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
-                });
-            }
-            else {
-                throw new factory_1.factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
-            }
-            const deleteAt = new Date();
-            let deleteTransactionTasks;
-            switch (transactionTypeOf) {
-                case factory_1.factory.transactionType.PlaceOrder:
-                    deleteTransactionTasks = transactions.map((transaction) => {
-                        return {
-                            project: transaction.project,
-                            name: factory_1.factory.taskName.DeleteTransaction,
-                            status: factory_1.factory.taskStatus.Ready,
-                            runsAt: deleteAt,
-                            remainingNumberOfTries: 3,
-                            numberOfTried: 0,
-                            executionResults: [],
-                            data: {
-                                object: {
-                                    specifyingMethod: factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
-                                    id: transaction.id,
-                                    object: {
-                                        ...(typeof transaction.object.confirmationNumber === 'string')
-                                            ? { confirmationNumber: transaction.object.confirmationNumber }
-                                            : undefined,
-                                        ...(typeof transaction.object.orderNumber === 'string')
-                                            ? { orderNumber: transaction.object.orderNumber }
-                                            : undefined
-                                    },
-                                    project: transaction.project,
-                                    startDate: transaction.startDate,
-                                    typeOf: transaction.typeOf,
-                                    ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
-                                }
-                            }
-                        };
-                    });
-                    break;
-                case factory_1.factory.transactionType.ReturnOrder:
-                    deleteTransactionTasks = transactions.map((transaction) => {
-                        return {
-                            project: transaction.project,
-                            name: factory_1.factory.taskName.DeleteTransaction,
-                            status: factory_1.factory.taskStatus.Ready,
-                            runsAt: deleteAt,
-                            remainingNumberOfTries: 3,
-                            numberOfTried: 0,
-                            executionResults: [],
-                            data: {
-                                object: {
-                                    specifyingMethod: factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
-                                    id: transaction.id,
-                                    object: {
-                                        order: transaction.object.order
-                                    },
-                                    project: transaction.project,
-                                    startDate: transaction.startDate,
-                                    typeOf: transaction.typeOf,
-                                    ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
-                                }
-                            }
-                        };
-                    });
-                    break;
-                default:
-                    throw new factory_1.factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
-            }
-            if (deleteTransactionTasks.length > 0) {
-                await repos.task.saveMany(deleteTransactionTasks, { emitImmediately: true });
-            }
-        }
-    };
-}
 function deleteTransactionById(params) {
     return async (repos) => {
         if (typeof params.object.specifyingMethod === 'string'
@@ -133,7 +30,7 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory_1.factory.errors.ArgumentNull('object.id');
         }
-        let deletingOrderNumberByTask;
+        // let deletingOrderNumberByTask: string | undefined;
         let transaction;
         if (params.object.typeOf === factory_1.factory.transactionType.PlaceOrder) {
             transaction = (await repos.placeOrder.findPlaceOrderTransactions({
@@ -141,7 +38,7 @@ function deleteTransactionById(params) {
                 typeOf: params.object.typeOf,
                 inclusion: ['typeOf', 'project', 'status']
             })).shift();
-            deletingOrderNumberByTask = params.object.object.orderNumber;
+            // deletingOrderNumberByTask = params.object.object.orderNumber;
         }
         else if (params.object.typeOf === factory_1.factory.transactionType.ReturnOrder) {
             transaction = (await repos.returnOrder.findReturnOrderTransactions({
@@ -191,18 +88,15 @@ function deleteTransactionById(params) {
                         case factory_1.factory.transactionStatusType.Expired:
                             break;
                         case factory_1.factory.transactionStatusType.Confirmed: {
-                            // 削除対象の注文番号についてはタスクを参照する(2026-06-15~)
-                            // const deletingOrder = transaction.result?.order;
-                            // if (typeof deletingOrder?.orderNumber === 'string') {
+                            // identifierによる削除に変更(2026-06-28~)
+                            // if (typeof deletingOrderNumberByTask === 'string') {
                             //     await deleteOrder({
-                            //         object: deletingOrder
+                            //         object: { orderNumber: deletingOrderNumberByTask }
                             //     })(repos);
                             // }
-                            if (typeof deletingOrderNumberByTask === 'string') {
-                                await (0, deleteOrder_1.deleteOrder)({
-                                    object: { orderNumber: deletingOrderNumberByTask }
-                                })(repos);
-                            }
+                            await (0, deleteOrder_1.deleteOrder)({
+                                object: { identifier: transaction.id }
+                            })(repos);
                             break;
                         }
                         default:

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

@@ -177,7 +177,10 @@ function confirm(params, options) {
             await repos.placeOrder.confirmPlaceOrder({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
-                object: { orderDate: params.result.order.orderDate },
+                object: {
+                    orderDate: params.result.order.orderDate,
+                    orderNumber
+                },
                 result: result,
                 potentialActions: potentialActions
             });

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

@@ -1,4 +1,4 @@
-import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { OrderInTransactionRepo, IOrderInTransaction } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -16,6 +16,9 @@ declare function issueOrderNumberIfNotExist(params: {
     object: {
         orderDate: Date;
     };
+    creatingOrderInTransaction: Pick<IOrderInTransaction, 'broker' | 'seller' | 'customer'>;
+}, options: {
+    saveOrderNumberInPlaceOrderInProgress: boolean;
 }): (repos: {
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;

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

@@ -2,44 +2,57 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.issueOrderNumberIfNotExist = issueOrderNumberIfNotExist;
 const factory_1 = require("../../../factory");
-// const USE_LEGACY_ISSUE_ORDER_NUMBER = process.env.USE_LEGACY_ISSUE_ORDER_NUMBER === '1';
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
-function issueOrderNumberIfNotExist(params) {
+function issueOrderNumberIfNotExist(params, options) {
     return async (repos) => {
-        // 1. 最初のチェック
-        let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
-        // すでに発行済であれば何もしない
-        if (typeof orderNumber === 'string') {
-            return orderNumber;
-        }
-        // 2. 発行準備
+        const { saveOrderNumberInPlaceOrderInProgress } = options;
+        // // 1. 最初のチェック
+        // let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
+        // // すでに発行済であれば何もしない
+        // if (typeof orderNumber === 'string') {
+        //     return orderNumber;
+        // }
+        // 新注文番号発行
         const { alternateName } = await repos.project.findAlternateNameById({ id: params.project.id });
         if (typeof alternateName !== 'string') {
             throw new factory_1.factory.errors.NotFound('project.alternateName');
         }
-        // 3. 番号発行
         const issuedOrderNumber = await repos.orderNumber.issueOrderNumber({
             project: { alternateName },
             orderDate: params.object.orderDate
         });
-        // 4. 保管を試みる
-        const { modifiedCount } = await repos.placeOrder.saveOrderNumberIfNotExist({
-            id: params.id,
-            orderNumber: issuedOrderNumber
+        // 注文ドキュメント作成
+        await repos.orderInTransaction.createPlaceOrderIfNotExists({
+            ...params.creatingOrderInTransaction,
+            orderNumber: issuedOrderNumber,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+            identifier: params.id,
         });
-        // 5. 書き込めたなら、自分が発行した番号が「真実」
-        if (modifiedCount === 1) {
-            return issuedOrderNumber;
-        }
-        // 6. 競合が発生した場合（他者が先に書き込んだ場合）
-        // DBにある「正解」を再取得して返す
-        orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
-        if (typeof orderNumber !== 'string') {
-            // ここを通るのは、他者が保存した直後に取引がキャンセル/削除された等の極めて稀なケース
-            throw new factory_1.factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
+        // 注文ドキュメント(存在するはず)から注文番号を参照
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.id,
+            project: { id: params.project.id }
+        }, { onlyPlaceOrder: true });
+        if (saveOrderNumberInPlaceOrderInProgress) {
+            // 取引に保管を試みる
+            await repos.placeOrder.saveOrderNumberIfNotExist({
+                id: params.id,
+                orderNumber
+            });
         }
+        // // 5. 書き込めたなら、自分が発行した番号が「真実」
+        // if (modifiedCount === 1) {
+        //     return issuedOrderNumber;
+        // }
+        // // 6. 競合が発生した場合（他者が先に書き込んだ場合）
+        // // DBにある「正解」を再取得して返す
+        // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
+        // if (typeof orderNumber !== 'string') {
+        //     // ここを通るのは、他者が保存した直後に取引がキャンセル/削除された等の極めて稀なケース
+        //     throw new factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
+        // }
         return orderNumber;
     };
 }

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

@@ -25,5 +25,7 @@ type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 /**
  * 取引開始
  */
-declare function start(params: IStartPlaceOrderParams): IStartOperation<IStartedPlaceOrder>;
+declare function start(params: IStartPlaceOrderParams, options: {
+    saveOrderNumberInPlaceOrderInProgress: boolean;
+}): IStartOperation<IStartedPlaceOrder>;
 export { start, IStartPlaceOrderParams };

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

@@ -8,7 +8,7 @@ const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 /**
  * 取引開始
  */
-function start(params) {
+function start(params, options) {
     return async (repos) => {
         const { passport, customerType } = await repos.passport.validatePassportTokenIfExist(params);
         const { sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
@@ -52,26 +52,22 @@ function start(params) {
         if (transaction === undefined) {
             transaction = await repos.placeOrder.startPlaceOrder(startParams);
         }
-        // support createOrderDocument(2026-06-23~)
-        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
-            object: { orderDate: new Date() }
-        })(repos);
-        await repos.orderInTransaction.createPlaceOrderIfNotExists({
-            orderNumber,
-            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            identifier: transaction.id,
-            seller: {
-                id: seller.id,
-                name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
-                typeOf: seller.typeOf,
-                additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
-            },
-            ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
-            ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
-        });
-        // console.log('createPlaceOrderResult:', createPlaceOrderResult);
+            object: { orderDate: new Date() },
+            // support createOrderDocument(2026-06-23~)
+            creatingOrderInTransaction: {
+                seller: {
+                    id: seller.id,
+                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
+                    typeOf: seller.typeOf,
+                    additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+                },
+                ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
+                ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
+            }
+        }, options)(repos);
         return transaction;
     };
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.0.0",
+    "@chevre/factory": "9.2.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.20"
+  "version": "25.0.0-alpha.22"
 }

package/lib/chevre/service/task/deletePerson.d.ts

@@ -1,6 +0,0 @@
-import { factory } from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
-/**
- * タスク実行関数
- */
-export declare function call(params: Pick<factory.task.deletePerson.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;