@chevre/domain 21.2.0-alpha.53 → 21.2.0-alpha.55

package/example/src/chevre/importEventsFromCOA.ts

@@ -21,11 +21,10 @@ async function main() {
             id: project.id,
             typeOf: chevre.factory.organizationType.Project
         },
-        locationBranchCode: '120',
-        importFrom: moment()
+        locationBranchCode: '018',
+        importFrom: moment('2023-05-17T02:45:00.214Z')
             .toDate(),
-        importThrough: moment()
-            .add(1, 'day')
+        importThrough: moment('2023-05-20T02:45:00.214Z')
             .toDate(),
         saveMovieTheater: false,
         saveScreeningEventSeries: false

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -126,8 +126,9 @@ function createPayObjectServiceOutput(params) {
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
                     var _a;
+                    const amount = movieTicket2amount(transaction, movieTicket);
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
-                    return Object.assign({ identifier: movieTicket.identifier }, (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                    return Object.assign(Object.assign({ identifier: movieTicket.identifier }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                         ? {
                             serviceOutput: reservation4invoice
                         }
@@ -140,6 +141,21 @@ function createPayObjectServiceOutput(params) {
     }
     return paymentServiceOutput;
 }
+function movieTicket2amount(transaction, movieTicket) {
+    var _a;
+    let amount;
+    const accountsReceivables = transaction.object.accountsReceivablesByServiceType;
+    if (Array.isArray(accountsReceivables)) {
+        const accountsReceivable = (_a = accountsReceivables.find((a) => a.serviceType === movieTicket.serviceType)) === null || _a === void 0 ? void 0 : _a.accountsReceivable;
+        if (typeof accountsReceivable === 'number') {
+            amount = {
+                typeOf: 'MonetaryAmount',
+                value: accountsReceivable
+            };
+        }
+    }
+    return amount;
+}
 function reservationPriceComponent2invoicePriceComponent(component) {
     var _a;
     const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')

package/lib/chevre/service/event.js

@@ -127,7 +127,7 @@ function importFromCOA(params) {
             })(repos);
             savedScreeningEventSeriesCount = savedEventsCount;
             try {
-                // イベントごとに永続化トライ
+                // イベント永続化
                 const screeningEvents = yield saveScreeningEvents({
                     locationBranchCode: params.locationBranchCode,
                     movieTheater: movieTheater,
@@ -154,6 +154,8 @@ function importFromCOA(params) {
                 // "message": "ESOCKETTIMEDOUT",
                 if (error.name === 'COAServiceError') {
                     if (error.message === 'ESOCKETTIMEDOUT') {
+                        // tslint:disable-next-line:no-console
+                        console.error('saveScreeningEvents throwed an error', error.name, error.message);
                         throwsError = false;
                     }
                 }

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -174,7 +174,13 @@ function createDeleteTasks(order) {
             numberOfTried: 0,
             executionResults: [],
             data: {
-                object: order
+                object: {
+                    confirmationNumber: order.confirmationNumber,
+                    orderDate: order.orderDate,
+                    orderNumber: order.orderNumber,
+                    project: order.project,
+                    typeOf: order.typeOf
+                }
             }
         }];
 }

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -12,8 +12,5 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
     project: ProjectRepo;
     seller: SellerRepo;
 }) => Promise<{
-    accountsReceivablesByServiceType: {
-        serviceType: string;
-        accountsReceivable?: number;
-    }[];
+    accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -42,10 +42,7 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 }>;
 interface IAuthorizeResult {
     accountId: string;
-    accountsReceivablesByServiceType: {
-        serviceType: string;
-        accountsReceivable?: number;
-    }[];
+    accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
     payAction: factory.action.trade.pay.IAction;
 }
 /**

package/lib/chevre/service/transaction/moneyTransfer/exportTasks/factory.js

@@ -35,7 +35,13 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: transaction
+            object: {
+                endDate: transaction.endDate,
+                id: transaction.id,
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf
+            }
         }
     };
     taskAttributes.push(deleteTransactionTask);

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -75,7 +75,13 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: transaction
+            object: {
+                endDate: transaction.endDate,
+                id: transaction.id,
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf
+            }
         }
     };
     // 確定取引にも決済承認中止タスクを追加(2023-05-03~)

package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js

@@ -36,7 +36,13 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: transaction
+            object: {
+                endDate: transaction.endDate,
+                id: transaction.id,
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf
+            }
         }
     };
     taskAttributes.push(deleteTransactionTask);

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.1",
+    "@chevre/factory": "4.313.0-alpha.2",
     "@cinerino/sdk": "3.156.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.53"
+  "version": "21.2.0-alpha.55"
 }