@chevre/domain 22.0.0-alpha.9 → 22.0.0

package/example/src/chevre/aggregateAllEvents2.ts

@@ -35,7 +35,8 @@ export async function aggregateScreeningEvent() {
             try {
                 console.log('executing...', count);
                 await (await chevre.service.task.createService()).executeByName({
-                    name: chevre.factory.taskName.AggregateScreeningEvent
+                    name: chevre.factory.taskName.AggregateScreeningEvent,
+                    executor: { name: 'sample' }
                 })({
                     connection: mongoose.connection,
                     redisClient,
@@ -68,6 +69,7 @@ export async function aggregateScreeningEvent() {
                         deliverOrderLimit: 1,
                         transaction: { informUrls: [], confirmedStoragePeriodInDays: 365, canceledStoragePeriodInDays: 365 },
                         abortedTasksWithoutReport: [],
+                        coa: { timeout: 1000 },
                         gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },
                         movieticketReserve: { timeout: 1000, timeoutCheck: 1000 },
                         numTryConfirmReserveTransaction: 10,

package/example/src/chevre/aggregation/aggregateOffersOnEvent.ts

@@ -1,78 +1,82 @@
 // tslint:disable:no-console
 import * as mongoose from 'mongoose';
-import * as redis from 'redis';
+// import * as redis from 'redis';
 
 import { chevre } from '../../../../lib/index';
 
 const project = { id: <string>process.env.PROJECT_ID };
-const EVENT_ID = String(process.env.EVENT_ID);
+// const EVENT_ID = String(process.env.EVENT_ID);
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-    const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
-        socket: {
-            port: Number(<string>process.env.REDIS_PORT),
-            host: <string>process.env.REDIS_HOST
-        },
-        password: <string>process.env.REDIS_KEY
-    });
-    await client.connect();
+    // const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+    //     socket: {
+    //         port: Number(<string>process.env.REDIS_PORT),
+    //         host: <string>process.env.REDIS_HOST
+    //     },
+    //     password: <string>process.env.REDIS_KEY
+    // });
+    // await client.connect();
 
     const aggregateReservationRepo = await chevre.repository.AggregateReservation.createInstance(mongoose.connection);
-    let aggregateReservations = await aggregateReservationRepo.searchWithReservationForId(
+    const aggregateReservations = await aggregateReservationRepo.searchWithReservationForId(
         {
-            limit: 100,
+            limit: 10,
             page: 1,
             project: { id: { $eq: project.id } },
             reservationFor: {
-                id: { $eq: EVENT_ID },
+                id: {
+                    $in: [
+                        'blvcj2vfl', 'blvcj2w48',
+                        'blvcj2wqj', 'blvcj2y1n',
+                        'blvcj2ylh', 'blvcj2z7k',
+                        'blvcj2zqz', 'blvcj30d3',
+                        'blvcj30wo', 'blvcj32as'
+                    ]
+                },
                 typeOf: chevre.factory.eventType.ScreeningEvent
-            }
+            },
+            sort: { 'reservationFor.startDate': 1 }
         },
         ['aggregateEntranceGate', 'aggregateOffer']
     );
     console.log('aggregateReservations:', aggregateReservations);
+    console.log('aggregateReservations:', aggregateReservations.map(({ id }) => id));
 
-    await (await chevre.service.aggregation.createService()).event.aggregateOffers({
-        id: EVENT_ID,
-        typeOf: chevre.factory.eventType.ScreeningEvent
-    })({
-        aggregateReservation: aggregateReservationRepo,
-        event: await chevre.repository.Event.createInstance(mongoose.connection),
-        stockHolder: await chevre.repository.StockHolder.createInstance(client, mongoose.connection),
-        offer: await chevre.repository.Offer.createInstance(mongoose.connection),
-        offerCatalog: await chevre.repository.OfferCatalog.createInstance(mongoose.connection),
-        offerRateLimit: await chevre.repository.rateLimit.Offer.createInstance(client),
-        screeningRoom: await chevre.repository.place.ScreeningRoom.createInstance(mongoose.connection),
-        product: await chevre.repository.Product.createInstance(mongoose.connection),
-        reservation: await chevre.repository.Reservation.createInstance(mongoose.connection),
-        task: await chevre.repository.Task.createInstance(mongoose.connection)
-    });
-    console.log('aggregateReserveAction processed.');
+    // await (await chevre.service.aggregation.createService()).event.aggregateOffers({
+    //     id: EVENT_ID,
+    //     typeOf: chevre.factory.eventType.ScreeningEvent
+    // })({
+    //     aggregateReservation: aggregateReservationRepo,
+    //     event: await chevre.repository.Event.createInstance(mongoose.connection),
+    //     stockHolder: await chevre.repository.StockHolder.createInstance(client, mongoose.connection),
+    //     offer: await chevre.repository.Offer.createInstance(mongoose.connection),
+    //     offerCatalog: await chevre.repository.OfferCatalog.createInstance(mongoose.connection),
+    //     offerRateLimit: await chevre.repository.rateLimit.Offer.createInstance(client),
+    //     screeningRoom: await chevre.repository.place.ScreeningRoom.createInstance(mongoose.connection),
+    //     product: await chevre.repository.Product.createInstance(mongoose.connection),
+    //     reservation: await chevre.repository.Reservation.createInstance(mongoose.connection)
+    // });
+    // console.log('aggregateReserveAction processed.');
 
-    aggregateReservations = await aggregateReservationRepo.searchWithReservationForId(
-        {
-            limit: 1,
-            page: 1,
-            sort: { 'reservationFor.startDate': 1 },
-            project: { id: { $eq: project.id } },
-            reservationFor: {
-                id: {
-                    $eq: EVENT_ID,
-                    $in: [EVENT_ID]
-                },
-                typeOf: chevre.factory.eventType.ScreeningEvent
-                // startFrom: moment()
-                //     .toDate(),
-                // startThrough: moment()
-                //     .add(1, 'minutes')
-                //     .toDate()
-            }
-        },
-        []
-    );
-    console.log('aggregateReservations:', aggregateReservations);
+    // aggregateReservations = await aggregateReservationRepo.searchWithReservationForId(
+    //     {
+    //         limit: 1,
+    //         page: 1,
+    //         sort: { 'reservationFor.startDate': 1 },
+    //         project: { id: { $eq: project.id } },
+    //         reservationFor: {
+    //             id: {
+    //                 $eq: EVENT_ID,
+    //                 $in: [EVENT_ID]
+    //             },
+    //             typeOf: chevre.factory.eventType.ScreeningEvent
+    //         }
+    //     },
+    //     []
+    // );
+    // console.log('aggregateReservations:', aggregateReservations);
 }
 
 main()

package/example/src/chevre/changeOrderStatus.ts

@@ -0,0 +1,29 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+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: false });
+
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+    const result = await orderRepo.changeStatus(
+        {
+            project: {
+                id: project.id
+            },
+            orderNumber: 'CIN1-3723005-2440693',
+            orderStatus: chevre.factory.orderStatus.OrderDelivered,
+            previousOrderStatus: chevre.factory.orderStatus.OrderInTransit
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/projectEventFieldsById.ts

@@ -0,0 +1,35 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+const startTime = process.hrtime();
+import { chevre } from '../../../lib/index';
+const diff = process.hrtime(startTime);
+console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
+
+// const PROJECT_ID = process.env.PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const event = await eventRepo.projectFieldsById(
+        {
+            // id: '120162210202407171202250'
+            id: 'blxonxv1m'
+        },
+        // [
+        //     'project', 'organizer', 'typeOf',
+        //     'name', 'doorTime', 'endDate', 'eventStatus',
+        //     'location', 'startDate', 'superEvent',
+        //     'offers'
+        // ]
+        ['project', 'startDate', 'typeOf', 'superEvent.location.id']
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(event, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/projectOrderFieldsById.ts

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(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 orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+    const result = await orderRepo.projectFieldsById(
+        {
+            id: '66a04d962582d528b3ba6521',
+            inclusion: ['orderNumber']
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+
+    const findByOrderNumberResult = await orderRepo.projectFieldsByOrderNumber(
+        {
+            orderNumber: 'CIN0-2152162-0949752',
+            project: { id: project.id },
+            inclusion: [
+                // 'orderNumber', 'orderStatus', 'typeOf',
+                'project'
+            ]
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.log(findByOrderNumberResult);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchEvents.ts

@@ -6,7 +6,7 @@ import { chevre } from '../../../lib/index';
 const diff = process.hrtime(startTime);
 console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
 
-const PROJECT_ID = process.env.PROJECT_ID;
+// const PROJECT_ID = process.env.PROJECT_ID;
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
@@ -15,18 +15,19 @@ async function main() {
 
     const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>(
         {
-            limit: 100,
+            limit: 1,
             page: 1,
             // sort: { startDate: 1 },
             typeOf: chevre.factory.eventType.ScreeningEvent,
-            project: { id: { $eq: PROJECT_ID } }
-            // id: { $eq: 'al6aff83y' },
-            // typeOfIn: [chevre.factory.eventType.Event, chevre.factory.eventType.ScreeningEvent]
+            // project: { id: { $eq: PROJECT_ID } },
+            // id: { $eq: '120162210202407171202250' }
+            id: { $eq: 'blxonxv1m' }
         },
-        ['_id', 'name'],
+        ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered'],
         []
     );
-    console.log(events);
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(events, { depth: null });
     console.log(events.length, 'events found');
 }
 

package/example/src/chevre/searchOrders.ts

@@ -21,7 +21,7 @@ async function main() {
 
     const orders = await orderRepo.search(
         {
-            limit: 10,
+            limit: 1,
             project: { id: { $eq: project.id } },
             acceptedOffers: {
                 // itemOffered: {
@@ -48,11 +48,21 @@ async function main() {
             // }
         },
         {
-            orderNumber: 1,
-            customer: 1
+            inclusion: {
+                confirmationNumber: 1,
+                // customer: 1,
+                identifier: 1, orderDate: 1, orderNumber: 1, orderStatus: 1,
+                // orderedItem: 1,
+                // paymentMethods: 1,
+                price: 1, priceCurrency: 1, project: 1,
+                // seller: 1,
+                typeOf: 1
+            },
+            exclusion: {}
         }
     );
-    console.log('orders found', orders);
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(orders, { depth: null });
     console.log(orders.length, 'orders found');
 }
 

package/example/src/chevre/sendGrid/filterEmailActivity.ts

@@ -0,0 +1,33 @@
+// tslint:disable:no-console
+// tslint:disable-next-line:no-implicit-dependencies
+import * as client from '@sendgrid/client';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    client.setApiKey(<string>process.env.SENDGRID_API_KEY);
+
+    const queryParams = {
+        // "query": "from_email=\"email@example.com\"",
+        // "limit": 10
+    };
+
+    const request = {
+        url: `/v3/messages`,
+        method: 'GET',
+        qs: queryParams
+    };
+
+    client.request(request)
+        .then(([response, body]) => {
+            console.log(response.statusCode);
+            console.log(response.body, body);
+        })
+        .catch((error) => {
+            console.error(error);
+        });
+
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/credentials.d.ts

@@ -1,4 +1,3 @@
-import type { COACredentials } from './credentials/coa';
 import type { CustomSearchCredentials } from './credentials/customSearch';
 import type { JWTCredentials } from './credentials/jwt';
 import type { LINENotifyCredentials } from './credentials/lineNotify';
@@ -7,10 +6,6 @@ import type { SendGridCredentials } from './credentials/sendGrid';
  * 外部サービス認証情報
  */
 export declare namespace credentials {
-    type COA = COACredentials;
-    namespace COA {
-        function createInstance(...params: ConstructorParameters<typeof COACredentials>): Promise<COACredentials>;
-    }
     type CustomSearch = CustomSearchCredentials;
     namespace CustomSearch {
         function createInstance(...params: ConstructorParameters<typeof CustomSearchCredentials>): Promise<CustomSearchCredentials>;

package/lib/chevre/credentials.js

@@ -28,19 +28,6 @@ var credentials;
     // export const sendGrid = {
     //     apiKey: process.env.SENDGRID_API_KEY
     // };
-    let COA;
-    (function (COA) {
-        let cred;
-        function createInstance(...params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (cred === undefined) {
-                    cred = (yield Promise.resolve().then(() => require('./credentials/coa'))).COACredentials;
-                }
-                return new cred(...params);
-            });
-        }
-        COA.createInstance = createInstance;
-    })(COA = credentials.COA || (credentials.COA = {}));
     let CustomSearch;
     (function (CustomSearch) {
         let cred;

package/lib/chevre/emailMessageBuilder.d.ts

@@ -4,9 +4,7 @@ type ISendableEmailMessage = factory.action.transfer.send.message.email.IObjectA
     identifier: string;
     name: string;
 };
-export type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {
-    customer: factory.order.ICustomer;
-};
+export type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {};
 /**
  * 注文配送メッセージを作成する
  */
@@ -20,7 +18,7 @@ declare function createSendOrderMessage(params: {
  * 注文返品メッセージを作成する
  */
 declare function createReturnOrderMessage(params: {
-    order: factory.order.IOrder;
+    order: IOrderAsCreateEmailParams;
     email?: factory.creativeWork.message.email.ICustomization;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
     index: number;
@@ -29,7 +27,7 @@ declare function createReturnOrderMessage(params: {
  * 返金メッセージを作成する
  */
 declare function createRefundMessage(params: {
-    order: factory.order.IOrder;
+    order: IOrderAsCreateEmailParams;
     email?: factory.creativeWork.message.email.ICustomization;
     paymentMethodId: string;
 }, settings: Settings): Promise<ISendableEmailMessage>;

package/lib/chevre/factory/event.d.ts

@@ -1,5 +1,7 @@
 import * as factory from '../factory';
-export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent | factory.eventType.Event> = T extends factory.eventType.ScreeningEvent ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'superEvent' | 'offers' | 'coaInfo' | 'identifier'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers'> : never;
+export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent | factory.eventType.Event> = T extends factory.eventType.ScreeningEvent ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'superEvent' | 'offers' | 'coaInfo' | 'identifier'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers'> & {
+    superEvent?: never;
+} : never;
 /**
  * 興行イベントのsuperEventを作成する
  */

package/lib/chevre/index.d.ts

@@ -13,5 +13,6 @@ import * as service from './service';
 import * as settings from './settings';
 export { credentials, errorHandler, eventEmitter, factory, repository, service, settings };
 export declare function loadPecorinoapi(): Promise<typeof Pecorinoapi>;
+export type COA = typeof COAService;
 export declare function loadCOA(): Promise<typeof COAService>;
 export declare function loadGMO(): Promise<typeof GMOService>;

package/lib/chevre/repo/aggregateReservation.js

@@ -68,17 +68,18 @@ class AggregateReservationRepo {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = AggregateReservationRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {
+            let projectStage = {
                 _id: 0,
                 id: '$reservationFor.id'
             };
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    projectStage[field] = { $ifNull: [`$${field}`, '$false'] };
+                    // projectStage[field] = 1;
                 });
             }
             else {
-                projection = {
+                projectStage = {
                     _id: 0,
                     id: '$reservationFor.id',
                     aggregateEntranceGate: 1,
@@ -91,7 +92,16 @@ class AggregateReservationRepo {
                 ...(typeof sortByStartDate === 'number')
                     ? [{ $sort: { 'reservationFor.startDate': sortByStartDate } }]
                     : [],
-                { $project: projection }
+                // 現時点でreservationFor.idへのunique indexがないので、重複ドキュメント対応として、$group
+                {
+                    $group: {
+                        _id: '$reservationFor.id',
+                        reservationFor: { $first: '$reservationFor' },
+                        aggregateEntranceGate: { $first: '$aggregateEntranceGate' },
+                        aggregateOffer: { $first: '$aggregateOffer' }
+                    }
+                },
+                { $project: projectStage }
             ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

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

@@ -68,13 +68,16 @@ interface IStatus {
 interface IAggregateEvent {
     statuses: IStatus[];
 }
-type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'aggregateEntranceGate' | 'aggregateOffer';
+export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
+type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered';
+/**
+ * minimizedEvent検索時のprojection候補
+ * add(2024-07-18~)
+ */
+type IKeyOfProjection4minimizedEvent<T extends factory.eventType> = T extends factory.eventType.ScreeningEvent ? Exclude<keyof IMinimizedIndividualEvent<T>, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : T extends factory.eventType.Event ? Exclude<keyof IMinimizedIndividualEvent<T>, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : never;
 type IUnset<T extends factory.eventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };
-export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-export declare const keyOfMinimizedScreeningEvent: IKeyOfProjection<factory.eventType.ScreeningEvent>[];
-export declare const keyOfMinimizedEvent: IKeyOfProjection<factory.eventType.Event>[];
 /**
  * イベントリポジトリ
  */
@@ -159,9 +162,13 @@ export declare class EventRepo {
      */
     search<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[], exclusion: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
-    findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
+    /**
+     * 特定イベントから指定フィールドのみ取得する
+     * イベント IDは必ず返ります
+     */
+    projectFieldsById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;
-    }): Promise<IMinimizedIndividualEvent<T>>;
+    }, inclusion: IKeyOfProjection4minimizedEvent<T>[]): Promise<IMinimizedIndividualEvent<T>>;
     /**
      * イベントをキャンセルする
      */