@chevre/domain 22.11.0-alpha.1 → 22.11.0-alpha.3

package/example/src/chevre/checkProjectMembers.ts

@@ -0,0 +1,55 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
+
+    const cursor = memberRepo.getCursor(
+        {
+            'member.memberOf.typeOf': { $eq: 'Project' },
+            'member.typeOf': { $eq: 'Person' }
+        },
+        {
+            _id: 1,
+            member: 1,
+            project: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let sellerMemberCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const member = <Pick<chevre.factory.iam.IMember, 'member' | 'project'>>doc.toObject();
+
+        console.log('checking...', member.project.id, member.member?.id, i);
+        const sellerMembers = await memberRepo.projectFieldsByProjectId(
+            { id: member.project.id },
+            {
+                member: {
+                    id: { $eq: member.member.id },
+                    typeOf: { $eq: 'Person' },
+                    memberOf: { typeOf: { $eq: chevre.factory.organizationType.Corporation } }
+                }
+            },
+            ['member']
+        );
+        console.log(sellerMembers.length, 'sellerMember found', member.project.id, member.member?.id, i);
+        if (sellerMembers.length > 0) {
+            sellerMemberCount += 1;
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(sellerMemberCount, 'members sellerMember');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/orders/searchWithUnwoundAcceptedOffers.ts

@@ -0,0 +1,73 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const formatter = new Intl.NumberFormat('ja-JP');
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    let startTime: [number, number] = process.hrtime();
+    let diff: [number, number] = process.hrtime(startTime);
+
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
+
+    startTime = process.hrtime();
+    const result = await acceptedOfferRepo.searchWithUnwoundAcceptedOffers(
+        {
+            project: { id: { $eq: project.id } },
+            limit: 20,
+            page: 12,
+            sort: {
+                orderDate: chevre.factory.sortType.Descending
+            },
+            orderStatuses: [chevre.factory.orderStatus.OrderDelivered],
+            orderDate: {
+                $gte: new Date('2025-06-07T15:00:00.000Z'),
+                $lte: new Date('2025-07-08T01:42:34.654Z')
+            },
+            acceptedOffers: {
+                itemOffered: {
+                    issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.EventService } },
+                    reservationFor: {
+                        inSessionFrom: new Date('2025-07-07T15:00:00.000Z'),
+                        inSessionThrough: new Date('2025-07-08T15:00:00.000Z'),
+                        superEvent: {
+                            location: { branchCodes: ['p006'] }
+                        }
+                    }
+                }
+            },
+            seller: { ids: ['62568df4138ef5000b18c8c0'] },
+            provider: { id: { $eq: '62568df4138ef5000b18c8c0' } }
+            // // req.seller.idを考慮(2023-07-19~)
+            // ...(typeof req.seller?.id === 'string') ? { provider: { id: { $eq: req.seller.id } } } : undefined
+        },
+        {
+            confirmationNumber: 1,
+            customer: 1,
+            dateReturned: 1,
+            orderDate: 1,
+            orderNumber: 1,
+            orderStatus: 1,
+            paymentMethods: 1,
+            price: 1,
+            priceCurrency: 1,
+            project: 1,
+            seller: 1
+        },
+        { useLimitAfterSkip: false }
+        // { useLimitAfterSkip: true }
+    );
+    diff = process.hrtime(startTime);
+    console.log(result.map(({ orderNumber, orderDate }) => `${orderDate} ${orderNumber}`));
+    console.log(result.length);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/settings/addSettings.ts

@@ -0,0 +1,32 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
+
+    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+    const useInformReturnAction = (<any>setting)?.onOrderStatusChanged?.useInformReturnAction === true;
+    if (useInformReturnAction) {
+        console.log('already useInformReturnAction:true');
+    } else {
+        // update
+        await settingRepo.updateByProject4migration(
+            { project: { id: { $eq: '*' } } },
+            {
+                $set: {
+                    'onOrderStatusChanged.useInformReturnAction': true
+                }
+            }
+        );
+        console.log('updated.');
+    }
+
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -20,7 +20,9 @@ export declare class AcceptedOfferRepo {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
+    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
+        useLimitAfterSkip: boolean;
+    }): Promise<factory.order.IOrder[]>;
     aggreateOwnershipInfosByOrder(filter: {
         orderNumber: {
             $eq: string;

package/lib/chevre/repo/acceptedOffer.js

@@ -24,9 +24,10 @@ class AcceptedOfferRepo {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffers(params, projection) {
+    searchWithUnwoundAcceptedOffers(params, projection, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const { useLimitAfterSkip } = options;
             const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
             const aggregate = this.orderModel.aggregate();
             // pipelineの順序に注意
@@ -43,8 +44,15 @@ class AcceptedOfferRepo {
             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));
+                // support skip -> limit(2025-07-09~)
+                if (useLimitAfterSkip) {
+                    aggregate.skip(params.limit * (page - 1))
+                        .limit(params.limit);
+                }
+                else {
+                    aggregate.limit(params.limit * page)
+                        .skip(params.limit * (page - 1));
+                }
             }
             return aggregate
                 // .allowDiskUse(true) // false化(2023-11-30~)

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

@@ -23,4 +23,13 @@ export declare class SettingRepo {
             };
         };
     }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    updateByProject4migration(filter: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+    }, update: {
+        $set: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -56,5 +56,14 @@ class SettingRepo {
                 .exec();
         });
     }
+    updateByProject4migration(filter, update) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { $set } = update;
+            return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
+                $set
+            })
+                .exec();
+        });
+    }
 }
 exports.SettingRepo = SettingRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.js

