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

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

@@ -26,32 +26,10 @@ function getOrderWithToken(params) {
         if (typeof credentials_1.credentials.hub.clientId !== 'string') {
             return params.order;
         }
-        // 冗長な個人情報をマスク(最低限の情報に)
-        // const customer4orderToken: factory.order.ISimpleCustomer =
-        //     (params.order.customer.typeOf === factory.organizationType.Organization)
-        //         ? {
-        //             id: params.order.customer.id,
-        //             name: '****',
-        //             // project: params.order.customer.project,
-        //             typeOf: params.order.customer.typeOf
-        //         }
-        //         : {
-        //             id: params.order.customer.id,
-        //             typeOf: params.order.customer.typeOf
-        //         };
-        // const seller4orderToken: Omit<factory.order.ISeller, 'name'> = {
-        //     id: params.order.seller.id,
-        //     typeOf: params.order.seller.typeOf
-        // };
         // 最適化(2023-01-31~)
         const order4token = {
             typeOf: params.order.typeOf,
-            // seller: seller4orderToken,
-            // customer: customer4orderToken,
             orderNumber: params.order.orderNumber
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
-            // orderDate: params.order.orderDate
         };
         const token = yield new Promise((resolve, reject) => {
             // 所有権を暗号化する
@@ -163,26 +141,31 @@ const ORDER_STORAGE_PERIOD_IN_DAYS = (typeof process.env.ORDER_STORAGE_PERIOD_IN
     // tslint:disable-next-line:no-magic-numbers
     365;
 function createDeleteTasks(order) {
-    return [{
-            project: order.project,
-            name: factory.taskName.DeleteOrder,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(order.orderDate)
-                .add(ORDER_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 10,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: {
-                    confirmationNumber: order.confirmationNumber,
-                    orderDate: order.orderDate,
-                    orderNumber: order.orderNumber,
-                    project: order.project,
-                    typeOf: order.typeOf
+    if (settings_1.USE_DELETE_ORDER_TASK) {
+        return [{
+                project: order.project,
+                name: factory.taskName.DeleteOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: moment(order.orderDate)
+                    .add(ORDER_STORAGE_PERIOD_IN_DAYS, 'days')
+                    .toDate(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    object: {
+                        confirmationNumber: order.confirmationNumber,
+                        orderDate: order.orderDate,
+                        orderNumber: order.orderNumber,
+                        project: order.project,
+                        typeOf: order.typeOf
+                    }
                 }
-            }
-        }];
+            }];
+    }
+    else {
+        return [];
+    }
 }
 exports.createDeleteTasks = createDeleteTasks;
 function createConfirmReservationActionObject4ChevreByOrder(params) {

package/lib/chevre/service/task/importOffersFromCOA.js

@@ -35,6 +35,10 @@ function call(data) {
             offer: offerRepo,
             masterService
         });
+        yield OfferService.event.importCategoryCodesFromCOA(data)({
+            categoryCode: categoryCodeRepo,
+            masterService
+        });
     });
 }
 exports.call = call;

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

@@ -7,6 +7,7 @@ const settings_1 = require("../../../../settings");
 /**
  * 取引のタスクを作成する
  */
+// tslint:disable-next-line:max-func-body-length
 function createTasks(params) {
     const taskAttributes = [];
     const transaction = params.transaction;
@@ -38,6 +39,9 @@ function createTasks(params) {
             object: {
                 endDate: transaction.endDate,
                 id: transaction.id,
+                object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+                    ? { pendingTransaction: transaction.object.pendingTransaction }
+                    : undefined),
                 project: transaction.project,
                 startDate: transaction.startDate,
                 typeOf: transaction.typeOf

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

@@ -17,7 +17,9 @@ function createStartParams(params, passport, seller, amount, fromLocation, toLoc
             // ↓最適化(2022-05-24~)
             // ...{ project: seller.project }
         },
-        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, authorizeActions: [], pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, 
+            // authorizeActions: [],
+            pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
                 ? { identifier: params.object.pendingTransaction.identifier }
                 : undefined) }, (passport !== undefined) ? { passport } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined),
         expires: params.expires

package/lib/chevre/service/transaction/moneyTransfer/potentialActions.d.ts

@@ -4,5 +4,6 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
     transaction: factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>;
 }): Promise<factory.transaction.IPotentialActions<factory.transactionType.MoneyTransfer>>;

