@chevre/domain 21.4.0-alpha.1 → 21.4.0-alpha.10

package/lib/chevre/repo/mongoose/schemas/event.d.ts

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Event";
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,11 +53,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     checkInCount: number;
     attendeeCount: number;
+    organizer: any;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -86,11 +87,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     checkInCount: number;
     attendeeCount: number;
+    organizer: any;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -119,11 +121,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     checkInCount: number;
     attendeeCount: number;
+    organizer: any;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;

package/lib/chevre/repo/mongoose/schemas/event.js

@@ -7,10 +7,17 @@ const factory = require("../../../factory");
 const modelName = 'Event';
 exports.modelName = modelName;
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    organizer: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     _id: String,
     typeOf: {
         type: String,
@@ -78,6 +85,12 @@ schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ 'project.id': 1, startDate: 1 }, {
     name: 'searchByProjectId-v20220721'
 });
+schema.index({ 'organizer.id': 1, startDate: 1 }, {
+    name: 'searchByOrganizerId',
+    partialFilterExpression: {
+        'organizer.id': { $exists: true }
+    }
+});
 schema.index({ typeOf: 1, startDate: 1 }, { name: 'searchByTypeOf' });
 schema.index({ eventStatus: 1, startDate: 1 }, { name: 'searchByEventStatus' });
 schema.index({ name: 1, startDate: 1 }, { name: 'searchByName' });

package/lib/chevre/repo/productOffer.d.ts

@@ -1,6 +1,5 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
-export type IAvailablePaymentServiceType = factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
 /**
  * プロダクトオファーリポジトリ
  */
@@ -18,15 +17,56 @@ export declare class MongoRepository {
                 $eq?: string;
             };
         };
-        id?: {
-            $eq?: string;
+        itemOffered?: {
+            id?: {
+                $eq?: string;
+            };
         };
         seller?: {
             id?: {
                 $eq?: string;
             };
         };
-    }): Promise<(Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'> & {
-        offers: Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'>;
+    }): Promise<(Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'> & {
+        itemOffered: Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'>;
     })[]>;
+    create(params: factory.product.IOffer & {
+        project: {
+            id: string;
+        };
+        itemOffered: {
+            /**
+             * プロダクトID
+             */
+            id: string;
+        };
+    }): Promise<{
+        id: string;
+    }>;
+    update(params: factory.product.IOffer & {
+        project: {
+            id: string;
+        };
+        itemOffered: {
+            /**
+             * プロダクトID
+             */
+            id: string;
+        };
+    }): Promise<{
+        id: string;
+    }>;
+    deleteOne(params: Pick<factory.product.IOffer, 'seller'> & {
+        project: {
+            id: string;
+        };
+        itemOffered: {
+            /**
+             * プロダクトID
+             */
+            id: string;
+        };
+    }): Promise<{
+        id: string;
+    }>;
 }

package/lib/chevre/repo/productOffer.js

@@ -25,7 +25,7 @@ class MongoRepository {
      * プロダクトオファー検索
      */
     search(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{
                     $match: {
@@ -41,11 +41,11 @@ class MongoRepository {
             if (typeof projectIdEq === 'string') {
                 matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
             }
-            const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
-            if (typeof idEq === 'string') {
-                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } } });
+            const itemOfferedIdEq = (_d = (_c = params.itemOffered) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof itemOfferedIdEq === 'string') {
+                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(itemOfferedIdEq) } } });
             }
-            const sellerIdEq = (_e = (_d = params.seller) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+            const sellerIdEq = (_f = (_e = params.seller) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof sellerIdEq === 'string') {
                 matchStages.push({ $match: { 'offers.seller.id': { $exists: true, $eq: sellerIdEq } } });
             }
@@ -60,16 +60,16 @@ class MongoRepository {
                 {
                     $project: {
                         _id: 0,
-                        offers: {
-                            availabilityEnds: '$offers.availabilityEnds',
-                            availabilityStarts: '$offers.availabilityStarts',
-                            validFrom: '$offers.validFrom',
-                            validThrough: '$offers.validThrough',
-                            seller: '$offers.seller'
+                        itemOffered: {
+                            id: { $toString: '$_id' },
+                            name: '$name',
+                            typeOf: '$typeOf'
                         },
-                        id: { $toString: '$_id' },
-                        name: '$name',
-                        typeOf: '$typeOf'
+                        availabilityEnds: '$offers.availabilityEnds',
+                        availabilityStarts: '$offers.availabilityStarts',
+                        validFrom: '$offers.validFrom',
+                        validThrough: '$offers.validThrough',
+                        seller: '$offers.seller'
                     }
                 }
             ]);
@@ -82,5 +82,104 @@ class MongoRepository {
                 .exec();
         });
     }
