@chevre/domain 21.2.0-alpha.25 → 21.2.0-alpha.27

package/example/src/chevre/searchAbortedTasks.ts

@@ -0,0 +1,30 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.Pay>[]>await taskRepo.search({
+        // limit: 100,
+        // page: 1,
+        name: chevre.factory.taskName.Pay,
+        statuses: [chevre.factory.taskStatus.Aborted],
+        runsFrom: moment('2023-04-27T00:00:00Z')
+            .toDate(),
+        sort: { runsAt: chevre.factory.sortType.Ascending }
+    });
+    console.log(tasks.map((task) => `${task.project.id},${task.id},${moment(task.runsAt)
+        .tz('Asia/Tokyo')
+        .format('YYYY-MM-DDTHH:mm:ssZ')},"${task.data.object[0].paymentMethod.paymentMethodId}"`)
+        .join('\n'));
+    console.log(tasks.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/credentials.d.ts

@@ -27,6 +27,7 @@ export declare const credentials: {
     lineNotify: {
         url: string;
         accessToken: string;
+        accessTokenAlert: string;
     };
     movieticketReserve: {
         timeout: number;

package/lib/chevre/credentials.js

@@ -31,7 +31,8 @@ exports.credentials = {
     },
     lineNotify: {
         url: process.env.LINE_NOTIFY_URL,
-        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN
+        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
+        accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT
     },
     movieticketReserve: {
         // tslint:disable-next-line:no-magic-numbers

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

@@ -98,6 +98,11 @@ export declare class MongoRepository {
         };
         status: factory.transactionStatusType;
         id?: string;
+        tasksExportAction: {
+            agent: {
+                name: string;
+            };
+        };
     }): Promise<Pick<factory.assetTransaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ

package/lib/chevre/repo/assetTransaction.js

@@ -360,7 +360,13 @@ class MongoRepository {
                 // no op
             }
             const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
-            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
+            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
+                tasksExportAction: {
+                    agent: { name: params.tasksExportAction.agent.name },
+                    startDate: new Date()
+                },
+                tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting
+            }, { new: true })
                 .select({
                 _id: 1,
                 typeOf: 1
@@ -396,12 +402,14 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const endDate = new Date();
             yield this.transactionModel.updateOne({
                 _id: { $eq: params.id },
                 tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
             }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-                tasksExportedAt: new Date()
+                tasksExportedAt: endDate,
+                'tasksExportAction.endDate': endDate
             })
                 .exec();
         });

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

@@ -69,6 +69,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportedAt?: Date | undefined;
     location?: any;
     seller?: any;
+    tasksExportAction?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     object?: any;
     typeOf?: string | undefined;
@@ -87,6 +88,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportedAt?: Date | undefined;
     location?: any;
     seller?: any;
+    tasksExportAction?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     object?: any;
     typeOf?: string | undefined;
@@ -105,6 +107,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportedAt?: Date | undefined;
     location?: any;
     seller?: any;
+    tasksExportAction?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

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

@@ -22,6 +22,7 @@ const schema = new mongoose_1.Schema({
     expires: Date,
     startDate: Date,
     endDate: Date,
+    tasksExportAction: mongoose_1.SchemaTypes.Mixed,
     tasksExportedAt: Date,
     tasksExportationStatus: String,
     potentialActions: mongoose_1.SchemaTypes.Mixed,

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

@@ -28,6 +28,11 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     typeOf?: {
         $in: T[];
     };
+    tasksExportAction?: {
+        agent: {
+            name: string;
+        };
+    };
 }): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/assetTransaction.js

@@ -20,6 +20,7 @@ const PayTransactionService = require("./assetTransaction/pay");
 const RefundTransactionService = require("./assetTransaction/refund");
 const RegisterServiceTransactionService = require("./assetTransaction/registerService");
 const ReserveTransactionService = require("./assetTransaction/reserve");
+const settings_1 = require("../settings");
 exports.cancelReservation = CancelReservationTransactionService;
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.pay = PayTransactionService;
@@ -31,9 +32,17 @@ exports.reserve = ReserveTransactionService;
  */
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const transaction = yield repos.assetTransaction.startExportTasks({
             typeOf: params.typeOf,
-            status: params.status
+            status: params.status,
+            tasksExportAction: {
+                agent: {
+                    name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
+                        ? params.tasksExportAction.agent.name
+                        : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
+                }
+            }
         });
         if (transaction === null) {
             return;

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

@@ -1,7 +1,9 @@
 import * as factory from '../factory';
 import { MongoRepository as ActionRepo } from '../repo/action';
 import { MongoRepository as ProjectRepo } from '../repo/project';
-export type Operation<T> = () => Promise<T>;
+export type Operation<T> = (repos: {
+    accessToken: string;
+}) => Promise<T>;
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html

package/lib/chevre/service/notification.js

@@ -111,15 +111,11 @@ exports.sendEmailMessage = sendEmailMessage;
  * https://notify-bot.line.me/doc/ja/
  */
 function report2developers(subject, content, imageThumbnail, imageFullsize) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
-        const LINE_NOTIFY_ACCESS_TOKEN = credentials_1.credentials.lineNotify.accessToken;
         if (LINE_NOTIFY_URL === undefined) {
             throw new Error('Environment variable LINE_NOTIFY_URL not set');
         }
-        if (LINE_NOTIFY_ACCESS_TOKEN === undefined) {
-            throw new Error('Environment variable LINE_NOTIFY_ACCESS_TOKEN not set');
-        }
         const message = `--------
 ${subject}
 --------
@@ -130,7 +126,7 @@ ${content}`;
             var _a;
             request.post({
                 url: LINE_NOTIFY_URL,
-                auth: { bearer: LINE_NOTIFY_ACCESS_TOKEN },
+                auth: { bearer: repos.accessToken },
                 form: formData,
                 json: true,
                 timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout

package/lib/chevre/service/task.js

@@ -18,6 +18,7 @@ const factory = require("../factory");
 const task_1 = require("../repo/task");
 const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
+const credentials_1 = require("../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`;
@@ -140,7 +141,9 @@ function abort(params) {
             }
             // 開発者へ報告
             const message = (0, factory_1.task2lineNotify)({ task: abortedTask });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }
@@ -157,7 +160,9 @@ function notifyAbortedTasks(params) {
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }

package/lib/chevre/service/transaction.js

@@ -19,7 +19,7 @@ const MoneyTransferTransactionService = require("./transaction/moneyTransfer");
 const PlaceOrderTransactionService = require("./transaction/placeOrder");
 const PlaceOrderInProgressTransactionService = require("./transaction/placeOrderInProgress");
 const ReturnOrderTransactionService = require("./transaction/returnOrder");
-const DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
+const settings_1 = require("../settings");
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
 exports.placeOrderInProgress = PlaceOrderInProgressTransactionService;
@@ -83,7 +83,7 @@ function exportTasks(params) {
                 agent: {
                     name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
                         ? params.tasksExportAction.agent.name
-                        : DEFAULT_TASKS_EXPORT_AGENT_NAME
+                        : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
                 }
             } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {

package/lib/chevre/settings.d.ts

@@ -27,6 +27,7 @@ export type ISettings = factory.project.ISettings & {
     useOfferRateLimitProjects: string[];
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
+export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_EVENT_EMITTERS = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_EVENT_EMITTERS = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -44,6 +44,7 @@ exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSA
     : 7;
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = String(process.env.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD);
+exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
 exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.25"
+  "version": "21.2.0-alpha.27"
 }