@chevre/domain 24.0.0-alpha.2 → 24.0.0-alpha.21
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/repo/action/acceptCOAOffer.d.ts +23 -0
- package/lib/chevre/repo/action/acceptCOAOffer.js +64 -0
- package/lib/chevre/repo/action/acceptPay.d.ts +8 -0
- package/lib/chevre/repo/action/acceptPay.js +13 -0
- package/lib/chevre/repo/action/actionProcess.d.ts +115 -0
- package/lib/chevre/repo/action/actionProcess.js +293 -0
- package/lib/chevre/repo/action/authorizeOffer.d.ts +21 -0
- package/lib/chevre/repo/action/authorizeOffer.js +85 -0
- package/lib/chevre/repo/action/checkMovieTicket.d.ts +111 -0
- package/lib/chevre/repo/action/checkMovieTicket.js +200 -0
- package/lib/chevre/repo/action/checkThing.d.ts +8 -0
- package/lib/chevre/repo/action/checkThing.js +13 -0
- package/lib/chevre/repo/action.d.ts +9 -249
- package/lib/chevre/repo/action.js +308 -708
- package/lib/chevre/repo/aggregateAction.d.ts +102 -0
- package/lib/chevre/repo/aggregateAction.js +379 -0
- package/lib/chevre/repo/mongoose/schemas/transaction.js +31 -0
- package/lib/chevre/repo/orderInTransaction.d.ts +8 -0
- package/lib/chevre/repo/orderInTransaction.js +16 -2
- package/lib/chevre/repo/orderNumber.d.ts +3 -2
- package/lib/chevre/repo/orderNumber.js +23 -28
- package/lib/chevre/repo/transaction/moneyTransfer.d.ts +61 -0
- package/lib/chevre/repo/transaction/moneyTransfer.js +379 -0
- package/lib/chevre/repo/transaction/placeOrder.d.ts +140 -0
- package/lib/chevre/repo/transaction/placeOrder.js +528 -0
- package/lib/chevre/repo/transaction/returnOrder.d.ts +45 -0
- package/lib/chevre/repo/transaction/returnOrder.js +341 -0
- package/lib/chevre/repo/transaction.d.ts +1 -125
- package/lib/chevre/repo/transaction.js +726 -632
- package/lib/chevre/repository.d.ts +49 -0
- package/lib/chevre/repository.js +107 -2
- package/lib/chevre/service/aggregation/system.d.ts +10 -10
- package/lib/chevre/service/aggregation/system.js +9 -9
- package/lib/chevre/service/assetTransaction/pay/check.d.ts +5 -4
- package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.d.ts +5 -2
- package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js +3 -3
- package/lib/chevre/service/assetTransaction/pay/start/factory.d.ts +51 -3
- package/lib/chevre/service/assetTransaction/pay/start/factory.js +58 -21
- package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.d.ts +10 -0
- package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.js +88 -0
- package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.d.ts +55 -0
- package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.js +56 -0
- package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.d.ts +3 -1
- package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.js +1 -11
- package/lib/chevre/service/assetTransaction/pay/start.d.ts +2 -0
- package/lib/chevre/service/assetTransaction/pay/start.js +8 -132
- package/lib/chevre/service/notification/triggerWebhook.d.ts +7 -6
- package/lib/chevre/service/offer/event/authorize.d.ts +2 -2
- package/lib/chevre/service/offer/event/authorize.js +3 -3
- package/lib/chevre/service/offer/event/issueEventOfferTicket.d.ts +2 -2
- package/lib/chevre/service/offer/event/issueEventOfferTicket.js +1 -1
- package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts +0 -2
- package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js +1 -0
- package/lib/chevre/service/offer/event/voidTransaction.d.ts +2 -2
- package/lib/chevre/service/offer/event/voidTransaction.js +2 -2
- package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts +3 -3
- package/lib/chevre/service/offer/event/voidTransactionByActionId.js +2 -2
- package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts +16 -5
- package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js +7 -7
- package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts +6 -4
- package/lib/chevre/service/offer/eventServiceByCOA/authorize.js +3 -10
- package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.js +21 -13
- package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js +19 -10
- package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.d.ts +2 -2
- package/lib/chevre/service/offer/moneyTransfer/authorize.d.ts +2 -2
- package/lib/chevre/service/offer/moneyTransfer/authorize.js +6 -3
- package/lib/chevre/service/offer/moneyTransfer/voidTransaction.d.ts +2 -2
- package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js +4 -1
- package/lib/chevre/service/offer/product.d.ts +3 -3
- package/lib/chevre/service/offer/product.js +4 -4
- package/lib/chevre/service/order/confirmPayTransaction.d.ts +0 -2
- package/lib/chevre/service/order/confirmPayTransaction.js +1 -0
- package/lib/chevre/service/order/findPlaceOrderTransaction.d.ts +2 -2
- package/lib/chevre/service/order/findPlaceOrderTransaction.js +1 -1
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/isDeliverable.d.ts +16 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/isDeliverable.js +97 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.d.ts +21 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.js +86 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.d.ts +22 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.js +112 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/onReserveTransactionConfirmed.d.ts +22 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/onReserveTransactionConfirmed.js +74 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts +25 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.js +111 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/processing2inTransit.d.ts +16 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/processing2inTransit.js +74 -0
- package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts +8 -30
- package/lib/chevre/service/order/onAssetTransactionStatusChanged.js +37 -348
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.d.ts +6 -7
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially.d.ts +6 -5
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts +7 -6
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +1 -1
- package/lib/chevre/service/order/payOrder.d.ts +2 -2
- package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts +2 -2
- package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js +1 -1
- package/lib/chevre/service/order/placeOrder.d.ts +13 -12
- package/lib/chevre/service/order/returnOrder.d.ts +2 -2
- package/lib/chevre/service/order/returnOrder.js +1 -1
- package/lib/chevre/service/order/sendOrder.d.ts +6 -6
- package/lib/chevre/service/order/sendOrder.js +10 -8
- package/lib/chevre/service/order.d.ts +3 -6
- package/lib/chevre/service/order.js +3 -9
- package/lib/chevre/service/payment/any/{fixOrderAsNeeded.d.ts → authorize/fixOrderAsNeeded.d.ts} +6 -6
- package/lib/chevre/service/payment/any/{fixOrderAsNeeded.js → authorize/fixOrderAsNeeded.js} +5 -8
- package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts +3 -3
- package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts +3 -3
- package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js +1 -1
- package/lib/chevre/service/payment/any/authorize.d.ts +92 -0
- package/lib/chevre/service/payment/any/authorize.js +225 -0
- package/lib/chevre/service/payment/any/findAcceptAction.d.ts +43 -0
- package/lib/chevre/service/payment/any/findAcceptAction.js +94 -0
- package/lib/chevre/service/payment/any/findAuthorizeAction.d.ts +41 -0
- package/lib/chevre/service/payment/any/findAuthorizeAction.js +83 -0
- package/lib/chevre/service/payment/any/findCheckAction.d.ts +45 -0
- package/lib/chevre/service/payment/any/findCheckAction.js +89 -0
- package/lib/chevre/service/payment/any/invalidatePaymentUrl.d.ts +28 -0
- package/lib/chevre/service/payment/any/invalidatePaymentUrl.js +185 -0
- package/lib/chevre/service/payment/any/onPayActionCompleted.d.ts +7 -3
- package/lib/chevre/service/payment/any/onPayActionCompleted.js +3 -0
- package/lib/chevre/service/payment/any/processVoidPayTransaction.d.ts +29 -0
- package/lib/chevre/service/payment/any/processVoidPayTransaction.js +125 -0
- package/lib/chevre/service/payment/any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl.d.ts +2 -2
- package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts +66 -0
- package/lib/chevre/service/payment/any/publishPaymentUrl.js +133 -0
- package/lib/chevre/service/payment/any/voidPayTransaction.d.ts +31 -0
- package/lib/chevre/service/payment/any/voidPayTransaction.js +38 -0
- package/lib/chevre/service/payment/any.d.ts +8 -305
- package/lib/chevre/service/payment/any.js +17 -857
- package/lib/chevre/service/payment/movieTicket/authorize.d.ts +2 -0
- package/lib/chevre/service/payment/movieTicket/checkMovieTicket.d.ts +3 -3
- package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js +3 -3
- package/lib/chevre/service/payment/movieTicket/validation.d.ts +11 -10
- package/lib/chevre/service/payment/movieTicket/validation.js +19 -15
- package/lib/chevre/service/report/telemetry.d.ts +4 -0
- package/lib/chevre/service/report/telemetry.js +7 -12
- package/lib/chevre/service/task/acceptCOAOffer.js +11 -6
- package/lib/chevre/service/task/authorizePayment.js +6 -2
- package/lib/chevre/service/task/checkMovieTicket.js +3 -3
- package/lib/chevre/service/task/checkResource.js +2 -2
- package/lib/chevre/service/task/confirmPayTransaction.js +2 -2
- package/lib/chevre/service/task/deleteTransaction.js +7 -1
- package/lib/chevre/service/task/onAssetTransactionStatusChanged.js +4 -2
- package/lib/chevre/service/task/onOrderPaymentCompleted.js +2 -2
- package/lib/chevre/service/task/payment/payByTask.d.ts +14 -12
- package/lib/chevre/service/task/placeOrder.js +6 -4
- package/lib/chevre/service/task/publishPaymentUrl.js +8 -4
- package/lib/chevre/service/task/returnOrder.js +4 -4
- package/lib/chevre/service/task/returnPayTransaction.js +4 -3
- package/lib/chevre/service/task/sendOrder.js +4 -4
- package/lib/chevre/service/task/voidMoneyTransferTransaction.js +6 -3
- package/lib/chevre/service/task/voidPayTransaction.js +4 -2
- package/lib/chevre/service/task/voidRegisterServiceTransaction.js +3 -3
- package/lib/chevre/service/task/voidReserveTransaction.js +4 -3
- package/lib/chevre/service/transaction/deleteTransaction.d.ts +6 -0
- package/lib/chevre/service/transaction/deleteTransaction.js +56 -14
- package/lib/chevre/service/transaction/moneyTransfer.d.ts +5 -5
- package/lib/chevre/service/transaction/moneyTransfer.js +5 -5
- package/lib/chevre/service/transaction/placeOrder/confirm.d.ts +2 -2
- package/lib/chevre/service/transaction/placeOrder/confirm.js +10 -9
- package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts +7 -6
- package/lib/chevre/service/transaction/placeOrder/exportTasksById.js +1 -1
- package/lib/chevre/service/transaction/placeOrder/{publishOrderNumberIfNotExist.d.ts → issueOrderNumberIfNotExist.d.ts} +4 -4
- package/lib/chevre/service/transaction/placeOrder/{publishOrderNumberIfNotExist.js → issueOrderNumberIfNotExist.js} +21 -13
- package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.d.ts +2 -2
- package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.js +3 -3
- package/lib/chevre/service/transaction/placeOrder/start.d.ts +3 -3
- package/lib/chevre/service/transaction/placeOrder/start.js +2 -2
- package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts +23 -0
- package/lib/chevre/service/transaction/placeOrder/updateAgent.js +126 -0
- package/lib/chevre/service/transaction/placeOrder.d.ts +2 -1
- package/lib/chevre/service/transaction/placeOrder.js +3 -1
- package/lib/chevre/service/transaction/returnOrder/preStart.d.ts +1 -1
- package/lib/chevre/service/transaction/returnOrder.d.ts +16 -14
- package/lib/chevre/service/transaction/returnOrder.js +4 -4
- package/lib/chevre/service/transaction.d.ts +9 -21
- package/lib/chevre/service/transaction.js +5 -111
- package/package.json +4 -8
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.processVoidPayTransaction = processVoidPayTransaction;
|
|
27
|
+
const factory = __importStar(require("../../../factory"));
|
|
28
|
+
const PayTransactionService = __importStar(require("../../assetTransaction/pay"));
|
|
29
|
+
/**
|
|
30
|
+
* 決済承認中止
|
|
31
|
+
* apiもしくはタスクから決済承認を取り消す
|
|
32
|
+
*/
|
|
33
|
+
function processVoidPayTransaction(params) {
|
|
34
|
+
return async (repos) => {
|
|
35
|
+
const cancelAction = {
|
|
36
|
+
startTime: new Date(),
|
|
37
|
+
agent: { id: params.project.id, typeOf: factory.organizationType.Project },
|
|
38
|
+
...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
|
|
39
|
+
};
|
|
40
|
+
let transaction;
|
|
41
|
+
// アクションID指定の場合、進行中取引検証(2023-02-24~)
|
|
42
|
+
if (typeof params.id === 'string') {
|
|
43
|
+
transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status']);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'result']);
|
|
47
|
+
}
|
|
48
|
+
// 承認アクションを取得
|
|
49
|
+
let authorizeActions;
|
|
50
|
+
if (typeof params.id === 'string') {
|
|
51
|
+
const authorizeAction = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
|
|
52
|
+
// 取引内のアクションかどうか確認
|
|
53
|
+
if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
|
|
54
|
+
throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
|
|
55
|
+
}
|
|
56
|
+
authorizeActions = [authorizeAction];
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
authorizeActions = await repos.action.searchByPurpose({
|
|
60
|
+
typeOf: factory.actionType.AuthorizeAction,
|
|
61
|
+
purpose: { typeOf: transaction.typeOf, id: transaction.id },
|
|
62
|
+
object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } }
|
|
63
|
+
});
|
|
64
|
+
switch (transaction.status) {
|
|
65
|
+
case factory.transactionStatusType.InProgress:
|
|
66
|
+
throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
|
|
67
|
+
case factory.transactionStatusType.Confirmed:
|
|
68
|
+
// OrderCancelledを考慮(2023-08-30~)
|
|
69
|
+
const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
|
|
70
|
+
if (!orderCancelled) {
|
|
71
|
+
// 取り消すべきアクションに絞る
|
|
72
|
+
authorizeActions = authorizeActions.filter(({ actionStatus }) => actionStatus !== factory.actionStatusType.CompletedActionStatus);
|
|
73
|
+
const actionIdsFromTransactionResult = transaction.result?.authorizeActions?.map(({ id }) => id);
|
|
74
|
+
if (!Array.isArray(actionIdsFromTransactionResult)) {
|
|
75
|
+
throw new factory.errors.Argument('Transaction', `${transaction.id} must have result.authorizeActions`);
|
|
76
|
+
}
|
|
77
|
+
authorizeActions = authorizeActions.filter(({ id }) => !actionIdsFromTransactionResult.includes(id));
|
|
78
|
+
// CreditCardIFでは、事前発行のpaymentMethodIdを承認時に指定するケースがある
|
|
79
|
+
// その場合、paymentMethodIdの重複がありうる
|
|
80
|
+
// exclude paymentMethodId in the order(2025-02-25~)
|
|
81
|
+
let authorizedPaymentMethodIds = [];
|
|
82
|
+
authorizedPaymentMethodIds = authorizeActions.filter(({ id }) => actionIdsFromTransactionResult.includes(id))
|
|
83
|
+
.map(({ object }) => object.paymentMethodId);
|
|
84
|
+
authorizedPaymentMethodIds = [...new Set(authorizedPaymentMethodIds)];
|
|
85
|
+
authorizeActions =
|
|
86
|
+
authorizeActions.filter(({ object }) => !authorizedPaymentMethodIds.includes(object.paymentMethodId));
|
|
87
|
+
}
|
|
88
|
+
break;
|
|
89
|
+
default:
|
|
90
|
+
// no op
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
const errors = [];
|
|
94
|
+
for (const action of authorizeActions) {
|
|
95
|
+
// 失敗するケースがあっても、残りが少なくとも処理されるようにエラーハンドリング
|
|
96
|
+
try {
|
|
97
|
+
await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
|
|
98
|
+
// 取引が存在すれば中止
|
|
99
|
+
const transactionNumber = action.object.paymentMethodId;
|
|
100
|
+
if (typeof transactionNumber === 'string' && transactionNumber.length > 0) {
|
|
101
|
+
const payTransaction = (await repos.assetTransaction.search({
|
|
102
|
+
limit: 1,
|
|
103
|
+
page: 1,
|
|
104
|
+
project: { id: { $eq: action.project.id } },
|
|
105
|
+
typeOf: factory.assetTransactionType.Pay,
|
|
106
|
+
transactionNumber: { $eq: transactionNumber }
|
|
107
|
+
}, ['_id', 'status'])).shift();
|
|
108
|
+
if (payTransaction !== undefined) {
|
|
109
|
+
// ステータス検証(Expiredから実行される可能性がある)
|
|
110
|
+
if (payTransaction.status !== factory.transactionStatusType.Canceled
|
|
111
|
+
&& payTransaction.status !== factory.transactionStatusType.Expired) {
|
|
112
|
+
await PayTransactionService.cancel({ transactionNumber })(repos);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
errors.push(error);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
if (errors.length > 0) {
|
|
122
|
+
throw errors[0];
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as factory from '../../../../factory';
|
|
2
2
|
import type { AuthorizationRepo } from '../../../../repo/authorization';
|
|
3
3
|
import type { TicketRepo } from '../../../../repo/ticket';
|
|
4
|
-
import type { ITransactionInProgress } from '../../../../repo/transaction';
|
|
4
|
+
import type { ITransactionInProgress } from '../../../../repo/transaction/placeOrder';
|
|
5
5
|
import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
|
|
6
6
|
interface IFixTransactionNumberRepos {
|
|
7
7
|
authorization: AuthorizationRepo;
|
|
@@ -17,7 +17,7 @@ type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWi
|
|
|
17
17
|
*/
|
|
18
18
|
declare function fixTransactionNumberOnPublishPaymentUrl(params: {
|
|
19
19
|
object: IObjectWithoutDetail;
|
|
20
|
-
transaction: Pick<ITransactionInProgress
|
|
20
|
+
transaction: Pick<ITransactionInProgress, 'id' | 'project'>;
|
|
21
21
|
paymentServiceType: factory.service.paymentService.PaymentServiceType;
|
|
22
22
|
}): IFixTransactionNumberOperation<{
|
|
23
23
|
transactionNumber: string;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import * as factory from '../../../factory';
|
|
2
|
+
import { Settings } from '../../../settings';
|
|
3
|
+
import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
|
|
4
|
+
import type { ActionRepo } from '../../../repo/action';
|
|
5
|
+
import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
|
|
6
|
+
import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
|
|
7
|
+
import type { AuthorizationRepo } from '../../../repo/authorization';
|
|
8
|
+
import type { EventRepo } from '../../../repo/event';
|
|
9
|
+
import type { EventSeriesRepo } from '../../../repo/eventSeries';
|
|
10
|
+
import type { OrderNumberRepo } from '../../../repo/orderNumber';
|
|
11
|
+
import type { PaymentServiceRepo } from '../../../repo/paymentService';
|
|
12
|
+
import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
|
|
13
|
+
import type { ProjectRepo } from '../../../repo/project';
|
|
14
|
+
import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
|
|
15
|
+
import type { TicketRepo } from '../../../repo/ticket';
|
|
16
|
+
import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
|
|
17
|
+
import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
|
|
18
|
+
import * as PayTransactionService from '../../assetTransaction/pay';
|
|
19
|
+
interface IPublishPaymentUrlRepos {
|
|
20
|
+
acceptedPaymentMethod: AcceptedPaymentMethodRepo;
|
|
21
|
+
action: ActionRepo;
|
|
22
|
+
acceptPayAction: AcceptPayActionRepo;
|
|
23
|
+
assetTransaction: AssetTransactionRepo;
|
|
24
|
+
authorization: AuthorizationRepo;
|
|
25
|
+
event: EventRepo;
|
|
26
|
+
eventSeries: EventSeriesRepo;
|
|
27
|
+
orderNumber: OrderNumberRepo;
|
|
28
|
+
paymentAccepted: SellerPaymentAcceptedRepo;
|
|
29
|
+
paymentService: PaymentServiceRepo;
|
|
30
|
+
paymentServiceProvider: PaymentServiceProviderRepo;
|
|
31
|
+
project: ProjectRepo;
|
|
32
|
+
ticket: TicketRepo;
|
|
33
|
+
placeOrder: PlaceOrderRepo;
|
|
34
|
+
transactionNumber: TransactionNumberRepo;
|
|
35
|
+
}
|
|
36
|
+
type IPublishPaymentUrlOperation<T> = (repos: IPublishPaymentUrlRepos, settings: Settings) => Promise<T>;
|
|
37
|
+
type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
|
|
38
|
+
ticketToken?: string;
|
|
39
|
+
};
|
|
40
|
+
/**
|
|
41
|
+
* 外部決済ロケーションを発行する
|
|
42
|
+
*/
|
|
43
|
+
declare function publishPaymentUrl(params: {
|
|
44
|
+
project: {
|
|
45
|
+
id: string;
|
|
46
|
+
};
|
|
47
|
+
agent: {
|
|
48
|
+
id: string;
|
|
49
|
+
};
|
|
50
|
+
object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
|
|
51
|
+
purpose: factory.action.authorize.paymentMethod.any.IPurpose;
|
|
52
|
+
paymentServiceType: factory.service.paymentService.PaymentServiceType;
|
|
53
|
+
location: factory.action.trade.pay.ILocation;
|
|
54
|
+
sameAs?: {
|
|
55
|
+
/**
|
|
56
|
+
* 実行元タスクID
|
|
57
|
+
*/
|
|
58
|
+
id: string;
|
|
59
|
+
};
|
|
60
|
+
/**
|
|
61
|
+
* add identifier for an unique index(2025-02-25~)
|
|
62
|
+
*/
|
|
63
|
+
identifier?: string;
|
|
64
|
+
instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
|
|
65
|
+
}): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
|
|
66
|
+
export { IPublishPaymentUrlRepos, publishPaymentUrl };
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.publishPaymentUrl = publishPaymentUrl;
|
|
27
|
+
const factory = __importStar(require("../../../factory"));
|
|
28
|
+
// import type { TransactionProcessRepo } from '../../repo/transactionProcess';
|
|
29
|
+
const PayTransactionService = __importStar(require("../../assetTransaction/pay"));
|
|
30
|
+
const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
|
|
31
|
+
const fixTransactionNumberOnPublishPaymentUrl_1 = require("./publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl");
|
|
32
|
+
const factory_1 = require("./factory");
|
|
33
|
+
/**
|
|
34
|
+
* 外部決済ロケーションを発行する
|
|
35
|
+
*/
|
|
36
|
+
function publishPaymentUrl(params) {
|
|
37
|
+
return async (repos, settings) => {
|
|
38
|
+
const { paymentServiceType, purpose, project } = params;
|
|
39
|
+
if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
|
|
40
|
+
throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
|
|
41
|
+
}
|
|
42
|
+
try {
|
|
43
|
+
const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
|
|
44
|
+
if (project.id !== transaction.project.id) {
|
|
45
|
+
throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
|
|
46
|
+
}
|
|
47
|
+
// issueOrderNumber(2025-03-11~)
|
|
48
|
+
await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
|
|
49
|
+
project: { id: transaction.project.id },
|
|
50
|
+
id: transaction.id,
|
|
51
|
+
object: { orderDate: new Date() }
|
|
52
|
+
})(repos);
|
|
53
|
+
// 取引番号生成
|
|
54
|
+
const { transactionNumber, ticketToken } = await (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
|
|
55
|
+
object: params.object,
|
|
56
|
+
transaction,
|
|
57
|
+
paymentServiceType
|
|
58
|
+
})(repos);
|
|
59
|
+
// let transactionNumber: string | undefined;
|
|
60
|
+
// // support ticketToken(2024-08-21~)
|
|
61
|
+
// const { permitOrInvoice } =
|
|
62
|
+
// await verifyTicketTokenAsNeeded({ project, object: params.object, paymentServiceType, purpose })(repos);
|
|
63
|
+
// if (permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) {
|
|
64
|
+
// const paymentMethodIdByPermit = permitOrInvoice?.identifier;
|
|
65
|
+
// if (typeof paymentMethodIdByPermit === 'string') {
|
|
66
|
+
// transactionNumber = paymentMethodIdByPermit;
|
|
67
|
+
// }
|
|
68
|
+
// }
|
|
69
|
+
// if (typeof transactionNumber !== 'string') {
|
|
70
|
+
// const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
|
|
71
|
+
// transactionNumber = publishTransactionNumberResult.transactionNumber;
|
|
72
|
+
// }
|
|
73
|
+
// URL発行
|
|
74
|
+
const authorizeObject = {
|
|
75
|
+
...params.object,
|
|
76
|
+
accountId: '',
|
|
77
|
+
paymentMethodId: transactionNumber,
|
|
78
|
+
typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment,
|
|
79
|
+
// support referencesOrder(2025-11-24~)
|
|
80
|
+
referencesOrder: (params.object.referencesOrder?.typeOf === factory.order.OrderType.Order)
|
|
81
|
+
? params.object.referencesOrder
|
|
82
|
+
: { typeOf: factory.order.OrderType.Order }
|
|
83
|
+
};
|
|
84
|
+
const startParams = (0, factory_1.creatPublishPaymentUrlParams)({
|
|
85
|
+
object: authorizeObject,
|
|
86
|
+
paymentServiceType,
|
|
87
|
+
transaction: transaction,
|
|
88
|
+
transactionNumber: transactionNumber,
|
|
89
|
+
location: params.location,
|
|
90
|
+
instrument: params.instrument,
|
|
91
|
+
...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined,
|
|
92
|
+
...(typeof ticketToken === 'string') ? { ticketToken } : undefined
|
|
93
|
+
});
|
|
94
|
+
const taskId = params.sameAs?.id;
|
|
95
|
+
const result = await PayTransactionService.publishPaymentUrl(startParams, {
|
|
96
|
+
purposeAsTransaction: { id: transaction.id },
|
|
97
|
+
executor: (typeof taskId === 'string') ? { id: taskId } : {} // タスク関連付け(2024-05-22~)
|
|
98
|
+
})(repos, settings);
|
|
99
|
+
// 取引に保管
|
|
100
|
+
const paymentMethodByPaymentUrl = {
|
|
101
|
+
// typeOf: params.object.paymentMethod, // discontinue(2024-06-05~)
|
|
102
|
+
paymentMethodId: result.paymentMethodId
|
|
103
|
+
// paymentUrl: result.paymentUrl, // migrate to recipe(2024-06-05~)
|
|
104
|
+
// issuedThrough: {
|
|
105
|
+
// id: (typeof startParams.object.id === 'string') ? startParams.object.id : ''
|
|
106
|
+
// } // migrate to acceptAction(2024-06-05~)
|
|
107
|
+
// GMO IFを保管(2024-01-01~)
|
|
108
|
+
// entryTranArgs: result.entryTranArgs, // migrate to recipe(2024-06-05~)
|
|
109
|
+
// entryTranResult: result.entryTranResult, // migrate to recipe(2024-06-05~)
|
|
110
|
+
// execTranArgs: result.execTranArgs, // migrate to recipe(2024-06-05~)
|
|
111
|
+
// execTranResult: result.execTranResult, // migrate to recipe(2024-06-05~)
|
|
112
|
+
// paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~) // migrate to acceptAction(2024-06-05~)
|
|
113
|
+
};
|
|
114
|
+
await repos.placeOrder.findByIdAndUpdateInProgress({
|
|
115
|
+
id: transaction.id,
|
|
116
|
+
update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
|
|
117
|
+
});
|
|
118
|
+
return {
|
|
119
|
+
paymentMethodId: result.paymentMethodId,
|
|
120
|
+
paymentUrl: result.paymentUrl
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
catch (error) {
|
|
124
|
+
// 複数対応(2024-03-27~)
|
|
125
|
+
if (Array.isArray(error)) {
|
|
126
|
+
throw error[0];
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
throw error;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import * as factory from '../../../factory';
|
|
2
|
+
import type { AccountingReportRepo } from '../../../repo/accountingReport';
|
|
3
|
+
import type { ActionRepo } from '../../../repo/action';
|
|
4
|
+
import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
|
|
5
|
+
import type { PaymentServiceRepo } from '../../../repo/paymentService';
|
|
6
|
+
import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
|
|
7
|
+
import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
|
|
8
|
+
import type { TaskRepo } from '../../../repo/task';
|
|
9
|
+
import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
|
|
10
|
+
/**
|
|
11
|
+
* 決済承認中止
|
|
12
|
+
* タスクから決済承認を取り消す
|
|
13
|
+
*/
|
|
14
|
+
declare function voidPayTransaction(params: factory.task.IData<factory.taskName.VoidPayTransaction> & {
|
|
15
|
+
project: {
|
|
16
|
+
id: string;
|
|
17
|
+
};
|
|
18
|
+
sameAs?: {
|
|
19
|
+
id: string;
|
|
20
|
+
};
|
|
21
|
+
}): (repos: {
|
|
22
|
+
accountingReport: AccountingReportRepo;
|
|
23
|
+
action: ActionRepo;
|
|
24
|
+
assetTransaction: AssetTransactionRepo;
|
|
25
|
+
paymentAccepted: SellerPaymentAcceptedRepo;
|
|
26
|
+
paymentService: PaymentServiceRepo;
|
|
27
|
+
paymentServiceProvider: PaymentServiceProviderRepo;
|
|
28
|
+
task: TaskRepo;
|
|
29
|
+
placeOrder: PlaceOrderRepo;
|
|
30
|
+
}) => Promise<void>;
|
|
31
|
+
export { voidPayTransaction, };
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.voidPayTransaction = voidPayTransaction;
|
|
4
|
+
const invalidatePaymentUrl_1 = require("./invalidatePaymentUrl");
|
|
5
|
+
const processVoidPayTransaction_1 = require("./processVoidPayTransaction");
|
|
6
|
+
/**
|
|
7
|
+
* 決済承認中止
|
|
8
|
+
* タスクから決済承認を取り消す
|
|
9
|
+
*/
|
|
10
|
+
function voidPayTransaction(params) {
|
|
11
|
+
return async (repos
|
|
12
|
+
// settings: Settings
|
|
13
|
+
) => {
|
|
14
|
+
// 決済承認アクション確認不要(2024-03-12~)
|
|
15
|
+
// 決済承認アクションを検索
|
|
16
|
+
// let authorizeActions = <factory.action.authorize.paymentMethod.any.IAction[]>
|
|
17
|
+
// await repos.action.searchByPurpose({
|
|
18
|
+
// typeOf: factory.actionType.AuthorizeAction,
|
|
19
|
+
// purpose: {
|
|
20
|
+
// typeOf: params.purpose.typeOf,
|
|
21
|
+
// id: params.purpose.id
|
|
22
|
+
// }
|
|
23
|
+
// });
|
|
24
|
+
// authorizeActions = authorizeActions.filter(
|
|
25
|
+
// (a) => a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment
|
|
26
|
+
// );
|
|
27
|
+
// // Chevreを使用した承認を取り消し
|
|
28
|
+
// const authorizeActionsWithChevre = authorizeActions.filter((a) => {
|
|
29
|
+
// return a.instrument?.identifier === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
|
|
30
|
+
// });
|
|
31
|
+
// if (authorizeActionsWithChevre.length > 0) {
|
|
32
|
+
// await processVoidPayTransaction(params)(repos);
|
|
33
|
+
// }
|
|
34
|
+
await (0, processVoidPayTransaction_1.processVoidPayTransaction)(params)(repos);
|
|
35
|
+
// 決済URL無効化もここで処理
|
|
36
|
+
await (0, invalidatePaymentUrl_1.invalidatePaymentUrl)(params)(repos);
|
|
37
|
+
};
|
|
38
|
+
}
|