@chevre/domain 21.8.0-alpha.6 → 21.8.0-alpha.60

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

@@ -47,6 +47,7 @@ declare function searchEventTicketOffers(params: {
     page?: number;
     addSortIndex: boolean;
     validateOfferRateLimit: boolean;
+    useOffersAsPrimaryForcible: boolean;
 }): ISearchEventTicketOffersOperation<{
     ticketOffers: ITicketOfferWithSortIndex[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];

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

@@ -36,7 +36,8 @@ function searchTicketOffersByItemOffered(params) {
             // Mongoのpagingを利用するオプション(2023-02-21~)
             limit: params.limit,
             page: params.page,
-            sort: false
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
+            // sort: false // 完全廃止(2023-09-04~)
         });
         return { availableOffers: offers, sortedOfferIds };
     });
@@ -84,7 +85,8 @@ function searchEventTicketOffersByEvent(params) {
             page: params.page,
             onlyValid: params.onlyValid,
             unacceptedPaymentMethod,
-            excludeAppliesToMovieTicket
+            excludeAppliesToMovieTicket,
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
         })(repos);
         // 冗長な検索について最適化(2023-03-03~)
         const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({
@@ -248,7 +250,8 @@ function searchEventTicketOffers(params) {
                     page: params.page,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
-                    onlyValid: params.onlyValid === true
+                    onlyValid: params.onlyValid === true,
+                    useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;

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

@@ -26,6 +26,7 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id,
@@ -46,8 +47,12 @@ function voidTransaction(params) {
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
             // 確定取引に対応(2023-05-07~)
             case factory.transactionStatusType.Confirmed:
-                // アクションステータスを検証する
-                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                // OrderCancelledを考慮(2023-08-30~)
+                const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                if (!orderCancelled) {
+                    // 取り消すべきアクションに絞る
+                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                }
                 break;
             default:
             // no op
@@ -71,44 +76,60 @@ function voidTransaction(params) {
 }
 exports.voidTransaction = voidTransaction;
 function processVoidTransaction4coa(params) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const action = params.action;
-        // COAの場合、resultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
-        if (action.result !== undefined) {
-            const coaRequestBody = action.result.requestBody;
-            const coaResponseBody = action.result.responseBody;
+        // COAの場合、objectあるいはresultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
+        let delTmpReserveParams;
+        // objectに進行中取引情報があれば利用する(2023-09-11~)
+        const pendingTransaction = params.action.object.pendingTransaction;
+        if (typeof (pendingTransaction === null || pendingTransaction === void 0 ? void 0 : pendingTransaction.typeOf) === 'string') {
+            delTmpReserveParams = {
+                theaterCode: pendingTransaction.theaterCode,
+                dateJouei: pendingTransaction.dateJouei,
+                titleCode: pendingTransaction.titleCode,
+                titleBranchNum: pendingTransaction.titleBranchNum,
+                timeBegin: pendingTransaction.timeBegin,
+                tmpReserveNum: pendingTransaction.tmpReserveNum
+            };
+        }
+        else {
+            const coaRequestBody = (_a = params.action.result) === null || _a === void 0 ? void 0 : _a.requestBody;
+            const coaResponseBody = (_b = params.action.result) === null || _b === void 0 ? void 0 : _b.responseBody;
             if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
-                // COAで仮予約取消
-                try {
-                    const reserveService = new COA.service.Reserve({
-                        endpoint: credentials_1.credentials.coa.endpoint,
-                        auth: coaAuthClient
-                    }, { timeout: credentials_1.credentials.coa.timeout });
-                    yield reserveService.delTmpReserve({
-                        theaterCode: coaRequestBody.theaterCode,
-                        dateJouei: coaRequestBody.dateJouei,
-                        titleCode: coaRequestBody.titleCode,
-                        titleBranchNum: coaRequestBody.titleBranchNum,
-                        timeBegin: coaRequestBody.timeBegin,
-                        tmpReserveNum: coaResponseBody.tmpReserveNum
-                    });
-                }
-                catch (error) {
-                    let deleted = false;
-                    // COAサービスエラーの場合ハンドリング
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore if */
-                    if (error.name === 'COAServiceError') {
-                        if (Number.isInteger(error.code) && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
-                            // すでに取消済の場合こうなるので、okとする
-                            if (error.message === '座席取消失敗') {
-                                deleted = true;
-                            }
+                delTmpReserveParams = {
+                    theaterCode: coaRequestBody.theaterCode,
+                    dateJouei: coaRequestBody.dateJouei,
+                    titleCode: coaRequestBody.titleCode,
+                    titleBranchNum: coaRequestBody.titleBranchNum,
+                    timeBegin: coaRequestBody.timeBegin,
+                    tmpReserveNum: coaResponseBody.tmpReserveNum
+                };
+            }
+        }
+        if (delTmpReserveParams !== undefined) {
+            // COAで仮予約取消
+            try {
+                const reserveService = new COA.service.Reserve({
+                    endpoint: credentials_1.credentials.coa.endpoint,
+                    auth: coaAuthClient
+                }, { timeout: credentials_1.credentials.coa.timeout });
+                yield reserveService.delTmpReserve(delTmpReserveParams);
+            }
+            catch (error) {
+                let deleted = false;
+                // COAサービスエラーの場合ハンドリング
+                // tslint:disable-next-line:no-single-line-block-comment
+                /* istanbul ignore if */
+                if (error.name === 'COAServiceError') {
+                    if (Number.isInteger(error.code) && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
+                        // すでに取消済の場合こうなるので、okとする
+                        if (error.message === '座席取消失敗') {
+                            deleted = true;
                         }
                     }
-                    if (!deleted) {
-                        throw error;
-                    }
+                }
+                if (!deleted) {
+                    throw error;
                 }
             }
         }

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

@@ -4,8 +4,9 @@ export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export type IAcceptedOffer4COA = factory.action.authorize.offer.seatReservation.IAcceptedOffer<factory.service.webAPI.Identifier.COA>;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+    pendingTransaction: factory.action.authorize.offer.seatReservation.ICOAPendingTransaction;
 }): factory.action.authorize.offer.seatReservation.IAttributes<WebAPIIdentifier.COA>;
 /**
  * 供給情報から承認アクションの価格を導き出す

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

@@ -17,20 +17,18 @@ function createAuthorizeSeatReservationActionAttributes(params) {
                 typeOf: 'WebAPI'
             }
         },
-        // ↓不要なので廃止(少なくともapiレスポンスにはevent自体含んでいない)(2022-08-19~)
-        // superEvent: params.event.superEvent,
         typeOf: params.event.typeOf
     };
+    const authorizeObject = {
+        typeOf: factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation,
+        acceptedOffer: params.acceptedOffers,
+        event: authorizeObjectEvent,
+        pendingTransaction: params.pendingTransaction
+    };
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        object: {
-            typeOf: factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation,
-            acceptedOffer: params.acceptedOffers,
-            event: authorizeObjectEvent
-            // 不要なので廃止(2022-07-29~)
-            // ...{ offers: params.acceptedOffers } // 互換性維持のため
-        },
+        object: authorizeObject,
         agent: {
             id: transaction.seller.id,
             typeOf: transaction.seller.typeOf,
@@ -41,8 +39,6 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         recipient: {
             typeOf: transaction.agent.typeOf,
             id: transaction.agent.id
-            // ↓不要なので廃止(2022-08-19~)
-            // ...(transaction.agent.identifier !== undefined) ? { identifier: transaction.agent.identifier } : undefined
         },
         purpose: { typeOf: transaction.typeOf, id: transaction.id },
         instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA }

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

@@ -18,8 +18,8 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
  * COA興行オファー承認
  */
-// tslint:disable-next-line:max-func-body-length
 function authorize(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
@@ -28,34 +28,64 @@ function authorize(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id });
-        const availablePaymentMethodTypes = yield repos.categoryCode.search({
-            project: { id: { $eq: transaction.project.id } },
-            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        }, [], []);
-        const seatingTypes = yield repos.categoryCode.search({
-            project: { id: { $eq: transaction.project.id } },
-            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-        }, [], []);
-        const videoFormatTypes = yield repos.categoryCode.search({
-            project: { id: { $eq: transaction.project.id } },
-            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
-        }, [], []);
-        // COA仮予約後にリクエストが来る前提
-        const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
-            object: params.object,
-            project: { id: transaction.project.id },
-            screeningEvent,
-            availablePaymentMethodTypes,
-            seatingTypes,
-            videoFormatTypes
-        })(repos);
+        let screeningEvent;
+        let acceptedOffers;
+        const pendingTransaction = {
+            theaterCode: params.result.requestBody.theaterCode,
+            dateJouei: params.result.requestBody.dateJouei,
+            titleCode: params.result.requestBody.titleCode,
+            titleBranchNum: params.result.requestBody.titleBranchNum,
+            timeBegin: params.result.requestBody.timeBegin,
+            tmpReserveNum: params.result.responseBody.tmpReserveNum,
+            transactionNumber: params.result.responseBody.tmpReserveNum,
+            typeOf: 'COAReserveTransaction'
+        };
+        try {
+            // イベント取得属性最適化(2023-01-23~)
+            screeningEvent =
+                yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id });
+            const availablePaymentMethodTypes = yield repos.categoryCode.search({
+                project: { id: { $eq: transaction.project.id } },
+                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
+            }, [], []);
+            const seatingTypes = yield repos.categoryCode.search({
+                project: { id: { $eq: transaction.project.id } },
+                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
+            }, [], []);
+            const videoFormatTypes = yield repos.categoryCode.search({
+                project: { id: { $eq: transaction.project.id } },
+                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
+            }, [], []);
+            // COA仮予約後にリクエストが来る前提
+            const validateAcceptedOffersResult = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
+                object: params.object,
+                project: { id: transaction.project.id },
+                screeningEvent,
+                availablePaymentMethodTypes,
+                seatingTypes,
+                videoFormatTypes
+            })(repos);
+            acceptedOffers = validateAcceptedOffersResult.acceptedOffers;
+        }
+        catch (error) {
+            // アクション開始前に例外がthrowされてもCOA仮予約を取り消す機会をつくるためにFailedアクションを作成する(2023-09-12~)
+            const failedActionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
+                acceptedOffers: [],
+                event: { id: params.object.event.id, typeOf: factory.eventType.ScreeningEvent },
+                transaction,
+                pendingTransaction
+            });
+            const failedAction = yield repos.action.start(failedActionAttributes);
+            const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+            yield repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error: actionError });
+            throw error;
+        }
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
             acceptedOffers,
             event: screeningEvent,
