@chevre/domain 21.26.0-alpha.2 → 21.26.0-alpha.3

package/example/src/chevre/validateOrder.ts

@@ -22,7 +22,7 @@ async function main() {
             orderDate: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-31, 'days')
+                    .add(-365, 'days')
                     .toDate()
             }
         },
@@ -41,12 +41,13 @@ async function main() {
     const unexpextedprojectIds: string[] = [];
 
     let i = 0;
+    let unexpextedOrderCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
         const order: Pick<chevre.factory.order.IOrder, 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> = doc.toObject();
 
         try {
-            console.log('validating order...', order.project.id, order.typeOf, order.orderNumber, order.orderDate, i);
+            console.log('validating order...', order.project.id, order.typeOf, order.orderNumber, order.orderDate, i, unexpextedOrderCount);
             const result = await validateOrder({
                 orderNumber: order.orderNumber,
                 project: { id: order.project.id }
@@ -58,6 +59,7 @@ async function main() {
             console.log(result);
         } catch (error) {
             console.error(error);
+            unexpextedOrderCount += 1;
             unexpextedOrders.push({
                 orderDate: order.orderDate,
                 orderNumber: order.orderNumber,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -1,5 +1,4 @@
 import * as factory from '../../../../factory';
-type IAcceptedOffer = Pick<factory.order.IAcceptedOffer<factory.order.IItemOffered>, 'itemOffered' | 'offeredThrough'>;
 type IProcessingOrder = factory.order.IOrder & {
     numAcceptedOffers: number;
     orderStatus: factory.orderStatus.OrderProcessing;
@@ -16,4 +15,5 @@ declare function createConfirmReservationActionObject4COAByOrder(params: {
     };
 }): factory.task.confirmReserveTransaction.IObject4COAOptimized[];
 type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-export { IAcceptedOffer, IExternalOrder, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder };
+declare function createCheckResourceTask(order: IProcessingOrder): factory.task.checkResource.IAttributes;
+export { IExternalOrder, createInformTasks, createCheckResourceTask, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder };

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = void 0;
+exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createCheckResourceTask = exports.createInformTasks = void 0;
 const factory = require("../../../../factory");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
 const settings_1 = require("../../../../settings");
@@ -104,3 +104,25 @@ function createConfirmReservationActionObject4COAByOrder(params) {
     });
 }
 exports.createConfirmReservationActionObject4COAByOrder = createConfirmReservationActionObject4COAByOrder;
+function createCheckResourceTask(order) {
+    const taskRunsAt = new Date();
+    const data = {
+        object: {
+            orderNumber: order.orderNumber,
+            typeOf: order.typeOf
+        },
+        project: order.project,
+        typeOf: factory.actionType.CheckAction
+    };
+    return {
+        project: order.project,
+        name: factory.taskName.CheckResource,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data
+    };
+}
+exports.createCheckResourceTask = createCheckResourceTask;

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

@@ -16,7 +16,6 @@ exports.onOrderProcessing = void 0;
 const createDebug = require("debug");
 const util = require("util");
 const factory = require("../../../factory");
-// import { createMaskedCustomer } from '../../../factory/order';
 const settings_1 = require("../../../settings");
 const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
 const factory_1 = require("./onOrderProcessing/factory");
@@ -44,7 +43,8 @@ function onOrderProcessing(params) {
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order)
+                    ...(0, factory_1.createInformTasks)(params.order),
+                    ...(settings_1.USE_CHECK_RESOURCE_TASK) ? [(0, factory_1.createCheckResourceTask)(params.order)] : [] // リソース検証タスクを追加(2024-03-13~)
                 ];
                 break;
             default:

package/lib/chevre/service/task/checkResource.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.checkResource.IData): IOperation<void>;

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

@@ -0,0 +1,64 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
+const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
+const order_1 = require("../../repo/order");
+const validateOrder_1 = require("../validation/validateOrder");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
+        const acceptedOfferRepo = new acceptedOffer_1.MongoRepository(connection);
+        const actionRepo = new action_1.MongoRepository(connection);
+        const assetTransactionRepo = new assetTransaction_1.MongoRepository(connection);
+        const orderRepo = new order_1.MongoRepository(connection);
+        const actionAttributes = {
+            agent: { id: data.project.id, typeOf: factory.organizationType.Project },
+            object: data.object,
+            project: { id: data.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.CheckAction
+        };
+        const action = yield actionRepo.start(actionAttributes);
+        try {
+            switch (data.object.typeOf) {
+                case factory.order.OrderType.Order:
+                    yield (0, validateOrder_1.validateOrder)({
+                        orderNumber: data.object.orderNumber,
+                        project: { id: data.project.id }
+                    })({
+                        acceptedOffer: acceptedOfferRepo,
+                        assetTransaction: assetTransactionRepo,
+                        order: orderRepo
+                    });
+                    break;
+                default:
+                    throw new factory.errors.NotImplemented(`${data.object.typeOf} not implemented`);
+            }
+        }
+        catch (error) {
+            try {
+                yield actionRepo.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        const actionResult = {};
+        yield actionRepo.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+    });
+}
+exports.call = call;

package/lib/chevre/settings.d.ts

@@ -43,6 +43,7 @@ export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
 export declare const USE_MINIMIZED_PAY_TASK: boolean;
 export declare const USE_VALIDATE_PROJECT_MAKES_OFFER: boolean;
 export declare const USE_OWNERSHIP_INFO_BY_WEB_APPLICATION: boolean;
+export declare const USE_CHECK_RESOURCE_TASK: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = 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.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = 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.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -67,6 +67,7 @@ exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = process.env.USE_SEND_EMAIL_
 exports.USE_MINIMIZED_PAY_TASK = process.env.USE_MINIMIZED_PAY_TASK === '1';
 exports.USE_VALIDATE_PROJECT_MAKES_OFFER = process.env.USE_VALIDATE_PROJECT_MAKES_OFFER === '1';
 exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = process.env.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION === '1';
+exports.USE_CHECK_RESOURCE_TASK = process.env.USE_CHECK_RESOURCE_TASK === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.362.0-alpha.2",
-    "@cinerino/sdk": "5.14.0-alpha.0",
+    "@chevre/factory": "4.362.0-alpha.3",
+    "@cinerino/sdk": "5.14.0-alpha.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.26.0-alpha.2"
+  "version": "21.26.0-alpha.3"
 }