@chevre/domain 21.8.0-alpha.8 → 21.8.0

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

@@ -120,7 +120,8 @@ function addReservations(params) {
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 onlyValid: true,
                 addSortIndex: false,
-                validateOfferRateLimit: true
+                validateOfferRateLimit: true,
+                useIncludeInDataCatalog: false
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
@@ -181,7 +182,7 @@ function addReservations(params) {
         //     await repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
         // }
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
-        yield onReservationsCreated({ event })(repos);
+        yield onReservationsCreated({ event, transaction: { transactionNumber: transaction.transactionNumber } })(repos);
         return { transaction, objectSubReservations, issuedThrough };
     });
 }
@@ -386,21 +387,62 @@ function createReservations4transactionObject(params) {
                 }
             }
             // 指定されたアドオンがオファーに存在すれば、アドオンの単価仕様作成
-            let acceptedAddOns = [];
+            const acceptedAddOns = [];
             let availableAddOns;
-            const acceptedAddOnParams = acceptedOffer.addOn;
-            if (Array.isArray(acceptedAddOnParams) && acceptedAddOnParams.length > 0) {
+            const acceptedAddOnsParams = acceptedOffer.addOn;
+            if (Array.isArray(acceptedAddOnsParams) && acceptedAddOnsParams.length > 0) {
                 // アドオンオファー検索(2023-03-02~)
                 availableAddOns = yield searchAvailableAddOns({
-                    ids: acceptedAddOnParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
+                    ids: acceptedAddOnsParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
                     project: { id: params.transaction.project.id },
                     ticketOffer,
                     availableAtOrFrom: params.availableAtOrFrom
                 })(repos);
             }
-            // availableAddOns = <factory.product.ITicketAddOn[] | undefined>ticketOffer.addOn;
-            if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnParams)) {
-                acceptedAddOns = availableAddOns.filter((availableAddOn) => acceptedAddOnParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id));
+            if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnsParams)) {
+                acceptedAddOnsParams.forEach((acceptedAddOnParams) => {
+                    var _a, _b, _c;
+                    const availableAddOn = availableAddOns === null || availableAddOns === void 0 ? void 0 : availableAddOns.find((addOn) => addOn.id === acceptedAddOnParams.id);
+                    if (availableAddOn !== undefined) {
+                        // acceptedAddOnsの重複を避ける(単価オファーIDに対して)
+                        if (!acceptedAddOns.some((addOn) => addOn.id === availableAddOn.id)) {
+                            const availableAddOnReferenceQuantityValue = availableAddOn.priceSpecification.referenceQuantity.value;
+                            if (typeof availableAddOnReferenceQuantityValue !== 'number') {
+                                throw new factory.errors.NotImplemented('addOn.priceSpecification.referenceQuantity.value must be number');
+                            }
+                            // 受入数量はデフォルトで単価オファーの基準数量
+                            let referenceQuantityValueAccepted = availableAddOnReferenceQuantityValue;
+                            // 数量指定を検証(2023-08-31~)
+                            const specifiedReferencedQuantityValue = (_b = (_a = acceptedAddOnParams.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity) === null || _b === void 0 ? void 0 : _b.value;
+                            if (typeof specifiedReferencedQuantityValue === 'number') {
+                                if (specifiedReferencedQuantityValue < 1) {
+                                    throw new factory.errors.Argument('addOn.priceSpecification.referenceQuantity.value must be > 0');
+                                }
+                                // 数量が適用単位要件を満たしていなければエラー
+                                if (specifiedReferencedQuantityValue % availableAddOnReferenceQuantityValue !== 0) {
+                                    throw new factory.errors.Argument('addOn.priceSpecification.referenceQuantity.value', `Offer ${availableAddOn.id} requires reference quantity value ${specifiedReferencedQuantityValue}`);
+                                }
+                                // 基準数量上書き
+                                referenceQuantityValueAccepted = specifiedReferencedQuantityValue;
+                            }
+                            const priceAccepted = availableAddOn.priceSpecification.price *
+                                (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue);
+                            const accountsReceivableAccepted = (typeof ((_c = availableAddOn.priceSpecification.accounting) === null || _c === void 0 ? void 0 : _c.accountsReceivable) === 'number')
+                                ? availableAddOn.priceSpecification.accounting.accountsReceivable *
+                                    (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue)
+                                : undefined;
+                            const acceptedAddOn = Object.assign(Object.assign({}, availableAddOn), { priceSpecification: Object.assign(Object.assign(Object.assign({}, availableAddOn.priceSpecification), (typeof accountsReceivableAccepted === 'number')
+                                    ? {
+                                        accounting: Object.assign(Object.assign({}, availableAddOn.priceSpecification.accounting), { accountsReceivable: accountsReceivableAccepted, typeOf: 'Accounting' })
+                                    }
+                                    : undefined), { price: priceAccepted, referenceQuantity: Object.assign(Object.assign({}, availableAddOn.priceSpecification.referenceQuantity), { value: referenceQuantityValueAccepted }) }) });
+                            acceptedAddOns.push(acceptedAddOn);
+                        }
+                    }
+                });
+                // acceptedAddOns = availableAddOns.filter(
+                //     (availableAddOn) => acceptedAddOnsParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id)
+                // );
             }
             const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
             const reservationId = `${reservationNumber}-${reservationIndex}`;
@@ -435,7 +477,7 @@ function searchAvailableAddOns(params) {
         if (Array.isArray(params.ticketOffer.addOn)) {
             const addOnProductIds = [...new Set(params.ticketOffer.addOn.map((o) => String(o.itemOffered.id)))];
             for (const addOnProductId of addOnProductIds) {
-                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAt: { id: params.availableAtOrFrom.id } }
                     : undefined))(repos);
                 availableAddOns.push(...offers.map((o) => {
@@ -530,31 +572,64 @@ function validateProgramMembershipUsed(params) {
             if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
             }
-            // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
-            const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
-            // メンバーシップの存在確認
-            const serviceOutput = yield permitService.findByIdentifier({
-                project: { id: params.project.id },
-                identifier: programMembershipUsedIdentifier,
-                issuedThrough: { typeOf: factory.product.ProductType.MembershipService }
-            });
-            // 有効期間のチェック
-            if (serviceOutput.validFrom === undefined || serviceOutput.validFrom === null
-                || serviceOutput.validUntil === undefined || serviceOutput.validUntil === null) {
-                throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'not valid programMembership');
-            }
-            if (moment(serviceOutput.validFrom)
-                .isAfter(moment(now))
-                || moment(serviceOutput.validUntil)
-                    .isBefore(moment(now))) {
-                throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
+            const permitIssuedThrough = yield repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
+            switch (permitIssuedThrough.typeOf) {
+                // 発行サービスがCreditCardのケースに対応(2023-09-01~)
+                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                    // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
+                    let issuedThroughServiceType;
+                    if (Array.isArray(permitIssuedThrough.serviceOutput)) {
+                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => output.typeOf === factory.permit.PermitType.Permit);
+                        if ((serviceOutputAsPermit === null || serviceOutputAsPermit === void 0 ? void 0 : serviceOutputAsPermit.typeOf) === factory.permit.PermitType.Permit) {
+                            issuedThroughServiceType = serviceOutputAsPermit.issuedThrough.serviceType;
+                        }
+                    }
+                    if ((issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.typeOf) === 'CategoryCode') {
+                        programMembershipUsed = {
+                            project: permitIssuedThrough.project,
+                            typeOf: factory.permit.PermitType.Permit,
+                            identifier: programMembershipUsedIdentifier,
+                            issuedThrough: {
+                                id: permitIssuedThrough.id,
+                                serviceType: issuedThroughServiceType,
+                                typeOf: permitIssuedThrough.typeOf
+                            }
+                        };
+                    }
+                    else {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'issuedThrough has no serviceOutput as Permit');
+                    }
+                    break;
+                case factory.product.ProductType.MembershipService:
+                    // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
+                    const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
+                    // メンバーシップの存在確認
+                    const serviceOutput = yield permitService.findByIdentifier({
+                        project: { id: params.project.id },
+                        identifier: programMembershipUsedIdentifier,
+                        issuedThrough: { typeOf: factory.product.ProductType.MembershipService }
+                    });
+                    // 有効期間のチェック
+                    if (serviceOutput.validFrom === undefined || serviceOutput.validFrom === null
+                        || serviceOutput.validUntil === undefined || serviceOutput.validUntil === null) {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'not valid programMembership');
+                    }
+                    if (moment(serviceOutput.validFrom)
+                        .isAfter(moment(now))
+                        || moment(serviceOutput.validUntil)
+                            .isBefore(moment(now))) {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
+                    }
+                    programMembershipUsed = {
+                        project: serviceOutput.project,
+                        typeOf: serviceOutput.typeOf,
+                        identifier: serviceOutput.identifier,
+                        issuedThrough: serviceOutput.issuedThrough
+                    };
+                    break;
+                default:
+                    throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `${permitIssuedThrough.typeOf} not implemented`);
             }
