@chevre/domain 21.9.0-alpha.13 → 21.9.0-alpha.14

package/example/src/chevre/searchOfferCatalogItemAvailability.ts

@@ -0,0 +1,38 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const PROJECT_ID = process.env.PROJECT_ID;
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+    const productRepo = new chevre.repository.Product(mongoose.connection);
+
+    const result = await chevre.service.offer.event.searchOfferCatalogItemAvailability({
+        event: {
+            id: 'cllkq475u'
+        },
+        limit: 10,
+        page: 1,
+        availableAtOrFrom: { id: '3eo6okferrsdpfd9j2ce1iv9k7' }
+    })({
+        event: eventRepo,
+        offer: offerRepo,
+        offerCatalog: offerCatalogRepo,
+        product: productRepo
+    });
+    console.log(result);
+    console.log(result.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchOfferCatalogItems.ts

@@ -3,7 +3,7 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
-const PROJECT_ID = process.env.PROJECT_ID;
+// const PROJECT_ID = process.env.PROJECT_ID;
 mongoose.Model.on('index', (...args) => {
     console.error('******** index event emitted. ********\n', args);
 });
@@ -11,31 +11,46 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const catalogItemRepo = new chevre.repository.OfferCatalogItem(mongoose.connection);
-
-    console.log('searching...');
-    const catalogs = await catalogItemRepo.search(
-        {
-            project: { id: { $eq: PROJECT_ID } },
-            sort: { identifier: chevre.factory.sortType.Descending },
-            limit: 2,
-            page: 1,
-            itemListElement: { typeOf: { $eq: 'Offer' } }
-            // id: { $in: ['xxx'] }
-        }
-    );
-    console.log(catalogs[0]?.id, typeof catalogs[0]?.id);
-    console.log('catalogs found', catalogs.map((catalog) => `${catalog.id} ${catalog.identifier} ${catalog.numberOfItems} ${catalog.itemListElementTypeOf}`));
-    console.log(catalogs.length);
-
-    const numCatalogs = await catalogItemRepo.count(
-        {
-            project: { id: { $eq: PROJECT_ID } },
-            itemListElement: { typeOf: { $eq: 'Offer' } }
-            // id: { $in: ['xxx'] }
-        }
-    );
-    console.log('numCatalogs:', numCatalogs);
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+    const offerCatalogItemRepo = new chevre.repository.OfferCatalogItem(mongoose.connection);
+    const productRepo = new chevre.repository.Product(mongoose.connection);
+
+    const result = await chevre.service.offer.event.searchOfferCatalogItems({
+        event: {
+            id: 'cllkq475u'
+        },
+        limit: 10,
+        page: 1
+    })({
+        event: eventRepo,
+        offerCatalog: offerCatalogRepo,
+        offerCatalogItem: offerCatalogItemRepo,
+        product: productRepo
+    });
+    console.log(result);
+    console.log(result.length);
+
+    // console.log('searching...');
+    // const catalogs = await catalogItemRepo.search(
+    //     {
+    //         project: { id: { $eq: PROJECT_ID } },
+    //         sort: { identifier: chevre.factory.sortType.Descending },
+    //         limit: 2,
+    //         page: 1,
+    //         itemListElement: { typeOf: { $eq: 'Offer' } }
+    //     }
+    // );
+    // console.log(catalogs[0]?.id, typeof catalogs[0]?.id);
+    // console.log(catalogs.length);
+
+    // const numCatalogs = await catalogItemRepo.count(
+    //     {
+    //         project: { id: { $eq: PROJECT_ID } },
+    //         itemListElement: { typeOf: { $eq: 'Offer' } }
+    //     }
+    // );
+    // console.log('numCatalogs:', numCatalogs);
 }
 
 main()

package/example/src/chevre/searchOffers.ts

@@ -3,8 +3,20 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+
+    console.log(
+        await mongoose.connection.db.collection('aggregateOffers')
+            .indexes()
+    );
+    // await mongoose.connection.db.collection('aggregateOffers')
+    //     .dropIndexes();
+    // console.log('indexes droped');
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
@@ -33,9 +45,9 @@ async function main() {
         //     ]
         // }
     });
-    console.log(offers.map((offer) => {
-        return `${offer.project.id} ${offer.id} ${offer.identifier} ${offer.name.ja}`;
-    }));
+    // console.log(offers.map((offer) => {
+    //     return `${offer.project.id} ${offer.id} ${offer.identifier} ${offer.name.ja}`;
+    // }));
     console.log(offers.length);
 }
 

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

@@ -119,6 +119,22 @@ export declare class MongoRepository {
         limit?: number;
         page?: number;
     }): Promise<Pick<factory.priceSpecification.unitPrice.IAppliesToMovieTicket, 'serviceOutput'>[]>;
+    /**
+     * クライアントの利用可能カタログを検索する
+     */
+    searchAvailableCatalogs(params: {
+        project: {
+            id: string;
+        };
+        includedInDataCatalog: {
+            id: string[];
+        };
+        availableAtOrFrom: {
+            id: string;
+        };
+    }): Promise<{
+        id: string;
+    }[]>;
     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 & {