@chevre/domain 26.0.0-alpha.4 → 26.0.0-alpha.41
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/eventEmitter/task.d.ts +8 -23
- package/lib/chevre/eventEmitter/task.js +2 -2
- package/lib/chevre/repo/acceptedOffer.d.ts +0 -7
- package/lib/chevre/repo/acceptedOffer.js +27 -27
- package/lib/chevre/repo/action/acceptCOAOffer.d.ts +3 -1
- package/lib/chevre/repo/action/acceptCOAOffer.js +8 -2
- package/lib/chevre/repo/action/acceptPay.d.ts +3 -1
- package/lib/chevre/repo/action/acceptPay.js +8 -4
- package/lib/chevre/repo/action/{actionProcess.d.ts → anyAction/actionProcess.d.ts} +18 -45
- package/lib/chevre/repo/action/{actionProcess.js → anyAction/actionProcess.js} +26 -91
- package/lib/chevre/repo/action/anyAction/actionRecipe.d.ts +37 -0
- package/lib/chevre/repo/action/anyAction/actionRecipe.js +53 -0
- package/lib/chevre/repo/action/authorizeInvoice.d.ts +5 -8
- package/lib/chevre/repo/action/authorizeInvoice.js +7 -4
- package/lib/chevre/repo/action/authorizeOffer.d.ts +3 -1
- package/lib/chevre/repo/action/authorizeOffer.js +7 -2
- package/lib/chevre/repo/action/authorizePaymentMethod.d.ts +3 -1
- package/lib/chevre/repo/action/authorizePaymentMethod.js +7 -4
- package/lib/chevre/repo/action/authorizeTicketedObject.d.ts +3 -1
- package/lib/chevre/repo/action/authorizeTicketedObject.js +7 -2
- package/lib/chevre/repo/action/checkMovieTicket.d.ts +3 -1
- package/lib/chevre/repo/action/checkMovieTicket.js +8 -1
- package/lib/chevre/repo/action/create.d.ts +10 -0
- package/lib/chevre/repo/action/create.js +17 -0
- package/lib/chevre/repo/action/inform.d.ts +38 -0
- package/lib/chevre/repo/action/inform.js +146 -0
- package/lib/chevre/repo/action/pay.d.ts +3 -1
- package/lib/chevre/repo/action/pay.js +7 -4
- package/lib/chevre/repo/action/refund.d.ts +3 -1
- package/lib/chevre/repo/action/refund.js +7 -4
- package/lib/chevre/repo/action/sendEmailMessage.d.ts +10 -0
- package/lib/chevre/repo/action/sendEmailMessage.js +17 -0
- package/lib/chevre/repo/action/sendOrder.d.ts +10 -0
- package/lib/chevre/repo/action/sendOrder.js +16 -0
- package/lib/chevre/repo/action/unknown2actionError.d.ts +6 -0
- package/lib/chevre/repo/action/unknown2actionError.js +15 -0
- package/lib/chevre/repo/action/update.d.ts +48 -0
- package/lib/chevre/repo/action/update.js +166 -0
- package/lib/chevre/repo/action/use.d.ts +39 -0
- package/lib/chevre/repo/action/use.js +153 -0
- package/lib/chevre/repo/action.d.ts +5 -101
- package/lib/chevre/repo/action.js +7 -453
- package/lib/chevre/repo/adminAction.d.ts +87 -0
- package/lib/chevre/repo/adminAction.js +170 -0
- package/lib/chevre/repo/adminAssetTransaction.d.ts +126 -0
- package/lib/chevre/repo/adminAssetTransaction.js +491 -0
- package/lib/chevre/repo/adminAsyncAction.d.ts +2 -2
- package/lib/chevre/repo/adminScheduledTask.d.ts +1 -1
- package/lib/chevre/repo/adminTask.d.ts +25 -8
- package/lib/chevre/repo/adminTask.js +31 -32
- package/lib/chevre/repo/adminTransaction.d.ts +131 -0
- package/lib/chevre/repo/adminTransaction.js +237 -0
- package/lib/chevre/repo/aggregateAction.d.ts +8 -11
- package/lib/chevre/repo/aggregateAction.js +0 -61
- package/lib/chevre/repo/aggregateAssetTransaction.d.ts +43 -0
- package/lib/chevre/repo/aggregateAssetTransaction.js +166 -0
- package/lib/chevre/repo/aggregateTransaction.d.ts +39 -0
- package/lib/chevre/repo/aggregateTransaction.js +166 -0
- package/lib/chevre/repo/aggregateUseAction.d.ts +35 -0
- package/lib/chevre/repo/aggregateUseAction.js +164 -0
- package/lib/chevre/repo/aggregation.d.ts +0 -8
- package/lib/chevre/repo/aggregation.js +0 -10
- package/lib/chevre/repo/assetTransaction.d.ts +10 -235
- package/lib/chevre/repo/assetTransaction.js +48 -636
- package/lib/chevre/repo/asyncAction.d.ts +2 -2
- package/lib/chevre/repo/authorization.d.ts +0 -6
- package/lib/chevre/repo/authorization.js +15 -27
- package/lib/chevre/repo/message.d.ts +0 -7
- package/lib/chevre/repo/message.js +0 -38
- package/lib/chevre/repo/migrateAction.d.ts +48 -0
- package/lib/chevre/repo/migrateAction.js +32 -0
- package/lib/chevre/repo/mongoose/schemas/action/inform.d.ts +11 -0
- package/lib/chevre/repo/mongoose/schemas/action/inform.js +82 -0
- package/lib/chevre/repo/mongoose/schemas/action/update.d.ts +12 -0
- package/lib/chevre/repo/mongoose/schemas/action/update.js +112 -0
- package/lib/chevre/repo/mongoose/schemas/{ownershipInfo.d.ts → action/use.d.ts} +4 -6
- package/lib/chevre/repo/mongoose/schemas/action/use.js +92 -0
- package/lib/chevre/repo/mongoose/schemas/action.d.ts +1 -3
- package/lib/chevre/repo/mongoose/schemas/action.js +22 -7
- package/lib/chevre/repo/mongoose/schemas/actionRecipe.d.ts +1 -0
- package/lib/chevre/repo/mongoose/schemas/actionRecipe.js +19 -1
- package/lib/chevre/repo/mongoose/schemas/aggregateReservation.js +8 -9
- package/lib/chevre/repo/mongoose/schemas/aggregation.js +8 -1
- package/lib/chevre/repo/mongoose/schemas/assetTransaction.js +95 -76
- package/lib/chevre/repo/mongoose/schemas/authorization.js +25 -18
- package/lib/chevre/repo/mongoose/schemas/event.js +7 -0
- package/lib/chevre/repo/mongoose/schemas/eventOffer.js +7 -0
- package/lib/chevre/repo/mongoose/schemas/message.js +8 -1
- package/lib/chevre/repo/mongoose/schemas/pendingReservation.js +11 -4
- package/lib/chevre/repo/mongoose/schemas/setting.d.ts +1 -0
- package/lib/chevre/repo/mongoose/schemas/task.d.ts +2 -5
- package/lib/chevre/repo/mongoose/schemas/task.js +134 -118
- package/lib/chevre/repo/mongoose/schemas/ticket.js +8 -1
- package/lib/chevre/repo/orderInTransaction.d.ts +0 -3
- package/lib/chevre/repo/orderInTransaction.js +30 -22
- package/lib/chevre/repo/scheduledTask.d.ts +5 -2
- package/lib/chevre/repo/scheduledTask.js +3 -25
- package/lib/chevre/repo/task.d.ts +45 -171
- package/lib/chevre/repo/task.js +20 -475
- package/lib/chevre/repo/taskDelayed.d.ts +74 -0
- package/lib/chevre/repo/taskDelayed.js +195 -0
- package/lib/chevre/repo/taskRunning.d.ts +35 -0
- package/lib/chevre/repo/taskRunning.js +89 -0
- package/lib/chevre/repo/ticket.d.ts +0 -6
- package/lib/chevre/repo/ticket.js +0 -11
- package/lib/chevre/repo/transaction.d.ts +1 -187
- package/lib/chevre/repo/transaction.js +2 -383
- package/lib/chevre/repository.d.ts +50 -10
- package/lib/chevre/repository.js +112 -24
- package/lib/chevre/service/aggregation/system.d.ts +9 -8
- package/lib/chevre/service/aggregation/system.js +5 -5
- package/lib/chevre/service/assetTransaction/cancelReservation/start.js +10 -17
- package/lib/chevre/service/assetTransaction/refund.js +2 -2
- package/lib/chevre/service/asyncAction.d.ts +2 -2
- package/lib/chevre/service/asyncAction.js +1 -4
- package/lib/chevre/service/asyncActionHandler/onOperationFailed.d.ts +2 -2
- package/lib/chevre/service/asyncActionHandler/onOperationFailed.js +0 -2
- package/lib/chevre/service/asyncActionHandler.d.ts +4 -4
- package/lib/chevre/service/asyncActionHandler.js +11 -13
- package/lib/chevre/service/event/processUpdateMovieTheater.d.ts +4 -2
- package/lib/chevre/service/event/processUpdateMovieTheater.js +3 -3
- package/lib/chevre/service/event.d.ts +4 -2
- package/lib/chevre/service/event.js +3 -3
- package/lib/chevre/service/notification/sendEmailMessage.d.ts +4 -2
- package/lib/chevre/service/notification/sendEmailMessage.js +3 -3
- package/lib/chevre/service/notification/triggerWebhook.d.ts +4 -2
- package/lib/chevre/service/notification/triggerWebhook.js +5 -16
- package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js +1 -3
- package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.d.ts +0 -4
- package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.js +19 -19
- package/lib/chevre/service/offer/onEventChanged.js +0 -2
- package/lib/chevre/service/order/confirmPayTransaction.js +4 -1
- package/lib/chevre/service/order/createAccountingReportIfNotExist.d.ts +1 -1
- package/lib/chevre/service/order/createAccountingReportIfNotExist.js +2 -56
- package/lib/chevre/service/order/deleteOrder.d.ts +2 -2
- package/lib/chevre/service/order/deleteOrder.js +1 -2
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/isDeliverable.js +1 -49
- package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.js +2 -2
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered/factory.js +2 -4
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js +2 -4
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +4 -4
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js +2 -2
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js +2 -10
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts +2 -2
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js +4 -8
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js +2 -2
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +1 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.js +5 -11
- package/lib/chevre/service/order/onOrderUpdated/factory.js +0 -3
- package/lib/chevre/service/order/returnOrder.d.ts +0 -2
- package/lib/chevre/service/order/returnOrder.js +8 -40
- package/lib/chevre/service/order/sendOrder.d.ts +4 -6
- package/lib/chevre/service/order/sendOrder.js +30 -72
- package/lib/chevre/service/payment/any/findAcceptAction.d.ts +0 -4
- package/lib/chevre/service/payment/any/findAcceptAction.js +19 -19
- package/lib/chevre/service/payment/any/findAuthorizeAction.d.ts +0 -4
- package/lib/chevre/service/payment/any/findAuthorizeAction.js +19 -19
- package/lib/chevre/service/payment/any/findCheckAction.d.ts +0 -4
- package/lib/chevre/service/payment/any/findCheckAction.js +19 -19
- package/lib/chevre/service/payment/any/processVoidPayTransaction.js +1 -1
- package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts +0 -2
- package/lib/chevre/service/payment/any/publishPaymentUrl.js +2 -2
- package/lib/chevre/service/project.d.ts +0 -6
- package/lib/chevre/service/project.js +0 -2
- package/lib/chevre/service/reserve/cancelReservation.js +3 -3
- package/lib/chevre/service/reserve/checkInReservation.js +2 -2
- package/lib/chevre/service/reserve/confirmReservation.js +1 -1
- package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js +2 -2
- package/lib/chevre/service/reserve/useReservation.d.ts +4 -0
- package/lib/chevre/service/reserve/useReservation.js +6 -24
- package/lib/chevre/service/scheduledTask.d.ts +1 -4
- package/lib/chevre/service/scheduledTask.js +3 -10
- package/lib/chevre/service/scheduledTaskHandler/onOperationFailed.js +1 -2
- package/lib/chevre/service/scheduledTaskHandler.js +0 -13
- package/lib/chevre/service/task/acceptCOAOffer.js +1 -14
- package/lib/chevre/service/task/authorizePayment.js +1 -7
- package/lib/chevre/service/task/checkMovieTicket.js +1 -7
- package/lib/chevre/service/task/checkResource.js +14 -57
- package/lib/chevre/service/task/confirmReserveTransaction.js +3 -1
- package/lib/chevre/service/task/createAccountingReport.js +8 -15
- package/lib/chevre/service/task/deleteTransaction.js +10 -41
- package/lib/chevre/service/task/importEventsFromCOA.js +4 -2
- package/lib/chevre/service/task/onAuthorizationCreated.js +2 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByAggregateOffer.d.ts +4 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByAggregateOffer.js +4 -4
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByEventSeries.d.ts +4 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByEventSeries.js +4 -4
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByMovieTheater.d.ts +4 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByMovieTheater.js +4 -4
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByOfferCatalog.d.ts +4 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByOfferCatalog.js +4 -4
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByProduct.d.ts +4 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByProduct.js +4 -4
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByRoom.d.ts +4 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByRoom.js +4 -4
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesBySeller.d.ts +4 -2
- package/lib/chevre/service/task/onResourceDeleted/deleteResourcesBySeller.js +4 -4
- package/lib/chevre/service/task/onResourceDeleted.js +4 -3
- package/lib/chevre/service/task/onResourceUpdated/onAggregateOfferUpdated.js +0 -1
- package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js +0 -1
- package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js +0 -1
- package/lib/chevre/service/task/onResourceUpdated.js +0 -8
- package/lib/chevre/service/task/publishPaymentUrl.js +2 -13
- package/lib/chevre/service/task/returnOrder.js +2 -5
- package/lib/chevre/service/task/returnPayTransaction.js +2 -5
- package/lib/chevre/service/task/sendEmailMessage.js +2 -2
- package/lib/chevre/service/task/sendOrder.js +4 -8
- package/lib/chevre/service/task/syncResourcesFromCOA.js +31 -23
- package/lib/chevre/service/task/triggerWebhook.js +4 -2
- package/lib/chevre/service/task/useReservation.js +4 -0
- package/lib/chevre/service/task/voidReserveTransaction.js +5 -8
- package/lib/chevre/service/task.d.ts +3 -22
- package/lib/chevre/service/task.js +8 -40
- package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.js +0 -1
- package/lib/chevre/service/taskHandler/onOperationFailed.d.ts +3 -2
- package/lib/chevre/service/taskHandler/onOperationFailed.js +5 -16
- package/lib/chevre/service/taskHandler.d.ts +1 -2
- package/lib/chevre/service/taskHandler.js +7 -19
- package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.js +2 -2
- package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.js +2 -2
- package/lib/chevre/service/transaction/deleteTransaction.d.ts +8 -4
- package/lib/chevre/service/transaction/deleteTransaction.js +7 -7
- package/lib/chevre/service/transaction/placeOrder/confirm.js +1 -1
- package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts +8 -4
- package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js +55 -103
- package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts +2 -0
- package/lib/chevre/service/transaction/placeOrder/exportTasksById.js +14 -10
- package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.d.ts +13 -3
- package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js +48 -51
- package/lib/chevre/service/transaction/returnOrder.d.ts +2 -0
- package/lib/chevre/service/transaction/returnOrder.js +15 -13
- package/lib/chevre/service/transaction.d.ts +2 -0
- package/lib/chevre/service/transaction.js +0 -2
- package/lib/chevre/service/validation/validateOrder.d.ts +0 -4
- package/lib/chevre/service/validation/validateOrder.js +3 -3
- package/lib/chevre/taskSettings.d.ts +4 -4
- package/package.json +2 -2
- package/lib/chevre/repo/action/checkThing.d.ts +0 -8
- package/lib/chevre/repo/action/checkThing.js +0 -13
- package/lib/chevre/repo/mongoose/schemas/ownershipInfo.js +0 -227
- package/lib/chevre/repo/mongoose/schemas/pendingReservationAggregate.d.ts +0 -25
- package/lib/chevre/repo/mongoose/schemas/pendingReservationAggregate.js +0 -100
- package/lib/chevre/repo/ownershipInfo.d.ts +0 -122
- package/lib/chevre/repo/ownershipInfo.js +0 -466
- package/lib/chevre/service/validation/validateEvent.d.ts +0 -11
- package/lib/chevre/service/validation/validateEvent.js +0 -21
|
@@ -88,18 +88,7 @@ function createInformActionAttributes(params) {
|
|
|
88
88
|
const { about, object, purpose, recipient, project, id, typeOf } = params;
|
|
89
89
|
// redefine recipient(2025-02-15~)
|
|
90
90
|
let informRecipient;
|
|
91
|
-
|
|
92
|
-
// ...recipient
|
|
93
|
-
// // url: target.urlTemplate // discontinue(2025-02-15~)
|
|
94
|
-
// };
|
|
95
|
-
if (recipient?.typeOf === factory_1.factory.organizationType.Corporation && typeof recipient.id === 'string') {
|
|
96
|
-
informRecipient = {
|
|
97
|
-
id: recipient.id,
|
|
98
|
-
name: recipient.name,
|
|
99
|
-
typeOf: recipient.typeOf
|
|
100
|
-
};
|
|
101
|
-
}
|
|
102
|
-
else if (recipient?.typeOf === factory_1.factory.creativeWorkType.WebApplication) {
|
|
91
|
+
if (recipient?.typeOf === factory_1.factory.creativeWorkType.WebApplication) {
|
|
103
92
|
informRecipient = {
|
|
104
93
|
name: recipient.name,
|
|
105
94
|
typeOf: recipient.typeOf
|
|
@@ -139,9 +128,9 @@ function createInformActionAttributes(params) {
|
|
|
139
128
|
project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
|
|
140
129
|
recipient: informRecipient,
|
|
141
130
|
typeOf: factory_1.factory.actionType.InformAction,
|
|
131
|
+
target, // add(2025-02-06~)
|
|
142
132
|
...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
|
|
143
133
|
...(typeof about?.typeOf === 'string') ? { about } : undefined, // add(2025-01-23~)
|
|
144
|
-
...(typeof target?.typeOf === 'string') ? { target } : undefined // add(2025-02-06~)
|
|
145
134
|
};
|
|
146
135
|
};
|
|
147
136
|
}
|
|
@@ -159,7 +148,7 @@ function processInformAction(params, options) {
|
|
|
159
148
|
const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
|
|
160
149
|
const { identifier } = params;
|
|
161
150
|
const informActionAttributes = await createInformActionAttributes(params)(repos);
|
|
162
|
-
const action = await repos.
|
|
151
|
+
const action = await repos.actions.inform.startInformAction(informActionAttributes);
|
|
163
152
|
let result = {};
|
|
164
153
|
try {
|
|
165
154
|
const urlTemplate = informActionAttributes.target?.urlTemplate;
|
|
@@ -226,13 +215,13 @@ function processInformAction(params, options) {
|
|
|
226
215
|
}
|
|
227
216
|
catch (error) {
|
|
228
217
|
try {
|
|
229
|
-
await repos.
|
|
218
|
+
await repos.actions.inform.giveUpInformAction({ typeOf: action.typeOf, id: action.id, error });
|
|
230
219
|
}
|
|
231
220
|
catch (__) {
|
|
232
221
|
// 失敗したら仕方ない
|
|
233
222
|
}
|
|
234
223
|
throw error;
|
|
235
224
|
}
|
|
236
|
-
await repos.
|
|
225
|
+
await repos.actions.inform.completeInformAction({ typeOf: action.typeOf, id: action.id, result: result });
|
|
237
226
|
};
|
|
238
227
|
}
|
|
@@ -2,15 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.processVoidTransaction4chevre = processVoidTransaction4chevre;
|
|
4
4
|
const factory_1 = require("../../../../factory");
|
|
5
|
-
// import type { TransactionRepo } from '../../../../repo/transaction';
|
|
6
5
|
const reserve_1 = require("../../../assetTransaction/reserve");
|
|
7
6
|
function processVoidTransaction4chevre(params) {
|
|
8
7
|
return async (repos, settings) => {
|
|
9
|
-
// const transactionNumber = params.action.object.pendingTransaction?.transactionNumber;
|
|
10
8
|
const transactionNumber = params.action.instrument.transactionNumber;
|
|
11
9
|
if (typeof transactionNumber === 'string') {
|
|
12
10
|
// 取引が存在すれば中止
|
|
13
|
-
const assetTransactions = await repos.assetTransaction.
|
|
11
|
+
const assetTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
|
|
14
12
|
limit: 1,
|
|
15
13
|
page: 1,
|
|
16
14
|
project: { id: { $eq: params.action.project.id } },
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { factory } from '../../../factory';
|
|
2
2
|
import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
|
|
3
3
|
import type { AsyncActionRepo } from '../../../repo/asyncAction';
|
|
4
|
-
import type { TaskRepo } from '../../../repo/task';
|
|
5
4
|
interface IFindAcceptActionResult {
|
|
6
5
|
/**
|
|
7
6
|
* アクションID
|
|
@@ -35,11 +34,8 @@ declare function findAcceptAction(params: {
|
|
|
35
34
|
*/
|
|
36
35
|
id: string;
|
|
37
36
|
};
|
|
38
|
-
}, options: {
|
|
39
|
-
useAsyncAction: boolean;
|
|
40
37
|
}): (repos: {
|
|
41
38
|
action: AcceptCOAOfferActionRepo;
|
|
42
39
|
asyncAction: AsyncActionRepo;
|
|
43
|
-
task: TaskRepo;
|
|
44
40
|
}) => Promise<IFindAcceptActionResult>;
|
|
45
41
|
export { findAcceptAction };
|
|
@@ -2,27 +2,27 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findAcceptAction = findAcceptAction;
|
|
4
4
|
const factory_1 = require("../../../factory");
|
|
5
|
-
function findAcceptAction(params
|
|
5
|
+
function findAcceptAction(params) {
|
|
6
6
|
return async (repos) => {
|
|
7
7
|
// 非同期アクションに対応(2026-07-27~)
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
//
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
8
|
+
// let task: Pick<factory.task.acceptCOAOffer.ITask, 'id' | 'status' | 'executionResults'> | undefined;
|
|
9
|
+
// まず非同期アクションを参照
|
|
10
|
+
const task = await repos.asyncAction.findAsyncActionById({
|
|
11
|
+
id: { $eq: params.sameAs.id },
|
|
12
|
+
project: { id: { $eq: params.project.id } },
|
|
13
|
+
name: factory_1.factory.taskName.AcceptCOAOffer
|
|
14
|
+
}, ['status', 'executionResults']);
|
|
15
|
+
// // 非同期アクションが存在しなければタスクを参照
|
|
16
|
+
// if (task === undefined) {
|
|
17
|
+
// task = await repos.task.findTaskById(
|
|
18
|
+
// {
|
|
19
|
+
// id: { $eq: params.sameAs.id },
|
|
20
|
+
// project: { id: { $eq: params.project.id } },
|
|
21
|
+
// name: factory.taskName.AcceptCOAOffer
|
|
22
|
+
// },
|
|
23
|
+
// ['status', 'executionResults']
|
|
24
|
+
// );
|
|
25
|
+
// }
|
|
26
26
|
if (task === undefined) {
|
|
27
27
|
throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AcceptCOAOffer);
|
|
28
28
|
}
|
|
@@ -203,7 +203,6 @@ function createInformTasks(params, setting) {
|
|
|
203
203
|
const informActionAttributes = {
|
|
204
204
|
object: event4inform,
|
|
205
205
|
recipient: {
|
|
206
|
-
id: '',
|
|
207
206
|
name: String(informEvent.recipient?.name),
|
|
208
207
|
typeOf: factory_1.factory.creativeWorkType.WebApplication
|
|
209
208
|
// url: informUrl // discontinue(2025-02-13~)
|
|
@@ -257,7 +256,6 @@ function createInform2aggTasks(params, setting) {
|
|
|
257
256
|
const informActionAttributes = {
|
|
258
257
|
object: informObject,
|
|
259
258
|
recipient: {
|
|
260
|
-
id: '',
|
|
261
259
|
name: String(informEvent.recipient?.name),
|
|
262
260
|
typeOf: factory_1.factory.creativeWorkType.WebApplication
|
|
263
261
|
// url: informUrl // discontinue(2025-02-13~)
|
|
@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.confirmPayTransaction = confirmPayTransaction;
|
|
37
|
+
const util_1 = require("util");
|
|
37
38
|
const factory_1 = require("../../factory");
|
|
38
39
|
// import type { TransactionRepo } from '../../repo/transaction';
|
|
39
40
|
const PayTransactionService = __importStar(require("../assetTransaction/pay"));
|
|
@@ -112,7 +113,9 @@ function onConfirmed(params) {
|
|
|
112
113
|
},
|
|
113
114
|
useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
|
|
114
115
|
};
|
|
116
|
+
const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', params.project.id, factory_1.factory.taskName.OnAssetTransactionStatusChanged, onAssetTransactionStatusChangedTaskData.purpose.orderNumber, onAssetTransactionStatusChangedTaskData.object.transactionNumber);
|
|
115
117
|
const onAssetTransactionStatusChangedTask = {
|
|
118
|
+
identifier: taskIdentifier,
|
|
116
119
|
project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
|
|
117
120
|
name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
|
|
118
121
|
status: factory_1.factory.taskStatus.Ready,
|
|
@@ -122,7 +125,7 @@ function onConfirmed(params) {
|
|
|
122
125
|
executionResults: [],
|
|
123
126
|
data: onAssetTransactionStatusChangedTaskData
|
|
124
127
|
};
|
|
125
|
-
await repos.task.
|
|
128
|
+
await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
|
|
126
129
|
}
|
|
127
130
|
}
|
|
128
131
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AccountingReportRepo } from '../../repo/accountingReport';
|
|
2
2
|
import { factory } from '../../factory';
|
|
3
|
-
export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'paymentMethods' | 'seller' | 'typeOf' | 'orderDate'>
|
|
3
|
+
export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'paymentMethods' | 'seller' | 'typeOf' | 'orderDate'>): (repos: {
|
|
4
4
|
accountingReport: AccountingReportRepo;
|
|
5
5
|
}) => Promise<void>;
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
|
|
7
|
-
const
|
|
7
|
+
const moment_1 = __importDefault(require("moment"));
|
|
8
8
|
const factory_1 = require("../../factory");
|
|
9
9
|
function createAccountingReportIfNotExist(params) {
|
|
10
10
|
return async (repos) => {
|
|
@@ -17,61 +17,7 @@ function createAccountingReportIfNotExist(params) {
|
|
|
17
17
|
await repos.accountingReport.syncMainEntity(accountingReport);
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
|
-
// 最適化(2023-06-30~)
|
|
21
20
|
function createOrder4report(params) {
|
|
22
|
-
// if (!Array.isArray(params.acceptedOffers)) {
|
|
23
|
-
// throw new factory.errors.ArgumentNull('order.acceptedOffers');
|
|
24
|
-
// }
|
|
25
|
-
// const numItems: number = params.acceptedOffers.length;
|
|
26
|
-
// // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
|
|
27
|
-
// const acceptedOffers = (Array.isArray(params.acceptedOffers))
|
|
28
|
-
// ? params.acceptedOffers.map((o) => {
|
|
29
|
-
// if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
|
|
30
|
-
// let itemOffered = o.itemOffered;
|
|
31
|
-
// const reservationFor = itemOffered.reservationFor;
|
|
32
|
-
// itemOffered = {
|
|
33
|
-
// ...itemOffered,
|
|
34
|
-
// reservationFor: {
|
|
35
|
-
// ...reservationFor,
|
|
36
|
-
// ...(reservationFor.doorTime !== undefined)
|
|
37
|
-
// ? {
|
|
38
|
-
// doorTime: moment(reservationFor.doorTime)
|
|
39
|
-
// .toDate()
|
|
40
|
-
// }
|
|
41
|
-
// : undefined,
|
|
42
|
-
// ...(reservationFor.endDate !== undefined)
|
|
43
|
-
// ? {
|
|
44
|
-
// endDate: moment(reservationFor.endDate)
|
|
45
|
-
// .toDate()
|
|
46
|
-
// }
|
|
47
|
-
// : undefined,
|
|
48
|
-
// ...(reservationFor.startDate !== undefined)
|
|
49
|
-
// ? {
|
|
50
|
-
// startDate: moment(reservationFor.startDate)
|
|
51
|
-
// .toDate()
|
|
52
|
-
// }
|
|
53
|
-
// : undefined
|
|
54
|
-
// }
|
|
55
|
-
// } as factory.order.IReservation;
|
|
56
|
-
// return {
|
|
57
|
-
// ...o,
|
|
58
|
-
// itemOffered
|
|
59
|
-
// };
|
|
60
|
-
// } else {
|
|
61
|
-
// return o;
|
|
62
|
-
// }
|
|
63
|
-
// })
|
|
64
|
-
// : [];
|
|
65
|
-
// const customer: factory.report.accountingReport.IOptimizedCustomer = {
|
|
66
|
-
// id: params.customer.id,
|
|
67
|
-
// typeOf: params.customer.typeOf,
|
|
68
|
-
// additionalProperty: (Array.isArray(params.customer.additionalProperty))
|
|
69
|
-
// ? params.customer.additionalProperty
|
|
70
|
-
// : [],
|
|
71
|
-
// identifier: (Array.isArray(params.customer.identifier))
|
|
72
|
-
// ? params.customer.identifier
|
|
73
|
-
// : []
|
|
74
|
-
// };
|
|
75
21
|
return {
|
|
76
22
|
id: params.id,
|
|
77
23
|
orderNumber: params.orderNumber,
|
|
@@ -82,7 +28,7 @@ function createOrder4report(params) {
|
|
|
82
28
|
typeOf: params.seller.typeOf
|
|
83
29
|
},
|
|
84
30
|
typeOf: params.typeOf,
|
|
85
|
-
orderDate: (0,
|
|
31
|
+
orderDate: (0, moment_1.default)(params.orderDate)
|
|
86
32
|
.toDate(),
|
|
87
33
|
// confirmationNumber: params.confirmationNumber, // discontinue(2026-05-06~)
|
|
88
34
|
// price: params.price, // discontinue(2026-05-06~)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
|
|
2
2
|
import type { AccountingReportRepo } from '../../repo/accountingReport';
|
|
3
|
-
import type { IDeleteActionResult,
|
|
3
|
+
import type { IDeleteActionResult, AdminActionRepo } from '../../repo/adminAction';
|
|
4
4
|
import type { NoteRepo } from '../../repo/note';
|
|
5
5
|
import type { OrderRepo } from '../../repo/order';
|
|
6
6
|
import type { ReservationRepo } from '../../repo/reservation';
|
|
@@ -18,7 +18,7 @@ declare function deleteOrder(params: {
|
|
|
18
18
|
}): (repos: {
|
|
19
19
|
acceptedOffer: AcceptedOfferRepo;
|
|
20
20
|
accountingReport: AccountingReportRepo;
|
|
21
|
-
|
|
21
|
+
adminAction: AdminActionRepo;
|
|
22
22
|
note: NoteRepo;
|
|
23
23
|
order: OrderRepo;
|
|
24
24
|
reservation: ReservationRepo;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deleteOrder = deleteOrder;
|
|
4
|
-
// import { createOwnershipInfosFromOrder } from '../delivery/factory';
|
|
5
4
|
const factory_1 = require("../../factory");
|
|
6
5
|
/**
|
|
7
6
|
* 注文に関わるリソースを削除する
|
|
@@ -45,7 +44,7 @@ function deleteOrder(params) {
|
|
|
45
44
|
}
|
|
46
45
|
});
|
|
47
46
|
// アクション削除(2026-07-10~)
|
|
48
|
-
deleteActionsResult = await repos.
|
|
47
|
+
deleteActionsResult = await repos.adminAction.deleteActionsByOrderNumber({
|
|
49
48
|
orderNumber: order.orderNumber,
|
|
50
49
|
project: { id: order.project.id },
|
|
51
50
|
});
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// import createDebug from 'debug';
|
|
3
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
3
|
exports.isDeliverable = isDeliverable;
|
|
5
4
|
const factory_1 = require("../../../factory");
|
|
6
|
-
// const debug = createDebug('chevre-domain:service:order');
|
|
7
5
|
function isDeliverable(params) {
|
|
8
6
|
return async (repos) => {
|
|
9
7
|
let allReserveTransactionConfirmed = false;
|
|
@@ -15,7 +13,7 @@ function isDeliverable(params) {
|
|
|
15
13
|
// 注文のreservationNumberを取得
|
|
16
14
|
const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
|
|
17
15
|
if (reservationNumbers.length > 0) {
|
|
18
|
-
const referencedReserveTransactions = await repos.assetTransaction.
|
|
16
|
+
const referencedReserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
|
|
19
17
|
project: { id: { $eq: params.project.id } },
|
|
20
18
|
typeOf: factory_1.factory.assetTransactionType.Reserve,
|
|
21
19
|
transactionNumber: { $in: reservationNumbers }
|
|
@@ -27,52 +25,6 @@ function isDeliverable(params) {
|
|
|
27
25
|
else {
|
|
28
26
|
allReserveTransactionConfirmed = true;
|
|
29
27
|
}
|
|
30
|
-
// } else if (params.assetTransactionType === factory.assetTransactionType.MoneyTransfer) {
|
|
31
|
-
// allReserveTransactionConfirmed = true;
|
|
32
|
-
// allRegisterServiceTransactionConfirmed = true;
|
|
33
|
-
// // 注文のMoneyTransferTransaction.transactionNumberを取得
|
|
34
|
-
// const moneyTransferTransactionNumbers = await repos.acceptedOffer.distinctValues(
|
|
35
|
-
// { orderNumber: { $in: [params.orderNumber] } },
|
|
36
|
-
// 'acceptedOffers.serialNumber'
|
|
37
|
-
// );
|
|
38
|
-
// if (moneyTransferTransactionNumbers.length > 0) {
|
|
39
|
-
// debug('is deliverable?...', params.orderNumber, 'moneyTransferTransactionNumbers:', moneyTransferTransactionNumbers);
|
|
40
|
-
// const referencedMoneyTransferTransactions = await repos.assetTransaction.search(
|
|
41
|
-
// {
|
|
42
|
-
// project: { id: { $eq: params.project.id } },
|
|
43
|
-
// typeOf: factory.assetTransactionType.MoneyTransfer,
|
|
44
|
-
// transactionNumber: { $in: moneyTransferTransactionNumbers }
|
|
45
|
-
// },
|
|
46
|
-
// ['status']
|
|
47
|
-
// ) as Pick<factory.assetTransaction.moneyTransfer.ITransaction, 'status'>[];
|
|
48
|
-
// allMoneyTransferTransactionConfirmed =
|
|
49
|
-
// referencedMoneyTransferTransactions.length === moneyTransferTransactionNumbers.length
|
|
50
|
-
// && referencedMoneyTransferTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
|
|
51
|
-
// } else {
|
|
52
|
-
// allMoneyTransferTransactionConfirmed = true;
|
|
53
|
-
// }
|
|
54
|
-
// } else if (params.assetTransactionType === factory.assetTransactionType.RegisterService) {
|
|
55
|
-
// allReserveTransactionConfirmed = true;
|
|
56
|
-
// allMoneyTransferTransactionConfirmed = true;
|
|
57
|
-
// const registerServiceTransactionNumbers = await repos.acceptedOffer.distinctValues(
|
|
58
|
-
// { orderNumber: { $in: [params.orderNumber] } },
|
|
59
|
-
// 'acceptedOffers.serialNumber'
|
|
60
|
-
// );
|
|
61
|
-
// if (registerServiceTransactionNumbers.length > 0) {
|
|
62
|
-
// const referencedRegisterServiceTransactions = await repos.assetTransaction.search(
|
|
63
|
-
// {
|
|
64
|
-
// project: { id: { $eq: params.project.id } },
|
|
65
|
-
// typeOf: factory.assetTransactionType.RegisterService,
|
|
66
|
-
// transactionNumber: { $in: registerServiceTransactionNumbers }
|
|
67
|
-
// },
|
|
68
|
-
// ['status']
|
|
69
|
-
// ) as Pick<factory.assetTransaction.registerService.ITransaction, 'status'>[];
|
|
70
|
-
// allRegisterServiceTransactionConfirmed =
|
|
71
|
-
// referencedRegisterServiceTransactions.length === registerServiceTransactionNumbers.length
|
|
72
|
-
// && referencedRegisterServiceTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
|
|
73
|
-
// } else {
|
|
74
|
-
// allRegisterServiceTransactionConfirmed = true;
|
|
75
|
-
// }
|
|
76
28
|
}
|
|
77
29
|
return allReserveTransactionConfirmed && allMoneyTransferTransactionConfirmed && allRegisterServiceTransactionConfirmed;
|
|
78
30
|
};
|
package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.js
CHANGED
|
@@ -36,7 +36,7 @@ function onPayTransactionConfirmed(params) {
|
|
|
36
36
|
}
|
|
37
37
|
function fixPaymentMethodIdentifierIfPossible(params) {
|
|
38
38
|
return async (repos) => {
|
|
39
|
-
const referencedPayTransactions = await repos.assetTransaction.
|
|
39
|
+
const referencedPayTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
|
|
40
40
|
project: { id: { $eq: params.project.id } },
|
|
41
41
|
typeOf: factory_1.factory.assetTransactionType.Pay,
|
|
42
42
|
statuses: [factory_1.factory.transactionStatusType.Confirmed],
|
|
@@ -73,7 +73,7 @@ function isProcessable(params) {
|
|
|
73
73
|
const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
|
|
74
74
|
.map((invoice) => invoice.paymentMethodId);
|
|
75
75
|
if (paymentMethodIds.length > 0) {
|
|
76
|
-
const referencedPayTransactions = await repos.assetTransaction.
|
|
76
|
+
const referencedPayTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
|
|
77
77
|
project: { id: { $eq: params.project.id } },
|
|
78
78
|
typeOf: factory_1.factory.assetTransactionType.Pay,
|
|
79
79
|
transactionNumber: { $in: paymentMethodIds }
|
|
@@ -12,16 +12,14 @@ setting) {
|
|
|
12
12
|
const order4inform = creteOrder4inform(order);
|
|
13
13
|
const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
|
|
14
14
|
if (Array.isArray(informOrder) && informOrder.length > 0) {
|
|
15
|
-
let recipientId = '';
|
|
16
|
-
recipientId = order.customer.id;
|
|
15
|
+
// let recipientId = '';
|
|
16
|
+
// recipientId = order.customer.id;
|
|
17
17
|
informOrder.forEach((informOrderParams) => {
|
|
18
18
|
if (typeof informOrderParams.recipient?.url === 'string') {
|
|
19
19
|
const informActionAttributes = {
|
|
20
20
|
about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
|
|
21
21
|
object: order4inform,
|
|
22
22
|
recipient: {
|
|
23
|
-
// url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
|
|
24
|
-
id: recipientId,
|
|
25
23
|
name: informOrderParams.recipient?.name,
|
|
26
24
|
typeOf: factory_1.factory.creativeWorkType.WebApplication
|
|
27
25
|
},
|
|
@@ -25,16 +25,14 @@ setting) {
|
|
|
25
25
|
const order4inform = creteOrder4inform(order);
|
|
26
26
|
const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}:${order.acceptedOffers.page}`;
|
|
27
27
|
if (Array.isArray(informOrder) && informOrder.length > 0) {
|
|
28
|
-
let recipientId = '';
|
|
29
|
-
recipientId = order.customer.id;
|
|
28
|
+
// let recipientId = '';
|
|
29
|
+
// recipientId = order.customer.id;
|
|
30
30
|
informOrder.forEach((informOrderParams) => {
|
|
31
31
|
if (typeof informOrderParams.recipient?.url === 'string') {
|
|
32
32
|
const informActionAttributes = {
|
|
33
33
|
about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
|
|
34
34
|
object: order4inform,
|
|
35
35
|
recipient: {
|
|
36
|
-
// url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
|
|
37
|
-
id: recipientId,
|
|
38
36
|
name: informOrderParams.recipient?.name,
|
|
39
37
|
typeOf: factory_1.factory.creativeWorkType.WebApplication
|
|
40
38
|
},
|
|
@@ -62,7 +62,7 @@ function createSendOrderTaskIfNotExist(params) {
|
|
|
62
62
|
};
|
|
63
63
|
const taskIdentifier = `${sendOrderTaskData.project.id}:${factory_1.factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
|
|
64
64
|
const sendOrderTask = {
|
|
65
|
-
alternateName: taskIdentifier,
|
|
65
|
+
// alternateName: taskIdentifier,
|
|
66
66
|
identifier: taskIdentifier,
|
|
67
67
|
project: params.order.project,
|
|
68
68
|
name: factory_1.factory.taskName.SendOrder,
|
|
@@ -75,7 +75,7 @@ function createSendOrderTaskIfNotExist(params) {
|
|
|
75
75
|
};
|
|
76
76
|
debug('processing createSendOrderTaskIfNotExist...', sendOrderTask);
|
|
77
77
|
// await repos.task.createSendOrderTaskIfNotExist(sendOrderTask);
|
|
78
|
-
await repos.task.
|
|
78
|
+
await repos.task.runTaskByIdentifier(sendOrderTask);
|
|
79
79
|
};
|
|
80
80
|
}
|
|
81
81
|
function createOnAuthorizationCreatedTask(order) {
|
|
@@ -92,7 +92,7 @@ function createOnAuthorizationCreatedTask(order) {
|
|
|
92
92
|
const taskRunsAt = new Date();
|
|
93
93
|
const taskIdentifier = `${order.project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.transactionType.PlaceOrder}:${placeOrderTransaction?.id}`;
|
|
94
94
|
const task = {
|
|
95
|
-
alternateName: taskIdentifier,
|
|
95
|
+
// alternateName: taskIdentifier,
|
|
96
96
|
identifier: taskIdentifier,
|
|
97
97
|
name: factory_1.factory.taskName.OnAuthorizationCreated,
|
|
98
98
|
status: factory_1.factory.taskStatus.Ready,
|
|
@@ -107,7 +107,7 @@ function createOnAuthorizationCreatedTask(order) {
|
|
|
107
107
|
},
|
|
108
108
|
project: { id: order.project.id, typeOf: factory_1.factory.organizationType.Project }
|
|
109
109
|
};
|
|
110
|
-
await repos.task.
|
|
110
|
+
await repos.task.runTaskByIdentifier(task);
|
|
111
111
|
}
|
|
112
112
|
};
|
|
113
113
|
}
|
|
@@ -53,7 +53,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
|
|
|
53
53
|
};
|
|
54
54
|
const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmPayTransaction, data.purpose.typeOf, data.purpose.orderNumber, factory_1.factory.assetTransactionType.Pay, invoice.paymentMethodId);
|
|
55
55
|
const confirmPayTransactionTask = {
|
|
56
|
-
alternateName: taskIdentifier,
|
|
56
|
+
// alternateName: taskIdentifier,
|
|
57
57
|
identifier: taskIdentifier,
|
|
58
58
|
project: order.project,
|
|
59
59
|
name: factory_1.factory.taskName.ConfirmPayTransaction,
|
|
@@ -64,7 +64,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
|
|
|
64
64
|
executionResults: [],
|
|
65
65
|
data
|
|
66
66
|
};
|
|
67
|
-
await repos.task.
|
|
67
|
+
await repos.task.runTaskByIdentifier(confirmPayTransactionTask);
|
|
68
68
|
// 冗長なタスク作成を回避
|
|
69
69
|
// const existingTasks = await repos.task.projectFields(
|
|
70
70
|
// {
|
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.createSendEmailMessageTaskIfNotExist = createSendEmailMessageTaskIfNotExist;
|
|
7
|
-
const debug_1 = __importDefault(require("debug"));
|
|
8
4
|
const util_1 = require("util");
|
|
9
5
|
const factory_1 = require("../../../../factory");
|
|
10
|
-
const debug = (0, debug_1.default)('chevre-domain:service:order');
|
|
11
6
|
function createSendEmailMessageTaskIfNotExist(params) {
|
|
12
7
|
return async (repos) => {
|
|
13
8
|
const sendEmailMessageActions = params.sendEmailMessage;
|
|
@@ -19,12 +14,10 @@ function createSendEmailMessageTaskIfNotExist(params) {
|
|
|
19
14
|
about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } },
|
|
20
15
|
mainEntity: { orderNumber: { $eq: params.order.orderNumber } }
|
|
21
16
|
}, ['identifier'])).shift();
|
|
22
|
-
debug('createSendEmailMessageTaskIfNotExist: message4order:', JSON.stringify(message4order));
|
|
23
17
|
if (typeof message4order?.identifier === 'string') {
|
|
24
18
|
// 取引のpotentialActionsが存在する間は、メッセージ識別子が想定通りか確認する
|
|
25
19
|
const messageIdentifierByTransaction = sendEmailMessageActions?.at(0)?.object.identifier;
|
|
26
20
|
if (typeof messageIdentifierByTransaction === 'string') {
|
|
27
|
-
debug('createSendEmailMessageTaskIfNotExist: identifier matched?', message4order.identifier, messageIdentifierByTransaction);
|
|
28
21
|
if (message4order.identifier !== messageIdentifierByTransaction) {
|
|
29
22
|
throw new factory_1.factory.errors.Internal(`message identifier not matched. ${message4order.identifier} ${messageIdentifierByTransaction}`);
|
|
30
23
|
}
|
|
@@ -44,11 +37,10 @@ function createSendEmailMessageTaskIfNotExist(params) {
|
|
|
44
37
|
typeOf: factory_1.factory.creativeWorkType.EmailMessage
|
|
45
38
|
},
|
|
46
39
|
agent: params.order.project,
|
|
47
|
-
recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
|
|
48
40
|
purpose: simpleOrder
|
|
49
41
|
};
|
|
50
42
|
const sendEmailMessageTask = {
|
|
51
|
-
alternateName: taskIdentifier,
|
|
43
|
+
// alternateName: taskIdentifier,
|
|
52
44
|
identifier: taskIdentifier,
|
|
53
45
|
project: params.order.project,
|
|
54
46
|
name: factory_1.factory.taskName.SendEmailMessage,
|
|
@@ -59,7 +51,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
|
|
|
59
51
|
executionResults: [],
|
|
60
52
|
data: { actionAttributes }
|
|
61
53
|
};
|
|
62
|
-
await repos.task.
|
|
54
|
+
await repos.task.runTaskByIdentifier(sendEmailMessageTask);
|
|
63
55
|
}
|
|
64
56
|
};
|
|
65
57
|
}
|
|
@@ -5,8 +5,8 @@ type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broke
|
|
|
5
5
|
numAcceptedOffers: number;
|
|
6
6
|
orderStatus: factory.orderStatus.OrderProcessing;
|
|
7
7
|
};
|
|
8
|
-
type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, '
|
|
9
|
-
alternateName
|
|
8
|
+
type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, 'data' | 'executionResults' | 'identifier' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
|
|
9
|
+
alternateName?: never;
|
|
10
10
|
identifier: string;
|
|
11
11
|
};
|
|
12
12
|
type ICreatingInformProcessingOrderTask = Pick<factory.task.IAttributes<factory.taskName.TriggerWebhook>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>;
|
|
@@ -15,16 +15,14 @@ function createInformProcessingOrderTasks(order, setting) {
|
|
|
15
15
|
const order4inform = creteProcessingOrderAsNotification(order);
|
|
16
16
|
const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
|
|
17
17
|
if (Array.isArray(informOrder) && informOrder.length > 0) {
|
|
18
|
-
let recipientId = '';
|
|
19
|
-
recipientId = order.customer.id;
|
|
18
|
+
// let recipientId = '';
|
|
19
|
+
// recipientId = order.customer.id;
|
|
20
20
|
informOrder.forEach((informOrderParams) => {
|
|
21
21
|
if (typeof informOrderParams.recipient?.url === 'string') {
|
|
22
22
|
const informActionAttributes = {
|
|
23
23
|
about: { orderNumber: order.orderNumber, typeOf: factory_1.factory.order.OrderType.Order },
|
|
24
24
|
object: order4inform,
|
|
25
25
|
recipient: {
|
|
26
|
-
// url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
|
|
27
|
-
id: recipientId,
|
|
28
26
|
name: informOrderParams.recipient?.name,
|
|
29
27
|
typeOf: factory_1.factory.creativeWorkType.WebApplication
|
|
30
28
|
},
|
|
@@ -136,13 +134,11 @@ function createCheckResourceTask(order) {
|
|
|
136
134
|
object: {
|
|
137
135
|
orderNumber: order.orderNumber,
|
|
138
136
|
typeOf: order.typeOf
|
|
139
|
-
}
|
|
140
|
-
// project: order.project,
|
|
141
|
-
typeOf: factory_1.factory.actionType.CheckAction
|
|
137
|
+
}
|
|
142
138
|
};
|
|
143
139
|
const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.CheckResource, order.typeOf, order.orderNumber);
|
|
144
140
|
return {
|
|
145
|
-
alternateName: taskIdentifier, // add identifier(2025-03-29~)
|
|
141
|
+
// alternateName: taskIdentifier, // add identifier(2025-03-29~)
|
|
146
142
|
identifier: taskIdentifier, // add identifier(2025-03-29~)
|
|
147
143
|
project: order.project,
|
|
148
144
|
name: factory_1.factory.taskName.CheckResource,
|
|
@@ -50,7 +50,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
|
|
|
50
50
|
};
|
|
51
51
|
const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
|
|
52
52
|
const confirmReserveTransactionTask = {
|
|
53
|
-
alternateName: taskIdentifier,
|
|
53
|
+
// alternateName: taskIdentifier,
|
|
54
54
|
identifier: taskIdentifier,
|
|
55
55
|
project: order.project,
|
|
56
56
|
name: factory_1.factory.taskName.ConfirmReserveTransaction,
|
|
@@ -61,7 +61,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
|
|
|
61
61
|
executionResults: [],
|
|
62
62
|
data
|
|
63
63
|
};
|
|
64
|
-
await repos.task.
|
|
64
|
+
await repos.task.runTaskByIdentifier(confirmReserveTransactionTask);
|
|
65
65
|
if (options.force === true) {
|
|
66
66
|
const existingTask = await repos.task.findByIdentifier({
|
|
67
67
|
identifier: taskIdentifier,
|
|
@@ -37,7 +37,7 @@ function onOrderProcessing(params) {
|
|
|
37
37
|
await repos.task.saveMany(tasks);
|
|
38
38
|
// uniqueness of CheckResource task(2025-03-29~)
|
|
39
39
|
if (creatingCheckResourceTask !== undefined) {
|
|
40
|
-
await repos.task.
|
|
40
|
+
await repos.task.runTaskByIdentifier(creatingCheckResourceTask);
|
|
41
41
|
}
|
|
42
42
|
switch (params.order.orderStatus) {
|
|
43
43
|
case factory_1.factory.orderStatus.OrderProcessing:
|