@chevre/domain 22.8.0-alpha.21 → 22.8.0-alpha.23

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

@@ -1,7 +1,10 @@
 import * as factory from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 type IReturnedOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner'>;
-declare function createInformTasks(order: IReturnedOrder, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+type IReturnAction = factory.action.transfer.returnAction.order.IAttributes & {
+    id: string;
+};
+declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IReturnAction, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 /**
  * 注文返品後のアクション
  */
@@ -9,4 +12,4 @@ 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/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
-export { createInformTasks, createOnOrderReturnedTasksByTransaction };
+export { createInformTasks, createOnOrderReturnedTasksByTransaction, IReturnAction };

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

@@ -3,26 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformTasks = createInformTasks;
 exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
 const factory = require("../../../../factory");
-function createInformTasks(order, 
-// settings: Settings,
-setting) {
-    var _a, _b;
+function createInformTasks(order, returnOrderAction, setting) {
+    var _a, _b, _c;
     const taskRunsAt = new Date();
-    // const informOrder = settings.onOrderStatusChanged?.informOrder;
     const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    const useInformReturnAction = ((_b = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _b === void 0 ? void 0 : _b.useInformReturnAction) === true;
     const informTasks = [];
-    const order4inform = creteOrder4inform(order);
-    const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
+    // support returnAction4inform(2025-01-22~)
+    let informObject;
+    const informIdentifier = `${factory.order.OrderType.Order}:${order.orderNumber}:${factory.orderStatus.OrderReturned}`;
+    if (useInformReturnAction) {
+        informObject = createReturnAction4inform(returnOrderAction);
+    }
+    else {
+        informObject = createOrder4inform(order);
+    }
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         let recipientId = '';
         recipientId = order.customer.id;
-        if (typeof ((_b = order.returner) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+        if (typeof ((_c = order.returner) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
             recipientId = order.returner.id;
         }
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                object: order4inform,
+                object: informObject,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
@@ -45,7 +50,11 @@ setting) {
     }
     return informTasks;
 }
-function creteOrder4inform(order) {
+function createReturnAction4inform(returnOrderAction) {
+    const { id, instrument, object, project, typeOf } = returnOrderAction;
+    return Object.assign({ id, object, project, typeOf }, (Array.isArray(instrument)) ? { instrument } : undefined);
+}
+function createOrder4inform(order) {
     return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: factory.orderStatus.OrderReturned }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
 }
 /**

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

@@ -2,12 +2,14 @@ import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
+import { IReturnAction } from './onOrderReturned/factory';
 type IReturnOrderTransaction = Pick<factory.transaction.returnOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderReturned(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
         orderStatus: factory.orderStatus.OrderReturned;
     };
-    returnOrderTransaction?: IReturnOrderTransaction;
+    returnOrderTransaction: IReturnOrderTransaction;
+    returnOrderAction: IReturnAction;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     setting: SettingRepo;

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

@@ -53,7 +53,7 @@ function onOrderReturned(params) {
                 const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
                 const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order, setting),
+                    ...(0, factory_1.createInformTasks)(params.order, params.returnOrderAction, setting),
                     ...createReturnReserveTransactionTasks(Object.assign(Object.assign({}, params.order), { reservationNumbers,
                         offeredThroughIdentifier,
                         reservationForSuperEventLocationBranchCodes }), simpleOrder),

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

@@ -16,6 +16,11 @@ const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
 // import { Settings } from '../../settings';
 const debug = createDebug('chevre-domain:service:order');
+function createReturnPolicy(params) {
+    const { identifier, returnFees, restockingFee, typeOf } = params.returnOrderTransaction.object.returnPolicy;
+    return Object.assign(Object.assign({ returnFees,
+        typeOf }, (typeof identifier === 'string') ? { identifier } : undefined), (typeof (restockingFee === null || restockingFee === void 0 ? void 0 : restockingFee.value) === 'number') ? { restockingFee } : undefined);
+}
 function returnOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos
@@ -54,7 +59,7 @@ function returnOrder(params) {
             typeOf: factory.transactionType.ReturnOrder,
             statuses: [factory.transactionStatusType.Confirmed],
             object: { order: { orderNumbers: [orderNumber] } },
-            inclusion: ['typeOf', 'potentialActions']
+            inclusion: ['typeOf', 'potentialActions', 'object']
         });
         const returnOrderTransaction = returnOrderTransactions.shift();
         if (returnOrderTransaction === undefined) {
@@ -62,23 +67,22 @@ function returnOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            // price: order.price,
-            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate,
             dateReturned
         };
+        const recipient = {
+            id: order.seller.id,
+            name: order.seller.name,
+            typeOf: order.seller.typeOf
+        };
+        const returnPolicyAsInstrument = createReturnPolicy({ returnOrderTransaction });
         const returnOrderActionAttributes = {
             agent: returner,
+            instrument: [returnPolicyAsInstrument], // add returnPolicy(2025-01-21~)
             object: simpleOrder,
             project: order.project,
-            recipient: order.seller,
+            recipient,
             typeOf: factory.actionType.ReturnAction
         };
         let returnedOwnershipInfos = [];
@@ -125,7 +129,8 @@ function returnOrder(params) {
                     orderDate: returnedOrder.orderDate,
                     orderStatus: factory.orderStatus.OrderReturned
                 },
-                returnOrderTransaction
+                returnOrderTransaction,
+                returnOrderAction: Object.assign(Object.assign({}, returnOrderActionAttributes), { id: action.id })
             })(repos
             // settings
             );

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.392.0-alpha.14",
-    "@cinerino/sdk": "10.20.0-alpha.9",
+    "@chevre/factory": "4.392.0-alpha.16",
+    "@cinerino/sdk": "10.20.0-alpha.10",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.8.0-alpha.21"
+  "version": "22.8.0-alpha.23"
 }