-            transaction: transaction
+            transaction,
+            pendingTransaction
         });
         const action = yield repos.action.start(actionAttributes);
         try {
@@ -97,8 +127,6 @@ function authorize(params) {
             requestBody: params.result.requestBody,
             responseBody: params.result.responseBody,
             acceptedOffers: acceptedOffers4result
-            // 不要なので廃止(2023-03-27~)
-            // ...{ updTmpReserveSeatArgs, updTmpReserveSeatResult } // 互換性維持のため
         };
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });

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

@@ -1,9 +1,19 @@
 import * as factory from '../../factory';
 type IMovieTicketTypeChargeSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.MovieTicketTypeChargeSpecification>;
 type ICategoryCodeChargeSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>;
+type ITicketOffer = factory.product.ITicketOffer & {
+    parentOffer?: {
+        id: string;
+    };
+};
 declare function createCompoundPriceSpec4event(params: {
     eligibleQuantity: factory.quantitativeValue.IQuantitativeValue<factory.unitCode.C62>;
-    offer: factory.unitPriceOffer.IUnitPriceOffer;
+    offer: factory.unitPriceOffer.IUnitPriceOffer & {
+        offerIndex?: number;
+        parentOffer?: {
+            id: string;
+        };
+    };
     movieTicketTypeChargeSpecs: IMovieTicketTypeChargeSpecification[];
     videoFormatChargeSpecs: ICategoryCodeChargeSpecification[];
     soundFormatChargeSpecs: ICategoryCodeChargeSpecification[];
@@ -11,7 +21,5 @@ declare function createCompoundPriceSpec4event(params: {
     availability?: factory.itemAvailability;
     addOn: factory.product.IMinimizedTicketAddOn[];
     sortIndex?: number;
-}): factory.product.ITicketOffer & {
-    sortIndex?: number;
-};
+}): ITicketOffer;
 export { createCompoundPriceSpec4event };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 function categoryCodeChargePriceSpec2component(params) {
     var _a;
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToCategoryCode: params.appliesToCategoryCode }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
@@ -69,25 +70,22 @@ function createCompoundPriceSpec4event(params) {
         ...mvtkPriceComponents
     ];
     const compoundPriceSpecification = {
-        // 不要な属性を除外(2022-11-02~)
-        // project: params.offer.project,
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
         priceCurrency: factory.priceCurrency.JPY,
         valueAddedTaxIncluded: true,
         priceComponent
     };
     // 必要な属性のみに限定(2023-02-24~)
