@chevre/domain 22.14.0-alpha.9 → 23.0.0-alpha.1

package/lib/chevre/repo/productOffer.js

@@ -10,189 +10,195 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductOfferRepo = void 0;
-const mongoose_1 = require("mongoose");
-const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const productOffer_1 = require("./mongoose/schemas/productOffer");
+const AVAILABLE_PROJECT_FIELDS = [
+    'identifier',
+    'project',
+    'itemOffered',
+    'offeredBy',
+    'typeOf',
+    'validFrom',
+    'validThrough',
+    'availability',
+    'acceptedPaymentMethod',
+    'validForMemberTier'
+];
 /**
  * プロダクトオファーリポジトリ
  */
 class ProductOfferRepo {
     constructor(connection) {
-        this.productModel = connection.model(product_1.modelName, (0, product_1.createSchema)());
+        this.productOfferModel = connection.model(productOffer_1.modelName, (0, productOffer_1.createSchema)());
     }
-    /**
-     * プロダクトオファー検索
-     */
-    search(params) {
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        const andConditions = [];
+        const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const identifierEq = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const identifierIn = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$in;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $in: identifierIn } });
+        }
+        const itemOfferedIdentifierEq = (_g = (_f = params.itemOffered) === null || _f === void 0 ? void 0 : _f.identifier) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof itemOfferedIdentifierEq === 'string') {
+            andConditions.push({ 'itemOffered.identifier': { $eq: itemOfferedIdentifierEq } });
+        }
+        const itemOfferedIdentifierIn = (_j = (_h = params.itemOffered) === null || _h === void 0 ? void 0 : _h.identifier) === null || _j === void 0 ? void 0 : _j.$in;
+        if (Array.isArray(itemOfferedIdentifierIn)) {
+            andConditions.push({ 'itemOffered.identifier': { $in: itemOfferedIdentifierIn } });
+        }
+        const offeredByIdEq = (_l = (_k = params.offeredBy) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof offeredByIdEq === 'string') {
+            andConditions.push({ 'offeredBy.id': { $eq: offeredByIdEq } });
+        }
+        const sellerByIdEq = (_o = (_m = params.seller) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof sellerByIdEq === 'string') {
+            andConditions.push({ 'offeredBy.id': { $eq: sellerByIdEq } });
+        }
+        const validForMemberTierIdentifierEq = (_q = (_p = params.validForMemberTier) === null || _p === void 0 ? void 0 : _p.identifier) === null || _q === void 0 ? void 0 : _q.$eq;
+        if (typeof validForMemberTierIdentifierEq === 'string') {
+            andConditions.push({ 'validForMemberTier.identifier': { $exists: true, $eq: validForMemberTierIdentifierEq } });
+        }
+        const validFromLte = (_r = params.validFrom) === null || _r === void 0 ? void 0 : _r.$lte;
+        if (validFromLte instanceof Date) {
+            andConditions.push({ validFrom: { $lte: validFromLte } });
+        }
+        const validThroughGte = (_s = params.validThrough) === null || _s === void 0 ? void 0 : _s.$gte;
+        if (validThroughGte instanceof Date) {
+            andConditions.push({ validThrough: { $gte: validThroughGte } });
+        }
+        return andConditions;
+    }
+    findProductOffers(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
-            const matchStages = [{
-                    $match: {
-                        typeOf: {
-                            $in: [
-                                factory.product.ProductType.MembershipService,
-                                factory.product.ProductType.PaymentCard
-                            ]
-                        }
-                    }
-                }];
-            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof projectIdEq === 'string') {
-                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+            var _a;
+            const conditions = ProductOfferRepo.CREATE_MONGO_CONDITIONS(params);
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
-            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) } } });
+            else {
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
             }
-            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 } } });
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.productOfferModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.validFrom) === 'number') {
+                query.sort({ validFrom: params.sort.validFrom });
             }
-            const aggregate = this.productModel.aggregate([
-                { $sort: { productID: factory.sortType.Ascending } },
-                {
-                    $unwind: {
-                        path: '$offers'
-                    }
-                },
-                ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        itemOffered: {
-                            id: { $toString: '$_id' },
-                            name: '$name',
-                            typeOf: '$typeOf'
-                        },
-                        availabilityEnds: '$offers.availabilityEnds',
-                        availabilityStarts: '$offers.availabilityStarts',
-                        validFrom: '$offers.validFrom',
-                        validThrough: '$offers.validThrough',
-                        seller: '$offers.seller'
-                    }
-                }
-            ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
+                query.limit(params.limit)
                     .skip(params.limit * (page - 1));
             }
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    create(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            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) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            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 }
-            })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
                 .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound('Product');
