@chevre/domain 24.1.0-alpha.56 → 24.1.0-alpha.57

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -16,7 +16,10 @@ type IAcceptedOffer = factory.order.IAcceptedOffer & {
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
  */
-export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'identifier' | 'isGift' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'url'> & {
+export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'isGift' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {
+    url?: never;
+    identifier?: never;
+    name?: never;
     /**
      * 上書きしてはいけない
      */

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)
@@ -78,32 +73,24 @@ function createPlacingOrder(params) {
         throw new factory_1.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,
@@ -113,7 +100,7 @@ function createPlacingOrder(params) {
         orderDate: (0, moment_1.default)(orderByTransaction.orderDate)
             .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.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/transaction/placeOrder/confirm/factory/result.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrderAsResult = createOrderAsResult;
 const factory_1 = require("../../../../../factory");
-// import { acceptedOffers2orderedItem } from './result/orderedItem';
 /**
  * 注文取引結果としての注文を生成する
  */
@@ -12,20 +11,11 @@ function createOrderAsResult(params) {
         typeOf: factory_1.factory.order.OrderType.Order,
         price,
         priceCurrency: factory_1.factory.priceCurrency.JPY,
-        // discounts: discounts, // 廃止(2024-04-16~)
         confirmationNumber: '',
         orderNumber,
-        url: '',
+        // url: '', // discontinue(2026-06-11~)
         orderStatus,
         orderDate,
-        identifier: []
-        // orderedItem: params.orderedItem, // discontinue(2024-06-20~)
-        // paymentMethods: params.paymentMethods, // discontinue(2024-06-20~)
-        // customer, // discontinue(2024-06-20~)
-        // project: params.transaction.project, // discontinue(2024-06-20~)
-        // seller, // discontinue(2024-06-20~)
-        // isGift: params.isGift, // discontinue(2024-06-20~)
-        // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2024-06-20~)
-        // ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // discontinue(2024-06-20~)
+        // identifier: [] // discontinue(2026-06-11~)
     };
 }

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

@@ -335,14 +335,17 @@ function createResult(params, options) {
     });
     (0, validation_1.validatePaymentMethods)({ order: { paymentMethods } }, options);
     // 確認番号を発行
-    const { confirmationNumber, identifier, url } = createConfirmationNumber({
+    const { confirmationNumber,
+    // identifier,
+    // url
+     } = createConfirmationNumber({
         order: orderAsResult,
         transaction: transaction,
         result: params.result
     });
     orderAsResult.confirmationNumber = confirmationNumber;
-    orderAsResult.identifier = identifier;
-    orderAsResult.url = url;
+    // orderAsResult.identifier = identifier; // discontinue(2026-06-11~)
+    // orderAsResult.url = url; // discontinue(2026-06-11~)
     const authorizeActions = [
         ...params.authorizePaymentActions.map(({ id }) => ({ id })),
         ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
@@ -443,26 +446,29 @@ function searchAuthorizeActions(params) {
 }
 function createConfirmationNumber(params) {
     const confirmationNumber = params.transaction.object.confirmationNumber;
-    let url = '';
+    // 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 };
+    // // 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

@@ -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-alpha.9",
+    "@chevre/factory": "8.2.0-alpha.10",
     "@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.56"
+  "version": "24.1.0-alpha.57"
 }