@chevre/domain 21.37.0-alpha.11 → 21.37.0-alpha.12

package/lib/chevre/service/assetTransaction/reserve/start.d.ts

@@ -69,5 +69,6 @@ declare function start(params: IStartParams & {
     transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>, 'id'>;
     objectSubReservations: IObjectSubReservation[];
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+    reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }>;
 export { start };

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

@@ -77,14 +77,15 @@ function start(params) {
             transaction: { id },
             objectSubReservations,
             // issuedThrough: addReservationsResult.issuedThrough
-            issuedThrough: startParams.object.issuedThrough
+            issuedThrough: startParams.object.issuedThrough,
+            reservationFor: startParams.object.reservationFor
         };
     });
 }
 exports.start = start;
 function fixEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const reservationForId = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof reservationForId !== 'string' || reservationForId.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
@@ -96,6 +97,13 @@ function fixEvent(params) {
         else {
             event = yield repos.event.findMinimizedIndividualEventById({ id: reservationForId });
         }
+        let offeredThrough = (_c = event.offers) === null || _c === void 0 ? void 0 : _c.offeredThrough;
+        if (offeredThrough === undefined) {
+            offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
+        }
+        if (offeredThrough.identifier === factory.service.webAPI.Identifier.COA) {
+            throw new factory.errors.NotImplemented(`${offeredThrough.identifier} not implemented`);
+        }
         return event;
     });
 }

package/lib/chevre/service/offer/event/{defaultOffer.d.ts → authorize/defaultOffer.d.ts}

@@ -1,4 +1,4 @@
-import * as factory from '../../../factory';
+import * as factory from '../../../../factory';
 declare const DEFAULT_OFFER_ID = "****AUTOMATICALLY_APPLIED****";
 declare const DEFAULT_TICKET_OFFER: factory.product.ITicketOffer;
 declare const DEFAULT_AVAILABLE_OFFER: factory.unitPriceOffer.IUnitPriceOffer;

