@chevre/domain 21.20.0-alpha.8 → 21.20.0

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

@@ -233,9 +233,10 @@ function processAuthorizePaymentCard(params) {
             price: 0,
             priceCurrency: factory.priceCurrency.JPY,
             // requestBody: requestBody,
-            responseBody: responseBody
+            responseBody: responseBody,
+            acceptedOffers: [] // PlaceOrderではないのでacceptedOffersとしては空
         };
-        return repos.action.complete({ typeOf: action.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
     });
 }
 function createAuthorizeMoneyTransferOfferActionAttributes(params) {
@@ -246,6 +247,10 @@ function createAuthorizeMoneyTransferOfferActionAttributes(params) {
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
+        instrument: {
+            typeOf: factory.assetTransactionType.MoneyTransfer,
+            transactionNumber
+        },
         object: {
             project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
             typeOf: factory.offerType.Offer,
@@ -472,10 +477,6 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
                 if (order === undefined) {
                     throw new factory.errors.NotFound('Order');
                 }
-                // OrderDeliveredのみ許可
-                // if (order.orderStatus !== chevre.factory.orderStatus.OrderDelivered) {
-                //     throw new chevre.factory.errors.Argument('fromLocation', `Invalid order status '${order.orderStatus}''`);
-                // }
                 let awardAccounts = [];
                 const awardAccounsValue = (_b = (_a = order.identifier) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === order_1.AWARD_ACCOUNTS_IDENTIFIER_NAME)) === null || _b === void 0 ? void 0 : _b.value;
                 if (typeof awardAccounsValue === 'string' && awardAccounsValue.length > 0) {

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,9 +1,9 @@
 import * as factory from '../../../../factory';
-export type IPlaceOrderTransactionAsInformObject = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'id' | 'typeOf' | 'agent' | 'endDate' | 'expires' | 'project' | 'seller' | 'result' | 'startDate' | 'status'>;
+export type IPlaceOrderTransactionAsInformObject = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'id' | 'typeOf' | 'endDate' | 'project' | 'seller' | 'startDate' | 'status'>;
 /**
  * 取引のタスクを作成する
  */
 export declare function createTasks(params: {
-    transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     runsAt: Date;
 }): factory.task.IAttributes<factory.taskName>[];

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

@@ -9,7 +9,6 @@ const settings_1 = require("../../../../settings");
  */
 // tslint:disable-next-line:max-func-body-length
 function createTasks(params) {
-    var _a;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
@@ -18,12 +17,9 @@ function createTasks(params) {
         const informObject = {
             id: transaction.id,
             typeOf: transaction.typeOf,
-            agent: transaction.agent,
             endDate: transaction.endDate,
-            expires: transaction.expires,
             project: transaction.project,
             seller: transaction.seller,
-            result: transaction.result,
             startDate: transaction.startDate,
             status: transaction.status
         };
@@ -121,25 +117,26 @@ function createTasks(params) {
     taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes, voidReserveTaskAttributes);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
-            const potentialActions = transaction.potentialActions;
-            if (potentialActions === undefined) {
-                throw new factory.errors.NotFound('Transaction PotentialActions');
+            // const potentialActions = transaction.potentialActions;
+            // if (potentialActions === undefined) {
+            //     throw new factory.errors.NotFound('Transaction PotentialActions');
+            // }
+            // const orderFromTransaction = transaction.result?.order;
+            // if (orderFromTransaction === undefined) {
+            //     throw new factory.errors.NotFound('Transaction Result');
+            // }
+            const confirmationNumber = transaction.object.confirmationNumber;
+            if (typeof confirmationNumber !== 'string' || confirmationNumber.length === 0) {
+                throw new factory.errors.NotFound('transaction.object.confirmationNumber');
             }
-            const orderFromTransaction = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
-            if (orderFromTransaction === undefined) {
-                throw new factory.errors.NotFound('Transaction Result');
+            const orderNumber = transaction.object.orderNumber;
+            if (typeof orderNumber !== 'string' || orderNumber.length === 0) {
+                throw new factory.errors.NotFound('transaction.object.orderNumber');
             }
-            const orderActionAttributes = potentialActions.order;
+            // const orderActionAttributes = potentialActions.order;
             const placeOrderTaskData = {
-                project: orderActionAttributes.project,
-                object: {
-                    confirmationNumber: orderFromTransaction.confirmationNumber,
-                    orderNumber: orderActionAttributes.object.orderNumber
-                }
-                // 廃止(2023-08-21~)
-                // ...(orderActionAttributes.potentialActions !== undefined)
-                //     ? { potentialActions: orderActionAttributes.potentialActions }
-                //     : undefined
+                project: transaction.project,
+                object: { confirmationNumber, orderNumber }
             };
             const placeOrderTaskAttributes = {
                 project: transaction.project,

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

@@ -23,7 +23,8 @@ function exportTasksById(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.findById({
             typeOf: factory.transactionType.PlaceOrder,
-            id: params.id
+            id: params.id,
+            inclusion: ['endDate', 'id', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']
         });
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();

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

@@ -0,0 +1,51 @@
+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';
+import type { MongoRepository as ProjectRepo } from '../../../repo/project';
+import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import * as factory from '../../../factory';
+import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
+interface IConfirmOperationRepos {
+    action: ActionRepo;
+    authorization: CodeRepo;
+    emailMessage?: EmailMessageRepo;
+    project: ProjectRepo;
+    transaction: TransactionRepo;
+    orderNumber: OrderNumberRepo;
+    confirmationNumber: ConfirmationNumberRepo;
+}
+type IConfirmOperation<T> = (repos: IConfirmOperationRepos) => Promise<T>;
+type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
+    options: {
+        /**
+         * 取引resultから注文オファーを作成するかどうか
+         */
+        ignoreAccpetedOffersFromResult: boolean;
+        /**
+         * 確定レスポンスに予約IDを含めるかどうか(ttts対応)
+         */
+        expectsReservationIds: boolean;
+        /**
+         * 同期的にに注文コードを発行する場合に指定
+         */
+        publishCodeExpiresInSeconds?: number;
+    };
+};
+/**
+ * 注文取引を確定する
+ */
+declare function confirm(params: IConfirmParams): IConfirmOperation<{
+    order: factory.order.IOrder;
+    code?: string;
+    /**
+     * expectsReservationIdsの場合のみ
+     */
+    eventId?: string;
+    /**
+     * expectsReservationIdsの場合のみ
+     */
+    reservationIds?: string[];
+}>;
+export { confirm };

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

@@ -0,0 +1,268 @@
+"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());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.confirm = void 0;
+const moment = require("moment");
+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");
+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;
+        // 確認番号を事前発行
+        yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+            id: params.id,
+            object: { orderDate: params.result.order.orderDate }
+        })(repos);
+        const transaction = yield repos.transaction.findById({
+            typeOf: factory.transactionType.PlaceOrder,
+            id: params.id
+        });
+        if (transaction.status === factory.transactionStatusType.Confirmed) {
+            // すでに確定済の場合
+            return transaction.result;
+        }
+        else if (transaction.status === factory.transactionStatusType.Expired) {
+            throw new factory.errors.Argument('transactionId', 'Transaction already expired');
+        }
+        else if (transaction.status === factory.transactionStatusType.Canceled) {
+            throw new factory.errors.Argument('transactionId', 'Transaction already canceled');
+        }
+        if (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.id) === 'string' && transaction.agent.id !== params.agent.id) {
+            throw new factory.errors.Forbidden('Transaction not yours');
+        }
+        // 取引に対する全ての承認アクションをマージ
+        const completedAuthorizeActions = yield searchAuthorizeActions(params)(repos);
+        // 注文番号を発行
+        const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+            project: { id: transaction.project.id },
+            id: transaction.id,
+            object: { orderDate: params.result.order.orderDate }
+        })(repos);
+        // 必要あらば注文コード発行(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 { orderWithAcceptedOffers, result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions, code }));
+        // デフォルトEメールメッセージを検索
+        let emailMessageOnOrderSent;
+        if (repos.emailMessage !== undefined) {
+            const searchEmailMessagesResult = yield repos.emailMessage.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: transaction.project.id } },
+                about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
+            });
+            emailMessageOnOrderSent = searchEmailMessagesResult.shift();
+        }
+        // ポストアクションを作成
+        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
+            // order: result.order,
+            order: orderWithAcceptedOffers,
+            potentialActions: params.potentialActions,
+            transaction: transaction,
+            emailMessage: emailMessageOnOrderSent,
+            authorizeActions: completedAuthorizeActions
+        });
+        // ステータス変更
+        try {
+            yield repos.transaction.confirm({
+                typeOf: transaction.typeOf,
+                id: transaction.id,
+                result: result,
+                potentialActions: potentialActions
+            });
+        }
+        catch (error) {
+            if (yield (0, errorHandler_1.isMongoError)(error)) {
+                // 万が一同一注文番号で確定しようとすると、MongoDBでE11000 duplicate key errorが発生する
+                // message: 'E11000 duplicate key error collection: prodttts.transactions index:result.order.orderNumber_1 dup key:...',
+                if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                    throw new factory.errors.AlreadyInUse('transaction', ['result.order.orderNumber']);
+                }
+            }
+            throw error;
+        }
+        const { order } = result;
+        return Object.assign({ order,
+            eventId,
+            reservationIds }, (typeof code === 'string') ? { code } : undefined);
+    });
+}
+exports.confirm = confirm;
+function createReservationIdsResult(order) {
+    var _a;
+    let eventId = '';
+    const reservationIds = [];
+    let eventIdsByOrder = (_a = order.orderedItem) === null || _a === void 0 ? void 0 : _a.filter((o) => o.orderedItem.typeOf === factory.product.ProductType.EventService).map((o) => {
+        return o.orderedItem.serviceOutput.reservationFor.id;
+    });
+    if (Array.isArray(eventIdsByOrder)) {
+        eventIdsByOrder = [...new Set(eventIdsByOrder)];
+        // イベントIDが1つのみに対応
+        if (eventIdsByOrder.length === 1) {
+            eventId = eventIdsByOrder[0];
+            if (Array.isArray(order.acceptedOffers)) {
+                order.acceptedOffers.forEach((o) => {
+                    if (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || o.itemOffered.typeOf === factory.reservationType.BusReservation) {
+                        reservationIds.push(o.itemOffered.id);
+                    }
+                });
+            }
+        }
+    }
+    return { eventId, reservationIds };
+}
+function createResult(params) {
+    var _a;
+    const transaction = params.transaction;
+    // 取引の確定条件が全て整っているかどうか確認
+    (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
+    // 注文作成
+    const order = (0, result_1.createOrder)({
+        orderNumber: params.orderNumber,
+        transaction: transaction,
+        orderDate: params.result.order.orderDate,
+        // OrderPaymentDueオプションを追加(2023-08-25~)
+        // 注文作成時のステータスとなる
+        // orderStatus: (USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
+        orderStatus: factory.orderStatus.OrderPaymentDue,
+        isGift: false,
+        authorizeActions: params.authorizeActions
+    });
+    (0, validation_1.validateEventOffers)({
+        transaction: transaction,
+        order: order,
+        authorizeActions: params.authorizeActions
+    });
+    // 注文オファー検証
+    (0, validation_1.validateNumItems)({
+        order: order,
+        result: params.result
+    });
+    // 注文アイテム検証(2024-01-20~)
+    (0, validation_1.validateOrderedItem)({
+        order: order,
+        result: params.result
+    });
+    (0, validation_1.validatePaymentMethods)({ order });
+    // 確認番号を発行
+    const { confirmationNumber, identifier, url } = createConfirmationNumber({
+        order: order,
+        transaction: transaction,
+        result: params.result
+    });
+    order.confirmationNumber = confirmationNumber;
+    order.identifier = identifier;
+    order.url = url;
+    const authorizeActions = params.authorizeActions.map(({ id }) => ({ id }));
+    let orderAsResult;
+    if (settings_1.USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
+        orderAsResult = order;
+    }
+    else {
+        const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
+        orderAsResult = orderWithoutAcceptedOffers;
+    }
+    let eventId;
+    let reservationIds;
+    if (params.options.expectsReservationIds) {
+        // ttts対応として予約IDリストとイベントIDを返却
+        const reservationIdsResult = createReservationIdsResult(order);
+        eventId = reservationIdsResult.eventId;
+        reservationIds = reservationIdsResult.reservationIds;
+    }
+    return {
+        orderWithAcceptedOffers: order,
+        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
+    };
+}
+function searchAuthorizeActions(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 取引に対する全ての承認アクションをマージ
+        let authorizeActions = yield repos.action.searchByPurpose({
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: factory.transactionType.PlaceOrder,
+                id: params.id
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+        });
+        // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
+        authorizeActions = authorizeActions.filter((a) => {
+            return (a.endDate instanceof Date) && moment(a.endDate)
+                .isBefore(moment(params.result.order.orderDate));
+        });
+        return authorizeActions;
+    });
+}
+function createConfirmationNumber(params) {
+    const confirmationNumber = params.transaction.object.confirmationNumber;
+    let url = '';
+    let identifier = [];
+    // 取引に確認番号が保管されていなければ、確認番号を発行
+    if (typeof confirmationNumber !== 'string') {
+        // 事前に発行済なはずなので、ありえないフロー
+        throw new factory.errors.ServiceUnavailable('object.confirmationNumber undefined');
+    }
+    // URLの指定があれば上書き
+    // tslint:disable-next-line:no-single-line-block-comment
+    /* istanbul ignore if */
+    if (typeof params.result.order.url === 'string') {
+        url = params.result.order.url;
+    }
+    else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore next */
+        url = params.result.order.url(params.order);
+    }
+    // 識別子の指定があれば上書き
+    identifier = [
+        ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
+        // 取引に指定があれば追加
+        ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
+    ];
+    return { confirmationNumber, url, identifier };
+}

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

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, expiresInSeconds: number, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker, customerType?: string): factory.transaction.placeOrder.IStartParams;
+export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, expiresInSeconds: number, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker, customerType?: string, memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload): factory.transaction.placeOrder.IStartParams;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = void 0;
 const factory = require("../../../factory");
