@chevre/domain 21.25.0-alpha.8 → 21.25.0

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

@@ -17,11 +17,12 @@ const processStartReserve4chevre_1 = require("./processStartReserve4chevre");
 const searchEventTicketOffers_1 = require("./searchEventTicketOffers");
 const factory_1 = require("./factory");
 /**
- * イベントオファー承認
+ * 興行オファー承認
  */
 function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const noOfferSpecified = params.noOfferSpecified === true;
         const { transaction, event, bookingServiceIdentifire } = yield validateCreateRequest(params)({ event: repos.event, transaction: repos.transaction });
         const { acceptedOffers, ticketOffers, unitPriceOffers } = yield validateAcceptedOffers({
@@ -41,33 +42,22 @@ function authorize(params) {
             event: event,
             transaction: transaction,
             pendingTransaction: { typeOf: factory.assetTransactionType.Reserve, transactionNumber },
-            broker: params.object.broker
+            broker: params.object.broker,
+            useResultAcceptedOffers: params.options.useResultAcceptedOffers
         });
         const action = yield repos.action.start(actionAttributes);
         try {
             switch (bookingServiceIdentifire) {
                 // 実質使用する予定なしなので廃止(2022-05-12~)
                 // case factory.service.webAPI.Identifier.COA:
-                //     const processStartReserve4coaResult = await processStartReserve4coa({ event, object: params.object });
-                //     requestBody = processStartReserve4coaResult.requestBody;
-                //     responseBody = processStartReserve4coaResult.responseBody;
                 //     break;
                 case factory.service.webAPI.Identifier.Chevre:
-                    const processStartReserveResult = yield (0, processStartReserve4chevre_1.processStartReserve4chevre)({
-                        action,
-                        event,
+                    const processStartReserveResult = yield (0, processStartReserve4chevre_1.processStartReserve4chevre)(Object.assign({ 
+                        // action,
+                        acceptedOffer: acceptedOffers, event,
                         transactionNumber,
-                        transaction,
-                        availableAtOrFrom: { id: params.store.id },
-                        ticketOffers,
-                        unitPriceOffers,
-                        validateEvent: params.validateEvent === true,
-                        validateEventOfferPeriod: params.validateEventOfferPeriod === true,
-                        // 完全廃止(2023-07-19~)
-                        // disablePendingReservations: params.disablePendingReservations,
-                        useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber,
-                        stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
-                    })(repos);
+                        transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers,
+                        unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined))(repos);
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
                     // add orderInTransaction(2024-01-15~)
                     if (!noOfferSpecified) {
@@ -105,7 +95,7 @@ function authorize(params) {
         const result = Object.assign({ priceCurrency: acceptedOffers[0].priceCurrency, amount: [], requestBody: {}, responseBody: {} }, (!noOfferSpecified) // オファー指定の場合のみ金額計算(2023-11-27~)
             ? {
                 price: (0, factory_1.acceptedOffers2amount)({ acceptedOffers: acceptedOffers4result }),
-                acceptedOffers: acceptedOffers4result
+                acceptedOffers: (params.options.useResultAcceptedOffers === true) ? acceptedOffers4result : []
             }
             : undefined);
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });

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

@@ -18,7 +18,7 @@ interface ICancelRepos {
     transaction: TransactionRepo;
 }
 /**
- * イベントオファー承認取消(apiから実行)
+ * 興行オファー承認取消(apiから実行)
  * 特定の承認アクションについて処理する
  */
 export declare function cancel(params: {

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

@@ -14,7 +14,7 @@ const factory = require("../../../factory");
 const ReserveTransactionService = require("../../assetTransaction/reserve");
 const any_1 = require("../any");
 /**
- * イベントオファー承認取消(apiから実行)
+ * 興行オファー承認取消(apiから実行)
  * 特定の承認アクションについて処理する
  */
 function cancel(params) {

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

@@ -1,15 +1,15 @@
 import * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
-export type IReservationFor = factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
-export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
-export type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail4chevre;
-export type IObjectWithDetail = factory.action.authorize.offer.eventService.IObject<factory.service.webAPI.Identifier.Chevre>;
 export declare function createReserveTransactionStartParams(params: {
     project: {
         id: string;
     };
-    object: IObjectWithDetail;
+    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.Chevre>[];
+    event: {
+        id: string;
+    };
+    broker?: factory.reservation.IBroker<factory.reservationType>;
     transaction: factory.transaction.ITransaction<factory.transactionType>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
@@ -19,6 +19,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     pendingTransaction: factory.action.authorize.offer.eventService.IChevrePendingTransaction;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
+    useResultAcceptedOffers: boolean;
 }): factory.action.authorize.offer.eventService.IAttributes<factory.service.webAPI.Identifier.Chevre>;
 export declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];

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

@@ -5,11 +5,10 @@ const COA = require("@motionpicture/coa-service");
 const moment = require("moment");
 const util_1 = require("util");
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 function createReserveTransactionStartParams(params) {
-    var _a, _b;
-    const acceptedTicketOffersWithoutDetail = (Array.isArray(params.object.acceptedOffer))
-        ? params.object.acceptedOffer.map((o) => {
+    var _a;
+    const acceptedTicketOffersWithoutDetail = (Array.isArray(params.acceptedOffer))
+        ? params.acceptedOffer.map((o) => {
             var _a, _b, _c, _d, _e;
             const issuedBy = {
                 typeOf: params.transaction.seller.typeOf,
@@ -24,9 +23,6 @@ function createReserveTransactionStartParams(params) {
             }
             else if (typeof ((_b = o.priceSpecification.appliesToMovieTicket) === null || _b === void 0 ? void 0 : _b.identifier) === 'string') {
                 appliesToMovieTicket = { identifier: o.priceSpecification.appliesToMovieTicket.identifier };
-                // movieTicketIdentifire参照は廃止(2022-09-09~)
-                // } else if (typeof o.movieTicketIdentifire === 'string') {
-                // appliesToMovieTicket = { identifier: o.movieTicketIdentifire };
             }
             return Object.assign(Object.assign({ 
                 // 必要な属性のみ指定する
@@ -42,22 +38,22 @@ function createReserveTransactionStartParams(params) {
         typeOf: factory.assetTransactionType.Reserve,
         transactionNumber: params.transactionNumber,
         agent: {
-            // Sellerに変更(2022-05-30~)
             typeOf: params.transaction.seller.typeOf,
-            id: String(params.transaction.seller.id),
+            id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
-                : String((_a = params.transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja),
-            identifier: [
-                { name: 'transaction', value: params.transaction.id },
-                {
-                    name: 'transactionExpires',
-                    value: moment(params.transaction.expires)
-                        .toISOString()
-                }
-            ]
+                : String((_a = params.transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+            // identifierを廃止(2024-03-05~)
+            // identifier: [
+            //     { name: 'transaction', value: params.transaction.id },
+            //     {
+            //         name: 'transactionExpires',
+            //         value: moment(params.transaction.expires)
+            //             .toISOString()
+            //     }
+            // ]
         },
-        object: Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: { id: String((_b = params.object.event) === null || _b === void 0 ? void 0 : _b.id) } }, (params.object.broker !== undefined) ? { broker: params.object.broker } : undefined),
+        object: Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: { id: params.event.id } }, (params.broker !== undefined) ? { broker: params.broker } : undefined),
         expires: moment(params.transaction.expires)
             .add(1, 'month')
             .toDate() // 余裕を持って
@@ -95,7 +91,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        object: Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent, acceptedOffer: acceptedOffers, pendingTransaction: params.pendingTransaction }, (params.broker !== undefined) ? { broker: params.broker } : undefined),
+        object: Object.assign(Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent, acceptedOffer: acceptedOffers, pendingTransaction: params.pendingTransaction }, (params.broker !== undefined) ? { broker: params.broker } : undefined), { useResultAcceptedOffers: params.useResultAcceptedOffers }),
         agent: {
             id: transaction.seller.id,
             typeOf: transaction.seller.typeOf,
@@ -109,7 +105,8 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         },
         purpose: { typeOf: transaction.typeOf, id: transaction.id },
         instrument: {
-            typeOf: 'WebAPI',
+            // typeOf: 'WebAPI',
+            typeOf: factory.assetTransactionType.Reserve,
             identifier: factory.service.webAPI.Identifier.Chevre,
             transactionNumber: params.pendingTransaction.transactionNumber
         }
@@ -172,7 +169,6 @@ function responseBody2acceptedOffers4result(params) {
                             : undefined), (typeof ((_a = accounting.operatingRevenue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                             ? {
                                 operatingRevenue: {
-                                    // project: accounting.operatingRevenue.project, // 削除(2023-12-13~)
                                     typeOf: accounting.operatingRevenue.typeOf,
                                     codeValue: accounting.operatingRevenue.codeValue
                                 }
@@ -238,16 +234,12 @@ function createReservation(params) {
             startDate: moment(event.startDate)
                 .toDate(),
             // 最適化(2022-05-31~)
-            superEvent: Object.assign(Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined), (settings_1.USE_KANA_NAME_IN_ACCEPTED_OFFER) ? { kanaName: event.superEvent.kanaName } : undefined // オプション化
-            )
+            superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
         };
         if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
         }
-        reservationItem = Object.assign({ 
-            // 不要なので廃止(2023-07-01~)
-            // project: itemOffered.project,
-            typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        reservationItem = Object.assign({ typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
@@ -275,10 +267,7 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
         }
-        reservationItem = Object.assign({ 
-            // 不要なので廃止(2023-07-01~)
-            // project: itemOffered.project,
-            typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        reservationItem = Object.assign({ typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
@@ -304,7 +293,6 @@ function coaTicket2offer(params) {
     const eligibleMembershipType = (params.ticketResult.flgMember === COA.factory.master.FlgMember.Member
         && typeof ((_b = params.defaultMembershipType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
         ? [{
-                // project: params.defaultMembershipType.project,
                 typeOf: params.defaultMembershipType.typeOf,
                 id: params.defaultMembershipType.id,
                 codeValue: params.defaultMembershipType.codeValue,
@@ -329,9 +317,7 @@ function coaTicket2offer(params) {
             ? params.ticketResult.ticketNameEng
             : ''
     };
-    return Object.assign(Object.assign(Object.assign({ 
-        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
-        typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
+    return Object.assign(Object.assign(Object.assign({ typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
         // id: '',
         identifier: identifier, name: offerName, description: {
             ja: '',

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

@@ -15,10 +15,10 @@ import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLi
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
-type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 declare function processStartReserve4chevre(params: {
-    action: IAuthorizeOfferAction;
+    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.Chevre>[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+    broker?: factory.reservation.IBroker<factory.reservationType>;
     transactionNumber?: string;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     availableAtOrFrom: {
@@ -48,6 +48,6 @@ declare function processStartReserve4chevre(params: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
-    acceptedOffers4result: import("@chevre/factory/lib/action/authorize/offer/eventService").IResultAcceptedOffer[];
+    acceptedOffers4result: factory.action.authorize.offer.eventService.IResultAcceptedOffer[];
 }>;
 export { processStartReserve4chevre };

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

@@ -16,11 +16,10 @@ const CodeService = require("../../code");
 const factory_1 = require("./factory");
 function processStartReserve4chevre(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const action = params.action;
+        // const action = params.action;
         const event = params.event;
         const transactionNumber = params.transactionNumber;
         const transaction = params.transaction;
-        // let requestBody: factory.assetTransaction.reserve.IStartParamsWithoutDetail;
         let responseBody;
         let acceptedOffers4result = [];
         if (typeof transactionNumber !== 'string') {
@@ -28,19 +27,13 @@ function processStartReserve4chevre(params) {
             throw new factory.errors.ServiceUnavailable('Unexpected error occurred: reserve transactionNumber not found');
         }
         // 予約取引開始
-        const startParams = (0, factory_1.createReserveTransactionStartParams)({
-            project: transaction.project,
-            object: action.object,
-            transaction,
-            transactionNumber
-        });
-        // requestBody = startParams;
+        const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
+            // object: <IObjectWithDetail>action.object,
+            acceptedOffer: params.acceptedOffer, event: { id: event.id }, transaction,
+            transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, 
-            // 完全廃止(2023-07-19~)
-            // disablePendingReservations: params.disablePendingReservations,
-            useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
         responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({

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

@@ -19,7 +19,7 @@ interface IVoidTransactionRepos {
     transaction: TransactionRepo;
 }
 /**
- * イベントオファー承認取消(タスクから実行)
+ * 興行オファー承認取消(タスクから実行)
  * 取引中の承認アクション全てについて処理する
  */
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction>): (repos: IVoidTransactionRepos) => Promise<void>;

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

@@ -23,7 +23,7 @@ const coaAuthClient = new COA.auth.RefreshToken({
 });
 exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
- * イベントオファー承認取消(タスクから実行)
+ * 興行オファー承認取消(タスクから実行)
  * 取引中の承認アクション全てについて処理する
  */
 function voidTransaction(params) {

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

@@ -50,5 +50,6 @@ export declare function authorize(params: {
     };
     options: {
         useCreateOrderOnOfferAccepted: boolean;
+        useResultAcceptedOffers: boolean;
     };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

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

@@ -79,7 +79,8 @@ function authorize(params) {
                 acceptedOffers: [],
                 event: { id: params.object.event.id, typeOf: factory.eventType.ScreeningEvent },
                 transaction,
-                pendingTransaction
+                pendingTransaction,
+                useResultAcceptedOffers: params.options.useResultAcceptedOffers
             });
             const failedAction = yield repos.action.start(failedActionAttributes);
             yield repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
@@ -91,7 +92,8 @@ function authorize(params) {
             acceptedOffers,
             event: screeningEvent,
             transaction,
-            pendingTransaction
+            pendingTransaction,
+            useResultAcceptedOffers: params.options.useResultAcceptedOffers
         });
         const action = yield repos.action.start(actionAttributes);
         try {
@@ -99,7 +101,8 @@ function authorize(params) {
             const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
             const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
                 responseBody: params.result.responseBody,
-                object: action.object,
+                // object: action.object,
+                acceptedOffer: acceptedOffers,
                 event: screeningEvent,
                 seller: transaction.seller,
                 bookingTime: moment(action.startDate)
@@ -112,7 +115,7 @@ function authorize(params) {
                 amount: eligibleMonetaryAmount,
                 requestBody: params.result.requestBody,
                 responseBody: params.result.responseBody,
-                acceptedOffers: acceptedOffers4result
+                acceptedOffers: (params.options.useResultAcceptedOffers === true) ? acceptedOffers4result : []
             };
             // add orderInTransaction(2024-01-15~)
             if (params.options.useCreateOrderOnOfferAccepted) {

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.d.ts

@@ -21,5 +21,6 @@ export declare function changeOffers(params: {
     };
     options: {
         useCreateOrderOnOfferAccepted: boolean;
+        useResultAcceptedOffers: boolean;
     };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -84,14 +84,15 @@ function changeOffers(params) {
         const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
         const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             responseBody: updTmpReserveSeatResult,
-            object: authorizeAction.object,
+            // object: authorizeAction.object,
+            acceptedOffer: acceptedOffers,
             event: screeningEvent,
             seller: transaction.seller,
             bookingTime: moment(authorizeAction.startDate)
                 .toDate(),
             totalPrice: price
         });
-        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, amount: eligibleMonetaryAmount, acceptedOffers: acceptedOffers4result });
+        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, amount: eligibleMonetaryAmount, acceptedOffers: (params.options.useResultAcceptedOffers === true) ? acceptedOffers4result : [] });
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
         yield repos.action.reStart({ id: authorizeAction.id });
         try {

package/lib/chevre/service/offer/eventServiceByCOA/factory.d.ts

@@ -7,6 +7,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
+    useResultAcceptedOffers: boolean;
 }): factory.action.authorize.offer.eventService.IAttributes<WebAPIIdentifier.COA>;
 /**
  * 供給情報から承認アクションの価格を導き出す
@@ -21,7 +22,7 @@ type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultA
  */
 export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.action.authorize.offer.eventService.IResponseBody<factory.service.webAPI.Identifier.COA>;
-    object: factory.action.authorize.offer.eventService.IObject<factory.service.webAPI.Identifier.COA>;
+    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;

package/lib/chevre/service/offer/eventServiceByCOA/factory.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.responseBody2acceptedOffers4result = exports.offers2resultPrice = exports.createAuthorizeSeatReservationActionAttributes = exports.WebAPIIdentifier = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 function createAuthorizeSeatReservationActionAttributes(params) {
     var _a;
@@ -24,7 +23,8 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
         acceptedOffer: params.acceptedOffers,
         event: authorizeObjectEvent,
-        pendingTransaction: params.pendingTransaction
+        pendingTransaction: params.pendingTransaction,
+        useResultAcceptedOffers: params.useResultAcceptedOffers
     };
     return {
         project: transaction.project,
@@ -43,7 +43,8 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         },
         purpose: { typeOf: transaction.typeOf, id: transaction.id },
         instrument: {
-            typeOf: 'WebAPI',
+            // typeOf: 'WebAPI',
+            typeOf: 'COAReserveTransaction',
             identifier: factory.service.webAPI.Identifier.COA,
             transactionNumber: params.pendingTransaction.transactionNumber
         }
@@ -77,7 +78,7 @@ function responseBody2acceptedOffers4result(params) {
     // tslint:disable-next-line:max-func-body-length
     acceptedOffers4result.push(...params.responseBody.listTmpReserve.map((tmpReserve, index) => {
         var _a, _b, _c, _d;
-        const requestedOffer = params.object.acceptedOffer.find((o) => {
+        const requestedOffer = params.acceptedOffer.find((o) => {
             var _a, _b, _c, _d;
             return ((_d = (_c = (_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber) === tmpReserve.seatNum
                 && o.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatSection === tmpReserve.seatSection;
@@ -117,8 +118,19 @@ function responseBody2acceptedOffers4result(params) {
                 branchCode: event.location.branchCode,
                 name: event.location.name
             }, name: event.name, startDate: moment(event.startDate)
-                .toDate(), superEvent: Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, identifier: event.superEvent.identifier, name: event.superEvent.name, alternativeHeadline: event.superEvent.alternativeHeadline, location: event.superEvent.location, videoFormat: event.superEvent.videoFormat, soundFormat: event.superEvent.soundFormat, workPerformed: workPerformed, duration: event.superEvent.duration, coaInfo: event.superEvent.coaInfo }, (settings_1.USE_KANA_NAME_IN_ACCEPTED_OFFER) ? { kanaName: event.superEvent.kanaName } : undefined // オプション化
-            ), id: event.id });
+                .toDate(), superEvent: {
+                typeOf: event.superEvent.typeOf,
+                id: event.superEvent.id,
+                identifier: event.superEvent.identifier,
+                name: event.superEvent.name,
+                alternativeHeadline: event.superEvent.alternativeHeadline,
+                location: event.superEvent.location,
+                videoFormat: event.superEvent.videoFormat,
+                soundFormat: event.superEvent.soundFormat,
+                workPerformed: workPerformed,
+                duration: event.superEvent.duration,
+                coaInfo: event.superEvent.coaInfo
+            }, id: event.id });
         const reservedTicket = {
             typeOf: 'Ticket',
             coaTicketInfo: requestedOffer.ticketInfo,
@@ -160,10 +172,7 @@ function responseBody2acceptedOffers4result(params) {
                 }
             }
         };
-        const reservation = Object.assign(Object.assign(Object.assign({ 
-            // 不要なので廃止(2023-07-01~)
-            // project: { typeOf: event.project.typeOf, id: event.project.id },
-            typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
+        const reservation = Object.assign(Object.assign(Object.assign({ typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
             // numSeats: 1, // 廃止(2022-08-18~)
             reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
         if (requestedOffer.priceSpecification === undefined) {

package/lib/chevre/service/offer/product/factory.js

@@ -10,22 +10,20 @@ function createRegisterServiceStartParams(params) {
         typeOf: factory.assetTransactionType.RegisterService,
         transactionNumber: params.transactionNumber,
         agent: {
-            // Sellerに変更(2022-05-30~)
             typeOf: params.transaction.seller.typeOf,
-            id: String(params.transaction.seller.id),
+            id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
-                : String((_a = params.transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja),
-            // typeOf: params.transaction.agent.typeOf,
-            // name: params.transaction.agent.id,
-            identifier: [
-                { name: 'transaction', value: params.transaction.id },
-                {
-                    name: 'transactionExpires',
-                    value: moment(params.transaction.expires)
-                        .toISOString()
-                }
-            ]
+                : String((_a = params.transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+            // identifierを廃止(2024-03-05~)
+            // identifier: [
+            //     { name: 'transaction', value: params.transaction.id },
+            //     {
+            //         name: 'transactionExpires',
+            //         value: moment(params.transaction.expires)
+            //             .toISOString()
+            //     }
+            // ]
         },
         object: params.object.map((o) => {
             return {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js

@@ -3,7 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNextSendOrderTasks = exports.createInformTasks = void 0;
 const factory = require("../../../../factory");
-const order_1 = require("../../../../factory/order");
+// import { createMaskedCustomer } from '../../../../factory/order';
 const settings_1 = require("../../../../settings");
 const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
 function creteOrder4inform(order) {
@@ -52,16 +52,16 @@ exports.createInformTasks = createInformTasks;
 function createNextSendOrderTasks(params) {
     const now = new Date();
     const taskAttributes = [];
-    const maskedCustomer = (0, order_1.createMaskedCustomer)({ customer: params.order.customer }, { noProfile: true });
+    // const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
     const simpleOrder = {
         typeOf: params.order.typeOf,
-        seller: {
-            id: params.order.seller.id,
-            typeOf: params.order.seller.typeOf,
-            name: params.order.seller.name
-        },
+        // seller: {
+        //     id: params.order.seller.id,
+        //     typeOf: params.order.seller.typeOf,
+        //     name: params.order.seller.name
+        // }, // 廃止(2024-03-06~)
         // mask
-        customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+        // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
         orderNumber: params.order.orderNumber,
         price: params.order.price,
         priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js

@@ -15,7 +15,7 @@ exports.onOrderInTransit = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../factory");
-const order_1 = require("../../../factory/order");
+// import { createMaskedCustomer } from '../../../factory/order';
 const settings_1 = require("../../../settings");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderInTransit(params) {
@@ -39,16 +39,16 @@ exports.onOrderInTransit = onOrderInTransit;
 function createSendOrderTaskIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const maskedCustomer = (0, order_1.createMaskedCustomer)({ customer: params.order.customer }, { noProfile: true });
+        // const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
-            seller: {
-                id: params.order.seller.id,
-                typeOf: params.order.seller.typeOf,
-                name: params.order.seller.name
-            },
+            // seller: {
+            //     id: params.order.seller.id,
+            //     typeOf: params.order.seller.typeOf,
+            //     name: params.order.seller.name
+            // }, // 廃止(2024-03-06~)
             // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,