@chevre/domain 26.0.0-alpha.2 → 26.0.0-alpha.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (87) hide show
  1. package/lib/chevre/eventEmitter/task.d.ts +8 -23
  2. package/lib/chevre/eventEmitter/task.js +2 -2
  3. package/lib/chevre/repo/adminAsyncAction.d.ts +2 -2
  4. package/lib/chevre/repo/adminScheduledTask.d.ts +1 -1
  5. package/lib/chevre/repo/adminTask.d.ts +31 -8
  6. package/lib/chevre/repo/adminTask.js +41 -26
  7. package/lib/chevre/repo/aggregateScheduledTask.d.ts +32 -0
  8. package/lib/chevre/repo/aggregateScheduledTask.js +136 -0
  9. package/lib/chevre/repo/asyncAction.d.ts +2 -2
  10. package/lib/chevre/repo/mongoose/schemas/setting.d.ts +1 -0
  11. package/lib/chevre/repo/mongoose/schemas/task.d.ts +2 -5
  12. package/lib/chevre/repo/mongoose/schemas/task.js +87 -96
  13. package/lib/chevre/repo/orderInTransaction.d.ts +0 -3
  14. package/lib/chevre/repo/orderInTransaction.js +30 -22
  15. package/lib/chevre/repo/scheduledTask.d.ts +5 -2
  16. package/lib/chevre/repo/scheduledTask.js +3 -25
  17. package/lib/chevre/repo/task.d.ts +25 -172
  18. package/lib/chevre/repo/task.js +19 -475
  19. package/lib/chevre/repo/taskDelayed.d.ts +74 -0
  20. package/lib/chevre/repo/taskDelayed.js +195 -0
  21. package/lib/chevre/repo/taskRunning.d.ts +35 -0
  22. package/lib/chevre/repo/taskRunning.js +89 -0
  23. package/lib/chevre/repository.d.ts +10 -0
  24. package/lib/chevre/repository.js +24 -2
  25. package/lib/chevre/service/aggregation/system.d.ts +10 -2
  26. package/lib/chevre/service/aggregation/system.js +42 -0
  27. package/lib/chevre/service/assetTransaction/reserve/start/factory/createStartParams.js +5 -25
  28. package/lib/chevre/service/asyncAction.d.ts +2 -2
  29. package/lib/chevre/service/asyncAction.js +1 -4
  30. package/lib/chevre/service/asyncActionHandler/onOperationFailed.d.ts +2 -2
  31. package/lib/chevre/service/asyncActionHandler/onOperationFailed.js +0 -2
  32. package/lib/chevre/service/asyncActionHandler.d.ts +4 -4
  33. package/lib/chevre/service/asyncActionHandler.js +11 -13
  34. package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js +1 -1
  35. package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.d.ts +0 -4
  36. package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.js +19 -19
  37. package/lib/chevre/service/order/confirmPayTransaction.js +4 -1
  38. package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +4 -4
  39. package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js +2 -2
  40. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js +2 -2
  41. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts +2 -2
  42. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js +1 -1
  43. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js +2 -2
  44. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +1 -1
  45. package/lib/chevre/service/payment/any/findAcceptAction.d.ts +0 -4
  46. package/lib/chevre/service/payment/any/findAcceptAction.js +19 -19
  47. package/lib/chevre/service/payment/any/findAuthorizeAction.d.ts +0 -4
  48. package/lib/chevre/service/payment/any/findAuthorizeAction.js +19 -19
  49. package/lib/chevre/service/payment/any/findCheckAction.d.ts +0 -4
  50. package/lib/chevre/service/payment/any/findCheckAction.js +19 -19
  51. package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts +0 -2
  52. package/lib/chevre/service/payment/any/publishPaymentUrl.js +2 -2
  53. package/lib/chevre/service/project.d.ts +0 -3
  54. package/lib/chevre/service/project.js +0 -1
  55. package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js +2 -2
  56. package/lib/chevre/service/scheduledTask.d.ts +1 -4
  57. package/lib/chevre/service/scheduledTask.js +3 -10
  58. package/lib/chevre/service/scheduledTaskHandler/onOperationFailed.js +1 -2
  59. package/lib/chevre/service/scheduledTaskHandler.js +0 -13
  60. package/lib/chevre/service/task/acceptCOAOffer.js +1 -14
  61. package/lib/chevre/service/task/authorizePayment.js +1 -7
  62. package/lib/chevre/service/task/checkMovieTicket.js +1 -7
  63. package/lib/chevre/service/task/confirmReserveTransaction.js +3 -1
  64. package/lib/chevre/service/task/importEventCapacitiesFromCOA.js +4 -1
  65. package/lib/chevre/service/task/importEventsFromCOA.js +4 -1
  66. package/lib/chevre/service/task/importOffersFromCOA.js +5 -5
  67. package/lib/chevre/service/task/publishPaymentUrl.js +2 -13
  68. package/lib/chevre/service/task/syncResourcesFromCOA.js +1 -5
  69. package/lib/chevre/service/task/voidReserveTransaction.js +5 -8
  70. package/lib/chevre/service/task.d.ts +3 -22
  71. package/lib/chevre/service/task.js +8 -40
  72. package/lib/chevre/service/taskHandler/onOperationFailed.d.ts +3 -2
  73. package/lib/chevre/service/taskHandler/onOperationFailed.js +5 -16
  74. package/lib/chevre/service/taskHandler.d.ts +1 -2
  75. package/lib/chevre/service/taskHandler.js +7 -53
  76. package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts +8 -4
  77. package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js +55 -103
  78. package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts +2 -0
  79. package/lib/chevre/service/transaction/placeOrder/exportTasksById.js +14 -10
  80. package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.d.ts +13 -3
  81. package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js +48 -51
  82. package/lib/chevre/service/transaction/returnOrder.d.ts +2 -0
  83. package/lib/chevre/service/transaction/returnOrder.js +15 -13
  84. package/lib/chevre/service/transaction.d.ts +2 -0
  85. package/lib/chevre/service/transaction.js +0 -2
  86. package/lib/chevre/taskSettings.d.ts +4 -4
  87. package/package.json +2 -2
