@chevre/domain 24.0.0-alpha.8 → 24.0.0-alpha.80

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findApplicableReturnPolicy = findApplicableReturnPolicy;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 const getReturnPolicyByProject_1 = require("./getReturnPolicyByProject");
 const debug = (0, debug_1.default)('chevre-domain:service');
 /**
@@ -37,17 +14,17 @@ const debug = (0, debug_1.default)('chevre-domain:service');
  * restockingFeeが最低のポリシーを自動選択
  */
 async function findApplicableReturnPolicy(params) {
-    if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
+    if (params.reason === factory_1.factory.transaction.returnOrder.Reason.Seller) {
         // 販売者都合の場合、手数料なしの返金返品ポリシーを適用
         return {
             typeOf: 'MerchantReturnPolicy',
-            returnFees: factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn
+            returnFees: factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn
             // no identifier in this case
         };
     }
     const returnPolicies = params.returnPolicies;
     let applicalbleReturnPolicies = [];
-    if (params.reason === factory.transaction.returnOrder.Reason.Customer) {
+    if (params.reason === factory_1.factory.transaction.returnOrder.Reason.Customer) {
         // プロジェクトの返品ポリシー設定を考慮(2023-11-14~)
         const returnPolicySameAsByPoject = params.returnPolicySettingsByProject?.sameAs;
         if (typeof returnPolicySameAsByPoject === 'string' && returnPolicySameAsByPoject.length > 0) {
@@ -78,7 +55,7 @@ async function findApplicableReturnPolicy(params) {
     });
     // 販売者にポリシーが存在しなければ返品不可
     if (applicalbleReturnPolicies.length === 0) {
-        throw new factory.errors.Argument('Seller', 'has no applicable return policies');
+        throw new factory_1.factory.errors.Argument('Seller', 'has no applicable return policies');
     }
     // オファーの返品ポリシーから返品手数料タイプを決定する
     const { returnFees, returnFeesMovieTicket } = validateOffersReturnPolicy({
@@ -111,7 +88,7 @@ async function findApplicableReturnPolicy(params) {
     if (typeof appliedItemConditionId === 'string') {
         const appliedItemConditionFromDB = params.offerItemConditions.find((o) => o.id === appliedItemConditionId);
         if (appliedItemConditionFromDB === undefined) {
-            throw new factory.errors.NotFound('OfferItemCondition');
+            throw new factory_1.factory.errors.NotFound('OfferItemCondition');
         }
         appliedItemCondition = {
             identifier: appliedItemConditionFromDB.identifier,
@@ -151,7 +128,7 @@ function isSellerReturnPolicyApplicable(params) {
         if (typeof itemConditionId === 'string') {
             offerItemCondition = params.offerItemConditions.find((o) => o.id === itemConditionId);
             if (offerItemCondition === undefined) {
-                throw new factory.errors.NotFound('OfferItemCondition');
+                throw new factory_1.factory.errors.NotFound('OfferItemCondition');
             }
         }
     }
@@ -193,7 +170,7 @@ function isSellerReturnPolicyApplicable(params) {
     // アイテムコンディション検証
     let satisfyItemCondition = true;
     if (typeof offerItemConditionAsStr === 'string') {
-        if (offerItemConditionAsStr === factory.offerItemCondition.OfferItemCondition.NewCondition) {
+        if (offerItemConditionAsStr === factory_1.factory.offerItemCondition.OfferItemCondition.NewCondition) {
             let satisfyOnlyUnused = true;
             if (params.usedReservationExists) {
                 satisfyOnlyUnused = false;
@@ -279,55 +256,55 @@ function validateOffersReturnPolicy(params) {
         return Array.isArray(offer.hasMerchantReturnPolicy) && offer.hasMerchantReturnPolicy.length > 0;
     });
     if (!everyOffersHaveReturnPolicy) {
-        throw new factory.errors.NotFound('offer.hasMerchantReturnPolicy');
+        throw new factory_1.factory.errors.NotFound('offer.hasMerchantReturnPolicy');
     }
     let returnFees;
     // 返品手数料設定はどうか？
     const somePolicyWithReturnFeesCustomerResponsibility = params.policiesByOffer.some((policy) => {
-        return policy.customerRemorseReturnFees === factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility;
+        return policy.customerRemorseReturnFees === factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility;
     });
     const somePolicyWithRestockingFees = params.policiesByOffer.some((policy) => {
-        return policy.customerRemorseReturnFees === factory.merchantReturnPolicy.ReturnFeesEnumeration.RestockingFees;
+        return policy.customerRemorseReturnFees === factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.RestockingFees;
     });
     const everyPolicyWithFreeReturn = params.policiesByOffer.every((policy) => {
-        return policy.customerRemorseReturnFees === factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn;
+        return policy.customerRemorseReturnFees === factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn;
     });
     if (somePolicyWithReturnFeesCustomerResponsibility) {
         // ひとつでも返金なしがあれば返金なし
-        returnFees = factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility;
+        returnFees = factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility;
     }
     else if (somePolicyWithRestockingFees) {
         // ひとつでも手数料あり返金があれば手数料あり返金
-        returnFees = factory.merchantReturnPolicy.ReturnFeesEnumeration.RestockingFees;
+        returnFees = factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.RestockingFees;
     }
     else if (everyPolicyWithFreeReturn) {
         // 全ポリシーが手数料なしであれば手数料なし返金
-        returnFees = factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn;
+        returnFees = factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn;
     }
     else {
-        throw new factory.errors.NotImplemented('returnFees not defined');
+        throw new factory_1.factory.errors.NotImplemented('returnFees not defined');
     }
     // 決済カード取消ポリシーを確定(2023-05-23~)
     const returnFeesMovieTicket = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
         const unitPriceOffer = params.offers.find((offer) => offer.id === acceptedOffer.id);
         if (unitPriceOffer === undefined) {
-            throw new factory.errors.NotFound(`UnitPriceOffer ${acceptedOffer.id}`);
+            throw new factory_1.factory.errors.NotFound(`UnitPriceOffer ${acceptedOffer.id}`);
         }
         if (!Array.isArray(unitPriceOffer.hasMerchantReturnPolicy) || unitPriceOffer.hasMerchantReturnPolicy.length === 0) {
-            throw new factory.errors.NotFound(`offer.hasMerchantReturnPolicy ${acceptedOffer.id}`);
+            throw new factory_1.factory.errors.NotFound(`offer.hasMerchantReturnPolicy ${acceptedOffer.id}`);
         }
         const hasMerchantReturnPolicy = unitPriceOffer.hasMerchantReturnPolicy[0];
         const policyByOffer = params.policiesByOffer.find((policy) => policy.id === hasMerchantReturnPolicy.id);
         if (policyByOffer === undefined) {
-            throw new factory.errors.NotFound(`MerchantReturnPolicy acceptedOffer:${acceptedOffer.id}`);
+            throw new factory_1.factory.errors.NotFound(`MerchantReturnPolicy acceptedOffer:${acceptedOffer.id}`);
         }
         const movieTicketTypeChargeSpecExists = acceptedOffer.priceSpecification?.priceComponent.some((component) => {
-            return component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+            return component.typeOf === factory_1.factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
         });
         if (movieTicketTypeChargeSpecExists === true) {
             acceptedOffer.priceSpecification?.priceComponent.forEach((component) => {
-                if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
+                if (component.typeOf === factory_1.factory.priceSpecificationType.UnitPriceSpecification) {
                     if (Array.isArray(component.appliesToMovieTicket)) {
                         component.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
                             returnFeesMovieTicket.push({

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

@@ -1,4 +1,4 @@
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 import { ICustomSellerReturnPolicy, IFixedAcceptedOffer } from './factory';
 /**
  * プロジェクトのカスタム返品ポリシーをリモートから取得する

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

@@ -1,38 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getReturnPolicyByProject = getReturnPolicyByProject;
 const http_status_1 = require("http-status");
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 function createOrder4returnPolicy(params) {
     return {
         orderDate: params.order.orderDate,
         orderNumber: params.order.orderNumber,
         price: params.order.price,
         acceptedOffers: params.order.acceptedOffers.map((o) => {
-            if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (o.itemOffered.typeOf === factory_1.factory.reservationType.EventReservation) {
                 const reservation = o.itemOffered;
                 const priceComponent = o.priceSpecification?.priceComponent;
                 return {
@@ -51,7 +28,8 @@ function createOrder4returnPolicy(params) {
                     priceSpecification: {
                         priceComponent: (Array.isArray(priceComponent))
                             ? priceComponent.map((component) => {
-                                const { accounting, name, priceCurrency, valueAddedTaxIncluded, ...postingComponent } = component;
+                                const { accounting, name, priceCurrency, valueAddedTaxIncluded, // eslint-disable-line @typescript-eslint/no-unused-vars
+                                ...postingComponent } = component;
                                 return postingComponent;
                             })
                             : []
@@ -89,30 +67,30 @@ async function getReturnPolicyByProject(params) {
         try {
             body = await res.json();
         }
-        catch (error) {
+        catch (_error) {
             // no op
         }
         let returnPolicy;
         switch (res.status) {
-            case http_status_1.OK:
-            case http_status_1.CREATED:
-            case http_status_1.ACCEPTED:
-            case http_status_1.NO_CONTENT:
+            case http_status_1.status.OK:
+            case http_status_1.status.CREATED:
+            case http_status_1.status.ACCEPTED:
+            case http_status_1.status.NO_CONTENT: {
                 const restockingFeeValue = body?.restockingFee?.value;
                 if (typeof restockingFeeValue !== 'number') {
-                    throw new factory.errors.Internal('invalid return policy');
+                    throw new factory_1.factory.errors.Internal('invalid return policy');
                 }
                 else {
                     const itemCondition = body?.itemCondition;
                     if (itemCondition !== undefined) {
-                        if (itemCondition !== factory.offerItemCondition.OfferItemCondition.NewCondition) {
-                            throw new factory.errors.Argument('', `unknown itemCondition: ${itemCondition}`);
+                        if (itemCondition !== factory_1.factory.offerItemCondition.OfferItemCondition.NewCondition) {
+                            throw new factory_1.factory.errors.Argument('', `unknown itemCondition: ${itemCondition}`);
                         }
                     }
                     returnPolicy = {
                         typeOf: 'MerchantReturnPolicy',
                         restockingFee: {
-                            currency: factory.priceCurrency.JPY,
+                            currency: factory_1.factory.priceCurrency.JPY,
                             typeOf: 'MonetaryAmount',
                             value: restockingFeeValue
                         },
@@ -121,11 +99,12 @@ async function getReturnPolicyByProject(params) {
                     };
                 }
                 break;
-            case http_status_1.NOT_FOUND:
-                throw new factory.errors.Argument('', `custom return policy returned statusCode: ${res.status}`);
+            }
+            case http_status_1.status.NOT_FOUND:
+                throw new factory_1.factory.errors.Argument('', `custom return policy returned statusCode: ${res.status}`);
             // break;
             default:
-                throw new factory.errors.Internal(`ProjectReturnPolicy unavailable. statusCode: ${res.status} body: ${body}`);
+                throw new factory_1.factory.errors.Internal(`ProjectReturnPolicy unavailable. statusCode: ${res.status} body: ${body}`);
         }
         return returnPolicy;
     }

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

@@ -1,4 +1,4 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { EventRepo } from '../../../repo/event';
 import type { MerchantReturnPolicyRepo } from '../../../repo/merchantReturnPolicy';
@@ -31,4 +31,4 @@ declare function preStart(params: factory.transaction.returnOrder.IStartParamsWi
     seller: IFixedSeller;
     expiresInSeconds: number;
 }>;
-export { preStart };
+export { IPreStartOperationRepos, preStart };

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

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preStart = preStart;
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const findApplicableReturnPolicy_1 = require("./preStart/findApplicableReturnPolicy");
 const debug = (0, debug_1.default)('chevre-domain:service');
 /**
@@ -46,7 +23,7 @@ function preStart(params) {
         }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf']);
         const seller = sellers.shift();
         if (seller === undefined) {
-            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Corporation);
         }
         await validateOrder({ orders })();
         let offers = [];
@@ -60,7 +37,7 @@ function preStart(params) {
         if (eventIds.length > 0) {
             events = await repos.event.projectEventFields({
                 id: { $in: eventIds },
-                typeOf: factory.eventType.ScreeningEvent
+                typeOf: factory_1.factory.eventType.ScreeningEvent
             }, ['startDate']);
         }
         let returnPolicies = [];
@@ -119,7 +96,7 @@ function preStart(params) {
             expiresInSeconds = params.expiresInSeconds;
         }
         else {
-            throw new factory.errors.ArgumentNull('expiresInSeconds');
+            throw new factory_1.factory.errors.ArgumentNull('expiresInSeconds');
         }
         return { transactionObject, seller, expiresInSeconds };
     };
@@ -131,7 +108,7 @@ function fixOrders(params) {
         }
         // ひとまず同時返品可能な注文数を1に限定(2022-04-28~)
         if (params.object.order.length !== 1) {
-            throw new factory.errors.Argument('object.order', 'number of orders must be 1');
+            throw new factory_1.factory.errors.Argument('object.order', 'number of orders must be 1');
         }
         // 注文数を1に限定であれば、findByConfirmationNumberに変更できる(2022-04-28~)
         const orders = await repos.order.projectFields({
@@ -156,7 +133,7 @@ function fixOrders(params) {
         // }
         );
         if (orders.length !== params.object.order.length) {
-            throw new factory.errors.NotFound('Order');
+            throw new factory_1.factory.errors.NotFound('Order');
         }
         const offerIds = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
@@ -196,13 +173,14 @@ function checkUsedReservationExists(params) {
         }, 'acceptedOffers.itemOffered.reservationNumber');
         if (reservationNumbers.length > 0) {
             // 使用済の予約がひとつでもあれば不可
-            const existingUsedReservations = await repos.reservation.projectFields({
+            const existingUsedReservations = await repos.reservation.findReservations({
                 limit: 1,
                 page: 1,
-                typeOf: factory.reservationType.EventReservation,
+                typeOf: factory_1.factory.reservationType.EventReservation,
                 reservationNumber: { $in: reservationNumbers },
                 attended: true
-            }, { id: 1 });
+            }, { id: 1 } // 廃止属性の影響なし(2026-03-25~)
+            );
             if (existingUsedReservations.length > 0) {
                 usedReservationExists = true;
             }
@@ -212,7 +190,7 @@ function checkUsedReservationExists(params) {
 }
 function validateItems(params) {
     return async (__) => {
-        if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
+        if (params.reason === factory_1.factory.transaction.returnOrder.Reason.Seller) {
             // 販売者都合の場合、特に検証しない
             return;
         }
@@ -252,7 +230,7 @@ function searchPoliciesByOffer(params) {
             });
         }
         if (merchantReturnPolicyIds.length !== policiesByOffer.length) {
-            throw new factory.errors.NotFound('MerchantReturnPolicy with offers');
+            throw new factory_1.factory.errors.NotFound('MerchantReturnPolicy with offers');
         }
         return policiesByOffer;
     };
@@ -260,25 +238,25 @@ function searchPoliciesByOffer(params) {
 function validateAppliedReturnPolicy(params) {
     const appliedReturnPolicy = params.merchantReturnPolicy;
     switch (appliedReturnPolicy.returnFees) {
-        case factory.merchantReturnPolicy.ReturnFeesEnumeration.RestockingFees:
+        case factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.RestockingFees:
             // 返品ポリシーに返品手数料が定義されていれば、金額設定が必須
             if (typeof appliedReturnPolicy.restockingFee === 'number') {
-                throw new factory.errors.NotImplemented('restockingFee in type of number not implemented');
+                throw new factory_1.factory.errors.NotImplemented('restockingFee in type of number not implemented');
             }
             else {
                 const returnFeeByPolicy = appliedReturnPolicy.restockingFee?.value;
                 if (typeof returnFeeByPolicy !== 'number') {
-                    throw new factory.errors.NotFound('appliedReturnPolicy.restockingFee.value');
+                    throw new factory_1.factory.errors.NotFound('appliedReturnPolicy.restockingFee.value');
                 }
             }
             break;
-        case factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn:
+        case factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn:
             // 返品手数料設定不要なのでスルー
             break;
-        case factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility:
+        case factory_1.factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility:
             // 返金処理なしなのでスルー
             break;
         default:
-            throw new factory.errors.NotImplemented(`returnFees of returnPolicy: ${appliedReturnPolicy.returnFees} not implemented`);
+            throw new factory_1.factory.errors.NotImplemented(`returnFees of returnPolicy: ${appliedReturnPolicy.returnFees} not implemented`);
     }
 }

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

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { EmailMessageRepo } from '../../repo/emailMessage';
 import type { EventRepo } from '../../repo/event';
@@ -13,7 +13,7 @@ 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';
+import type { IStartedTransaction, ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 import { preStart } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
@@ -26,18 +26,27 @@ interface IStartOperationRepos {
     reservation: ReservationRepo;
     seller: SellerRepo;
     sellerReturnPolicy: SellerReturnPolicyRepo;
-    transaction: TransactionRepo;
+    returnOrder: ReturnOrderRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-type ITaskAndTransactionOperation<T> = (repos: {
+interface IExportTasksByIdRepos {
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
-}) => Promise<T>;
+    returnOrder: ReturnOrderRepo;
+}
+type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise<T>;
 /**
  * 返品取引開始
  */
 declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
+interface IConfirmRepos {
+    acceptedOffer: AcceptedOfferRepo;
+    emailMessage?: EmailMessageRepo;
+    message: MessageRepo;
+    order: OrderRepo;
+    setting: SettingRepo;
+    returnOrder: ReturnOrderRepo;
+}
 /**
  * 取引確定
  */
@@ -47,14 +56,7 @@ declare function confirm(params: factory.transaction.returnOrder.IConfirmParams
             dateReturned: Date;
         };
     };
-}): (repos: {
-    acceptedOffer: AcceptedOfferRepo;
-    emailMessage?: EmailMessageRepo;
-    message: MessageRepo;
-    order: OrderRepo;
-    setting: SettingRepo;
-    transaction: TransactionRepo;
-}) => Promise<import("@chevre/factory/lib/transaction/returnOrder").IResult | undefined>;
+}): (repos: IConfirmRepos) => Promise<import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined>;
 /**
  * 取引のタスクを出力します
  * 複数タスクが生成されます
@@ -67,4 +69,4 @@ declare function exportTasksById(params: {
      */
     runsTasksAfterInSeconds?: number;
 }): ITaskAndTransactionOperation<void>;
-export { preStart, start, confirm, exportTasksById };
+export { IStartOperationRepos, IConfirmRepos, IExportTasksByIdRepos, preStart, start, confirm, exportTasksById };

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -34,8 +11,8 @@ exports.exportTasksById = exportTasksById;
  * 返品取引サービス
  */
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
-const factory = __importStar(require("../../factory"));
-const factory_1 = require("./returnOrder/exportTasks/factory");
+const factory_1 = require("../../factory");
+const factory_2 = require("./returnOrder/exportTasks/factory");
 const potentialActions_1 = require("./returnOrder/potentialActions");
 const preStart_1 = require("./returnOrder/preStart");
 Object.defineProperty(exports, "preStart", { enumerable: true, get: function () { return preStart_1.preStart; } });
@@ -48,7 +25,7 @@ function start(params) {
         const { transactionObject, expiresInSeconds, seller } = await (0, preStart_1.preStart)(params)(repos);
         const returnOrderAttributes = {
             project: params.project,
-            typeOf: factory.transactionType.ReturnOrder,
+            typeOf: factory_1.factory.transactionType.ReturnOrder,
             agent: params.agent,
             seller: {
                 id: String(seller.id),
@@ -60,14 +37,14 @@ function start(params) {
         };
         let returnOrderTransaction;
         try {
-            returnOrderTransaction = await repos.transaction.startNoPlaceOrder(returnOrderAttributes);
+            returnOrderTransaction = await repos.returnOrder.startReturnOrder(returnOrderAttributes);
         }
         catch (error) {
             if (await (0, errorHandler_1.isMongoError)(error)) {
                 // 同一取引に対して返品取引を作成しようとすると、MongoDBでE11000 duplicate key errorが発生する
                 /* istanbul ignore else */
                 if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                    throw new factory.errors.Argument('orderNumber', 'Already returned');
+                    throw new factory_1.factory.errors.Argument('orderNumber', 'Already returned');
                 }
             }
             throw error;
@@ -93,9 +70,9 @@ function saveMessagesIfNeeded(params) {
             for (const { identifier, name, about, text, toRecipient, sender } of emailMessages) {
                 await repos.message.upsertOneByIdentifier({
                     identifier, name, about, text, toRecipient, sender,
-                    project: { id: project.id, typeOf: factory.organizationType.Project },
-                    provider: { id: seller.id, typeOf: factory.organizationType.Corporation },
-                    mainEntity: { orderNumber, typeOf: factory.order.OrderType.Order }
+                    project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
+                    provider: { id: seller.id, typeOf: factory_1.factory.organizationType.Corporation },
+                    mainEntity: { orderNumber, typeOf: factory_1.factory.order.OrderType.Order }
                 });
             }
         }
@@ -108,23 +85,23 @@ function confirm(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const transaction = await repos.transaction.projectFieldsByIdNoPlaceOrder({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
-        if (transaction.status === factory.transactionStatusType.Confirmed) {
+        const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory_1.factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
+        if (transaction.status === factory_1.factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
             return transaction.result;
         }
-        else if (transaction.status === factory.transactionStatusType.Expired) {
-            throw new factory.errors.Argument('transaction', 'Transaction already expired');
+        else if (transaction.status === factory_1.factory.transactionStatusType.Expired) {
+            throw new factory_1.factory.errors.Argument('transaction', 'Transaction already expired');
         }
-        else if (transaction.status === factory.transactionStatusType.Canceled) {
-            throw new factory.errors.Argument('transaction', 'Transaction already canceled');
+        else if (transaction.status === factory_1.factory.transactionStatusType.Canceled) {
+            throw new factory_1.factory.errors.Argument('transaction', 'Transaction already canceled');
         }
         if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
+            throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
         // ひとまず同時返品可能な注文数を1に限定(2022-04-28~)
         if (transaction.object.order.length !== 1) {
-            throw new factory.errors.Argument('object.order', 'number of orders must be 1');
+            throw new factory_1.factory.errors.Argument('object.order', 'number of orders must be 1');
         }
         const returningOrders = await repos.order.projectFields({
             limit: 1,
@@ -145,13 +122,13 @@ function confirm(params) {
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
+                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
             });
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
-            throw new factory.errors.NotFound('setting.defaultSenderEmail');
+            throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
         }
         const result = {};
         const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
@@ -169,7 +146,7 @@ function confirm(params) {
             order: { orderNumber: returningOrders[0].orderNumber }, seller: { id: returningOrders[0].seller.id }, emailMessages
         })(repos);
         // ステータス変更
-        await repos.transaction.confirmNoPlaceOrder({
+        await repos.returnOrder.confirmReturnOrder({
             typeOf: transaction.typeOf,
             id: transaction.id,
             result, potentialActions
@@ -186,7 +163,7 @@ function exportTasksById(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const transaction = await repos.transaction.projectFieldsByIdNoPlaceOrder({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
+        const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory_1.factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {
@@ -196,7 +173,7 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const taskAttributes = (0, factory_1.createTasks)({
+        const taskAttributes = (0, factory_2.createTasks)({
             transaction,
             runsAt: taskRunsAt
         }, setting