@chevre/domain 22.8.0-alpha.9 → 22.8.0

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

@@ -23,6 +23,7 @@ setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: order4inform,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

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

@@ -23,6 +23,7 @@ setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: order4inform,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

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

@@ -23,13 +23,14 @@ Object.defineProperty(exports, "processOrder", { enumerable: true, get: function
 const debug = createDebug('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d;
         const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         const { numTryConfirmReserveTransaction } = settings;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
-        const sendEmailMessageByOrderPotentialActions = (_f = (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions) === null || _f === void 0 ? void 0 : _f.sendEmailMessage;
-        const sendEmailMessageByOnOrderProcessing = (_k = (_j = (_h = (_g = params.placeOrderTransaction) === null || _g === void 0 ? void 0 : _g.potentialActions) === null || _h === void 0 ? void 0 : _h.order) === null || _j === void 0 ? void 0 : _j.onOrderProcessing) === null || _k === void 0 ? void 0 : _k.sendEmailMessage;
+        // const sendEmailMessageByOrderPotentialActions =
+        //     params.placeOrderTransaction?.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
+        const sendEmailMessageByOnOrderProcessing = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.onOrderProcessing) === null || _d === void 0 ? void 0 : _d.sendEmailMessage;
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = [
@@ -53,7 +54,7 @@ function onOrderProcessing(params) {
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
                     sendEmailMessage: [
-                        ...(Array.isArray(sendEmailMessageByOrderPotentialActions)) ? sendEmailMessageByOrderPotentialActions : [],
+                        // ...(Array.isArray(sendEmailMessageByOrderPotentialActions)) ? sendEmailMessageByOrderPotentialActions : [],
                         ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
                     ],
                     order: params.order

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,32 @@ 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,
+                about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
+                object: informObject,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
@@ -45,7 +51,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/onOrderUpdated/factory.js

@@ -16,6 +16,7 @@ setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order4inform.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: order4inform,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

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/lib/chevre/service/task/createEvent/createEventBySchedule.js

@@ -100,7 +100,7 @@ schedule, createDate) {
         }
         let existingApplicationMembers = [];
         if (applicationIds.length > 0) {
-            existingApplicationMembers = (yield repos.member.searchCustomerMembers({
+            existingApplicationMembers = yield repos.member.searchCustomerMembers({
                 limit: 100,
                 page: 1,
                 project: { id: project.id },
@@ -110,7 +110,7 @@ schedule, createDate) {
                     // },
                     id: { $in: applicationIds }
                 }
-            }));
+            });
         }
         // ロールで絞る(customer or pos)
         // existingApplicationMembers = existingApplicationMembers

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

@@ -1,4 +1,6 @@
+import type { IssuerRepo } from '../../../../repo/issuer';
 import type { MemberRepo } from '../../../../repo/member';
+import type { MemberProgramRepo } from '../../../../repo/memberProgram';
 import type { ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
 import type { ISellerWithId, SellerRepo } from '../../../../repo/seller';
 import * as factory from '../../../../factory';
@@ -15,9 +17,15 @@ declare function validateStartRequest(params: {
      * passportによって決定するカスタマータイプ
      */
     customerType?: string;
+    /**
+     * メンバーシップトークン
+     * プロジェクトオファーにvalidForMemberTierが存在する場合に必須
+     */
     memberOfToken?: string;
 }): (repos: {
+    issuer: IssuerRepo;
     member: MemberRepo;
+    memberProgram: MemberProgramRepo;
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
 }) => Promise<{

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

@@ -49,10 +49,10 @@ function verifyMembershipToken(params) {
         return result;
     });
 }
-// tslint:disable-next-line:max-func-body-length
 function validateStartRequest(params) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c;
         const clientId = (_a = params.clientUser) === null || _a === void 0 ? void 0 : _a.client_id;
         if (typeof clientId !== 'string' || clientId.length === 0) {
             throw new factory.errors.ArgumentNull('client_id');
@@ -120,13 +120,40 @@ function validateStartRequest(params) {
         }
         // メンバーシップトークン検証(2024-01-31~)
         let memeberOfPayload;
-        if (Array.isArray(iamMember.member.member)) {
-            const verifySecret = (_d = (_c = iamMember.member.member[0]) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.secret; // ひとまず1種類のメンバーシップのみ対応
-            const verifyIssuer = (_f = (_e = iamMember.member.member[0]) === null || _e === void 0 ? void 0 : _e.memberOf) === null || _f === void 0 ? void 0 : _f.issuer; // ひとまず1種類のメンバーシップのみ対応
-            if (typeof verifySecret === 'string') {
-                memeberOfPayload = yield verifyMembershipToken(Object.assign(Object.assign({ secret: verifySecret }, (typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined), (typeof verifyIssuer === 'string') ? { issuer: verifyIssuer } : undefined));
+        // 適用メンバーシップについてはproject.makesOfferを参照(2025-01-13~)
+        const validMemberProgramIdentifier = (_c = projectMakesOffer.validForMemberTier) === null || _c === void 0 ? void 0 : _c.isTierOf.identifier;
+        if (typeof validMemberProgramIdentifier === 'string') {
+            // メンバープログラムと発行者を参照(2025-01-16~)
+            const memberProgram = (yield repos.memberProgram.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                identifier: { $eq: validMemberProgramIdentifier }
+            })).shift();
+            if (memberProgram === undefined) {
+                throw new factory.errors.NotFound('MemberProgram');
             }
+            const issuer = yield repos.issuer.findByIdentifier({
+                project: { id: params.project.id },
+                identifier: memberProgram.hostingOrganization.identifier
+            });
+            if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
+                throw new factory.errors.NotFound('issuer.tokenSecret');
+            }
+            memeberOfPayload = yield verifyMembershipToken(Object.assign({ secret: issuer.tokenSecret, issuer: issuer.identifier }, (typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined));
         }
+        // discontinue(2025-01-14~)
+        // if (Array.isArray(iamMember.member.member)) {
+        //     const verifySecret = iamMember.member.member[0]?.memberOf?.secret; // ひとまず1種類のメンバーシップのみ対応
+        //     const verifyIssuer = iamMember.member.member[0]?.memberOf?.issuer; // ひとまず1種類のメンバーシップのみ対応
+        //     if (typeof verifySecret === 'string') {
+        //         memeberOfPayload = await verifyMembershipToken({
+        //             secret: verifySecret,
+        //             ...(typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined,
+        //             ...(typeof verifyIssuer === 'string') ? { issuer: verifyIssuer } : undefined
+        //         });
+        //     }
+        // }
         return Object.assign({ sellerMakesOffer,
             seller }, (memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined);
     });

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

@@ -1,11 +1,15 @@
+import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
+import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { PassportRepo } from '../../../repo/passport';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedTransaction, TransactionRepo } from '../../../repo/transaction';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
+    issuer: IssuerRepo;
     member: MemberRepo;
+    memberProgram: MemberProgramRepo;
     passport: PassportRepo;
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;

package/lib/chevre/service/transaction/returnOrder/preStart.d.ts

@@ -8,6 +8,7 @@ import type { OrderRepo } from '../../../repo/order';
 import type { ProjectRepo } from '../../../repo/project';
 import type { ReservationRepo } from '../../../repo/reservation';
 import type { ISellerWithId, SellerRepo } from '../../../repo/seller';
+import type { SellerReturnPolicyRepo } from '../../../repo/sellerReturnPolicy';
 interface IPreStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -18,6 +19,7 @@ interface IPreStartOperationRepos {
     project: ProjectRepo;
     reservation: ReservationRepo;
     seller: SellerRepo;
+    sellerReturnPolicy: SellerReturnPolicyRepo;
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
 type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;

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

@@ -24,7 +24,6 @@ exports.preStart = preStart;
 const createDebug = require("debug");
 const http_status_1 = require("http-status");
 const moment = require("moment-timezone");
-// import * as request from 'request';
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service');
 /**
@@ -60,10 +59,18 @@ function preStart(params) {
                 typeOf: factory.eventType.ScreeningEvent
             }, ['startDate']);
         }
-        let returnPolicies = seller.hasMerchantReturnPolicy;
-        if (!Array.isArray(returnPolicies)) {
-            returnPolicies = [];
+        let returnPolicies = [];
+        if (Array.isArray(seller.hasMerchantReturnPolicy)) {
+            const sellerReturnPolicyIdentifiers = seller.hasMerchantReturnPolicy.map(({ identifier }) => identifier);
+            // support sellerReturnPolicyRepo(2025-01-19~)
+            if (sellerReturnPolicyIdentifiers.length > 0) {
+                returnPolicies = yield repos.sellerReturnPolicy.projectFields({
+                    project: { id: { $eq: seller.project.id } },
+                    identifier: { $in: sellerReturnPolicyIdentifiers }
+                }, ['applicablePaymentMethod', 'identifier', 'itemCondition', 'merchantReturnDays', 'restockingFee', 'typeOf']);
+            }
         }
+        debug('returnOrder.preStart: returnPolicies:', JSON.stringify(returnPolicies));
         // アイテムコンディション取得
         let offerItemConditions = [];
         const itemConditionIds = returnPolicies
@@ -316,11 +323,16 @@ function getReturnPolicyByProject(params) {
                         throw new factory.errors.Internal('invalid return policy');
                     }
                     else {
-                        returnPolicy = Object.assign({ typeOf: 'MerchantReturnPolicy', restockingFee: {
+                        returnPolicy = {
+                            typeOf: 'MerchantReturnPolicy',
+                            restockingFee: {
                                 currency: factory.priceCurrency.JPY,
                                 typeOf: 'MonetaryAmount',
                                 value: body.restockingFee.value
-                            } }, (typeof identifier === 'string') ? { identifier } : undefined);
+                            },
+                            // keep identifier(2024-06-26~)
+                            identifier
+                        };
                     }
                     break;
                 case http_status_1.NOT_FOUND:
@@ -358,7 +370,7 @@ function findApplicableReturnPolicy(params) {
             const returnPolicySameAsByPoject = (_a = params.returnPolicySettingsByProject) === null || _a === void 0 ? void 0 : _a.sameAs;
             if (typeof returnPolicySameAsByPoject === 'string' && returnPolicySameAsByPoject.length > 0) {
                 const returnPolicyByProject = yield getReturnPolicyByProject({
-                    identifier: (_b = params.returnPolicySettingsByProject) === null || _b === void 0 ? void 0 : _b.identifier,
+                    identifier: String((_b = params.returnPolicySettingsByProject) === null || _b === void 0 ? void 0 : _b.identifier),
                     sameAs: returnPolicySameAsByPoject,
                     order: Object.assign(Object.assign({}, params.orders[0]), { acceptedOffers: params.acceptedOffers })
                 });

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

@@ -10,6 +10,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { ReservationRepo } from '../../repo/reservation';
 import type { SellerRepo } from '../../repo/seller';
+import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
@@ -24,6 +25,7 @@ interface IStartOperationRepos {
     project: ProjectRepo;
     reservation: ReservationRepo;
     seller: SellerRepo;
+    sellerReturnPolicy: SellerReturnPolicyRepo;
     transaction: TransactionRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;

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.6",
-    "@cinerino/sdk": "10.20.0-alpha.0",
+    "@chevre/factory": "4.392.0",
+    "@cinerino/sdk": "10.20.0",
     "@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.9"
+  "version": "22.8.0"
 }

package/example/src/chevre/adminSellerPaymentAccepted.ts

@@ -1,60 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const SELLER_ID = '59d20831e53ebc2b4e774466';
-const PAYMENT_METHOD_TYPE = 'Cash';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const paymentAcceptedRepo = await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection);
-
-    let paymentAccepted = await paymentAcceptedRepo.search({
-        project: { id: { $eq: project.id } },
-        seller: { id: { $eq: SELLER_ID } },
-        codeValue: { $eq: PAYMENT_METHOD_TYPE }
-    });
-    console.log('paymentAccepted:', paymentAccepted);
-    console.log(paymentAccepted.length, 'paymentAccepted found');
-
-    try {
-        await paymentAcceptedRepo.deleteOne({
-            codeValue: PAYMENT_METHOD_TYPE,
-            project: { id: project.id },
-            seller: { id: SELLER_ID }
-        });
-        console.log('paymentAccepted deleted');
-    } catch (error) {
-        console.error(error);
-    }
-
-    paymentAccepted = await paymentAcceptedRepo.search({
-        project: { id: { $eq: project.id } },
-        seller: { id: { $eq: SELLER_ID } },
-        codeValue: { $eq: PAYMENT_METHOD_TYPE }
-    });
-    console.log('paymentAccepted:', paymentAccepted);
-    console.log(paymentAccepted.length, 'paymentAccepted found');
-
-    await paymentAcceptedRepo.create({
-        codeValue: PAYMENT_METHOD_TYPE,
-        project: { id: project.id },
-        seller: { id: SELLER_ID }
-    });
-    console.log('paymentAccepted created');
-
-    paymentAccepted = await paymentAcceptedRepo.search({
-        project: { id: { $eq: project.id } },
-        seller: { id: { $eq: SELLER_ID } },
-        codeValue: { $eq: PAYMENT_METHOD_TYPE }
-    });
-    console.log('paymentAccepted:', paymentAccepted);
-    console.log(paymentAccepted.length, 'paymentAccepted found');
-}
-
-main()
-    .then()
-    .catch(console.error);