@chevre/domain 22.14.0-alpha.17 → 22.14.0-alpha.3

package/lib/chevre/repo/productOffer.js

@@ -10,149 +10,191 @@ 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',
-    'typeOf',
-    'validFrom',
-    'validThrough',
-    'availability',
-    'acceptedPaymentMethod',
-    'validForMemberTier'
-];
 /**
  * プロダクトオファーリポジトリ
  */
 class ProductOfferRepo {
     constructor(connection) {
-        this.productOfferModel = connection.model(productOffer_1.modelName, (0, productOffer_1.createSchema)());
+        this.productModel = connection.model(product_1.modelName, (0, product_1.createSchema)());
     }
-    static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const andConditions = [];
-        // const idIn = params.id?.$in;
-        // if (Array.isArray(idIn)) {
-        //     andConditions.push({ _id: { $in: idIn } });
-        // }
-        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') {
-            andConditions.push({ 'project.id': { $eq: projectIdEq } });
-        }
-        const itemOfferedIdentifierEq = (_d = (_c = params.itemOffered) === null || _c === void 0 ? void 0 : _c.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
-        if (typeof itemOfferedIdentifierEq === 'string') {
-            andConditions.push({ 'itemOffered.identifier': { $eq: itemOfferedIdentifierEq } });
-        }
-        const validForMemberTierIdentifierEq = (_f = (_e = params.validForMemberTier) === null || _e === void 0 ? void 0 : _e.identifier) === null || _f === void 0 ? void 0 : _f.$eq;
-        if (typeof validForMemberTierIdentifierEq === 'string') {
-            andConditions.push({ 'validForMemberTier.identifier': { $exists: true, $eq: validForMemberTierIdentifierEq } });
-        }
-        const validFromLte = (_g = params.validFrom) === null || _g === void 0 ? void 0 : _g.$lte;
-        if (validFromLte instanceof Date) {
-            andConditions.push({ validFrom: { $lte: validFromLte } });
-        }
-        const validThroughGte = (_h = params.validThrough) === null || _h === void 0 ? void 0 : _h.$gte;
-        if (validThroughGte instanceof Date) {
-            andConditions.push({ validThrough: { $gte: validThroughGte } });
-        }
-        return andConditions;
-    }
-    findProductOffers(params, inclusion) {
+    /**
+     * プロダクトオファー検索
+     */
+    search(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            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));
+            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 } } });
             }
-            else {
-                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            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 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 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 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;
-                query.limit(params.limit)
+                aggregate.limit(params.limit * page)
                     .skip(params.limit * (page - 1));
             }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
-    /**
-     * オファーコードとオファーコレクションコードをキーにして冪等置換
-     */
-    upsertOffersByIdentifier(params, options) {
+    create(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { update } = options;
-            const bulkWriteOps = [];
-            const queryFilters = [];
-            if (Array.isArray(params)) {
-                params.forEach(({ $set, $unset }) => {
-                    const { availability, identifier, itemOffered, 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, 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 });
-                    }
-                });
+            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');
             }
-            if (bulkWriteOps.length > 0) {
-                const bulkWriteResult = yield this.productOfferModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedNotes = yield this.productOfferModel.find({ $or: queryFilters }, {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                })
-                    .lean()
-                    .exec();
-                return { bulkWriteResult, modifiedNotes };
+            // プロダクト存在確認
+            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 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Product');
+            }
+            return doc.toObject();
+        });
+    }
+    deleteOne(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 }
+            }, {
+                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Product');
+            }
+            return doc.toObject();
+        });
+    }
+    deleteManyBySellerId(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({
+                'project.id': { $eq: params.project.id },
+                'offers.seller.id': { $exists: true, $eq: sellerId }
+            }, {
+                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
+            })
+                .exec();
         });
     }
 }

package/lib/chevre/repo/task.js

