@chevre/domain 21.25.0-alpha.17 → 21.25.0-alpha.18

package/lib/chevre/service/aggregation/event/findEventOffers.d.ts

@@ -4,7 +4,7 @@ import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCat
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
 import * as factory from '../../../factory';
 /**
- * イベントオファー検索
+ * 興行オファー検索
  * NotFoundエラーをハンドリングする
  */
 export declare function findEventOffers(params: {

package/lib/chevre/service/aggregation/event/findEventOffers.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findEventOffers = void 0;
 const factory = require("../../../factory");
 /**
- * イベントオファー検索
+ * 興行オファー検索
  * NotFoundエラーをハンドリングする
  */
 function findEventOffers(params) {

package/lib/chevre/service/assetTransaction/reserve/factory/price.js

@@ -121,7 +121,7 @@ function createPriceSpecsByEventOffer(params) {
     });
 }
 /**
- * イベントオファーの単価仕様を予約単価仕様に最適化する
+ * 興行オファーの単価仕様を予約単価仕様に最適化する
  */
 function eventOfferUnitPriceSpec2reservationUnitPriceSpec(params) {
     var _a;

package/lib/chevre/service/assetTransaction/reserve.js

@@ -112,7 +112,7 @@ function addReservations(params) {
             availableOffers = params.preSearchedUnitPriceOffers;
         }
         else {
-            // イベントオファー検索
+            // 興行オファー検索
             const searchEventTicketOffersResult = yield OfferService.event.searchEventTicketOffers({
                 ids: acceptedOfferIds,
                 event: { id: event.id },

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

@@ -19,7 +19,6 @@ import type { StockHolderRepository as StockHolderRepo } from '../../../repo/sto
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../../repo/transactionNumber';
-import { IObjectWithoutDetail } from './factory';
 interface IAuthorizeRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -44,8 +43,9 @@ interface IAuthorizeRepos {
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
+type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail4chevre;
 /**
- * イベントオファー承認
+ * 興行オファー承認
  */
 declare function authorize(params: {
     project: {

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({
@@ -49,24 +50,14 @@ function authorize(params) {
             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,
-                        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) {

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;

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

@@ -6,9 +6,9 @@ const moment = require("moment");
 const util_1 = require("util");
 const factory = require("../../../factory");
 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,
@@ -53,7 +53,7 @@ function createReserveTransactionStartParams(params) {
             //     }
             // ]
         },
-        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() // 余裕を持って
@@ -105,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
         }

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,13 +27,10 @@ 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, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);

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

@@ -101,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)

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

@@ -84,7 +84,8 @@ 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)

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

@@ -22,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

@@ -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;

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.360.0-alpha.6",
-    "@cinerino/sdk": "5.13.0-alpha.3",
+    "@chevre/factory": "4.360.0",
+    "@cinerino/sdk": "5.13.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.25.0-alpha.17"
+  "version": "21.25.0-alpha.18"
 }