-            }
-            return doc.toObject();
         });
     }
-    deleteOne(params) {
+    /**
+     * オファーコードとオファーコレクションコードをキーにして冪等置換
+     */
+    upsertOffersByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            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 { update } = options;
+            const bulkWriteOps = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set, $unset }) => {
+                    const { availability, identifier, itemOffered, offeredBy, project, validFrom, validThrough, acceptedPaymentMethod, validForMemberTier } = $set;
+                    if (typeof identifier !== 'string' || identifier === '') {
+                        throw new factory.errors.ArgumentNull('identifier');
+                    }
+                    if (typeof itemOffered.identifier !== 'string' || itemOffered.identifier === '') {
+                        throw new factory.errors.ArgumentNull('itemOffered.identifier');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        'project.id': { $eq: project.id },
+                        'itemOffered.identifier': { $eq: itemOffered.identifier },
+                        identifier: { $eq: identifier }
+                    };
+                    queryFilters.push({
+                        'project.id': { $eq: project.id },
+                        'itemOffered.identifier': { $eq: itemOffered.identifier },
+                        identifier: { $eq: identifier }
+                    });
+                    if (update === true) {
+                        const setFields = Object.assign(Object.assign({ availability,
+                            validFrom,
+                            validThrough }, (typeof (acceptedPaymentMethod === null || acceptedPaymentMethod === void 0 ? void 0 : acceptedPaymentMethod.typeOf) === 'string') ? { acceptedPaymentMethod } : undefined), (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.typeOf) === 'string') ? { validForMemberTier } : undefined);
+                        const updateFilter = Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined);
+                        const updateOne = {
+                            filter,
+                            update: updateFilter,
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    else {
+                        const setOnInsert = Object.assign(Object.assign({ itemOffered, offeredBy, identifier, project, typeOf: factory.offerType.Offer, availability,
+                            validFrom,
+                            validThrough }, (typeof (acceptedPaymentMethod === null || acceptedPaymentMethod === void 0 ? void 0 : acceptedPaymentMethod.typeOf) === 'string') ? { acceptedPaymentMethod } : undefined), (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.typeOf) === 'string') ? { validForMemberTier } : undefined);
+                        const updateFilter = {
+                            $setOnInsert: setOnInsert
+                        };
+                        const updateOne = {
+                            filter,
+                            update: updateFilter,
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                });
             }
-            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');
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.productOfferModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedProductOffers = yield this.productOfferModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedProductOffers };
             }
-            return doc.toObject();
         });
     }
-    deleteManyBySellerId(params) {
+    // public async deleteProductOffersByIds(params: {
+    //     project: { id: string };
+    //     ids: string[];
+    // }): Promise<DeleteResult | void> {
+    //     const { project, ids } = params;
+    //     if (Array.isArray(ids) && ids.length > 0) {
+    //         return this.productOfferModel.deleteMany(
+    //             {
+    //                 'project.id': { $eq: project.id },
+    //                 _id: { $in: ids }
+    //             }
+    //         )
+    //             .exec();
+    //     }
+    // }
+    /**
+     * 販売者の提供するプロダクトオファーを削除する
+     */
+    deleteProductOffersBySeller(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            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');
-            }
-            return this.productModel.updateMany({
+            return this.productOfferModel.deleteMany({
                 'project.id': { $eq: params.project.id },
-                'offers.seller.id': { $exists: true, $eq: sellerId }
-            }, {
-                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
+                'offeredBy.id': { $eq: params.offeredBy.id }
             })
                 .exec();
         });

package/lib/chevre/repository.d.ts

@@ -34,7 +34,6 @@ import type { MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import type { MessageRepo } from './repo/message';
 import type { NoteRepo } from './repo/note';
 import type { NoteAboutOrderRepo } from './repo/noteAboutOrder';
-import type { EventOfferRepo } from './repo/offer/event';
 import type { OfferRepo } from './repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from './repo/offerCatalog';
 import type { OfferCatalogItemRepo } from './repo/offerCatalogItem';
@@ -180,10 +179,6 @@ export type Event = EventRepo;
 export declare namespace Event {
     function createInstance(...params: ConstructorParameters<typeof EventRepo>): Promise<EventRepo>;
 }
-export type EventOffer = EventOfferRepo;
-export declare namespace EventOffer {
-    function createInstance(...params: ConstructorParameters<typeof EventOfferRepo>): Promise<EventOfferRepo>;
-}
 export type EventSellerMakesOffer = EventSellerMakesOfferRepo;
 export declare namespace EventSellerMakesOffer {
     function createInstance(...params: ConstructorParameters<typeof EventSellerMakesOfferRepo>): Promise<EventSellerMakesOfferRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = void 0;
+exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -310,19 +310,6 @@ var Event;
     }
     Event.createInstance = createInstance;
 })(Event || (exports.Event = Event = {}));