@@ -1,11 +1,15 @@
1
1
  import { factory } from '../../../../factory';
2
2
  import type { ISetting } from '../../../../repo/setting';
3
- type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.deleteTransaction.IAttributes | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.voidReserveTransaction.IAttributes;
3
+ type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | Omit<factory.task.voidReserveTransaction.IAttributes, 'expires'>;
4
4
  /**
5
5
  * 取引のタスクを作成する
6
+ * 取引削除タスクを分離(2026-08-02~)
6
7
  */
7
- export declare function createTasks(params: {
8
+ export declare function createImmediateTasks(params: {
8
9
  transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
9
- runsAt: Date;
10
- }, setting: Pick<ISetting, 'storage'> | null): IPlaceOrderPotentialTask[];
10
+ taskRunsAt: Date;
11
+ }): IPlaceOrderPotentialTask[];
12
+ export declare function createScheduledTasks(params: {
13
+ transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'status' | 'typeOf'>;
14
+ }, setting: Pick<ISetting, 'storage'> | null): factory.task.deleteTransaction.IAttributes;
11
15
  export {};
@@ -3,114 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.createTasks = createTasks;
6
+ exports.createImmediateTasks = createImmediateTasks;
7
+ exports.createScheduledTasks = createScheduledTasks;
7
8
  const moment_1 = __importDefault(require("moment"));
8
9
  const factory_1 = require("../../../../factory");
9
10
  /**
10
11
  * 取引のタスクを作成する
12
+ * 取引削除タスクを分離(2026-08-02~)
11
13
  */
