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

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

@@ -1,14 +1,9 @@
 import { factory } from '../../factory';
-export type IOrderURLGenerator = (order: factory.transaction.placeOrder.IOrderAsResult) => string;
-export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderParams & {
+export interface IResultOrderParams {
     /**
      * 注文日時
      */
     orderDate: Date;
-    /**
-     * 注文確認URLのカスタム指定
-     */
-    url?: string | IOrderURLGenerator;
     /**
      * オファー制約
      */
@@ -26,7 +21,7 @@ export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderPara
     orderedItem: {
         maxValue: number;
     };
-};
+}
 export type IConfirmParams = factory.transaction.placeOrder.IConfirmParams & {
     project: {
         id: string;

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

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+;

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

@@ -126,6 +126,9 @@ export declare class PlaceOrderRepo {
     confirmPlaceOrder(params: {
         typeOf: factory.transactionType.PlaceOrder;
         id: string;
+        object: {
+            orderDate: Date;
+        };
         result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
         potentialActions: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
     }): Promise<void>;

package/lib/chevre/repo/transaction/placeOrder.js

@@ -425,7 +425,7 @@ class PlaceOrderRepo {
         }, {
             status: factory_1.factory.transactionStatusType.Confirmed, // ステータス変更
             endDate,
-            // 'object.authorizeActions': params.authorizeActions,
+            'object.orderDate': params.object.orderDate, // add(2026-06-15~)
             result: params.result, // resultを更新
             potentialActions: params.potentialActions // resultを更新
         }, {

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

@@ -68,10 +68,29 @@ 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 });
     // discontinue(2026-06-11~)
     // const name: string | undefined =
@@ -92,21 +111,17 @@ function createPlacingOrder(params) {
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,
     });
-    const confirmationNumber = transaction.object.confirmationNumber;
-    if (typeof confirmationNumber !== 'string') {
-        // 事前に発行済なはずなので、ありえないフロー
-        throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
-    }
     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~
         priceCurrency: factory_1.factory.priceCurrency.JPY, // 取引保管を廃止するためにここで指定(2026-06-14~)
-        orderDate: (0, moment_1.default)(orderByTransaction.orderDate)
+        orderDate: (0, moment_1.default)(orderDateByTransaction)
             .toDate(),
         orderedItem, // 2024-06-18~
         // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)

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

@@ -133,19 +133,21 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory_1.factory.errors.ArgumentNull('object.id');
         }
+        let deletingOrderNumberByTask;
         let transaction;
         if (params.object.typeOf === factory_1.factory.transactionType.PlaceOrder) {
             transaction = (await repos.placeOrder.findPlaceOrderTransactions({
                 ids: [deletingTransactionId],
                 typeOf: params.object.typeOf,
-                inclusion: ['typeOf', 'project', 'status', 'result']
+                inclusion: ['typeOf', 'project', 'status']
             })).shift();
+            deletingOrderNumberByTask = params.object.object.orderNumber;
         }
         else if (params.object.typeOf === factory_1.factory.transactionType.ReturnOrder) {
             transaction = (await repos.returnOrder.findReturnOrderTransactions({
                 ids: [deletingTransactionId],
                 typeOf: params.object.typeOf,
-                inclusion: ['typeOf', 'project', 'status', 'result']
+                inclusion: ['typeOf', 'project', 'status']
             })).shift();
         }
         else {
@@ -189,10 +191,16 @@ function deleteTransactionById(params) {
                         case factory_1.factory.transactionStatusType.Expired:
                             break;
                         case factory_1.factory.transactionStatusType.Confirmed: {
-                            const deletingOrder = transaction.result?.order;
-                            if (typeof deletingOrder?.orderNumber === 'string') {
+                            // 削除対象の注文番号についてはタスクを参照する(2026-06-15~)
+                            // const deletingOrder = transaction.result?.order;
+                            // if (typeof deletingOrder?.orderNumber === 'string') {
+                            //     await deleteOrder({
+                            //         object: deletingOrder
+                            //     })(repos);
+                            // }
+                            if (typeof deletingOrderNumberByTask === 'string') {
                                 await (0, deleteOrder_1.deleteOrder)({
-                                    object: deletingOrder
+                                    object: { orderNumber: deletingOrderNumberByTask }
                                 })(repos);
                             }
                             break;
@@ -200,8 +208,6 @@ function deleteTransactionById(params) {
                         default:
                             throw new factory_1.factory.errors.NotImplemented(`${transaction.status} not implemented`);
                     }
-                    // eslint-disable-next-line no-warning-comments
-                    // TODO サービス登録取引を削除
                     // 決済取引を削除
                     const deletePayTransactionsByPlaceOrderResult = await deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
                     deletePayTransactionResult = deletePayTransactionsByPlaceOrderResult.deletePayTransactionResult;

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

@@ -6,7 +6,6 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
  * 取引が確定可能な状態かどうかをチェックする
  */
 export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
-export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証
  */

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

@@ -43,10 +43,14 @@ interface IConfirmOptions {
      * 注文における最大CreditCardIF決済方法数
      */
     maxNumCreditCardPaymentMethod: number;
+    /**
+     * 取引ドキュメントのresult.orderを保管しないオプション(2026-06-15~)
+     */
+    disableResultOrder: boolean;
 }
 type IConfirmParams = PlaceOrderFactory.IConfirmParams;
 interface IConfirmResult {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
     customer: factory.order.ICustomer;
     code?: string;
     /**

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

@@ -29,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
             };
         }
@@ -165,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
             });
@@ -177,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,
@@ -345,7 +356,6 @@ function createResult(params, options) {
     const authorizeActions = [
         ...params.authorizePaymentActions.map(({ id }) => ({ id })),
         ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
-        // ...params.authorizeProductOfferActions.map(({ id }) => ({ id }))
     ];
     let eventId;
     let reservationIds;
@@ -359,13 +369,10 @@ function createResult(params, options) {
         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

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.2.0",
+    "@chevre/factory": "9.0.0-alpha.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.60"
+  "version": "24.1.0-alpha.61"
 }