-            programMembershipUsed = {
-                project: serviceOutput.project,
-                typeOf: serviceOutput.typeOf,
-                identifier: serviceOutput.identifier,
-                issuedThrough: serviceOutput.issuedThrough
-            };
         }
         return programMembershipUsed;
     });
@@ -729,7 +804,8 @@ function onReservationsCreated(params) {
         yield OfferService.createAggregateScreeningEventIfNotExist({
             project: params.event.project,
             reservationFor: [{ id: params.event.id }],
-            force: false
+            force: false,
+            identifier: `onReservationsCreated:${params.transaction.transactionNumber}`
         })({ task: repos.task });
     });
 }

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

@@ -188,6 +188,7 @@ function validateObjectWithoutDetail(params) {
         var _a, _b, _c, _d;
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
+            const validatedAcceptedOffersWithoutDetail = [];
             for (let acceptedOffer of objectWithoutDetail.acceptedOffer) {
                 let programMembershipUsed = (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
                 // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
@@ -214,7 +215,9 @@ function validateObjectWithoutDetail(params) {
                     };
                     acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_d = acceptedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed }) }) });
                 }
+                validatedAcceptedOffersWithoutDetail.push(acceptedOffer);
             }
+            objectWithoutDetail.acceptedOffer = validatedAcceptedOffersWithoutDetail;
         }
         return objectWithoutDetail;
     });
