@chevre/domain 24.0.0-alpha.56 → 24.0.0-alpha.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/chevre/errorHandler.js +3 -1
- package/lib/chevre/repo/factory/reservation/createMongoConditions.js +29 -24
- package/lib/chevre/service/payment/any/authorize.js +4 -1
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSyncCancel.js +6 -4
- package/package.json +4 -4
|
@@ -206,7 +206,9 @@ function handleMvtkReserveError(error) {
|
|
|
206
206
|
}
|
|
207
207
|
// タイムアウト設定によって中止されたリクエストの場合
|
|
208
208
|
// const uri: string | undefined = error.requestOptions?.uri;
|
|
209
|
-
if (error.name === 'AbortError'
|
|
209
|
+
if (error.name === 'AbortError'
|
|
210
|
+
|| error.name === 'TimeoutError' // native AbortSignalの場合
|
|
211
|
+
) {
|
|
210
212
|
handledError = new factory_1.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} type:${error.type} message:${error.message}`);
|
|
211
213
|
}
|
|
212
214
|
return handledError;
|
|
@@ -424,30 +424,35 @@ function CREATE_MONGO_CONDITIONS(params) {
|
|
|
424
424
|
}
|
|
425
425
|
});
|
|
426
426
|
}
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
}
|
|
427
|
+
// 単価オファーカテゴリーでの検索は廃止(2026-04-02~)
|
|
428
|
+
// /* istanbul ignore else */
|
|
429
|
+
// if (params.reservedTicket.ticketType.category !== undefined) {
|
|
430
|
+
// /* istanbul ignore else */
|
|
431
|
+
// if (Array.isArray(params.reservedTicket.ticketType.category.ids)) {
|
|
432
|
+
// andConditions.push(
|
|
433
|
+
// {
|
|
434
|
+
// 'reservedTicket.ticketType.category.id': {
|
|
435
|
+
// $exists: true,
|
|
436
|
+
// $in: params.reservedTicket.ticketType.category.ids
|
|
437
|
+
// }
|
|
438
|
+
// }
|
|
439
|
+
// );
|
|
440
|
+
// }
|
|
441
|
+
// /* istanbul ignore else */
|
|
442
|
+
// if (params.reservedTicket.ticketType.category.codeValue !== undefined
|
|
443
|
+
// && params.reservedTicket.ticketType.category !== null) {
|
|
444
|
+
// if (Array.isArray(params.reservedTicket.ticketType.category.codeValue.$in)) {
|
|
445
|
+
// andConditions.push(
|
|
446
|
+
// {
|
|
447
|
+
// 'reservedTicket.ticketType.category.codeValue': {
|
|
448
|
+
// $exists: true,
|
|
449
|
+
// $in: params.reservedTicket.ticketType.category.codeValue.$in
|
|
450
|
+
// }
|
|
451
|
+
// }
|
|
452
|
+
// );
|
|
453
|
+
// }
|
|
454
|
+
// }
|
|
455
|
+
// }
|
|
451
456
|
}
|
|
452
457
|
/* istanbul ignore else */
|
|
453
458
|
if (params.reservedTicket.ticketedSeat !== undefined) {
|
|
@@ -160,7 +160,10 @@ function authorize(params) {
|
|
|
160
160
|
// "name": "AbortError"
|
|
161
161
|
// }
|
|
162
162
|
const rawError = Array.isArray(error) ? error[1] : undefined;
|
|
163
|
-
if (rawError !== undefined
|
|
163
|
+
if (rawError !== undefined
|
|
164
|
+
&& rawError.name !== 'AbortError'
|
|
165
|
+
&& rawError.name !== 'TimeoutError' // native AbortSignalの場合
|
|
166
|
+
) {
|
|
164
167
|
await (0, processVoidPayTransaction_1.processVoidPayTransaction)({
|
|
165
168
|
project: actionAttributes.project,
|
|
166
169
|
id: action.id,
|
package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSyncCancel.js
CHANGED
|
@@ -37,14 +37,16 @@ function processSeatInfoSyncCancel(params) {
|
|
|
37
37
|
catch (error) {
|
|
38
38
|
let throwsError = true;
|
|
39
39
|
if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
const surfrockRequestError = error;
|
|
41
|
+
if (surfrockRequestError.code === http_status_1.BAD_REQUEST) {
|
|
42
|
+
const firstSoapServeError = surfrockRequestError.errors?.at(0);
|
|
43
|
+
if (firstSoapServeError !== undefined) {
|
|
44
|
+
const mvtkReserveServiceError = firstSoapServeError;
|
|
43
45
|
// 興行会社システム座席予約番号存在無の場合、取消済なのでok
|
|
44
46
|
if (mvtkReserveServiceError.status === surfrock.factory.ResultStatus.Success) {
|
|
45
47
|
const cnclResult = mvtkReserveServiceError.rawResult?.cnclResult;
|
|
46
48
|
if (cnclResult === surfrock.service.seat.factory.seatInfoSyncCancel.CancelResult.CancelResult02) {
|
|
47
|
-
seatInfoSyncCancelResult =
|
|
49
|
+
seatInfoSyncCancelResult = surfrockRequestError;
|
|
48
50
|
throwsError = false;
|
|
49
51
|
}
|
|
50
52
|
}
|
package/package.json
CHANGED
|
@@ -11,12 +11,12 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@aws-sdk/client-cognito-identity-provider": "3.600.0",
|
|
13
13
|
"@aws-sdk/credential-providers": "3.600.0",
|
|
14
|
-
"@chevre/factory": "6.2.0-alpha.
|
|
15
|
-
"@cinerino/sdk": "14.0.0-alpha.
|
|
14
|
+
"@chevre/factory": "6.2.0-alpha.4",
|
|
15
|
+
"@cinerino/sdk": "14.0.0-alpha.2",
|
|
16
16
|
"@motionpicture/coa-service": "9.6.0",
|
|
17
17
|
"@motionpicture/gmo-service": "5.4.0-alpha.1",
|
|
18
18
|
"@sendgrid/client": "8.1.4",
|
|
19
|
-
"@surfrock/sdk": "2.0.0-alpha.
|
|
19
|
+
"@surfrock/sdk": "2.0.0-alpha.2",
|
|
20
20
|
"debug": "^3.2.7",
|
|
21
21
|
"google-libphonenumber": "^3.2.18",
|
|
22
22
|
"http-status": "^1.5.0",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
"postversion": "git push origin --tags",
|
|
98
98
|
"prepublishOnly": "npm run clean && npm run build"
|
|
99
99
|
},
|
|
100
|
-
"version": "24.0.0-alpha.
|
|
100
|
+
"version": "24.0.0-alpha.58"
|
|
101
101
|
}
|