@chevre/domain 21.4.0-alpha.2 → 21.4.0-alpha.21

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

@@ -40,7 +40,7 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        const product = yield repos.product.findById({ id: productId });
+        const product = yield repos.product.findById({ id: productId }, [], []);
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
@@ -124,7 +124,7 @@ function createTransactionObject(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id });
+        const product = yield repos.product.findById({ id: params.issuedThrough.id }, [], []);
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -1,10 +1,16 @@
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 import { IAcceptedAddOn } from './factory/price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export { IAcceptedAddOn };
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
+    provider: {
+        /**
+         * 販売者ID
+         */
+        id: string;
+    };
     reservationNumber: string;
-    disablePendingReservations: boolean;
     useHoldStockByTransactionNumber: boolean;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
 /**
@@ -46,9 +52,9 @@ export declare function createAdditionalTicketText(params: {
     reservedTicket: factory.reservation.ITicket;
 }): string | undefined;
 export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
-export declare function createReservationFor(params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent): factory.assetTransaction.reserve.IReservationFor;
+export declare function createReservationFor(params: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>): factory.assetTransaction.reserve.IReservationFor;
 export declare function createIssuedThrough(params: {
-    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
@@ -61,7 +67,7 @@ export declare function createReservation(params: {
     reserveDate: Date;
     agent: factory.assetTransaction.reserve.IAgent;
     reservationNumber: string;
-    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
     reservedTicket: factory.reservation.ITicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;

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

@@ -11,9 +11,13 @@ const price_1 = require("./factory/price");
 function createStartParams(params) {
     var _a;
     const reservationNumber = params.reservationNumber;
-    const reservationPackage = Object.assign({ 
-        // project: params.project,
-        reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+    const provider = {
+        id: params.provider.id,
+        typeOf: factory.organizationType.Corporation
+    };
+    const reservationPackage = Object.assign({ provider, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, 
+        // trueで固定(2023-07-19~)
+        disablePendingReservations: true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
@@ -327,7 +331,9 @@ function createAdditionalTicketText(params) {
     return (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalTicketText;
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
-function createReservationFor(params) {
+function createReservationFor(
+// params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent
+params) {
     var _a, _b;
     if (params.typeOf === factory.eventType.ScreeningEvent) {
         return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
@@ -343,7 +349,9 @@ function createReservationFor(params) {
     }
 }
 exports.createReservationFor = createReservationFor;
-function optimizeReservationSuperEvent(params) {
+function optimizeReservationSuperEvent(
+// params: factory.event.screeningEvent.IEvent
+params) {
     const superEvent = params.superEvent;
     return Object.assign(Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
             ? superEvent.additionalProperty
@@ -409,36 +417,14 @@ function createReservation(params) {
     }
     // priceを最適化
     const price4reservation = (0, price_1.createPrice)(params);
-    // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>params.reservationFor.offers;
-    // // offersは必ず存在するはず
-    // if (eventOffers === undefined) {
-    //     throw new factory.errors.NotFound('reservationFor.offers');
-    // }
-    // const serviceTypeOfIssuedThrough: factory.reservation.eventReservation.IServiceTypeOfIssuedThrough | undefined
-    //     = (typeof eventOffers.itemOffered.serviceType?.codeValue === 'string')
-    //         ? {
-    //             codeValue: eventOffers.itemOffered.serviceType.codeValue,
-    //             inCodeSet: {
-    //                 typeOf: 'CategoryCodeSet',
-    //                 identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
-    //             },
-    //             typeOf: 'CategoryCode'
-    //         }
-    //         : undefined;
-    // const availableChannel: factory.reservation.IServiceChannel = eventOffers.itemOffered.availableChannel;
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        // const issuedThrough: factory.reservation.eventReservation.IIssuedThrough = {
-        //     typeOf: factory.product.ProductType.EventService,
-        //     // 興行IDを追加(2022-09-08~)
-        //     id: eventOffers.itemOffered.id,
-        //     availableChannel,
-        //     // issuedThrough.serviceTypeを連携
-        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
-        // };
         return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, 
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, 
+            // statusは不要なので削除(2023-07-19~)
+            // reservationStatus: factory.reservationStatusType.ReservationPending,
+            reservedTicket: params.reservedTicket, 
             // 最適化(2022-12-19~)
             underName: {
                 typeOf: params.agent.typeOf,
@@ -459,18 +445,13 @@ function createReservation(params) {
             : undefined);
     }
     else {
-        // const issuedThrough: factory.reservation.busReservation.IIssuedThrough = {
-        //     typeOf: factory.product.ProductType.Transportation,
-        //     // 興行IDを追加(2022-09-08~)
-        //     id: eventOffers.itemOffered.id,
-        //     availableChannel,
-        //     // issuedThrough.serviceTypeを連携
-        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
-        // };
         return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: {
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, 
+            // statusは不要なので削除(2023-07-19~)
+            // reservationStatus: factory.reservationStatusType.ReservationPending,
+            reservedTicket: params.reservedTicket, underName: {
                 typeOf: params.agent.typeOf,
                 name: params.agent.name
             }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))

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

@@ -96,7 +96,6 @@ type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail &
  * 取引開始
  */
 export declare function start(params: IStartParams & {
-    disablePendingReservations: boolean;
     useHoldStockByTransactionNumber: boolean;
     stockHoldUntilDaysAfterEventEnd: number;
 }): IStartOperation<{

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

@@ -55,7 +55,7 @@ function start(params) {
             now,
             store: { id: (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id }
         });
-        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { reservationNumber: reservationNumber }));
+        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber: reservationNumber }));
         // 取引作成
         let transaction;
         try {
@@ -139,20 +139,6 @@ function addReservations(params) {
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
         const { issuedThrough } = (0, factory_1.createIssuedThrough)({ reservationFor: event });
-        // const minimizedObjectSubReservations: factory.assetTransaction.reserve.IMinimizedObjectSubReservation[] =
-        //     objectSubReservations.map((r) => {
-        //         return {
-        //             id: r.id,
-        //             typeOf: r.typeOf,
-        //             reservedTicket: {
-        //                 ticketType: r.reservedTicket.ticketType,
-        //                 ...(typeof r.reservedTicket.ticketedSeat?.typeOf === 'string')
-        //                     ? { ticketedSeat: r.reservedTicket.ticketedSeat }
-        //                     : undefined
-        //             },
-        //             ...(Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined
-        //         };
-        //     });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -165,9 +151,7 @@ function addReservations(params) {
                     // issuedThroughを追加(2023-06-05~)
                     issuedThrough,
                     reservationFor,
-                    // subReservationにreservationForを保管しない(2021-10-19～)
                     subReservation: objectSubReservations
-                    // subReservation: minimizedObjectSubReservations
                 }
             });
         }