@@ -4,24 +4,22 @@ exports.createInformTasks = createInformTasks;
 exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
 const factory = require("../../../../factory");
 function createInformTasks(order, returnOrderAction, setting) {
-    var _a, _b, _c;
+    var _a, _b;
     const taskRunsAt = new Date();
     const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-    const useInformReturnAction = ((_b = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _b === void 0 ? void 0 : _b.useInformReturnAction) === true;
+    // const useInformReturnAction = (<any>setting)?.onOrderStatusChanged?.useInformReturnAction === true; // discontinue(2025-07-01~)
     const informTasks = [];
-    // support returnAction4inform(2025-01-22~)
-    let informObject;
     const informIdentifier = `${factory.order.OrderType.Order}:${order.orderNumber}:${factory.orderStatus.OrderReturned}`;
-    if (useInformReturnAction) {
-        informObject = createReturnAction4inform(returnOrderAction);
-    }
-    else {
-        informObject = createOrder4inform(order);
-    }
+    const informObject = createReturnAction4inform(returnOrderAction);
+    // if (useInformReturnAction) { // discontinue(2025-07-01~)
+    //     informObject = createReturnAction4inform(returnOrderAction);
+    // } else {
+    //     informObject = createOrder4inform(order);
+    // }
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         let recipientId = '';
         recipientId = order.customer.id;
-        if (typeof ((_c = order.returner) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
+        if (typeof ((_b = order.returner) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             recipientId = order.returner.id;
         }
         informOrder.forEach((informOrderParams) => {
@@ -63,9 +61,19 @@ function createReturnAction4inform(returnOrderAction) {
     const { id, instrument, object, project, typeOf } = returnOrderAction;
     return Object.assign({ id, object, project, typeOf }, (Array.isArray(instrument)) ? { instrument } : undefined);
 }
-function createOrder4inform(order) {
-    return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: factory.orderStatus.OrderReturned }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
-}
+// function createOrder4inform(
+//     order: IReturnedOrder
+// ): IOrder4inform {
+//     return {
+//         project: order.project,
+//         typeOf: order.typeOf,
+//         orderNumber: order.orderNumber,
+//         orderStatus: factory.orderStatus.OrderReturned,
+//         ...(order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined,
+//         // ↓hub側で使用している可能性もあるので念のため
+//         ...(typeof order.id === 'string') ? { id: order.id } : undefined
+//     };
+// }
 /**
  * 注文返品後のアクション
  */

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.395.0-alpha.1",
-    "@cinerino/sdk": "11.0.0-alpha.2",
+    "@chevre/factory": "4.395.0-alpha.2",
+    "@cinerino/sdk": "11.0.0-alpha.3",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/client": "8.1.4",
@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.1"
+  "version": "22.11.0-alpha.3"
 }

package/example/src/chevre/checkActions.ts

@@ -1,65 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const CONSOLE_CLIENT_ID = 'xxx';
-// const project = { id: String(process.env.PROJECT_ID) };
-type IAction = chevre.factory.action.IAction<chevre.factory.action.IAttributes<chevre.factory.actionType, any, any>>;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-
-    const cursor = actionRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.actionType.CreateAction },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-60, 'days')
-                    .toDate()
-            }
-        },
-        {
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const action = <IAction>doc.toObject();
-        // const size = JSON.stringify(action).length;
-        // // console.log(JSON.stringify(action).length);
-        // if (action.typeOf !== chevre.factory.actionType.InformAction
-        //     && action.typeOf !== chevre.factory.actionType.AuthorizeAction
-        //     && action.typeOf !== chevre.factory.actionType.CheckAction
-        //     && size > 2000) {
-        //     console.log(action.typeOf, action.object?.typeOf);
-        //     console.log(size);
-        // }
-
-        const eventCount = (Array.isArray(action.result))
-            ? action.result.filter(({ typeOf }) => typeOf === chevre.factory.eventType.ScreeningEvent)
-                .length
-            : 0;
-        if (action.instrument?.id !== CONSOLE_CLIENT_ID) {
-            console.log(eventCount, 'events created', action.project.id, action.startDate, action.instrument?.id, i);
-            // tslint:disable-next-line:no-magic-numbers
-            if (eventCount > 10) {
-                throw new Error('eventCount too large');
-            }
-        }
-    });
-
-    console.log(i, 'actions checked');
-}
-
-main()
-    .then()
-    .catch(console.error);