@chevre/domain 21.9.0-alpha.9 → 21.10.0

package/README.md

@@ -6,13 +6,12 @@
 [![Known Vulnerabilities](https://snyk.io/test/github/chevre-jp/domain/badge.svg)](https://snyk.io/test/github/chevre-jp/domain)
 [![npm](https://img.shields.io/npm/dm/@chevre/domain.svg)](https://nodei.co/npm/@chevre/domain/)
 
-Node.js client library for using Chevre backend programming.
-
 ## Table of contents
 
-* [Usage](#usage)
-* [Code Samples](#code-samples)
-* [License](#license)
+- [Chevre Domain Library for Node.js](#chevre-domain-library-for-nodejs)
+  - [Table of contents](#table-of-contents)
+  - [Usage](#usage)
+  - [License](#license)
 
 ## Usage
 
@@ -20,36 +19,6 @@ Node.js client library for using Chevre backend programming.
 npm install @chevre/domain
 ```
 
-### Environment variables
-
-| Name                             | Required | Value           | Purpose                        |
-| -------------------------------- | -------- | --------------- | ------------------------------ |
-| `AWS_ACCESS_KEY_ID`              | true     |                 | AWS access key                 |
-| `AWS_SECRET_ACCESS_KEY`          | true     |                 | AWS secret access key          |
-| `CHEVRE_AUTHORIZE_SERVER_DOMAIN` | true     |                 | Chevre credentials             |
-| `CHEVRE_CLIENT_ID`               | true     |                 | Chevre credentials             |
-| `CHEVRE_CLIENT_SECRET`           | true     |                 | Chevre credentials             |
-| `CHEVRE_ENDPOINT`                | true     |                 | Chevre credentials             |
-| `CUSTOM_SEARCH_ENGINE_ID`        | true     |                 | Google Custom Search Engine ID |
-| `COA_ENDPOINT`                   | true     |                 | COA credentilas                |
-| `COA_REFRESH_TOKEN`              | true     |                 | credentilas                    |
-| `DEBUG`                          | false    | chevre-domain:* | Debug                          |
-| `GOOGLE_API_KEY`                 | true     |                 | Google API Key                 |
-| `INFORM_ORDER_URL`               | false    |                 | Inform Order URLs              |
-| `INFORM_TRANSACTION_URL`         | false    |                 | Inform Transaction URLs        |
-| `LINE_NOTIFY_URL`                | true     |                 | LINE Notify URL                |
-| `LINE_NOTIFY_ACCESS_TOKEN`       | true     |                 | LINE Notify access token       |
-| `SENDGRID_API_KEY`               | true     |                 | SendGrid API key               |
-| `COA_TIMEOUT`                    | false    |                 | Timeout settings               |
-| `GMO_TIMEOUT`                    | false    |                 | Timeout settings               |
-| `MVTK_TIMEOUT`                   | false    |                 | Timeout settings               |
-| `TRIGGER_WEBHOOK_TIMEOUT`        | false    |                 | Timeout settings               |
-
-
-## Code Samples
-
-Code sample are [here](https://github.com/chevre-jp/domain/tree/master/example).
-
 ## License
 
 ISC

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -92,7 +92,7 @@ async function main() {
                         .toDate(),
                     description: {
                         en: 'english description',
-                        ja: 'ムビチケ検証用のイベントです。'
+                        ja: 'イベント説明'
                     },
                     headline: {
                         en: 'headlineheadlineheadlineheadlineheadlineheadlineheadline',
@@ -261,7 +261,7 @@ async function main() {
                         .toDate(),
                     description: {
                         en: 'english description',
-                        ja: 'ムビチケ検証用のイベントです。'
+                        ja: 'イベント説明'
                     },
                     headline: {
                         en: 'headlineheadlineheadlineheadlineheadlineheadlineheadline',

package/example/src/chevre/searchAvaialbleAppliesToMovieTicketByOfferCatalogId.ts

@@ -15,9 +15,11 @@ async function main() {
         limit: 10,
         page: 1,
         subOfferCatalog: {
-            id: '0001'
+            id: '0001',
+            isOfferCatalogItem: false
         },
         excludeAppliesToMovieTicket: false,
+        useIncludeInDataCatalog: true,
         unacceptedPaymentMethod: []
     });
     console.log(result);
@@ -26,6 +28,7 @@ async function main() {
     result = await chevre.service.offer.event.searchOfferAppliesToMovieTicket({
         event: { id: 'cllkq475p' },
         onlyValid: true,
+        useIncludeInDataCatalog: true,
         limit: 100,
         page: 1
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined

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 });
+
+    const indexes = await mongoose.connection.db.collection('aggregateOffers')
+        .indexes();
+    console.log(indexes);
+    console.log(indexes.length);
+    // 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/example/src/chevre/searchOrders.ts

@@ -6,27 +6,31 @@ import { chevre } from '../../../lib/index';
 const project = { id: String(process.env.PROJECT_ID) };
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const orderRepo = new chevre.repository.Order(mongoose.connection);
 
     const orders = await orderRepo.search({
         limit: 10,
         project: { id: { $eq: project.id } },
-        // acceptedOffers: {
-        //     itemOffered: {
-        //         issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.MembershipService } }
-        //     }
-        // },
-        paymentMethods: {
-            paymentMethod: { identifier: { $in: ['Cash'] } }
-            // additionalProperty: {
-            //     $in: [
-            //         { name: 'orderId', value: '0102022031518442020' },
-            //         { name: 'orderId', value: '0102022031518423030' }
-            //     ]
-            // }
+        acceptedOffers: {
+            // $size: 1
+            //     itemOffered: {
+            //         issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.MembershipService } }
+            //     }
+        },
+        orderedItem: {
+            $size: 3
         }
+        // paymentMethods: {
+        //     paymentMethod: { identifier: { $in: ['Cash'] } }
+        //     additionalProperty: {
+        //         $in: [
+        //             { name: 'orderId', value: '0102022031518442020' },
+        //             { name: 'orderId', value: '0102022031518423030' }
+        //         ]
+        //     }
+        // }
     });
     console.log('orders found', orders);
     console.log(orders.length, 'orders found');

package/example/src/chevre/syncCatalogs2aggregateOffers.ts

@@ -11,15 +11,17 @@ mongoose.Model.on('index', (...args) => {
 // tslint:disable-next-line:max-func-body-length
 async function main() {
     const now = new Date();
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    console.log('now:', now);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
     const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
-    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    // const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     const cursor = offerCatalogRepo.getCursor(
         {
             // 'project.id': { $eq: project.id }
+            'itemListElement.typeOf': { $exists: true, $eq: chevre.factory.offerType.Offer }
         },
         {
             __v: 0,
@@ -52,25 +54,25 @@ async function main() {
             console.log('already synced.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
         } else {
             console.log('creating task...', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
-            const syncTaskData: chevre.factory.task.onResourceUpdated.IData4common = {
-                typeOf: 'OfferCatalog',
-                id: [String(offerCatalog.id)],
-                isNew: false,
-                isDeleted: false,
-                project: { id: offerCatalog.project.id },
-                useInform: false
-            };
-            const syncTask: chevre.factory.task.IAttributes<chevre.factory.taskName.OnResourceUpdated> = {
-                data: syncTaskData,
-                executionResults: [],
-                name: chevre.factory.taskName.OnResourceUpdated,
-                numberOfTried: 0,
-                project: offerCatalog.project,
-                remainingNumberOfTries: 1,
-                runsAt: now,
-                status: chevre.factory.taskStatus.Ready
-            };
-            await taskRepo.saveMany([syncTask], { emitImmediately: false });
+            // const syncTaskData: chevre.factory.task.onResourceUpdated.IData4common = {
+            //     typeOf: 'OfferCatalog',
+            //     id: [String(offerCatalog.id)],
+            //     isNew: false,
+            //     isDeleted: false,
+            //     project: { id: offerCatalog.project.id },
+            //     useInform: false
+            // };
+            // const syncTask: chevre.factory.task.IAttributes<chevre.factory.taskName.OnResourceUpdated> = {
+            //     data: syncTaskData,
+            //     executionResults: [],
+            //     name: chevre.factory.taskName.OnResourceUpdated,
+            //     numberOfTried: 0,
+            //     project: offerCatalog.project,
+            //     remainingNumberOfTries: 1,
+            //     runsAt: now,
+            //     status: chevre.factory.taskStatus.Ready
+            // };
+            // await taskRepo.saveMany([syncTask], { emitImmediately: false });
             updateCount += 1;
             console.log('task saved.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
         }

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

@@ -11,18 +11,19 @@ export type IUnitPriceOfferFromAggregateOffer = factory.unitPriceOffer.IUnitPric
         id: string;
     };
 };
+type ISearchConditions = factory.unitPriceOffer.ISearchConditions;
 /**
  * 集計オファーリポジトリ
  */
 export declare class MongoRepository {
     private readonly aggregateOfferModel;
     constructor(connection: Connection);
-    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: factory.unitPriceOffer.ISearchConditions): IMatchStage[];
+    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: ISearchConditions): IMatchStage[];
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
         [field: string]: AnyExpression;
     };
-    count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
-    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
+    count(params: Omit<ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
+    search(params: ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
     pushIncludedInDataCatalog(params: {
         project: {
             id: string;
@@ -58,5 +59,20 @@ export declare class MongoRepository {
             };
         };
     }): Promise<void>;
+    /**
+     * サブカタログを含み、かつ、新しいカタログに含まれない集計オファーからサブカタログを除外
+     */
+    /**
+     * カタログに属するサブカタログを全て除外する
+     */
+    /**
+     * サブカタログに属するサブカタログを全て除外する
+     */
+    deleteById(params: {
+        project: {
+            id: string;
+        };
+        id: string;
+    }): Promise<void>;
 }
 export {};