-var EventOffer;
-(function (EventOffer) {
-    let repo;
-    function createInstance(...params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (repo === undefined) {
-                repo = (yield Promise.resolve().then(() => require('./repo/offer/event'))).EventOfferRepo;
-            }
-            return new repo(...params);
-        });
-    }
-    EventOffer.createInstance = createInstance;
-})(EventOffer || (exports.EventOffer = EventOffer = {}));
 var EventSellerMakesOffer;
 (function (EventSellerMakesOffer) {
     let repo;

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

@@ -24,6 +24,6 @@ type IAggregateOffersOperation<T> = (repos: {
  */
 declare function aggregateOffers(params: {
     id: string;
-    typeOf: factory.eventType.ScreeningEvent | factory.eventType.Event;
+    typeOf: factory.eventType.ScreeningEvent;
 }): IAggregateOffersOperation<void>;
 export { aggregateOffers };

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -43,7 +43,6 @@ function aggregateOffers(params) {
 }
 function aggregateOffersByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const now = new Date();
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
@@ -52,7 +51,7 @@ function aggregateOffersByEvent(params) {
             movieTheaterId = params.event.superEvent.location.id;
         }
         else {
-            movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+            throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
         const screeningRoom = yield repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
@@ -123,10 +122,7 @@ function aggregateReservationByOffer(params) {
         let reservationCount4offer;
         // let attendeeCount4offer: number | undefined;
         // let checkInCount4offer: number | undefined;
-        let reservationType = factory.reservationType.EventReservation;
-        if (params.event.typeOf === factory.eventType.Event) {
-            reservationType = factory.reservationType.BusReservation;
-        }
+        const reservationType = factory.reservationType.EventReservation;
         const offerIdsWithSameCategory = params.availableOffers.filter(({ category }) => {
             var _a;
             return typeof (category === null || category === void 0 ? void 0 : category.codeValue) === 'string' && category.codeValue === ((_a = params.offer.category) === null || _a === void 0 ? void 0 : _a.codeValue);

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -56,19 +56,7 @@ function aggregateScreeningEvent(params) {
                     .add(1, 'hour')
                     .add(-1, 'second')
                     .toDate();
-                if (event.typeOf === factory.eventType.Event) {
-                    aggregatingEvents = yield repos.event.projectEventFields({
-                        limit: 100,
-                        page: 1,
-                        project: { id: { $eq: event.project.id } },
-                        typeOf: event.typeOf,
-                        eventStatuses: [factory.eventStatusType.EventScheduled],
-                        startFrom: startFrom,
-                        startThrough: startThrough,
-                        location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
-                }
-                else if (event.typeOf === factory.eventType.ScreeningEvent) {
+                if (event.typeOf === factory.eventType.ScreeningEvent) {
                     aggregatingEvents = yield repos.event.projectEventFields({
                         limit: 100,
                         page: 1,
@@ -95,7 +83,6 @@ function aggregateByEvent(params, options) {
     return (repos
     // settings: Settings
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const now = new Date();
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
@@ -104,7 +91,7 @@ function aggregateByEvent(params, options) {
             movieTheaterId = params.event.superEvent.location.id;
         }
         else {
-            movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+            throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
         const screeningRoom = yield repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
@@ -224,10 +211,7 @@ function aggregateReservationByEvent(params) {
         let attendeeCount;
         let checkInCount;
         let reservationCount;
-        let reservationType = factory.reservationType.EventReservation;
-        if (params.event.typeOf === factory.eventType.Event) {
-            reservationType = factory.reservationType.BusReservation;
-        }
+        const reservationType = factory.reservationType.EventReservation;
         reservationCount = yield repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },

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

@@ -5,14 +5,13 @@ import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
 import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { ProductRepo } from '../../../../repo/product';
-import type { ProductOfferRepo } from '../../../../repo/productOffer';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 declare function createSubReservations(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     ticketOffers: factory.product.ITicketOffer[];
     availableOffers: factory.unitPriceOffer.IUnitPriceOffer[];
     now: Date;
-    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent;
     availableSeatOffers: factory.place.seat.IPlaceWithOffer[];
     reservationNumber: string;
     availableAtOrFrom?: {
@@ -25,6 +24,5 @@ declare function createSubReservations(params: {
     offerCatalog: OfferCatalogRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
 }) => Promise<IObjectSubReservation[]>;
 export { createSubReservations };

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

@@ -42,7 +42,7 @@ declare function createReservation(params: {
         typeOf: factory.organizationType.Project;
     };
     id: string;
-    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
+    reservationFor: IMinimizedIndividualEvent;
     reservedTicket: IReservedTicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;

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

@@ -13,7 +13,7 @@ declare function createStartParams(params: factory.assetTransaction.reserve.ISta
         id: string;
     };
     reservationNumber: string;
-    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent;
     acceptedOffers4transactionObject: factory.assetTransaction.reserve.IAcceptedOffer4object[];
     objectSubReservations: IObjectSubReservation[];
     instrument: factory.assetTransaction.reserve.IInstrument[];

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

@@ -25,18 +25,13 @@ function createStartParams(params) {
     };
 }
 function createReservationFor(params, useOptimizeReservation) {
-    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, useOptimizeReservation), typeOf: params.typeOf }, (params.doorTime instanceof Date)
             ? { doorTime: params.doorTime }
             : undefined);
     }
     else {
-        const tripByEvent = (_b = (_a = params.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservationFor;
-        if (typeof (tripByEvent === null || tripByEvent === void 0 ? void 0 : tripByEvent.typeOf) !== 'string') {
-            throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput?.reservationFor');
-        }
-        return Object.assign(Object.assign({}, tripByEvent), { arrivalTime: params.endDate, id: params.id, name: params.name, departureTime: params.startDate });
+        throw new factory.errors.NotImplemented(`typeOf: ${params.typeOf}`);
     }
 }
 function optimizeReservationSuperEvent(params, useOptimizeReservation) {

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

@@ -6,7 +6,6 @@ import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../repo/offer/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
@@ -24,7 +23,6 @@ interface IStartOperationRepos {
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -47,9 +47,9 @@ function start(params, options) {
             now,
             store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id }
         })({
-            eventOffer: repos.eventOffer,
             issuer: repos.issuer,
-            memberProgram: repos.memberProgram
+            memberProgram: repos.memberProgram,
+            productOffer: repos.productOffer
         });
         // objectに必要な情報をそろえる
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createObjectAttributes({
@@ -117,10 +117,10 @@ function createObjectAttributes(params, options) {
         const { event, now } = params;
         const reservationNumber = params.transaction.transactionNumber;
         const acceptedOffers = (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer : [];
-        if (event.typeOf !== factory.eventType.ScreeningEvent && event.typeOf !== factory.eventType.Event) {
+        if (event.typeOf !== factory.eventType.ScreeningEvent) {
             throw new factory.errors.Argument('object.reservationFor.id', `invalid event type ${event.typeOf}`);
         }
-        if (event.typeOf === factory.eventType.ScreeningEvent || event.typeOf === factory.eventType.Event) {
+        if (event.typeOf === factory.eventType.ScreeningEvent) {
             validateEvent({ now, event }, options);
         }
         // 受け入れたオファーIDだけ取得する(2023-01-26~)

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

@@ -2,10 +2,10 @@ import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../repo/offer/event';
+import type { ProductOfferRepo } from '../../../repo/productOffer';
 declare function validateStartRequest(params: {
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>, 'offers' | 'id' | 'project'>;
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project'>;
     validateEventOfferPeriod?: boolean;
     validateEvent?: boolean;
     now: Date;
@@ -16,8 +16,8 @@ declare function validateStartRequest(params: {
         id?: string;
     };
 }): (repos: {
-    eventOffer: EventOfferRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;
+    productOffer: ProductOfferRepo;
 }) => Promise<void>;
 export { validateStartRequest };