@chevre/domain 22.11.0 → 22.12.0-alpha.1

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

@@ -7,6 +7,9 @@ import { chevre } from '../../../../lib/index';
 
 const PROJECT_ID = String(process.env.PROJECT_ID);
 const AGGREGATE_PERIOD_IN_DAYS = 365;
+const AGGREGATE_ORDER_CLIENT_IDS = (typeof process.env.AGGREGATE_ORDER_CLIENT_IDS === 'string')
+    ? process.env.AGGREGATE_ORDER_CLIENT_IDS.split(' ')
+    : [];
 
 function createAggregation(params: {
     order: Pick<chevre.factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'project'>;
@@ -35,7 +38,7 @@ function createAggregation(params: {
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false, appName: 'sample' });
 
     const aggregateOrderRepo = await chevre.repository.AggregateOrder.createInstance(mongoose.connection);
     const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
@@ -56,7 +59,7 @@ async function main() {
             typeOf: { $eq: chevre.factory.order.OrderType.Order },
             'customer.id': { // exclude pos,tvm
                 $exists: true,
-                $in: []
+                $in: AGGREGATE_ORDER_CLIENT_IDS
             }
         },
         {

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

@@ -0,0 +1,34 @@
+// tslint:disable:no-console
+// import * as fs from 'fs';
+import * as moment from 'moment-timezone';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const AGGREGATE_PERIOD_IN_DAYS = 365;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false, appName: 'sample' });
+
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+
+    const orderDateLte: Date = moment()
+        .toDate();
+    const orderDateGte: Date = moment(orderDateLte)
+        .add(-AGGREGATE_PERIOD_IN_DAYS, 'days')
+        .toDate();
+
+    console.log('aggregating...');
+    const result = await orderRepo.aggregateOrderOfCustomerGlobally({
+        orderDate: { $gte: orderDateGte, $lte: orderDateLte },
+        customer: { email: { $eq: 'ilovegadd@gmail.com' } }
+    });
+    console.log(result);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/event/migrateEventMaximumPhysicalAttendeeCapacity.ts

@@ -0,0 +1,76 @@
+// 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 eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const cursor = eventRepo.getCursor(
+        {
+            // _id: { $eq: 'bm2bftkoj' },
+            'location.maximumAttendeeCapacity': { $exists: true }
+        },
+        {
+            _id: 1,
+            startDate: 1,
+            project: 1,
+            location: 1,
+            maximumPhysicalAttendeeCapacity: 1,
+            typeOf: 1
+        }
+    );
+    console.log('events found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const event: Pick<
+            chevre.factory.event.screeningEvent.IEvent,
+            'id' | 'location' | 'startDate' | 'project' | 'maximumPhysicalAttendeeCapacity' | 'typeOf'
+        > = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', event.project.id, event.id, event.startDate, i);
+        const originCapacity = event.location.maximumAttendeeCapacity;
+        const alreadyMigrated = typeof originCapacity !== 'number'
+            || (typeof originCapacity === 'number' && originCapacity === event.maximumPhysicalAttendeeCapacity);
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', event.project.id, event.id, event.startDate, i);
+        } else {
+            if (typeof originCapacity === 'number') {
+                console.log(
+                    'updating project... maximumPhysicalAttendeeCapacity:',
+                    originCapacity,
+                    event.project.id, event.id, event.startDate, i);
+                await eventRepo.updatePartiallyById({
+                    project: { id: event.project.id },
+                    id: event.id,
+                    attributes: {
+                        typeOf: event.typeOf,
+                        ...{
+                            maximumPhysicalAttendeeCapacity: originCapacity
+                        }
+                    }
+                });
+                updateCount += 1;
+                console.log(
+                    'updated.',
+                    event.project.id, event.id, event.startDate, i);
+            }
+        }
+    });
+
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/reIndex.ts

@@ -11,7 +11,7 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    await chevre.repository.Task.createInstance(mongoose.connection);
+    await chevre.repository.Product.createInstance(mongoose.connection);
     console.log('success!');
 }
 

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

@@ -1,5 +1,5 @@
 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' | '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'> & {
