@chevre/domain 21.17.0-alpha.9 → 21.17.0

package/lib/chevre/repo/offer.js

@@ -40,7 +40,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46;
         const matchStages = [];
         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') {
@@ -202,7 +202,18 @@ class MongoRepository {
                 }
             });
         }
-        const appliesToMovieTicketServiceOutputTypeOfNin = (_11 = (_10 = (_9 = (_8 = params.priceSpecification) === null || _8 === void 0 ? void 0 : _8.appliesToMovieTicket) === null || _9 === void 0 ? void 0 : _9.serviceOutput) === null || _10 === void 0 ? void 0 : _10.typeOf) === null || _11 === void 0 ? void 0 : _11.$nin;
+        const appliesToMovieTicketServiceOutputTypeOfAll = (_11 = (_10 = (_9 = (_8 = params.priceSpecification) === null || _8 === void 0 ? void 0 : _8.appliesToMovieTicket) === null || _9 === void 0 ? void 0 : _9.serviceOutput) === null || _10 === void 0 ? void 0 : _10.typeOf) === null || _11 === void 0 ? void 0 : _11.$all;
+        if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfAll)) {
+            matchStages.push({
+                $match: {
+                    'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
+                        $exists: true,
+                        $all: appliesToMovieTicketServiceOutputTypeOfAll
+                    }
+                }
+            });
+        }
+        const appliesToMovieTicketServiceOutputTypeOfNin = (_15 = (_14 = (_13 = (_12 = params.priceSpecification) === null || _12 === void 0 ? void 0 : _12.appliesToMovieTicket) === null || _13 === void 0 ? void 0 : _13.serviceOutput) === null || _14 === void 0 ? void 0 : _14.typeOf) === null || _15 === void 0 ? void 0 : _15.$nin;
         if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfNin)) {
             matchStages.push({
                 $match: {
@@ -213,7 +224,7 @@ class MongoRepository {
             });
         }
         if (params.priceSpecification !== undefined && params.priceSpecification !== null) {
-            const priceSpecificationPriceGte = (_12 = params.priceSpecification.price) === null || _12 === void 0 ? void 0 : _12.$gte;
+            const priceSpecificationPriceGte = (_16 = params.priceSpecification.price) === null || _16 === void 0 ? void 0 : _16.$gte;
             if (typeof priceSpecificationPriceGte === 'number') {
                 matchStages.push({
                     $match: {
@@ -224,7 +235,7 @@ class MongoRepository {
                     }
                 });
             }
-            const priceSpecificationPriceLte = (_13 = params.priceSpecification.price) === null || _13 === void 0 ? void 0 : _13.$lte;
+            const priceSpecificationPriceLte = (_17 = params.priceSpecification.price) === null || _17 === void 0 ? void 0 : _17.$lte;
             if (typeof priceSpecificationPriceLte === 'number') {
                 matchStages.push({
                     $match: {
@@ -235,7 +246,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountsReceivableGte = (_15 = (_14 = params.priceSpecification.accounting) === null || _14 === void 0 ? void 0 : _14.accountsReceivable) === null || _15 === void 0 ? void 0 : _15.$gte;
+            const accountsReceivableGte = (_19 = (_18 = params.priceSpecification.accounting) === null || _18 === void 0 ? void 0 : _18.accountsReceivable) === null || _19 === void 0 ? void 0 : _19.$gte;
             if (typeof accountsReceivableGte === 'number') {
                 matchStages.push({
                     $match: {
@@ -246,7 +257,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountsReceivableLte = (_17 = (_16 = params.priceSpecification.accounting) === null || _16 === void 0 ? void 0 : _16.accountsReceivable) === null || _17 === void 0 ? void 0 : _17.$lte;
+            const accountsReceivableLte = (_21 = (_20 = params.priceSpecification.accounting) === null || _20 === void 0 ? void 0 : _20.accountsReceivable) === null || _21 === void 0 ? void 0 : _21.$lte;
             if (typeof accountsReceivableLte === 'number') {
                 matchStages.push({
                     $match: {
@@ -257,7 +268,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountingCodeValueEq = (_20 = (_19 = (_18 = params.priceSpecification.accounting) === null || _18 === void 0 ? void 0 : _18.operatingRevenue) === null || _19 === void 0 ? void 0 : _19.codeValue) === null || _20 === void 0 ? void 0 : _20.$eq;
+            const accountingCodeValueEq = (_24 = (_23 = (_22 = params.priceSpecification.accounting) === null || _22 === void 0 ? void 0 : _22.operatingRevenue) === null || _23 === void 0 ? void 0 : _23.codeValue) === null || _24 === void 0 ? void 0 : _24.$eq;
             if (typeof accountingCodeValueEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -268,7 +279,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountingCodeValueIn = (_23 = (_22 = (_21 = params.priceSpecification.accounting) === null || _21 === void 0 ? void 0 : _21.operatingRevenue) === null || _22 === void 0 ? void 0 : _22.codeValue) === null || _23 === void 0 ? void 0 : _23.$in;
+            const accountingCodeValueIn = (_27 = (_26 = (_25 = params.priceSpecification.accounting) === null || _25 === void 0 ? void 0 : _25.operatingRevenue) === null || _26 === void 0 ? void 0 : _26.codeValue) === null || _27 === void 0 ? void 0 : _27.$in;
             if (Array.isArray(accountingCodeValueIn)) {
                 matchStages.push({
                     $match: {
@@ -279,7 +290,7 @@ class MongoRepository {
                     }
                 });
             }
-            const referenceQuantityValueEq = (_25 = (_24 = params.priceSpecification.referenceQuantity) === null || _24 === void 0 ? void 0 : _24.value) === null || _25 === void 0 ? void 0 : _25.$eq;
+            const referenceQuantityValueEq = (_29 = (_28 = params.priceSpecification.referenceQuantity) === null || _28 === void 0 ? void 0 : _28.value) === null || _29 === void 0 ? void 0 : _29.$eq;
             if (typeof referenceQuantityValueEq === 'number') {
                 matchStages.push({
                     $match: {
@@ -291,7 +302,7 @@ class MongoRepository {
                 });
             }
         }
-        const availabilityEq = (_26 = params.availability) === null || _26 === void 0 ? void 0 : _26.$eq;
+        const availabilityEq = (_30 = params.availability) === null || _30 === void 0 ? void 0 : _30.$eq;
         if (typeof availabilityEq === 'string') {
             matchStages.push({
                 $match: {
@@ -299,7 +310,7 @@ class MongoRepository {
                 }
             });
         }
-        const availableAtOrFromIdEq = (_28 = (_27 = params.availableAtOrFrom) === null || _27 === void 0 ? void 0 : _27.id) === null || _28 === void 0 ? void 0 : _28.$eq;
+        const availableAtOrFromIdEq = (_32 = (_31 = params.availableAtOrFrom) === null || _31 === void 0 ? void 0 : _31.id) === null || _32 === void 0 ? void 0 : _32.$eq;
         if (typeof availableAtOrFromIdEq === 'string') {
             matchStages.push({
                 $match: {
@@ -310,7 +321,7 @@ class MongoRepository {
                 }
             });
         }
-        const availableAtOrFromIdIn = (_30 = (_29 = params.availableAtOrFrom) === null || _29 === void 0 ? void 0 : _29.id) === null || _30 === void 0 ? void 0 : _30.$in;
+        const availableAtOrFromIdIn = (_34 = (_33 = params.availableAtOrFrom) === null || _33 === void 0 ? void 0 : _33.id) === null || _34 === void 0 ? void 0 : _34.$in;
         if (Array.isArray(availableAtOrFromIdIn)) {
             matchStages.push({
                 $match: {
@@ -321,7 +332,7 @@ class MongoRepository {
                 }
             });
         }
-        const addOnItemOfferedIdEq = (_33 = (_32 = (_31 = params.addOn) === null || _31 === void 0 ? void 0 : _31.itemOffered) === null || _32 === void 0 ? void 0 : _32.id) === null || _33 === void 0 ? void 0 : _33.$eq;
+        const addOnItemOfferedIdEq = (_37 = (_36 = (_35 = params.addOn) === null || _35 === void 0 ? void 0 : _35.itemOffered) === null || _36 === void 0 ? void 0 : _36.id) === null || _37 === void 0 ? void 0 : _37.$eq;
         if (typeof addOnItemOfferedIdEq === 'string') {
             matchStages.push({
                 $match: {
@@ -329,7 +340,7 @@ class MongoRepository {
                 }
             });
         }
-        const addOnItemOfferedIdIn = (_36 = (_35 = (_34 = params.addOn) === null || _34 === void 0 ? void 0 : _34.itemOffered) === null || _35 === void 0 ? void 0 : _35.id) === null || _36 === void 0 ? void 0 : _36.$in;
+        const addOnItemOfferedIdIn = (_40 = (_39 = (_38 = params.addOn) === null || _38 === void 0 ? void 0 : _38.itemOffered) === null || _39 === void 0 ? void 0 : _39.id) === null || _40 === void 0 ? void 0 : _40.$in;
         if (Array.isArray(addOnItemOfferedIdIn)) {
             matchStages.push({
                 $match: {
@@ -337,7 +348,7 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_38 = (_37 = params.hasMerchantReturnPolicy) === null || _37 === void 0 ? void 0 : _37.id) === null || _38 === void 0 ? void 0 : _38.$eq;
+        const hasMerchantReturnPolicyIdEq = (_42 = (_41 = params.hasMerchantReturnPolicy) === null || _41 === void 0 ? void 0 : _41.id) === null || _42 === void 0 ? void 0 : _42.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             matchStages.push({
                 $match: {
@@ -348,7 +359,18 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_39 = params.additionalProperty) === null || _39 === void 0 ? void 0 : _39.$all;
+        const acceptedPaymentMethodIdentifierIn = (_44 = (_43 = params.acceptedPaymentMethod) === null || _43 === void 0 ? void 0 : _43.identifier) === null || _44 === void 0 ? void 0 : _44.$in;
+        if (Array.isArray(acceptedPaymentMethodIdentifierIn)) {
+            matchStages.push({
+                $match: {
+                    'offers.acceptedPaymentMethod.identifier': {
+                        $exists: true,
+                        $in: acceptedPaymentMethodIdentifierIn
+                    }
+                }
+            });
+        }
+        const additionalPropertyAll = (_45 = params.additionalProperty) === null || _45 === void 0 ? void 0 : _45.$all;
         if (Array.isArray(additionalPropertyAll)) {
             matchStages.push({
                 $match: {
@@ -359,7 +381,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_40 = params.additionalProperty) === null || _40 === void 0 ? void 0 : _40.$elemMatch;
+        const additionalPropertyElemMatch = (_46 = params.additionalProperty) === null || _46 === void 0 ? void 0 : _46.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             matchStages.push({
                 $match: {
@@ -527,7 +549,7 @@ class MongoRepository {
      * カタログ内ソートインデックスはsortedOfferIdsで判断する
      */
     searchByOfferCatalogIdWithSortIndex(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function* () {
             const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
                 id: params.offerCatalog.id,
@@ -536,17 +558,20 @@ class MongoRepository {
             let offers = [];
             if (sortedOfferIds.length > 0) {
                 const appliesToMovieTicketServiceOutputTypeOfEq = (_d = (_c = (_b = (_a = params.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.typeOf) === null || _d === void 0 ? void 0 : _d.$eq;
-                const appliesToMovieTicketServiceTypeExists = (_g = (_f = (_e = params.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToMovieTicket) === null || _f === void 0 ? void 0 : _f.serviceType) === null || _g === void 0 ? void 0 : _g.$exists;
+                const appliesToMovieTicketServiceOutputTypeOfAll = (_h = (_g = (_f = (_e = params.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToMovieTicket) === null || _f === void 0 ? void 0 : _f.serviceOutput) === null || _g === void 0 ? void 0 : _g.typeOf) === null || _h === void 0 ? void 0 : _h.$all;
+                const appliesToMovieTicketServiceTypeExists = (_l = (_k = (_j = params.priceSpecification) === null || _j === void 0 ? void 0 : _j.appliesToMovieTicket) === null || _k === void 0 ? void 0 : _k.serviceType) === null || _l === void 0 ? void 0 : _l.$exists;
                 // 適用決済カード条件なしのみを検索するかどうか
                 const onlyNoAppliesToMovieTicket = params.excludeAppliesToMovieTicket || (appliesToMovieTicketServiceTypeExists === false);
                 const onlyAppliesToMovieTicket = !params.excludeAppliesToMovieTicket && (appliesToMovieTicketServiceTypeExists === true);
                 const priceSpecificationConditions = {
                     appliesToMovieTicket: Object.assign(Object.assign({ serviceOutput: {
-                            typeOf: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+                            typeOf: Object.assign(Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
                                 // 利用不可決済方法区分条件を追加(2023-02-21~)
                                 ? { $nin: params.unacceptedPaymentMethod }
                                 : undefined), (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string')
                                 ? { $eq: appliesToMovieTicketServiceOutputTypeOfEq }
+                                : undefined), (Array.isArray(appliesToMovieTicketServiceOutputTypeOfAll))
+                                ? { $all: appliesToMovieTicketServiceOutputTypeOfAll }
                                 : undefined)
                         } }, (onlyNoAppliesToMovieTicket)
                         ? { serviceType: { $exists: false } }
@@ -556,7 +581,7 @@ class MongoRepository {
                 };
                 const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ priceSpecification: priceSpecificationConditions, onlyValid: params.onlyValid === true }, (params.useIncludeInDataCatalog)
                     ? { includedInDataCatalog: { id: { $in: [params.offerCatalog.id] } } }
-                    : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_h = params.availableAtOrFrom) === null || _h === void 0 ? void 0 : _h.id) === 'string')
+                    : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_m = params.availableAtOrFrom) === null || _m === void 0 ? void 0 : _m.id) === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } } // store.idでのフィルターをmongoで処理(2023-01-27~)
                     : undefined), (typeof params.limit === 'number' && typeof params.page === 'number')
                     // 明示的なソート指定を調整(決して重複しない属性が相応)(2023-09-07~)

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

@@ -15,11 +15,17 @@ export declare class MongoRepository {
     private readonly offerCatalogItemModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): any[];
-    save(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    save(params: factory.offerCatalog.IOfferCatalog & {
+        $unset?: any;
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * プロジェクトとコードから冪等保管
      */
-    saveByIdentifier(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    saveByIdentifier(params: factory.offerCatalog.IOfferCatalog): Promise<{
+        id: string;
+    }>;
     /**
      * 同期日時を更新する
      */

package/lib/chevre/repo/offerCatalogItem.js

@@ -107,18 +107,18 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
             if (typeof params.id !== 'string' || params.id.length === 0) {
-                const { id } = params, creatingDoc = __rest(params, ["id"]);
+                const { id, $unset } = params, creatingDoc = __rest(params, ["id", "$unset"]);
                 doc = yield this.offerCatalogItemModel.create(creatingDoc);
             }
             else {
-                const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
-                doc = yield this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true })
+                const { id, identifier, project, typeOf, $unset } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf", "$unset"]);
+                doc = yield this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.offerCatalogItemModel.modelName);
             }
-            return doc.toObject();
+            return { id: doc.id };
         });
     }
     /**
@@ -135,7 +135,7 @@ class MongoRepository {
                 $setOnInsert: { identifier, project, typeOf }
             }, { upsert: true, new: true })
                 .exec();
-            return doc.toObject();
+            return { id: doc.id };
         });
     }
     /**

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

@@ -25,11 +25,10 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IKeyOfProjection = keyof factory.order.IOrder | '_id';
-type IProjection4searchWithUnwoundAcceptedOffer = {
+type IProjection4searchWithUnwoundAcceptedOffers = {
     [key in keyof Omit<factory.order.IOrder, 'acceptedOffers'>]?: 1;
 } & {
     _id?: 0 | 1;
-    acceptedOffers?: ['$acceptedOffers'];
 };
 /**
  * 注文リポジトリ
@@ -37,7 +36,7 @@ type IProjection4searchWithUnwoundAcceptedOffer = {
 export declare class MongoRepository {
     private readonly orderModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.order.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.order.ISearchConditions): FilterQuery<factory.order.IOrder>[];
     /**
      * なければ作成する
      */
@@ -141,9 +140,11 @@ export declare class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffer): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered> | factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }>;
+    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
+    /**
+     * オファーのみ展開して検索する
+     */
+    searchAcceptedOffers(params: factory.order.ISearchConditions, inclusion?: (keyof factory.order.IAcceptedOffer<factory.order.IItemOffered>)[]): Promise<factory.order.IAcceptedOffer<factory.order.IItemOffered>[]>;
     /**
      * 注文に含まれる予約番号を検索する
      */

package/lib/chevre/repo/order.js

@@ -989,7 +989,7 @@ class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params, projection) {
+    searchWithUnwoundAcceptedOffers(params, projection) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
@@ -1005,43 +1005,67 @@ class MongoRepository {
             conditions.forEach((c) => {
                 aggregate.match(c);
             });
-            aggregate.project((projection !== undefined && projection !== null)
-                ? projection
-                : {
-                    // _id: 0,
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
+            aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate
+                // .allowDiskUse(true) // false化(2023-11-30~)
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * オファーのみ展開して検索する
+     */
+    searchAcceptedOffers(params, inclusion) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const aggregate = this.orderModel.aggregate();
+            // pipelineの順序に注意
+            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
+                aggregate.sort({ orderDate: params.sort.orderDate });
+            }
+            aggregate.unwind('$acceptedOffers');
+            conditions.forEach((c) => {
+                aggregate.match(c);
+            });
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                const specifiedProjection = {
+                    _id: 0
+                };
+                inclusion.forEach((key) => {
+                    specifiedProjection[key] = `$acceptedOffers.${key}`;
                 });
+                aggregate.project(specifiedProjection);
+            }
+            else {
+                aggregate.project({
+                    _id: 0,
+                    itemOffered: '$acceptedOffers.itemOffered',
+                    priceSpecification: '$acceptedOffers.priceSpecification',
+                    typeOf: '$acceptedOffers.typeOf',
+                    id: '$acceptedOffers.id',
+                    offeredThrough: '$acceptedOffers.offeredThrough',
+                    name: '$acceptedOffers.name'
+                });
+            }
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 aggregate.limit(params.limit * page)
                     .skip(params.limit * (page - 1));
             }
-            return aggregate.allowDiskUse(true)
+            return aggregate
                 .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
-    // 廃止(2023-10-15~)
-    // public async saveAwardAccountsIfNotExist(parmas: {
-    //     orderNumber: string;
-    //     awardAccounts: factory.transaction.placeOrder.IAwardAccount[];
-    // }) {
-    //     if (Array.isArray(parmas.awardAccounts)) {
-    //         const newIdentifier: factory.propertyValue.IPropertyValue<string>
-    //             = { name: AWARD_ACCOUNTS_IDENTIFIER_NAME, value: JSON.stringify(parmas.awardAccounts) };
-    //         await this.orderModel.findOneAndUpdate(
-    //             {
-    //                 orderNumber: { $eq: parmas.orderNumber },
-    //                 'identifier.name': { $ne: AWARD_ACCOUNTS_IDENTIFIER_NAME }
-    //             },
-    //             { $push: { identifier: newIdentifier } },
-    //             { new: true }
-    //         )
-    //             .exec();
-    //     }
-    // }
     /**
      * 注文に含まれる予約番号を検索する
      */

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

@@ -24,7 +24,8 @@
 /// <reference types="mongoose/types/inferschematype" />
 import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-export type ISeller = factory.seller.ISeller;
+export type ISeller = Omit<factory.seller.ISeller, 'paymentAccepted'>;
+export type ISavingSeller = Omit<factory.seller.ISeller, 'paymentAccepted'>;
 export type ISellerByAggregate = Pick<ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'>;
 export interface IMemberSearchConditions {
     /**
@@ -54,8 +55,8 @@ export declare class MongoRepository {
      */
     save(params: {
         id?: string;
-        attributes: factory.seller.ISeller;
-    }): Promise<ISeller>;
+        attributes: ISavingSeller;
+    }): Promise<ISavingSeller>;
     /**
      * 集計検索(publicな属性検索が目的)
      */
@@ -64,26 +65,6 @@ export declare class MongoRepository {
      * 販売者検索
      */
     search(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<ISeller[]>;
-    /**
-     * 対応決済方法を検索する
-     */
-    searchPaymentAcceptedById(params: {
-        limit?: number;
-        page?: number;
-        /**
-         * 販売者ID
-         */
-        id: {
-            $eq: string;
-        };
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-    }): Promise<{
-        codeValue: string;
-    }[]>;
     /**
      * 販売者を削除する
      */

package/lib/chevre/repo/seller.js

@@ -241,10 +241,7 @@ class MongoRepository {
     /**
      * 販売者検索
      */
-    search(conditions, 
-    // inclusion化(2023-07-07~)
-    // projection?: any
-    inclusion, exclusion) {
+    search(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
@@ -258,7 +255,8 @@ class MongoRepository {
                 projection = {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    paymentAccepted: 0 // 除外(2023-12-01~)
                 };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
                     exclusion.forEach((field) => {
@@ -282,39 +280,6 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    /**
-     * 対応決済方法を検索する
-     */
-    searchPaymentAcceptedById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [
-                { $match: { 'project.id': { $eq: params.project.id.$eq } } },
-                { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.id.$eq) } } }
-            ];
-            const aggregate = this.organizationModel.aggregate([
-                {
-                    $unwind: {
-                        path: '$paymentAccepted'
-                    }
-                },
-                ...matchStages,
-                { $sort: { 'paymentAccepted.paymentMethodType': factory.sortType.Ascending } },
-                {
-                    $project: {
-                        _id: 0,
-                        codeValue: '$paymentAccepted.paymentMethodType'
-                    }
-                }
-            ]);
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
     /**
      * 販売者を削除する
      */

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

@@ -0,0 +1,54 @@
+import { Connection } from 'mongoose';
+/**
+ * 販売者対応決済方法リポジトリ
+ */
+export declare class MongoRepository {
+    private readonly sellerModel;
+    constructor(connection: Connection);
+    search(params: {
+        limit?: number;
+        page?: number;
+        seller?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        codeValue?: {
+            $eq?: string;
+        };
+    }): Promise<{
+        codeValue: string;
+        seller: {
+            id: string;
+        };
+    }[]>;
+    create(params: {
+        codeValue: string;
+        project: {
+            id: string;
+        };
+        seller: {
+            id: string;
+        };
+    }): Promise<void>;
+    deleteOne(params: {
+        codeValue: string;
+        project: {
+            id: string;
+        };
+        seller: {
+            id: string;
+        };
+    }): Promise<void>;
+    isAcceptedBySeller(params: {
+        seller: {
+            id: string;
+        };
+        codeValue: string;
+    }): Promise<boolean>;
+}