@chevre/domain 27.1.0-alpha.4 → 27.1.0-alpha.6

package/lib/chevre/repo/adminEvent.js

@@ -102,8 +102,7 @@ class AdminEventRepo {
                     bulkWriteOps.push({ updateOne });
                 }
                 else {
-                    const { id, coaInfo, description, // eslint-disable-line @typescript-eslint/no-unused-vars
-                    maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // eslint-disable-line @typescript-eslint/no-unused-vars
+                    const { id: __id, coaInfo: _coaInfo, description: _description, maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // eslint-disable-line @typescript-eslint/no-unused-vars
                     ...setOnInsertFields } = $set;
                     const setOnInsert = {
                         ...setOnInsertFields,

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

@@ -24,7 +24,7 @@ const schemaDefinition = {
     identifier: String,
     name: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
-    description: mongoose_1.SchemaTypes.Mixed,
+    // description: SchemaTypes.Mixed, // discontinue(2026-09-04~)
     doorTime: Date,
     endDate: Date,
     eventStatus: String,
@@ -40,17 +40,6 @@ const schemaDefinition = {
     aggregateReservation: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed,
     coaInfo: mongoose_1.SchemaTypes.Mixed
-    // ↓discontinue EventSeries(2024-09-17~)
-    // alternateName: SchemaTypes.Mixed,
-    // alternativeHeadline: SchemaTypes.Mixed,
-    // duration: String,
-    // headline: SchemaTypes.Mixed,
-    // workPerformed: SchemaTypes.Mixed,
-    // videoFormat: SchemaTypes.Mixed,
-    // soundFormat: SchemaTypes.Mixed,
-    // subtitleLanguage: SchemaTypes.Mixed,
-    // dubLanguage: SchemaTypes.Mixed,
-    // kanaName: String,
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -158,18 +158,6 @@ class ReturnOrderRepo {
             id: { $toString: '$_id' },
             ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
         };
-        // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
-        // if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
-        //     params.inclusion.forEach((field) => {
-        //         projection[field] = 1;
-        //     });
-        // } else {
-        //     projection = {
-        //         __v: 0,
-        //         createdAt: 0,
-        //         updatedAt: 0
-        //     };
-        // }
         const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
             .select(projection);
         if (typeof params.limit === 'number' && params.limit > 0) {
@@ -243,18 +231,6 @@ class ReturnOrderRepo {
             id: { $toString: '$_id' },
             ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
         };
-        // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
-        // if (Array.isArray(inclusion) && inclusion.length > 0) {
-        //     inclusion.forEach((field) => {
-        //         projection[field] = 1;
-        //     });
-        // } else {
-        //     projection = {
-        //         __v: 0,
-        //         createdAt: 0,
-        //         updatedAt: 0
-        //     };
-        // }
         const doc = await this.transactionModel.findOne({
             _id: { $eq: params.id },
             typeOf: { $eq: params.typeOf }

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

@@ -3,7 +3,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import { IReturnAction } from './onOrderReturned/factory';
-type IReturnOrderTransaction = Pick<factory.transaction.returnOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
+type IReturnOrderTransaction = Pick<factory.transaction.returnOrder.ITransaction, 'typeOf' | 'potentialActions' | 'object'>;
 declare function onOrderReturned(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
         orderStatus: factory.orderStatus.OrderReturned;

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

@@ -223,6 +223,10 @@ function createReturnPayTransactionTasks(order, returnOrderTransaction) {
     const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions?.returnPaymentMethod;
     if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
         tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
+            const data = {
+                ...a,
+                returnOrderTransaction: { object: returnOrderTransaction.object } // 返品取引廃止のために、必要な属性を拡張(2026-09-05~)
+            };
             return {
                 project: order.project,
                 name: factory_1.factory.taskName.ReturnPayTransaction,
@@ -231,7 +235,7 @@ function createReturnPayTransactionTasks(order, returnOrderTransaction) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: a
+                data
             };
         }));
     }

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

@@ -15,6 +15,7 @@ declare function returnOrder(params: {
         id: string;
     };
     useOnOrderStatusChanged: boolean;
+    returnOrderTransaction?: Pick<factory.transaction.returnOrder.ITransaction, 'object' | 'potentialActions' | 'typeOf'>;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     actions: {

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

@@ -44,19 +44,25 @@ function returnOrder(params) {
                 // OrderDeliveredへの処理が進行中と考えられるので、ひとまず失敗させてリトライに期待
                 throw new factory_1.factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
         }
-        // 返品取引検索
-        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']
-        });
-        const returnOrderTransaction = returnOrderTransactions.shift();
-        if (returnOrderTransaction === undefined) {
-            throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.ReturnOrder);
+        let returnOrderTransaction;
+        if (params.returnOrderTransaction !== undefined) {
+            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);
+            }
         }
         const simpleOrder = {
             typeOf: order.typeOf,

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

@@ -57,7 +57,8 @@ function call(params) {
     return async ({ connection }) => {
         await returnPayTransaction({
             ...params.data,
-            sameAs: { id: params.id }
+            sameAs: { id: params.id },
+            project: { id: params.project.id }
         })({
             actions: {
                 pay: new pay_1.PayActionRepo(connection),
@@ -86,8 +87,6 @@ function task2actionAttributes(params) {
     const purpose = {
         typeOf: order.typeOf,
         orderNumber: order.orderNumber,
-        // price: order.price,
-        // priceCurrency: order.priceCurrency,
         orderDate: order.orderDate
     };
     return {
@@ -101,7 +100,7 @@ function task2actionAttributes(params) {
         ...(typeof sameAs?.id === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined
     };
 }
-function fixOrderAndTransaction(params) {
+function fixOrderAndTransaction(params, project) {
     return async (repos) => {
         const paymentMethodId = params.object.paymentMethodId;
         // objectから注文を特定する(2024-06-19~)
@@ -115,19 +114,25 @@ function fixOrderAndTransaction(params) {
         }
         // const orderNumber = params.purpose.orderNumber;
         const orderNumber = orderByPaymentMethodId.orderNumber;
-        const returnOrderTransaction = (await repos.returnOrder.findReturnOrderTransactions({
-            limit: 1,
-            page: 1,
-            typeOf: factory_1.factory.transactionType.ReturnOrder,
-            object: { order: { orderNumbers: [orderNumber] } },
-            inclusion: ['object', 'project']
-        })).shift();
-        if (returnOrderTransaction === undefined) {
-            throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.ReturnOrder);
+        let returnOrderTransaction;
+        if (params.returnOrderTransaction !== undefined) {
+            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);
+            }
         }
         const order = await repos.order.projectFieldsByOrderNumber({
             orderNumber,
-            project: { id: returnOrderTransaction.project.id },
+            project: { id: project.id },
             inclusion: ['seller', 'project', 'dateReturned', 'typeOf', 'price', 'priceCurrency', 'orderNumber', 'orderDate', 'customer']
         });
         return { order, returnOrderTransaction };
@@ -138,7 +143,7 @@ function fixOrderAndTransaction(params) {
  */
 function returnPayTransaction(taskData) {
     return async (repos) => {
-        const { order, returnOrderTransaction } = await fixOrderAndTransaction(taskData)(repos);
+        const { order, returnOrderTransaction } = await fixOrderAndTransaction(taskData, { id: taskData.project.id })(repos);
         const paymentServiceType = taskData.object.issuedThrough?.typeOf;
         if (typeof paymentServiceType !== 'string' || paymentServiceType.length === 0) {
             throw new factory_1.factory.errors.ArgumentNull('object.issuedThrough.typeOf');

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

@@ -21,12 +21,14 @@ function createImmediateTasks(params) {
             if (Array.isArray(returnOrderPotentialActions)) {
                 // 返品タスク
                 const returnOrderTask = returnOrderPotentialActions.map((r) => {
+                    const { object, potentialActions, typeOf } = transaction;
                     // data最適化(2023-08-22~)
                     const returnOrderTaskData = {
                         agent: r.agent,
                         object: r.object,
                         project: transaction.project,
-                        typeOf: r.typeOf
+                        typeOf: r.typeOf,
+                        returnOrderTransaction: { object, potentialActions, typeOf } // add(2026-09-05~)
                     };
                     return {
                         project: transaction.project,

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.5.0-alpha.2",
+    "@chevre/factory": "10.5.0-alpha.6",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "27.1.0-alpha.4"
+  "version": "27.1.0-alpha.6"
 }