@chevre/domain 22.0.0-alpha.7 → 22.0.0-alpha.8
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/example/src/chevre/aggregateAllEvents2.ts +8 -1
- package/example/src/chevre/processOrder.ts +4 -1
- package/lib/chevre/credentials.d.ts +0 -15
- package/lib/chevre/credentials.js +20 -20
- package/lib/chevre/emailMessageBuilder.d.ts +4 -3
- package/lib/chevre/emailMessageBuilder.js +8 -9
- package/lib/chevre/service/assetTransaction/pay.d.ts +6 -5
- package/lib/chevre/service/assetTransaction/pay.js +15 -15
- package/lib/chevre/service/assetTransaction.d.ts +1 -1
- package/lib/chevre/service/assetTransaction.js +1 -7
- package/lib/chevre/service/order/deleteOrder.js +3 -44
- package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts +1 -1
- package/lib/chevre/service/order/onAssetTransactionStatusChanged.js +6 -11
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts +2 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +4 -6
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.d.ts +1 -0
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js +3 -3
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +8 -1
- package/lib/chevre/service/order/sendOrder.js +3 -4
- package/lib/chevre/service/payment/any.d.ts +5 -4
- package/lib/chevre/service/payment/any.js +8 -8
- package/lib/chevre/service/payment/creditCard/authorize.d.ts +2 -1
- package/lib/chevre/service/payment/creditCard/authorize.js +5 -6
- package/lib/chevre/service/payment/creditCard/payCreditCard.d.ts +2 -1
- package/lib/chevre/service/payment/creditCard/payCreditCard.js +3 -4
- package/lib/chevre/service/payment/creditCard/refundCreditCard.d.ts +2 -1
- package/lib/chevre/service/payment/creditCard/refundCreditCard.js +3 -4
- package/lib/chevre/service/payment/creditCard/searchGMOTrade.d.ts +2 -1
- package/lib/chevre/service/payment/creditCard/searchGMOTrade.js +3 -4
- package/lib/chevre/service/payment/creditCard/voidTransaction.d.ts +2 -1
- package/lib/chevre/service/payment/creditCard/voidTransaction.js +3 -4
- package/lib/chevre/service/payment/movieTicket/authorize.d.ts +2 -1
- package/lib/chevre/service/payment/movieTicket/authorize.js +3 -3
- package/lib/chevre/service/payment/movieTicket/checkMovieTicket.d.ts +2 -1
- package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js +2 -2
- package/lib/chevre/service/payment/movieTicket/payMovieTicket.d.ts +2 -1
- package/lib/chevre/service/payment/movieTicket/payMovieTicket.js +2 -3
- package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.d.ts +2 -1
- package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.js +2 -4
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket.d.ts +2 -1
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js +2 -3
- package/lib/chevre/service/payment/movieTicket/validation.d.ts +2 -1
- package/lib/chevre/service/payment/movieTicket/validation.js +4 -4
- package/lib/chevre/service/payment/movieTicket/voidTransaction.d.ts +2 -1
- package/lib/chevre/service/payment/movieTicket/voidTransaction.js +2 -2
- package/lib/chevre/service/payment.d.ts +4 -3
- package/lib/chevre/service/payment.js +9 -9
- package/lib/chevre/service/task/authorizePayment.js +2 -3
- package/lib/chevre/service/task/checkMovieTicket.js +9 -9
- package/lib/chevre/service/task/pay.js +14 -14
- package/lib/chevre/service/task/publishPaymentUrl.js +11 -11
- package/lib/chevre/service/task/refund.js +13 -13
- package/lib/chevre/service/task/voidPayTransaction.js +10 -10
- package/lib/chevre/service/task/voidPayment.js +10 -10
- package/lib/chevre/service/task.js +5 -3
- package/lib/chevre/service/transaction/moneyTransfer/exportTasks/factory.d.ts +2 -1
- package/lib/chevre/service/transaction/moneyTransfer/exportTasks/factory.js +3 -4
- package/lib/chevre/service/transaction/moneyTransfer.d.ts +2 -1
- package/lib/chevre/service/transaction/moneyTransfer.js +2 -2
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts +2 -1
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.js +2 -2
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts +2 -1
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js +2 -2
- package/lib/chevre/service/transaction/placeOrder/confirm.d.ts +2 -1
- package/lib/chevre/service/transaction/placeOrder/confirm.js +2 -2
- package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js +2 -3
- package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.d.ts +2 -1
- package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js +3 -4
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.d.ts +2 -1
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js +7 -7
- package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.d.ts +2 -1
- package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js +2 -2
- package/lib/chevre/service/transaction/returnOrder/potentialActions.d.ts +2 -1
- package/lib/chevre/service/transaction/returnOrder/potentialActions.js +3 -4
- package/lib/chevre/service/transaction/returnOrder.d.ts +3 -2
- package/lib/chevre/service/transaction/returnOrder.js +4 -4
- package/lib/chevre/service/transaction.d.ts +1 -1
- package/lib/chevre/service/transaction.js +3 -9
- package/lib/chevre/settings.d.ts +63 -16
- package/lib/chevre/settings.js +28 -31
- package/package.json +1 -1
- package/example/src/chevre/onAssetTransactionStatusChanged.ts +0 -60
- package/example/src/chevre/report2developers.ts +0 -63
- package/example/src/chevre/sendOrder.ts +0 -62
|
@@ -60,7 +60,14 @@ export async function aggregateScreeningEvent() {
|
|
|
60
60
|
userPoolIdNew: '',
|
|
61
61
|
useAggregateEntranceGateProjects: [],
|
|
62
62
|
useAggregateOfferProjects: [],
|
|
63
|
-
useOfferRateLimitProjects: []
|
|
63
|
+
useOfferRateLimitProjects: [],
|
|
64
|
+
defaultSenderEmail: 'test@example.com',
|
|
65
|
+
deliverOrderLimit: 1,
|
|
66
|
+
transaction: { confirmedStoragePeriodInDays: 365, canceledStoragePeriodInDays: 365 },
|
|
67
|
+
abortedTasksWithoutReport: [],
|
|
68
|
+
gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },
|
|
69
|
+
movieticketReserve: { timeout: 1000, timeoutCheck: 1000 },
|
|
70
|
+
numTryConfirmReserveTransaction: 10
|
|
64
71
|
})
|
|
65
72
|
});
|
|
66
73
|
console.log('executed', count);
|
|
@@ -64,7 +64,10 @@ async function main() {
|
|
|
64
64
|
serialNumbers,
|
|
65
65
|
offeredThroughIdentifier
|
|
66
66
|
},
|
|
67
|
-
options: {
|
|
67
|
+
options: {
|
|
68
|
+
force: true,
|
|
69
|
+
numTryConfirmReserveTransaction: 10
|
|
70
|
+
}
|
|
68
71
|
})({ task: taskRepo });
|
|
69
72
|
console.log('order processed', order.orderNumber);
|
|
70
73
|
updateCount += 1;
|
|
@@ -8,27 +8,12 @@ export declare namespace credentials {
|
|
|
8
8
|
engineId: string;
|
|
9
9
|
apiKey: string;
|
|
10
10
|
};
|
|
11
|
-
const gmo: {
|
|
12
|
-
timeout: number;
|
|
13
|
-
timeoutBackground: number | undefined;
|
|
14
|
-
useFetch: boolean;
|
|
15
|
-
};
|
|
16
11
|
const lineNotify: {
|
|
17
12
|
url: string | undefined;
|
|
18
13
|
accessToken: string | undefined;
|
|
19
14
|
accessTokenAlert: string | undefined;
|
|
20
15
|
accessTokenInfo: string | undefined;
|
|
21
16
|
};
|
|
22
|
-
const movieticketReserve: {
|
|
23
|
-
/**
|
|
24
|
-
* 着券時タイムアウト
|
|
25
|
-
*/
|
|
26
|
-
timeout: number;
|
|
27
|
-
/**
|
|
28
|
-
* 認証時タイムアウト
|
|
29
|
-
*/
|
|
30
|
-
timeoutCheck: number;
|
|
31
|
-
};
|
|
32
17
|
const sendGrid: {
|
|
33
18
|
apiKey: string | undefined;
|
|
34
19
|
};
|
|
@@ -55,32 +55,32 @@ var credentials;
|
|
|
55
55
|
engineId: process.env.CUSTOM_SEARCH_ENGINE_ID,
|
|
56
56
|
apiKey: process.env.GOOGLE_API_KEY
|
|
57
57
|
};
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
};
|
|
58
|
+
// export const gmo = {
|
|
59
|
+
// // tslint:disable-next-line:no-magic-numbers
|
|
60
|
+
// timeout: (typeof process.env.GMO_TIMEOUT === 'string') ? Number(process.env.GMO_TIMEOUT) : 5000,
|
|
61
|
+
// timeoutBackground: (typeof process.env.GMO_TIMEOUT_BACKGROUND === 'string')
|
|
62
|
+
// ? Number(process.env.GMO_TIMEOUT_BACKGROUND)
|
|
63
|
+
// : undefined,
|
|
64
|
+
// useFetch: process.env.GMO_USE_FETCH === '1'
|
|
65
|
+
// };
|
|
66
66
|
credentials.lineNotify = {
|
|
67
67
|
url: process.env.LINE_NOTIFY_URL,
|
|
68
68
|
accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
|
|
69
69
|
accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT,
|
|
70
70
|
accessTokenInfo: process.env.LINE_NOTIFY_ACCESS_TOKEN_INFO
|
|
71
71
|
};
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
};
|
|
72
|
+
// export const movieticketReserve = {
|
|
73
|
+
// /**
|
|
74
|
+
// * 着券時タイムアウト
|
|
75
|
+
// */
|
|
76
|
+
// // tslint:disable-next-line:no-magic-numbers
|
|
77
|
+
// timeout: (typeof process.env.MVTK_TIMEOUT === 'string') ? Number(process.env.MVTK_TIMEOUT) : 5000,
|
|
78
|
+
// /**
|
|
79
|
+
// * 認証時タイムアウト
|
|
80
|
+
// */
|
|
81
|
+
// // tslint:disable-next-line:no-magic-numbers
|
|
82
|
+
// timeoutCheck: (typeof process.env.MVTK_TIMEOUT_CHECK === 'string') ? Number(process.env.MVTK_TIMEOUT_CHECK) : 5000
|
|
83
|
+
// };
|
|
84
84
|
credentials.sendGrid = {
|
|
85
85
|
apiKey: process.env.SENDGRID_API_KEY
|
|
86
86
|
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as factory from './factory';
|
|
2
|
+
import { Settings } from './settings';
|
|
2
3
|
type ISendableEmailMessage = factory.action.transfer.send.message.email.IObjectAsEmailMessage & {
|
|
3
4
|
identifier: string;
|
|
4
5
|
name: string;
|
|
@@ -14,7 +15,7 @@ declare function createSendOrderMessage(params: {
|
|
|
14
15
|
email?: factory.creativeWork.message.email.ICustomization;
|
|
15
16
|
emailMessage?: factory.creativeWork.message.email.ICreativeWork;
|
|
16
17
|
index: number;
|
|
17
|
-
}): Promise<ISendableEmailMessage>;
|
|
18
|
+
}, settings: Settings): Promise<ISendableEmailMessage>;
|
|
18
19
|
/**
|
|
19
20
|
* 注文返品メッセージを作成する
|
|
20
21
|
*/
|
|
@@ -23,7 +24,7 @@ declare function createReturnOrderMessage(params: {
|
|
|
23
24
|
email?: factory.creativeWork.message.email.ICustomization;
|
|
24
25
|
emailMessage?: factory.creativeWork.message.email.ICreativeWork;
|
|
25
26
|
index: number;
|
|
26
|
-
}): Promise<ISendableEmailMessage>;
|
|
27
|
+
}, settings: Settings): Promise<ISendableEmailMessage>;
|
|
27
28
|
/**
|
|
28
29
|
* 返金メッセージを作成する
|
|
29
30
|
*/
|
|
@@ -31,5 +32,5 @@ declare function createRefundMessage(params: {
|
|
|
31
32
|
order: factory.order.IOrder;
|
|
32
33
|
email?: factory.creativeWork.message.email.ICustomization;
|
|
33
34
|
paymentMethodId: string;
|
|
34
|
-
}): Promise<ISendableEmailMessage>;
|
|
35
|
+
}, settings: Settings): Promise<ISendableEmailMessage>;
|
|
35
36
|
export { createSendOrderMessage, createReturnOrderMessage, createRefundMessage };
|
|
@@ -15,7 +15,6 @@ exports.createRefundMessage = exports.createReturnOrderMessage = exports.createS
|
|
|
15
15
|
*/
|
|
16
16
|
const pug = require("pug");
|
|
17
17
|
const factory = require("./factory");
|
|
18
|
-
const settings_1 = require("./settings");
|
|
19
18
|
function createEmailMessageText(params) {
|
|
20
19
|
var _a, _b, _c;
|
|
21
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -106,7 +105,7 @@ function createEmailMessageAbout(params) {
|
|
|
106
105
|
return about;
|
|
107
106
|
});
|
|
108
107
|
}
|
|
109
|
-
function createEmailMessageSender(params) {
|
|
108
|
+
function createEmailMessageSender(params, settings) {
|
|
110
109
|
var _a, _b;
|
|
111
110
|
return {
|
|
112
111
|
typeOf: params.order.seller.typeOf,
|
|
@@ -115,13 +114,13 @@ function createEmailMessageSender(params) {
|
|
|
115
114
|
: (typeof params.order.seller.name === 'string')
|
|
116
115
|
? params.order.seller.name
|
|
117
116
|
: String(params.order.seller.id),
|
|
118
|
-
email:
|
|
117
|
+
email: settings.defaultSenderEmail
|
|
119
118
|
};
|
|
120
119
|
}
|
|
121
120
|
/**
|
|
122
121
|
* 注文配送メッセージを作成する
|
|
123
122
|
*/
|
|
124
|
-
function createSendOrderMessage(params) {
|
|
123
|
+
function createSendOrderMessage(params, settings) {
|
|
125
124
|
var _a;
|
|
126
125
|
return __awaiter(this, void 0, void 0, function* () {
|
|
127
126
|
const emailMessageText = yield createEmailMessageText({
|
|
@@ -141,7 +140,7 @@ function createSendOrderMessage(params) {
|
|
|
141
140
|
throw new factory.errors.Argument('order', 'order.customer.email undefined');
|
|
142
141
|
}
|
|
143
142
|
const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
|
|
144
|
-
const sender = createEmailMessageSender(params);
|
|
143
|
+
const sender = createEmailMessageSender(params, settings);
|
|
145
144
|
const toRecipientCustomization = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient;
|
|
146
145
|
const toRecipient = (Array.isArray(toRecipientCustomization))
|
|
147
146
|
? toRecipientCustomization.map((customizedRecipient) => {
|
|
@@ -179,7 +178,7 @@ exports.createSendOrderMessage = createSendOrderMessage;
|
|
|
179
178
|
/**
|
|
180
179
|
* 注文返品メッセージを作成する
|
|
181
180
|
*/
|
|
182
|
-
function createReturnOrderMessage(params) {
|
|
181
|
+
function createReturnOrderMessage(params, settings) {
|
|
183
182
|
var _a;
|
|
184
183
|
return __awaiter(this, void 0, void 0, function* () {
|
|
185
184
|
const emailMessageText = yield createEmailMessageText({
|
|
@@ -199,7 +198,7 @@ function createReturnOrderMessage(params) {
|
|
|
199
198
|
throw new factory.errors.Argument('order', 'order.customer.email undefined');
|
|
200
199
|
}
|
|
201
200
|
const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
|
|
202
|
-
const sender = createEmailMessageSender(params);
|
|
201
|
+
const sender = createEmailMessageSender(params, settings);
|
|
203
202
|
const toRecipientCustomization = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient;
|
|
204
203
|
const toRecipient = (Array.isArray(toRecipientCustomization))
|
|
205
204
|
? toRecipientCustomization.map((customizedRecipient) => {
|
|
@@ -237,7 +236,7 @@ exports.createReturnOrderMessage = createReturnOrderMessage;
|
|
|
237
236
|
/**
|
|
238
237
|
* 返金メッセージを作成する
|
|
239
238
|
*/
|
|
240
|
-
function createRefundMessage(params) {
|
|
239
|
+
function createRefundMessage(params, settings) {
|
|
241
240
|
var _a;
|
|
242
241
|
return __awaiter(this, void 0, void 0, function* () {
|
|
243
242
|
const emailMessageText = yield createEmailMessageText({
|
|
@@ -255,7 +254,7 @@ function createRefundMessage(params) {
|
|
|
255
254
|
throw new factory.errors.Argument('order', 'order.customer.email undefined');
|
|
256
255
|
}
|
|
257
256
|
const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
|
|
258
|
-
const sender = createEmailMessageSender(params);
|
|
257
|
+
const sender = createEmailMessageSender(params, settings);
|
|
259
258
|
const toRecipientCustomization = (_a = params.email) === null || _a === void 0 ? void 0 : _a.toRecipient;
|
|
260
259
|
const toRecipient = (Array.isArray(toRecipientCustomization))
|
|
261
260
|
? toRecipientCustomization.map((customizedRecipient) => {
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import * as GMO from '@motionpicture/gmo-service';
|
|
5
5
|
import * as factory from '../../factory';
|
|
6
|
+
import { Settings } from '../../settings';
|
|
6
7
|
import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
|
|
7
8
|
import type { AccountingReportRepo } from '../../repo/accountingReport';
|
|
8
9
|
import type { ActionRepo } from '../../repo/action';
|
|
@@ -27,7 +28,7 @@ export interface IStartOperationRepos {
|
|
|
27
28
|
assetTransaction: AssetTransactionRepo;
|
|
28
29
|
task: TaskRepo;
|
|
29
30
|
}
|
|
30
|
-
export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
|
|
31
|
+
export type IStartOperation<T> = (repos: IStartOperationRepos, settings: Settings) => Promise<T>;
|
|
31
32
|
export interface ICancelRepos {
|
|
32
33
|
assetTransaction: AssetTransactionRepo;
|
|
33
34
|
}
|
|
@@ -52,13 +53,13 @@ export type ICheckOperation<T> = (repos: {
|
|
|
52
53
|
paymentAccepted: SellerPaymentAcceptedRepo;
|
|
53
54
|
paymentService: PaymentServiceRepo;
|
|
54
55
|
paymentServiceProvider: PaymentServiceProviderRepo;
|
|
55
|
-
}) => Promise<T>;
|
|
56
|
+
}, settings: Settings) => Promise<T>;
|
|
56
57
|
export type IPublishPaymentUrlOperation<T> = (repos: {
|
|
57
58
|
action: ActionRepo;
|
|
58
59
|
paymentAccepted: SellerPaymentAcceptedRepo;
|
|
59
60
|
paymentService: PaymentServiceRepo;
|
|
60
61
|
paymentServiceProvider: PaymentServiceProviderRepo;
|
|
61
|
-
}) => Promise<T>;
|
|
62
|
+
}, settings: Settings) => Promise<T>;
|
|
62
63
|
export type IInvalidatePaymentUrlOperation<T> = (repos: {
|
|
63
64
|
accountingReport: AccountingReportRepo;
|
|
64
65
|
action: ActionRepo;
|
|
@@ -67,7 +68,7 @@ export type IInvalidatePaymentUrlOperation<T> = (repos: {
|
|
|
67
68
|
paymentServiceProvider: PaymentServiceProviderRepo;
|
|
68
69
|
task: TaskRepo;
|
|
69
70
|
assetTransaction: AssetTransactionRepo;
|
|
70
|
-
}) => Promise<T>;
|
|
71
|
+
}, settings: Settings) => Promise<T>;
|
|
71
72
|
export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransaction & {
|
|
72
73
|
paymentMethodId: string;
|
|
73
74
|
paymentUrl: string;
|
|
@@ -164,4 +165,4 @@ export declare function searchGMOTrade(params: {
|
|
|
164
165
|
paymentService: PaymentServiceRepo;
|
|
165
166
|
paymentServiceProvider: PaymentServiceProviderRepo;
|
|
166
167
|
assetTransaction: AssetTransactionRepo;
|
|
167
|
-
}) => Promise<GMO.factory.credit.ISearchTradeResult>;
|
|
168
|
+
}, settings: Settings) => Promise<GMO.factory.credit.ISearchTradeResult>;
|
|
@@ -56,7 +56,7 @@ function publishPaymentUrlResult2recipe(params) {
|
|
|
56
56
|
// tslint:disable-next-line:max-func-body-length
|
|
57
57
|
function publishPaymentUrl(params, options) {
|
|
58
58
|
// tslint:disable-next-line:max-func-body-length
|
|
59
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
59
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
var _a, _b, _c, _d, _e;
|
|
61
61
|
const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
|
|
62
62
|
// 金額をfix
|
|
@@ -90,7 +90,7 @@ function publishPaymentUrl(params, options) {
|
|
|
90
90
|
}), paymentServiceId, {
|
|
91
91
|
processPublishPaymentUrl: true,
|
|
92
92
|
executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {} // タスク関連付け(2024-05-22~)
|
|
93
|
-
})(repos);
|
|
93
|
+
})(repos, settings);
|
|
94
94
|
let paymentUrl;
|
|
95
95
|
// 3DS拡張(2024-01-02~)
|
|
96
96
|
const retUrl = (_e = params.object.paymentMethod.creditCard) === null || _e === void 0 ? void 0 : _e.retUrl;
|
|
@@ -144,12 +144,12 @@ exports.publishPaymentUrl = publishPaymentUrl;
|
|
|
144
144
|
* 実質、外部で実行された決済に対する返金処理
|
|
145
145
|
*/
|
|
146
146
|
function invalidatePaymentUrl(params) {
|
|
147
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
147
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
148
148
|
var _a;
|
|
149
149
|
const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
|
|
150
150
|
switch (paymentServiceType) {
|
|
151
151
|
case factory.service.paymentService.PaymentServiceType.CreditCard:
|
|
152
|
-
yield CreditCardPayment.refundCreditCard(params, { requirePayAction: false })(repos);
|
|
152
|
+
yield CreditCardPayment.refundCreditCard(params, { requirePayAction: false })(repos, settings);
|
|
153
153
|
break;
|
|
154
154
|
default:
|
|
155
155
|
throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
|
|
@@ -161,14 +161,14 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
|
|
|
161
161
|
* 決済方法認証
|
|
162
162
|
*/
|
|
163
163
|
function check(params) {
|
|
164
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
164
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
165
165
|
var _a;
|
|
166
166
|
let action;
|
|
167
167
|
const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
|
|
168
168
|
try {
|
|
169
169
|
switch (paymentServiceType) {
|
|
170
170
|
case factory.service.paymentService.PaymentServiceType.MovieTicket:
|
|
171
|
-
action = yield MovieTicketPayment.checkMovieTicket(params)(repos);
|
|
171
|
+
action = yield MovieTicketPayment.checkMovieTicket(params)(repos, settings);
|
|
172
172
|
break;
|
|
173
173
|
default:
|
|
174
174
|
throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
|
|
@@ -185,7 +185,7 @@ exports.check = check;
|
|
|
185
185
|
* 取引開始
|
|
186
186
|
*/
|
|
187
187
|
function start(params, options) {
|
|
188
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
188
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
189
189
|
var _a, _b, _c, _d;
|
|
190
190
|
// 金額をfix
|
|
191
191
|
const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
|
|
@@ -218,13 +218,13 @@ function start(params, options) {
|
|
|
218
218
|
// transaction =
|
|
219
219
|
yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ executor: (typeof ((_c = options.executor) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
|
|
220
220
|
? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
|
|
221
|
-
: undefined))(repos);
|
|
221
|
+
: undefined))(repos, settings);
|
|
222
222
|
break;
|
|
223
223
|
case factory.service.paymentService.PaymentServiceType.MovieTicket:
|
|
224
224
|
transaction = yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckByIdentifierIfNotYet, {
|
|
225
225
|
executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {},
|
|
226
226
|
purpose: options.purpose
|
|
227
|
-
})(repos);
|
|
227
|
+
})(repos, settings);
|
|
228
228
|
break;
|
|
229
229
|
default:
|
|
230
230
|
throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
|
|
@@ -375,11 +375,11 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
|
|
|
375
375
|
});
|
|
376
376
|
}
|
|
377
377
|
function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
|
|
378
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
378
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
379
379
|
var _a;
|
|
380
380
|
yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: transaction.id }), paymentServiceId, Object.assign({ processPublishPaymentUrl: false, executor: (typeof ((_a = options.executor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
|
|
381
381
|
? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
|
|
382
|
-
: undefined))(repos);
|
|
382
|
+
: undefined))(repos, settings);
|
|
383
383
|
// ↓discontinue(2024-06-14~)
|
|
384
384
|
// return saveAuthorizeResult({
|
|
385
385
|
// id: transaction.id,
|
|
@@ -399,8 +399,8 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, optio
|
|
|
399
399
|
});
|
|
400
400
|
}
|
|
401
401
|
function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options) {
|
|
402
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
403
|
-
const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options)(repos);
|
|
402
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
403
|
+
const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options)(repos, settings);
|
|
404
404
|
// const payActionInObject: factory.assetTransaction.pay.IPayActionInObject = {
|
|
405
405
|
// actionStatus: payAction.actionStatus,
|
|
406
406
|
// id: payAction.id,
|
|
@@ -598,7 +598,7 @@ exports.exportTasksById = exportTasksById;
|
|
|
598
598
|
* 決済代行取引参照
|
|
599
599
|
*/
|
|
600
600
|
function searchGMOTrade(params) {
|
|
601
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
601
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
602
602
|
var _a, _b;
|
|
603
603
|
const assetTransaction = yield repos.assetTransaction.findByTransactionNumber({
|
|
604
604
|
typeOf: factory.assetTransactionType.Pay,
|
|
@@ -635,7 +635,7 @@ function searchGMOTrade(params) {
|
|
|
635
635
|
paymentMethodId: String(assetTransaction.transactionNumber),
|
|
636
636
|
shopId,
|
|
637
637
|
shopPass
|
|
638
|
-
});
|
|
638
|
+
}, settings);
|
|
639
639
|
});
|
|
640
640
|
}
|
|
641
641
|
exports.searchGMOTrade = searchGMOTrade;
|
|
@@ -20,7 +20,6 @@ const PayTransactionService = require("./assetTransaction/pay");
|
|
|
20
20
|
const RefundTransactionService = require("./assetTransaction/refund");
|
|
21
21
|
const RegisterServiceTransactionService = require("./assetTransaction/registerService");
|
|
22
22
|
const ReserveTransactionService = require("./assetTransaction/reserve");
|
|
23
|
-
const settings_1 = require("../settings");
|
|
24
23
|
exports.cancelReservation = CancelReservationTransactionService;
|
|
25
24
|
exports.moneyTransfer = MoneyTransferTransactionService;
|
|
26
25
|
exports.pay = PayTransactionService;
|
|
@@ -32,13 +31,8 @@ exports.reserve = ReserveTransactionService;
|
|
|
32
31
|
*/
|
|
33
32
|
function exportTasks(params) {
|
|
34
33
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
var _a;
|
|
36
34
|
const transaction = yield repos.assetTransaction.startExportTasks(Object.assign({ typeOf: params.typeOf, status: params.status, tasksExportAction: {
|
|
37
|
-
agent: {
|
|
38
|
-
name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
|
|
39
|
-
? params.tasksExportAction.agent.name
|
|
40
|
-
: settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
|
|
41
|
-
}
|
|
35
|
+
agent: { name: params.tasksExportAction.agent.name }
|
|
42
36
|
} }, (typeof params.id === 'string') ? { id: params.id } : undefined));
|
|
43
37
|
if (transaction === null) {
|
|
44
38
|
return;
|
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.deleteOrder = void 0;
|
|
13
13
|
const factory_1 = require("../delivery/factory");
|
|
14
14
|
const factory = require("../../factory");
|
|
15
|
-
const settings_1 = require("../../settings");
|
|
16
15
|
/**
|
|
17
16
|
* 注文に関わるリソースを削除する
|
|
18
17
|
* 冪等性を確保すること
|
|
@@ -50,9 +49,9 @@ function deleteOrder(params) {
|
|
|
50
49
|
}
|
|
51
50
|
});
|
|
52
51
|
// 終了済の関連イベントを削除(2023-08-16~)
|
|
53
|
-
if (
|
|
54
|
-
|
|
55
|
-
}
|
|
52
|
+
// if (USE_DELETE_EVENT_BY_ORDER) {
|
|
53
|
+
// await deleteEventsByOrder(order)(repos);
|
|
54
|
+
// }
|
|
56
55
|
// 注文削除
|
|
57
56
|
yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
|
|
58
57
|
});
|
|
@@ -95,43 +94,3 @@ function deleteOwnershipInfosByOrder(order) {
|
|
|
95
94
|
}
|
|
96
95
|
});
|
|
97
96
|
}
|
|
98
|
-
function deleteEventsByOrder(order) {
|
|
99
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
100
|
-
const now = new Date();
|
|
101
|
-
const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
102
|
-
orderNumber: { $eq: order.orderNumber },
|
|
103
|
-
project: { id: { $eq: order.project.id } }
|
|
104
|
-
});
|
|
105
|
-
const reservationForIds = acceptedOffers.filter((o) => {
|
|
106
|
-
return (o.itemOffered.typeOf === factory.reservationType.EventReservation
|
|
107
|
-
|| o.itemOffered.typeOf === factory.reservationType.BusReservation)
|
|
108
|
-
&& typeof o.itemOffered.reservationFor.id === 'string';
|
|
109
|
-
})
|
|
110
|
-
.map((o) => {
|
|
111
|
-
return String(o.itemOffered.reservationFor.id);
|
|
112
|
-
});
|
|
113
|
-
if (reservationForIds.length > 0) {
|
|
114
|
-
for (const reservationForId of reservationForIds) {
|
|
115
|
-
// 関連注文が存在しなければ削除
|
|
116
|
-
const relatedOrders = yield repos.order.search({
|
|
117
|
-
limit: 1,
|
|
118
|
-
page: 1,
|
|
119
|
-
project: { id: { $eq: order.project.id } },
|
|
120
|
-
acceptedOffers: {
|
|
121
|
-
itemOffered: {
|
|
122
|
-
reservationFor: { ids: [reservationForId] }
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
}, { _id: 1 });
|
|
126
|
-
if (relatedOrders.length === 0) {
|
|
127
|
-
yield repos.event.deleteManyEndedByIds({
|
|
128
|
-
typeOf: { $in: [factory.eventType.Event, factory.eventType.ScreeningEvent] },
|
|
129
|
-
project: { id: order.project.id },
|
|
130
|
-
ids: [reservationForId],
|
|
131
|
-
endDate: { $lte: now }
|
|
132
|
-
});
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
});
|
|
137
|
-
}
|
|
@@ -35,5 +35,5 @@ declare function processing2inTransit(params: {
|
|
|
35
35
|
order: OrderRepo;
|
|
36
36
|
task: TaskRepo;
|
|
37
37
|
transaction: TransactionRepo;
|
|
38
|
-
}) => Promise<void>;
|
|
38
|
+
}, settings: Settings) => Promise<void>;
|
|
39
39
|
export { onAssetTransactionStatusChanged, paymentDue2Processing, processing2inTransit };
|
|
@@ -61,7 +61,7 @@ function onAssetTransactionStatusChanged(params) {
|
|
|
61
61
|
// confirmationNumber,
|
|
62
62
|
orderNumber,
|
|
63
63
|
useOnOrderStatusChanged: params.useOnOrderStatusChanged
|
|
64
|
-
})(repos);
|
|
64
|
+
})(repos, settings);
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
break;
|
|
@@ -79,7 +79,7 @@ function onAssetTransactionStatusChanged(params) {
|
|
|
79
79
|
// confirmationNumber,
|
|
80
80
|
orderNumber,
|
|
81
81
|
useOnOrderStatusChanged: params.useOnOrderStatusChanged
|
|
82
|
-
})(repos);
|
|
82
|
+
})(repos, settings);
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
break;
|
|
@@ -96,7 +96,7 @@ function onAssetTransactionStatusChanged(params) {
|
|
|
96
96
|
// confirmationNumber,
|
|
97
97
|
orderNumber,
|
|
98
98
|
useOnOrderStatusChanged: params.useOnOrderStatusChanged
|
|
99
|
-
})(repos);
|
|
99
|
+
})(repos, settings);
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
102
|
break;
|
|
@@ -113,7 +113,7 @@ function onAssetTransactionStatusChanged(params) {
|
|
|
113
113
|
// confirmationNumber,
|
|
114
114
|
orderNumber,
|
|
115
115
|
useOnOrderStatusChanged: params.useOnOrderStatusChanged
|
|
116
|
-
})(repos);
|
|
116
|
+
})(repos, settings);
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
break;
|
|
@@ -376,12 +376,7 @@ function isDeliverable(params) {
|
|
|
376
376
|
});
|
|
377
377
|
}
|
|
378
378
|
function processing2inTransit(params) {
|
|
379
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
380
|
-
// const placeOrderTransaction = await findPlaceOrderTransaction({
|
|
381
|
-
// project: { id: params.project.id },
|
|
382
|
-
// confirmationNumber: params.confirmationNumber,
|
|
383
|
-
// orderNumber: params.orderNumber
|
|
384
|
-
// })({ transaction: repos.transaction });
|
|
379
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
385
380
|
let order = yield repos.order.findByOrderNumber({
|
|
386
381
|
orderNumber: params.orderNumber,
|
|
387
382
|
project: { id: params.project.id },
|
|
@@ -417,7 +412,7 @@ function processing2inTransit(params) {
|
|
|
417
412
|
})({
|
|
418
413
|
task: repos.task,
|
|
419
414
|
transaction: repos.transaction
|
|
420
|
-
});
|
|
415
|
+
}, settings);
|
|
421
416
|
}
|
|
422
417
|
});
|
|
423
418
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { TaskRepo } from '../../../repo/task';
|
|
2
2
|
import type { TransactionRepo } from '../../../repo/transaction';
|
|
3
3
|
import * as factory from '../../../factory';
|
|
4
|
+
import { Settings } from '../../../settings';
|
|
4
5
|
declare function onOrderInTransit(params: {
|
|
5
6
|
order: Omit<factory.order.IOrder, 'orderStatus'> & {
|
|
6
7
|
orderStatus: factory.orderStatus.OrderInTransit;
|
|
@@ -8,5 +9,5 @@ declare function onOrderInTransit(params: {
|
|
|
8
9
|
}): (repos: {
|
|
9
10
|
task: TaskRepo;
|
|
10
11
|
transaction: TransactionRepo;
|
|
11
|
-
}) => Promise<void>;
|
|
12
|
+
}, settings: Settings) => Promise<void>;
|
|
12
13
|
export { onOrderInTransit };
|
|
@@ -15,18 +15,16 @@ exports.onOrderInTransit = void 0;
|
|
|
15
15
|
*/
|
|
16
16
|
const createDebug = require("debug");
|
|
17
17
|
const factory = require("../../../factory");
|
|
18
|
-
// import { createMaskedCustomer } from '../../../factory/order';
|
|
19
|
-
const settings_1 = require("../../../settings");
|
|
20
18
|
const debug = createDebug('chevre-domain:service:order');
|
|
21
19
|
function onOrderInTransit(params) {
|
|
22
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
23
21
|
debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
|
|
24
22
|
switch (params.order.orderStatus) {
|
|
25
23
|
case factory.orderStatus.OrderInTransit:
|
|
26
24
|
// 冗長なsendOrderタスク作成を回避(2023-08-25~)
|
|
27
25
|
yield createSendOrderTaskIfNotExist({
|
|
28
26
|
order: params.order
|
|
29
|
-
})(repos);
|
|
27
|
+
})(repos, settings);
|
|
30
28
|
// 取引確定時にコードを発行していればタスク作成(2024-02-06~)
|
|
31
29
|
yield createOnAuthorizationCreatedTask(params.order)(repos);
|
|
32
30
|
break;
|
|
@@ -37,7 +35,7 @@ function onOrderInTransit(params) {
|
|
|
37
35
|
}
|
|
38
36
|
exports.onOrderInTransit = onOrderInTransit;
|
|
39
37
|
function createSendOrderTaskIfNotExist(params) {
|
|
40
|
-
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
38
|
+
return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
|
|
41
39
|
const now = new Date();
|
|
42
40
|
// const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
|
|
43
41
|
const simpleOrder = {
|
|
@@ -55,7 +53,7 @@ function createSendOrderTaskIfNotExist(params) {
|
|
|
55
53
|
orderDate: params.order.orderDate
|
|
56
54
|
};
|
|
57
55
|
const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {
|
|
58
|
-
limit:
|
|
56
|
+
limit: settings.deliverOrderLimit,
|
|
59
57
|
page: 1 // page1から配送
|
|
60
58
|
} });
|
|
61
59
|
const sendOrderTaskData = {
|
|
@@ -16,7 +16,6 @@ exports.processOrder = void 0;
|
|
|
16
16
|
const createDebug = require("debug");
|
|
17
17
|
const util = require("util");
|
|
18
18
|
const factory = require("../../../../factory");
|
|
19
|
-
const settings_1 = require("../../../../settings");
|
|
20
19
|
const factory_1 = require("./factory");
|
|
21
20
|
const debug = createDebug('chevre-domain:service:order');
|
|
22
21
|
function processOrder(params) {
|
|
@@ -50,6 +49,7 @@ function processOrder(params) {
|
|
|
50
49
|
exports.processOrder = processOrder;
|
|
51
50
|
function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, options) {
|
|
52
51
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
const { numTryConfirmReserveTransaction } = options;
|
|
53
53
|
const taskRunsAt = new Date();
|
|
54
54
|
const taskRunsAt4coa = new Date();
|
|
55
55
|
let confirmObjects;
|
|
@@ -81,7 +81,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
|
|
|
81
81
|
name: factory.taskName.ConfirmReserveTransaction,
|
|
82
82
|
status: factory.taskStatus.Ready,
|
|
83
83
|
runsAt: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
|
|
84
|
-
remainingNumberOfTries:
|
|
84
|
+
remainingNumberOfTries: numTryConfirmReserveTransaction,
|
|
85
85
|
numberOfTried: 0,
|
|
86
86
|
executionResults: [],
|
|
87
87
|
data
|
|
@@ -96,7 +96,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
|
|
|
96
96
|
if (typeof (existingTask === null || existingTask === void 0 ? void 0 : existingTask.id) === 'string') {
|
|
97
97
|
const retryResult = yield repos.task.retryForciblyIfAborted({
|
|
98
98
|
id: existingTask.id,
|
|
99
|
-
remainingNumberOfTries:
|
|
99
|
+
remainingNumberOfTries: numTryConfirmReserveTransaction
|
|
100
100
|
});
|
|
101
101
|
debug('retryResult:', retryResult, 'taskIdentifier:', taskIdentifier);
|
|
102
102
|
}
|