@@ -236,7 +239,8 @@ function validateAcceptedOffers(params) {
             store: params.store,
             onlyValid: true,
             addSortIndex: false,
-            validateOfferRateLimit: true
+            validateOfferRateLimit: true,
+            useIncludeInDataCatalog: false
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))
@@ -252,31 +256,35 @@ function validateAcceptedOffers(params) {
             : [];
         // オファーIDごとにオファー適用条件を確認
         offerIds.forEach((offerId) => {
-            var _a;
+            var _a, _b, _c;
             const acceptedOffersByOfferId = acceptedOffers.filter((o) => o.id === offerId);
+            const numAcceptedOffersByOfferId = acceptedOffersByOfferId.length;
             let referenceQuantityValue = 1;
-            const unitPriceSpec = acceptedOffersByOfferId[0].priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification);
-            const unitPriceSpecReferenceQuantityValue = (_a = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.referenceQuantity) === null || _a === void 0 ? void 0 : _a.value;
+            // 単価仕様を取り出す
+            const unitPriceSpec = acceptedOffersByOfferId[0].priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification && (!Array.isArray(spec.appliesToAddOn)));
+            // 単価仕様は必ず存在するはず
+            if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
+                throw new factory.errors.ServiceUnavailable(`unitPriceSpec of the offer '${offerId}' not found`);
+            }
+            const unitPriceSpecReferenceQuantityValue = (_a = unitPriceSpec.referenceQuantity) === null || _a === void 0 ? void 0 : _a.value;
             if (typeof unitPriceSpecReferenceQuantityValue === 'number') {
                 referenceQuantityValue = unitPriceSpecReferenceQuantityValue;
             }
             // アイテム数が適用単位要件を満たしていなければエラー
