@chevre/domain 24.1.0-alpha.8 → 25.0.0-alpha.0

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.paymentDue2Processing = paymentDue2Processing;
 const debug_1 = __importDefault(require("debug"));
-const findPlaceOrderTransaction_1 = require("../findPlaceOrderTransaction");
+const findConfirmedPlaceOrder_1 = require("../findConfirmedPlaceOrder");
 const onOrderStatusChanged_1 = require("../onOrderStatusChanged");
 const factory_1 = require("../../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
@@ -14,16 +14,11 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
  */
 function paymentDue2Processing(params) {
     return async (repos, settings) => {
-        const placeOrderTransaction = await (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+        const placeOrderTransaction = await (0, findConfirmedPlaceOrder_1.findConfirmedPlaceOrder)({
             project: { id: params.project.id },
             confirmationNumber: params.confirmationNumber,
             orderNumber: params.orderNumber
         })(repos);
-        // const existingOrder: Pick<factory.order.IOrder, 'project'> = await repos.order.projectFieldsByOrderNumber({
-        //     orderNumber: params.orderNumber,
-        //     project: { id: params.project.id },
-        //     inclusion: ['project']
-        // });
         let order;
         try {
             order = await repos.order.changeStatus({
@@ -55,28 +50,26 @@ function paymentDue2Processing(params) {
             }
         }
         if (params.useOnOrderStatusChanged) {
-            // 全acceptedOffersを検索(2023-12-08~)
-            // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber(
-            //     {
-            //         orderNumber: { $eq: order.orderNumber },
-            //         project: { id: { $eq: params.project.id } }
-            //     },
-            //     ['itemOffered', 'offeredThrough']
-            // );
             const { numAcceptedOffers } = await repos.acceptedOffer.countByOrderNumber({
                 orderNumber: { $eq: order.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
-            const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+            // const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues(
+            //     { orderNumber: { $in: [params.orderNumber] } },
+            //     'acceptedOffers.itemOffered.typeOf'
+            // ) as factory.order.IItemOffered['typeOf'][];
             const serialNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
             const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier')).shift();
-            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 'itemOfferedTypeOfs:', itemOfferedTypeOfs, 'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
+            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 
+            // 'itemOfferedTypeOfs:', itemOfferedTypeOfs,
+            'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
             await (0, onOrderStatusChanged_1.onOrderProcessing)({
                 order: {
                     ...order,
                     // acceptedOffers,
                     numAcceptedOffers,
-                    itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    // itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    itemOfferedTypeOf: factory_1.factory.reservationType.EventReservation, // EventReservationしか存在しないので固定でよし
                     serialNumbers,
                     offeredThroughIdentifier,
                     orderStatus: factory_1.factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する

package/lib/chevre/service/order/onAssetTransactionStatusChanged/processing2inTransit.d.ts

@@ -1,7 +1,7 @@
 import type { OrderRepo } from '../../../repo/order';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function processing2inTransit(params: {
     project: {
         id: string;

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

@@ -7,7 +7,7 @@ import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { paymentDue2Processing } from './onAssetTransactionStatusChanged/paymentDue2Processing';
 import { processing2inTransit } from './onAssetTransactionStatusChanged/processing2inTransit';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 interface IOnAssetTransactionStatusChangedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -9,7 +9,6 @@ exports.onOrderDelivered = onOrderDelivered;
  */
 const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./onOrderDelivered/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderDelivered(params) {

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

@@ -5,7 +5,12 @@ type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'projec
         limit: number;
         page: number;
     };
-    deliveredAcceptedOffers: factory.order.IAcceptedOffer[];
+    deliveredAcceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification' | 'name'> & {
+        /**
+         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+         */
+        priceSpecification?: factory.order.ITicketPriceSpecification;
+    })[];
     orderStatus: factory.orderStatus.OrderInTransit;
 };
 declare function createInformTasks(params: {

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

@@ -9,7 +9,6 @@ exports.onOrderDeliveredPartially = onOrderDeliveredPartially;
  */
 const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./onOrderDeliveredPartially/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderDeliveredPartially(params) {

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

@@ -1,7 +1,7 @@
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IOnOrderInTransitRepos {
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;

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

@@ -48,7 +48,7 @@ function createSendOrderTaskIfNotExist(params) {
         const sendOrderObject = {
             ...simpleOrder,
             acceptedOffers: {
-                limit: settings.deliverOrderLimit,
+                limit: (await settings.getByKey('deliverOrderLimit')),
                 page: 1 // page1から配送
             }
         };

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

@@ -1,7 +1,7 @@
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
 import { processOrder } from './onOrderProcessing/processOrder';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;

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

@@ -18,7 +18,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return async (repos, settings) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
-        const { numTryConfirmReserveTransaction } = settings;
+        // const { numTryConfirmReserveTransaction } = settings;
+        const numTryConfirmReserveTransaction = await settings.getByKey('numTryConfirmReserveTransaction');
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         let creatingCheckResourceTask;

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

@@ -10,7 +10,6 @@ exports.onOrderReturned = onOrderReturned;
 const debug_1 = __importDefault(require("debug"));
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 // import { createMaskedCustomer } from '../../../factory/order';
 const factory_2 = require("./onOrderReturned/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderUpdated = onOrderUpdated;
 const factory_1 = require("../../factory");
-// import { Settings } from '../../settings';
 const factory_2 = require("./onOrderUpdated/factory");
 function onOrderUpdated(params) {
     return async (repos

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

@@ -4,7 +4,7 @@ import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 /**
  * 注文を決済する
  */

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts

@@ -22,4 +22,4 @@ declare function createPlacingOrderFromExistingTransaction(params: {
     placeOrderTransaction: IPlaceOrderTransaction;
     serialNumbers: string[];
 }>;
-export { ICreatePlacingOrderFromExistingTransactionRepos, createPlacingOrderFromExistingTransaction };
+export { ICreatePlacingOrderFromExistingTransactionRepos, IPlacingOrder, createPlacingOrderFromExistingTransaction };

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -13,18 +13,27 @@ function createPlacingOrderFromExistingTransaction(params) {
             project: { id: { $eq: params.project.id } },
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             statuses: [factory_1.factory.transactionStatusType.Confirmed],
-            result: {
-                order: {
-                    confirmationNumber: { $eq: confirmationNumber },
-                    orderNumbers: [orderNumber]
-                }
+            // resultではなくobjectで参照するように変更(2026-06-16~)
+            object: {
+                orderNumber: { $eq: orderNumber },
             },
-            inclusion: ['project', 'typeOf', 'result', 'object', 'seller'] // potentialActionsは必要なし(2024-01-19~)
+            // result: {
+            //     order: {
+            //         confirmationNumber: { $eq: confirmationNumber },
+            //         orderNumbers: [orderNumber]
+            //     }
+            // },
+            inclusion: ['project', 'typeOf', 'result', 'object', 'seller']
         });
         const placeOrderTransactionWithResult = placeOrderTransactions.shift();
         if (placeOrderTransactionWithResult === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
         }
+        // 参照時の条件に含まれないので、確認番号はここで検証(2026-06-16~)
+        if (typeof placeOrderTransactionWithResult.object.confirmationNumber !== 'string'
+            || placeOrderTransactionWithResult.object.confirmationNumber !== confirmationNumber) {
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder, `${factory_1.factory.transactionType.PlaceOrder} not found with the confirmationNumber`);
+        }
         let authorizePaymentActions = [];
         let authorizeOfferActionsWithInstrument = [];
         const authorizeActionsAsResult = placeOrderTransactionWithResult.result?.authorizeActions;
@@ -80,7 +89,10 @@ function createPlacingOrderFromExistingTransaction(params) {
             .map(({ instrument }) => String(instrument.transactionNumber));
         try {
             // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
-            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+                orderNumber,
+                project: { id: params.project.id }
+            }))
                 .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         }
         catch (error) {

package/lib/chevre/service/order/placeOrder/factory/orderedItem.d.ts

@@ -3,6 +3,6 @@ import { factory } from '../../../../factory';
  * 受入オファーを注文アイテムに変換する
  */
 declare function acceptedOffers2orderedItem(params: {
-    eventReservationAcceptedOffers: factory.order.IAcceptedOffer[];
+    eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[];
 }): factory.order.IOrderedItem[];
 export { acceptedOffers2orderedItem };

package/lib/chevre/service/order/placeOrder/factory/orderedItem.js

@@ -9,11 +9,6 @@ function acceptedOffers2orderedItem(params) {
     // 予約がある場合
     const { reservationOrderItems } = createReservationAcceptedOffers(params);
     // 通貨転送がある場合
-    // const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
-    // プロダクトがある場合
-    // const { productOrderItems } = createProductItems(params);
-    // return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
-    // return [...reservationOrderItems, ...productOrderItems];
     return reservationOrderItems;
 }
 function createReservationAcceptedOffers(params) {

package/lib/chevre/service/order/placeOrder/factory.d.ts

@@ -1,7 +1,7 @@
 import type { IPlacingOrder } from '../../../repo/orderInTransaction';
 import { factory } from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
-type IOrderAcceptedOffer = factory.order.IAcceptedOffer;
+type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>;
 declare function createPaymentMethods(params: {
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
 }): {

package/lib/chevre/service/order/placeOrder/factory.js

@@ -15,7 +15,6 @@ function createPaymentMethods(params) {
     // 決済方法をセット
     params.authorizePaymentActions.forEach((a) => {
         const resultAsInvoice = (Array.isArray(a.result))
-            // ? a.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             ? a.result[0]
             : undefined;
         if (resultAsInvoice === undefined) {
@@ -42,16 +41,12 @@ function createPaymentMethods(params) {
             paymentStatus: resultAsInvoice.paymentStatus,
             paymentMethod: paymentMethodOfInvoice,
             ...(resultAsInvoice.totalPaymentDue !== undefined) ? { totalPaymentDue: resultAsInvoice.totalPaymentDue } : undefined
-            // ...(USE_ORDER_PAYMENT_METHOD_TYPE_OF) // 完全廃止(2024-01-17~)
-            //     ? { typeOf: paymentMethodType }
-            //     : undefined
         });
     });
     // 決済方法から注文金額の計算
     price += params.authorizePaymentActions
         .reduce((a, b) => {
         const resultAsInvoice = (Array.isArray(b.result))
-            // ? b.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             ? b.result[0]
             : undefined;
         const jpyAmount = (resultAsInvoice?.totalPaymentDue?.currency === factory_1.factory.priceCurrency.JPY)
@@ -73,47 +68,63 @@ function createSeller(params) {
 }
 function createPlacingOrder(params) {
     const { transaction, authorizePaymentActions } = params;
-    const orderByTransaction = transaction.result?.order;
-    if (orderByTransaction === undefined) {
-        throw new factory_1.factory.errors.NotFound('transaction.result.order');
+    let orderDateByTransaction;
+    const { confirmationNumber, orderDate, orderNumber } = transaction.object;
+    if (typeof confirmationNumber !== 'string') {
+        // 事前に発行済なはずなので、ありえないフロー
+        throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
     }
+    if (typeof orderNumber !== 'string') {
+        // 事前に発行済なはずなので、ありえないフロー
+        throw new factory_1.factory.errors.Internal('object.orderNumber undefined');
+    }
+    if (orderDate === undefined) {
+        orderDateByTransaction = transaction.result?.order?.orderDate;
+    }
+    else {
+        orderDateByTransaction = orderDate;
+    }
+    if (orderDateByTransaction === undefined) {
+        throw new factory_1.factory.errors.NotFound('orderDate in the transaction');
+    }
+    // const orderByTransaction = transaction.result?.order;
+    // if (orderByTransaction === undefined) {
+    //     throw new factory.errors.NotFound('transaction.result.order');
+    // }
     const seller = createSeller({ transaction });
-    const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
+    // discontinue(2026-06-11~)
+    // const name: string | undefined =
+    //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
     const broker = (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
-    // const productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[] = [];
-    // const moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[] = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
                 eventReservationAcceptedOffers.push(acceptedOffer);
                 break;
-            // case factory.permit.PermitType.Permit:
-            //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));
-            //     break;
-            // case factory.actionType.MoneyTransfer:
-            //     moneyTransferAcceptedOffers.push(<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>>acceptedOffer);
-            //     break;
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
         }
     });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,
-        // productAcceptedOffers,
-        // moneyTransferAcceptedOffers
     });
     return {
-        ...orderByTransaction,
+        // ...orderByTransaction, // transaction.result.orderへの依存廃止(2026-06-15~)
+        confirmationNumber,
+        orderNumber,
+        typeOf: factory_1.factory.order.OrderType.Order, // 取引保管を廃止するためにここで指定(2026-06-14~)
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 取引保管を廃止するためにここで指定(2026-06-14~)
         seller, // 2024-06-17~
         paymentMethods, // 2024-06-17~
         price, // 2024-06-17~
-        orderDate: (0, moment_1.default)(orderByTransaction.orderDate)
+        priceCurrency: factory_1.factory.priceCurrency.JPY, // 取引保管を廃止するためにここで指定(2026-06-14~)
+        orderDate: (0, moment_1.default)(orderDateByTransaction)
             .toDate(),
         orderedItem, // 2024-06-18~
-        ...(typeof name === 'string') ? { name } : undefined, // 2024-06-17~
+        // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)
         ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // 2024-06-17~
     };
 }

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

@@ -9,7 +9,8 @@ import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
+import { IPlacingOrder } from './placeOrder/createPlacingOrderFromExistingTransaction';
 interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
@@ -36,6 +37,6 @@ declare function placeOrder(params: {
     };
     useOnOrderStatusChanged: boolean;
 }): (repos: IPlaceOrderRepos, settings: Settings) => Promise<{
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: IPlacingOrder;
 }>;
 export { IPlaceOrderRepos, placeOrder };

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

@@ -31,15 +31,7 @@ function placeOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            // price: order.price,
-            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
         const orderActionPurpose = {
@@ -48,7 +40,6 @@ function placeOrder(params) {
         const orderActionAttributes = {
             agent: (typeof params.agent?.typeOf === 'string') ? params.agent : placeOrderTransaction.project,
             object: simpleOrder,
-            // potentialActions: {}, // discontinue(2024-06-28~)
             project: placeOrderTransaction.project,
             purpose: orderActionPurpose,
             typeOf: factory_1.factory.actionType.OrderAction

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

@@ -8,7 +8,6 @@ const debug_1 = __importDefault(require("debug"));
 // import { createMaskedCustomer } from '../../factory/order';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_1 = require("../../factory");
-// import { Settings } from '../../settings';
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function createReturnPolicy(params) {
     const { identifier, returnFees, restockingFee, typeOf } = params.returnOrderTransaction.object.returnPolicy;

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

@@ -10,7 +10,6 @@ const factory_1 = require("../delivery/factory");
 // import { findPlaceOrderTransaction } from './findPlaceOrderTransaction';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_2 = require("../../factory");
-// import { Settings } from '../../settings';
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 /**
  * 注文を配送する
@@ -94,10 +93,7 @@ function sendOrder(params) {
                 case factory_2.factory.personType.Person:
                     createOwnerships = true; // Personのみに限定(2026-03-15~)
                     break;
-                // case factory.creativeWorkType.WebApplication:
-                //     break;
                 default:
-                // createOwnerships = true;
             }
             try {
                 const offerIndexBase = (limit * (page - 1));
@@ -107,8 +103,7 @@ function sendOrder(params) {
                     project: { id: { $eq: order.project.id } }
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
-                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), // eslint-disable-line @typescript-eslint/no-explicit-any
-                params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
+                debug('delivering...', order.orderNumber, params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
                     creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
@@ -163,7 +158,6 @@ function sendOrder(params) {
                             price: order.price,
                             priceCurrency: order.priceCurrency
                         }
-                        // placeOrderTransaction
                     })(repos);
                 }
                 else {

package/lib/chevre/service/payment/any/authorize.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';

package/lib/chevre/service/payment/any/factory.js

@@ -162,12 +162,13 @@ function creatPayTransactionStartParams(params) {
     };
 }
 function createMovieTicket(params) {
-    let ticketIdentifier = (0, util_1.format)('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
-    // 指定があれば採用(2024-04-16~)
-    const ticketIdentifierByRequest = params.serviceOutput.reservedTicket.identifier;
-    if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
-        ticketIdentifier = ticketIdentifierByRequest;
-    }
+    const ticketIdentifier = (0, util_1.format)('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+    // カスタム指定は廃止(2026-06-08~)
+    // // 指定があれば採用(2024-04-16~)
+    // const ticketIdentifierByRequest = params.serviceOutput.reservedTicket.identifier;
+    // if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
+    //     ticketIdentifier = ticketIdentifierByRequest;
+    // }
     const serviceOutput = {
         reservationFor: {
             typeOf: params.serviceOutput.reservationFor.typeOf,

package/lib/chevre/service/payment/any/person2username.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.person2username = person2username;
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const person_1 = require("../../../repo/person");
 const SSKTS_PROVIDER_NAME = 'SSKTS';
 async function person2username(person, cognitoIdentityServiceProvider, setting

package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';

package/lib/chevre/service/payment/creditCard/authorize.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';

package/lib/chevre/service/payment/creditCard/authorize.js

@@ -47,10 +47,11 @@ payTransaction, paymentServiceId, options) {
         try {
             // タスクによって実行されているかどうか
             const executedByTask = typeof options.executor?.id === 'string' && options.executor.id !== '';
+            const gmoIntegrationSettings = await settings.getByKey('gmo');
             // 非同期承認時に長時間対応(2024-05-18~)
-            const timeout = (executedByTask && typeof settings.gmo.timeoutBackground === 'number')
-                ? settings.gmo.timeoutBackground
-                : settings.gmo.timeout;
+            const timeout = (executedByTask && typeof gmoIntegrationSettings.timeoutBackground === 'number')
+                ? gmoIntegrationSettings.timeoutBackground
+                : gmoIntegrationSettings.timeout;
             debug('processAuthorizeCreditCard processing... executor:', options.executor?.id, 'timeout:', timeout);
             const creditCardService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)

package/lib/chevre/service/payment/creditCard/payCreditCard.d.ts

@@ -6,7 +6,7 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 /**
  * クレジットカード決済
  */

package/lib/chevre/service/payment/creditCard/payCreditCard.js

@@ -39,7 +39,7 @@ function payCreditCard(params) {
         try {
             const creditService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)
-            }, { timeout: settings.gmo.timeout });
+            }, { timeout: (await settings.getByKey('gmo')).timeout });
             await Promise.all(payObject.map(async (paymentMethod) => {
                 const processAlterTranResult = await processAlterTran({
                     shopId, shopPass, availableChannel, paymentMethod

package/lib/chevre/service/payment/creditCard/refundCreditCard.d.ts

@@ -6,7 +6,7 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 /**
  * refund CreditCard IF payment
  */

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -59,7 +59,7 @@ function refundCreditCard(params
         try {
             const creditService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)
-            }, { timeout: settings.gmo.timeout });
+            }, { timeout: (await settings.getByKey('gmo')).timeout });
             processAlterTranResult = await processAlterTran({
                 availableChannel,
                 alterTranResultByPayAction,

package/lib/chevre/service/payment/creditCard/searchGMOTrade.d.ts

@@ -1,6 +1,6 @@
 import { GMO } from '@motionpicture/gmo-service';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 /**
  * 決済代行側の取引状態参照
  * 存在しない場合NotFoundエラー

package/lib/chevre/service/payment/creditCard/searchGMOTrade.js

@@ -11,7 +11,7 @@ const gmoError_1 = require("./gmoError");
 async function searchGMOTrade(params, settings) {
     const creditCardService = new gmo_service_1.GMO.service.Credit({
         endpoint: String(params.availableChannel.serviceUrl)
-    }, { timeout: settings.gmo.timeout });
+    }, { timeout: (await settings.getByKey('gmo')).timeout });
     // 取引状態参照
     let searchTradeResult;
     try {

package/lib/chevre/service/payment/creditCard/voidTransaction.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';