@chevre/domain 22.14.0-alpha.16 → 22.14.0-alpha.18

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

@@ -0,0 +1,36 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+interface IProductOffer {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+    typeOf: factory.offerType.Offer;
+    /**
+     * プロダクトオファーコード
+     */
+    identifier: string;
+    itemOffered: {
+        typeOf: factory.offerType.AggregateOffer;
+        /**
+         * プロダクトオファーコレクションコード
+         */
+        identifier: string;
+    };
+    availability: factory.itemAvailability.InStock | factory.itemAvailability.OutOfStock;
+    validFrom: Date;
+    validThrough: Date;
+    acceptedPaymentMethod?: {
+        typeOf: 'PaymentMethod';
+        identifier: string;
+    };
+    validForMemberTier?: Pick<factory.issuer.IMemberProgramTier, 'identifier' | 'typeOf'>;
+}
+type IDocType = IProductOffer;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "ProductOffer";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/{offer/event.js → productOffer.js}

@@ -3,25 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
-const settings_1 = require("../../../../settings");
-const writeConcern_1 = require("../../writeConcern");
-const modelName = 'Offer.Event';
+const settings_1 = require("../../../settings");
+const writeConcern_1 = require("../writeConcern");
+const modelName = 'ProductOffer';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    seller: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     identifier: { type: String, required: true },
     itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    availableAtOrFrom: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    availability: { type: String, required: true },
     validFrom: { type: Date, required: true },
     validThrough: { type: Date, required: true },
-    validForMemberTier: { type: mongoose_1.SchemaTypes.Mixed, required: true }
+    // availableAtOrFrom: { type: SchemaTypes.Mixed, required: false },
+    validForMemberTier: { type: mongoose_1.SchemaTypes.Mixed, required: false },
+    acceptedPaymentMethod: { type: mongoose_1.SchemaTypes.Mixed, required: false }
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
     autoCreate: false,
-    collection: 'offers.event',
+    collection: 'productOffers',
     id: true,
     read: settings_1.MONGO_READ_PREFERENCE,
     writeConcern: writeConcern_1.writeConcern,
@@ -46,56 +47,11 @@ const indexes = [
     [
         { validFrom: 1 },
         { name: 'validFrom' }
-    ],
-    [
-        {
-            'itemOffered.id': 1,
-            identifier: 1
-        },
-        {
-            name: 'uniqueByItemOfferedAndIdentifier',
-            unique: true
-        }
-    ],
-    [
-        {
-            'itemOffered.id': 1,
-            'availableAtOrFrom.id': 1,
-            'validForMemberTier.identifier': 1
-        },
-        {
-            name: 'uniqueByItemOfferedAndAvailableAt',
-            unique: true
-        }
-    ],
-    [
-        { 'project.id': 1, validFrom: 1 },
-        { name: 'projectId' }
-    ],
-    [
-        { 'seller.id': 1, validFrom: 1 },
-        { name: 'sellerId' }
-    ],
-    [
-        { identifier: 1, validFrom: 1 },
-        { name: 'identifier' }
-    ],
-    [
-        { 'itemOffered.id': 1, validFrom: 1 },
-        { name: 'itemOfferedId' }
-    ],
-    [
-        { 'availableAtOrFrom.id': 1, validFrom: 1 },
-        { name: 'availableAtOrFromId' }
-    ],
-    [
-        { 'validForMemberTier.identifier': 1, validFrom: 1 },
-        { name: 'validForMemberTierIdentifier' }
     ]
 ];
 exports.indexes = indexes;
 /**
- * イベントオファー(クライアントごとの有効期間)スキーマ
+ * プロダクトオファー(汎用的なオファー設定)スキーマ
  */
 let schema;
 function createSchema() {

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

@@ -1,7 +1,72 @@
-import { Connection } from 'mongoose';
+import type { BulkWriteResult } from 'mongodb';
+import { Connection, FilterQuery } from 'mongoose';
+import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/productOffer';
+export { IDocType as IProductOffer };
+interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: {
+        validFrom?: factory.sortType;
+    };
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    itemOffered?: {
+        identifier?: {
+            $eq?: string;
+        };
+    };
+    validForMemberTier?: {
+        identifier?: {
+            $eq?: string;
+        };
+    };
+    validFrom?: {
+        $lte?: Date;
+    };
+    validThrough?: {
+        $gte?: Date;
+    };
+}
+export type ISavingOffer = Pick<IDocType, 'identifier' | 'itemOffered' | 'project' | 'typeOf' | 'validFrom' | 'validThrough' | 'availability' | 'validForMemberTier' | 'acceptedPaymentMethod'> & {
+    id?: never;
+};
+type IUnset = {
+    [key in keyof IDocType]?: 1;
+};
+type IDocWithId = IDocType & {
+    id: string;
+};
+type IKeyOfProjection = keyof IDocType;
 /**
  * プロダクトオファーリポジトリ
  */
 export declare class ProductOfferRepo {
-    constructor(__: Connection);
+    private readonly productOfferModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
+    findProductOffers(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IDocWithId[]>;
+    /**
+     * オファーコードとオファーコレクションコードをキーにして冪等置換
+     */
+    upsertOffersByIdentifier(params: {
+        $set: Pick<IDocType, 'acceptedPaymentMethod' | 'availability' | 'identifier' | 'itemOffered' | 'project' | 'typeOf' | 'validForMemberTier' | 'validFrom' | 'validThrough'> & {
+            id?: never;
+        };
+        $unset: IUnset;
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setのみ
+         */
+        update: boolean;
+    }): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedNotes: {
+            id: string;
+        }[];
+    } | void>;
 }

