@chevre/domain 25.0.0-alpha.9 → 25.1.0-alpha.0
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/message.d.ts +7 -15
- package/lib/chevre/repo/message.js +37 -74
- package/lib/chevre/repo/mongoose/schemas/message.d.ts +1 -1
- package/lib/chevre/repo/mongoose/schemas/order.js +2 -110
- package/lib/chevre/repo/mongoose/schemas/setting.d.ts +35 -9
- package/lib/chevre/repo/mongoose/schemas/setting.js +3 -2
- package/lib/chevre/repo/mongoose/schemas/transaction.js +51 -50
- package/lib/chevre/repo/order.d.ts +1 -7
- package/lib/chevre/repo/order.js +56 -26
- package/lib/chevre/repo/orderInTransaction.d.ts +41 -22
- package/lib/chevre/repo/orderInTransaction.js +108 -79
- package/lib/chevre/repo/passport.d.ts +5 -2
- package/lib/chevre/repo/setting/rateLimit.d.ts +18 -0
- package/lib/chevre/repo/setting/rateLimit.js +48 -0
- package/lib/chevre/repo/setting/waiter.d.ts +17 -0
- package/lib/chevre/repo/setting/waiter.js +39 -0
- package/lib/chevre/repo/setting.d.ts +12 -11
- package/lib/chevre/repo/setting.js +6 -18
- package/lib/chevre/repo/task.d.ts +1 -1
- package/lib/chevre/repo/transaction/placeOrder.d.ts +1 -6
- package/lib/chevre/repo/transaction/placeOrder.js +37 -26
- package/lib/chevre/repo/transaction.d.ts +1 -1
- package/lib/chevre/repo/transaction.js +2 -2
- package/lib/chevre/repository.d.ts +10 -0
- package/lib/chevre/repository.js +22 -0
- package/lib/chevre/service/assetTransaction/reserve/start.d.ts +0 -2
- package/lib/chevre/service/offer/any.d.ts +1 -3
- package/lib/chevre/service/offer/any.js +7 -8
- package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts +0 -2
- package/lib/chevre/service/offer/event/authorize.d.ts +0 -4
- package/lib/chevre/service/offer/event/authorize.js +5 -8
- package/lib/chevre/service/offer/event/voidTransaction.js +29 -17
- package/lib/chevre/service/offer/event/voidTransactionByActionId.js +16 -12
- package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts +0 -6
- package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js +10 -12
- package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts +1 -1
- package/lib/chevre/service/offer/eventServiceByCOA/authorize.js +6 -7
- package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js +20 -17
- package/lib/chevre/service/order/deleteOrder.d.ts +6 -10
- package/lib/chevre/service/order/deleteOrder.js +7 -48
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled/factory.d.ts +1 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts +1 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.d.ts +4 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js +1 -26
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts +1 -1
- package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js +3 -2
- package/lib/chevre/service/order/placeOrder/factory.d.ts +1 -1
- package/lib/chevre/service/order/placeOrder/factory.js +6 -6
- package/lib/chevre/service/order/placeOrder/voidAcceptedOfferIfNecessary.d.ts +1 -3
- package/lib/chevre/service/order/placeOrder/voidAcceptedOfferIfNecessary.js +3 -15
- package/lib/chevre/service/order/placeOrder.js +6 -6
- package/lib/chevre/service/order.d.ts +1 -2
- package/lib/chevre/service/order.js +1 -5
- package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.d.ts +2 -4
- package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js +4 -6
- package/lib/chevre/service/payment/any/authorize.d.ts +2 -0
- package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts +0 -4
- package/lib/chevre/service/payment/any/publishPaymentUrl.js +5 -8
- package/lib/chevre/service/task/acceptCOAOffer.js +8 -10
- package/lib/chevre/service/task/authorizePayment.js +2 -6
- package/lib/chevre/service/task/deleteTransaction.js +2 -10
- package/lib/chevre/service/task/publishPaymentUrl.js +6 -9
- package/lib/chevre/service/taskHandler.js +0 -1
- package/lib/chevre/service/transaction/deleteTransaction.d.ts +8 -16
- package/lib/chevre/service/transaction/deleteTransaction.js +46 -145
- package/lib/chevre/service/transaction/placeOrder/confirm/factory/result.d.ts +7 -2
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts +3 -2
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts +3 -2
- package/lib/chevre/service/transaction/placeOrder/confirm.d.ts +2 -5
- package/lib/chevre/service/transaction/placeOrder/confirm.js +29 -24
- package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts +2 -3
- package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js +45 -54
- package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts +0 -4
- package/lib/chevre/service/transaction/placeOrder/exportTasksById.js +2 -3
- package/lib/chevre/service/transaction/placeOrder/issueOrderNumberIfNotExist.d.ts +5 -0
- package/lib/chevre/service/transaction/placeOrder/issueOrderNumberIfNotExist.js +37 -23
- package/lib/chevre/service/transaction/placeOrder/start/factory.d.ts +20 -4
- package/lib/chevre/service/transaction/placeOrder/start/factory.js +20 -7
- package/lib/chevre/service/transaction/placeOrder/start.d.ts +9 -4
- package/lib/chevre/service/transaction/placeOrder/start.js +18 -1
- package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts +0 -4
- package/lib/chevre/service/transaction/placeOrder/updateAgent.js +19 -22
- package/lib/chevre/service/transaction/placeOrder.d.ts +1 -2
- package/lib/chevre/service/transaction/placeOrder.js +1 -3
- package/lib/chevre/service/transaction.d.ts +0 -4
- package/lib/chevre/service/transaction.js +1 -1
- package/lib/chevre/service.d.ts +0 -2
- package/lib/chevre/service.js +0 -2
- package/package.json +2 -2
- package/lib/chevre/factory/order.d.ts +0 -2
- package/lib/chevre/factory/order.js +0 -5
- package/lib/chevre/service/order/placeOrderWithoutTransaction.d.ts +0 -22
- package/lib/chevre/service/order/placeOrderWithoutTransaction.js +0 -51
- package/lib/chevre/service/task/deletePerson.d.ts +0 -6
- package/lib/chevre/service/task/deletePerson.js +0 -465
|
@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.call = call;
|
|
4
4
|
const coa_service_1 = require("@motionpicture/coa-service");
|
|
5
5
|
const factory_1 = require("../../factory");
|
|
6
|
-
// import { ActionRepo } from '../../repo/action';
|
|
7
6
|
const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
|
|
8
7
|
const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
|
|
9
8
|
const credentials_1 = require("../../repo/credentials");
|
|
10
9
|
const event_1 = require("../../repo/event");
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
|
|
11
|
+
// import { OrderNumberRepo } from '../../repo/orderNumber';
|
|
12
|
+
// import { ProjectRepo } from '../../repo/project';
|
|
13
13
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
14
14
|
const integration_1 = require("../../repo/setting/integration");
|
|
15
|
-
// import { TransactionRepo } from '../../repo/transaction';
|
|
16
15
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
17
16
|
const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
|
|
18
17
|
let coaAuthClient;
|
|
@@ -87,10 +86,9 @@ function call(params) {
|
|
|
87
86
|
action: actionRepo,
|
|
88
87
|
authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
|
|
89
88
|
event: new event_1.EventRepo(connection),
|
|
90
|
-
orderNumber: new
|
|
91
|
-
project: new
|
|
89
|
+
// orderNumber: new OrderNumberRepo({ connection }),
|
|
90
|
+
// project: new ProjectRepo(connection),
|
|
92
91
|
placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
|
|
93
|
-
// transaction: new TransactionRepo(connection),
|
|
94
92
|
reserveService,
|
|
95
93
|
masterService
|
|
96
94
|
});
|
|
@@ -106,10 +104,10 @@ function call(params) {
|
|
|
106
104
|
})({
|
|
107
105
|
action: actionRepo,
|
|
108
106
|
event: new event_1.EventRepo(connection),
|
|
109
|
-
|
|
110
|
-
|
|
107
|
+
// orderInTransaction: new OrderInTransactionRepo(connection),
|
|
108
|
+
// orderNumber: new OrderNumberRepo({ connection }),
|
|
109
|
+
// project: new ProjectRepo(connection),
|
|
111
110
|
placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
|
|
112
|
-
// transaction: new TransactionRepo(connection),
|
|
113
111
|
reserveService,
|
|
114
112
|
masterService
|
|
115
113
|
});
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.call = call;
|
|
4
4
|
const factory_1 = require("../../factory");
|
|
5
5
|
const accountingReport_1 = require("../../repo/accountingReport");
|
|
6
|
-
// import { ActionRepo } from '../../repo/action';
|
|
7
6
|
const pay_1 = require("../../repo/action/pay");
|
|
8
7
|
const refund_1 = require("../../repo/action/refund");
|
|
9
8
|
const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
|
|
@@ -17,6 +16,7 @@ const credentials_1 = require("../../repo/credentials");
|
|
|
17
16
|
const event_1 = require("../../repo/event");
|
|
18
17
|
const eventSeries_1 = require("../../repo/eventSeries");
|
|
19
18
|
const issuer_1 = require("../../repo/issuer");
|
|
19
|
+
const orderInTransaction_1 = require("../../repo/orderInTransaction");
|
|
20
20
|
const orderNumber_1 = require("../../repo/orderNumber");
|
|
21
21
|
const paymentService_1 = require("../../repo/paymentService");
|
|
22
22
|
const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
@@ -27,10 +27,8 @@ const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
|
27
27
|
const integration_1 = require("../../repo/setting/integration");
|
|
28
28
|
const task_1 = require("../../repo/task");
|
|
29
29
|
const ticket_1 = require("../../repo/ticket");
|
|
30
|
-
// import { TransactionRepo } from '../../repo/transaction';
|
|
31
30
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
32
31
|
const transactionNumber_1 = require("../../repo/transactionNumber");
|
|
33
|
-
// import { TransactionProcessRepo } from '../../repo/transactionProcess';
|
|
34
32
|
const any_1 = require("../payment/any");
|
|
35
33
|
/**
|
|
36
34
|
* タスク実行関数
|
|
@@ -60,7 +58,6 @@ function call(params) {
|
|
|
60
58
|
sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
|
|
61
59
|
})({
|
|
62
60
|
accountingReport: new accountingReport_1.AccountingReportRepo(connection),
|
|
63
|
-
// action: new ActionRepo(connection),
|
|
64
61
|
actions: {
|
|
65
62
|
pay: new pay_1.PayActionRepo(connection),
|
|
66
63
|
refund: new refund_1.RefundActionRepo(connection),
|
|
@@ -79,6 +76,7 @@ function call(params) {
|
|
|
79
76
|
event: new event_1.EventRepo(connection),
|
|
80
77
|
eventSeries: new eventSeries_1.EventSeriesRepo(connection),
|
|
81
78
|
issuer: new issuer_1.IssuerRepo(connection),
|
|
79
|
+
orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
|
|
82
80
|
orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
|
|
83
81
|
paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
|
|
84
82
|
paymentService: new paymentService_1.PaymentServiceRepo(connection),
|
|
@@ -89,9 +87,7 @@ function call(params) {
|
|
|
89
87
|
task: new task_1.TaskRepo(connection),
|
|
90
88
|
ticket: new ticket_1.TicketRepo(connection),
|
|
91
89
|
placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
|
|
92
|
-
// transaction: new TransactionRepo(connection),
|
|
93
90
|
transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
|
|
94
|
-
// transactionProcess: transactionProcessRepo
|
|
95
91
|
}, settings);
|
|
96
92
|
}
|
|
97
93
|
catch (error) {
|
|
@@ -38,14 +38,10 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
|
|
|
38
38
|
const accountingReport_1 = require("../../repo/accountingReport");
|
|
39
39
|
const action_1 = require("../../repo/action");
|
|
40
40
|
const assetTransaction_1 = require("../../repo/assetTransaction");
|
|
41
|
-
|
|
42
|
-
const message_1 = require("../../repo/message");
|
|
41
|
+
// import { MessageRepo } from '../../repo/message';
|
|
43
42
|
const note_1 = require("../../repo/note");
|
|
44
43
|
const order_1 = require("../../repo/order");
|
|
45
|
-
const ownershipInfo_1 = require("../../repo/ownershipInfo");
|
|
46
44
|
const reservation_1 = require("../../repo/reservation");
|
|
47
|
-
const setting_1 = require("../../repo/setting");
|
|
48
|
-
const task_1 = require("../../repo/task");
|
|
49
45
|
const transaction_1 = require("../../repo/transaction");
|
|
50
46
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
51
47
|
const returnOrder_1 = require("../../repo/transaction/returnOrder");
|
|
@@ -60,14 +56,10 @@ function call(data) {
|
|
|
60
56
|
accountingReport: new accountingReport_1.AccountingReportRepo(connection),
|
|
61
57
|
action: new action_1.ActionRepo(connection),
|
|
62
58
|
assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
|
|
63
|
-
|
|
64
|
-
message: new message_1.MessageRepo(connection),
|
|
59
|
+
// message: new MessageRepo(connection),
|
|
65
60
|
note: new note_1.NoteRepo(connection),
|
|
66
61
|
order: new order_1.OrderRepo(connection),
|
|
67
|
-
ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
|
|
68
62
|
reservation: new reservation_1.ReservationRepo(connection),
|
|
69
|
-
setting: new setting_1.SettingRepo(connection),
|
|
70
|
-
task: new task_1.TaskRepo(connection),
|
|
71
63
|
transaction: new transaction_1.TransactionRepo(connection),
|
|
72
64
|
placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
|
|
73
65
|
returnOrder: new returnOrder_1.ReturnOrderRepo(connection),
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.call = call;
|
|
4
4
|
const factory_1 = require("../../factory");
|
|
5
|
-
// import { ActionRepo } from '../../repo/action';
|
|
6
5
|
const acceptPay_1 = require("../../repo/action/acceptPay");
|
|
7
6
|
const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
|
|
8
7
|
const assetTransaction_1 = require("../../repo/assetTransaction");
|
|
@@ -10,17 +9,16 @@ const authorization_1 = require("../../repo/authorization");
|
|
|
10
9
|
const event_1 = require("../../repo/event");
|
|
11
10
|
const eventSeries_1 = require("../../repo/eventSeries");
|
|
12
11
|
const issuer_1 = require("../../repo/issuer");
|
|
13
|
-
|
|
12
|
+
// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
|
|
13
|
+
// import { OrderNumberRepo } from '../../repo/orderNumber';
|
|
14
14
|
const paymentService_1 = require("../../repo/paymentService");
|
|
15
15
|
const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
16
|
-
|
|
16
|
+
// import { ProjectRepo } from '../../repo/project';
|
|
17
17
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
18
18
|
const integration_1 = require("../../repo/setting/integration");
|
|
19
19
|
const ticket_1 = require("../../repo/ticket");
|
|
20
|
-
// import { TransactionRepo } from '../../repo/transaction';
|
|
21
20
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
22
21
|
const transactionNumber_1 = require("../../repo/transactionNumber");
|
|
23
|
-
// import { TransactionProcessRepo } from '../../repo/transactionProcess';
|
|
24
22
|
const any_1 = require("../payment/any");
|
|
25
23
|
/**
|
|
26
24
|
* タスク実行関数
|
|
@@ -43,7 +41,6 @@ function call(params) {
|
|
|
43
41
|
instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
|
|
44
42
|
sameAs: { id: params.id }
|
|
45
43
|
})({
|
|
46
|
-
// action: new ActionRepo(connection),
|
|
47
44
|
acceptPayAction: actionRepo,
|
|
48
45
|
authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
|
|
49
46
|
assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
|
|
@@ -51,14 +48,14 @@ function call(params) {
|
|
|
51
48
|
event: new event_1.EventRepo(connection),
|
|
52
49
|
eventSeries: new eventSeries_1.EventSeriesRepo(connection),
|
|
53
50
|
issuer: new issuer_1.IssuerRepo(connection),
|
|
54
|
-
|
|
51
|
+
// orderInTransaction: new OrderInTransactionRepo(connection),
|
|
52
|
+
// orderNumber: new OrderNumberRepo({ connection }),
|
|
55
53
|
paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
|
|
56
54
|
paymentService: new paymentService_1.PaymentServiceRepo(connection),
|
|
57
55
|
paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
|
|
58
|
-
project: new
|
|
56
|
+
// project: new ProjectRepo(connection),
|
|
59
57
|
ticket: new ticket_1.TicketRepo(connection),
|
|
60
58
|
placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
|
|
61
|
-
// transaction: new TransactionRepo(connection),
|
|
62
59
|
transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
|
|
63
60
|
}, settings);
|
|
64
61
|
}
|
|
@@ -54,7 +54,6 @@ function executeTask(task, next) {
|
|
|
54
54
|
case factory_1.factory.taskName.CheckMovieTicket:
|
|
55
55
|
case factory_1.factory.taskName.CheckResource:
|
|
56
56
|
case factory_1.factory.taskName.CreateAccountingReport:
|
|
57
|
-
case factory_1.factory.taskName.DeletePerson:
|
|
58
57
|
case factory_1.factory.taskName.HandleNotification:
|
|
59
58
|
case factory_1.factory.taskName.ImportEventCapacitiesFromCOA:
|
|
60
59
|
case factory_1.factory.taskName.ImportEventsFromCOA:
|
|
@@ -3,35 +3,27 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
|
|
|
3
3
|
import type { AccountingReportRepo } from '../../repo/accountingReport';
|
|
4
4
|
import type { ActionRepo } from '../../repo/action';
|
|
5
5
|
import type { AssetTransactionRepo } from '../../repo/assetTransaction';
|
|
6
|
-
import type { EventRepo } from '../../repo/event';
|
|
7
|
-
import type { MessageRepo } from '../../repo/message';
|
|
8
6
|
import type { NoteRepo } from '../../repo/note';
|
|
9
7
|
import type { OrderRepo } from '../../repo/order';
|
|
10
|
-
import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
|
|
11
8
|
import type { ReservationRepo } from '../../repo/reservation';
|
|
12
|
-
import type { SettingRepo } from '../../repo/setting';
|
|
13
|
-
import type { TaskRepo } from '../../repo/task';
|
|
14
9
|
import type { TransactionRepo } from '../../repo/transaction';
|
|
15
10
|
import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
|
|
16
11
|
import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
|
|
17
|
-
|
|
18
|
-
* 取引に関わるリソースを削除する
|
|
19
|
-
* 冪等性を確保すること
|
|
20
|
-
*/
|
|
21
|
-
export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
|
|
12
|
+
interface IDeleteTransactionRepos {
|
|
22
13
|
acceptedOffer: AcceptedOfferRepo;
|
|
23
14
|
accountingReport: AccountingReportRepo;
|
|
24
15
|
action: ActionRepo;
|
|
25
16
|
assetTransaction: AssetTransactionRepo;
|
|
26
|
-
event: EventRepo;
|
|
27
|
-
message: MessageRepo;
|
|
28
17
|
note: NoteRepo;
|
|
29
18
|
order: OrderRepo;
|
|
30
|
-
ownershipInfo: OwnershipInfoRepo;
|
|
31
19
|
reservation: ReservationRepo;
|
|
32
|
-
setting: SettingRepo;
|
|
33
|
-
task: TaskRepo;
|
|
34
20
|
transaction: TransactionRepo;
|
|
35
21
|
placeOrder: PlaceOrderRepo;
|
|
36
22
|
returnOrder: ReturnOrderRepo;
|
|
37
|
-
}
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* 取引に関わるリソースを削除する
|
|
26
|
+
* 冪等性を確保すること
|
|
27
|
+
*/
|
|
28
|
+
export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: IDeleteTransactionRepos) => Promise<void>;
|
|
29
|
+
export {};
|
|
@@ -11,118 +11,15 @@ const deleteOrder_1 = require("../order/deleteOrder");
|
|
|
11
11
|
function deleteTransaction(params) {
|
|
12
12
|
return async (repos) => {
|
|
13
13
|
if (params.object.specifyingMethod === factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
throw new factory_1.factory.errors.NotImplemented('deleteTransaction by agentId discontinued'); // discontinue(2026-06-28~)
|
|
15
|
+
// // transaction.agent.id指定による取引削除に対応(2023-06-30~)
|
|
16
|
+
// await createDeleteTransactionTasksByAgentId(params)(repos);
|
|
16
17
|
}
|
|
17
18
|
else {
|
|
18
19
|
await deleteTransactionById(params)(repos);
|
|
19
20
|
}
|
|
20
21
|
};
|
|
21
22
|
}
|
|
22
|
-
function createDeleteTransactionTasksByAgentId(params) {
|
|
23
|
-
return async (repos) => {
|
|
24
|
-
if (params.object.specifyingMethod !== factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
|
|
25
|
-
throw new factory_1.factory.errors.Argument('object.specifyingMethod', `must be ${factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId}`);
|
|
26
|
-
}
|
|
27
|
-
const agentIdSpecified = params.object.agent.id;
|
|
28
|
-
// agentIdによる全取引についてDeleteTransactionタスクを作成する
|
|
29
|
-
if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
|
|
30
|
-
const transactionTypeOf = params.object.typeOf;
|
|
31
|
-
let transactions;
|
|
32
|
-
if (transactionTypeOf === factory_1.factory.transactionType.PlaceOrder) {
|
|
33
|
-
transactions = await repos.placeOrder.findPlaceOrderTransactions({
|
|
34
|
-
project: { id: { $eq: params.object.project.id } },
|
|
35
|
-
agent: {
|
|
36
|
-
ids: [agentIdSpecified],
|
|
37
|
-
typeOf: factory_1.factory.personType.Person
|
|
38
|
-
},
|
|
39
|
-
typeOf: transactionTypeOf,
|
|
40
|
-
inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
else if (transactionTypeOf === factory_1.factory.transactionType.ReturnOrder) {
|
|
44
|
-
transactions = await repos.returnOrder.findReturnOrderTransactions({
|
|
45
|
-
project: { id: { $eq: params.object.project.id } },
|
|
46
|
-
agent: {
|
|
47
|
-
ids: [agentIdSpecified],
|
|
48
|
-
typeOf: factory_1.factory.personType.Person
|
|
49
|
-
},
|
|
50
|
-
typeOf: transactionTypeOf,
|
|
51
|
-
inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
throw new factory_1.factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
|
|
56
|
-
}
|
|
57
|
-
const deleteAt = new Date();
|
|
58
|
-
let deleteTransactionTasks;
|
|
59
|
-
switch (transactionTypeOf) {
|
|
60
|
-
case factory_1.factory.transactionType.PlaceOrder:
|
|
61
|
-
deleteTransactionTasks = transactions.map((transaction) => {
|
|
62
|
-
return {
|
|
63
|
-
project: transaction.project,
|
|
64
|
-
name: factory_1.factory.taskName.DeleteTransaction,
|
|
65
|
-
status: factory_1.factory.taskStatus.Ready,
|
|
66
|
-
runsAt: deleteAt,
|
|
67
|
-
remainingNumberOfTries: 3,
|
|
68
|
-
numberOfTried: 0,
|
|
69
|
-
executionResults: [],
|
|
70
|
-
data: {
|
|
71
|
-
object: {
|
|
72
|
-
specifyingMethod: factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
|
|
73
|
-
id: transaction.id,
|
|
74
|
-
object: {
|
|
75
|
-
...(typeof transaction.object.confirmationNumber === 'string')
|
|
76
|
-
? { confirmationNumber: transaction.object.confirmationNumber }
|
|
77
|
-
: undefined,
|
|
78
|
-
...(typeof transaction.object.orderNumber === 'string')
|
|
79
|
-
? { orderNumber: transaction.object.orderNumber }
|
|
80
|
-
: undefined
|
|
81
|
-
},
|
|
82
|
-
project: transaction.project,
|
|
83
|
-
startDate: transaction.startDate,
|
|
84
|
-
typeOf: transaction.typeOf,
|
|
85
|
-
...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
};
|
|
89
|
-
});
|
|
90
|
-
break;
|
|
91
|
-
case factory_1.factory.transactionType.ReturnOrder:
|
|
92
|
-
deleteTransactionTasks = transactions.map((transaction) => {
|
|
93
|
-
return {
|
|
94
|
-
project: transaction.project,
|
|
95
|
-
name: factory_1.factory.taskName.DeleteTransaction,
|
|
96
|
-
status: factory_1.factory.taskStatus.Ready,
|
|
97
|
-
runsAt: deleteAt,
|
|
98
|
-
remainingNumberOfTries: 3,
|
|
99
|
-
numberOfTried: 0,
|
|
100
|
-
executionResults: [],
|
|
101
|
-
data: {
|
|
102
|
-
object: {
|
|
103
|
-
specifyingMethod: factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
|
|
104
|
-
id: transaction.id,
|
|
105
|
-
object: {
|
|
106
|
-
order: transaction.object.order
|
|
107
|
-
},
|
|
108
|
-
project: transaction.project,
|
|
109
|
-
startDate: transaction.startDate,
|
|
110
|
-
typeOf: transaction.typeOf,
|
|
111
|
-
...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
};
|
|
115
|
-
});
|
|
116
|
-
break;
|
|
117
|
-
default:
|
|
118
|
-
throw new factory_1.factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
|
|
119
|
-
}
|
|
120
|
-
if (deleteTransactionTasks.length > 0) {
|
|
121
|
-
await repos.task.saveMany(deleteTransactionTasks, { emitImmediately: true });
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
};
|
|
125
|
-
}
|
|
126
23
|
function deleteTransactionById(params) {
|
|
127
24
|
return async (repos) => {
|
|
128
25
|
if (typeof params.object.specifyingMethod === 'string'
|
|
@@ -133,7 +30,7 @@ function deleteTransactionById(params) {
|
|
|
133
30
|
if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
|
|
134
31
|
throw new factory_1.factory.errors.ArgumentNull('object.id');
|
|
135
32
|
}
|
|
136
|
-
let deletingOrderNumberByTask;
|
|
33
|
+
// let deletingOrderNumberByTask: string | undefined;
|
|
137
34
|
let transaction;
|
|
138
35
|
if (params.object.typeOf === factory_1.factory.transactionType.PlaceOrder) {
|
|
139
36
|
transaction = (await repos.placeOrder.findPlaceOrderTransactions({
|
|
@@ -141,7 +38,7 @@ function deleteTransactionById(params) {
|
|
|
141
38
|
typeOf: params.object.typeOf,
|
|
142
39
|
inclusion: ['typeOf', 'project', 'status']
|
|
143
40
|
})).shift();
|
|
144
|
-
deletingOrderNumberByTask = params.object.object.orderNumber;
|
|
41
|
+
// deletingOrderNumberByTask = params.object.object.orderNumber;
|
|
145
42
|
}
|
|
146
43
|
else if (params.object.typeOf === factory_1.factory.transactionType.ReturnOrder) {
|
|
147
44
|
transaction = (await repos.returnOrder.findReturnOrderTransactions({
|
|
@@ -172,7 +69,7 @@ function deleteTransactionById(params) {
|
|
|
172
69
|
let deleteCancelReservationTransactionResult;
|
|
173
70
|
let deletedReservationNumbers = [];
|
|
174
71
|
let deleteActionResult;
|
|
175
|
-
let deleteMessagessResult;
|
|
72
|
+
// let deleteMessagessResult: IDeleteResult | undefined;
|
|
176
73
|
const action = await repos.action.start(actionAttributes);
|
|
177
74
|
try {
|
|
178
75
|
const transactionTypeOf = transaction.typeOf;
|
|
@@ -191,18 +88,15 @@ function deleteTransactionById(params) {
|
|
|
191
88
|
case factory_1.factory.transactionStatusType.Expired:
|
|
192
89
|
break;
|
|
193
90
|
case factory_1.factory.transactionStatusType.Confirmed: {
|
|
194
|
-
//
|
|
195
|
-
//
|
|
196
|
-
// if (typeof deletingOrder?.orderNumber === 'string') {
|
|
91
|
+
// identifierによる削除に変更(2026-06-28~)
|
|
92
|
+
// if (typeof deletingOrderNumberByTask === 'string') {
|
|
197
93
|
// await deleteOrder({
|
|
198
|
-
// object:
|
|
94
|
+
// object: { orderNumber: deletingOrderNumberByTask }
|
|
199
95
|
// })(repos);
|
|
200
96
|
// }
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
})(repos);
|
|
205
|
-
}
|
|
97
|
+
await (0, deleteOrder_1.deleteOrder)({
|
|
98
|
+
object: { identifier: transaction.id }
|
|
99
|
+
})(repos);
|
|
206
100
|
break;
|
|
207
101
|
}
|
|
208
102
|
default:
|
|
@@ -233,11 +127,12 @@ function deleteTransactionById(params) {
|
|
|
233
127
|
]
|
|
234
128
|
}
|
|
235
129
|
});
|
|
236
|
-
//
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
130
|
+
// メッセージはcronで定期削除するため取引削除における連動は廃止(2026-06-29~)
|
|
131
|
+
// // messages削除(2024-05-01~)
|
|
132
|
+
// const deleteMessagesByPlaceOrderResult = await deleteMessagesByPlaceOrder({
|
|
133
|
+
// transaction: params.object
|
|
134
|
+
// })(repos);
|
|
135
|
+
// deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
|
|
241
136
|
// 取引削除
|
|
242
137
|
await repos.transaction.findByIdAndDelete({ id: transaction.id });
|
|
243
138
|
break;
|
|
@@ -270,7 +165,7 @@ function deleteTransactionById(params) {
|
|
|
270
165
|
deleteCancelReservationTransactionResult,
|
|
271
166
|
deletedReservationNumbers,
|
|
272
167
|
deleteActionResult,
|
|
273
|
-
...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
|
|
168
|
+
// ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
|
|
274
169
|
};
|
|
275
170
|
await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
|
|
276
171
|
};
|
|
@@ -383,24 +278,30 @@ function deletePayTransactionsByPlaceOrder(params) {
|
|
|
383
278
|
return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
|
|
384
279
|
};
|
|
385
280
|
}
|
|
386
|
-
function deleteMessagesByPlaceOrder(params
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
281
|
+
// function deleteMessagesByPlaceOrder(params: {
|
|
282
|
+
// transaction: factory.task.deleteTransaction.IObject;
|
|
283
|
+
// }) {
|
|
284
|
+
// return async (repos: {
|
|
285
|
+
// message: MessageRepo;
|
|
286
|
+
// }): Promise<{
|
|
287
|
+
// deleteResult?: IDeleteResult;
|
|
288
|
+
// }> => {
|
|
289
|
+
// let deleteResult: IDeleteResult | undefined;
|
|
290
|
+
// if (params.transaction.typeOf === factory.transactionType.PlaceOrder
|
|
291
|
+
// && params.transaction.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
|
|
292
|
+
// const orderNumber = params.transaction.object.orderNumber;
|
|
293
|
+
// if (typeof orderNumber === 'string' && orderNumber.length > 0) {
|
|
294
|
+
// const deleteReservationsResult = await repos.message.deleteByMainEntityOrderNumber({
|
|
295
|
+
// project: { id: params.transaction.project.id },
|
|
296
|
+
// mainEntity: { orderNumber }
|
|
297
|
+
// });
|
|
298
|
+
// deleteResult = {
|
|
299
|
+
// n: deleteReservationsResult?.n,
|
|
300
|
+
// ok: deleteReservationsResult?.ok,
|
|
301
|
+
// deletedCount: deleteReservationsResult?.deletedCount
|
|
302
|
+
// };
|
|
303
|
+
// }
|
|
304
|
+
// }
|
|
305
|
+
// return { deleteResult };
|
|
306
|
+
// };
|
|
307
|
+
// }
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { factory } from '../../../../../factory';
|
|
2
|
+
type IOrderAsResult = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'typeOf'> & {
|
|
3
|
+
orderStatus: factory.orderStatus.OrderPaymentDue;
|
|
4
|
+
identifier?: never;
|
|
5
|
+
url?: never;
|
|
6
|
+
};
|
|
2
7
|
/**
|
|
3
8
|
* 注文取引結果としての注文を生成する
|
|
4
9
|
*/
|
|
@@ -6,5 +11,5 @@ declare function createOrderAsResult(params: {
|
|
|
6
11
|
orderNumber: string;
|
|
7
12
|
orderDate: Date;
|
|
8
13
|
price: number;
|
|
9
|
-
}):
|
|
10
|
-
export { createOrderAsResult };
|
|
14
|
+
}): IOrderAsResult;
|
|
15
|
+
export { createOrderAsResult, IOrderAsResult };
|
package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { factory } from '../../../../../factory';
|
|
2
2
|
import type { ISetting } from '../../../../../repo/setting';
|
|
3
|
+
import type { IOrderAsResult } from '../factory/result';
|
|
3
4
|
export declare function createSendEmailMessageActions(params: {
|
|
4
|
-
order:
|
|
5
|
+
order: IOrderAsResult & {
|
|
5
6
|
confirmationNumber: string;
|
|
6
7
|
orderStatus: factory.orderStatus;
|
|
7
8
|
price: number;
|
|
@@ -9,7 +10,7 @@ export declare function createSendEmailMessageActions(params: {
|
|
|
9
10
|
typeOf: factory.order.OrderType;
|
|
10
11
|
};
|
|
11
12
|
customer: factory.order.ICustomer;
|
|
12
|
-
seller: factory.order.ISeller
|
|
13
|
+
seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
|
|
13
14
|
paymentMethods: factory.order.IReferencedInvoice[];
|
|
14
15
|
potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
|
|
15
16
|
}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { factory } from '../../../../factory';
|
|
2
2
|
import type { ISetting } from '../../../../repo/setting';
|
|
3
|
+
import { IOrderAsResult } from './factory/result';
|
|
3
4
|
/**
|
|
4
5
|
* 取引のポストアクションを作成する
|
|
5
6
|
*/
|
|
6
7
|
export declare function createPotentialActions(params: {
|
|
7
|
-
order:
|
|
8
|
+
order: IOrderAsResult & {
|
|
8
9
|
confirmationNumber: string;
|
|
9
10
|
orderStatus: factory.orderStatus.OrderPaymentDue;
|
|
10
11
|
price: number;
|
|
@@ -12,7 +13,7 @@ export declare function createPotentialActions(params: {
|
|
|
12
13
|
typeOf: factory.order.OrderType;
|
|
13
14
|
};
|
|
14
15
|
customer: factory.order.ICustomer;
|
|
15
|
-
seller: factory.order.ISeller
|
|
16
|
+
seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
|
|
16
17
|
paymentMethods: factory.order.IReferencedInvoice[];
|
|
17
18
|
potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
|
|
18
19
|
}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
|
|
@@ -11,6 +11,7 @@ import type { SettingRepo } from '../../../repo/setting';
|
|
|
11
11
|
import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
|
|
12
12
|
import { factory } from '../../../factory';
|
|
13
13
|
import { PlaceOrderFactory } from '../../../factory/transaction';
|
|
14
|
+
import { IOrderAsResult } from './confirm/factory/result';
|
|
14
15
|
interface IConfirmOperationRepos {
|
|
15
16
|
acceptPayAction: AcceptPayActionRepo;
|
|
16
17
|
authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
|
|
@@ -38,14 +39,10 @@ interface IConfirmOptions {
|
|
|
38
39
|
* 注文における最大CreditCardIF決済方法数
|
|
39
40
|
*/
|
|
40
41
|
maxNumCreditCardPaymentMethod: number;
|
|
41
|
-
/**
|
|
42
|
-
* 取引ドキュメントのresult.order,result,numAcceptedOffersを保管しないオプション(2026-06-15~)
|
|
43
|
-
*/
|
|
44
|
-
disableResultOrder: boolean;
|
|
45
42
|
}
|
|
46
43
|
type IConfirmParams = PlaceOrderFactory.IConfirmParams;
|
|
47
44
|
interface IConfirmResult {
|
|
48
|
-
order: Pick<
|
|
45
|
+
order: Pick<IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
|
|
49
46
|
customer: factory.order.ICustomer;
|
|
50
47
|
code?: string;
|
|
51
48
|
/**
|