-    // const { project, ...unitOfferFields4ticketOffer } = params.offer;
-    const { name, description, alternateName, color, typeOf, id, 
-    // addOn,
-    availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered } = params.offer;
-    return Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
-        // addOn,
-        // availability,
-        availableAtOrFrom, category,
+    const { name, description, alternateName, color, typeOf, id, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
+        category,
         eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
         priceCurrency,
         validFrom, validThrough, validRateLimit, additionalProperty,
-        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
+        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (!settings_1.USE_OPTIMIZE_TICKET_OFFER)
+        ? {
+            availableAtOrFrom // 最適化(2023-09-10~)
+        }
+        : undefined), (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -1,6 +1,11 @@
 import * as factory from '../../../factory';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
+type ITicketOffer = factory.product.ITicketOffer & {
+    parentOffer?: {
+        id: string;
+    };
+};
 /**
  * プロダクトオファーを検索する
  */
@@ -19,7 +24,9 @@ export declare function searchProductOffers(params: {
     addSortIndex: boolean;
     limit?: number;
     page?: number;
+    useOffersAsPrimaryForcible: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;
-}) => Promise<factory.product.ITicketOffer[]>;
+}) => Promise<ITicketOffer[]>;
+export {};

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchProductOffers = void 0;
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 /**
  * プロダクトオファーを検索する
  */