@@ -191,10 +175,11 @@ function addReservations(params) {
             },
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         })(repos);
-        if (transaction.object.disablePendingReservations !== true) {
-            // 予約作成(insertManyで実装)
-            yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
-        }
+        // 完全廃止(2023-07-19~)
+        // if (transaction.object.disablePendingReservations !== true) {
+        //     // 予約作成(insertManyで実装)
+        //     await repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
+        // }
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event })(repos);
         return { transaction, objectSubReservations, issuedThrough };
@@ -546,7 +531,7 @@ function validateProgramMembershipUsed(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id });
+        const product = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

package/lib/chevre/service/event/createEvent.d.ts

@@ -0,0 +1,9 @@
+import * as factory from '../../factory';
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as EventRepo } from '../../repo/event';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+export declare function createEvent(params: factory.task.createEvent.IData): (repos: {
+    action: ActionRepo;
+    event: EventRepo;
+    task: TaskRepo;
+}) => Promise<void>;

package/lib/chevre/service/event/createEvent.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEvent = void 0;
+const factory = require("../../factory");
+// tslint:disable-next-line:max-func-body-length
+function createEvent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const actionAttributes = params;
+        const action = yield repos.action.start(actionAttributes);
+        let eventIds = [];
+        let eventType;
+        try {
+            if (((_a = actionAttributes.instrument) === null || _a === void 0 ? void 0 : _a.createScreeningEventSeriesIfNotExistByWorkPerformed) === true) {
+                const bulkWriteResult = yield repos.event.createScreeningEventSeriesIfNotExistByWorkPerformed(actionAttributes.object.map((p) => {
+                    if (p.typeOf !== factory.eventType.ScreeningEventSeries) {
+                        throw new factory.errors.Argument('typeOf', `must be ${factory.eventType.ScreeningEventSeries}`);
+                    }
+                    return { attributes: p };
+                }));
+                let upsertedIds;
+                if (bulkWriteResult !== undefined) {
+                    upsertedIds = bulkWriteResult.getUpsertedIds()
+                        .map((doc) => doc._id.toString());
+                }
+                eventIds = (Array.isArray(upsertedIds)) ? upsertedIds : [];
+                eventType = factory.eventType.ScreeningEventSeries;
+            }
+            else {
+                // no op
+                throw new factory.errors.NotImplemented('only createScreeningEventSeriesIfNotExistByWorkPerformed implemented');
+            }
+        }
+        catch (error) {
+            // actionにエラー結果を追加
+            try {
+                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        // アクション完了
+        yield repos.action.complete({
+            typeOf: action.typeOf,
+            id: action.id,
+            result: (Array.isArray(eventIds))
+                ? eventIds.map((eventId) => {
+                    return { id: eventId };
+                })
+                : undefined
+        });
+        if (Array.isArray(eventIds) && eventIds.length > 0) {
+            // 非同期に変更(2023-06-08~)
+            const onEventChangedTask = {
+                project: actionAttributes.project,
+                name: factory.taskName.OnEventChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    id: eventIds,
+                    project: { id: actionAttributes.project.id },
+                    typeOf: eventType,
+                    isNew: true,
+                    useInform: true
+                }
+            };
+            yield repos.task.saveMany([onEventChangedTask], { emitImmediately: true });
+        }
+    });
+}
+exports.createEvent = createEvent;

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