12
- function createTasks(params, setting) {
14
+ function createImmediateTasks(params) {
13
15
  const taskAttributes = [];
14
16
  const transaction = params.transaction;
15
- const taskRunsAt = params.runsAt;
17
+ const taskRunsAt = params.taskRunsAt;
16
18
  // 取引通知は廃止(2026-06-29~)
17
- // const informTransaction = setting?.onTransactionStatusChanged?.informTransaction;
18
- // const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
19
- // const triggerWebhookTaskAttributes: factory.task.IAttributes<factory.taskName.TriggerWebhook>[] = [];
20
- // transactionWebhookUrls.forEach(({ recipient }) => {
21
- // if (typeof recipient?.url === 'string') {
22
- // const informObject: factory.notification.transaction.IPlaceOrderAsNotification = {
23
- // id: transaction.id,
24
- // typeOf: transaction.typeOf,
25
- // project: transaction.project,
26
- // seller: transaction.seller,
27
- // startDate: transaction.startDate,
28
- // status: transaction.status,
29
- // ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
30
- // };
31
- // const data: factory.task.triggerWebhook.IInformAnyResourceAction = {
32
- // object: informObject,
33
- // recipient: {
34
- // id: (typeof recipient?.id === 'string') ? recipient.id : '',
35
- // name: recipient?.name,
36
- // typeOf: factory.creativeWorkType.WebApplication
37
- // // url: recipient.url // discontinue(2025-02-13~)
38
- // },
39
- // target: {
40
- // httpMethod: 'POST',
41
- // encodingType: factory.encodingFormat.Application.json,
42
- // typeOf: 'EntryPoint',
43
- // urlTemplate: recipient.url
44
- // }
45
- // };
46
- // triggerWebhookTaskAttributes.push({
47
- // project: transaction.project,
48
- // name: factory.taskName.TriggerWebhook,
49
- // status: factory.taskStatus.Ready,
50
- // runsAt: taskRunsAt,
51
- // remainingNumberOfTries: 3,
52
- // numberOfTried: 0,
53
- // executionResults: [],
54
- // data
55
- // });
56
- // }
57
- // });
58
- const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
59
- const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
60
- if (typeof confirmedStoragePeriodInDays !== 'number') {
61
- throw new factory_1.factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
62
- }
63
- if (typeof canceledStoragePeriodInDays !== 'number') {
64
- throw new factory_1.factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
65
- }
66
- // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
67
- // let deleteAt = moment(transaction.endDate)
68
- // .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
69
- // .toDate();
70
- let deleteAt = (0, moment_1.default)(transaction.endDate)
71
- .add(confirmedStoragePeriodInDays, 'days')
72
- .toDate();
73
- switch (transaction.status) {
74
- case factory_1.factory.transactionStatusType.Confirmed:
75
- break;
76
- case factory_1.factory.transactionStatusType.Canceled:
77
- case factory_1.factory.transactionStatusType.Expired:
78
- // deleteAt = moment(transaction.endDate)
79
- // .add(settings.transaction.canceledStoragePeriodInDays, 'days')
80
- // .toDate();
81
- deleteAt = (0, moment_1.default)(transaction.endDate)
82
- .add(canceledStoragePeriodInDays, 'days')
83
- .toDate();
84
- break;
85
- default:
86
- }
87
- const deleteTransactionTask = {
88
- project: transaction.project,
89
- name: factory_1.factory.taskName.DeleteTransaction,
90
- status: factory_1.factory.taskStatus.Ready,
91
- runsAt: deleteAt,
92
- remainingNumberOfTries: 3,
93
- numberOfTried: 0,
94
- executionResults: [],
95
- data: {
96
- object: {
97
- specifyingMethod: factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
98
- id: transaction.id,
99
- object: {
100
- ...(typeof transaction.object.confirmationNumber === 'string')
101
- ? { confirmationNumber: transaction.object.confirmationNumber }
102
- : undefined,
103
- ...(typeof transaction.object.orderNumber === 'string')
104
- ? { orderNumber: transaction.object.orderNumber }
105
- : undefined
106
- },
107
- // project: transaction.project,
108
- // startDate: transaction.startDate,
109
- typeOf: transaction.typeOf,
110
- // ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
111
- }
112
- }
113
- };
114
19
  // 確定取引にも興行オファー承認中止タスクを追加(2023-05-09~)
115
20
  const voidReserveTaskAttributes = {
116
21
  project: transaction.project,
@@ -121,7 +26,6 @@ function createTasks(params, setting) {
121
26
  numberOfTried: 0,
122
27
  executionResults: [],
123
28
  data: {
124
- // project: transaction.project, // discontinue(2025-03-12~)
125
29
  purpose: { typeOf: transaction.typeOf, id: transaction.id }
126
30
  }
127
31
  };
@@ -135,11 +39,9 @@ function createTasks(params, setting) {
135
39
  numberOfTried: 0,
136
40
  executionResults: [],
137
41
  data: {
138
- // project: transaction.project, // discontinue(2025-03-12~)
139
42
  purpose: { typeOf: transaction.typeOf, id: transaction.id }
140
43
  }
141
44
  };
142
- taskAttributes.push(deleteTransactionTask);
143
45
  switch (transaction.status) {
144
46
  case factory_1.factory.transactionStatusType.Confirmed: {
145
47
  taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
@@ -188,3 +90,53 @@ function createTasks(params, setting) {
188
90
  }
189
91
  return taskAttributes;
190
92
  }
93
+ function createScheduledTasks(params, setting) {
94
+ const transaction = params.transaction;
95
+ const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
96
+ const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
97
+ if (typeof confirmedStoragePeriodInDays !== 'number') {
98
+ throw new factory_1.factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
99
+ }
100
+ if (typeof canceledStoragePeriodInDays !== 'number') {
101
+ throw new factory_1.factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
102
+ }
103
+ // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
104
+ let deleteAt = (0, moment_1.default)(transaction.endDate)
105
+ .add(confirmedStoragePeriodInDays, 'days')
106
+ .toDate();
107
+ switch (transaction.status) {
108
+ case factory_1.factory.transactionStatusType.Confirmed:
109
+ break;
110
+ case factory_1.factory.transactionStatusType.Canceled:
111
+ case factory_1.factory.transactionStatusType.Expired:
112
+ deleteAt = (0, moment_1.default)(transaction.endDate)
113
+ .add(canceledStoragePeriodInDays, 'days')
114
+ .toDate();
115
+ break;
116
+ default:
117
+ }
118
+ return {
119
+ project: transaction.project,
120
+ name: factory_1.factory.taskName.DeleteTransaction,
121
+ status: factory_1.factory.taskStatus.Ready,
122
+ runsAt: deleteAt,
123
+ remainingNumberOfTries: 3,
124
+ numberOfTried: 0,
125
+ executionResults: [],
126
+ data: {
127
+ object: {
128
+ specifyingMethod: factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
129
+ id: transaction.id,
130
+ object: {
131
+ ...(typeof transaction.object.confirmationNumber === 'string')
132
+ ? { confirmationNumber: transaction.object.confirmationNumber }
133
+ : undefined,
134
+ ...(typeof transaction.object.orderNumber === 'string')
135
+ ? { orderNumber: transaction.object.orderNumber }
136
+ : undefined
137
+ },
138
+ typeOf: transaction.typeOf,
139
+ }
140
+ }
141
+ };
142
+ }
@@ -1,8 +1,10 @@
1
1
  import type { SettingRepo } from '../../../repo/setting';
2
+ import type { ScheduledTaskRepo } from '../../../repo/scheduledTask';
2
3
  import type { TaskRepo } from '../../../repo/task';
3
4
  import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
4
5
  interface IExportTasksByIdRepos {
5
6
  setting: SettingRepo;
7
+ scheduledTask: ScheduledTaskRepo;
6
8
  task: TaskRepo;
7
9
  placeOrder: PlaceOrderRepo;
8
10
  }
@@ -11,9 +11,7 @@ const factory_2 = require("./exportTasks/factory");
11
11
  * 取引のタスクを出力します
12
12
  */
13
13
  function exportTasksById(params) {
14
- return async (repos
15
- // settings: Settings
16
- ) => {
14
+ return async (repos) => {
17
15
  const transaction = await repos.placeOrder.findPlaceOrderById({
18
16
  typeOf: factory_1.factory.transactionType.PlaceOrder,
19
17
  id: params.id
@@ -27,12 +25,18 @@ function exportTasksById(params) {
27
25
  }
28
26
  // search settings
29
27
  const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
30
- const taskAttributes = (0, factory_2.createTasks)({
31
- transaction,
32
- runsAt: taskRunsAt
33
- }, setting
34
- // settings
35
- );
36
- await repos.task.saveMany(taskAttributes);
28
+ const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
29
+ if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
30
+ throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
31
+ }
32
+ const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
33
+ // support scheduledTask(2026-08-02~)
34
+ await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
35
+ await repos.scheduledTask.addScheduledTasks([{
36
+ ...deleteTask,
37
+ expires: (0, moment_1.default)(deleteTask.runsAt)
38
+ .add(deleteTransactionTaskExpiresInDays, 'days')
39
+ .toDate()
40
+ }]);
37
41
  };
38
42
  }
@@ -1,9 +1,19 @@
1
1
  import type { ISetting } from '../../../../repo/setting';
2
2
  import { factory } from '../../../../factory';
3
+ type IReturnOrderPotentialTask = factory.task.IAttributes<factory.taskName.ReturnOrder>;
3
4
  /**
4
5
  * 取引のタスクを作成する
6
+ * 取引削除タスクを分離(2026-08-02~)
5
7
  */
6
- export declare function createTasks(params: {
8
+ export declare function createImmediateTasks(params: {
7
9
  transaction: Pick<factory.transaction.ITransaction<factory.transactionType.ReturnOrder>, 'endDate' | 'status' | 'id' | 'project' | 'typeOf' | 'startDate' | 'object' | 'potentialActions'>;
8
- runsAt: Date;
9
- }, setting: Pick<ISetting, 'storage'> | null): factory.task.IAttributes<factory.taskName>[];
10
+ taskRunsAt: Date;
11
+ }): IReturnOrderPotentialTask[];
12
+ /**
13
+ * 取引のタスクを作成する
14
+ * 取引削除タスクを分離(2026-08-02~)
15
+ */
16
+ export declare function createScheduledTasks(params: {
17
+ transaction: Pick<factory.transaction.ITransaction<factory.transactionType.ReturnOrder>, 'endDate' | 'status' | 'id' | 'project' | 'typeOf' | 'object'>;
18
+ }, setting: Pick<ISetting, 'storage'> | null): factory.task.deleteTransaction.IAttributes;
19
+ export {};
@@ -3,18 +3,60 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.createTasks = createTasks;
6
+ exports.createImmediateTasks = createImmediateTasks;
7
+ exports.createScheduledTasks = createScheduledTasks;
7
8
  const moment_1 = __importDefault(require("moment"));
8
9
  const factory_1 = require("../../../../factory");
9
10
  /**
10
11
  * 取引のタスクを作成する
12
+ * 取引削除タスクを分離(2026-08-02~)
11
13
  */
12
- function createTasks(params, setting
13
- // settings: Settings
14
- ) {
14
+ function createImmediateTasks(params) {
15
15
  const taskAttributes = [];
16
16
  const transaction = params.transaction;
17
- const taskRunsAt = params.runsAt;
17
+ const taskRunsAt = params.taskRunsAt;
18
+ switch (transaction.status) {
19
+ case factory_1.factory.transactionStatusType.Confirmed: {
20
+ const returnOrderPotentialActions = transaction.potentialActions?.returnOrder;
21
+ if (Array.isArray(returnOrderPotentialActions)) {
22
+ // 返品タスク
23
+ const returnOrderTask = returnOrderPotentialActions.map((r) => {
24
+ // data最適化(2023-08-22~)
25
+ const returnOrderTaskData = {
26
+ agent: r.agent,
27
+ object: r.object,
28
+ project: transaction.project,
29
+ typeOf: r.typeOf
30
+ };
31
+ return {
32
+ project: transaction.project,
33
+ name: factory_1.factory.taskName.ReturnOrder,
34
+ status: factory_1.factory.taskStatus.Ready,
35
+ runsAt: taskRunsAt,
36
+ remainingNumberOfTries: 10,
37
+ numberOfTried: 0,
38
+ executionResults: [],
39
+ data: returnOrderTaskData
40
+ };
41
+ });
42
+ taskAttributes.push(...returnOrderTask);
43
+ }
44
+ break;
45
+ }
46
+ case factory_1.factory.transactionStatusType.Expired:
47
+ // 特にタスクなし
48
+ break;
49
+ default:
50
+ throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
51
+ }
52
+ return taskAttributes;
53
+ }
54
+ /**
55
+ * 取引のタスクを作成する
56
+ * 取引削除タスクを分離(2026-08-02~)
57
+ */
58
+ function createScheduledTasks(params, setting) {
59
+ const transaction = params.transaction;
18
60
  const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
19
61
  const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
20
62
  if (typeof confirmedStoragePeriodInDays !== 'number') {
@@ -24,9 +66,6 @@ function createTasks(params, setting
24
66
  throw new factory_1.factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
25
67
  }
26
68
  // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
27
- // let deleteAt = moment(transaction.endDate)
28
- // .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
29
- // .toDate();
30
69
  let deleteAt = (0, moment_1.default)(transaction.endDate)
31
70
  .add(confirmedStoragePeriodInDays, 'days')
32
71
  .toDate();
@@ -35,16 +74,13 @@ function createTasks(params, setting
35
74
  break;
36
75
  case factory_1.factory.transactionStatusType.Canceled:
37
76
  case factory_1.factory.transactionStatusType.Expired:
38
- // deleteAt = moment(transaction.endDate)
39
- // .add(settings.transaction.canceledStoragePeriodInDays, 'days')
40
- // .toDate();
41
77
  deleteAt = (0, moment_1.default)(transaction.endDate)
42
78
  .add(canceledStoragePeriodInDays, 'days')
43
79
  .toDate();
44
80
  break;
45
81
  default:
46
82
  }
47
- const deleteTransactionTask = {
83
+ return {
48
84
  project: transaction.project,
49
85
  name: factory_1.factory.taskName.DeleteTransaction,
50
86
  status: factory_1.factory.taskStatus.Ready,
@@ -59,47 +95,8 @@ function createTasks(params, setting
59
95
  object: {
60
96
  order: transaction.object.order
61
97
  },
62
- // project: transaction.project,
63
- // startDate: transaction.startDate,
64
98
  typeOf: transaction.typeOf,
65
- // ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
66
99
  }
67
100
  }
68
101
  };
69
- taskAttributes.push(deleteTransactionTask);
70
- switch (transaction.status) {
71
- case factory_1.factory.transactionStatusType.Confirmed: {
72
- const returnOrderPotentialActions = transaction.potentialActions?.returnOrder;
73
- if (Array.isArray(returnOrderPotentialActions)) {
74
- // 返品タスク
75
- const returnOrderTask = returnOrderPotentialActions.map((r) => {
76
- // data最適化(2023-08-22~)
77
- const returnOrderTaskData = {
78
- agent: r.agent,
79
- object: r.object,
80
- project: transaction.project,
81
- typeOf: r.typeOf
82
- };
83
- return {
84
- project: transaction.project,
85
- name: factory_1.factory.taskName.ReturnOrder,
86
- status: factory_1.factory.taskStatus.Ready,
87
- runsAt: taskRunsAt,
88
- remainingNumberOfTries: 10,
89
- numberOfTried: 0,
90
- executionResults: [],
91
- data: returnOrderTaskData
92
- };
93
- });
94
- taskAttributes.push(...returnOrderTask);
95
- }
96
- break;
97
- }
98
- case factory_1.factory.transactionStatusType.Expired:
99
- // 特にタスクなし
100
- break;
101
- default:
102
- throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
103
- }
104
- return taskAttributes;
105
102
  }
@@ -11,6 +11,7 @@ import type { ReservationRepo } from '../../repo/reservation';
11
11
  import type { SellerRepo } from '../../repo/seller';
12
12
  import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
13
13
  import type { SettingRepo } from '../../repo/setting';
14
+ import type { ScheduledTaskRepo } from '../../repo/scheduledTask';
14
15
  import type { TaskRepo } from '../../repo/task';
15
16
  import type { IStartedTransaction, ReturnOrderRepo } from '../../repo/transaction/returnOrder';
16
17
  import { preStart } from './returnOrder/preStart';
@@ -30,6 +31,7 @@ interface IStartOperationRepos {
30
31
  type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
31
32
  interface IExportTasksByIdRepos {
32
33
  setting: SettingRepo;
34
+ scheduledTask: ScheduledTaskRepo;
33
35
  task: TaskRepo;
34
36
  returnOrder: ReturnOrderRepo;
35
37
  }
@@ -79,9 +79,7 @@ function saveMessagesIfNeeded(params) {
79
79
  * 取引確定
80
80
  */
81
81
  function confirm(params) {
82
- return async (repos
83
- // settings: Settings
84
- ) => {
82
+ return async (repos) => {
85
83
  const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory_1.factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
86
84
  if (transaction.status === factory_1.factory.transactionStatusType.Confirmed) {
87
85
  // すでに確定済の場合
@@ -158,9 +156,7 @@ function confirm(params) {
158
156
  * この関数では、取引のタスクエクスポートステータスは見ません
159
157
  */
160
158
  function exportTasksById(params) {
161
- return async (repos
162
- // settings: Settings
163
- ) => {
159
+ return async (repos) => {
164
160
  const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory_1.factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
165
161
  // タスク実行日時バッファの指定があれば調整
166
162
  let taskRunsAt = new Date();
@@ -171,12 +167,18 @@ function exportTasksById(params) {
171
167
  }
172
168
  // search settings
173
169
  const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
174
- const taskAttributes = (0, factory_2.createTasks)({
175
- transaction,
176
- runsAt: taskRunsAt
177
- }, setting
178
- // settings
179
- );
180
- await repos.task.saveMany(taskAttributes);
170
+ const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
171
+ if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
172
+ throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
173
+ }
174
+ const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
175
+ // support scheduledTask(2026-08-02~)
176
+ await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
177
+ await repos.scheduledTask.addScheduledTasks([{
178
+ ...deleteTask,
179
+ expires: (0, moment_timezone_1.default)(deleteTask.runsAt)
180
+ .add(deleteTransactionTaskExpiresInDays, 'days')
181
+ .toDate()
182
+ }]);
181
183
  };
182
184
  }
@@ -3,6 +3,7 @@
3
3
  */
4
4
  import { factory } from '../factory';
5
5
  import type { SettingRepo } from '../repo/setting';
6
+ import type { ScheduledTaskRepo } from '../repo/scheduledTask';
6
7
  import type { TaskRepo } from '../repo/task';
7
8
  import type { TransactionRepo } from '../repo/transaction';
8
9
  import type { PlaceOrderRepo } from '../repo/transaction/placeOrder';
@@ -18,6 +19,7 @@ export import returnOrder = ReturnOrderTransactionService;
18
19
  export { deleteTransaction };
19
20
  export type IExportTasksOperation<T> = (repos: {
20
21
  setting: SettingRepo;
22
+ scheduledTask: ScheduledTaskRepo;
21
23
  task: TaskRepo;
22
24
  placeOrder: PlaceOrderRepo;
23
25
  returnOrder: ReturnOrderRepo;
@@ -52,7 +52,6 @@ function exportOneTransactionTasksIfExists(params) {
52
52
  agent: { name: params.tasksExportAction.agent.name }
53
53
  },
54
54
  endDate: { $lt: params.endDate.$lt },
55
- // ...(params.typeOf !== undefined) ? { typeOf: params.typeOf } : undefined,
56
55
  ...(typeof params.id === 'string') ? { id: params.id } : undefined,
57
56
  ...(typeof params.status?.$eq === 'string') ? { status: params.status } : undefined,
58
57
  ...(params.sort !== undefined) ? { sort: params.sort } : undefined
@@ -65,7 +64,6 @@ function exportOneTransactionTasksIfExists(params) {
65
64
  case factory_1.factory.transactionType.PlaceOrder:
66
65
  await PlaceOrderTransactionService.exportTasksById({
67
66
  id: transaction.id,
68
- // optimizeRedundantTasks: params.optimizeRedundantTasks === true,
69
67
  ...(typeof params.runsTasksAfterInSeconds === 'number')
70
68
  ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
71
69
  : undefined
@@ -20,10 +20,10 @@ declare class AggregationSettings {
20
20
  interface IExecuteSettings extends IMinimumExecuteSettings {
21
21
  aggregationSettings?: AggregationSettings;
22
22
  }
23
- interface IExecuteOptions {
24
- executeById: boolean;
25
- executeByName: boolean;
26
- }
23
+ /**
24
+ * かつてはexecuteById,executeByNameといったオプションが存在したが、現時点で特に何もなし(2026-08-07)
25
+ */
26
+ type IExecuteOptions = Record<string, never>;
27
27
  type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
28
28
  type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
29
29
  type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "dependencies": {
12
12
  "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
13
13
  "@aws-sdk/credential-providers": "3.1090.0",
14
- "@chevre/factory": "10.1.0-alpha.2",
14
+ "@chevre/factory": "10.3.0-alpha.0",
15
15
  "@motionpicture/coa-service": "10.0.0",
16
16
  "@motionpicture/gmo-service": "6.1.0-alpha.0",
17
17
  "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
88
88
  "postversion": "git push origin --tags",
89
89
  "prepublishOnly": "npm run clean && npm run build"
90
90
  },
91
- "version": "26.0.0-alpha.2"
91
+ "version": "26.0.0-alpha.21"
92
92
  }