@chevre/domain 24.1.0-alpha.6 → 24.1.0-alpha.61

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -8,7 +8,6 @@ const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../../../errorHandler");
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
 const result_1 = require("./confirm/factory/result");
@@ -30,9 +29,16 @@ function processTransactionNotInProgress(transaction) {
             // if (resultCustomer === undefined) {
             //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
             // }
+            const { confirmationNumber, orderNumber } = transaction.object;
+            // Confirmedの取引であればobjectには必ず存在するはず
+            if (typeof confirmationNumber !== 'string' || typeof orderNumber !== 'string'
+                || confirmationNumber === '' || orderNumber === '') {
+                throw new factory_1.factory.errors.Internal('confirmationNumber, orderNumber undefined unexpectedly');
+            }
             // すでに確定済の場合
             return {
                 ...transaction.result,
+                order: { confirmationNumber, orderNumber },
                 customer: resultCustomer
             };
         }
@@ -99,7 +105,10 @@ function confirm(params, options) {
         // authorizeProductOfferActions,
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+            orderNumber,
+            project: { id: transaction.project.id }
+        }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
@@ -116,7 +125,7 @@ function confirm(params, options) {
         // let customer: factory.order.ICustomer = createCustomer({ transaction });
         const customer = await repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
         const seller = (0, factory_2.createSeller)({ transaction });
-        const { paymentMethods, result, eventId, reservationIds } = createResult({
+        const { paymentMethods, placingOrder, result, eventId, reservationIds } = createResult({
             ...params,
             orderNumber, transaction,
             acceptPayActions,
@@ -142,7 +151,7 @@ function confirm(params, options) {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
         }
         const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
-            order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
+            order: placingOrder, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
             paymentMethods,
@@ -163,6 +172,7 @@ function confirm(params, options) {
             await repos.placeOrder.confirmPlaceOrder({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
+                object: { orderDate: params.result.order.orderDate },
                 result: result,
                 potentialActions: potentialActions
             });
@@ -175,9 +185,12 @@ function confirm(params, options) {
             }
             throw error;
         }
-        const { order } = result;
+        // const { order } = result;
         return {
-            order,
+            order: {
+                confirmationNumber: placingOrder.confirmationNumber,
+                orderNumber: placingOrder.orderNumber
+            },
             customer,
             ...(typeof code === 'string') ? { code } : undefined,
             ...(typeof eventId === 'string') ? { eventId } : undefined,
@@ -288,7 +301,7 @@ function createResult(params, options) {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
-                eventReservationAcceptedOffers.push(acceptedOffer);
+                eventReservationAcceptedOffers.push((acceptedOffer));
                 break;
             // case factory.permit.PermitType.Permit:
             //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));
@@ -303,18 +316,7 @@ function createResult(params, options) {
     eventReservationAcceptedOffers, params.payTransactions, params.customer);
     const { paymentMethods, price } = (0, factory_2.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
-        eventReservationAcceptedOffers,
-        // productAcceptedOffers,
-        // moneyTransferAcceptedOffers
-    });
-    // 注文作成
-    const orderAsResult = (0, result_1.createOrderAsResult)({
-        orderNumber: params.orderNumber,
-        orderDate: params.result.order.orderDate,
-        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 注文作成時のステータスとなる
-        // orderedItem,
-        // paymentMethods,
-        price
+        eventReservationAcceptedOffers
     });
     (0, validation_1.validateEventOffers)({
         order: { price },
@@ -333,18 +335,27 @@ function createResult(params, options) {
     });
     (0, validation_1.validatePaymentMethods)({ order: { paymentMethods } }, options);
     // 確認番号を発行
-    const { confirmationNumber, identifier, url } = createConfirmationNumber({
-        order: orderAsResult,
-        transaction: transaction,
-        result: params.result
+    const { confirmationNumber } = createConfirmationNumber({ transaction });
+    // 注文作成
+    const orderAsResult = (0, result_1.createOrderAsResult)({
+        orderNumber: params.orderNumber,
+        orderDate: params.result.order.orderDate,
+        price
     });
     orderAsResult.confirmationNumber = confirmationNumber;
-    orderAsResult.identifier = identifier;
-    orderAsResult.url = url;
+    // orderAsResult.identifier = identifier; // discontinue(2026-06-11~)
+    // orderAsResult.url = url; // discontinue(2026-06-11~)
+    const placingOrder = {
+        ...orderAsResult,
+        confirmationNumber,
+        typeOf: factory_1.factory.order.OrderType.Order,
+        price,
+        priceCurrency: factory_1.factory.priceCurrency.JPY,
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue
+    };
     const authorizeActions = [
         ...params.authorizePaymentActions.map(({ id }) => ({ id })),
         ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
-        // ...params.authorizeProductOfferActions.map(({ id }) => ({ id }))
     ];
     let eventId;
     let reservationIds;
@@ -356,14 +367,12 @@ function createResult(params, options) {
     }
     return {
         paymentMethods,
+        placingOrder,
         result: {
-            order: orderAsResult,
             authorizeActions, // 追加(2024-01-17~)
             numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
-            // options: { // discontinue(2024-06-20~)
-            //     ignoreAccpetedOffersFromResult: true
-            // },
-            ...(typeof params.code === 'string') ? { code: params.code } : undefined
+            ...(typeof params.code === 'string') ? { code: params.code } : undefined,
+            ...((!options.disableResultOrder) && { order: orderAsResult }) // support disableResultOrder(2026-06-15~)
         },
         ...(typeof eventId === 'string') ? { eventId } : undefined,
         ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined
@@ -441,26 +450,12 @@ function searchAuthorizeActions(params) {
 }
 function createConfirmationNumber(params) {
     const confirmationNumber = params.transaction.object.confirmationNumber;
-    let url = '';
     // 取引に確認番号が保管されていなければ、確認番号を発行
     if (typeof confirmationNumber !== 'string') {
         // 事前に発行済なはずなので、ありえないフロー
         throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
     }
-    // URLの指定があれば上書き
-    /* istanbul ignore if */
-    if (typeof params.result.order.url === 'string') {
-        url = params.result.order.url;
-    }
-    else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
-        /* istanbul ignore next */
-        url = params.result.order.url(params.order);
-    }
-    // 識別子の指定があれば上書き
-    const identifier = [
-        ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
-        // 取引に指定があれば追加
-        ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
-    ];
-    return { confirmationNumber, url, identifier };
+    return {
+        confirmationNumber,
+    };
 }

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = exportTasksById;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./exportTasks/factory");
 /**
  * 取引のタスクを出力します

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

@@ -6,5 +6,14 @@ type IVerifiedPassport = factory.waiter.passport.IPassport & {
      */
     identifier: string;
 };
-declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker, customerType?: string, memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload): factory.transaction.placeOrder.IStartParams;
-export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams };
+type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
+    object: factory.transaction.placeOrder.IStartParamsWithoutDetail['object'] & {
+        /**
+         * api経由で取引が開始されれば必ず存在するはず
+         */
+        clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
+    };
+    broker?: factory.order.IBroker;
+};
+declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
+export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

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

@@ -5,20 +5,22 @@ exports.createStartParams = createStartParams;
 const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
-function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType, memeberOfPayload) {
-    let clientUser;
+function createStartParams(params, expiresInSeconds, passport, seller, 
+// broker?: factory.order.IBroker,
+customerType) {
+    const { broker } = params;
+    // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
     if (typeof params.object.clientUser?.client_id === 'string') {
-        const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
-        clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
+        const { client_id } = params.object.clientUser;
+        // const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
+        // clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
         instrument = { id: client_id, typeOf: factory_1.factory.creativeWorkType.WebApplication };
     }
     const transactionObject = {
-        // discontinue passportToken(2024-07-05~)
-        // ...(typeof params.object.passport?.token === 'string') ? { passportToken: params.object.passport.token } : undefined,
-        ...(typeof passport?.scope === 'string') ? { passport } : undefined,
-        ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined,
-        ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined,
+        // ...(typeof passport?.scope === 'string') ? { passport } : undefined, // discontinue(2026-06-10~)
+        // ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined, // discontinue(2026-06-10~)
+        // ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined, // discontinue(2026-06-11~)
         ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined,
         ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
         ...(typeof customerType === 'string') ? { customerType } : undefined
@@ -36,7 +38,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
     ];
     const agent = {
         ...params.agent,
-        ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined,
+        // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined, // discontinue(2026-06-10~)
         identifier: agentIdentifier
     };
     return {

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

@@ -12,7 +12,7 @@ declare function validateStartRequest(params: {
     seller: {
         id: string;
     };
-    clientUser?: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'>;
+    clientUser?: factory.transaction.placeOrder.IClientUserBeforeStart;
     /**
      * passportによって決定するカスタマータイプ
      */
@@ -31,6 +31,5 @@ declare function validateStartRequest(params: {
 }) => Promise<{
     seller: ISeller;
     sellerMakesOffer: factory.seller.IMakesOffer;
-    memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload;
 }>;
 export { validateStartRequest };

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

@@ -104,8 +104,8 @@ function validateStartRequest(params) {
         if (iamMember === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.role.RoleType.OrganizationRole);
         }
-        // メンバーシップトークン検証(2024-01-31~)
-        let memeberOfPayload;
+        // // メンバーシップトークン検証(2024-01-31~)
+        // let memeberOfPayload: factory.transaction.placeOrder.IMemberOfPayload | undefined;
         // 適用メンバーシップについてはproject.makesOfferを参照(2025-01-13~)
         const validMemberProgramIdentifier = projectMakesOffer.validForMemberTier?.isTierOf.identifier;
         if (typeof validMemberProgramIdentifier === 'string') {
@@ -126,29 +126,18 @@ function validateStartRequest(params) {
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory_1.factory.errors.NotFound('issuer.tokenSecret');
             }
-            memeberOfPayload = await verifyMembershipToken({
+            // memeberOfPayload =
+            await verifyMembershipToken({
                 secret: issuer.tokenSecret,
                 // issuer: issuer.identifier,
                 issuer: issuer.url, // identifier -> url(2025-05-11~)
                 ...(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 {
             sellerMakesOffer,
             seller,
-            ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined
+            // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined
         };
     };
 }

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

@@ -5,7 +5,7 @@ import type { PassportRepo } from '../../../repo/passport';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { PlaceOrderFactory } from '../../../factory/transaction';
+import { IStartPlaceOrderParams } from './start/factory';
 interface IStartOperationRepos {
     issuer: IssuerRepo;
     member: MemberRepo;
@@ -16,12 +16,11 @@ interface IStartOperationRepos {
     placeOrder: PlaceOrderRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-type IStartParams = PlaceOrderFactory.IStartParams;
 interface IStartOptions {
     lockPassport: boolean;
 }
 /**
  * 取引開始
  */
-declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
-export { start };
+declare function start(params: IStartPlaceOrderParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
+export { start, IStartPlaceOrderParams };

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

@@ -10,7 +10,7 @@ const validateStartRequest_1 = require("./start/validateStartRequest");
 function start(params, options) {
     return async (repos) => {
         const { passport, customerType } = await repos.passport.validatePassportTokenIfExist(params);
-        const { memeberOfPayload, sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
+        const { sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
             project: { id: params.project.id },
             seller: { id: params.seller.id },
             ...(typeof passport?.scope === 'string') ? { customerType } : undefined,
@@ -22,7 +22,7 @@ function start(params, options) {
             throw new factory_1.factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, params.broker, customerType, memeberOfPayload);
+        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
         if (options.lockPassport && passport !== undefined) {

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -4,7 +4,6 @@ exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
 const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
-// import { Settings } from '../settings';
 // export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
 function fixCustomer(params) {
     return async (repos) => {

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

@@ -4,6 +4,6 @@
 import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
 import { confirm } from './placeOrder/confirm';
 import { exportTasksById } from './placeOrder/exportTasksById';
-import { start } from './placeOrder/start';
+import { start, IStartPlaceOrderParams } from './placeOrder/start';
 import { updateAgent } from './placeOrder/updateAgent';
-export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, exportTasksById, updateAgent };
+export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, IStartPlaceOrderParams, exportTasksById, updateAgent };

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTasks = createTasks;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../../factory");
-// import { Settings } from '../../../../settings';
 /**
  * 取引のタスクを作成する
  */

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

@@ -1,7 +1,7 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 export declare function createReturnPaymentMethodActions(params: {
-    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
+    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'object'>;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-// import { Settings } from '../../../../settings';
 async function createReturnInvoicePotentialActions(params, 
 // settings: Settings
 setting) {

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

@@ -2,7 +2,7 @@ import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
-    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
+    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{

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

@@ -1,6 +1,6 @@
 import { factory } from '../../../factory';
 import type { ISetting } from '../../../repo/setting';
-type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'identifier' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'project' | 'seller' | 'typeOf'>;
+type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'project' | 'seller' | 'typeOf'>;
 declare function createPotentialActions(params: {
     dateReturned: Date;
     orders: IReturningOrder4potentialActions[];

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 async function createPotentialActions(params, 

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

@@ -141,13 +141,10 @@ function fixOrders(params) {
         const eventIds = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.itemOffered.reservationFor.id');
-        // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
-        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
-        // });
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, { noName: true });
         return { acceptedOffers, eventIds, offerIds, orders };
     };
 }

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

@@ -108,7 +108,7 @@ function confirm(params) {
             orderNumbers: [transaction.object.order[0].orderNumber]
         }, {
             inclusion: [
-                'confirmationNumber', 'customer', 'identifier', 'orderDate', 'orderNumber', 'orderStatus',
+                'confirmationNumber', 'customer', 'orderDate', 'orderNumber', 'orderStatus',
                 'orderedItem', 'paymentMethods', 'price', 'priceCurrency', 'project', 'seller', 'typeOf'
             ]
         });

package/lib/chevre/service/validation/validateOrder.js

@@ -10,47 +10,6 @@ const factory_1 = require("../../factory");
 const factory_2 = require("../offer/event/authorize/factory");
 // import { acceptedOffers2amount as acceptedOffers2amount4product } from '../offer/product/factory';
 const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
-// const debug = createDebug('chevre-domain:service:validation');
-// type ICreatingCheckEventTask = Pick<
-//     factory.task.checkResource.IAttributes,
-//     'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'description'
-// > & {
-//     description: string;
-// };
-// function createCheckEventTasks(params: {
-//     order: Pick<factory.order.IOrder, 'orderNumber' | 'typeOf'>;
-//     project: { id: string };
-//     reservationForIds: string[];
-// }): ICreatingCheckEventTask[] {
-//     const { order, project, reservationForIds } = params;
-//     const runsAt = new Date();
-//     return reservationForIds.map((reservationForId) => {
-//         const object: factory.task.checkResource.IResourceAsEvent = { id: reservationForId, typeOf: factory.eventType.ScreeningEvent };
-//         const data: factory.task.checkResource.IData = {
-//             object,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             typeOf: factory.actionType.CheckAction
-//         };
-//         const description: string = util.format(
-//             '%s:%s:%s:%s',
-//             order.typeOf,
-//             order.orderNumber,
-//             factory.eventType.ScreeningEvent,
-//             reservationForId
-//         );
-//         return {
-//             description,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             name: factory.taskName.CheckResource,
-//             status: factory.taskStatus.Ready,
-//             runsAt,
-//             remainingNumberOfTries: 3,
-//             numberOfTried: 0,
-//             executionResults: [],
-//             data
-//         };
-//     });
-// }
 function validateOrder(params) {
     return async (repos) => {
         const order = await repos.order.projectFieldsByOrderNumber({
@@ -63,7 +22,7 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, { noName: true });
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
             payTransactions = await repos.assetTransaction.search({
@@ -101,14 +60,8 @@ function validateOrder(params) {
                     throw new Error(`invalid acceptedOffer.priceSpecification.priceComponent [${typeof priceSpecification.priceComponent}]`);
                 }
             }
-            // 旧メンバーシップ&ペイメントカードを例外として除外(互換性維持対応をしていないため)
-            if ((0, moment_1.default)(order.orderDate)
-                .isAfter((0, moment_1.default)('2023-09-30T15:00:00Z'))
-            // || typeOf !== factory.permit.PermitType.Permit
-            ) {
-                if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
-                    throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
-                }
+            if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
+                throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
             }
         });
         let reservationForIds = [];
@@ -176,21 +129,8 @@ function validateOrder(params) {
                 }
                 break;
             }
-            // case factory.permit.PermitType.Permit: {
-            //     numOrderedItemExpected = acceptedOffers.length;
-            //     const permitAcceptedOffers = acceptedOffers as factory.order.IAcceptedOffer<factory.order.IPermit>[];
-            //     priceExpected = acceptedOffers2amount4product({
-            //         acceptedOffers: permitAcceptedOffers
-            //     });
-            //     break;
-            // }
-            // case factory.actionType.MoneyTransfer:
-            //     break;
             default:
-                if ((0, moment_1.default)(order.orderDate)
-                    .isAfter((0, moment_1.default)('2024-02-01T15:00:00Z'))) {
-                    throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
-                }
+                throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
         }
         // orderedItem検証
         if (order.orderedItem.length !== numOrderedItemExpected) {
@@ -225,20 +165,5 @@ function validateOrder(params) {
                 throw new Error(`invalid ticketIdentifiers.length:${reservationReservedTicketIdentifiers.length} [expected:${acceptedOffers.length}]`);
             }
         }
-        // useMongoAsStockHolderProjectsの場合のイベント検証タスク作成を廃止(もう十分検証したので)(2025-07-11~)
-        // add check event task(2025-05-01~)
-        // const setting = <Pick<ISetting, 'useMongoAsStockHolderProjects'> | null>
-        //     await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useMongoAsStockHolderProjects']);
-        // const useMongoAsStockHolderProjects = setting?.useMongoAsStockHolderProjects;
-        // if (Array.isArray(useMongoAsStockHolderProjects) && useMongoAsStockHolderProjects.includes(params.project.id)) {
-        //     const creatingCheckResourceTask = createCheckEventTasks({
-        //         order: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
-        //         project: { id: params.project.id },
-        //         reservationForIds
-        //     });
-        //     if (creatingCheckResourceTask.length > 0) {
-        //         await repos.task.saveMany(creatingCheckResourceTask, { emitImmediately: true });
-        //     }
-        // }
     };
 }

package/lib/chevre/settings.d.ts

@@ -1,58 +1,3 @@
-interface ISurfrockSettings {
-    /**
-     * 着券時タイムアウト
-     */
-    timeout: number;
-    /**
-     * 認証時タイムアウト
-     */
-    timeoutCheck: number;
-    /**
-     * 決済と返金の最小間隔(ms)
-     */
-    minIntervalBetweenPayAndRefund: number;
-    /**
-     * surfrockクライアント認証情報保管期限
-     * 0の場合、保管しない
-     */
-    credentialsExpireInSeconds?: number;
-}
-interface IOptions {
-    abortedTasksWithoutReport: string[];
-    numTryConfirmReserveTransaction: number;
-    deliverOrderLimit: number;
-    coa: {
-        timeout: number;
-    };
-    gmo: {
-        timeout: number;
-        timeoutBackground: number;
-    };
-    movieticketReserve: ISurfrockSettings;
-    useExperimentalFeature: boolean;
-}
-/**
- * domain settings
- */
-declare class Settings {
-    readonly abortedTasksWithoutReport: string[];
-    readonly numTryConfirmReserveTransaction: number;
-    readonly deliverOrderLimit: number;
-    readonly coa: {
-        timeout: number;
-    };
-    readonly gmo: {
-        timeout: number;
-        timeoutBackground: number;
-    };
-    readonly movieticketReserve: ISurfrockSettings;
-    readonly useExperimentalFeature: boolean;
-    /**
-     * 通知設定
-     */
-    constructor(options: IOptions);
-}
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;
-export { Settings };