@chevre/domain 21.20.0-alpha.51 → 21.20.0-alpha.53

package/lib/chevre/errorHandler.js

@@ -65,6 +65,9 @@ exports.handleMongoError = handleMongoError;
 function handleCOAError(error) {
     var _a;
     let handledError = error;
+    if (error.name === 'AbortError') {
+        handledError = new factory_1.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} code:${error.code} message:${error.message}`);
+    }
     if (error.name === 'COAServiceError') {
         // error.requestOptions.uriを処理
         const uri = (_a = error.requestOptions) === null || _a === void 0 ? void 0 : _a.uri;

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

@@ -87,10 +87,9 @@ function importFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            // "name": "COAServiceError",
-            // "code": 500,
-            // "status": "",
-            // "message": "ESOCKETTIMEDOUT",
+            if (error.name === 'AbortError') {
+                throwsError = false;
+            }
             if (error.name === 'COAServiceError') {
                 if (error.message === 'ESOCKETTIMEDOUT') {
                     throwsError = false;

package/lib/chevre/service/event.js

@@ -167,10 +167,11 @@ function importFromCOA(params) {
             }
             catch (error) {
                 let throwsError = true;
-                // "name": "COAServiceError",
-                // "code": 500,
-                // "status": "",
-                // "message": "ESOCKETTIMEDOUT",
+                if (error.name === 'AbortError') {
+                    // tslint:disable-next-line:no-console
+                    console.error('saveScreeningEvents throwed an error', error.name, error.message);
+                    throwsError = false;
+                }
                 if (error.name === 'COAServiceError') {
                     if (error.message === 'ESOCKETTIMEDOUT') {
                         // tslint:disable-next-line:no-console

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -46,10 +46,9 @@ function importFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            // "name": "COAServiceError",
-            // "code": 500,
-            // "status": "",
-            // "message": "ESOCKETTIMEDOUT",
+            if (error.name === 'AbortError') {
+                throwsError = false;
+            }
             if (error.name === 'COAServiceError') {
                 if (error.message === 'ESOCKETTIMEDOUT') {
                     throwsError = false;
@@ -115,10 +114,9 @@ function importCategoryCodesFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            // "name": "COAServiceError",
-            // "code": 500,
-            // "status": "",
-            // "message": "ESOCKETTIMEDOUT",
+            if (error.name === 'AbortError') {
+                throwsError = false;
+            }
             if (error.name === 'COAServiceError') {
                 if (error.message === 'ESOCKETTIMEDOUT') {
                     throwsError = false;

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -139,7 +139,7 @@ function processVoidTransaction4coa(params) {
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore if */
                 if (error.name === 'COAServiceError') {
-                    if (Number.isInteger(error.code) && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
+                    if (typeof error.code === 'number' && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
                         // すでに取消済の場合こうなるので、okとする
                         if (error.message === '座席取消失敗') {
                             deleted = true;

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

@@ -304,22 +304,35 @@ function voidTransaction(params) {
             endpoint: String(availableChannel.serviceUrl),
             useFetch: credentials_1.credentials.gmo.useFetch
         }, { timeout: credentials_1.credentials.gmo.timeout });
-        // オーソリ取消
-        // 現時点では、ここで失敗したらオーソリ取消をあきらめる
-        // GMO混雑エラーはここでも発生する(取消処理でも混雑エラーが発生することは確認済)
-        // try {
-        // } catch (error) {
-        //     // no op
-        // }
-        const searchTradeResult = yield creditCardService.searchTrade({
-            shopId: shopId,
-            shopPass: shopPass,
-            orderId: paymentMethodId,
-            siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-            sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
-        });
+        let searchTradeResult;
+        try {
+            searchTradeResult = yield creditCardService.searchTrade({
+                shopId: shopId,
+                shopPass: shopPass,
+                orderId: paymentMethodId,
+                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+            });
+        }
+        catch (error) {
+            // searchTradeでのエラーをハンドリング(2024-01-27~)
+            let throwsError = true;
+            if (error.name === 'GMOServiceBadRequestError') {
+                if (Array.isArray(error.errors) && error.errors.length > 0) {
+                    const gmoErrors = error.errors;
+                    // 指定されたIDとパスワードの取引が存在しません。
+                    const notFoundErrorExists = gmoErrors.some(({ info }) => info === 'E01110002');
+                    if (notFoundErrorExists) {
+                        throwsError = false;
+                    }
+                }
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
         // 仮売上であれば取消
-        if (searchTradeResult.status === GMO.utils.util.JobCd.Auth) {
+        if ((searchTradeResult === null || searchTradeResult === void 0 ? void 0 : searchTradeResult.status) === GMO.utils.util.JobCd.Auth) {
             yield creditCardService.alterTran({
                 shopId: shopId,
                 shopPass: shopPass,

package/lib/chevre/service/reserve/checkInReservation.d.ts

@@ -30,9 +30,7 @@ interface ICheckInReservationParams {
         code: string;
     };
 }
-export declare function checkInReservation(params: ICheckInReservationParams & {
-    reserveIfNotYet: boolean;
-}): (repos: {
+export declare function checkInReservation(params: ICheckInReservationParams): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;

package/lib/chevre/service/reserve/checkInReservation.js

@@ -19,10 +19,7 @@ function checkInReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        debug('reserveIfNotYet?', params.reserveIfNotYet, 'ids:', params.object.ids, 'reservationNumbers:', params.object.reservationNumbers);
-        if (params.reserveIfNotYet === true) {
-            yield reserveIfNotYet(params)(repos);
-        }
+        yield reserveIfNotYet(params)(repos);
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -25,7 +25,6 @@ export declare function useReservation(params: {
         identifier?: string;
     };
     verifyToken: boolean;
-    reserveIfNotYet: boolean;
 }): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/reserve/useReservation.js

@@ -38,10 +38,7 @@ function useReservation(params) {
             }
         }
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        debug('reserveIfNotYet?', params.reserveIfNotYet, 'id:', params.object.id);
-        if (params.reserveIfNotYet === true) {
-            yield reserveIfNotYet({ object: params.object })(repos);
-        }
+        yield reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({

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

@@ -91,7 +91,6 @@ function onAuthorizationCreated(params) {
                 reservationNumbers: reservationNumbers,
                 reservationFor: { ids: reservationForIds }
             },
-            reserveIfNotYet: params.reserveIfNotYet,
             purpose: { code: params.code }
         })({
             action: repos.action,

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

@@ -24,7 +24,7 @@ function call(data) {
         var _a, _b;
         yield (0, reserve_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object, 
             // タスク作成前に検証済なので検証不要
-            verifyToken: false, reserveIfNotYet: data.reserveIfNotYet }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
+            verifyToken: false }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

package/package.json

@@ -10,9 +10,9 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.352.0-alpha.7",
+    "@chevre/factory": "4.352.0-alpha.8",
     "@cinerino/sdk": "5.9.0-alpha.1",
-    "@motionpicture/coa-service": "9.3.0-alpha.3",
+    "@motionpicture/coa-service": "9.3.0-alpha.4",
     "@motionpicture/gmo-service": "5.3.0-alpha.2",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.2.0",
@@ -111,5 +111,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.51"
+  "version": "21.20.0-alpha.53"
 }