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

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

@@ -13,7 +13,7 @@ import { factory } from '../../factory';
  * 冪等性を確保すること
  */
 declare function deleteOrder(params: {
-    object: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
+    object: Pick<factory.order.IOrder, 'orderNumber'>;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;

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/factory.js

@@ -92,11 +92,20 @@ 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,
+        confirmationNumber,
+        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)
             .toDate(),
         orderedItem, // 2024-06-18~

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

@@ -10,6 +10,7 @@ import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
 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/transaction/placeOrder/confirm/factory/result.d.ts

@@ -5,7 +5,6 @@ import { factory } from '../../../../../factory';
 declare function createOrderAsResult(params: {
     orderNumber: string;
     orderDate: Date;
-    orderStatus: factory.orderStatus;
     price: number;
 }): factory.transaction.placeOrder.IOrderAsResult;
 export { createOrderAsResult };

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

@@ -6,16 +6,16 @@ const factory_1 = require("../../../../../factory");
  * 注文取引結果としての注文を生成する
  */
 function createOrderAsResult(params) {
-    const { orderDate, orderNumber, orderStatus, price } = params;
+    const { orderDate, orderNumber, price } = params;
     return {
+        confirmationNumber: '',
+        orderNumber,
+        orderDate,
         typeOf: factory_1.factory.order.OrderType.Order,
         price,
         priceCurrency: factory_1.factory.priceCurrency.JPY,
-        confirmationNumber: '',
-        orderNumber,
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue // 注文作成時のステータスとなる
         // url: '', // discontinue(2026-06-11~)
-        orderStatus,
-        orderDate,
         // identifier: [] // discontinue(2026-06-11~)
     };
 }

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

@@ -1,7 +1,13 @@
 import { factory } from '../../../../../factory';
 import type { ISetting } from '../../../../../repo/setting';
 export declare function createSendEmailMessageActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: factory.transaction.placeOrder.IOrderAsResult & {
+        confirmationNumber: string;
+        orderStatus: factory.orderStatus;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.order.OrderType;
+    };
     customer: factory.order.ICustomer;
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];

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

@@ -4,7 +4,13 @@ import type { ISetting } from '../../../../repo/setting';
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: factory.transaction.placeOrder.IOrderAsResult & {
+        confirmationNumber: string;
+        orderStatus: factory.orderStatus.OrderPaymentDue;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.order.OrderType;
+    };
     customer: factory.order.ICustomer;
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];

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

@@ -36,7 +36,9 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'price'>;
+    order: {
+        price: number;
+    };
     paymentMethods: factory.order.IReferencedInvoice[];
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'instrument' | 'object' | 'result'>[];
 }): void;

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

@@ -118,7 +118,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,
@@ -144,7 +144,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,
@@ -305,18 +305,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 },
@@ -335,17 +324,24 @@ 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; // 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 })),
@@ -361,6 +357,7 @@ function createResult(params, options) {
     }
     return {
         paymentMethods,
+        placingOrder,
         result: {
             order: orderAsResult,
             authorizeActions, // 追加(2024-01-17~)
@@ -446,29 +443,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 as IOrderURLGenerator)(params.order);
-    // }
-    // // 識別子の指定があれば上書き
-    // const identifier: factory.order.IIdentifier = [
-    //     ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
-    //     // 取引に指定があれば追加
-    //     ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
-    // ];
     return {
         confirmationNumber,
-        // url,
-        // identifier
     };
 }

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.59"
+  "version": "24.1.0-alpha.60"
 }