@chevre/domain 21.9.0-alpha.9 → 21.10.0

package/lib/chevre/repo/aggregateOffer.js

@@ -494,7 +494,7 @@ class MongoRepository {
                     typeOf: 'OfferCatalog'
                 };
             });
-            let result = yield this.aggregateOfferModel.updateMany({
+            const result = yield this.aggregateOfferModel.updateMany({
                 'project.id': { $eq: params.project.id },
                 _id: { $in: params.id.$in },
                 // includedInDataCatalogのユニークネスを保証する
@@ -511,24 +511,28 @@ class MongoRepository {
             })
                 .exec();
             debug('result', result);
-            // offersにもpush
-            result = yield this.aggregateOfferModel.updateMany({
-                'project.id': { $eq: params.project.id },
-                _id: { $in: params.id.$in }
-            }, {
-                $push: {
-                    'offers.$[offer].includedInDataCatalog': {
-                        $each: newIncludedInDataCatalogs
-                    }
-                }
-            }, {
-                // includedInDataCatalogのユニークネスを保証する
-                arrayFilters: [
-                    { 'offer.includedInDataCatalog.id': { $nin: pushIncludedInDataCatalogIds } }
-                ]
-            })
-                .exec();
-            debug('result', result);
+            // offersにもpush(ひとまず廃止)
+            // result = await this.aggregateOfferModel.updateMany(
+            //     {
+            //         'project.id': { $eq: params.project.id },
+            //         _id: { $in: params.id.$in }
+            //     },
+            //     {
+            //         $push: {
+            //             'offers.$[offer].includedInDataCatalog': {
+            //                 $each: newIncludedInDataCatalogs
+            //             }
+            //         }
+            //     },
+            //     {
+            //         // includedInDataCatalogのユニークネスを保証する
+            //         arrayFilters: [
+            //             { 'offer.includedInDataCatalog.id': { $nin: pushIncludedInDataCatalogIds } }
+            //         ]
+            //     }
+            // )
+            //     .exec();
+            // debug('result', result);
         });
     }
     /**
@@ -547,14 +551,210 @@ class MongoRepository {
                 }
             })
                 .exec();
-            // 全offersからもpull
-            yield this.aggregateOfferModel.updateMany(Object.assign({ 'project.id': { $eq: params.project.id }, 'offers.includedInDataCatalog.id': { $exists: true, $eq: pullingCatalogId } }, (Array.isArray(idNin)) ? { _id: { $nin: idNin } } : undefined), {
-                $pull: {
-                    'offers.$[].includedInDataCatalog': {
-                        id: { $eq: pullingCatalogId }
-                    }
-                }
-            })
+        });
+    }
+    // public async pushIncludedInOfferCatalogItem(params: {
+    //     project: { id: string };
+    //     id: { $in: string[] };
+    //     $push: {
+    //         includedInOfferCatalogItem: {
+    //             /**
+    //              * サブカタログID
+    //              */
+    //             id: { $eq: string };
+    //             includedInDataCatalog: {
+    //                 /**
+    //                  * カタログID
+    //                  */
+    //                 id: { $eq: string };
+    //             };
+    //         };
+    //     };
+    // }): Promise<void> {
+    //     if (!Array.isArray(params.id.$in) || params.id.$in.length === 0) {
+    //         return;
+    //     }
+    //     const newIncludedInOfferCatalogItem: {
+    //         /**
+    //          * サブカタログID
+    //          */
+    //         id: string;
+    //         typeOf: 'OfferCatalog';
+    //         includedInDataCatalog: {
+    //             /**
+    //              * カタログID
+    //              */
+    //             id: string;
+    //             typeOf: 'OfferCatalog';
+    //         };
+    //     } = {
+    //         id: params.$push.includedInOfferCatalogItem.id.$eq,
+    //         typeOf: 'OfferCatalog',
+    //         includedInDataCatalog: { id: params.$push.includedInOfferCatalogItem.includedInDataCatalog.id.$eq, typeOf: 'OfferCatalog' }
+    //     };
+    //     const result = await this.aggregateOfferModel.updateMany(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             _id: { $in: params.id.$in }
+    //         },
+    //         {
+    //             // newIncludedInOfferCatalogItemsのユニークネスを保証する
+    //             $addToSet: { 'offers.$[].includedInOfferCatalogItem': newIncludedInOfferCatalogItem }
+    //         }
+    //     )
+    //         .exec();
+    //     debug('result', result);
+    // }
+    /**
+     * サブカタログを含み、かつ、新しいカタログに含まれない集計オファーからサブカタログを除外
+     */
+    // public async pullIncludedInOfferCatalogItem(params: {
+    //     project: { id: string };
+    //     id?: { $nin?: string[] };
+    //     $pull: {
+    //         includedInOfferCatalogItem: {
+    //             $elemMatch: {
+    //                 /**
+    //                  * サブカタログID
+    //                  */
+    //                 id: { $eq: string };
+    //                 includedInDataCatalog: {
+    //                     /**
+    //                      * カタログID
+    //                      */
+    //                     id: { $eq: string };
+    //                 };
+    //             };
+    //         };
+    //     };
+    // }) {
+    //     const idNin = params.id?.$nin;
+    //     await this.aggregateOfferModel.updateMany(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             'offers.includedInOfferCatalogItem': {
+    //                 $elemMatch: {
+    //                     id: { $exists: true, $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.id.$eq },
+    //                     'includedInDataCatalog.id': {
+    //                         $exists: true,
+    //                         $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.includedInDataCatalog.id.$eq
+    //                     }
+    //                 }
+    //             },
+    //             ...(Array.isArray(idNin)) ? { _id: { $nin: idNin } } : undefined
+    //         },
+    //         {
+    //             $pull: {
+    //                 'offers.$[].includedInOfferCatalogItem': {
+    //                     id: { $exists: true, $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.id.$eq },
+    //                     'includedInDataCatalog.id': {
+    //                         $exists: true,
+    //                         $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.includedInDataCatalog.id.$eq
+    //                     }
+    //                 }
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    /**
+     * カタログに属するサブカタログを全て除外する
+     */
+    // public async pullIncludedInOfferCatalogItemByCatalogId(params: {
+    //     project: { id: string };
+    //     $pull: {
+    //         includedInOfferCatalogItem: {
+    //             $elemMatch: {
+    //                 /**
+    //                  * サブカタログID除外リスト
+    //                  */
+    //                 id?: { $nin: string[] };
+    //                 includedInDataCatalog: {
+    //                     /**
+    //                      * カタログID
+    //                      */
+    //                     id: { $eq: string };
+    //                 };
+    //             };
+    //         };
+    //     };
+    // }) {
+    //     const offerCatalogItemIdNin = params.$pull.includedInOfferCatalogItem.$elemMatch.id?.$nin;
+    //     await this.aggregateOfferModel.updateMany(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             'offers.includedInOfferCatalogItem': {
+    //                 $elemMatch: {
+    //                     'includedInDataCatalog.id': {
+    //                         $exists: true,
+    //                         $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.includedInDataCatalog.id.$eq
+    //                     }
+    //                 }
+    //             }
+    //         },
+    //         {
+    //             $pull: {
+    //                 'offers.$[].includedInOfferCatalogItem': {
+    //                     'includedInDataCatalog.id': {
+    //                         $exists: true,
+    //                         $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.includedInDataCatalog.id.$eq
+    //                     },
+    //                     ...(Array.isArray(offerCatalogItemIdNin))
+    //                         ? { id: { $nin: offerCatalogItemIdNin } } // // 指定サブカタログを除外する
+    //                         : undefined
+    //                 }
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    /**
+     * サブカタログに属するサブカタログを全て除外する
+     */
+    // public async pullIncludedInOfferCatalogItemByCatalogItemId(params: {
+    //     project: { id: string };
+    //     $pull: {
+    //         includedInOfferCatalogItem: {
+    //             $elemMatch: {
+    //                 /**
+    //                  * サブカタログID
+    //                  */
+    //                 id: { $eq: string };
+    //             };
+    //         };
+    //     };
+    // }) {
+    //     await this.aggregateOfferModel.updateMany(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             'offers.includedInOfferCatalogItem': {
+    //                 $elemMatch: {
+    //                     id: {
+    //                         $exists: true,
+    //                         $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.id.$eq
+    //                     }
+    //                 }
+    //             }
+    //         },
+    //         {
+    //             $pull: {
+    //                 'offers.$[].includedInOfferCatalogItem': {
+    //                     id: {
+    //                         $exists: true,
+    //                         $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.id.$eq
+    //                     }
+    //                 }
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.aggregateOfferModel.findOneAndRemove({
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
+            }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -42,7 +42,6 @@ exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ 'offers.priceSpecification.price': 1 }, { name: 'searchByOffersPriceSpecificationPrice' });
-schema.index({ 'project.id': 1, 'offers.priceSpecification.price': 1 }, { name: 'searchByProjectId' });
 // オファーIDはグローバルユニーク
 schema.index({ 'offers.id': 1 }, {
     name: 'uniqueOfferId',
@@ -59,130 +58,131 @@ schema.index({ 'includedInDataCatalog.id': 1 }, {
         'includedInDataCatalog.id': { $exists: true }
     }
 });
-schema.index({ 'offers.includedInDataCatalog.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersIncludedInDataCatalogId',
+schema.index({ 'offers.includedInDataCatalog.id': 1 }, {
+    name: 'searchByOffersIncludedInDataCatalogId-v2',
     partialFilterExpression: {
         'offers.includedInDataCatalog.id': { $exists: true }
     }
 });
-schema.index({ 'offers.availability': 1, 'offers.priceSpecification.price': 1 }, { name: 'searchByOffersAvailability' });
-schema.index({ 'offers.itemOffered.typeOf': 1, 'offers.priceSpecification.price': 1 }, { name: 'searchByOffersItemOfferedTypeOf' });
-schema.index({ 'offers.identifier': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersIdentifier',
+schema.index({ 'project.id': 1 }, { name: 'searchByProjectId-v2' });
+schema.index({ 'offers.availability': 1 }, { name: 'searchByOffersAvailability-v2' });
+schema.index({ 'offers.itemOffered.typeOf': 1 }, { name: 'searchByOffersItemOfferedTypeOf-v2' });
+schema.index({ 'offers.identifier': 1 }, {
+    name: 'searchByOffersIdentifier-v2',
     partialFilterExpression: {
         'offers.identifier': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.referenceQuantity.value': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationReferenceQuantityValue',
+schema.index({ 'offers.priceSpecification.referenceQuantity.value': 1 }, {
+    name: 'searchByOffersPriceSpecificationReferenceQuantityValue-v2',
     partialFilterExpression: {
         'offers.priceSpecification.referenceQuantity.value': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.accounting.accountsReceivable': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAccountingAccountsReceivable',
+schema.index({ 'offers.priceSpecification.accounting.accountsReceivable': 1 }, {
+    name: 'searchByOffersPriceSpecificationAccountingAccountsReceivable-v2',
     partialFilterExpression: {
         'offers.priceSpecification.accounting.accountsReceivable': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.accounting.operatingRevenue.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAccountingOperatingRevenueCodeValue',
+schema.index({ 'offers.priceSpecification.accounting.operatingRevenue.codeValue': 1 }, {
+    name: 'searchByOffersPriceSpecificationAccountingOperatingRevenueCodeValue-v2',
     partialFilterExpression: {
         'offers.priceSpecification.accounting.operatingRevenue.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceType': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceType',
+schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceType': 1 }, {
+    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceType-v2',
     partialFilterExpression: {
         'offers.priceSpecification.appliesToMovieTicket.serviceType': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceOutputTypeOf',
+schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': 1 }, {
+    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceOutputTypeOf-v2',
     partialFilterExpression: {
         'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': { $exists: true }
     }
 });
-schema.index({ 'offers.name.ja': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersNameJa',
+schema.index({ 'offers.name.ja': 1 }, {
+    name: 'searchByOffersNameJa-v2',
     partialFilterExpression: {
         'offers.name.ja': { $exists: true }
     }
 });
-schema.index({ 'offers.name.en': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersNameEn',
+schema.index({ 'offers.name.en': 1 }, {
+    name: 'searchByOffersNameEn-v2',
     partialFilterExpression: {
         'offers.name.en': { $exists: true }
     }
 });
-schema.index({ 'offers.alternateName': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAlternateName',
+schema.index({ 'offers.alternateName': 1 }, {
+    name: 'searchByOffersAlternateName-v2',
     partialFilterExpression: {
         'offers.alternateName': { $exists: true }
     }
 });
-schema.index({ 'offers.category.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchOffersCategoryId',
+schema.index({ 'offers.category.id': 1 }, {
+    name: 'searchOffersCategoryId-v2',
     partialFilterExpression: {
         'offers.category.id': { $exists: true }
     }
 });
-schema.index({ 'offers.category.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersCategoryCodeValue',
+schema.index({ 'offers.category.codeValue': 1 }, {
+    name: 'searchByOffersCategoryCodeValue-v2',
     partialFilterExpression: {
         'offers.category.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.availableAtOrFrom.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAvailableAtOrFromId',
+schema.index({ 'offers.availableAtOrFrom.id': 1 }, {
+    name: 'searchByOffersAvailableAtOrFromId-v2',
     partialFilterExpression: {
         'offers.availableAtOrFrom.id': { $exists: true }
     }
 });
-schema.index({ 'offers.eligibleMembershipType.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersEligibleMembershipTypeCodeValue',
+schema.index({ 'offers.eligibleMembershipType.codeValue': 1 }, {
+    name: 'searchByOffersEligibleMembershipTypeCodeValue-v2',
     partialFilterExpression: {
         'offers.eligibleMembershipType.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.eligibleMonetaryAmount.currency': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersEligibleMonetaryAmountCurrency',
+schema.index({ 'offers.eligibleMonetaryAmount.currency': 1 }, {
+    name: 'searchByOffersEligibleMonetaryAmountCurrency-v2',
     partialFilterExpression: {
         'offers.eligibleMonetaryAmount.currency': { $exists: true }
     }
 });
-schema.index({ 'offers.eligibleSeatingType.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersEligibleSeatingTypeCodeValue',
+schema.index({ 'offers.eligibleSeatingType.codeValue': 1 }, {
+    name: 'searchByOffersEligibleSeatingTypeCodeValue-v2',
     partialFilterExpression: {
         'offers.eligibleSeatingType.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.addOn.itemOffered.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAddOnItemOfferedId',
+schema.index({ 'offers.addOn.itemOffered.id': 1 }, {
+    name: 'searchByOffersAddOnItemOfferedId-v2',
     partialFilterExpression: {
         'offers.addOn.itemOffered.id': { $exists: true }
     }
 });
-schema.index({ 'offers.hasMerchantReturnPolicy.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersHasMerchantReturnPolicyId',
+schema.index({ 'offers.hasMerchantReturnPolicy.id': 1 }, {
+    name: 'searchByOffersHasMerchantReturnPolicyId-v2',
     partialFilterExpression: {
         'offers.hasMerchantReturnPolicy.id': { $exists: true }
     }
 });
-schema.index({ 'offers.additionalProperty': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAdditionalProperty',
+schema.index({ 'offers.additionalProperty': 1 }, {
+    name: 'searchByOffersAdditionalProperty-v2',
     partialFilterExpression: {
         'offers.additionalProperty': { $exists: true }
     }
 });
-schema.index({ 'offers.validFrom': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersValidFrom',
+schema.index({ 'offers.validFrom': 1 }, {
+    name: 'searchByOffersValidFrom-v2',
     partialFilterExpression: {
         'offers.validFrom': { $exists: true }
     }
 });
-schema.index({ 'offers.validThrough': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersValidThrough',
+schema.index({ 'offers.validThrough': 1 }, {
+    name: 'searchByOffersValidThrough-v2',
     partialFilterExpression: {
         'offers.validThrough': { $exists: true }
     }

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

@@ -40,10 +40,10 @@ export declare class MongoRepository {
         offers: IUnitPriceOfferFromAggregateOffer[];
     }>;
     /**
-     * 単価オファーIDとカタログIDで単価オファーを検索する
-     * 必ずカタログデータから単価オファーIDを参照する
+     * 単価オファーIDとカタログIDで単価オファーを全て検索する
+     * 単価オファーIDを一定数指定する想定なのでpagingは不要
      */
-    searchByIdsAndOfferCatalogId(params: {
+    searchAllByIdsAndOfferCatalogId(params: {
         /**
          * 指定したIDの単価オファーだけ取得
          */
@@ -61,8 +61,6 @@ export declare class MongoRepository {
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
         onlyValid?: boolean;
-        limit?: number;
-        page?: number;
         projection?: IProjection;
     }): Promise<{
         offers: IUnitPriceOfferFromAggregateOffer[];
@@ -109,22 +107,34 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
+        useIncludeInDataCatalog: boolean;
         onlyValid?: boolean;
         limit?: number;
         page?: number;
     }): Promise<Pick<factory.priceSpecification.unitPrice.IAppliesToMovieTicket, 'serviceOutput'>[]>;
-    findAggregateOfferById(params: {
+    /**
+     * クライアントの利用可能カタログを検索する
+     */
+    searchAvailableCatalogs(params: {
         project: {
             id: string;
         };
+        includedInDataCatalog: {
+            id: string[];
+        };
+        availableAtOrFrom: {
+            id: string;
+        };
+    }): Promise<{
         id: string;
-    }): Promise<factory.aggregateOffer.IAggregateOffer>;
+    }[]>;
     count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
     search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<IUnitPriceOfferFromAggregateOffer[]>;
     save(params: factory.unitPriceOffer.IUnitPriceOffer & {
@@ -152,12 +162,6 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
-    deleteById(params: {
-        project: {
-            id: string;
-        };
-        id: string;
-    }): Promise<void>;
     /**
      * サブカタログから集計オファーIDリストを検索する
      */