package/lib/chevre/repo/productOffer.js

@@ -1,18 +1,159 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductOfferRepo = void 0;
-// import * as factory from '../factory';
-// import { MONGO_MAX_TIME_MS } from '../settings';
-// import { createSchema, IModel, modelName } from './mongoose/schemas/product';
-// type IMatchStage = PipelineStage.Match;
+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'
+];
 /**
  * プロダクトオファーリポジトリ
  */
-// tslint:disable-next-line:no-unnecessary-class
 class ProductOfferRepo {
-    // private readonly productModel: IModel;
-    constructor(__) {
-        // this.productModel = connection.model(modelName, createSchema());
+    constructor(connection) {
+        this.productOfferModel = connection.model(productOffer_1.modelName, (0, productOffer_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) {
+        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));
+            }
+            else {
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            }
+            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 });
+            }
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        });
+    }
+    /**
+     * オファーコードとオファーコレクションコードをキーにして冪等置換
+     */
+    upsertOffersByIdentifier(params, options) {
+        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 });
+                    }
+                });
+            }
+            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 };
+            }
+        });
     }
 }
 exports.ProductOfferRepo = ProductOfferRepo;

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/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';
@@ -14,6 +13,7 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
+import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
@@ -23,7 +23,6 @@ interface IStartOperationRepos {
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;
@@ -33,6 +32,7 @@ interface IStartOperationRepos {
     offerRateLimit: OfferRateLimitRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;

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({

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 { 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'>;
@@ -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,7 +13,6 @@ 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;
@@ -67,7 +66,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, availableAt, verifiedValidForMemberTier, memberProgramIdentifierMustBe } = params;
+        const { acceptedDate, event, verifiedValidForMemberTier, memberProgramIdentifierMustBe, aggregateOfferIdentifier } = 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') {
@@ -79,28 +78,36 @@ function validateMemberTier(params) {
         if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
             throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
         }
-        // イベントオファーを検索して有効期間検証
-        const eventOfferForMemberTier = (yield repos.eventOffer.projectFields({
+        // 有効なプロダクトオファーを検証
+        const productOfferForMemberTier = (yield repos.productOffer.findProductOffers({
             limit: 1,
             page: 1,
             project: { id: { $eq: event.project.id } },
-            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}`);
+            // 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');
         }
+        // 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}`
+        //     );
+        // }
     });
 }
 /**
@@ -108,19 +115,18 @@ function validateMemberTier(params) {
  */
 function validateEventOfferPeriod(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { event, availableAt, validForMemberTierToken } = params;
+        const { event, availableAt, tokenizedMemberProgramTier } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
         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) === params.availableAt.id)
-                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === params.availableAt.id);
+            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);
         });
         if (makesOfferOnApplication === undefined) {
-            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
+            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${availableAt.id}`);
         }
         const validFrom = makesOfferOnApplication.validFrom;
         const validThrough = makesOfferOnApplication.validThrough;
@@ -136,38 +142,53 @@ function validateEventOfferPeriod(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
+        // 有効メンバープログラムティアが存在する場合
         // support validForMemberTier(2025-05-14~)
-        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');
+        if (makesOfferOnApplication.typeOf === factory.offerType.AggregateOffer) {
+            const validForMemberTierExists = makesOfferOnApplication.validForMemberTier.typeOf === 'MemberProgramTier';
+            if (validForMemberTierExists) {
+                const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
+                const memberProgramIdentifierMustBe = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf.identifier;
+                // ティアトークンが必須
+                if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
+                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.token');
+                }
+                // メンバープログラムコード指定が必須
+                if (typeof memberProgramIdentifierMustBe !== 'string' || memberProgramIdentifierMustBe === '') {
+                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.isTierOf.identifier');
+                }
+                // 有効メンバープログラムティアが存在する場合、オファーコレクションコードが必須
+                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 verifiedValidForMemberTier = yield verifyOfferedByToken({
-                secret: issuer.tokenSecret,
-                issuer: issuer.url,
-                token: validForMemberTierToken
-            });
-            yield validateMemberTier({
-                event, availableAt, acceptedDate, verifiedValidForMemberTier,
-                memberProgramIdentifierMustBe
-            })(repos);
         }
     });
 }

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;

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

@@ -48,8 +48,8 @@ function createReserveTransactionStartParams(params) {
         //     }
         // ]
     };
-    const validForMemberTierToken = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
-    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
+    const validForMemberTier = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
+    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.assetTransactionType.Reserve,

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

@@ -8,7 +8,6 @@ import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/even
 import { 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';
@@ -16,6 +15,7 @@ import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { SeatRepo } from '../../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../../repo/product';
+import type { ProductOfferRepo } from '../../../../repo/productOffer';
 import type { ProjectRepo } from '../../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../../repo/setting';
@@ -27,7 +27,7 @@ declare function processStartReserve4chevre(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'> & {
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
@@ -52,7 +52,6 @@ declare function processStartReserve4chevre(params: {
     authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;
@@ -62,6 +61,7 @@ declare function processStartReserve4chevre(params: {
     offerRateLimit: OfferRateLimitRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;

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

@@ -20,13 +20,13 @@ function processStartReserve4chevre(params, options) {
     //     jwt: JWTCredentials;
     // }
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
             // object: <IObjectWithDetail>action.object,
-            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === 'string')
+            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_b = (_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === null || _b === void 0 ? void 0 : _b.token) === 'string')
                 ? { offers: { validForMemberTier: event.offers.validForMemberTier } }
                 : undefined), transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));

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

@@ -8,7 +8,6 @@ import type { EventRepo } from '../../../repo/event';
 import { 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';
@@ -18,6 +17,7 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
+import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
@@ -32,7 +32,6 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;
@@ -46,6 +45,7 @@ interface IAuthorizeRepos {
     paymentService: PaymentServiceRepo;
     priceSpecification: PriceSpecificationRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     project: ProjectRepo;
     seat: SeatRepo;
     setting: SettingRepo;

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

@@ -99,8 +99,8 @@ function validateCreateRequest(params) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         // support validForMemberTier(2025-05-14~)
-        const validForMemberTierToken = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
-        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined);
+        const validForMemberTier = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined);
         return { transaction, event };
     });
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.399.0-alpha.16",
+    "@chevre/factory": "4.399.0-alpha.18",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.14.0-alpha.16"
+  "version": "22.14.0-alpha.18"
 }

package/example/src/chevre/eventOffer/adminEventOffers.ts

@@ -1,67 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const IDENTIFIER = 'xxx';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    // const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-    const eventOfferRepo = await chevre.repository.EventOffer.createInstance(mongoose.connection);
-
-    let docs = await eventOfferRepo.projectFields(
-        {
-            project: { id: { $eq: project.id } },
-            identifier: { $eq: IDENTIFIER }
-        },
-        ['availableAtOrFrom', 'identifier', 'itemOffered', 'project', 'validFrom']
-    );
-    console.log('docs:', docs);
-    console.log(docs.length, 'docs found');
-
-    if (docs.length > 0) {
-        await eventOfferRepo.deleteById({
-            project: { id: docs[0].project.id },
-            id: docs[0].id
-        });
-        console.log('deleted', docs[0].id);
-    }
-
-    await eventOfferRepo.save({
-        attributes: {
-            identifier: IDENTIFIER,
-            project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-            typeOf: chevre.factory.offerType.Offer,
-            itemOffered: {
-                id: 'xxxxx',
-                typeOf: chevre.factory.eventType.ScreeningEvent
-            },
-            seller: {
-                id: 'xxxxx',
-                typeOf: chevre.factory.organizationType.Organization
-            },
-            availableAtOrFrom: { id: 'xxx' },
-            validFrom: new Date(),
-            validThrough: new Date(),
-            validForMemberTier: { identifier: 'xxx', typeOf: 'MemberProgramTier' }
-        }
-    });
-    console.log('created.');
-
-    docs = await await eventOfferRepo.projectFields(
-        {
-            project: { id: { $eq: project.id } },
-            identifier: { $eq: IDENTIFIER }
-        },
-        ['availableAtOrFrom', 'identifier', 'itemOffered', 'project', 'validFrom']
-    );
-    console.log('docs:', docs);
-    console.log(docs.length, 'docs found');
-}
-
-main()
-    .then()
-    .catch(console.error);

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

@@ -1,10 +0,0 @@
-import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
-import * as factory from '../../../../factory';
-type IDocType = factory.eventOffer.IEventOfferForMemberTier;
-type IModel = Model<IDocType>;
-type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
-declare const modelName = "Offer.Event";
-declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): ISchema;
-export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/offer/event.d.ts

@@ -1,38 +0,0 @@
-import { Connection, FilterQuery } from 'mongoose';
-import * as factory from '../../factory';
-import { IDocType } from '../mongoose/schemas/offer/event';
-type ISearchConditions = factory.eventOffer.ISearchConditions;
-export type ISavingOffer = Pick<IDocType, 'availableAtOrFrom' | 'identifier' | 'itemOffered' | 'project' | 'seller' | 'typeOf' | 'validForMemberTier' | 'validFrom' | 'validThrough'> & {
-    id?: never;
-};
-interface IUnset {
-    $unset?: {
-        [key: string]: 1;
-    };
-}
-type IDocWithId = IDocType & {
-    id: string;
-};
-type IKeyOfProjection = keyof IDocType;
-/**
- * イベントオファーリポジトリ
- */
-export declare class EventOfferRepo {
-    private readonly eventOfferModel;
-    constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: ISearchConditions): FilterQuery<IDocType>[];
-    save(params: {
-        id?: string;
-        attributes: ISavingOffer & IUnset;
-    }): Promise<{
-        id: string;
-    }>;
-    projectFields(conditions: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IDocWithId[]>;
-    deleteById(params: {
-        id: string;
-        project: {
-            id: string;
-        };
-    }): Promise<void>;
-}
-export {};

package/lib/chevre/repo/offer/event.js

@@ -1,142 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventOfferRepo = void 0;
-const factory = require("../../factory");
-const settings_1 = require("../../settings");
-const event_1 = require("../mongoose/schemas/offer/event");
-/**
- * イベントオファーリポジトリ
- */
-class EventOfferRepo {
-    constructor(connection) {
-        this.eventOfferModel = connection.model(event_1.modelName, (0, event_1.createSchema)());
-    }
-    // tslint:disable-next-line:max-func-body-length
-    static CREATE_FILTER_QUERY(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        const andConditions = [];
-        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 idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
-        if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
-        }
-        const idIn = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$in;
-        if (Array.isArray(idIn)) {
-            andConditions.push({ _id: { $in: idIn } });
-        }
-        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
-        if (typeof identifierEq === 'string') {
-            andConditions.push({ identifier: { $eq: identifierEq } });
-        }
-        const sellerIdEq = (_g = (_f = params.seller) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$eq;
-        if (typeof sellerIdEq === 'string') {
-            andConditions.push({ 'seller.id': { $eq: sellerIdEq } });
-        }
-        const itemOfferedIdEq = (_j = (_h = params.itemOffered) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$eq;
-        if (typeof itemOfferedIdEq === 'string') {
-            andConditions.push({ 'itemOffered.id': { $eq: itemOfferedIdEq } });
-        }
-        const availableAtOrFromIdEq = (_l = (_k = params.availableAtOrFrom) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
-        if (typeof availableAtOrFromIdEq === 'string') {
-            andConditions.push({ 'availableAtOrFrom.id': { $eq: availableAtOrFromIdEq } });
-        }
-        const validForMemberTierIdentifierEq = (_o = (_m = params.validForMemberTier) === null || _m === void 0 ? void 0 : _m.identifier) === null || _o === void 0 ? void 0 : _o.$eq;
-        if (typeof validForMemberTierIdentifierEq === 'string') {
-            andConditions.push({ 'validForMemberTier.identifier': { $exists: true, $eq: validForMemberTierIdentifierEq } });
-        }
-        return andConditions;
-    }
-    save(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let doc;
-            let savedId;
-            const savingId = params.id;
-            if (typeof savingId === 'string') {
-                if (savingId === '') {
-                    throw new factory.errors.ArgumentNull('id');
-                }
-                const _c = params.attributes, { id, identifier, itemOffered, project, seller, typeOf, availableAtOrFrom, validForMemberTier, $unset } = _c, updateFields = __rest(_c, ["id", "identifier", "itemOffered", "project", "seller", "typeOf", "availableAtOrFrom", "validForMemberTier", "$unset"]);
-                const filter = {
-                    _id: { $eq: savingId },
-                    'project.id': { $eq: project.id }
-                };
-                const update = Object.assign({ $set: Object.assign({}, updateFields) }, ($unset !== undefined && $unset !== null) ? { $unset } : undefined);
-                const options = {
-                    upsert: false,
-                    new: true,
-                    projection: { _id: 1, id: { $toString: '$_id' } }
-                };
-                doc = yield this.eventOfferModel.findOneAndUpdate(filter, update, options)
-                    .lean()
-                    .exec();
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.eventOfferModel.modelName);
-                }
-                savedId = savingId;
-            }
-            else {
-                const _d = params.attributes, { $unset, id } = _d, createParams = __rest(_d, ["$unset", "id"]);
-                const result = yield this.eventOfferModel.insertMany(Object.assign({}, createParams), { rawResult: true });
-                const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
-                if (typeof insertedId !== 'string') {
-                    throw new factory.errors.Internal(`seller not saved unexpectedly. result:${JSON.stringify(result)}`);
-                }
-                savedId = insertedId;
-            }
-            return { id: savedId };
-        });
-    }
-    projectFields(conditions, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const andConditions = EventOfferRepo.CREATE_FILTER_QUERY(conditions);
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(inclusion.map((key) => ([key, 1]))));
-            const query = this.eventOfferModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
-            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
-                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
-                query.limit(conditions.limit)
-                    .skip(conditions.limit * (page - 1));
-            }
-            if (typeof ((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.validFrom) === 'number') {
-                query.sort({ validFrom: conditions.sort.validFrom });
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-        });
-    }
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventOfferModel.findOneAndDelete({
-                _id: { $eq: params.id },
-                'project.id': { $eq: params.project.id }
-            }, { projection: { _id: 1 } })
-                .exec();
-        });
-    }
-}
-exports.EventOfferRepo = EventOfferRepo;