package/lib/chevre/service/offer/event/{defaultOffer.js → authorize/defaultOffer.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_AVAILABLE_OFFER = exports.DEFAULT_TICKET_OFFER = exports.DEFAULT_OFFER_ID = void 0;
-const factory = require("../../../factory");
+const factory = require("../../../../factory");
 const DEFAULT_OFFER_ID = '****AUTOMATICALLY_APPLIED****';
 exports.DEFAULT_OFFER_ID = DEFAULT_OFFER_ID;
 const DEFAULT_OFFER_IDENTIFIER = '****AUTOMATICALLY_APPLIED****';

package/lib/chevre/service/offer/event/{factory.d.ts → authorize/factory.d.ts}

@@ -1,20 +1,19 @@
-import * as COA from '@motionpicture/coa-service';
-import * as factory from '../../../factory';
-import { IMinimizedIndividualEvent } from '../../../factory/event';
-export declare function createReserveTransactionStartParams(params: {
+import * as factory from '../../../../factory';
+import { IMinimizedIndividualEvent } from '../../../../factory/event';
+declare function createReserveTransactionStartParams(params: {
     project: {
         id: string;
     };
-    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
     event: {
         id: string;
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
-export declare function createAuthorizeSeatReservationActionAttributes(params: {
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+declare function createAuthorizeSeatReservationActionAttributes(params: {
+    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
     instrument: {
         /**
          * 予約取引番号
@@ -22,12 +21,11 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
         transactionNumber: string;
     };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
-    broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
 }): factory.action.authorize.offer.eventService.IAttributes<factory.service.webAPI.Identifier.Chevre>;
-export declare function acceptedOffers2amount(params: {
+declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];
 }): number;
-export declare function acceptedOffers2authorizeResult(params: {
+declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
     acceptedOffers4result: IResultAcceptedOffer[];
     noOfferSpecified: boolean;
@@ -35,21 +33,15 @@ export declare function acceptedOffers2authorizeResult(params: {
 }): factory.action.authorize.offer.eventService.IResult;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;
-export declare function responseBody2acceptedOffers4result(params: {
+declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+    reservationFor: factory.assetTransaction.reserve.IReservationFor;
     objectSubReservations: IObjectSubReservation[];
     transactionNumber: string;
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
     seller: factory.transaction.placeOrder.ISeller;
 }): IResultAcceptedOffer[];
-export declare function coaTicket2offer(params: {
-    theaterCode: string;
-    ticketResult: COA.factory.master.ITicketResult;
-    defaultCurrencyType?: factory.categoryCode.ICategoryCode;
-    defaultMembershipType?: factory.categoryCode.ICategoryCode;
-}): factory.aggregateOffer.ISubOffer;
-export {};
+export { acceptedOffers2amount, acceptedOffers2authorizeResult, createAuthorizeSeatReservationActionAttributes, createReserveTransactionStartParams, responseBody2acceptedOffers4result };

package/lib/chevre/service/offer/event/{factory.js → authorize/factory.js}

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.coaTicket2offer = exports.responseBody2acceptedOffers4result = exports.acceptedOffers2authorizeResult = exports.acceptedOffers2amount = exports.createAuthorizeSeatReservationActionAttributes = exports.createReserveTransactionStartParams = void 0;
-const COA = require("@motionpicture/coa-service");
+exports.responseBody2acceptedOffers4result = exports.createReserveTransactionStartParams = exports.createAuthorizeSeatReservationActionAttributes = exports.acceptedOffers2authorizeResult = exports.acceptedOffers2amount = void 0;
 const moment = require("moment");
-const util_1 = require("util");
-const factory = require("../../../factory");
+const factory = require("../../../../factory");
 function createReserveTransactionStartParams(params) {
     var _a;
-    const acceptedTicketOffersWithoutDetail = (Array.isArray(params.acceptedOffer))
-        ? params.acceptedOffer.map((o) => {
+    const { transaction, transactionNumber } = params;
+    const { seller } = transaction;
+    const acceptedTicketOffersWithoutDetail = (Array.isArray(params.acceptedOffers))
+        ? params.acceptedOffers.map((o) => {
             var _a, _b, _c, _d, _e;
             const issuedBy = {
-                typeOf: params.transaction.seller.typeOf,
-                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: seller.typeOf,
+                name: (typeof seller.name === 'string') ? seller.name : String((_a = seller.name) === null || _a === void 0 ? void 0 : _a.ja)
             };
             // 適用決済カード情報を連携(複数対応)(2022-08-02~)
             let appliesToMovieTicket;
@@ -29,32 +27,28 @@ function createReserveTransactionStartParams(params) {
                 // 必要な属性のみ指定する
                 id: o.id, itemOffered: Object.assign(Object.assign({}, o.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_c = o.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput), { reservedTicket: Object.assign(Object.assign({}, (_e = (_d = o.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.reservedTicket), { 
                             // issuedByを明示的に指定する
-                            issuedBy, typeOf: 'Ticket' }), typeOf: factory.reservationType.EventReservation }) }) }, (Array.isArray(o.addOn)) ? { addOn: o.addOn } : undefined), (appliesToMovieTicket !== undefined)
-                ? { priceSpecification: { appliesToMovieTicket } }
-                : undefined);
+                            issuedBy, typeOf: 'Ticket' }), typeOf: factory.reservationType.EventReservation }) }) }, (Array.isArray(o.addOn)) ? { addOn: o.addOn } : undefined), (appliesToMovieTicket !== undefined) ? { priceSpecification: { appliesToMovieTicket } } : undefined);
         })
         : undefined;
+    const agent = {
+        typeOf: seller.typeOf,
+        id: seller.id,
+        name: (typeof seller.name === 'string') ? seller.name : String((_a = 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()
+        //     }
+        // ]
+    };
+    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: { id: params.event.id } }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.assetTransactionType.Reserve,
-        transactionNumber: params.transactionNumber,
-        agent: {
-            typeOf: params.transaction.seller.typeOf,
-            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を廃止(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: params.event.id } }, (params.broker !== undefined) ? { broker: params.broker } : undefined),
+        transactionNumber, agent, object,
         expires: moment(params.transaction.expires)
             .add(1, 'month')
             .toDate() // 余裕を持って
@@ -64,20 +58,7 @@ exports.createReserveTransactionStartParams = createReserveTransactionStartParam
 function createAuthorizeSeatReservationActionAttributes(params) {
     var _a;
     // const acceptedOffers = params.acceptedOffers;
-    const event = params.event;
-    const transaction = params.transaction;
-    const offers = event.offers;
-    if (offers === undefined) {
-        throw new factory.errors.NotFound('EventOffers', 'Event offers undefined');
-    }
-    let offeredThrough = offers.offeredThrough;
-    if (offeredThrough === undefined) {
-        offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
-    }
-    if (offeredThrough.identifier === factory.service.webAPI.Identifier.COA) {
-        throw new factory.errors.NotImplemented(`offeredThrough.identifier not implemented`);
-    }
-    // 最適化(2022-06-07~)
+    const { event, transaction } = params;
     const authorizeObjectEvent = {
         id: event.id,
         // イベント提供サービスを識別できるようにするために追加(2022-06-04~)
@@ -103,23 +84,22 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         identifier: factory.service.webAPI.Identifier.Chevre,
         transactionNumber: params.instrument.transactionNumber
     };
+    const agent = {
+        id: transaction.seller.id,
+        typeOf: transaction.seller.typeOf,
+        name: (typeof transaction.seller.name === 'string')
+            ? transaction.seller.name
+            : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+    };
+    const recipient = {
+        typeOf: transaction.agent.typeOf,
+        id: transaction.agent.id
+    };
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        object,
-        agent: {
-            id: transaction.seller.id,
-            typeOf: transaction.seller.typeOf,
-            name: (typeof transaction.seller.name === 'string')
-                ? transaction.seller.name
-                : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
-        },
-        recipient: {
-            typeOf: transaction.agent.typeOf,
-            id: transaction.agent.id
-        },
-        purpose: { typeOf: transaction.typeOf, id: transaction.id },
-        instrument
+        object, agent, recipient, instrument,
+        purpose: { typeOf: transaction.typeOf, id: transaction.id }
     };
 }
 exports.createAuthorizeSeatReservationActionAttributes = createAuthorizeSeatReservationActionAttributes;
@@ -199,7 +179,8 @@ function responseBody2acceptedOffers4result(params) {
             const reservation = createReservation({
                 project: params.project,
                 itemOffered,
-                event: params.event,
+                // event: params.event,
+                reservationFor: params.reservationFor,
                 issuedThrough: params.issuedThrough,
                 reservationNumber: params.transactionNumber
             });
@@ -249,9 +230,10 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
  */
 // tslint:disable-next-line:max-func-body-length
 function createReservation(params) {
-    var _a, _b, _c, _d;
-    const itemOffered = params.itemOffered;
-    const event = params.event;
+    var _a, _b;
+    // const { itemOffered, event, reservationFor } = params;
+    const { itemOffered } = params;
+    const event = params.reservationFor;
     let reservationItem;
     const reservedTicket = Object.assign(Object.assign({ typeOf: itemOffered.reservedTicket.typeOf, ticketType: {
             typeOf: itemOffered.reservedTicket.ticketType.typeOf,
@@ -293,30 +275,30 @@ function createReservation(params) {
             : undefined);
     }
     else if (itemOffered.typeOf === factory.reservationType.BusReservation
-        && event.typeOf === factory.eventType.Event) {
-        const tripByEvent = (_c = (_b = event.offers) === null || _b === void 0 ? void 0 : _b.itemOffered.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservationFor;
-        if (typeof (tripByEvent === null || tripByEvent === void 0 ? void 0 : tripByEvent.typeOf) !== 'string') {
-            throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput.reservationFor');
-        }
+        && event.typeOf === factory.tripType.BusTrip) {
+        // const tripByEvent = event.offers?.itemOffered.serviceOutput?.reservationFor;
+        // if (typeof tripByEvent?.typeOf !== 'string') {
+        //     throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput.reservationFor');
+        // }
         const reservationFor = {
-            typeOf: tripByEvent.typeOf,
+            typeOf: event.typeOf,
             id: event.id,
-            arrivalBusStop: tripByEvent.arrivalBusStop,
-            departureBusStop: tripByEvent.departureBusStop,
+            arrivalBusStop: event.arrivalBusStop,
+            departureBusStop: event.departureBusStop,
             name: event.name,
-            departureTime: moment(tripByEvent.departureTime)
+            departureTime: moment(event.departureTime)
                 .toDate(),
-            arrivalTime: moment(tripByEvent.arrivalTime)
+            arrivalTime: moment(event.arrivalTime)
                 .toDate(),
-            busName: tripByEvent.busName,
-            busNumber: tripByEvent.busNumber,
-            identifier: tripByEvent.identifier
+            busName: event.busName,
+            busNumber: event.busNumber,
+            identifier: event.identifier
         };
         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({ typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: params.reservationNumber, reservationFor,
-            reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+            reservedTicket }, (typeof ((_b = itemOffered.programMembershipUsed) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
     }
@@ -325,64 +307,3 @@ function createReservation(params) {
     }
     return reservationItem;
 }
-// tslint:disable-next-line:max-func-body-length
-function coaTicket2offer(params) {
-    var _a, _b;
-    // 適用通貨区分
-    const eligibleMonetaryAmount = (typeof params.ticketResult.usePoint === 'number' && params.ticketResult.usePoint > 0
-        && typeof ((_a = params.defaultCurrencyType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? [{
-                typeOf: 'MonetaryAmount',
-                currency: params.defaultCurrencyType.codeValue,
-                value: Number(params.ticketResult.usePoint)
-            }]
-        : undefined;
-    // 適用メンバーシップ区分
-    const eligibleMembershipType = (params.ticketResult.flgMember === COA.factory.master.FlgMember.Member
-        && typeof ((_b = params.defaultMembershipType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
-        ? [{
-                typeOf: params.defaultMembershipType.typeOf,
-                id: params.defaultMembershipType.id,
-                codeValue: params.defaultMembershipType.codeValue,
-                inCodeSet: params.defaultMembershipType.inCodeSet
-            }]
-        : undefined;
-    const unitPriceSpec = {
-        typeOf: factory.priceSpecificationType.UnitPriceSpecification,
-        price: 0,
-        priceCurrency: factory.priceCurrency.JPY,
-        valueAddedTaxIncluded: true,
-        referenceQuantity: {
-            typeOf: 'QuantitativeValue',
-            unitCode: factory.unitCode.C62,
-            value: 1
-        }
-    };
-    const identifier = (0, util_1.format)('%s-%s-%s', factory.service.webAPI.Identifier.COA, params.theaterCode, params.ticketResult.ticketCode);
-    const offerName = {
-        ja: params.ticketResult.ticketName,
-        en: (typeof params.ticketResult.ticketNameEng === 'string')
-            ? params.ticketResult.ticketNameEng
-            : ''
-    };
-    return Object.assign(Object.assign(Object.assign({ typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
-        // id: '',
-        identifier: identifier, name: offerName, description: {
-            ja: '',
-            en: ''
-        }, alternateName: {
-            ja: params.ticketResult.ticketName,
-            en: (typeof params.ticketResult.ticketNameEng === 'string')
-                ? params.ticketResult.ticketNameEng
-                : ''
-        }, availability: factory.itemAvailability.InStock, itemOffered: {
-            typeOf: factory.product.ProductType.EventService
-        }, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
-            { name: 'theaterCode', value: params.theaterCode },
-            ...Object.keys(params.ticketResult)
-                .map((key) => {
-                return { name: String(key), value: String(params.ticketResult[key]) };
-            })
-        ] });
-}
-exports.coaTicket2offer = coaTicket2offer;

package/lib/chevre/service/offer/event/{processStartReserve4chevre.d.ts → authorize/processStartReserve4chevre.d.ts}

@@ -1,23 +1,23 @@
-import * as factory from '../../../factory';
-import type { MongoRepository as ActionRepo } from '../../../repo/action';
-import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
-import type { AuthorizationRepo } from '../../../repo/code';
-import type { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../repo/event';
-import type { MongoRepository as OfferRepo } from '../../../repo/offer';
-import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
-import type { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
-import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
-import type { MongoRepository as SeatRepo } from '../../../repo/place/seat';
-import type { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
-import type { MongoRepository as ProductRepo } from '../../../repo/product';
-import type { MongoRepository as ProductOfferRepo } from '../../../repo/productOffer';
-import type { MongoRepository as ProjectRepo } from '../../../repo/project';
-import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
-import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
-import type { MongoRepository as TaskRepo } from '../../../repo/task';
-import type { TicketRepo } from '../../../repo/ticket';
+import * as factory from '../../../../factory';
+import type { MongoRepository as ActionRepo } from '../../../../repo/action';
+import type { MongoRepository as AssetTransactionRepo } from '../../../../repo/assetTransaction';
+import type { AuthorizationRepo } from '../../../../repo/code';
+import type { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../../repo/event';
+import type { MongoRepository as OfferRepo } from '../../../../repo/offer';
+import type { MongoRepository as OfferCatalogRepo } from '../../../../repo/offerCatalog';
+import type { MongoRepository as OfferCatalogItemRepo } from '../../../../repo/offerCatalogItem';
+import type { MongoRepository as PaymentServiceRepo } from '../../../../repo/paymentService';
+import type { MongoRepository as SeatRepo } from '../../../../repo/place/seat';
+import type { MongoRepository as PriceSpecificationRepo } from '../../../../repo/priceSpecification';
+import type { MongoRepository as ProductRepo } from '../../../../repo/product';
+import type { MongoRepository as ProductOfferRepo } from '../../../../repo/productOffer';
+import type { MongoRepository as ProjectRepo } from '../../../../repo/project';
+import type { RedisRepository as OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
+import type { StockHolderRepository as StockHolderRepo } from '../../../../repo/stockHolder';
+import type { MongoRepository as TaskRepo } from '../../../../repo/task';
+import type { TicketRepo } from '../../../../repo/ticket';
 declare function processStartReserve4chevre(params: {
-    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transactionNumber: string;

package/lib/chevre/service/offer/event/{processStartReserve4chevre.js → authorize/processStartReserve4chevre.js}

@@ -10,35 +10,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processStartReserve4chevre = void 0;
-const factory = require("../../../factory");
-const ReserveTransactionService = require("../../assetTransaction/reserve");
-const CodeService = require("../../code");
+const factory = require("../../../../factory");
+const ReserveTransactionService = require("../../../assetTransaction/reserve");
+const CodeService = require("../../../code");
 const factory_1 = require("./factory");
 function processStartReserve4chevre(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const event = params.event;
-        const transactionNumber = params.transactionNumber;
-        const transaction = params.transaction;
-        // let responseBody: factory.assetTransaction.reserve.ITransaction;
+        const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
             // object: <IObjectWithDetail>action.object,
-            acceptedOffer: params.acceptedOffer, event: { id: event.id }, transaction,
+            acceptedOffers: params.acceptedOffers, 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, // discontinue(2024-07-02~)
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
-        // responseBody = startReserveTransactionResult.transaction; // responseBody参照必要なし(2024-07-01~)
-        // 予約取引からオファー情報を生成する
+        // 予約取引結果から注文オファーを生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             issuedThrough: startReserveTransactionResult.issuedThrough,
+            reservationFor: startReserveTransactionResult.reservationFor,
             objectSubReservations: startReserveTransactionResult.objectSubReservations,
             transactionNumber,
-            // responseBody: responseBody,
-            event: event,
+            // event: event,
             project: transaction.project,
             seller: transaction.seller
         });

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

@@ -12,65 +12,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
 const factory = require("../../../factory");
 const any_1 = require("../any");
-const defaultOffer_1 = require("./defaultOffer");
-const processStartReserve4chevre_1 = require("./processStartReserve4chevre");
+const defaultOffer_1 = require("./authorize/defaultOffer");
+const factory_1 = require("./authorize/factory");
+const processStartReserve4chevre_1 = require("./authorize/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 { transaction, event } = yield validateCreateRequest(params)(repos);
         const { acceptedOffers, ticketOffers, unitPriceOffers } = yield validateAcceptedOffers({
             object: params.object,
             event,
-            seller: { typeOf: transaction.seller.typeOf, id: String(transaction.seller.id) },
+            seller: { typeOf: transaction.seller.typeOf, id: transaction.seller.id },
             transaction,
             store: params.store,
             noOfferSpecified
         })(repos);
         let acceptedOffers4result = [];
-        // Chevre予約の場合、まず取引番号発行
+        // まず取引番号発行
         const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-        // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
-            // acceptedOffers: acceptedOffers,
-            event: event,
-            transaction: transaction,
-            instrument: { transactionNumber },
-            broker: params.object.broker
+            event, transaction,
+            instrument: { transactionNumber }
         });
         const action = yield repos.action.start(actionAttributes);
         try {
-            switch (bookingServiceIdentifire) {
-                // 実質使用する予定なしなので廃止(2022-05-12~)
-                // case factory.service.webAPI.Identifier.COA:
-                //     break;
-                case factory.service.webAPI.Identifier.Chevre:
-                    const processStartReserveResult = yield (0, processStartReserve4chevre_1.processStartReserve4chevre)(Object.assign({ acceptedOffer: acceptedOffers, event,
-                        transactionNumber,
-                        transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers,
-                        unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true, 
-                        // useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, // discontinue(2024-07-02~)
-                        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) {
-                        // if (params.options.useCreateOrderOnOfferAccepted) {
-                        yield (0, any_1.acceptOffer)({
-                            project: transaction.project,
-                            purpose: { id: transaction.id },
-                            acceptedOffers: acceptedOffers4result
-                        })(repos);
-                        // }
-                    }
-                    break;
-                default:
-                    throw new factory.errors.Argument('Event', `Unknown booking service '${bookingServiceIdentifire}'`);
+            const processStartReserveResult = yield (0, processStartReserve4chevre_1.processStartReserve4chevre)(Object.assign({ acceptedOffers, event,
+                transactionNumber, transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers, unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true, 
+                // useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, // discontinue(2024-07-02~)
+                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) {
+                // if (params.options.useCreateOrderOnOfferAccepted) {
+                yield (0, any_1.acceptOffer)({
+                    project: transaction.project,
+                    purpose: { id: transaction.id },
+                    acceptedOffers: acceptedOffers4result
+                })(repos);
+                // }
             }
         }
         catch (error) {
@@ -80,15 +64,6 @@ function authorize(params) {
             catch (__) {
                 // no op
             }
-            switch (bookingServiceIdentifire) {
-                case factory.service.webAPI.Identifier.COA:
-                    // error = handleCOAReserveTemporarilyError(error);
-                    break;
-                case factory.service.webAPI.Identifier.Chevre:
-                    // error = handleChevreError(error);
-                    break;
-                default:
-            }
             throw error;
         }
         const result = (0, factory_1.acceptedOffers2authorizeResult)({ acceptedOffers, acceptedOffers4result, noOfferSpecified, ticketOffers });
@@ -98,7 +73,7 @@ function authorize(params) {
 exports.authorize = authorize;
 function validateCreateRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -122,12 +97,12 @@ function validateCreateRequest(params) {
         const event = yield repos.event.findMinimizedIndividualEventById({
             id: params.object.reservationFor.id
         });
-        let offeredThrough = (_c = event.offers) === null || _c === void 0 ? void 0 : _c.offeredThrough;
-        if (offeredThrough === undefined) {
-            offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
-        }
-        const bookingServiceIdentifire = offeredThrough.identifier;
-        return { transaction, event, bookingServiceIdentifire };
+        // let offeredThrough = event.offers?.offeredThrough;
+        // if (offeredThrough === undefined) {
+        //     offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
+        // }
+        // const bookingServiceIdentifire = offeredThrough.identifier;
+        return { transaction, event };
     });
 }
 /**
@@ -182,7 +157,7 @@ function validateAcceptedOffers(params) {
                 return acceptedOfferWithoutDetail2acceptedOffer({
                     availableTicketOffers: ticketOffers,
                     offerWithoutDetail,
-                    event: params.event,
+                    // event: params.event,
                     transaction: params.transaction,
                     seller: params.seller
                 })();
@@ -239,7 +214,7 @@ function validateAcceptedOffers(params) {
 function acceptedOfferWithoutDetail2acceptedOffer(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return () => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const availableTicketOffers = params.availableTicketOffers;
         const offerWithoutDetail = params.offerWithoutDetail;
         const offer = availableTicketOffers.find((o) => o.id === offerWithoutDetail.id);
@@ -310,33 +285,24 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 // no op
             }
         }
-        const acceptedOffer = Object.assign({ 
+        return {
             // オファーの中身を最適化する(必要最低限の情報のみに)
-            id: String(offer.id), 
+            id: String(offer.id),
             // identifier: offer.identifier,
-            priceSpecification, 
+            priceSpecification,
             // typeOf: offer.typeOf,
             // priceCurrency: offer.priceCurrency,
-            itemOffered: Object.assign(Object.assign({}, (itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined), (pointAward !== undefined) ? { pointAward } : undefined), addOn: acceptedAddOns, 
+            itemOffered: Object.assign(Object.assign({}, (itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined), (pointAward !== undefined) ? { pointAward } : undefined),
+            addOn: acceptedAddOns,
             // 追加属性をマージ
             additionalProperty: [
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
-            ] }, (Array.isArray(offer.acceptedPaymentMethod))
-            ? { acceptedPaymentMethod: offer.acceptedPaymentMethod } // add(2023-11-15~)
-            : undefined);
-        let offeredThrough = (_d = params.event.offers) === null || _d === void 0 ? void 0 : _d.offeredThrough;
-        if (typeof (offeredThrough === null || offeredThrough === void 0 ? void 0 : offeredThrough.typeOf) !== 'string') {
-            offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
-        }
-        switch (offeredThrough.identifier) {
-            case factory.service.webAPI.Identifier.COA:
-                // 実質使用する予定なしなので廃止(2022-05-12~)
-                throw new factory.errors.NotImplemented(`booking service '${offeredThrough.identifier}' not implemented`);
-            default:
-            // no op
-        }
-        return acceptedOffer;
+            ]
+            // ...(Array.isArray(offer.acceptedPaymentMethod)) // discontinue(2024-07-03~)
+            //     ? { acceptedPaymentMethod: offer.acceptedPaymentMethod }
+            //     : undefined
+        };
     });
 }
 function createPointAwardByOfferWithoutDetail(params) {

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

@@ -0,0 +1,9 @@
+import * as COA from '@motionpicture/coa-service';
+import * as factory from '../../../../factory';
+declare function coaTicket2offer(params: {
+    theaterCode: string;
+    ticketResult: COA.factory.master.ITicketResult;
+    defaultCurrencyType?: factory.categoryCode.ICategoryCode;
+    defaultMembershipType?: factory.categoryCode.ICategoryCode;
+}): factory.aggregateOffer.ISubOffer;
+export { coaTicket2offer };

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

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.coaTicket2offer = void 0;
+const COA = require("@motionpicture/coa-service");
+const util_1 = require("util");
+const factory = require("../../../../factory");
+// tslint:disable-next-line:max-func-body-length
+function coaTicket2offer(params) {
+    var _a, _b;
+    // 適用通貨区分
+    const eligibleMonetaryAmount = (typeof params.ticketResult.usePoint === 'number' && params.ticketResult.usePoint > 0
+        && typeof ((_a = params.defaultCurrencyType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        ? [{
+                typeOf: 'MonetaryAmount',
+                currency: params.defaultCurrencyType.codeValue,
+                value: Number(params.ticketResult.usePoint)
+            }]
+        : undefined;
+    // 適用メンバーシップ区分
+    const eligibleMembershipType = (params.ticketResult.flgMember === COA.factory.master.FlgMember.Member
+        && typeof ((_b = params.defaultMembershipType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+        ? [{
+                typeOf: params.defaultMembershipType.typeOf,
+                id: params.defaultMembershipType.id,
+                codeValue: params.defaultMembershipType.codeValue,
+                inCodeSet: params.defaultMembershipType.inCodeSet
+            }]
+        : undefined;
+    const unitPriceSpec = {
+        typeOf: factory.priceSpecificationType.UnitPriceSpecification,
+        price: 0,
+        priceCurrency: factory.priceCurrency.JPY,
+        valueAddedTaxIncluded: true,
+        referenceQuantity: {
+            typeOf: 'QuantitativeValue',
+            unitCode: factory.unitCode.C62,
+            value: 1
+        }
+    };
+    const identifier = (0, util_1.format)('%s-%s-%s', factory.service.webAPI.Identifier.COA, params.theaterCode, params.ticketResult.ticketCode);
+    const offerName = {
+        ja: params.ticketResult.ticketName,
+        en: (typeof params.ticketResult.ticketNameEng === 'string')
+            ? params.ticketResult.ticketNameEng
+            : ''
+    };
+    return Object.assign(Object.assign(Object.assign({ typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
+        // id: '',
+        identifier: identifier, name: offerName, description: {
+            ja: '',
+            en: ''
+        }, alternateName: {
+            ja: params.ticketResult.ticketName,
+            en: (typeof params.ticketResult.ticketNameEng === 'string')
+                ? params.ticketResult.ticketNameEng
+                : ''
+        }, availability: factory.itemAvailability.InStock, itemOffered: {
+            typeOf: factory.product.ProductType.EventService
+        }, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
+            { name: 'theaterCode', value: params.theaterCode },
+            ...Object.keys(params.ticketResult)
+                .map((key) => {
+                return { name: String(key), value: String(params.ticketResult[key]) };
+            })
+        ] });
+}
+exports.coaTicket2offer = coaTicket2offer;

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importCategoryCodesFromCOA = exports.importFromCOA = void 0;
 const factory = require("../../../factory");
-const factory_1 = require("./factory");
+const factory_1 = require("./importFromCOA/factory");
 function importFromCOA(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 通貨区分検索

package/lib/chevre/service/validation/validateOrder.js

@@ -13,7 +13,7 @@ exports.validateOrder = void 0;
 // import * as createDebug from 'debug';
 const moment = require("moment");
 const factory = require("../../factory");
-const factory_1 = require("../offer/event/factory");
+const factory_1 = require("../offer/event/authorize/factory");
 const factory_2 = require("../offer/product/factory");
 const validateMovieTicket_1 = require("../transaction/placeOrderInProgress/validation/validateMovieTicket");
 // const debug = createDebug('chevre-domain:service:validation');

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.37.0-alpha.11"
+  "version": "21.37.0-alpha.12"
 }