@@ -306,8 +306,8 @@ class TaskRepo {
     // resolve uniqueness of identifier(2025-03-27~)
     params, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (params.data.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
-                throw new factory.errors.NotImplemented(`only ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id} implemented`);
+            if (params.data.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.Id) {
+                throw new factory.errors.NotImplemented(`only ${factory.task.deleteTransaction.SpecifyingMethod.Id} implemented`);
             }
             const createdTask = yield this.taskModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },

package/lib/chevre/repository.d.ts

@@ -34,6 +34,7 @@ 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';
@@ -179,6 +180,10 @@ 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.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;
+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;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -310,6 +310,19 @@ 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/assetTransaction/reserve/start/createSubReservations.d.ts

@@ -5,6 +5,7 @@ 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[];
@@ -24,5 +25,6 @@ declare function createSubReservations(params: {
     offerCatalog: OfferCatalogRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
 }) => Promise<IObjectSubReservation[]>;
 export { createSubReservations };

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

@@ -6,6 +6,7 @@ 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';
@@ -23,6 +24,7 @@ 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,
-            productOffer: repos.productOffer
+            memberProgram: repos.memberProgram
         });
         // objectに必要な情報をそろえる
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createObjectAttributes({

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

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

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

@@ -13,6 +13,7 @@ exports.validateStartRequest = validateStartRequest;
 const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../factory");
+const ROLE_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
 function verifyOfferedByToken(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
@@ -66,7 +67,7 @@ function validateStartRequest(params) {
 function validateMemberTier(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
-        const { acceptedDate, event, verifiedValidForMemberTier, memberProgramIdentifierMustBe, aggregateOfferIdentifier } = params;
+        const { acceptedDate, event, availableAt, verifiedValidForMemberTier, memberProgramIdentifierMustBe } = params;
         const tierIdentifier = (_b = (_a = verifiedValidForMemberTier.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.identifier;
         const memberProgramIdentifier = (_e = (_d = (_c = verifiedValidForMemberTier.member) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.isTierOf) === null || _e === void 0 ? void 0 : _e.identifier;
         if (typeof tierIdentifier !== 'string') {
@@ -78,36 +79,28 @@ function validateMemberTier(params) {
         if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
             throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
         }
-        // 有効なプロダクトオファーを検証
-        const productOfferForMemberTier = (yield repos.productOffer.findProductOffers({
+        // イベントオファーを検索して有効期間検証
+        const eventOfferForMemberTier = (yield repos.eventOffer.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: event.project.id } },
-            // availableAtOrFrom: { id: { $eq: availableAt.id } },
-            itemOffered: { identifier: { $eq: aggregateOfferIdentifier } }, // オファーコレクションコード
-            validForMemberTier: { identifier: { $eq: tierIdentifier } },
-            validFrom: { $lte: acceptedDate.toDate() },
-            validThrough: { $gte: acceptedDate.toDate() }
-        }, ['identifier'])).shift();
-        if (productOfferForMemberTier === undefined) {
-            throw new factory.errors.NotFound(factory.offerType.Offer, 'product offer for member tier not found');
+            availableAtOrFrom: { id: { $eq: availableAt.id } },
+            itemOffered: { id: { $eq: event.id } },
+            validForMemberTier: { identifier: { $eq: tierIdentifier } }
+        }, ['validFrom', 'validThrough'])).shift();
+        if (eventOfferForMemberTier === undefined) {
+            throw new factory.errors.NotFound(factory.offerType.Offer, 'event offer for member tier not found');
+        }
+        let validThroughMoment;
+        let validFromMoment;
+        validThroughMoment = moment(eventOfferForMemberTier.validThrough, ROLE_DATE_FORMAT, true);
+        validFromMoment = moment(eventOfferForMemberTier.validFrom, ROLE_DATE_FORMAT, true);
+        if (acceptedDate.isBefore(validFromMoment)) {
+            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `the offer id valid from ${validFromMoment}`);
+        }
+        if (acceptedDate.isAfter(validThroughMoment)) {
+            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `the offer id valid through ${validThroughMoment}`);
         }
-        // let validThroughMoment: moment.Moment;
-        // let validFromMoment: moment.Moment;
-        // validThroughMoment = moment(productOfferForMemberTier.validThrough, ROLE_DATE_FORMAT, true);
-        // validFromMoment = moment(productOfferForMemberTier.validFrom, ROLE_DATE_FORMAT, true);
-        // if (acceptedDate.isBefore(validFromMoment)) {
-        //     throw new factory.errors.Argument(
-        //         'reservationFor.offers.validForMemberTier',
-        //         `the offer id valid from ${validFromMoment}`
-        //     );
-        // }
-        // if (acceptedDate.isAfter(validThroughMoment)) {
-        //     throw new factory.errors.Argument(
-        //         'reservationFor.offers.validForMemberTier',
-        //         `the offer id valid through ${validThroughMoment}`
-        //     );
-        // }
     });
 }
 /**
@@ -123,11 +116,11 @@ function validateEventOfferPeriod(params) {
         const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
             var _a, _b;
             // support non-array(2024-10-11~)
-            return (Array.isArray(offer.availableAtOrFrom) && ((_a = offer.availableAtOrFrom.at(0)) === null || _a === void 0 ? void 0 : _a.id) === availableAt.id)
-                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === availableAt.id);
+            return (Array.isArray(offer.availableAtOrFrom) && ((_a = offer.availableAtOrFrom.at(0)) === null || _a === void 0 ? void 0 : _a.id) === params.availableAt.id)
+                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === params.availableAt.id);
         });
         if (makesOfferOnApplication === undefined) {
-            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${availableAt.id}`);
+            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
         }
         const validFrom = makesOfferOnApplication.validFrom;
         const validThrough = makesOfferOnApplication.validThrough;
@@ -144,45 +137,37 @@ function validateEventOfferPeriod(params) {
             }
         }
         // support validForMemberTier(2025-05-14~)
-        if (makesOfferOnApplication.typeOf === factory.offerType.AggregateOffer) {
-            const memberProgramIdentifierMustBe = (_b = (_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.isTierOf) === null || _b === void 0 ? void 0 : _b.identifier;
-            if (typeof memberProgramIdentifierMustBe === 'string') {
-                // 有効メンバープログラムティアが存在する場合、ティアトークンが必須
-                if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
-                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier');
-                }
-                // 有効メンバープログラムティアが存在する場合、オファーコレクションコードが必須
-                const aggregateOfferIdentifier = makesOfferOnApplication.identifier;
-                if (typeof aggregateOfferIdentifier !== 'string' || aggregateOfferIdentifier === '') {
-                    throw new factory.errors.NotFound('makesOfferOnApplication.identifier');
-                }
-                // トークン検証
-                const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: params.event.project.id } },
-                    identifier: { $eq: memberProgramIdentifierMustBe }
-                })).shift();
-                if (memberProgram === undefined) {
-                    throw new factory.errors.NotFound('MemberProgram');
-                }
-                const issuer = yield repos.issuer.findByIdentifier({
-                    project: { id: params.event.project.id },
-                    identifier: memberProgram.hostingOrganization.identifier
-                });
-                if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
-                    throw new factory.errors.NotFound('issuer.tokenSecret');
-                }
-                const verifiedValidForMemberTier = yield verifyOfferedByToken({
-                    secret: issuer.tokenSecret,
-                    issuer: issuer.url,
-                    token: validForMemberTierToken
-                });
-                yield validateMemberTier({
-                    event, acceptedDate, verifiedValidForMemberTier,
-                    memberProgramIdentifierMustBe, aggregateOfferIdentifier
-                })(repos);
+        const memberProgramIdentifierMustBe = (_b = (_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.isTierOf) === null || _b === void 0 ? void 0 : _b.identifier;
+        if (typeof memberProgramIdentifierMustBe === 'string') {
+            if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
+                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier');
             }
+            // トークン検証
+            const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.event.project.id } },
+                identifier: { $eq: memberProgramIdentifierMustBe }
+            })).shift();
+            if (memberProgram === undefined) {
+                throw new factory.errors.NotFound('MemberProgram');
+            }
+            const issuer = yield repos.issuer.findByIdentifier({
+                project: { id: params.event.project.id },
+                identifier: memberProgram.hostingOrganization.identifier
+            });
+            if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
+                throw new factory.errors.NotFound('issuer.tokenSecret');
+            }
+            const verifiedValidForMemberTier = yield verifyOfferedByToken({
+                secret: issuer.tokenSecret,
+                issuer: issuer.url,
+                token: validForMemberTierToken
+            });
+            yield validateMemberTier({
+                event, availableAt, acceptedDate, verifiedValidForMemberTier,
+                memberProgramIdentifierMustBe
+            })(repos);
         }
     });
 }

package/lib/chevre/service/event.js

@@ -63,8 +63,7 @@ function importFromCOA(params) {
             object: Object.assign(Object.assign({}, params), { startDate: `${moment(targetImportFrom) // debug(2024-04-26~)
                     .toISOString()}/${moment(targetImportThrough)
                     .toISOString()}`, superEvent: { location: { branchCode: params.locationBranchCode } }, typeOf: factory.eventType.ScreeningEvent }),
-            instrument,
-            targetCollection: { typeOf: factory.eventType.ScreeningEvent }
+            instrument
         };
         const action = yield repos.action.start(actionAttributes);
         let savedScreeningEventsCount = 0;
@@ -151,8 +150,7 @@ function processUpdateMovieTheater(params) {
                 theaterCode: params.locationBranchCode,
                 typeOf: 'WebAPI',
                 identifier: factory.service.webAPI.Identifier.COA
-            },
-            targetCollection: { typeOf: factory.placeType.MovieTheater }
+            }
         };
         const action = yield repos.action.start(actionAttributes);
         let seller;
@@ -347,12 +345,6 @@ function createScreeningEvents(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = params.project;
-        if (typeof params.instrument.begin !== 'string') {
-            throw new factory.errors.ArgumentNull('instrument.begin');
-        }
-        if (typeof params.instrument.end !== 'string') {
-            throw new factory.errors.ArgumentNull('instrument.end');
-        }
         // COAからイベント取得;
         const schedulesFromCOA = yield repos.masterService.schedule({
             theaterCode: params.instrument.theaterCode,