@chevre/domain 24.1.0-alpha.23 → 24.1.0-alpha.25

package/lib/chevre/repo/orderInTransaction.js

@@ -1,15 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderInTransactionRepo = void 0;
-const debug_1 = __importDefault(require("debug"));
-const util_1 = require("util");
+// import { isDeepStrictEqual } from 'util';
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const assetTransaction_1 = require("./mongoose/schemas/assetTransaction");
-const debug = (0, debug_1.default)('chevre-domain:repo:orderInTransaction');
+// const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
  * 取引中注文リポジトリ
  */
@@ -75,15 +71,21 @@ class OrderInTransactionRepo {
         }
         return doc.acceptedOffers.map((acceptedOffer) => {
             const priceBySubReservation = subReservations.find((subReservation) => subReservation.id === acceptedOffer.itemOffered.id)?.price;
-            const priceSpecMatched = (0, util_1.isDeepStrictEqual)(acceptedOffer.priceSpecification, priceBySubReservation);
-            debug('findAcceptedOffersWithPriceByOrderNumber: priceSpecMatched?', priceSpecMatched, acceptedOffer.itemOffered.id, params.orderNumber, params.project.id);
-            if (!priceSpecMatched) {
-                console.error('findAcceptedOffersWithPriceByOrderNumber: priceSpecMatched: false!!!', acceptedOffer.itemOffered.id, params.orderNumber, params.project.id);
+            // 予約の価格は必ず存在するはず
+            if (priceBySubReservation === undefined) {
+                console.error('findAcceptedOffersWithPriceByOrderNumber: priceBySubReservation: undefined!!!', acceptedOffer.itemOffered.id);
             }
+            // const priceSpecMatched = isDeepStrictEqual(acceptedOffer.priceSpecification, priceBySubReservation);
+            // debug('findAcceptedOffersWithPriceByOrderNumber: priceSpecMatched?', priceSpecMatched, acceptedOffer.itemOffered.id, params.orderNumber, params.project.id);
+            // if (!priceSpecMatched) {
+            //     console.error('findAcceptedOffersWithPriceByOrderNumber: priceSpecMatched: false!!!', acceptedOffer.itemOffered.id, params.orderNumber, params.project.id);
+            // }
+            // const overwritePriceSpec = priceSpecMatched || acceptedOffer.priceSpecification === undefined;
             return {
                 ...acceptedOffer,
-                // 予約取引内の価格仕様と一致した場合のみ上書きしてみる
-                ...((priceSpecMatched && priceBySubReservation !== undefined) && { priceSpecification: priceBySubReservation })
+                // // 予約取引内の価格仕様と一致した場合のみ上書きしてみる
+                // ...((overwritePriceSpec && priceBySubReservation !== undefined) && { priceSpecification: priceBySubReservation })
+                ...((priceBySubReservation !== undefined) && { priceSpecification: priceBySubReservation })
             };
         });
     }

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -10,11 +10,6 @@ exports.createReserveTransactionStartParams = createReserveTransactionStartParam
 exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../../factory");
-/**
- * 実験的に導入
- * 2026-005-18~
- */
-const USE_ACCEPTED_OFFER_NO_PRICE_SPEC = process.env.USE_ACCEPTED_OFFER_NO_PRICE_SPEC === '1';
 function createReserveTransactionStartParams(params) {
     const { transaction, transactionNumber } = params;
     const { seller } = transaction;
@@ -290,16 +285,12 @@ function responseBody2acceptedOffers4result(params) {
                 name: itemOffered.reservedTicket.ticketType.name,
                 itemOffered: reservation,
                 offeredThrough: { typeOf: 'WebAPI', identifier: factory_1.factory.service.webAPI.Identifier.Chevre },
-                ...(USE_ACCEPTED_OFFER_NO_PRICE_SPEC)
-                    ? {}
-                    : {
-                        priceSpecification: {
-                            priceComponent: priceComponent,
-                            priceCurrency: priceSpecification.priceCurrency,
-                            typeOf: priceSpecification.typeOf,
-                            valueAddedTaxIncluded: priceSpecification.valueAddedTaxIncluded
-                        }
-                    },
+                priceSpecification: {
+                    priceComponent: priceComponent,
+                    priceCurrency: priceSpecification.priceCurrency,
+                    typeOf: priceSpecification.typeOf,
+                    valueAddedTaxIncluded: priceSpecification.valueAddedTaxIncluded
+                },
                 serialNumber: params.transactionNumber
             };
             return resultAcceptedOffer;

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -67,6 +67,12 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
+    /**
+     * 価格仕様なしのacceptedOfferを採用するかどうか
+     * 実験的に導入
+     * 2026-005-19~
+     */
+    useAcceptedOfferNoPriceSpec?: boolean;
 }
 /**
  * 興行オファー承認

package/lib/chevre/service/offer/event/authorize.js

@@ -58,13 +58,21 @@ function authorize(params, options) {
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
             // add orderInTransaction(2024-01-15~)
             if (!noOfferSpecified) {
-                // if (params.options.useCreateOrderOnOfferAccepted) {
+                const useAcceptedOfferNoPriceSpec = options.useAcceptedOfferNoPriceSpec === true;
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
-                    acceptedOffers: acceptedOffers4result
+                    acceptedOffers: acceptedOffers4result.map((acceptOffer4result) => {
+                        // support useAcceptedOfferNoPriceSpec(2026-05-19~)
+                        if (useAcceptedOfferNoPriceSpec) {
+                            const { priceSpecification: _priceSpecification, ...acceptOfferNoPriceSpec } = acceptOffer4result;
+                            return acceptOfferNoPriceSpec;
+                        }
+                        else {
+                            return acceptOffer4result;
+                        }
+                    })
                 })(repos);
-                // }
             }
         }
         catch (error) {

package/package.json

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