+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' | 'maximumPhysicalAttendeeCapacity'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers' | 'maximumPhysicalAttendeeCapacity'> & {
     superEvent?: never;
 } : never;
 /**

package/lib/chevre/repo/event.js

@@ -32,7 +32,7 @@ const AVAILABLE_PUBLIC_PROJECT_FIELDS = [
     'doorTime', 'endDate', 'eventStatus', 'identifier', 'location',
     'maximumAttendeeCapacity', 'name',
     // 'offers',
-    'organizer', 'project', 'remainingAttendeeCapacity', 'startDate', 'superEvent', 'typeOf'
+    'organizer', 'project', 'remainingAttendeeCapacity', 'startDate', 'superEvent', 'typeOf', 'maximumPhysicalAttendeeCapacity'
 ];
 /**
  * イベントリポジトリ

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

@@ -61,6 +61,15 @@ const indexes = [
     [
         { typeOf: 1, identifier: 1 },
         { name: 'typeOf' }
+    ],
+    [
+        { 'aggregateOrder.aggregateProject.projectCount': 1, identifier: 1 },
+        {
+            name: 'aggregateProjectProjectCount',
+            partialFilterExpression: {
+                'aggregateOrder.aggregateProject.projectCount': { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;

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

@@ -33,6 +33,7 @@ const schemaDefinition = {
     superEvent: mongoose_1.SchemaTypes.Mixed,
     offers: mongoose_1.SchemaTypes.Mixed,
     maximumAttendeeCapacity: { type: Number },
+    maximumPhysicalAttendeeCapacity: { type: Number, required: false }, // add(2025-08-24~)
     remainingAttendeeCapacity: { type: Number },
     checkInCount: { type: Number },
     attendeeCount: { type: Number },

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

@@ -16,6 +16,12 @@ interface IAggregation {
     maxPrice: number;
     minPrice: number;
 }
+interface IGlobalAggregateOrder {
+    orderCount: number;
+    aggregateProject: {
+        projectCount: number;
+    };
+}
 interface IAggregateOrder {
     aggregation: IAggregation;
 }
@@ -236,7 +242,7 @@ export declare class OrderRepo {
             };
         };
     }): Promise<{
-        aggregation: Pick<IAggregation, 'orderCount'> & {
+        aggregation: IGlobalAggregateOrder & {
             sumGraceTime?: never;
         };
     }>;

package/lib/chevre/repo/order.js

@@ -1280,12 +1280,35 @@ class OrderRepo {
             if (aggregations.length === 0) {
                 return {
                     aggregation: {
-                        orderCount: 0
+                        orderCount: 0,
+                        aggregateProject: { projectCount: 0 }
                     }
                 };
             }
+            const aggregations2 = yield this.orderModel.aggregate([
+                { $match: matchConditions },
+                {
+                    $project: {
+                        project: '$project'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$project.id'
+                    }
+                },
+                {
+                    $count: 'projectCount'
+                },
+                {
+                    $project: {
+                        aggregateProject: { projectCount: '$projectCount' }
+                    }
+                }
+            ])
+                .exec();
             return {
-                aggregation: Object.assign({}, aggregations[0])
+                aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])
             };
         });
     }

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -28,7 +28,7 @@ function aggregateScreeningEvent(params) {
     ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         // 集計対象イベント検索
-        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.id', 'superEvent.location.id', 'offers.itemOffered']);
+        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.id', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
         // プロジェクト設定検索
         const project = yield repos.project.findById({
             id: event.project.id,
@@ -66,7 +66,7 @@ function aggregateScreeningEvent(params) {
                         startFrom: startFrom,
                         startThrough: startThrough,
                         location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
+                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
                 }
                 else if (event.typeOf === factory.eventType.ScreeningEvent) {
                     aggregatingEvents = yield repos.event.projectEventFields({
@@ -78,7 +78,7 @@ function aggregateScreeningEvent(params) {
                         startFrom: startFrom,
                         startThrough: startThrough,
                         location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
+                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
                 }
                 // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
                 aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
@@ -234,7 +234,10 @@ function aggregateReservationByEvent(params) {
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
         });
         // maximumAttendeeCapacityを決定
-        const eventLocationMaximumAttendeeCapacity = params.event.location.maximumAttendeeCapacity;
+        let eventLocationMaximumAttendeeCapacity = params.event.location.maximumAttendeeCapacity;
+        if (typeof params.event.maximumPhysicalAttendeeCapacity === 'number') {
+            eventLocationMaximumAttendeeCapacity = params.event.maximumPhysicalAttendeeCapacity;
+        }
         if (typeof eventLocationMaximumAttendeeCapacity === 'number') {
             maximumAttendeeCapacity = eventLocationMaximumAttendeeCapacity;
         }

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -100,7 +100,7 @@ function fixEvent(params) {
             // additionalProperty, // discontinue(2024-07-20~)
             'name', 'doorTime', 'endDate', 'eventStatus',
             'location', 'startDate', 'superEvent',
-            'offers'
+            'offers', 'maximumPhysicalAttendeeCapacity'
             // 'coaInfo', // discontinue(2024-07-24~)
             // 'identifier' // discontinue(2024-07-24~)
         ]);
@@ -504,6 +504,7 @@ function processLockOfferRateLimit(params) {
 /**
  * 座席ロックプロセス
  */
