@chevre/domain 21.32.0 → 21.33.0-alpha.1

package/example/src/chevre/searchAggregations.ts

@@ -0,0 +1,45 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  moment from 'moment';
+import * as  mongoose from 'mongoose';
+
+// 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 now = new Date();
+    const limit = 100;
+    const page = 1;
+    const aggregationRepo = await chevre.repository.Aggregation.createInstance(mongoose.connection);
+    const aggregations = await aggregationRepo.aggregationModel.find(
+        {
+            typeOf: { $eq: 'AggregateAuthorizeEventServiceOfferAction' },
+            aggregateDuration: { $eq: 'P1D' },
+            aggregateStart: {
+                $gte: moment(now)
+                    .add(-1, 'months')
+                    .toDate(),
+                $lte: now
+            }
+        }
+    )
+        .limit(limit)
+        .skip(limit * (page - 1))
+        .sort({ aggregateStart: chevre.factory.sortType.Ascending })
+        .exec();
+
+    // console.log('aggregations:', aggregations);
+    console.log(aggregations.length, 'aggregations found');
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -27,6 +27,7 @@ async function main() {
     updateResult = await taskRepo.unsetUnnecessaryFields({
         filter: {
             // _id: { $exists: true },
+            name: { $nin: ['deleteTransaction'] },
             runsAt: {
                 $gte: moment()
                     .add(-1, 'days')

package/lib/chevre/repo/mongoose/schemas/aggregation.d.ts

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Aggregation";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

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

@@ -31,6 +31,25 @@ const schemaOptions = {
         versionKey: false
     }
 };
+const indexes = [
+    [
+        { aggregateStart: 1 },
+        { name: 'searchByAggregateStart' }
+    ],
+    [
+        { typeOf: 1, aggregateStart: 1 },
+        { name: 'searchByTypeOf' }
+    ],
+    [
+        { 'project.id': 1, aggregateStart: 1 },
+        { name: 'searchByProjectId' }
+    ],
+    [
+        { aggregateDuration: 1, aggregateStart: 1 },
+        { name: 'searchByAggregateDuration' }
+    ]
+];
+exports.indexes = indexes;
 /**
  * 集計スキーマ
  */
@@ -38,9 +57,12 @@ let schema;
 function createSchema() {
     if (schema === undefined) {
         schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
     }
     return schema;
 }
 exports.createSchema = createSchema;
-const indexes = [];
-exports.indexes = indexes;

package/lib/chevre/service/task/acceptCOAOffer.d.ts

@@ -1,6 +1,6 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.acceptCOAOffer.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.acceptCOAOffer.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

package/lib/chevre/service/task/authorizePayment.d.ts

@@ -1,6 +1,6 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.authorizePayment.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.authorizePayment.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -39,6 +39,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
+        let callResult;
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepository(settings.redisClient, { lockExpiresInSeconds: 120 });
         try {
@@ -72,7 +73,13 @@ function call(params) {
                 throwsError = false;
             }
             if (throwsError) {
-                throw error;
+                if (error instanceof Error) {
+                    // throwせずにcallResultとして返す(2024-05-29~)
+                    callResult = { error };
+                }
+                else {
+                    throw error;
+                }
             }
         }
         finally {
@@ -81,6 +88,9 @@ function call(params) {
                 yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
             }
         }
+        if (callResult !== undefined) {
+            return callResult;
+        }
     });
 }
 exports.call = call;

package/lib/chevre/service/task/checkMovieTicket.d.ts

@@ -1,6 +1,6 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.checkMovieTicket.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.checkMovieTicket.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

package/lib/chevre/service/task/publishPaymentUrl.d.ts

@@ -1,6 +1,6 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.publishPaymentUrl.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.publishPaymentUrl.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

package/lib/chevre/service/task/voidReserveTransaction.d.ts

@@ -1,6 +1,6 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.ITask<factory.taskName.VoidReserveTransaction>, IExecutableTaskKeys>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.VoidReserveTransaction>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -21,6 +21,7 @@ type TaskOperation<T> = (repos: {
 }) => Promise<T>;
 type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
 type IOperationExecute<T> = (settings: IConnectionSettings, options: IExecuteOptions) => Promise<T>;
+type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
 declare function executeById(params: {
     id: string;
     executor?: {
@@ -53,4 +54,4 @@ declare function abort(params: {
 declare function notifyAbortedTasks(params: {
     dateAbortedGte: Date;
 }): TaskOperation<void>;
-export { IExecutableTaskKeys, IOperationExecute, executeById, executeByName, execute, abort, notifyAbortedTasks };
+export { ICallResult, IExecutableTaskKeys, IOperationExecute, executeById, executeByName, execute, abort, notifyAbortedTasks };

package/lib/chevre/service/task.js

@@ -17,7 +17,6 @@ const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../factory");
 const factory_1 = require("./notification/factory");
-// import { credentials } from '../credentials';
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
 const DEFAULT_EXECUTOR_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
@@ -102,6 +101,7 @@ function execute(task) {
                 }
             }
             // タスク名の関数が定義されていなければ、TypeErrorとなる
+            let callResult;
             const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
             switch (task.name) {
                 case factory.taskName.AcceptCOAOffer:
@@ -110,7 +110,7 @@ function execute(task) {
                 case factory.taskName.PublishPaymentUrl:
                 case factory.taskName.Refund:
                 case factory.taskName.VoidReserveTransaction:
-                    yield call(task)(settings, options);
+                    callResult = yield call(task)(settings, options);
                     break;
                 default:
                     yield call(task.data)(settings);
@@ -118,7 +118,9 @@ function execute(task) {
             const result = {
                 executedAt: now,
                 endDate: new Date(),
-                error: ''
+                // enable overwriting task.executionResults.error on Executed(2024-05-29~)
+                error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
+                    ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
             };
             yield taskRepo.pushExecutionResultById(task.id, factory.taskStatus.Executed, result);
         }
@@ -165,7 +167,6 @@ function abort(params) {
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
             })({
-                // accessToken: credentials.lineNotify.accessTokenAlert,
                 useFetchAPI: settings_1.USE_FETCH_API
             });
         }

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -325,7 +325,7 @@ function getReturnPolicyByProject(params) {
                     }
                     break;
                 case http_status_1.NOT_FOUND:
-                    throw new factory.errors.Argument('Seller', 'has no applicable return policies');
+                    throw new factory.errors.Argument('', `custom return policy returned statusCode: ${res.status}`);
                 // break;
                 default:
                     // tslint:disable-next-line:no-console

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.32.0"
+  "version": "21.33.0-alpha.1"
 }