@chevre/domain 26.0.0-alpha.3 → 26.0.0-alpha.30

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

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = confirmPayTransaction;
+const util_1 = require("util");
 const factory_1 = require("../../factory");
 // import type { TransactionRepo } from '../../repo/transaction';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
@@ -112,7 +113,9 @@ function onConfirmed(params) {
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 };
+                const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', params.project.id, factory_1.factory.taskName.OnAssetTransactionStatusChanged, onAssetTransactionStatusChangedTaskData.purpose.orderNumber, onAssetTransactionStatusChangedTaskData.object.transactionNumber);
                 const onAssetTransactionStatusChangedTask = {
+                    identifier: taskIdentifier,
                     project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                     name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
                     status: factory_1.factory.taskStatus.Ready,
@@ -122,7 +125,7 @@ function onConfirmed(params) {
                     executionResults: [],
                     data: onAssetTransactionStatusChangedTaskData
                 };
-                await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
+                await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
             }
         }
     };

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrder = deleteOrder;
-// import { createOwnershipInfosFromOrder } from '../delivery/factory';
 const factory_1 = require("../../factory");
 /**
  * 注文に関わるリソースを削除する

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

@@ -1,9 +1,7 @@
 "use strict";
-// import createDebug from 'debug';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDeliverable = isDeliverable;
 const factory_1 = require("../../../factory");
-// const debug = createDebug('chevre-domain:service:order');
 function isDeliverable(params) {
     return async (repos) => {
         let allReserveTransactionConfirmed = false;
@@ -15,7 +13,7 @@ function isDeliverable(params) {
             // 注文のreservationNumberを取得
             const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
             if (reservationNumbers.length > 0) {
-                const referencedReserveTransactions = await repos.assetTransaction.search({
+                const referencedReserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                     project: { id: { $eq: params.project.id } },
                     typeOf: factory_1.factory.assetTransactionType.Reserve,
                     transactionNumber: { $in: reservationNumbers }
@@ -27,52 +25,6 @@ function isDeliverable(params) {
             else {
                 allReserveTransactionConfirmed = true;
             }
-            // } else if (params.assetTransactionType === factory.assetTransactionType.MoneyTransfer) {
-            //     allReserveTransactionConfirmed = true;
-            //     allRegisterServiceTransactionConfirmed = true;
-            //     // 注文のMoneyTransferTransaction.transactionNumberを取得
-            //     const moneyTransferTransactionNumbers = await repos.acceptedOffer.distinctValues(
-            //         { orderNumber: { $in: [params.orderNumber] } },
-            //         'acceptedOffers.serialNumber'
-            //     );
-            //     if (moneyTransferTransactionNumbers.length > 0) {
-            //         debug('is deliverable?...', params.orderNumber, 'moneyTransferTransactionNumbers:', moneyTransferTransactionNumbers);
-            //         const referencedMoneyTransferTransactions = await repos.assetTransaction.search(
-            //             {
-            //                 project: { id: { $eq: params.project.id } },
-            //                 typeOf: factory.assetTransactionType.MoneyTransfer,
-            //                 transactionNumber: { $in: moneyTransferTransactionNumbers }
-            //             },
-            //             ['status']
-            //         ) as Pick<factory.assetTransaction.moneyTransfer.ITransaction, 'status'>[];
-            //         allMoneyTransferTransactionConfirmed =
-            //             referencedMoneyTransferTransactions.length === moneyTransferTransactionNumbers.length
-            //             && referencedMoneyTransferTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
-            //     } else {
-            //         allMoneyTransferTransactionConfirmed = true;
-            //     }
-            // } else if (params.assetTransactionType === factory.assetTransactionType.RegisterService) {
-            //     allReserveTransactionConfirmed = true;
-            //     allMoneyTransferTransactionConfirmed = true;
-            //     const registerServiceTransactionNumbers = await repos.acceptedOffer.distinctValues(
-            //         { orderNumber: { $in: [params.orderNumber] } },
-            //         'acceptedOffers.serialNumber'
-            //     );
-            //     if (registerServiceTransactionNumbers.length > 0) {
-            //         const referencedRegisterServiceTransactions = await repos.assetTransaction.search(
-            //             {
-            //                 project: { id: { $eq: params.project.id } },
-            //                 typeOf: factory.assetTransactionType.RegisterService,
-            //                 transactionNumber: { $in: registerServiceTransactionNumbers }
-            //             },
-            //             ['status']
-            //         ) as Pick<factory.assetTransaction.registerService.ITransaction, 'status'>[];
-            //         allRegisterServiceTransactionConfirmed =
-            //             referencedRegisterServiceTransactions.length === registerServiceTransactionNumbers.length
-            //             && referencedRegisterServiceTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
-            //     } else {
-            //         allRegisterServiceTransactionConfirmed = true;
-            //     }
         }
         return allReserveTransactionConfirmed && allMoneyTransferTransactionConfirmed && allRegisterServiceTransactionConfirmed;
     };

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

@@ -36,7 +36,7 @@ function onPayTransactionConfirmed(params) {
 }
 function fixPaymentMethodIdentifierIfPossible(params) {
     return async (repos) => {
-        const referencedPayTransactions = await repos.assetTransaction.search({
+        const referencedPayTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             project: { id: { $eq: params.project.id } },
             typeOf: factory_1.factory.assetTransactionType.Pay,
             statuses: [factory_1.factory.transactionStatusType.Confirmed],
@@ -73,7 +73,7 @@ function isProcessable(params) {
         const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
             .map((invoice) => invoice.paymentMethodId);
         if (paymentMethodIds.length > 0) {
-            const referencedPayTransactions = await repos.assetTransaction.search({
+            const referencedPayTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 project: { id: { $eq: params.project.id } },
                 typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: { $in: paymentMethodIds }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered/factory.js

@@ -12,16 +12,14 @@ setting) {
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        let recipientId = '';
-        recipientId = order.customer.id;
+        // let recipientId = '';
+        // recipientId = order.customer.id;
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
-                        // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
-                        id: recipientId,
                         name: informOrderParams.recipient?.name,
                         typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js

@@ -25,16 +25,14 @@ setting) {
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}:${order.acceptedOffers.page}`;
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        let recipientId = '';
-        recipientId = order.customer.id;
+        // let recipientId = '';
+        // recipientId = order.customer.id;
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
-                        // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
-                        id: recipientId,
                         name: informOrderParams.recipient?.name,
                         typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },

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

@@ -62,7 +62,7 @@ function createSendOrderTaskIfNotExist(params) {
         };
         const taskIdentifier = `${sendOrderTaskData.project.id}:${factory_1.factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
         const sendOrderTask = {
-            alternateName: taskIdentifier,
+            // alternateName: taskIdentifier,
             identifier: taskIdentifier,
             project: params.order.project,
             name: factory_1.factory.taskName.SendOrder,
@@ -75,7 +75,7 @@ function createSendOrderTaskIfNotExist(params) {
         };
         debug('processing createSendOrderTaskIfNotExist...', sendOrderTask);
         // await repos.task.createSendOrderTaskIfNotExist(sendOrderTask);
-        await repos.task.createIfNotExistByAlternateName(sendOrderTask);
+        await repos.task.runTaskByIdentifier(sendOrderTask);
     };
 }
 function createOnAuthorizationCreatedTask(order) {
@@ -92,7 +92,7 @@ function createOnAuthorizationCreatedTask(order) {
             const taskRunsAt = new Date();
             const taskIdentifier = `${order.project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.transactionType.PlaceOrder}:${placeOrderTransaction?.id}`;
             const task = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 name: factory_1.factory.taskName.OnAuthorizationCreated,
                 status: factory_1.factory.taskStatus.Ready,
@@ -107,7 +107,7 @@ function createOnAuthorizationCreatedTask(order) {
                 },
                 project: { id: order.project.id, typeOf: factory_1.factory.organizationType.Project }
             };
-            await repos.task.createIfNotExistByAlternateName(task);
+            await repos.task.runTaskByIdentifier(task);
         }
     };
 }

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

@@ -53,7 +53,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
             };
             const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmPayTransaction, data.purpose.typeOf, data.purpose.orderNumber, factory_1.factory.assetTransactionType.Pay, invoice.paymentMethodId);
             const confirmPayTransactionTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
                 name: factory_1.factory.taskName.ConfirmPayTransaction,
@@ -64,7 +64,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                 executionResults: [],
                 data
             };
-            await repos.task.createIfNotExistByAlternateName(confirmPayTransactionTask);
+            await repos.task.runTaskByIdentifier(confirmPayTransactionTask);
             // 冗長なタスク作成を回避
             // const existingTasks = await repos.task.projectFields(
             //     {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js

@@ -48,7 +48,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
                 purpose: simpleOrder
             };
             const sendEmailMessageTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: params.order.project,
                 name: factory_1.factory.taskName.SendEmailMessage,
@@ -59,7 +59,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
                 executionResults: [],
                 data: { actionAttributes }
             };
-            await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask);
+            await repos.task.runTaskByIdentifier(sendEmailMessageTask);
         }
     };
 }

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

@@ -5,8 +5,8 @@ type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broke
     numAcceptedOffers: number;
     orderStatus: factory.orderStatus.OrderProcessing;
 };
-type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, 'alternateName' | 'data' | 'executionResults' | 'identifier' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
-    alternateName: string;
+type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, 'data' | 'executionResults' | 'identifier' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
+    alternateName?: never;
     identifier: string;
 };
 type ICreatingInformProcessingOrderTask = Pick<factory.task.IAttributes<factory.taskName.TriggerWebhook>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -15,16 +15,14 @@ function createInformProcessingOrderTasks(order, setting) {
     const order4inform = creteProcessingOrderAsNotification(order);
     const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        let recipientId = '';
-        recipientId = order.customer.id;
+        // let recipientId = '';
+        // recipientId = order.customer.id;
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
-                        // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
-                        id: recipientId,
                         name: informOrderParams.recipient?.name,
                         typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },
@@ -142,7 +140,7 @@ function createCheckResourceTask(order) {
     };
     const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.CheckResource, order.typeOf, order.orderNumber);
     return {
-        alternateName: taskIdentifier, // add identifier(2025-03-29~)
+        // alternateName: taskIdentifier, // add identifier(2025-03-29~)
         identifier: taskIdentifier, // add identifier(2025-03-29~)
         project: order.project,
         name: factory_1.factory.taskName.CheckResource,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js

@@ -50,7 +50,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
             };
             const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
                 name: factory_1.factory.taskName.ConfirmReserveTransaction,
@@ -61,7 +61,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
                 executionResults: [],
                 data
             };
-            await repos.task.createIfNotExistByAlternateName(confirmReserveTransactionTask);
+            await repos.task.runTaskByIdentifier(confirmReserveTransactionTask);
             if (options.force === true) {
                 const existingTask = await repos.task.findByIdentifier({
                     identifier: taskIdentifier,

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

@@ -37,7 +37,7 @@ function onOrderProcessing(params) {
         await repos.task.saveMany(tasks);
         // uniqueness of CheckResource task(2025-03-29~)
         if (creatingCheckResourceTask !== undefined) {
-            await repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask);
+            await repos.task.runTaskByIdentifier(creatingCheckResourceTask);
         }
         switch (params.order.orderStatus) {
             case factory_1.factory.orderStatus.OrderProcessing:

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.js

@@ -16,19 +16,17 @@ function createInformTasks(order, returnOrderAction, setting) {
     //     informObject = createOrder4inform(order);
     // }
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        let recipientId = '';
-        recipientId = order.customer.id;
-        if (typeof order.returner?.id === 'string') {
-            recipientId = order.returner.id;
-        }
+        // let recipientId = '';
+        // recipientId = order.customer.id;
+        // if (typeof order.returner?.id === 'string') {
+        //     recipientId = order.returner.id;
+        // }
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: informObject,
                     recipient: {
-                        // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
-                        id: recipientId,
                         name: informOrderParams.recipient?.name,
                         typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },

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

@@ -10,15 +10,12 @@ setting) {
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        const recipientId = '';
         informOrder.forEach((informOrderParams) => {
             if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order4inform.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
-                        // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
-                        id: recipientId,
                         name: informOrderParams.recipient?.name,
                         typeOf: factory_1.factory.creativeWorkType.WebApplication
                     },

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

@@ -1,7 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { ActionRepo } from '../../repo/action';
 import type { OrderRepo } from '../../repo/order';
-import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
@@ -20,7 +19,6 @@ declare function returnOrder(params: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
-    ownershipInfo: OwnershipInfoRepo;
     setting: SettingRepo;
     task: TaskRepo;
     returnOrder: ReturnOrderRepo;

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.returnOrder = returnOrder;
 const debug_1 = __importDefault(require("debug"));
-// import { createMaskedCustomer } from '../../factory/order';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
@@ -19,9 +18,7 @@ function createReturnPolicy(params) {
     };
 }
 function returnOrder(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -81,14 +78,15 @@ function returnOrder(params) {
             recipient,
             typeOf: factory_1.factory.actionType.ReturnAction
         };
-        let returnedOwnershipInfos;
+        const returnedOwnershipInfos = [];
         let returnedOrder;
         const action = await repos.action.start(returnOrderActionAttributes);
         try {
-            returnedOwnershipInfos = await processReturnOrder(order, dateReturned)({
-                acceptedOffer: repos.acceptedOffer,
-                ownershipInfo: repos.ownershipInfo
-            });
+            // ひとまず所有権管理を廃止するため、所有権返却処理は不要(2026-08-10)
+            // returnedOwnershipInfos = await processReturnOrder(order, dateReturned)({
+            //     acceptedOffer: repos.acceptedOffer,
+            //     ownershipInfo: repos.ownershipInfo
+            // });
             // 注文ステータス変更
             returnedOrder = await repos.order.returnOrder({
                 project: { id: order.project.id },
@@ -130,37 +128,7 @@ function returnOrder(params) {
                     ...returnOrderActionAttributes,
                     id: action.id
                 }
-            })(repos
-            // settings
-            );
-        }
-    };
-}
-function processReturnOrder(order, dateReturned) {
-    return async (repos) => {
-        const returnedOwnershipInfos = [];
-        // 所有権の所有期間変更
-        // 注文オファーリポジトリから所有権識別子を検索する(2023-12-07~)
-        const ownershipInfos = await repos.acceptedOffer.aggreateOwnershipInfosByOrder({ orderNumber: { $eq: order.orderNumber } });
-        if (Array.isArray(ownershipInfos)) {
-            await Promise.all(ownershipInfos.map(async (ownershipInfo) => {
-                const ownershipInfoReturned = await repos.ownershipInfo.findByIdentifierAndUpdateOwnedThrough({
-                    project: { id: order.project.id },
-                    identifier: String(ownershipInfo.identifier),
-                    ownedThrough: dateReturned
-                })
-                    .then((ownershipInfoByDB) => {
-                    // 存在しない場合は識別子のみ保管(customer.typeOfによって存在しないこともありうる)
-                    if (ownershipInfoByDB === undefined) {
-                        return ownershipInfo;
-                    }
-                    else {
-                        return ownershipInfoByDB;
-                    }
-                });
-                returnedOwnershipInfos.push(ownershipInfoReturned);
-            }));
+            })(repos);
         }
-        return returnedOwnershipInfos;
     };
 }

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

@@ -1,7 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { ActionRepo } from '../../repo/action';
 import type { OrderRepo } from '../../repo/order';
-import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
@@ -10,7 +9,6 @@ interface ISendOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
-    ownershipInfo: OwnershipInfoRepo;
     setting: SettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;

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

@@ -5,33 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendOrder = sendOrder;
 const debug_1 = __importDefault(require("debug"));
-// import { createMaskedCustomer } from '../../factory/order';
-const factory_1 = require("../delivery/factory");
-// import { findPlaceOrderTransaction } from './findPlaceOrderTransaction';
+// import { createOwnershipInfosFromOrder } from '../delivery/factory';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory_2 = require("../../factory");
+const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 /**
  * 注文を配送する
  */
 function sendOrder(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
-            throw new factory_2.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+            throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         if (typeof params.object.acceptedOffers?.limit !== 'number') {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
         }
         if (typeof params.object.acceptedOffers?.page !== 'number') {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.page', 'must be number');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.page', 'must be number');
         }
         if (params.object.acceptedOffers.limit <= 0) {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
         }
         if (params.object.acceptedOffers.page <= 0) {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
         }
         try {
             const orderNumber = params.object.orderNumber;
@@ -49,24 +45,16 @@ function sendOrder(params) {
             });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {
-                throw new factory_2.factory.errors.NotFound('Order');
+                throw new factory_1.factory.errors.NotFound('Order');
             }
             // 確認番号検証
             if (order.confirmationNumber !== confirmationNumber) {
-                throw new factory_2.factory.errors.NotFound('Order');
+                throw new factory_1.factory.errors.NotFound('Order');
             }
             // const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
             const simpleOrder = {
                 typeOf: order.typeOf,
-                // seller: {
-                //     id: order.seller.id,
-                //     typeOf: order.seller.typeOf,
-                //     name: order.seller.name
-                // }, // 廃止(2024-03-06~)
-                // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
                 orderNumber: order.orderNumber,
-                // price: order.price,
-                // priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
             const { limit, page } = params.object.acceptedOffers;
@@ -77,24 +65,24 @@ function sendOrder(params) {
             const sendOrderActionAttributes = {
                 agent: (typeof params.agent?.typeOf === 'string') ? params.agent : order.project,
                 object: sendOrderObject,
-                // potentialActions: {},
                 project: order.project,
                 recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
-                typeOf: factory_2.factory.actionType.SendAction
+                typeOf: factory_1.factory.actionType.SendAction
             };
             const action = await repos.action.start(sendOrderActionAttributes);
-            let creatingOwnershipInfos = [];
-            let createdOwnershipInfos = [];
+            // let creatingOwnershipInfos: IOwnershipInfo[] = [];
+            const createdOwnershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
-            // 所有権生成を最小化(2024-03-01~)
-            let createOwnerships = false;
-            switch (order.customer.typeOf) {
-                case factory_2.factory.personType.Person:
-                    createOwnerships = true; // Personのみに限定(2026-03-15~)
-                    break;
-                default:
-            }
+            // 所有権管理はひとまず廃止(2026-08-10~)
+            // // 所有権生成を最小化(2024-03-01~)
+            // let createOwnerships = false;
+            // switch (order.customer.typeOf) {
+            //     case factory.personType.Person:
+            //         createOwnerships = true; // Personのみに限定(2026-03-15~)
+            //         break;
+            //     default:
+            // }
             try {
                 const offerIndexBase = (limit * (page - 1));
                 const searchSlicedAcceptedOffersResult = await repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
@@ -104,29 +92,27 @@ function sendOrder(params) {
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
                 debug('delivering...', order.orderNumber, params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
-                // 所有権作成
-                if (createOwnerships) {
-                    creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-                        order: { ...order, acceptedOffers },
-                        offerIndexBase
-                    });
-                    createdOwnershipInfos = await Promise.all(creatingOwnershipInfos.map(async (creatingOwnershipInfo) => {
-                        const { id } = await repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
-                        return {
-                            id,
-                            ...(typeof creatingOwnershipInfo.identifier === 'string')
-                                ? { identifier: creatingOwnershipInfo.identifier }
-                                : undefined
-                        };
-                    }));
-                }
-                // const deliveredCount = limit * page;
-                // debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
+                // 所有権管理はひとまず廃止(2026-08-10~)
+                // if (createOwnerships) {
+                //     creatingOwnershipInfos = createOwnershipInfosFromOrder({
+                //         order: { ...order, acceptedOffers },
+                //         offerIndexBase
+                //     });
+                //     createdOwnershipInfos = await Promise.all(creatingOwnershipInfos.map(async (creatingOwnershipInfo) => {
+                //         const { id } = await repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
+                //         return {
+                //             id,
+                //             ...(typeof creatingOwnershipInfo.identifier === 'string')
+                //                 ? { identifier: creatingOwnershipInfo.identifier }
+                //                 : undefined
+                //         };
+                //     }));
+                // }
                 if (acceptedOffers.length === 0) {
                     order = await repos.order.changeStatus({
                         project: { id: order.project.id },
                         orderNumber,
-                        orderStatus: factory_2.factory.orderStatus.OrderDelivered,
+                        orderStatus: factory_1.factory.orderStatus.OrderDelivered,
                         previousOrderStatus: params.object.previousOrderStatus
                     });
                     allOffersDelivered = true;
@@ -154,7 +140,7 @@ function sendOrder(params) {
                             orderNumber: order.orderNumber,
                             project: order.project,
                             typeOf: order.typeOf,
-                            orderStatus: factory_2.factory.orderStatus.OrderDelivered,
+                            orderStatus: factory_1.factory.orderStatus.OrderDelivered,
                             price: order.price,
                             priceCurrency: order.priceCurrency
                         }
@@ -180,7 +166,7 @@ function sendOrder(params) {
                 project: { id: params.project.id },
                 inclusion: ['orderStatus']
             });
-            if (currentOrder?.orderStatus === factory_2.factory.orderStatus.OrderReturned) {
+            if (currentOrder?.orderStatus === factory_1.factory.orderStatus.OrderReturned) {
                 throwsError = false;
             }
             if (throwsError) {