+    create(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof sellerId !== 'string' || sellerId.length === 0) {
+                throw new factory.errors.ArgumentNull('seller.id');
+            }
+            // プロダクト存在確認
+            let doc = yield this.productModel.findOne({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.itemOffered.id }
+            }, { _id: 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Product');
+            }
+            const creatingOffer = {
+                priceCurrency: factory.priceCurrency.JPY,
+                availabilityEnds: params.availabilityEnds,
+                availabilityStarts: params.availabilityStarts,
+                validFrom: params.validFrom,
+                validThrough: params.validThrough,
+                seller: { id: sellerId },
+                typeOf: factory.offerType.Offer
+            };
+            doc = yield this.productModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.itemOffered.id },
+                'offers.seller.id': { $ne: sellerId }
+            }, {
+                $push: { offers: creatingOffer }
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
+                .exec();
+            // 存在しなければプロバイダーID重複
+            if (doc === null) {
+                throw new factory.errors.AlreadyInUse('offers.seller', ['id']);
+            }
+            return doc.toObject();
+        });
+    }
+    update(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof sellerId !== 'string' || sellerId.length === 0) {
+                throw new factory.errors.ArgumentNull('seller.id');
+            }
+            const doc = yield this.productModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.itemOffered.id },
+                'offers.seller.id': { $exists: true, $eq: sellerId }
+            }, Object.assign(Object.assign(Object.assign(Object.assign({}, (params.availabilityEnds instanceof Date)
+                ? { 'offers.$[offerBySeller].availabilityEnds': params.availabilityEnds }
+                : undefined), (params.availabilityStarts instanceof Date)
+                ? { 'offers.$[offerBySeller].availabilityStarts': params.availabilityStarts }
+                : undefined), (params.validFrom instanceof Date)
+                ? { 'offers.$[offerBySeller].validFrom': params.validFrom }
+                : undefined), (params.validThrough instanceof Date)
+                ? { 'offers.$[offerBySeller].validThrough': params.validThrough }
+                : undefined), {
+                new: true,
+                arrayFilters: [
+                    { 'offerBySeller.seller.id': { $eq: sellerId } }
+                ],
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Product');
+            }
+            return doc.toObject();
+        });
+    }
+    deleteOne(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof sellerId !== 'string' || sellerId.length === 0) {
+                throw new factory.errors.ArgumentNull('seller.id');
+            }
+            const doc = yield this.productModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.itemOffered.id },
+                'offers.seller.id': { $exists: true, $eq: sellerId }
+            }, {
+                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Product');
+            }
+            return doc.toObject();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/seller.d.ts

@@ -34,10 +34,8 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions): any[];
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions: {
-        id: string;
-    }, inclusion: string[], exclusion: string[]): Promise<ISeller>;
     /**
      * 販売者を保管する
      */
@@ -73,6 +71,9 @@ export declare class MongoRepository {
      * 販売者を削除する
      */
     deleteById(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<void>;
     /**

package/lib/chevre/repo/seller.js

@@ -128,37 +128,39 @@ class MongoRepository {
     }
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions, 
-    // projection?: any
-    inclusion, exclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
-            }
-            else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
-            }
-            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, projection)
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.organizationModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
+    // public async findById(
+    //     conditions: {
+    //         id: string;
+    //     },
+    //     inclusion: string[],
+    //     exclusion: string[]
+    // ): Promise<ISeller> {
+    //     let projection: { [key: string]: number } = {};
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         inclusion.forEach((field) => {
+    //             projection[field] = 1;
+    //         });
+    //     } else {
+    //         projection = {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         };
+    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
+    //             exclusion.forEach((field) => {
+    //                 projection[field] = 0;
+    //             });
+    //         }
+    //     }
+    //     const doc = await this.organizationModel.findOne({ _id: conditions.id }, projection)
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.organizationModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     /**
      * 販売者を保管する
      */
@@ -172,7 +174,10 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
-                const doc = yield this.organizationModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const doc = yield this.organizationModel.findOneAndUpdate({
+                    _id: params.id,
+                    'project.id': { $eq: project.id }
+                }, updateFields, { upsert: false, new: true })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.organizationModel.modelName);
@@ -182,12 +187,6 @@ class MongoRepository {
             return organization;
         });
     }
-    // public async count(params: factory.seller.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.organizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * 販売者検索
      */
@@ -270,7 +269,10 @@ class MongoRepository {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.organizationModel.findOneAndRemove({ _id: params.id })
+            yield this.organizationModel.findOneAndRemove({
+                _id: params.id,
+                'project.id': { $eq: params.project.id }
+            })
                 .exec();
         });
     }

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

@@ -1,4 +1,4 @@
-import { MongoRepository as EventRepo } from '../../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
@@ -28,5 +28,5 @@ export declare function aggregateScreeningEvent(params: {
     id: string;
 }): IAggregateScreeningEventOperation<void>;
 export declare function aggregateByEvent(params: {
-    event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): IAggregateScreeningEventOperation<void>;

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -28,7 +28,15 @@ function validateAccount(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted`);

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

@@ -210,7 +210,15 @@ function validateSeller(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');

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

@@ -1,4 +1,5 @@
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 import { IAcceptedAddOn } from './factory/price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export { IAcceptedAddOn };
@@ -46,9 +47,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 +62,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

@@ -327,7 +327,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 +345,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

package/lib/chevre/service/event.js

@@ -92,6 +92,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 +120,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 +135,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 +148,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 +238,8 @@ function saveScreeningEventSeries(params) {
                 eizouKubuns: eizouKubuns,
                 joueihousikiKubuns: joueihousikiKubuns,
                 jimakufukikaeKubuns: jimakufukikaeKubuns,
-                availablePaymentMethodTypes
+                availablePaymentMethodTypes,
+                seller: params.seller
             });
         });
         let savedEventsCount = 0;
@@ -362,7 +367,8 @@ function createScreeningEvents(params) {
                 screenRoom: screenRoom,
                 superEvent: screeningEventSeries,
                 serviceKubuns: serviceKubuns,
-                acousticKubuns: acousticKubuns
+                acousticKubuns: acousticKubuns,
+                seller: params.seller
             });
             screeningEvents.push(screeningEvent);
         });
@@ -373,16 +379,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 +393,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 +492,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 +579,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: {