@chevre/domain 20.1.0-alpha.6 → 20.1.0-alpha.7

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 (17) hide show
  1. package/lib/chevre/service/assetTransaction/pay/potentialActions.js +2 -1
  2. package/lib/chevre/service/order/onOrderStatusChanged/factory.js +2 -1
  3. package/lib/chevre/service/order/onOrderStatusChanged.js +3 -2
  4. package/lib/chevre/service/order/placeOrder.js +13 -5
  5. package/lib/chevre/service/order/returnOrder.js +2 -1
  6. package/lib/chevre/service/order/sendOrder.js +2 -1
  7. package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js +6 -3
  8. package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js +2 -1
  9. package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.js +2 -1
  10. package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js +2 -1
  11. package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js +2 -1
  12. package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.js +2 -1
  13. package/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.js +2 -1
  14. package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js +6 -3
  15. package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js +2 -1
  16. package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js +2 -1
  17. package/package.json +2 -2
package/lib/chevre/service/assetTransaction/pay/potentialActions.js CHANGED
@@ -17,7 +17,8 @@ function createPayActions(params) {
17
17
  seller: params.order.seller,
18
18
  // mask
19
19
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
20
- confirmationNumber: params.order.confirmationNumber,
20
+ // IOrderへ移行(2022-11-17~)
21
+ // confirmationNumber: params.order.confirmationNumber,
21
22
  orderNumber: params.order.orderNumber,
22
23
  price: params.order.price,
23
24
  priceCurrency: params.order.priceCurrency,
package/lib/chevre/service/order/onOrderStatusChanged/factory.js CHANGED
@@ -51,7 +51,8 @@ function getOrderWithToken(params) {
51
51
  typeOf: params.order.typeOf,
52
52
  seller: seller4orderToken,
53
53
  customer: customer4orderToken,
54
- confirmationNumber: params.order.confirmationNumber,
54
+ // IOrderへ移行(2022-11-17~)
55
+ // confirmationNumber: params.order.confirmationNumber,
55
56
  orderNumber: params.order.orderNumber,
56
57
  price: params.order.price,
57
58
  priceCurrency: params.order.priceCurrency,
package/lib/chevre/service/order/onOrderStatusChanged.js CHANGED
@@ -29,7 +29,8 @@ function onOrderStatusChanged(params) {
29
29
  typeOf: params.order.typeOf,
30
30
  seller: params.order.seller,
31
31
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
32
- confirmationNumber: params.order.confirmationNumber,
32
+ // IOrderへ移行(2022-11-17~)
33
+ // confirmationNumber: params.order.confirmationNumber,
33
34
  orderNumber: params.order.orderNumber,
34
35
  price: params.order.price,
35
36
  priceCurrency: params.order.priceCurrency,
@@ -118,7 +119,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
118
119
  typeOf: factory.actionType.ConfirmAction,
119
120
  object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: paymentMethod.paymentMethodId }],
120
121
  agent: order.project,
121
- purpose: simpleOrder,
122
+ purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
122
123
  instrument: {
123
124
  typeOf: 'WebAPI',
124
125
  identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre
package/lib/chevre/service/order/placeOrder.js CHANGED
@@ -95,7 +95,8 @@ function placeOrderWithoutTransaction(params) {
95
95
  typeOf: order.typeOf,
96
96
  seller: order.seller,
97
97
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
98
- confirmationNumber: order.confirmationNumber,
98
+ // IOrderへ移行(2022-11-17~)
99
+ // confirmationNumber: order.confirmationNumber,
99
100
  orderNumber: order.orderNumber,
100
101
  price: order.price,
101
102
  priceCurrency: order.priceCurrency,
@@ -132,7 +133,10 @@ function placeOrderWithoutTransaction(params) {
132
133
  task: repos.task
133
134
  });
134
135
  // 潜在アクション
135
- yield onPlaceOrder(params)(repos);
136
+ yield onPlaceOrder({
137
+ object: order,
138
+ potentialActions: params.potentialActions
139
+ })(repos);
136
140
  });
137
141
  }
138
142
  exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
@@ -155,7 +159,8 @@ function placeOrder(params) {
155
159
  typeOf: order.typeOf,
156
160
  seller: order.seller,
157
161
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
158
- confirmationNumber: order.confirmationNumber,
162
+ // IOrderへ移行(2022-11-17~)
163
+ // confirmationNumber: order.confirmationNumber,
159
164
  orderNumber: order.orderNumber,
160
165
  price: order.price,
161
166
  priceCurrency: order.priceCurrency,
@@ -192,7 +197,10 @@ function placeOrder(params) {
192
197
  task: repos.task
193
198
  });
194
199
  // 潜在アクション
195
- yield onPlaceOrder(params)(repos);
200
+ yield onPlaceOrder({
201
+ object: order,
202
+ potentialActions: params.potentialActions
203
+ })(repos);
196
204
  });
197
205
  }
198
206
  exports.placeOrder = placeOrder;
