@chevre/domain 22.11.0-alpha.4 → 22.11.0-alpha.40
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/aggregation/aggregateOrderOfCustomer.ts +21 -10
- package/example/src/chevre/aggregation/aggregateTasks.ts +41 -0
- package/example/src/chevre/assetTransaction/processReserve.ts +0 -1
- package/example/src/chevre/checkCustomerAttributesLength.ts +109 -0
- package/example/src/chevre/notifyAbortedTasksByEmail.ts +1 -1
- package/example/src/chevre/reIndex.ts +1 -1
- package/example/src/chevre/roles/addAdminPermissionIfNotExists.ts +132 -0
- package/example/src/chevre/roles/addDefaultPermissionIfNotExists.ts +37 -0
- package/example/src/chevre/roles/addEventOfferPermissionIfNotExists.ts +27 -0
- package/example/src/chevre/roles/addPermissionIfNotExists.ts +39 -6
- package/example/src/chevre/roles/addProjectCreatorRole.ts +48 -0
- package/example/src/chevre/roles/assignGlobalRoles.ts +72 -0
- package/example/src/chevre/roles/findPermissions.ts +84 -0
- package/example/src/chevre/roles/findRoleNames.ts +117 -0
- package/example/src/chevre/roles/removeConsolePermissionIfExists.ts +38 -0
- package/example/src/chevre/roles/removePermissionFromAPIRoles.ts +46 -0
- package/example/src/chevre/roles/removePermissionIfExists.ts +39 -0
- package/example/src/chevre/searchEventSeats.ts +1 -1
- package/example/src/chevre/searchProducts.ts +28 -0
- package/example/src/chevre/settings/addSettings.ts +31 -17
- package/example/src/chevre/task/countPotentiallyRunning.ts +41 -0
- package/example/src/chevre/task/countTasks.ts +51 -0
- package/example/src/chevre/{deleteRunsAtPassedCertainPeriod.ts → task/deleteRunsAtPassedCertainPeriod.ts} +4 -3
- package/example/src/chevre/task/deleteUnexpectedTasks.ts +23 -0
- package/example/src/chevre/task/emitRunning.ts +89 -0
- package/example/src/chevre/unsetUnnecessaryFields.ts +8 -5
- package/example/src/idaas/auth0/adminApplications.ts +183 -0
- package/example/src/idaas/auth0/getToken.ts +55 -0
- package/example/src/idaas/auth0/getTokenByPrivateKeyJWT.ts +84 -0
- package/example/src/regex.ts +31 -0
- package/lib/chevre/eventEmitter/task.d.ts +29 -6
- package/lib/chevre/index.d.ts +0 -2
- package/lib/chevre/index.js +0 -10
- package/lib/chevre/repo/confirmationNumber.d.ts +0 -3
- package/lib/chevre/repo/confirmationNumber.js +12 -47
- package/lib/chevre/repo/identity.d.ts +11 -33
- package/lib/chevre/repo/identity.js +10 -15
- package/lib/chevre/repo/member.d.ts +22 -4
- package/lib/chevre/repo/member.js +81 -27
- package/lib/chevre/repo/mongoose/schemas/identity.d.ts +1 -1
- package/lib/chevre/repo/mongoose/schemas/member/global.d.ts +14 -0
- package/lib/chevre/repo/mongoose/schemas/member/global.js +82 -0
- package/lib/chevre/repo/mongoose/schemas/product.js +9 -0
- package/lib/chevre/repo/mongoose/schemas/setting.d.ts +15 -0
- package/lib/chevre/repo/mongoose/schemas/setting.js +1 -0
- package/lib/chevre/repo/mongoose/schemas/task.js +9 -0
- package/lib/chevre/repo/order.d.ts +17 -2
- package/lib/chevre/repo/order.js +47 -8
- package/lib/chevre/repo/orderNumber.d.ts +0 -3
- package/lib/chevre/repo/orderNumber.js +10 -44
- package/lib/chevre/repo/pendingReservation.js +1 -0
- package/lib/chevre/repo/product.js +12 -17
- package/lib/chevre/repo/role.d.ts +16 -4
- package/lib/chevre/repo/role.js +71 -32
- package/lib/chevre/repo/serviceOutputIdentifier.d.ts +0 -3
- package/lib/chevre/repo/serviceOutputIdentifier.js +10 -27
- package/lib/chevre/repo/setting.d.ts +5 -10
- package/lib/chevre/repo/setting.js +4 -7
- package/lib/chevre/repo/stockHolder.d.ts +4 -27
- package/lib/chevre/repo/stockHolder.js +163 -186
- package/lib/chevre/repo/task.d.ts +58 -38
- package/lib/chevre/repo/task.js +126 -296
- package/lib/chevre/repo/transaction.js +10 -10
- package/lib/chevre/repo/transactionNumber.d.ts +0 -3
- package/lib/chevre/repo/transactionNumber.js +10 -44
- package/lib/chevre/repo/transactionNumberCounter.d.ts +0 -10
- package/lib/chevre/repo/transactionNumberCounter.js +34 -29
- package/lib/chevre/service/assetTransaction/cancelReservation/start.d.ts +1 -1
- package/lib/chevre/service/assetTransaction/registerService.js +4 -0
- package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js +19 -16
- package/lib/chevre/service/code.d.ts +5 -28
- package/lib/chevre/service/code.js +3 -79
- package/lib/chevre/service/iam.d.ts +17 -7
- package/lib/chevre/service/iam.js +26 -6
- package/lib/chevre/service/notification/notifyAbortedTasksByEmail.d.ts +15 -0
- package/lib/chevre/service/notification/notifyAbortedTasksByEmail.js +38 -0
- package/lib/chevre/service/notification.d.ts +2 -1
- package/lib/chevre/service/notification.js +3 -1
- package/lib/chevre/service/offer/product.js +4 -0
- package/lib/chevre/service/order/confirmPayTransaction.d.ts +6 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js +3 -3
- package/lib/chevre/service/task/acceptCOAOffer.d.ts +1 -1
- package/lib/chevre/service/task/acceptCOAOffer.js +6 -5
- package/lib/chevre/service/task/aggregateOffers.d.ts +1 -1
- package/lib/chevre/service/task/aggregateOffers.js +1 -1
- package/lib/chevre/service/task/aggregateOnSystem.d.ts +4 -2
- package/lib/chevre/service/task/aggregateScreeningEvent.d.ts +1 -1
- package/lib/chevre/service/task/aggregateScreeningEvent.js +1 -1
- package/lib/chevre/service/task/authorizePayment.d.ts +1 -1
- package/lib/chevre/service/task/authorizePayment.js +7 -6
- package/lib/chevre/service/task/cancelMoneyTransfer.d.ts +1 -1
- package/lib/chevre/service/task/cancelPendingReservation.d.ts +1 -1
- package/lib/chevre/service/task/cancelPendingReservation.js +1 -1
- package/lib/chevre/service/task/cancelReservation.d.ts +1 -1
- package/lib/chevre/service/task/cancelReservation.js +1 -1
- package/lib/chevre/service/task/checkMovieTicket.d.ts +1 -1
- package/lib/chevre/service/task/checkMovieTicket.js +4 -3
- package/lib/chevre/service/task/checkResource.d.ts +1 -1
- package/lib/chevre/service/task/checkResource.js +1 -1
- package/lib/chevre/service/task/confirmMoneyTransfer.d.ts +1 -1
- package/lib/chevre/service/task/confirmPayTransaction.d.ts +2 -2
- package/lib/chevre/service/task/confirmPayTransaction.js +3 -2
- package/lib/chevre/service/task/confirmRegisterService.d.ts +1 -1
- package/lib/chevre/service/task/confirmRegisterServiceTransaction.d.ts +1 -1
- package/lib/chevre/service/task/confirmReserveTransaction.d.ts +6 -2
- package/lib/chevre/service/task/confirmReserveTransaction.js +3 -3
- package/lib/chevre/service/task/createAccountingReport.d.ts +1 -1
- package/lib/chevre/service/task/createEvent.d.ts +1 -1
- package/lib/chevre/service/task/deletePerson.d.ts +1 -1
- package/lib/chevre/service/task/deleteTransaction.d.ts +1 -1
- package/lib/chevre/service/task/givePointAward.d.ts +1 -1
- package/lib/chevre/service/task/givePointAward.js +1 -1
- package/lib/chevre/service/task/handleNotification.d.ts +4 -2
- package/lib/chevre/service/task/importEventCapacitiesFromCOA.d.ts +1 -1
- package/lib/chevre/service/task/importEventsFromCOA.d.ts +1 -1
- package/lib/chevre/service/task/importOffersFromCOA.d.ts +1 -1
- package/lib/chevre/service/task/invalidatePaymentUrl.d.ts +1 -1
- package/lib/chevre/service/task/moneyTransfer.d.ts +1 -1
- package/lib/chevre/service/task/moneyTransfer.js +1 -1
- package/lib/chevre/service/task/onAssetTransactionStatusChanged.d.ts +1 -1
- package/lib/chevre/service/task/onAuthorizationCreated.d.ts +1 -1
- package/lib/chevre/service/task/onEventChanged.d.ts +1 -1
- package/lib/chevre/service/task/onOrderPaymentCompleted.d.ts +1 -1
- package/lib/chevre/service/task/onResourceUpdated.d.ts +1 -1
- package/lib/chevre/service/task/pay.d.ts +1 -1
- package/lib/chevre/service/task/placeOrder.d.ts +1 -1
- package/lib/chevre/service/task/publishPaymentUrl.d.ts +1 -1
- package/lib/chevre/service/task/publishPaymentUrl.js +6 -7
- package/lib/chevre/service/task/refund.d.ts +1 -1
- package/lib/chevre/service/task/refund.js +1 -1
- package/lib/chevre/service/task/registerService.d.ts +1 -1
- package/lib/chevre/service/task/reserve.d.ts +1 -1
- package/lib/chevre/service/task/returnMoneyTransfer.d.ts +1 -1
- package/lib/chevre/service/task/returnMoneyTransfer.js +1 -1
- package/lib/chevre/service/task/returnOrder.d.ts +1 -1
- package/lib/chevre/service/task/returnPayTransaction.d.ts +1 -1
- package/lib/chevre/service/task/returnPayTransaction.js +1 -1
- package/lib/chevre/service/task/returnPointAward.d.ts +1 -1
- package/lib/chevre/service/task/returnPointAward.js +1 -1
- package/lib/chevre/service/task/returnReserveTransaction.d.ts +1 -1
- package/lib/chevre/service/task/returnReserveTransaction.js +1 -1
- package/lib/chevre/service/task/sendEmailMessage.d.ts +1 -1
- package/lib/chevre/service/task/sendOrder.d.ts +1 -1
- package/lib/chevre/service/task/triggerWebhook.d.ts +1 -1
- package/lib/chevre/service/task/useReservation.d.ts +1 -1
- package/lib/chevre/service/task/voidMoneyTransferTransaction.d.ts +1 -1
- package/lib/chevre/service/task/voidPayTransaction.d.ts +1 -1
- package/lib/chevre/service/task/voidPayment.d.ts +1 -1
- package/lib/chevre/service/task/voidRegisterServiceTransaction.d.ts +1 -1
- package/lib/chevre/service/task/voidReserveTransaction.d.ts +1 -1
- package/lib/chevre/service/task/voidReserveTransaction.js +5 -4
- package/lib/chevre/service/task.d.ts +7 -29
- package/lib/chevre/service/task.js +9 -114
- package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.d.ts +11 -0
- package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.js +105 -0
- package/lib/chevre/service/taskHandler/onOperationFailed.d.ts +17 -0
- package/lib/chevre/service/taskHandler/onOperationFailed.js +70 -0
- package/lib/chevre/service/taskHandler.d.ts +26 -0
- package/lib/chevre/service/taskHandler.js +97 -0
- package/lib/chevre/service/validation/validateEvent.d.ts +2 -2
- package/lib/chevre/service/validation/validateEvent.js +16 -10
- package/lib/chevre/service/validation/validateOrder.js +55 -37
- package/lib/chevre/service.d.ts +0 -4
- package/lib/chevre/service.js +10 -14
- package/lib/chevre/settings/aggregation.d.ts +6 -1
- package/lib/chevre/settings/aggregation.js +2 -1
- package/package.json +6 -4
- package/example/src/chevre/adminAuth/adminIdentity.ts +0 -38
- package/example/src/chevre/executeOneTask.ts +0 -41
- package/example/src/chevre/executeTaskIfExists.ts +0 -80
- package/example/src/chevre/findExecutableTask.ts +0 -50
- package/example/src/chevre/findSetting.ts +0 -79
- package/example/src/chevre/roles/addRoleMembers.ts +0 -75
- package/example/src/chevre/searchPermissions.ts +0 -46
- package/example/src/chevre/searchProductOffers.ts +0 -29
- package/example/src/chevre/stockHolder/checkIfConflicted.ts +0 -76
- package/example/src/chevre/stockHolder/checkRedisKeyCount.ts +0 -195
- package/example/src/chevre/stockHolder/migratePendingReservations.ts +0 -96
- package/example/src/chevre/stockHolder/playAroundStockHolder.ts +0 -256
- package/example/src/chevre/transactionNumber/publishConfimationNumber.ts +0 -37
- package/example/src/chevre/transactionNumber/publishOrderNumber.ts +0 -40
- package/example/src/chevre/upsertProductsByProductId.ts +0 -100
- package/lib/chevre/adminAuth.d.ts +0 -2
- package/lib/chevre/adminAuth.js +0 -6
|
@@ -189,6 +189,10 @@ function fixProductAndOffers(params) {
|
|
|
189
189
|
if (product === undefined) {
|
|
190
190
|
throw new factory.errors.NotFound('Product');
|
|
191
191
|
}
|
|
192
|
+
if (product.typeOf !== factory.product.ProductType.MembershipService
|
|
193
|
+
&& product.typeOf !== factory.product.ProductType.PaymentCard) {
|
|
194
|
+
throw new factory.errors.Argument('object.itemOffered.id', `invalid product type: ${product.typeOf}`);
|
|
195
|
+
}
|
|
192
196
|
const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, includedInDataCatalog: { id: '' }, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
|
|
193
197
|
return { product, availableOffers: offers };
|
|
194
198
|
});
|
|
@@ -8,7 +8,12 @@ import type { OrderRepo } from '../../repo/order';
|
|
|
8
8
|
import type { ProjectRepo } from '../../repo/project';
|
|
9
9
|
import type { TaskRepo } from '../../repo/task';
|
|
10
10
|
import type { TransactionRepo } from '../../repo/transaction';
|
|
11
|
-
declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction
|
|
11
|
+
declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction> & {
|
|
12
|
+
project: {
|
|
13
|
+
id: string;
|
|
14
|
+
typeOf: factory.organizationType.Project;
|
|
15
|
+
};
|
|
16
|
+
}, options: {}): (repos: {
|
|
12
17
|
acceptedOffer: AcceptedOfferRepo;
|
|
13
18
|
action: ActionRepo;
|
|
14
19
|
assetTransaction: AssetTransactionRepo;
|
|
@@ -60,14 +60,14 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
|
|
|
60
60
|
}
|
|
61
61
|
yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
|
|
62
62
|
const data = {
|
|
63
|
-
project: order.project,
|
|
63
|
+
// project: order.project, // discontinue(2025-08-20~)
|
|
64
64
|
typeOf: factory.actionType.ConfirmAction,
|
|
65
65
|
object: confirmObject,
|
|
66
|
-
agent: order.project,
|
|
66
|
+
// agent: order.project, // discontinue(2025-08-20~)
|
|
67
67
|
purpose: simpleOrder
|
|
68
68
|
// instrument廃止(2024-03-13~)
|
|
69
69
|
};
|
|
70
|
-
const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s',
|
|
70
|
+
const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', order.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
|
|
71
71
|
const confirmReserveTransactionTask = {
|
|
72
72
|
alternateName: taskIdentifier,
|
|
73
73
|
identifier: taskIdentifier,
|
|
@@ -19,7 +19,7 @@ const orderNumber_1 = require("../../repo/orderNumber");
|
|
|
19
19
|
const project_1 = require("../../repo/project");
|
|
20
20
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
21
21
|
const transaction_1 = require("../../repo/transaction");
|
|
22
|
-
|
|
22
|
+
// import { TransactionProcessRepo } from '../../repo/transactionProcess';
|
|
23
23
|
const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
|
|
24
24
|
let coaAuthClient;
|
|
25
25
|
/**
|
|
@@ -62,7 +62,7 @@ function call(params) {
|
|
|
62
62
|
coaAuthClient = new COA.auth.RefreshToken(Object.assign(Object.assign({}, credentials), (credentialsRepo !== undefined) ? { credentialsRepo } : undefined));
|
|
63
63
|
}
|
|
64
64
|
const actionRepo = new action_1.ActionRepo(connection);
|
|
65
|
-
const transactionProcessRepo = new
|
|
65
|
+
// const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
|
|
66
66
|
try {
|
|
67
67
|
const reserveService = new COA.service.Reserve({
|
|
68
68
|
endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
|
|
@@ -86,7 +86,7 @@ function call(params) {
|
|
|
86
86
|
})({
|
|
87
87
|
action: actionRepo,
|
|
88
88
|
event: new event_1.EventRepo(connection),
|
|
89
|
-
orderNumber: new orderNumber_1.OrderNumberRepo({
|
|
89
|
+
orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
|
|
90
90
|
project: new project_1.ProjectRepo(connection),
|
|
91
91
|
transaction: new transaction_1.TransactionRepo(connection),
|
|
92
92
|
reserveService,
|
|
@@ -104,7 +104,7 @@ function call(params) {
|
|
|
104
104
|
})({
|
|
105
105
|
action: actionRepo,
|
|
106
106
|
event: new event_1.EventRepo(connection),
|
|
107
|
-
orderNumber: new orderNumber_1.OrderNumberRepo({
|
|
107
|
+
orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
|
|
108
108
|
project: new project_1.ProjectRepo(connection),
|
|
109
109
|
transaction: new transaction_1.TransactionRepo(connection),
|
|
110
110
|
reserveService,
|
|
@@ -128,8 +128,9 @@ function call(params) {
|
|
|
128
128
|
}
|
|
129
129
|
}
|
|
130
130
|
finally {
|
|
131
|
+
// taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
|
|
131
132
|
// 取引プロセスロック解除
|
|
132
|
-
|
|
133
|
+
// await transactionProcessRepo.unlock({ typeOf: factory.transactionType.PlaceOrder, id: params.data.purpose.id });
|
|
133
134
|
}
|
|
134
135
|
});
|
|
135
136
|
}
|
|
@@ -32,7 +32,7 @@ function call(data) {
|
|
|
32
32
|
yield (0, aggregateOffers_1.aggregateOffers)(data)({
|
|
33
33
|
aggregateReservation: new aggregateReservation_1.AggregateReservationRepo(connection),
|
|
34
34
|
event: new event_1.EventRepo(connection),
|
|
35
|
-
stockHolder: new stockHolder_1.StockHolderRepo(
|
|
35
|
+
stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
|
|
36
36
|
offer: new unitPriceInCatalog_1.OfferRepo(connection),
|
|
37
37
|
offerCatalog: new offerCatalog_1.OfferCatalogRepo(connection),
|
|
38
38
|
offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import * as factory from '../../factory';
|
|
2
|
-
import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../
|
|
3
|
-
export declare function call(params: Pick<factory.task.aggregateOnSystem.ITask, IExecutableTaskKeys>
|
|
2
|
+
import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
|
|
3
|
+
export declare function call(params: Pick<factory.task.aggregateOnSystem.ITask, IExecutableTaskKeys> & {
|
|
4
|
+
status: factory.taskStatus.Running;
|
|
5
|
+
}): IOperationExecute<ICallResult>;
|
|
@@ -32,7 +32,7 @@ function call(data) {
|
|
|
32
32
|
}
|
|
33
33
|
yield AggregationService.event.aggregateScreeningEvent(data)({
|
|
34
34
|
event: new event_1.EventRepo(connection),
|
|
35
|
-
stockHolder: new stockHolder_1.StockHolderRepo(
|
|
35
|
+
stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
|
|
36
36
|
offer: new unitPriceInCatalog_1.OfferRepo(connection),
|
|
37
37
|
offerCatalog: new offerCatalog_1.OfferCatalogRepo(connection),
|
|
38
38
|
offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
|
|
@@ -29,7 +29,7 @@ const task_1 = require("../../repo/task");
|
|
|
29
29
|
const ticket_1 = require("../../repo/ticket");
|
|
30
30
|
const transaction_1 = require("../../repo/transaction");
|
|
31
31
|
const transactionNumber_1 = require("../../repo/transactionNumber");
|
|
32
|
-
|
|
32
|
+
// import { TransactionProcessRepo } from '../../repo/transactionProcess';
|
|
33
33
|
const any_1 = require("../payment/any");
|
|
34
34
|
/**
|
|
35
35
|
* タスク実行関数
|
|
@@ -45,7 +45,7 @@ function call(params) {
|
|
|
45
45
|
}
|
|
46
46
|
let callResult;
|
|
47
47
|
const actionRepo = new action_1.ActionRepo(connection);
|
|
48
|
-
const transactionProcessRepo = new
|
|
48
|
+
// const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
|
|
49
49
|
const paymentServiceId = params.data.object.issuedThrough.id;
|
|
50
50
|
const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
|
|
51
51
|
const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
|
|
@@ -57,13 +57,13 @@ function call(params) {
|
|
|
57
57
|
action: actionRepo,
|
|
58
58
|
assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
|
|
59
59
|
authorization: new authorization_1.AuthorizationRepo(connection),
|
|
60
|
-
confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({
|
|
60
|
+
confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({ connection }),
|
|
61
61
|
credentials: new credentials_1.CredentialsRepo(redisClient, {
|
|
62
62
|
scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
|
|
63
63
|
expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
|
|
64
64
|
}),
|
|
65
65
|
event: new event_1.EventRepo(connection),
|
|
66
|
-
orderNumber: new orderNumber_1.OrderNumberRepo({
|
|
66
|
+
orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
|
|
67
67
|
paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
|
|
68
68
|
paymentService: new paymentService_1.PaymentServiceRepo(connection),
|
|
69
69
|
paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
|
|
@@ -73,7 +73,7 @@ function call(params) {
|
|
|
73
73
|
task: new task_1.TaskRepo(connection),
|
|
74
74
|
ticket: new ticket_1.TicketRepo(connection),
|
|
75
75
|
transaction: new transaction_1.TransactionRepo(connection),
|
|
76
|
-
transactionNumber: new transactionNumber_1.TransactionNumberRepo({
|
|
76
|
+
transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
|
|
77
77
|
// transactionProcess: transactionProcessRepo
|
|
78
78
|
}, settings);
|
|
79
79
|
}
|
|
@@ -101,7 +101,8 @@ function call(params) {
|
|
|
101
101
|
finally {
|
|
102
102
|
// 取引プロセスロック解除(2024-04-20~)
|
|
103
103
|
if (params.data.options.useUnlockTransactionProcess) {
|
|
104
|
-
|
|
104
|
+
// taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
|
|
105
|
+
// await transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
|
|
105
106
|
}
|
|
106
107
|
}
|
|
107
108
|
if (callResult !== undefined) {
|
|
@@ -43,7 +43,7 @@ function call(params) {
|
|
|
43
43
|
yield (0, cancelReservation_1.cancelPendingReservation)({ purpose: data.purpose })({
|
|
44
44
|
action: new action_1.ActionRepo(connection),
|
|
45
45
|
assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
|
|
46
|
-
stockHolder: new stockHolder_1.StockHolderRepo(
|
|
46
|
+
stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
|
|
47
47
|
offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
|
|
48
48
|
reservation: new reservation_1.ReservationRepo(connection),
|
|
49
49
|
setting: new setting_1.SettingRepo(connection),
|
|
@@ -34,7 +34,7 @@ function call(data) {
|
|
|
34
34
|
task: new task_1.TaskRepo(connection),
|
|
35
35
|
assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
|
|
36
36
|
offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
|
|
37
|
-
stockHolder: new stockHolder_1.StockHolderRepo(
|
|
37
|
+
stockHolder: new stockHolder_1.StockHolderRepo({ connection })
|
|
38
38
|
}
|
|
39
39
|
// settings
|
|
40
40
|
);
|
|
@@ -17,7 +17,7 @@ const event_1 = require("../../repo/event");
|
|
|
17
17
|
const paymentService_1 = require("../../repo/paymentService");
|
|
18
18
|
const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
19
19
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
20
|
-
|
|
20
|
+
// import { TransactionProcessRepo } from '../../repo/transactionProcess';
|
|
21
21
|
const pay_1 = require("../assetTransaction/pay");
|
|
22
22
|
/**
|
|
23
23
|
* タスク実行関数
|
|
@@ -33,7 +33,7 @@ function call(params) {
|
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
35
|
const actionRepo = new action_1.ActionRepo(connection);
|
|
36
|
-
const transactionProcessRepo = new
|
|
36
|
+
// const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
|
|
37
37
|
const paymentServiceId = (_b = params.data.object[0]) === null || _b === void 0 ? void 0 : _b.id;
|
|
38
38
|
const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
|
|
39
39
|
const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
|
|
@@ -67,7 +67,8 @@ function call(params) {
|
|
|
67
67
|
finally {
|
|
68
68
|
// 取引プロセスロック解除
|
|
69
69
|
if (typeof ((_d = params.data.purpose) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
|
|
70
|
-
|
|
70
|
+
// taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
|
|
71
|
+
// await transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
74
|
});
|
|
@@ -59,7 +59,7 @@ function call(data) {
|
|
|
59
59
|
project: { id: data.project.id }
|
|
60
60
|
})({
|
|
61
61
|
event: new event_1.EventRepo(connection),
|
|
62
|
-
stockHolder: new stockHolder_1.StockHolderRepo(
|
|
62
|
+
stockHolder: new stockHolder_1.StockHolderRepo({ connection })
|
|
63
63
|
});
|
|
64
64
|
break;
|
|
65
65
|
default:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { IOperationExecute } from '../
|
|
1
|
+
import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
|
|
2
2
|
import * as factory from '../../factory';
|
|
3
3
|
/**
|
|
4
4
|
* タスク実行関数
|
|
5
5
|
*/
|
|
6
|
-
export declare function call(
|
|
6
|
+
export declare function call(params: Pick<factory.task.ITask<factory.taskName.ConfirmPayTransaction>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
|
|
@@ -23,9 +23,10 @@ const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
|
|
|
23
23
|
/**
|
|
24
24
|
* タスク実行関数
|
|
25
25
|
*/
|
|
26
|
-
function call(
|
|
26
|
+
function call(params) {
|
|
27
|
+
// export function call(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): IOperationExecute<void> {
|
|
27
28
|
return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
|
|
28
|
-
yield (0, confirmPayTransaction_1.confirmPayTransaction)(data, {})({
|
|
29
|
+
yield (0, confirmPayTransaction_1.confirmPayTransaction)(Object.assign(Object.assign({}, params.data), { project: params.project }), {})({
|
|
29
30
|
acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
|
|
30
31
|
action: new action_1.ActionRepo(connection),
|
|
31
32
|
assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { IOperationExecute } from '../
|
|
1
|
+
import type { IOperationExecute } from '../taskHandler';
|
|
2
2
|
import * as factory from '../../factory';
|
|
3
3
|
import { ActionRepo } from '../../repo/action';
|
|
4
4
|
import { AssetTransactionRepo } from '../../repo/assetTransaction';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as COA from '@motionpicture/coa-service';
|
|
2
2
|
import * as factory from '../../factory';
|
|
3
3
|
import { Settings } from '../../settings';
|
|
4
|
-
import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../
|
|
4
|
+
import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
|
|
5
5
|
import { AcceptedOfferRepo } from '../../repo/acceptedOffer';
|
|
6
6
|
import { ActionRepo } from '../../repo/action';
|
|
7
7
|
import { AssetTransactionRepo } from '../../repo/assetTransaction';
|
|
@@ -17,10 +17,14 @@ export declare function call(params: Pick<factory.task.ITask<factory.taskName.Co
|
|
|
17
17
|
/**
|
|
18
18
|
* 予約を確定する
|
|
19
19
|
*/
|
|
20
|
-
export declare function confirmReserveTransaction(params: factory.task.IData<factory.taskName.ConfirmReserveTransaction> & {
|
|
20
|
+
export declare function confirmReserveTransaction(params: Omit<factory.task.IData<factory.taskName.ConfirmReserveTransaction>, 'agent' | 'project'> & {
|
|
21
21
|
sameAs?: {
|
|
22
22
|
id: string;
|
|
23
23
|
};
|
|
24
|
+
project: {
|
|
25
|
+
id: string;
|
|
26
|
+
typeOf: factory.organizationType.Project;
|
|
27
|
+
};
|
|
24
28
|
}, options: {
|
|
25
29
|
sendOrder: boolean;
|
|
26
30
|
useOnOrderStatusChanged: boolean;
|
|
@@ -52,7 +52,7 @@ function call(params) {
|
|
|
52
52
|
endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
|
|
53
53
|
auth: coaAuthClient
|
|
54
54
|
}, { timeout: settings.coa.timeout });
|
|
55
|
-
yield confirmReserveTransaction(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }), {
|
|
55
|
+
yield confirmReserveTransaction(Object.assign(Object.assign({}, params.data), { project: params.project, sameAs: { id: params.id } }), {
|
|
56
56
|
sendOrder: true,
|
|
57
57
|
useOnOrderStatusChanged: true
|
|
58
58
|
})({
|
|
@@ -179,8 +179,8 @@ function confirmReserveTransaction(params, options) {
|
|
|
179
179
|
default:
|
|
180
180
|
confirmActionObject = params.object;
|
|
181
181
|
}
|
|
182
|
-
const {
|
|
183
|
-
const confirmActionAttributes = Object.assign({ agent, project, purpose, typeOf, object: confirmActionObject }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined // link sameAs(2024-06-10~)
|
|
182
|
+
const { project, purpose, typeOf, sameAs } = params;
|
|
183
|
+
const confirmActionAttributes = Object.assign({ agent: project, project, purpose, typeOf, object: confirmActionObject }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined // link sameAs(2024-06-10~)
|
|
184
184
|
);
|
|
185
185
|
const action = yield repos.action.start(confirmActionAttributes, Object.assign({}, (recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
|
|
186
186
|
));
|
|
@@ -29,7 +29,7 @@ function call(data) {
|
|
|
29
29
|
const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
|
|
30
30
|
const productRepo = new product_1.ProductRepo(connection);
|
|
31
31
|
const projectRepo = new project_1.ProjectRepo(connection);
|
|
32
|
-
const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({
|
|
32
|
+
const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ connection });
|
|
33
33
|
yield DeliveryService.givePointAward(data)({
|
|
34
34
|
action: actionRepo,
|
|
35
35
|
assetTransaction: assetTransactionRepo,
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import * as factory from '../../factory';
|
|
2
|
-
import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../
|
|
3
|
-
export declare function call(params: Pick<factory.task.handleNotification.ITask, IExecutableTaskKeys>
|
|
2
|
+
import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
|
|
3
|
+
export declare function call(params: Pick<factory.task.handleNotification.ITask, IExecutableTaskKeys> & {
|
|
4
|
+
status: factory.taskStatus.Running;
|
|
5
|
+
}): IOperationExecute<ICallResult>;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { IExecutableTaskKeys, IOperationExecute } from '../
|
|
1
|
+
import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
|
|
2
2
|
import * as factory from '../../factory';
|
|
3
3
|
export declare function call(params: Pick<factory.task.invalidatePaymentUrl.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
|
|
@@ -25,7 +25,7 @@ function call(data) {
|
|
|
25
25
|
}
|
|
26
26
|
const actionRepo = new action_1.ActionRepo(connection);
|
|
27
27
|
const productRepo = new product_1.ProductRepo(connection);
|
|
28
|
-
const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({
|
|
28
|
+
const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ connection });
|
|
29
29
|
yield MoneyTransferService.moneyTransfer(data)({
|
|
30
30
|
action: actionRepo,
|
|
31
31
|
product: productRepo,
|