@@ -29,11 +30,13 @@ function searchProductOffers(params) {
             excludeAppliesToMovieTicket: false,
             limit: params.limit,
             page: params.page,
-            sort: false,
+            // sort: false, // 完全廃止(2023-09-04~)
             onlyValid: params.onlyValid === true,
-            availableAtOrFrom: params.availableAt
+            availableAtOrFrom: params.availableAt,
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
         });
         return offers.map((o) => {
+            var _a;
             let sortIndex;
             if (params.addSortIndex) {
                 sortIndex = sortedOfferIds.indexOf(String(o.id));
@@ -47,7 +50,11 @@ function searchProductOffers(params) {
                     ...(unitSpec !== undefined) ? [unitSpec] : []
                 ]
             };
-            return Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined);
+            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (!settings_1.USE_OPTIMIZE_TICKET_OFFER)
+                ? {
+                    availableAtOrFrom: o.availableAtOrFrom // 最適化(2023-09-10~)
+                }
+                : undefined), (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined), (typeof o.offerIndex === 'number') ? { offerIndex: o.offerIndex } : undefined), (typeof ((_a = o.parentOffer) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { parentOffer: { id: o.parentOffer.id } } : undefined);
         });
     });
 }

package/lib/chevre/service/offer/product.d.ts

@@ -55,6 +55,7 @@ export declare function search(params: {
     limit?: number;
     page?: number;
     addSortIndex: boolean;
+    useOffersAsPrimaryForcible: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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

@@ -66,7 +66,8 @@ function search(params) {
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
             onlyValid: params.onlyValid,
-            addSortIndex: params.addSortIndex
+            addSortIndex: params.addSortIndex,
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
         })(repos);
         return { offers, product };
         // Mongoへ移行(2023-03-01~)
@@ -211,7 +212,7 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, addSortIndex: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
+        const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, addSortIndex: false, useOffersAsPrimaryForcible: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
         return { product, availableOffers: offers };
     });
 }

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

@@ -71,6 +71,7 @@ export declare function createAggregateScreeningEventIfNotExist(params: {
         id: string;
     }[];
     force: boolean;
+    identifier: string;
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/offer.js

@@ -135,7 +135,8 @@ function onEventChanged(params) {
                         return { id };
                     }),
                     // 新規作成の場合は強制的に集計
-                    force: params.isNew
+                    force: params.isNew,
+                    identifier: `onEventChanged`
                 })(repos);
             }
             // 通知タスク作成(2023-06-08~)
@@ -184,9 +185,12 @@ function createAggregateScreeningEventIfNotExist(params) {
         const project = {
             id: params.project.id, typeOf: factory.organizationType.Project
         };
+        const nowInMilliseconds = Date.now();
         if (params.force) {
             aggregateTasks = params.reservationFor.map((reservationFor) => {
+                const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
                 return {
+                    identifier: taskIdentifier,
                     project,
                     name: factory.taskName.AggregateScreeningEvent,
                     status: factory.taskStatus.Ready,
@@ -209,7 +213,9 @@ function createAggregateScreeningEventIfNotExist(params) {
                 }, { _id: 1 })
                     .exec();
                 if (readyAggregateScreeningEventTaskDoc === null) {
+                    const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
                     aggregateTasks.push({
+                        identifier: taskIdentifier,
                         project,
                         name: factory.taskName.AggregateScreeningEvent,
                         status: factory.taskStatus.Ready,

package/lib/chevre/service/order/confirmPayTransaction.d.ts

@@ -1,7 +1,6 @@
 import * as factory from '../../factory';
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
-import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -21,6 +20,5 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
     seller: SellerRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    registerServiceInProgress: RegisterServiceInProgressRepo;
 }) => Promise<void>;
 export { confirmPayTransaction };