-            if (acceptedOffersByOfferId.length % referenceQuantityValue !== 0) {
+            if (numAcceptedOffersByOfferId % referenceQuantityValue !== 0) {
                 throw new factory.errors.Argument('acceptedOffers', `Offer ${offerId} requires reference quantity value ${referenceQuantityValue}`);
             }
             // 適用アイテム数要件を満たしていなければエラー
-            if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) !== undefined) {
-                const maxValue = unitPriceSpec.eligibleQuantity.maxValue;
-                if (typeof maxValue === 'number') {
-                    if (acceptedOffersByOfferId.length > maxValue) {
-                        throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be less than or equal to ${maxValue}`);
-                    }
+            const maxValue = (_b = unitPriceSpec.eligibleQuantity) === null || _b === void 0 ? void 0 : _b.maxValue;
+            if (typeof maxValue === 'number') {
+                if (numAcceptedOffersByOfferId > maxValue) {
+                    throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be less than or equal to ${maxValue}`);
                 }
-                const minValue = unitPriceSpec.eligibleQuantity.minValue;
-                if (typeof minValue === 'number') {
-                    if (acceptedOffersByOfferId.length < minValue) {
-                        throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be more than or equal to ${minValue}`);
-                    }
+            }
+            const minValue = (_c = unitPriceSpec.eligibleQuantity) === null || _c === void 0 ? void 0 : _c.minValue;
+            if (typeof minValue === 'number') {
+                if (numAcceptedOffersByOfferId < minValue) {
+                    throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be more than or equal to ${minValue}`);
                 }
             }
         });
