@chevre/domain 22.9.0-alpha.68 → 22.9.0-alpha.69

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

@@ -6,9 +6,12 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../../lib/index';
 
 const PROJECT_ID = String(process.env.PROJECT_ID);
-const SCREEN_CODE = '130';
+// const SCREEN_CODE = '10';
+// const MOVIE_THEATER_CODE = '118';
+// const SCREEN_CODE = '130';
+const SCREEN_CODE = '211';
 const MOVIE_THEATER_CODE = '020';
-const AGGREGATE_PERIOD_IN_MONTHS = 6;
+const AGGREGATE_PERIOD_IN_MONTHS = 12;
 // tslint:disable-next-line:max-func-body-length
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
@@ -17,7 +20,7 @@ async function main() {
     const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
 
     const seats = <Pick<chevre.factory.place.seat.IPlace, 'branchCode'>[]>await seatRepo.searchSeats({
-        // limit: 10,
+        // limit: 50,
         $projection: {
             additionalProperty: 0,
             'containedInPlace.typeOf': 0,
@@ -44,10 +47,13 @@ async function main() {
         .toDate();
 
     let maxSumGraceTime: number = 0;
+    let maxRepeatRate: number = 0;
     const seatsWithAggregateOrder: {
         branchCode: string;
         aggregateOrder: {
+            emailCount: number;
             orderCount: number;
+            repeatRate: number;
             avgGraceTime?: number;
             sumGraceTime: number;
             avgGraceTimeInHours?: number;
@@ -76,6 +82,13 @@ async function main() {
         const diff = process.hrtime(startTime);
         console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
 
+        const emailCount = (typeof aggregateResult.aggregation.emailCount === 'number')
+            ? aggregateResult.aggregation.emailCount
+            : 0;
+        const repeatRate = (aggregateResult.aggregation.orderCount > 0)
+            // tslint:disable-next-line:no-magic-numbers
+            ? (aggregateResult.aggregation.orderCount - emailCount) * 100 / aggregateResult.aggregation.orderCount
+            : 0;
         const sumGraceTime = (typeof aggregateResult.aggregation.sumGraceTime === 'number')
             ? aggregateResult.aggregation.sumGraceTime
             : 0;
@@ -90,11 +103,14 @@ async function main() {
                 .asHours())
             : 0;
         maxSumGraceTime = Math.max(sumGraceTime, maxSumGraceTime);
+        maxRepeatRate = Math.max(repeatRate, maxRepeatRate);
 
         seatsWithAggregateOrder.push({
             branchCode,
             aggregateOrder: {
                 ...aggregateResult.aggregation,
+                emailCount,
+                repeatRate,
                 avgGraceTimeInHours,
                 sumGraceTimeInHours,
                 sumGraceTime
@@ -105,16 +121,35 @@ async function main() {
     const seatsJson = seatsWithAggregateOrder.map((seat, key) => {
         // tslint:disable-next-line:no-magic-numbers
         const score = Math.floor(seat.aggregateOrder.sumGraceTime * 100 / maxSumGraceTime);
-        console.log('aggregateOrder:result', seat.branchCode, score, key);
+        console.log('aggregateOrder:result', seat.branchCode, key);
+
+        return {
+            branchCode: seat.branchCode,
+            score
+        };
+    });
+
+    const scoresByEmailJson = seatsWithAggregateOrder.map((seat, key) => {
+        // tslint:disable-next-line:no-magic-numbers
+        const score = Math.floor(seat.aggregateOrder.repeatRate * 100 / maxRepeatRate);
+        console.log('aggregateOrder:result', seat.branchCode, seat.aggregateOrder.emailCount, key);
 
         return {
             branchCode: seat.branchCode,
             score
+            // repeatRate: seat.aggregateOrder.repeatRate,
+            // emailCount: seat.aggregateOrder.emailCount,
+            // orderCount: seat.aggregateOrder.orderCount
         };
     });
 
+    console.log('maxSumGraceTime:', maxSumGraceTime);
+    console.log('maxRepeatRate:', maxRepeatRate);
+
+    // tslint:disable-next-line:non-literal-fs-path no-null-keyword
+    fs.writeFileSync(`${__dirname}/seatScoresByGraceTime.json`, JSON.stringify(seatsJson, null, '    '));
     // tslint:disable-next-line:non-literal-fs-path no-null-keyword
-    fs.writeFileSync(`${__dirname}/seatsWithAggregateOrder.json`, JSON.stringify(seatsJson, null, '    '));
+    fs.writeFileSync(`${__dirname}/seatScoresByEmail.json`, JSON.stringify(scoresByEmailJson, null, '    '));
 }
 
 main()

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

@@ -196,6 +196,7 @@ export declare class OrderRepo {
     }): Promise<{
         aggregation: Pick<IAggregation, 'orderCount'> & {
             sumGraceTime?: number;
+            emailCount?: number;
         };
     }>;
 }

package/lib/chevre/repo/order.js

@@ -1116,6 +1116,19 @@ class OrderRepo {
                 'acceptedOffers.itemOffered.reservationFor.location.branchCode': { $exists: true, $eq: screenCode },
                 'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true, $eq: seatNumber }
             };
+            const aggregations4email = yield this.orderModel.aggregate([
+                { $match: matchConditions },
+                {
+                    $group: {
+                        _id: '$customer.email'
+                    }
+                },
+                {
+                    $count: 'emailCount'
+                }
+            ])
+                .exec();
+            const emailCount = (aggregations4email.length > 0) ? aggregations4email[0].emailCount : 0;
             const aggregations = yield this.orderModel.aggregate([
                 { $match: matchConditions },
                 {
@@ -1152,7 +1165,9 @@ class OrderRepo {
                     }
                 };
             }
-            return { aggregation: aggregations[0] };
+            return {
+                aggregation: Object.assign(Object.assign({}, aggregations[0]), { emailCount })
+            };
         });
     }
 }

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

@@ -22,7 +22,7 @@ function createOnOrderCancelledTasksByTransaction(params) {
             numberOfTried: 0,
             executionResults: [],
             data: {
-                project: params.transaction.project,
+                // project: params.transaction.project, // discontinue(2025-03-12~)
                 purpose: {
                     typeOf: params.transaction.typeOf,
                     id: params.transaction.id,
@@ -39,7 +39,7 @@ function createOnOrderCancelledTasksByTransaction(params) {
             numberOfTried: 0,
             executionResults: [],
             data: {
-                project: params.transaction.project,
+                // project: params.transaction.project, // discontinue(2025-03-12~)
                 purpose: {
                     typeOf: params.transaction.typeOf,
                     id: params.transaction.id,

package/lib/chevre/service/task/voidPayTransaction.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -25,7 +24,7 @@ const any_1 = require("../payment/any");
  */
 function call(params) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield (0, any_1.voidPayTransaction)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id, typeOf: factory.organizationType.Project }, sameAs: { id: params.id } }))({
+        yield (0, any_1.voidPayTransaction)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id }, sameAs: { id: params.id } }))({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

package/lib/chevre/service/task/voidReserveTransaction.js

@@ -61,7 +61,7 @@ function call(params) {
         }, { timeout: settings.coa.timeout });
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
-            yield (0, voidTransaction_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id, typeOf: factory.organizationType.Project }, sameAs: { id: params.id } }))({
+            yield (0, voidTransaction_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id }, sameAs: { id: params.id } }))({
                 action: new action_1.ActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 stockHolder: new stockHolder_1.StockHolderRepo(redisClient, connection),

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -7,5 +7,6 @@ type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceO
 export declare function createTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     runsAt: Date;
+    optimizeRedundantTasks: boolean;
 }, setting: Pick<ISetting, 'onTransactionStatusChanged' | 'storage'> | null): IPlaceOrderPotentialTask[];
 export {};

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -104,7 +104,7 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            project: transaction.project,
+            // project: transaction.project, // discontinue(2025-03-12~)
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
@@ -118,13 +118,14 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            project: transaction.project,
+            // project: transaction.project, // discontinue(2025-03-12~)
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, voidReserveTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes);
+    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
+            taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             // const potentialActions = transaction.potentialActions;
             // if (potentialActions === undefined) {
             //     throw new factory.errors.NotFound('Transaction PotentialActions');
@@ -159,7 +160,18 @@ function createTasks(params, setting
             taskAttributes.push(placeOrderTaskAttributes);
             break;
         case factory.transactionStatusType.Canceled:
+            taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
+            break;
         case factory.transactionStatusType.Expired:
+            // optimizeRedundantTasks(2025-03-)
+            if (params.optimizeRedundantTasks === true) {
+                if (typeof params.transaction.object.orderNumber === 'string') {
+                    taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
+                }
+            }
+            else {
+                taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
+            }
             // tslint:disable-next-line:no-suspicious-comment
             // TODO reimplement
             // temporarily discontinue VoidRegisterServiceTransaction VoidMoneyTransferTransaction(2025-02-25~)

package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts

@@ -15,5 +15,9 @@ export declare function exportTasksById(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
+    /**
+     * support optimizeRedundantTasks(2025-03-11~)
+     */
+    optimizeRedundantTasks: boolean;
 }): ITaskAndTransactionOperation<void>;
 export {};

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -36,7 +36,8 @@ function exportTasksById(params) {
         const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTransactionStatusChanged', 'storage']);
         const taskAttributes = (0, factory_1.createTasks)({
             transaction,
-            runsAt: taskRunsAt
+            runsAt: taskRunsAt,
+            optimizeRedundantTasks: params.optimizeRedundantTasks === true
         }, setting
         // settings
         );

package/lib/chevre/service/transaction.d.ts

@@ -44,6 +44,10 @@ export declare function exportOneTransactionTasksIfExists(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
+    /**
+     * support optimizeRedundantTasks(2025-03-11~)
+     */
+    optimizeRedundantTasks: boolean;
     status?: {
         $eq?: factory.transactionStatusType;
     };

package/lib/chevre/service/transaction.js

@@ -126,7 +126,7 @@ function exportOneTransactionTasksIfExists(params) {
                     : undefined))(repos);
                 break;
             case factory.transactionType.PlaceOrder:
-                yield PlaceOrderTransactionService.exportTasksById(Object.assign({ id: transaction.id }, (typeof params.runsTasksAfterInSeconds === 'number')
+                yield PlaceOrderTransactionService.exportTasksById(Object.assign({ id: transaction.id, optimizeRedundantTasks: params.optimizeRedundantTasks === true }, (typeof params.runsTasksAfterInSeconds === 'number')
                     ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
                     : undefined))(repos);
                 break;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.36",
+    "@chevre/factory": "4.393.0-alpha.37",
     "@cinerino/sdk": "10.21.0-alpha.24",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.68"
+  "version": "22.9.0-alpha.69"
 }