@chevre/domain 27.1.0-alpha.7 → 27.1.0-alpha.9

package/lib/chevre/repo/mongoose/schemas/event.js

@@ -96,10 +96,6 @@ const indexes = [
         { eventStatus: 1, startDate: 1 },
         { name: 'searchByEventStatus' }
     ],
-    [
-        { name: 1, startDate: 1 },
-        { name: 'searchByName' }
-    ],
     [
         { 'superEvent.id': 1, startDate: 1 },
         {
@@ -174,18 +170,6 @@ const indexes = [
             name: 'searchByOffersItemOfferedServiceOutputReservedTicketTicketedSeatTypeOf'
         }
     ],
-    [
-        {
-            'offers.itemOffered.serviceType.id': 1,
-            startDate: 1
-        },
-        {
-            partialFilterExpression: {
-                'offers.itemOffered.serviceType.id': { $exists: true }
-            },
-            name: 'searchByOffersItemOfferedServiceTypeId'
-        }
-    ],
     [
         {
             'offers.itemOffered.id': 1,
@@ -235,24 +219,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'name.ja': 1, startDate: 1 },
-        {
-            name: 'searchByNameJa',
-            partialFilterExpression: {
-                'name.ja': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'name.en': 1, startDate: 1 },
-        {
-            name: 'searchByNameEn',
-            partialFilterExpression: {
-                'name.en': { $exists: true }
-            }
-        }
-    ],
     [
         { additionalProperty: 1, startDate: 1 },
         {
@@ -261,7 +227,42 @@ const indexes = [
                 additionalProperty: { $exists: true }
             }
         }
-    ]
+    ],
+    // 以下廃止(2026-09-07~)
+    // [
+    //     {
+    //         'offers.itemOffered.serviceType.id': 1,
+    //         startDate: 1
+    //     },
+    //     {
+    //         partialFilterExpression: {
+    //             'offers.itemOffered.serviceType.id': { $exists: true }
+    //         },
+    //         name: 'searchByOffersItemOfferedServiceTypeId'
+    //     }
+    // ],
+    // [
+    //     { name: 1, startDate: 1 },
+    //     { name: 'searchByName' }
+    // ],
+    // [
+    //     { 'name.ja': 1, startDate: 1 },
+    //     {
+    //         name: 'searchByNameJa',
+    //         partialFilterExpression: {
+    //             'name.ja': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'name.en': 1, startDate: 1 },
+    //     {
+    //         name: 'searchByNameEn',
+    //         partialFilterExpression: {
+    //             'name.en': { $exists: true }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/transaction/returnOrderInProgress.js

@@ -10,7 +10,7 @@ const factory_1 = require("../../factory");
  * 返品取引リポジトリ
  */
 class ReturnOrderInProgressRepo {
-    static KEY_PREFIX = `txn:${factory_1.factory.transaction.returnOrder}`;
+    static KEY_PREFIX = `txn:${factory_1.factory.transactionType.ReturnOrder}`;
     redisClient;
     constructor(redisClient) {
         this.redisClient = redisClient;

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

@@ -3,7 +3,6 @@ import type { ReturnActionRepo } from '../../repo/action/returnAction';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 import { factory } from '../../factory';
 declare function returnOrder(params: {
     agent: factory.action.transfer.returnAction.order.IAgent;
@@ -24,6 +23,5 @@ declare function returnOrder(params: {
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    returnOrder: ReturnOrderRepo;
 }) => Promise<void>;
 export { returnOrder };

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.returnOrder = returnOrder;
 const debug_1 = __importDefault(require("debug"));
+// import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
@@ -49,20 +50,22 @@ function returnOrder(params) {
             returnOrderTransaction = params.returnOrderTransaction;
         }
         else {
-            // 互換性維持対応としての返品取引検索(2026-09-05~)
-            const returnOrderTransactions = await repos.returnOrder.findReturnOrderTransactions({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: order.project.id } },
-                typeOf: factory_1.factory.transactionType.ReturnOrder,
-                statuses: [factory_1.factory.transactionStatusType.Confirmed],
-                object: { order: { orderNumbers: [orderNumber] } },
-                inclusion: ['typeOf', 'potentialActions', 'object']
-            });
-            returnOrderTransaction = returnOrderTransactions.shift();
-            if (returnOrderTransaction === undefined) {
-                throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.ReturnOrder);
-            }
+            throw new factory_1.factory.errors.ArgumentNull('returnOrderTransaction');
+            // // 互換性維持対応としての返品取引検索(2026-09-05~)
+            // const returnOrderTransactions =
+            //     await repos.returnOrder.findReturnOrderTransactions({
+            //         limit: 1,
+            //         page: 1,
+            //         project: { id: { $eq: order.project.id } },
+            //         typeOf: factory.transactionType.ReturnOrder,
+            //         statuses: [factory.transactionStatusType.Confirmed],
+            //         object: { order: { orderNumbers: [orderNumber] } },
+            //         inclusion: ['typeOf', 'potentialActions', 'object']
+            //     });
+            // returnOrderTransaction = returnOrderTransactions.shift();
+            // if (returnOrderTransaction === undefined) {
+            //     throw new factory.errors.NotFound(factory.transactionType.ReturnOrder);
+            // }
         }
         const simpleOrder = {
             typeOf: order.typeOf,

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

@@ -6,15 +6,15 @@ const returnAction_1 = require("../../repo/action/returnAction");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const returnOrder_1 = require("../../repo/transaction/returnOrder");
-const returnOrder_2 = require("../order/returnOrder");
+// import { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
+const returnOrder_1 = require("../order/returnOrder");
 /**
  * タスク実行関数
  */
 function call(params) {
     return async ({ connection }) => {
         const { data } = params;
-        await (0, returnOrder_2.returnOrder)({
+        await (0, returnOrder_1.returnOrder)({
             ...data,
             useOnOrderStatusChanged: true
         })({
@@ -23,7 +23,7 @@ function call(params) {
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            returnOrder: new returnOrder_1.ReturnOrderRepo(connection)
+            // returnOrder: new ReturnOrderRepo(connection)
         });
     };
 }

package/lib/chevre/service/task/returnPayTransaction.js

@@ -47,7 +47,7 @@ const paymentService_1 = require("../../repo/paymentService");
 const potentialAction_1 = require("../../repo/potentialAction");
 const product_1 = require("../../repo/product");
 const task_1 = require("../../repo/task");
-const returnOrder_1 = require("../../repo/transaction/returnOrder");
+// import { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const RefundTransactionService = __importStar(require("../assetTransaction/refund"));
 /**
@@ -70,7 +70,7 @@ function call(params) {
             potentialAction: new potentialAction_1.PotentialActionRepo(connection),
             product: new product_1.ProductRepo(connection),
             task: new task_1.TaskRepo(connection),
-            returnOrder: new returnOrder_1.ReturnOrderRepo(connection),
+            // returnOrder: new ReturnOrderRepo(connection),
             transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
         });
     };
@@ -119,16 +119,17 @@ function fixOrderAndTransaction(params, project) {
             returnOrderTransaction = params.returnOrderTransaction;
         }
         else {
-            returnOrderTransaction = (await repos.returnOrder.findReturnOrderTransactions({
-                limit: 1,
-                page: 1,
-                typeOf: factory_1.factory.transactionType.ReturnOrder,
-                object: { order: { orderNumbers: [orderNumber] } },
-                inclusion: ['object']
-            })).shift();
-            if (returnOrderTransaction === undefined) {
-                throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.ReturnOrder);
-            }
+            throw new factory_1.factory.errors.ArgumentNull('returnOrderTransaction');
+            // returnOrderTransaction = (await repos.returnOrder.findReturnOrderTransactions({
+            //     limit: 1,
+            //     page: 1,
+            //     typeOf: factory.transactionType.ReturnOrder,
+            //     object: { order: { orderNumbers: [orderNumber] } },
+            //     inclusion: ['object']
+            // })).shift();
+            // if (returnOrderTransaction === undefined) {
+            //     throw new factory.errors.NotFound(factory.transactionType.ReturnOrder);
+            // }
         }
         const order = await repos.order.projectFieldsByOrderNumber({
             orderNumber,

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

@@ -11,6 +11,7 @@ exports.exportTasksById = exportTasksById;
  * 返品取引サービス
  */
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const util_1 = require("util");
 const factory_1 = require("../../factory");
 const factory_2 = require("./returnOrder/exportTasks/factory");
 const potentialActions_1 = require("./returnOrder/potentialActions");
@@ -143,9 +144,11 @@ function confirm(params, options) {
             order: { orderNumber: returningOrders[0].orderNumber }, seller: { id: returningOrders[0].seller.id }, emailMessages
         })(repos);
         if (useConfirmReturnOrderTask) {
-            // タスク作成
+            // タスク作成(注文番号でユニークネス保証)
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s', transaction.project.id, factory_1.factory.taskName.ConfirmReturnOrder, returningOrders[0].orderNumber);
             const endDate = new Date();
-            const task = {
+            const confirmReturnOrderTask = {
+                identifier: taskIdentifier,
                 project: transaction.project,
                 name: factory_1.factory.taskName.ConfirmReturnOrder,
                 status: factory_1.factory.taskStatus.Ready,
@@ -164,7 +167,7 @@ function confirm(params, options) {
                     endDate
                 }
             };
-            await repos.task.saveMany([task]);
+            await repos.task.runTaskByIdentifier(confirmReturnOrderTask);
         }
         else {
             // ステータス変更

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "27.1.0-alpha.7"
+  "version": "27.1.0-alpha.9"
 }