@@ -298,44 +306,40 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             transaction: params.transaction
         });
         const acceptedAppliesToMovieTicket = (_a = offerWithoutDetail.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket;
-        // let movieTicketIdentifire: string | undefined;
-        // if (Array.isArray(acceptedAppliesToMovieTicket)) {
-        //     // throw new factory.errors.NotImplemented('multiple appliesToMovieTicket not implemented');
-        //     // no op
-        // } else if (typeof acceptedAppliesToMovieTicket?.identifier === 'string') {
-        //     movieTicketIdentifire = acceptedAppliesToMovieTicket.identifier;
-        // }
         // 承認アクションオブジェクトのacceptedOfferにappliesToMovieTicketを連携する(2022-08-02~)
         const priceSpecification = Object.assign(Object.assign({}, offer.priceSpecification), (Array.isArray(acceptedAppliesToMovieTicket) || typeof (acceptedAppliesToMovieTicket === null || acceptedAppliesToMovieTicket === void 0 ? void 0 : acceptedAppliesToMovieTicket.identifier) === 'string')
             ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
             : undefined);
+        const acceptedAddOns = (Array.isArray(offerWithoutDetail.addOn))
+            ? offerWithoutDetail.addOn.map((acceptedAddOnOffer) => {
+                var _a, _b;
+                if (typeof acceptedAddOnOffer.id !== 'string' || acceptedAddOnOffer.id.length === 0) {
+                    throw new factory.errors.ArgumentNull('object.acceptedOffer.addOn.id');
+                }
+                const addOnOfferReferenceQuantityValue = (_b = (_a = acceptedAddOnOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity) === null || _b === void 0 ? void 0 : _b.value;
+                return Object.assign({ 
+                    // typeOf: <factory.offerType.Offer>factory.offerType.Offer,
+                    id: acceptedAddOnOffer.id }, (typeof addOnOfferReferenceQuantityValue === 'number')
+                    ? { priceSpecification: { referenceQuantity: { value: addOnOfferReferenceQuantityValue } } }
+                    : undefined);
+            })
+            : [];
         const acceptedOffer = {
             // オファーの中身を最適化する(必要最低限の情報のみに)
             id: String(offer.id),
             identifier: offer.identifier,
             priceSpecification,
-            // project: offer.project,
             typeOf: offer.typeOf,
             priceCurrency: offer.priceCurrency,
             itemOffered: Object.assign({ typeOf: factory.product.ProductType.EventService, serviceOutput: (offerWithoutDetail.itemOffered !== undefined && offerWithoutDetail.itemOffered !== null)
                     ? offerWithoutDetail.itemOffered.serviceOutput
                     : undefined }, (pointAward !== undefined) ? { pointAward } : undefined),
-            addOn: (Array.isArray(offerWithoutDetail.addOn))
-                ? offerWithoutDetail.addOn.map((a) => {
-                    return {
-                        typeOf: factory.offerType.Offer,
-                        id: String(a.id),
-                        priceCurrency: offer.priceCurrency
-                    };
-                })
-                : [],
+            addOn: acceptedAddOns,
             // 追加属性をマージ
             additionalProperty: [
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
             ]
-            // movieTicketIdentifireの不要を確認後に廃止(2022-09-09以降)(2022-11-02+)
-            // ...(typeof movieTicketIdentifire === 'string') ? { movieTicketIdentifire } : undefined
         };
         let offeredThrough = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (typeof (offeredThrough === null || offeredThrough === void 0 ? void 0 : offeredThrough.typeOf) !== 'string') {

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

@@ -16,7 +16,7 @@ export declare function createReserveTransactionStartParams(params: {
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer4chevre[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
-    pendingTransaction?: factory.action.authorize.offer.seatReservation.IPendingTransaction | undefined;
+    pendingTransaction?: factory.action.authorize.offer.seatReservation.IChevrePendingTransaction | undefined;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
 }): factory.action.authorize.offer.seatReservation.IAttributes<factory.service.webAPI.Identifier.Chevre>;

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

@@ -299,6 +299,7 @@ function createReservation(params) {
     }
     return reservationItem;
 }
+// tslint:disable-next-line:max-func-body-length
 function coaTicket2offer(params) {
     var _a, _b;
     // 適用通貨区分
@@ -322,7 +323,6 @@ function coaTicket2offer(params) {
             }]
         : undefined;
     const unitPriceSpec = {
-        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.priceSpecificationType.UnitPriceSpecification,
         price: 0,
         priceCurrency: factory.priceCurrency.JPY,
@@ -332,15 +332,15 @@ function coaTicket2offer(params) {
             unitCode: factory.unitCode.C62,
             value: 1
         }
-        // appliesToMovieTicket?: {};
     };
     const identifier = (0, util_1.format)('%s-%s-%s', factory.service.webAPI.Identifier.COA, params.theaterCode, params.ticketResult.ticketCode);
-    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: {
-            ja: params.ticketResult.ticketName,
-            en: (typeof params.ticketResult.ticketNameEng === 'string')
-                ? params.ticketResult.ticketNameEng
-                : ''
-        }, description: {
+    const offerName = {
+        ja: params.ticketResult.ticketName,
+        en: (typeof params.ticketResult.ticketNameEng === 'string')
+            ? 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, id: '', identifier: identifier, name: offerName, description: {
             ja: '',
             en: ''
         }, alternateName: {

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

@@ -1,6 +1,7 @@
 import * as COA from '@motionpicture/coa-service';
 import { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function importFromCOA(params: {
     project: {
         id: string;
@@ -9,6 +10,7 @@ export declare function importFromCOA(params: {
 }): (repos: {
     categoryCode: CategoryCodeRepo;
     offer: OfferRepo;
+    task: TaskRepo;
     masterService: COA.service.Master;
 }) => Promise<void>;
 /**

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

@@ -1,5 +1,6 @@
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
@@ -8,6 +9,7 @@ interface ISearchEventTicketOffersRepos {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;
     product: ProductRepo;
 }
@@ -47,6 +49,7 @@ declare function searchEventTicketOffers(params: {
     page?: number;
     addSortIndex: boolean;
     validateOfferRateLimit: boolean;
+    useIncludeInDataCatalog: boolean;
 }): ISearchEventTicketOffersOperation<{
     ticketOffers: ITicketOfferWithSortIndex[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];

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

@@ -15,7 +15,7 @@ const factory = require("../../../factory");
 const factory_1 = require("../factory");
 function searchTicketOffersByItemOffered(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         let catalogId;
         if (typeof ((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
             const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id }, ['hasOfferCatalog'], []);
@@ -26,19 +26,47 @@ function searchTicketOffersByItemOffered(params) {
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
-        const { offers, sortedOfferIds } = yield repos.offer.findOffersByOfferCatalogId({
-            ids: params.ids,
-            offerCatalog: { id: catalogId },
-            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
-            unacceptedPaymentMethod: params.unacceptedPaymentMethod,
-            excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
-            onlyValid: params.onlyValid === true,
-            // Mongoのpagingを利用するオプション(2023-02-21~)
-            limit: params.limit,
-            page: params.page,
-            sort: false
-        });
-        return { availableOffers: offers, sortedOfferIds };
+        // サブカタログIDを決定
+        let subOfferCatalogId = catalogId;
+        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
+        if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
+            subOfferCatalogId = offerCatalogFirstElement.id;
+        }
+        if (params.withSortIndex) {
+            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            if (Array.isArray(params.ids)) {
+                throw new factory.errors.NotImplemented('id specification on addSortIndex not implemented');
+            }
+            const { offers, sortedOfferIds } = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
+                // ids: params.ids,
+                subOfferCatalog: { id: subOfferCatalogId },
+                availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+                unacceptedPaymentMethod: params.unacceptedPaymentMethod,
+                excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
+                onlyValid: params.onlyValid === true,
+                useIncludeInDataCatalog: params.useIncludeInDataCatalog,
+                limit: params.limit,
+                page: params.page
+            });
+            return { availableOffers: offers, sortedOfferIds };
+        }
+        else {
+            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            if (!Array.isArray(params.ids)) {
+                throw new factory.errors.ArgumentNull('ids', 'ids must be specified');
+            }
+            const { offers } = yield repos.offer.searchByIdsAndOfferCatalogId({
+                ids: params.ids,
+                subOfferCatalog: { id: subOfferCatalogId },
+                availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
+                unacceptedPaymentMethod: params.unacceptedPaymentMethod,
+                excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
+                onlyValid: params.onlyValid === true,
+                limit: params.limit,
+                page: params.page
+            });
+            return { availableOffers: offers };
+        }
     });
 }
 /**
@@ -84,7 +112,9 @@ function searchEventTicketOffersByEvent(params) {
             page: params.page,
             onlyValid: params.onlyValid,
             unacceptedPaymentMethod,
-            excludeAppliesToMovieTicket
+            excludeAppliesToMovieTicket,
+            withSortIndex: params.addSortIndex,
+            useIncludeInDataCatalog: params.useIncludeInDataCatalog
         })(repos);
         // 冗長な検索について最適化(2023-03-03~)
         const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({
@@ -98,7 +128,7 @@ function searchEventTicketOffersByEvent(params) {
         for (const availableOffer of availableOffers) {
             let sortIndex;
             if (params.addSortIndex) {
-                sortIndex = sortedOfferIds.indexOf(String(availableOffer.id));
+                sortIndex = sortedOfferIds === null || sortedOfferIds === void 0 ? void 0 : sortedOfferIds.indexOf(String(availableOffer.id));
             }
             let availability;
             if (params.validateOfferRateLimit) {
@@ -248,7 +278,8 @@ function searchEventTicketOffers(params) {
                     page: params.page,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
-                    onlyValid: params.onlyValid === true
+                    onlyValid: params.onlyValid === true,
+                    useIncludeInDataCatalog: params.useIncludeInDataCatalog
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;