+// tslint:disable-next-line:max-func-body-length
 function processLockSeats(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
@@ -554,6 +555,9 @@ function processLockSeats(params) {
         const bookingTime = params.transaction.startDate; // fix as transactionNumber(2024-07-02~)
         const hasTicketedSeat = ((_d = (_c = (_b = params.event.offers.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.typeOf) === factory.placeType.Seat;
         let maximumAttendeeCapacity4event = (_e = params.event.location) === null || _e === void 0 ? void 0 : _e.maximumAttendeeCapacity;
+        if (typeof params.event.maximumPhysicalAttendeeCapacity === 'number') {
+            maximumAttendeeCapacity4event = params.event.maximumPhysicalAttendeeCapacity;
+        }
         // 座席無の場合デフォルトmaximumAttendeeCapacityを適用(2025-04-20~)
         if (!hasTicketedSeat) {
             if (typeof maximumAttendeeCapacity4event !== 'number') {

package/lib/chevre/service/payment/any.d.ts

@@ -184,6 +184,7 @@ interface IFindAuthorizeActionResult {
      * アクションスタータス
      */
     actionStatus: factory.actionStatusType;
+    object?: Pick<factory.action.authorize.paymentMethod.any.IObject, 'paymentMethodId'>;
     /**
      * エラー
      */
@@ -221,6 +222,7 @@ interface IFindAcceptActionResult {
      * アクションスタータス
      */
     actionStatus: factory.actionStatusType;
+    object?: Pick<factory.action.accept.pay.IObject, 'transactionNumber'>;
     /**
      * エラー
      */

package/lib/chevre/service/payment/any.js

@@ -636,7 +636,10 @@ function findAuthorizeAction(params) {
                     if (((_b = authorizeAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    action = Object.assign({ id: authorizeAction.id, actionStatus: authorizeAction.actionStatus }, (authorizeAction.error !== undefined)
+                    const authorizeActionWithObject = yield repos.action.findById({ id: authorizeAction.id, typeOf: factory.actionType.AuthorizeAction }, ['object'], []);
+                    action = Object.assign({ id: authorizeAction.id, actionStatus: authorizeAction.actionStatus, 
+                        // add object.paymentMethodId(2025-08-26~)
+                        object: { paymentMethodId: authorizeActionWithObject.object.paymentMethodId } }, (authorizeAction.error !== undefined)
                         ? {
                             error: (Array.isArray(authorizeAction.error))
                                 ? authorizeAction.error[0]
@@ -741,8 +744,10 @@ function findAcceptAction(params) {
                     if (((_b = acceptAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    const acceptActionWithResult = yield repos.action.findById({ id: acceptAction.id, typeOf: factory.actionType.AcceptAction }, ['result'], []);
-                    action = Object.assign(Object.assign({ id: acceptAction.id, actionStatus: acceptAction.actionStatus }, (acceptAction.error !== undefined)
+                    const acceptActionWithResult = yield repos.action.findById({ id: acceptAction.id, typeOf: factory.actionType.AcceptAction }, ['result', 'object'], []);
+                    action = Object.assign(Object.assign({ id: acceptAction.id, actionStatus: acceptAction.actionStatus, 
+                        // add object.transactionNumber(2025-08-26~)
+                        object: { transactionNumber: acceptActionWithResult.object.transactionNumber } }, (acceptAction.error !== undefined)
                         ? {
                             error: (Array.isArray(acceptAction.error))
                                 ? acceptAction.error[0]

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.396.0",
-    "@cinerino/sdk": "12.0.0-alpha.0",
+    "@chevre/factory": "4.397.0-alpha.0",
+    "@cinerino/sdk": "12.0.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0"
+  "version": "22.12.0-alpha.1"
 }