@chevre/domain 28.1.0 → 28.2.0-alpha.1

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 (9) hide show
  1. package/lib/chevre/service/assetTransaction/reserve/confirm/factory.d.ts +2 -3
  2. package/lib/chevre/service/assetTransaction/reserve/confirm/factory.js +8 -63
  3. package/lib/chevre/service/assetTransaction/reserve/confirm.js +2 -6
  4. package/lib/chevre/service/offer/event/authorize.js +6 -5
  5. package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js +18 -13
  6. package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +0 -10
  7. package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +0 -10
  8. package/lib/chevre/service/order/sendOrder.js +0 -1
  9. package/package.json +2 -2
package/lib/chevre/service/assetTransaction/reserve/confirm/factory.d.ts CHANGED
@@ -1,8 +1,7 @@
1
1
  import { factory } from '../../../../factory';
2
- declare function createPotentialActions(params: {
2
+ declare function createUnderName(params: {
3
3
  order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
4
4
  }): {
5
- potentialActions: factory.assetTransaction.reserve.IPotentialActions;
6
5
  underName?: factory.assetTransaction.reserve.IUnderName;
7
6
  };
8
- export { createPotentialActions };
7
+ export { createUnderName };
package/lib/chevre/service/assetTransaction/reserve/confirm/factory.js CHANGED
@@ -1,67 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createPotentialActions = createPotentialActions;
4
- function createPotentialActions(params) {
5
- // const transaction = params.transaction;
6
- // const reservationFor = transaction.object.reservationFor;
7
- // if (reservationFor === undefined) {
8
- // throw new factory.errors.NotFound('transaction.object.reservationFor');
9
- // }
10
- // discontinue(2024-07-01~)
11
- // const useOptimizeReservation: boolean = !USE_OPTIMIZE_RESERVATION_EXCEPTIONS.includes(transaction.project.id);
12
- // 予約アクション属性作成
13
- // const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
14
- // let reserveActionAttributes: factory.action.reserve.IAttributes[] = [];
15
- // let reservationPackage: factory.action.reserve.IObject | undefined;
3
+ exports.createUnderName = createUnderName;
4
+ function createUnderName(params) {
16
5
  let underName;
17
6
  // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
18
7
  if (typeof params.order?.typeOf === 'string') {
19
8
  const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
20
9
  underName = ordre2reservationUnderNameResult.underName;
21
10
  }
22
- // if (pendingReservations.length > 0) {
23
- // const moneyTransferActions: factory.action.transfer.moneyTransfer.IAttributes[] = [];
24
- // pendingReservations.forEach((reservation) => {
25
- // const acceptedOffer4reservation = transaction.object.acceptedOffer?.find(
26
- // (o) => o.itemOffered?.serviceOutput?.id === reservation.id
27
- // );
28
- // moneyTransferActions.push(...createMoneyTransferActions({
29
- // acceptedOffer: acceptedOffer4reservation,
30
- // reservation,
31
- // transaction: params.transaction,
32
- // underName
33
- // }));
34
- // });
35
- // reservationPackage = {
36
- // reservationFor: {
37
- // id: String(reservationFor.id),
38
- // typeOf: reservationFor.typeOf,
39
- // optimized: true
40
- // }, // optimize(2024-01-24~)
41
- // reservationNumber: transaction.object.reservationNumber,
42
- // reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
43
- // ? params.transaction.object.reservationStatus
44
- // : factory.reservationStatusType.ReservationPending,
45
- // typeOf: factory.reservationType.ReservationPackage
46
- // };
47
- // reserveActionAttributes = [{
48
- // project: transaction.project,
49
- // typeOf: <factory.actionType.ReserveAction>factory.actionType.ReserveAction,
50
- // object: reservationPackage,
51
- // agent: transaction.project,
52
- // potentialActions: {
53
- // moneyTransfer: moneyTransferActions
54
- // },
55
- // purpose: { typeOf: transaction.typeOf, id: transaction.id }
56
- // }];
57
- // }
58
- return {
59
- potentialActions: {
60
- // reserve: reserveActionAttributes // discontinue(2024-07-01~)
61
- },
62
- // reservationPackage,
63
- underName
64
- };
11
+ return { underName };
65
12
  }
66
13
  /**
67
14
  * 予約のunderName.identifierを決定する
@@ -69,9 +16,6 @@ function createPotentialActions(params) {
69
16
  function createReservationUnderNameIdentifier(params) {
70
17
  // 必要最低限の識別子のみ継承する(2024-03-16~)
71
18
  let identifiersFromCustomer = (Array.isArray(params.order.customer.identifier)) ? params.order.customer.identifier : [];
72
- // if (params.useOptimizeReservation) {
73
- // identifiersFromCustomer = identifiersFromCustomer.filter(({ name }) => name === 'clientId');
74
- // }
75
19
  identifiersFromCustomer = identifiersFromCustomer.filter(({ name }) => name === 'clientId');
76
20
  return [
77
21
  { name: 'orderNumber', value: params.order.orderNumber },
@@ -83,15 +27,16 @@ function createReservationUnderName(params) {
83
27
  identifier: createReservationUnderNameIdentifier({ order: params.order }),
84
28
  name: String(params.order.customer.name),
85
29
  typeOf: params.order.customer.typeOf,
86
- ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
87
- ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
88
30
  ...(typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined,
89
31
  ...(typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined,
90
- ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
91
32
  ...(typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined,
92
33
  ...(typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined,
93
34
  ...(typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined,
94
- ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined
35
+ // 以下廃止(2026-11-11~)
36
+ // ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
37
+ // ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
38
+ // ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
39
+ // ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined,
95
40
  };
96
41
  }
97
42
  /**
package/lib/chevre/service/assetTransaction/reserve/confirm.js CHANGED
@@ -29,11 +29,7 @@ function confirm(params) {
29
29
  throw new factory_1.factory.errors.ArgumentNull('Transaction ID or Transaction Number');
30
30
  }
31
31
  const order = await fixOrderAsPurpose(params, transaction)(repos);
32
- const { potentialActions, underName } = (0, factory_2.createPotentialActions)({
33
- // ...params,
34
- // transaction,
35
- order
36
- });
32
+ const { underName } = (0, factory_2.createUnderName)({ order });
37
33
  // 取引確定
38
34
  const result = {};
39
35
  await repos.assetTransaction.confirm({
@@ -43,7 +39,7 @@ function confirm(params) {
43
39
  // potentialActions: (USE_ASSET_TRANSACTION_SYNC_PROCESSING)
44
40
  // ? { reserve: [] }
45
41
  // : potentialActions, // discontinue(2024-07-01~)
46
- potentialActions,
42
+ potentialActions: {},
47
43
  ...(typeof underName?.typeOf === 'string')
48
44
  ? { object: { underName } }
49
45
  : undefined
package/lib/chevre/service/offer/event/authorize.js CHANGED
@@ -305,11 +305,12 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
305
305
  ...(itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined,
306
306
  },
307
307
  addOn: acceptedAddOns,
308
- // 追加属性をマージ
309
- additionalProperty: [
310
- ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
311
- ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
312
- ]
308
+ // discontinue additionalProperty(2026-11-11~)
309
+ // // 追加属性をマージ
310
+ // additionalProperty: [
311
+ // ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
312
+ // ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
313
+ // ]
313
314
  };
314
315
  };
315
316
  }
package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js CHANGED
@@ -7,14 +7,29 @@ function creteOrder4inform(order) {
7
7
  const { deliveredAcceptedOffers, project, typeOf, orderNumber } = order;
8
8
  const acceptedOffers = deliveredAcceptedOffers.map((acceptedOffer) => {
9
9
  if (acceptedOffer.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA) {
10
- // COAでは最小化しない
11
- return acceptedOffer;
10
+ const { itemOffered, ...acceptedOfferWithtoutItemOffered } = acceptedOffer;
11
+ const { reservedTicket, ...itemOfferedWithoutReservedTicket } = itemOffered;
12
+ const { ticketType: _ticketType, ...reservedTicketwithoutTicketType } = reservedTicket;
13
+ const itemOffered4inform = {
14
+ ...itemOfferedWithoutReservedTicket,
15
+ reservedTicket: reservedTicketwithoutTicketType, // discontinue ticketType(2026-11-10~)
16
+ };
17
+ // // COAでは最小化しない
18
+ // return acceptedOffer as factory.acceptedOffer.ICOAAcceptedOffer;
19
+ return {
20
+ ...acceptedOfferWithtoutItemOffered,
21
+ itemOffered: itemOffered4inform
22
+ };
12
23
  }
13
24
  else {
14
25
  const { itemOffered, ...acceptedOfferWithtoutItemOffered } = acceptedOffer;
15
26
  const { reservationFor, issuedThrough: _issuedThrough, programMembershipUsed: _programMembershipUsed, ...itemOfferedWithoutReservationFor } = itemOffered;
27
+ const { reservedTicket, ...itemOfferedWithoutReservedTicket } = itemOfferedWithoutReservationFor;
28
+ const { ticketType: _ticketType, ...reservedTicketwithoutTicketType } = reservedTicket;
16
29
  const itemOffered4inform = {
17
- ...itemOfferedWithoutReservationFor,
30
+ // ...itemOfferedWithoutReservationFor,
31
+ ...itemOfferedWithoutReservedTicket,
32
+ reservedTicket: reservedTicketwithoutTicketType, // discontinue ticketType(2026-11-10~)
18
33
  reservationFor: { id: reservationFor.id, typeOf: reservationFor.typeOf } // minimize reservationFor(2026-09-28~)
19
34
  };
20
35
  return {
@@ -81,19 +96,9 @@ setting) {
81
96
  function createNextSendOrderTasks(params) {
82
97
  const now = new Date();
83
98
  const taskAttributes = [];
84
- // const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
85
99
  const simpleOrder = {
86
100
  typeOf: params.order.typeOf,
87
- // seller: {
88
- // id: params.order.seller.id,
89
- // typeOf: params.order.seller.typeOf,
90
- // name: params.order.seller.name
91
- // }, // 廃止(2024-03-06~)
92
- // mask
93
- // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
94
101
  orderNumber: params.order.orderNumber,
95
- // price: params.order.price,
96
- // priceCurrency: params.order.priceCurrency,
97
102
  orderDate: params.order.orderDate
98
103
  };
99
104
  const sendOrderObject = {
package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js CHANGED
@@ -30,19 +30,9 @@ function onOrderInTransit(params) {
30
30
  function createSendOrderTaskIfNotExist(params) {
31
31
  return async (repos, settings) => {
32
32
  const now = new Date();
33
- // const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
34
33
  const simpleOrder = {
35
34
  typeOf: params.order.typeOf,
36
- // seller: {
37
- // id: params.order.seller.id,
38
- // typeOf: params.order.seller.typeOf,
39
- // name: params.order.seller.name
40
- // }, // 廃止(2024-03-06~)
41
- // mask
42
- // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
43
35
  orderNumber: params.order.orderNumber,
44
- // price: params.order.price,
45
- // priceCurrency: params.order.priceCurrency,
46
36
  orderDate: params.order.orderDate
47
37
  };
48
38
  const sendOrderObject = {
package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js CHANGED
@@ -10,7 +10,6 @@ exports.onOrderReturned = onOrderReturned;
10
10
  const debug_1 = __importDefault(require("debug"));
11
11
  const customerTelephone2COATelNum_1 = require("../../../factory/customerTelephone2COATelNum");
12
12
  const factory_1 = require("../../../factory");
13
- // import { createMaskedCustomer } from '../../../factory/order';
14
13
  const factory_2 = require("./onOrderReturned/factory");
15
14
  const debug = (0, debug_1.default)('chevre-domain:service:order');
16
15
  function onOrderReturned(params) {
@@ -20,18 +19,9 @@ function onOrderReturned(params) {
20
19
  const setting = await repos.integrationSetting.getByKey('agg');
21
20
  debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
22
21
  let tasks;
23
- // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
24
22
  const simpleOrder = {
25
23
  typeOf: params.order.typeOf,
26
- // seller: {
27
- // id: params.order.seller.id,
28
- // typeOf: params.order.seller.typeOf,
29
- // name: params.order.seller.name
30
- // }, // 廃止(2024-03-06~)
31
- // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
32
24
  orderNumber: params.order.orderNumber,
33
- // price: params.order.price,
34
- // priceCurrency: params.order.priceCurrency,
35
25
  orderDate: params.order.orderDate
36
26
  };
37
27
  switch (params.order.orderStatus) {
package/lib/chevre/service/order/sendOrder.js CHANGED
@@ -40,7 +40,6 @@ function sendOrder(params) {
40
40
  if (order.confirmationNumber !== confirmationNumber) {
41
41
  throw new factory_1.factory.errors.NotFound('Order');
42
42
  }
43
- // const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
44
43
  const simpleOrder = {
45
44
  typeOf: order.typeOf,
46
45
  orderNumber: order.orderNumber,
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": "11.2.0-alpha.1",
14
+ "@chevre/factory": "11.2.0-alpha.3",
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",
@@ -89,5 +89,5 @@
89
89
  "postversion": "git push origin --tags",
90
90
  "prepublishOnly": "npm run clean && npm run build"
91
91
  },
92
- "version": "28.1.0"
92
+ "version": "28.2.0-alpha.1"
93
93
  }