package/lib/chevre/service/transaction/moneyTransfer/potentialActions.js

@@ -13,7 +13,7 @@ exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
 function createMoneyTransferActions(params) {
     const moneyTransferActions = [];
-    const authorizeMoneyTransferActions = params.transaction.object.authorizeActions
+    const authorizeMoneyTransferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
         .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

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

@@ -519,19 +519,17 @@ function confirm(params) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
         // 取引に対する全ての承認アクションをマージ
-        transaction.object.authorizeActions = yield searchAuthorizeActions({
+        const authorizeActions = yield searchAuthorizeActions({
             transaction: transaction,
             now: now
         })(repos);
         // ポストアクションを作成
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
-            transaction: transaction
-        });
+        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({ authorizeActions, transaction });
         // 取引確定
         yield repos.transaction.confirm({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
-            authorizeActions: transaction.object.authorizeActions,
+            authorizeActions: [],
             result: {},
             potentialActions: potentialActions
         });
@@ -551,9 +549,8 @@ function searchAuthorizeActions(params) {
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {
-            return a.endDate !== undefined
-                && moment(a.endDate)
-                    .toDate() < params.now;
+            return (a.endDate instanceof Date) && moment(a.endDate)
+                .isBefore(moment(params.now));
         });
         return authorizeActions;
     });

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

@@ -78,6 +78,11 @@ function createTasks(params) {
             object: {
                 endDate: transaction.endDate,
                 id: transaction.id,
+                object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+                    ? { confirmationNumber: transaction.object.confirmationNumber }
+                    : undefined), (typeof transaction.object.orderNumber === 'string')
+                    ? { orderNumber: transaction.object.orderNumber }
+                    : undefined),
                 project: transaction.project,
                 startDate: transaction.startDate,
                 typeOf: transaction.typeOf

package/lib/chevre/service/transaction/placeOrderInProgress.d.ts

@@ -1,6 +1,3 @@
-/**
- * 進行中注文取引サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { RedisRepository as ConfirmationNumberRepo } from '../../repo/confirmationNumber';

package/lib/chevre/service/transaction/placeOrderInProgress.js

@@ -13,6 +13,7 @@ exports.voidAward = exports.authorizeAward = exports.publishOrderNumberIfNotExis
 /**
  * 進行中注文取引サービス
  */
+const moment = require("moment");
 const factory = require("../../factory");
 const factory_1 = require("./placeOrderInProgress/factory");
 const potentialActions_1 = require("./placeOrderInProgress/potentialActions");
@@ -262,7 +263,10 @@ function searchAuthorizeActions(params) {
             actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
-        authorizeActions = authorizeActions.filter((a) => (a.endDate !== undefined && a.endDate < params.result.order.orderDate));
+        authorizeActions = authorizeActions.filter((a) => {
+            return (a.endDate instanceof Date) && moment(a.endDate)
+                .isBefore(moment(params.result.order.orderDate));
+        });
         return authorizeActions;
     });
 }

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

@@ -39,6 +39,9 @@ function createTasks(params) {
             object: {
                 endDate: transaction.endDate,
                 id: transaction.id,
+                object: {
+                    order: transaction.object.order
+                },
                 project: transaction.project,
                 startDate: transaction.startDate,
                 typeOf: transaction.typeOf

package/lib/chevre/settings.d.ts

@@ -33,6 +33,7 @@ export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
+export declare const USE_DELETE_ORDER_TASK: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 /**
  * グローバル設定

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_DELETE_ORDER_TASK = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -59,6 +59,7 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-08-31T15:00:00Z');
+exports.USE_DELETE_ORDER_TASK = process.env.USE_DELETE_ORDER_TASK === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.2",
+    "@chevre/factory": "4.313.0-alpha.3",
     "@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.55"
+  "version": "21.2.0-alpha.57"
 }