-function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType) {
+function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType, memeberOfPayload) {
     var _a, _b, _c, _d, _e;
     const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? { passportToken: params.object.passport.token } : undefined), (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { passport } : undefined), (typeof ((_b = params.object.clientUser) === null || _b === void 0 ? void 0 : _b.client_id) === 'string') ? { clientUser: params.object.clientUser } : undefined), (typeof ((_c = params.object) === null || _c === void 0 ? void 0 : _c.name) === 'string') ? { name: (_d = params.object) === null || _d === void 0 ? void 0 : _d.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_e = params.object.customer) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string') ? { customer: params.object.customer } : undefined), (typeof customerType === 'string') ? { customerType } : undefined);
     if (typeof seller.id !== 'string') {
@@ -11,10 +11,11 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
     if (typeof expiresInSeconds !== 'number') {
         throw new factory.errors.ArgumentNull('expiresInSeconds');
     }
+    const agent = Object.assign(Object.assign({}, params.agent), (memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined);
     return {
         project: { typeOf: seller.project.typeOf, id: seller.project.id },
         typeOf: factory.transactionType.PlaceOrder,
-        agent: params.agent,
+        agent,
         seller: {
             id: seller.id,
             name: seller.name,

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

@@ -42,7 +42,7 @@ function createMoneyTransferActions(params) {
                     project: params.transaction.project,
                     typeOf: factory.actionType.ConfirmAction,
                     object: {
-                        pendingTransaction: { id: actionResult.responseBody.id },
+                        // pendingTransaction: { id: actionResult.responseBody.id },
                         transactionNumber: pendingTransaction.transactionNumber,
                         typeOf: factory.assetTransactionType.MoneyTransfer
                     },

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

@@ -11,70 +11,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const givePointAward_1 = require("./potentialActions/givePointAward");
-const moneyTransfer_1 = require("./potentialActions/moneyTransfer");
-const registerService_1 = require("./potentialActions/registerService");
+// import { createMoneyTransferActions } from './potentialActions/moneyTransfer';
+// import { createRegisterServiceActions } from './potentialActions/registerService';
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-const factory = require("../../../factory");
-const order_1 = require("../../../factory/order");
 /**
  * 取引のポストアクションを作成する
  */
 function createPotentialActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const registerServiceActions = yield (0, registerService_1.createRegisterServiceActions)(params);
+        // const registerServiceActions = await createRegisterServiceActions(params);
         // 通貨転送アクション
-        const moneyTransferActions = yield (0, moneyTransfer_1.createMoneyTransferActions)(params);
+        // const moneyTransferActions = await createMoneyTransferActions(params);
         // ポイントインセンティブに対する承認アクションの分だけ、ポイントインセンティブ付与アクションを作成する
         const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
         // 注文配送メール送信設定
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
-        const simpleOrder = {
-            typeOf: params.order.typeOf,
-            seller: {
-                id: params.order.seller.id,
-                typeOf: params.order.seller.typeOf,
-                name: params.order.seller.name
-            },
-            // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
-        };
         const sendOrderActionAttributes = {
-            project: params.transaction.project,
-            typeOf: factory.actionType.SendAction,
-            // 取引から注文作成するように変更したのでminimizeする(2022-04-18~)
-            object: simpleOrder,
-            agent: params.transaction.project,
-            recipient: {
-                typeOf: params.order.customer.typeOf,
-                id: params.order.customer.id
-            },
             potentialActions: {
-                moneyTransfer: moneyTransferActions,
-                registerService: registerServiceActions,
+                // moneyTransfer: moneyTransferActions, // 廃止(2024-01-29~)
+                // registerService: registerServiceActions, // 廃止(2024-01-30~)
                 sendEmailMessage: sendEmailMessageActions
             }
         };
+        // optimize(2024-01-22~)
         return {
+            // order: {
+            //     project: params.transaction.project,
+            //     typeOf: factory.actionType.OrderAction,
+            //     object: simpleOrder,
+            //     agent: params.transaction.project,
+            //     potentialActions: {
+            //         givePointAward: givePointAwardActions,
+            //         sendOrder: sendOrderActionAttributes // optimize(2024-01-16~)
+            //     },
+            //     purpose: {
+            //         typeOf: params.transaction.typeOf,
+            //         id: params.transaction.id
+            //     }
+            // }
             order: {
-                project: params.transaction.project,
-                typeOf: factory.actionType.OrderAction,
-                // 取引から注文作成するように変更したのでminimizeする(2022-04-18~)
-                object: simpleOrder,
-                agent: params.transaction.project,
                 potentialActions: {
                     givePointAward: givePointAwardActions,
-                    // 完全廃止(2023-02-03~)
-                    // pay: confirmPayActions,
-                    sendOrder: sendOrderActionAttributes
-                },
-                purpose: {
-                    typeOf: params.transaction.typeOf,
-                    id: params.transaction.id
+                    sendOrder: sendOrderActionAttributes // optimize(2024-01-16~)
                 }
             }
         };

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/lib/chevre/service/transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist.d.ts

@@ -0,0 +1,18 @@
+import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
+import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+/**
+ * 未発行であれば、注文の確認番号を発行して取引に保管する
+ */
+declare function publishConfirmationNumberIfNotExist(params: {
+    /**
+     * 取引ID
+     */
+    id: string;
+    object: {
+        orderDate: Date;
+    };
+}): (repos: {
+    transaction: TransactionRepo;
+    confirmationNumber: ConfirmationNumberRepo;
+}) => Promise<string>;
+export { publishConfirmationNumberIfNotExist };