@chevre/domain 21.20.0-alpha.67 → 21.20.0-alpha.69

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.d.ts

@@ -4,6 +4,10 @@ declare function onOrderPaymentDue(params: {
     order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'customer' | 'orderDate' | 'seller' | 'typeOf' | 'price' | 'priceCurrency'> & {
         orderStatus: factory.orderStatus.OrderPaymentDue;
     };
+    /**
+     * 注文取引に注文コードが保管されている場合に対応
+     */
+    code?: string;
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -40,7 +40,10 @@ function onOrderPaymentDue(params) {
             case factory.orderStatus.OrderPaymentDue:
                 tasks = [
                     ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
-                    ...createCreateAccountingReportTask(params.order) // 経理レポート作成タスク(2024-02-02~)
+                    ...createCreateAccountingReportTask(params.order),
+                    ...(typeof params.code === 'string' && params.code.length > 0)
+                        ? createOnAuthorizationCreatedTask(params.order, params.code)
+                        : []
                 ];
                 break;
             default:
@@ -119,3 +122,25 @@ function createCreateAccountingReportTask(order) {
     };
     return [task];
 }
+function createOnAuthorizationCreatedTask(order, 
+/**
+ * 注文取引に注文コードが保管されている場合に対応
+ */
+code) {
+    const taskRunsAt = new Date();
+    const task = {
+        name: factory.taskName.OnAuthorizationCreated,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: { id: order.project.id },
+            code
+            // reserveIfNotYet: USE_RESERVE_IF_NOT_YET
+        },
+        project: { id: order.project.id, typeOf: factory.organizationType.Project }
+    };
+    return [task];
+}

package/lib/chevre/service/order/placeOrder.js

@@ -264,7 +264,7 @@ function verifyAcceptedOffers(params) {
 function placeOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -355,8 +355,8 @@ function placeOrder(params) {
             // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
-                yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
-                    order: {
+                const orderCodeFromTransaction = (_d = placeOrderTransaction.result) === null || _d === void 0 ? void 0 : _d.code;
+                yield (0, onOrderStatusChanged_1.onOrderPaymentDue)(Object.assign({ order: {
                         paymentMethods: order.paymentMethods,
                         project: order.project,
                         orderNumber: order.orderNumber,
@@ -368,8 +368,7 @@ function placeOrder(params) {
                         price: order.price,
                         priceCurrency: order.priceCurrency,
                         orderStatus: order.orderStatus
-                    }
-                })({
+                    } }, (typeof orderCodeFromTransaction === 'string') ? { code: orderCodeFromTransaction } : undefined))({
                     task: repos.task
                 });
                 // } else if (order.orderStatus === factory.orderStatus.OrderProcessing) {

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

@@ -1,4 +1,5 @@
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
+import type { MongoRepository as CodeRepo } from '../../../repo/code';
 import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
 import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
@@ -8,6 +9,7 @@ import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
     action: ActionRepo;
+    authorization: CodeRepo;
     emailMessage?: EmailMessageRepo;
     project: ProjectRepo;
     transaction: TransactionRepo;
@@ -25,10 +27,24 @@ type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
          * 確定レスポンスに予約IDを含めるかどうか(ttts対応)
          */
         expectsReservationIds: boolean;
+        /**
+         * 同期的にに注文コードを発行する場合に指定
+         */
+        publishCodeExpiresInSeconds?: number;
     };
 };
 /**
  * 注文取引を確定する
  */
-declare function confirm(params: IConfirmParams): IConfirmOperation<Pick<factory.transaction.placeOrder.IResult, 'order'>>;
+declare function confirm(params: IConfirmParams): IConfirmOperation<{
+    order: factory.order.IOrder;
+    /**
+     * expectsReservationIdsの場合のみ
+     */
+    eventId?: string;
+    /**
+     * expectsReservationIdsの場合のみ
+     */
+    reservationIds?: string[];
+}>;
 export { confirm };

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

@@ -26,6 +26,7 @@ const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const potentialActions_1 = require("./potentialActions");
+const publishCode_1 = require("./publishCode");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
 const publishOrderNumberIfNotExist_1 = require("./publishOrderNumberIfNotExist");
 const result_1 = require("./result");
@@ -34,6 +35,7 @@ const validation_1 = require("./validation");
  * 注文取引を確定する
  */
 function confirm(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         // 確認番号を事前発行
@@ -66,7 +68,18 @@ function confirm(params) {
             id: transaction.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions }));
+        // 必要あらば注文コード発行(2024-02-05~)
+        let code;
+        const publishCodeExpiresInSeconds = params.options.publishCodeExpiresInSeconds;
+        if (typeof publishCodeExpiresInSeconds === 'number') {
+            code = yield (0, publishCode_1.publishCode)({
+                project: { id: transaction.project.id },
+                object: { orderNumber },
+                validFrom: params.result.order.orderDate,
+                expiresInSeconds: publishCodeExpiresInSeconds
+            })(repos);
+        }
+        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions, code }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -198,14 +211,9 @@ function createResult(params) {
         reservationIds = reservationIdsResult.reservationIds;
     }
     return {
-        result: {
-            order: orderAsResult,
-            authorizeActions,
-            numAcceptedOffers: order.acceptedOffers.length,
-            options: {
+        result: Object.assign({ order: orderAsResult, authorizeActions, numAcceptedOffers: order.acceptedOffers.length, options: {
                 ignoreAccpetedOffersFromResult: ((_a = params.options) === null || _a === void 0 ? void 0 : _a.ignoreAccpetedOffersFromResult) === true
-            }
-        },
+            } }, (typeof params.code === 'string') ? { code: params.code } : undefined),
         eventId,
         reservationIds
     };

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

@@ -0,0 +1,14 @@
+import type { MongoRepository as CodeRepo } from '../../../repo/code';
+declare function publishCode(params: {
+    project: {
+        id: string;
+    };
+    object: {
+        orderNumber: string;
+    };
+    validFrom: Date;
+    expiresInSeconds: number;
+}): (repos: {
+    authorization: CodeRepo;
+}) => Promise<string>;
+export { publishCode };

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

@@ -0,0 +1,41 @@
+"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.publishCode = void 0;
+const factory = require("../../../factory");
+function publishCode(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const authorizationObject = {
+            typeOf: factory.order.OrderType.Order,
+            orderNumber: params.object.orderNumber
+        };
+        let authorizations;
+        try {
+            authorizations = yield repos.authorization.publish([{
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    object: authorizationObject,
+                    validFrom: params.validFrom,
+                    expiresInSeconds: params.expiresInSeconds
+                }]);
+        }
+        catch (error) {
+            throw error;
+        }
+        const code = (_a = authorizations.shift()) === null || _a === void 0 ? void 0 : _a.code;
+        if (typeof code !== 'string') {
+            // 基本的にありえないフロー
+            throw new factory.errors.ServiceUnavailable('code not published by an unexpected reason');
+        }
+        return code;
+    });
+}
+exports.publishCode = publishCode;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.353.0-alpha.2",
+    "@chevre/factory": "4.353.0-alpha.3",
     "@cinerino/sdk": "5.9.0",
     "@motionpicture/coa-service": "9.3.0-alpha.4",
     "@motionpicture/gmo-service": "5.3.0-alpha.2",
@@ -111,5 +111,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.67"
+  "version": "21.20.0-alpha.69"
 }