@chevre/domain 21.26.0-alpha.3 → 21.26.0-alpha.4

package/example/src/chevre/migrateOrderSeller.ts

@@ -0,0 +1,65 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+
+    const cursor = orderRepo.getCursor(
+        {
+            orderDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-12, 'months')
+                    .toDate()
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-6, 'months')
+                //     .toDate()
+            }
+        },
+        {
+            orderDate: 1,
+            orderNumber: 1,
+            project: 1,
+            seller: 1
+        }
+    );
+    console.log('orders found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const order: Pick<
+            chevre.factory.order.IOrder,
+            'orderDate' | 'orderNumber' | 'project' | 'seller'
+        > = doc.toObject();
+        console.log(order);
+
+        const alreadyMigrated = (<any>order.seller).telephone === undefined
+            && (<any>order.seller).url === undefined;
+
+        if (alreadyMigrated) {
+            console.log('already exist.', order.project.id, order.orderNumber, order.orderDate, i, updateCount);
+        } else {
+            console.log('updating...', order.project.id, order.orderNumber, order.orderDate, i, updateCount);
+            updateCount += 1;
+            console.log('updated.', order.project.id, order.orderNumber, order.orderDate, i, updateCount);
+        }
+    });
+
+    console.log(i, 'orders checked');
+    console.log(updateCount, 'orders updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/mvtkMessage.ts

@@ -0,0 +1,11 @@
+// tslint:disable:no-console
+
+const paymentMethodId = '792943638208219';
+const message = `{\"message\":\"bookingNo:\\\"${paymentMethodId}\\\" が見つかりません。\"}`;
+console.log(JSON.parse(message));
+
+const error = { message: `bookingNo:"${paymentMethodId}" が見つかりません。` };
+const expectedMessage4surfrockNotFound = JSON.stringify(error);
+console.log(expectedMessage4surfrockNotFound);
+
+console.log(expectedMessage4surfrockNotFound === message);

package/lib/chevre/errorHandler.d.ts

@@ -14,6 +14,7 @@ export declare function handleCOAError(error: any): Error;
  * 可能であればChevreエラーへ変換します
  */
 export declare function handlePecorinoError(error: any): Error;
+export declare const MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME = "MovieticketReserveRequestError";
 /**
  * ムビチケ着券サービスエラーをハンドリングする
  * 可能であればChevreエラーへ変換します

package/lib/chevre/errorHandler.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleAWSError = exports.handleMvtkReserveError = exports.handlePecorinoError = exports.handleCOAError = exports.handleMongoError = exports.isMongoError = exports.MongoErrorCode = void 0;
+exports.handleAWSError = exports.handleMvtkReserveError = exports.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME = exports.handlePecorinoError = exports.handleCOAError = exports.handleMongoError = exports.isMongoError = exports.MongoErrorCode = void 0;
 /**
  * エラーハンドラー
  * 外部サービスと連携している場合に、サービス(API)のエラーを本ドメインのエラーに変換する責任を担います。
@@ -115,6 +115,7 @@ function handlePecorinoError(error) {
     return handledError;
 }
 exports.handlePecorinoError = handlePecorinoError;
+exports.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME = 'MovieticketReserveRequestError';
 /**
  * ムビチケ着券サービスエラーをハンドリングする
  * 可能であればChevreエラーへ変換します
@@ -122,7 +123,7 @@ exports.handlePecorinoError = handlePecorinoError;
 // tslint:disable-next-line:no-any
 function handleMvtkReserveError(error) {
     let handledError = error;
-    if (error.name === 'MovieticketReserveRequestError') {
+    if (error.name === exports.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
         // ムビチケAPIのステータスコード4xxをハンドリング
         // ムビチケAPIのレスポンスステータスコードが4xxであればクライアントエラー
         const message = `${error.name}:${error.message}`;

package/lib/chevre/service/notification/factory.js

@@ -32,26 +32,37 @@ lastMessage:${lastMessage}`;
 exports.task2lineNotify = task2lineNotify;
 const MAX_LAST_MESSAGE_LENGTH = 20;
 function tasks2lineNotify(params) {
-    let content = '';
-    content = params.tasks.map((task) => {
-        var _a;
-        const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
-        let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
-        if (typeof lastError === 'string') {
-            lastError = { message: lastError, name: 'Error' };
-        }
-        const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
-        return `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}
+    const subject = `${params.tasks.length} ${exports.ABORT_REPORT_SUBJECT}`;
+    let content = subject;
+    // あまりに通知タスク数が多いケースに対応
+    // tslint:disable-next-line:no-magic-numbers
+    if (params.tasks.length > 10) {
+        content = params.tasks.map((task) => {
+            return `project:${task.project.id}
+id:${task.id}
+name:${task.name}`;
+        })
+            .join('\n');
+    }
+    else {
+        // tslint:disable-next-line:no-magic-numbers
+        const maxLastMessageLength = (params.tasks.length <= 5) ? 80 : MAX_LAST_MESSAGE_LENGTH; // 通知タスク数に応じてメッセージ長を調整
+        content = params.tasks.map((task) => {
+            const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
+            let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
+            if (typeof lastError === 'string') {
+                lastError = { message: lastError, name: 'Error' };
+            }
+            const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
+            return `project:${task.project.id}
 id:${task.id}
 name:${task.name}
 runsAt:${moment(task.runsAt)
-            .toISOString()}
-lastMessage:${lastMessage.slice(0, MAX_LAST_MESSAGE_LENGTH)}...`;
-    })
-        .join('\n');
-    return {
-        subject: `${params.tasks.length} ${exports.ABORT_REPORT_SUBJECT}`,
-        content: content
-    };
+                .toISOString()}
+lastMessage:${lastMessage.slice(0, maxLastMessageLength)}...`;
+        })
+            .join('\n');
+    }
+    return { subject, content };
 }
 exports.tasks2lineNotify = tasks2lineNotify;

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

@@ -14,6 +14,7 @@ exports.voidTransaction = exports.refundMovieTicket = exports.payMovieTicket = e
  * 決済サービス
  */
 const surfrock = require("@surfrock/sdk");
+const http_status_1 = require("http-status");
 const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
 const checkByIdentifier_1 = require("./movieTicket/checkByIdentifier");
@@ -23,6 +24,12 @@ const validation_1 = require("./movieTicket/validation");
 const errorHandler_1 = require("../../errorHandler");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
+var MovieticketReserveRequestErrorMessage;
+(function (MovieticketReserveRequestErrorMessage) {
+    MovieticketReserveRequestErrorMessage["AlreadyPaid"] = "\u65E2\u306B\u5B58\u5728\u3059\u308B\u8208\u884C\u30B7\u30B9\u30C6\u30E0\u5EA7\u5E2D\u4E88\u7D04\u756A\u53F7\u304C\u5165\u529B\u3055\u308C\u307E\u3057\u305F\u3002";
+    MovieticketReserveRequestErrorMessage["NotFound"] = "\u5B58\u5728\u3057\u306A\u3044\u8208\u884C\u4F1A\u793E\u30B7\u30B9\u30C6\u30E0\u5EA7\u5E2D\u4E88\u7D04\u756A\u53F7\u304C\u5165\u529B\u3055\u308C\u307E\u3057\u305F\u3002";
+    MovieticketReserveRequestErrorMessage["ReservationResult19"] = "ReservationResult 19";
+})(MovieticketReserveRequestErrorMessage || (MovieticketReserveRequestErrorMessage = {}));
 /**
  * MovieTicket認証
  */
@@ -250,9 +257,8 @@ function payMovieTicket(params) {
         catch (error) {
             let throwsError = true;
             // 「既に存在する興行システム座席予約番号が入力されました」の場合、着券済なのでok
-            if (error.name === 'MovieticketReserveRequestError') {
-                // tslint:disable-next-line:no-magic-numbers
-                if (error.code === 400 && error.message === '既に存在する興行システム座席予約番号が入力されました。') {
+            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.AlreadyPaid) {
                     seatInfoSyncResult = error;
                     throwsError = false;
                 }
@@ -366,15 +372,19 @@ function refundMovieTicket(params) {
         catch (error) {
             let throwsError = true;
             // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
-            if (error.name === 'MovieticketReserveRequestError') {
-                // tslint:disable-next-line:no-magic-numbers
-                if (error.code === 400 && error.message === '存在しない興行会社システム座席予約番号が入力されました。') {
+            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.NotFound) {
                     seatInfoSyncResult = error;
                     throwsError = false;
                 }
                 // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
-                // tslint:disable-next-line:no-magic-numbers
-                if (error.code === 400 && error.message === 'ReservationResult 19') {
+                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.ReservationResult19) {
+                    seatInfoSyncResult = error;
+                    throwsError = false;
+                }
+                // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
+                const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
+                if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
                     seatInfoSyncResult = error;
                     throwsError = false;
                 }

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.26.0-alpha.3"
+  "version": "21.26.0-alpha.4"
 }