@@ -6,6 +6,7 @@ import { MongoRepository as ProjectRepo } from '../repo/project';
 import { MongoRepository as SellerRepo } from '../repo/seller';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
+import { createEvent } from './event/createEvent';
 /**
  * Googleで作品画像を検索する
  */
@@ -71,3 +72,4 @@ export declare function updateEvent4ttts(params: {
     project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<void>;
+export { createEvent };

package/lib/chevre/service/event.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.importFromCOA = void 0;
+exports.createEvent = exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.importFromCOA = void 0;
 /**
  * マスターデータ同期サービス
  */
@@ -21,6 +21,8 @@ const difference = require("lodash.difference");
 const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
+const createEvent_1 = require("./event/createEvent");
+Object.defineProperty(exports, "createEvent", { enumerable: true, get: function () { return createEvent_1.createEvent; } });
 const offer_1 = require("./offer");
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({
@@ -92,6 +94,7 @@ function importFromCOA(params) {
             const sellersWithSameBranchCode = yield repos.seller.search({
                 limit: 1,
                 page: 1,
+                project: { id: { $eq: project.id } },
                 branchCode: { $eq: params.locationBranchCode }
             }, ['_id'], []);
             const seller = sellersWithSameBranchCode.shift();
@@ -119,6 +122,7 @@ function importFromCOA(params) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
             const screeningRooms = yield repos.place.searchScreeningRooms({
+                project: { id: { $eq: project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
             });
             const targetImportFrom = moment(`${moment(params.importFrom)
@@ -133,7 +137,8 @@ function importFromCOA(params) {
                 locationBranchCode: params.locationBranchCode,
                 movieTheater,
                 project: project,
-                saveScreeningEventSeries: params.saveScreeningEventSeries
+                saveScreeningEventSeries: params.saveScreeningEventSeries,
+                seller: { id: seller.id }
             })(repos);
             savedScreeningEventSeriesCount = savedEventsCount;
             try {
@@ -145,7 +150,8 @@ function importFromCOA(params) {
                     screeningEventSerieses: screeningEventSerieses,
                     project: project,
                     targetImportFrom: targetImportFrom.toDate(),
-                    targetImportThrough: targetImportThrough.toDate()
+                    targetImportThrough: targetImportThrough.toDate(),
+                    seller: { id: seller.id }
                 })(repos);
                 savedScreeningEventsCount = screeningEvents.length;
                 // COAから削除されたイベントをキャンセル済ステータスへ変更
@@ -234,7 +240,8 @@ function saveScreeningEventSeries(params) {
                 eizouKubuns: eizouKubuns,
                 joueihousikiKubuns: joueihousikiKubuns,
                 jimakufukikaeKubuns: jimakufukikaeKubuns,
-                availablePaymentMethodTypes
+                availablePaymentMethodTypes,
+                seller: params.seller
             });
         });
         let savedEventsCount = 0;
@@ -362,7 +369,8 @@ function createScreeningEvents(params) {
                 screenRoom: screenRoom,
                 superEvent: screeningEventSeries,
                 serviceKubuns: serviceKubuns,
-                acousticKubuns: acousticKubuns
+                acousticKubuns: acousticKubuns,
+                seller: params.seller
             });
             screeningEvents.push(screeningEvent);
         });
@@ -373,16 +381,6 @@ function cancelDeletedEvents(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // distinctでidのみ取得(2023-01-25~)
         // COAから削除されたイベントをキャンセル済ステータスへ変更
-        // const ids = await repos.event.search<factory.eventType.ScreeningEvent>({
-        //     project: { id: { $eq: params.project.id } },
-        //     typeOf: factory.eventType.ScreeningEvent,
-        //     superEvent: {
-        //         locationBranchCodes: [params.locationBranchCode]
-        //     },
-        //     startFrom: params.targetImportFrom,
-        //     startThrough: params.targetImportThrough
-        // })
-        //     .then((events) => events.map((e) => e.id));
         const ids = yield repos.event.searchIds({
             project: { id: { $eq: params.project.id } },
             typeOf: factory.eventType.ScreeningEvent,
@@ -397,7 +395,10 @@ function cancelDeletedEvents(params) {
         debug(`cancelling ${cancelledIds.length} events...`);
         for (const cancelledId of cancelledIds) {
             try {
-                yield repos.event.cancel({ id: cancelledId });
+                yield repos.event.cancel({
+                    id: cancelledId,
+                    project: { id: params.project.id }
+                });
             }
             catch (error) {
                 // tslint:disable-next-line:no-single-line-block-comment
@@ -493,7 +494,8 @@ function createScreeningEventFromCOA(params) {
         attendeeCount: 0,
         maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
         remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
-        additionalProperty
+        additionalProperty,
+        organizer: { id: params.seller.id }
     };
 }
 function createScreeningEventAdditionalPropertyFromCOA(params) {
@@ -579,12 +581,8 @@ function createScreeningEventSeriesFromCOA(params) {
             kanaName: params.movieTheater.kanaName,
             typeOf: params.movieTheater.typeOf
         },
-        // 不要なので廃止(2023-01-12~)
-        // organizer: {
-        //     typeOf: factory.organizationType.Corporation,
-        //     identifier: params.movieTheater.id,
-        //     name: params.movieTheater.name
-        // },
+        // 必須化(2023-07-12~)
+        organizer: { id: params.seller.id },
         videoFormat: params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0],
         soundFormat: [],
         workPerformed: {
@@ -674,7 +672,7 @@ function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromC
         },
         kanaName: theaterFromCOA.theaterNameKana,
         containsPlace: screensFromCOA.map((screenFromCOA) => {
-            return createScreeningRoomFromCOA(project, screenFromCOA);
+            return createScreeningRoomFromCOA(project, seller, screenFromCOA);
         }),
         typeOf: factory.placeType.MovieTheater,
         telephone: theaterFromCOA.theaterTelNum,
@@ -716,7 +714,7 @@ function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromC
  */
 // tslint:disable-next-line:no-single-line-block-comment
 /* istanbul ignore next */
-function createScreeningRoomFromCOA(project, screenFromCOA) {
+function createScreeningRoomFromCOA(project, seller, screenFromCOA) {
     const sections = [];
     const sectionCodes = [];
     screenFromCOA.listSeat.forEach((seat) => {
@@ -755,7 +753,9 @@ function createScreeningRoomFromCOA(project, screenFromCOA) {
             en: screenFromCOA.screenNameEng
         },
         typeOf: factory.placeType.ScreeningRoom,
-        maximumAttendeeCapacity: sections[0].containsPlace.length
+        maximumAttendeeCapacity: sections[0].containsPlace.length,
+        // 必須化(2023-07-14~)
+        parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };
 }
 function updateEvent4ttts(params) {

package/lib/chevre/service/moneyTransfer.js

@@ -322,7 +322,7 @@ function getIssuedThroughIdByAction(params) {
 function createPermitServiceCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const paymentCardService = yield repos.product.findById({ id: params.issuedThrough.id });
+        const paymentCardService = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
         const permitServiceEndpoint = (_a = paymentCardService.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = paymentCardService.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = paymentCardService.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -57,7 +57,6 @@ declare function authorize(params: {
          */
         id: string;
     };
-    disablePendingReservations: boolean;
     useHoldStockByTransactionNumber: boolean;
     stockHoldUntilDaysAfterEventEnd: number;
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

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

@@ -67,7 +67,8 @@ function authorize(params) {
                         unitPriceOffers,
                         validateEvent: params.validateEvent === true,
                         validateEventOfferPeriod: params.validateEventOfferPeriod === true,
-                        disablePendingReservations: params.disablePendingReservations,
+                        // 完全廃止(2023-07-19~)
+                        // disablePendingReservations: params.disablePendingReservations,
                         useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber,
                         stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
                     })(repos);
@@ -165,7 +166,10 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         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, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, 
+            // 完全廃止(2023-07-19~)
+            // disablePendingReservations: params.disablePendingReservations,
+            useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
         responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({

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

@@ -18,7 +18,7 @@ function searchTicketOffersByItemOffered(params) {
         var _a, _b, _c, _d;
         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 });
+            const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id }, ['hasOfferCatalog'], []);
             if (typeof ((_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }
@@ -53,7 +53,21 @@ function searchEventTicketOffersByEvent(params) {
         let videoFormatTypes = [];
         if (event.typeOf === factory.eventType.ScreeningEvent) {
             // 取得属性最適化(2023-01-25~)
-            const superEvent = yield repos.event.findById({ id: event.superEvent.id }, { soundFormat: 1, videoFormat: 1 });
+            // const superEvent: Pick<factory.event.IEvent<factory.eventType.ScreeningEventSeries>, 'soundFormat' | 'videoFormat'> =
+            //     await repos.event.findById<factory.eventType.ScreeningEventSeries>(
+            //         { id: event.superEvent.id },
+            //         { soundFormat: 1, videoFormat: 1 }
+            //     );
+            const superEvents = yield repos.event.search({
+                limit: 1,
+                page: 1,
+                id: { $eq: event.superEvent.id },
+                typeOf: factory.eventType.ScreeningEventSeries
+            }, { soundFormat: 1, videoFormat: 1 });
+            const superEvent = superEvents.shift();
+            if (superEvent === undefined) {
+                throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
+            }
             soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
             videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
         }

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

@@ -4,7 +4,7 @@ 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: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
 }): factory.action.authorize.offer.seatReservation.IAttributes<WebAPIIdentifier.COA>;
 /**

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

@@ -18,7 +18,7 @@ function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         // プロダクト検索
-        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id });
+        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id }, ['hasOfferCatalog'], []);
         const offerCatalogId = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof offerCatalogId !== 'string') {
             return [];

package/lib/chevre/service/order/returnOrder.js

@@ -14,6 +14,7 @@ const order_1 = require("../../factory/order");
 const factory_1 = require("../delivery/factory");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+// tslint:disable-next-line:max-func-body-length
 function returnOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const orderNumber = params.object.orderNumber;
@@ -21,7 +22,12 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
+        let order = yield repos.order.findByOrderNumber({
+            orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: []
+        });
         // プロジェクト条件検証
         if (order.project.id !== params.project.id) {
             throw new factory.errors.NotFound('Order');
@@ -59,6 +65,7 @@ function returnOrder(params) {
             returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({ ownershipInfo: repos.ownershipInfo });
             // 注文ステータス変更
             order = yield repos.order.returnOrder({
+                project: { id: order.project.id },
                 orderNumber,
                 dateReturned,
                 returner