@@ -220,7 +228,7 @@ function onPlaceOrder(params) {
220
228
  numberOfTried: 0,
221
229
  executionResults: [],
222
230
  // data: potentialActions.sendOrder
223
- data: Object.assign({ project: potentialActions.sendOrder.project, object: potentialActions.sendOrder.object }, (potentialActions.sendOrder.potentialActions !== undefined)
231
+ data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
224
232
  ? { potentialActions: potentialActions.sendOrder.potentialActions }
225
233
  : undefined)
226
234
  };
package/lib/chevre/service/order/returnOrder.js CHANGED
@@ -44,7 +44,8 @@ function returnOrder(params) {
44
44
  typeOf: order.typeOf,
45
45
  seller: order.seller,
46
46
  customer: (0, order_1.createMaskedCustomer)(order),
47
- confirmationNumber: order.confirmationNumber,
47
+ // IOrderへ移行(2022-11-17~)
48
+ // confirmationNumber: order.confirmationNumber,
48
49
  orderNumber: order.orderNumber,
49
50
  price: order.price,
50
51
  priceCurrency: order.priceCurrency,
package/lib/chevre/service/order/sendOrder.js CHANGED
@@ -48,7 +48,8 @@ function sendOrder(params) {
48
48
  typeOf: order.typeOf,
49
49
  seller: order.seller,
50
50
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
51
- confirmationNumber: order.confirmationNumber,
51
+ // IOrderへ移行(2022-11-17~)
52
+ // confirmationNumber: order.confirmationNumber,
52
53
  orderNumber: order.orderNumber,
53
54
  price: order.price,
54
55
  priceCurrency: order.priceCurrency,
package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js CHANGED
@@ -9,6 +9,7 @@ const settings_1 = require("../../../../settings");
9
9
  */
10
10
  // tslint:disable-next-line:max-func-body-length
11
11
  function createTasks(params) {
12
+ var _a;
12
13
  const taskAttributes = [];
13
14
  const transaction = params.transaction;
14
15
  const taskRunsAt = params.runsAt;
@@ -24,7 +25,6 @@ function createTasks(params) {
24
25
  executionResults: [],
25
26
  data: {
26
27
  agent: transaction.project,
27
- // agent: transaction.seller,
28
28
  object: transaction,
29
29
  project: transaction.project,
30
30
  purpose: { typeOf: transaction.typeOf, id: transaction.id },
@@ -72,6 +72,10 @@ function createTasks(params) {
72
72
  if (potentialActions === undefined) {
73
73
  throw new factory.errors.NotFound('Transaction PotentialActions');
74
74
  }
75
+ const orderFromTransaction = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
76
+ if (orderFromTransaction === undefined) {
77
+ throw new factory.errors.NotFound('Transaction Result');
78
+ }
75
79
  const orderActionAttributes = potentialActions.order;
76
80
  const placeOrderTaskAttributes = {
77
81
  project: transaction.project,
@@ -81,9 +85,8 @@ function createTasks(params) {
81
85
  remainingNumberOfTries: 10,
82
86
  numberOfTried: 0,
83
87
  executionResults: [],
84
- // data: orderActionAttributes
85
88
  data: Object.assign({ project: orderActionAttributes.project, object: {
86
- confirmationNumber: orderActionAttributes.object.confirmationNumber,
89
+ confirmationNumber: orderFromTransaction.confirmationNumber,
87
90
  orderNumber: orderActionAttributes.object.orderNumber
88
91
  } }, (orderActionAttributes.potentialActions !== undefined)
89
92
  ? { potentialActions: orderActionAttributes.potentialActions }
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js CHANGED
@@ -48,7 +48,8 @@ function createGivePointAwardActions(params) {
48
48
  seller: params.order.seller,
49
49
  // mask
50
50
  customer: (0, order_1.createMaskedCustomer)(params.order),
51
- confirmationNumber: params.order.confirmationNumber,
51
+ // IOrderへ移行(2022-11-17~)
52
+ // confirmationNumber: params.order.confirmationNumber,
52
53
  orderNumber: params.order.orderNumber,
53
54
  price: params.order.price,
54
55
  priceCurrency: params.order.priceCurrency,
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.js CHANGED
@@ -66,7 +66,8 @@ function createMoneyTransferActions(params) {
66
66
  seller: params.order.seller,
67
67
  // mask
68
68
  customer: (0, order_1.createMaskedCustomer)(params.order),
69
- confirmationNumber: params.order.confirmationNumber,
69
+ // IOrderへ移行(2022-11-17~)
70
+ // confirmationNumber: params.order.confirmationNumber,
70
71
  orderNumber: params.order.orderNumber,
71
72
  price: params.order.price,
72
73
  priceCurrency: params.order.priceCurrency,
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js CHANGED
@@ -51,7 +51,8 @@ function createRegisterServiceActions(params) {
51
51
  seller: params.order.seller,
52
52
  // mask
53
53
  customer: (0, order_1.createMaskedCustomer)(params.order),
54
- confirmationNumber: params.order.confirmationNumber,
54
+ // IOrderへ移行(2022-11-17~)
55
+ // confirmationNumber: params.order.confirmationNumber,
55
56
  orderNumber: params.order.orderNumber,
56
57
  price: params.order.price,
57
58
  priceCurrency: params.order.priceCurrency,
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js CHANGED
@@ -25,7 +25,8 @@ function createSendEmailMessageActions(params) {
25
25
  seller: params.order.seller,
26
26
  // mask
27
27
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
28
- confirmationNumber: params.order.confirmationNumber,
28
+ // IOrderへ移行(2022-11-17~)
29
+ // confirmationNumber: params.order.confirmationNumber,
29
30
  orderNumber: params.order.orderNumber,
30
31
  price: params.order.price,
31
32
  priceCurrency: params.order.priceCurrency,
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.js CHANGED
@@ -41,7 +41,8 @@ function createPotentialActions(params) {
41
41
  seller: params.order.seller,
42
42
  // mask
43
43
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
44
- confirmationNumber: params.order.confirmationNumber,
44
+ // IOrderへ移行(2022-11-17~)
45
+ // confirmationNumber: params.order.confirmationNumber,
45
46
  orderNumber: params.order.orderNumber,
46
47
  price: params.order.price,
47
48
  priceCurrency: params.order.priceCurrency,
package/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.js CHANGED
@@ -23,7 +23,8 @@ function createReturnMoneyTransferActions(params) {
23
23
  seller: order.seller,
24
24
  // mask
25
25
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
26
- confirmationNumber: order.confirmationNumber,
26
+ // IOrderへ移行(2022-11-17~)
27
+ // confirmationNumber: order.confirmationNumber,
27
28
  orderNumber: order.orderNumber,
28
29
  price: order.price,
29
30
  priceCurrency: order.priceCurrency,
package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js CHANGED
@@ -45,7 +45,8 @@ function createReturnPaymentMethodPotentialActions(params) {
45
45
  seller: order.seller,
46
46
  // mask
47
47
  customer: (0, order_1.createMaskedCustomer)(order),
48
- confirmationNumber: order.confirmationNumber,
48
+ // IOrderへ移行(2022-11-17~)
49
+ // confirmationNumber: order.confirmationNumber,
49
50
  orderNumber: order.orderNumber,
50
51
  price: order.price,
51
52
  priceCurrency: order.priceCurrency,
@@ -109,7 +110,8 @@ function createReturnPaymentMethodActions(params) {
109
110
  seller: order.seller,
110
111
  // mask
111
112
  customer: (0, order_1.createMaskedCustomer)(order),
112
- confirmationNumber: order.confirmationNumber,
113
+ // IOrderへ移行(2022-11-17~)
114
+ // confirmationNumber: order.confirmationNumber,
113
115
  orderNumber: order.orderNumber,
114
116
  price: order.price,
115
117
  priceCurrency: order.priceCurrency,
@@ -179,7 +181,8 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
179
181
  seller: order.seller,
180
182
  // mask
181
183
  customer: (0, order_1.createMaskedCustomer)(order),
182
- confirmationNumber: order.confirmationNumber,
184
+ // IOrderへ移行(2022-11-17~)
185
+ // confirmationNumber: order.confirmationNumber,
183
186
  orderNumber: order.orderNumber,
184
187
  price: order.price,
185
188
  priceCurrency: order.priceCurrency,
package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js CHANGED
@@ -54,7 +54,8 @@ function createReturnPointAwardActions(params) {
54
54
  seller: order.seller,
55
55
  // mask
56
56
  customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
57
- confirmationNumber: order.confirmationNumber,
57
+ // IOrderへ移行(2022-11-17~)
58
+ // confirmationNumber: order.confirmationNumber,
58
59
  orderNumber: order.orderNumber,
59
60
  price: order.price,
60
61
  priceCurrency: order.priceCurrency,
package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js CHANGED
@@ -23,7 +23,8 @@ function createSendEmailMessaegActionsOnReturn(params) {
23
23
  seller: order.seller,
24
24
  // mask
25
25
  customer: (0, order_1.createMaskedCustomer)(order),
26
- confirmationNumber: order.confirmationNumber,
26
+ // IOrderへ移行(2022-11-17~)
27
+ // confirmationNumber: order.confirmationNumber,
27
28
  orderNumber: order.orderNumber,
28
29
  price: order.price,
29
30
  priceCurrency: order.priceCurrency,
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  }
10
10
  ],
11
11
  "dependencies": {
12
- "@chevre/factory": "4.277.0",
12
+ "@chevre/factory": "4.278.0-alpha.0",
13
13
  "@cinerino/sdk": "3.132.1",
14
14
  "@motionpicture/coa-service": "9.2.0",
15
15
  "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
120
120
  "postversion": "git push origin --tags",
121
121
  "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
122
122
  },
123
- "version": "20.1.0-alpha.6"
123
+ "version": "20.1.0-alpha.7"
124
124
  }