@chevre/domain 21.20.0-alpha.9 → 21.20.0

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -128,7 +128,7 @@ function deleteResourcesByScreeningEventSeries(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -162,7 +162,7 @@ function deleteResourcesByScreeningRoom(params) {
             }
             throw error;
         }
-        yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
     });
 }
 function deleteResourcesByMovieTheater(params) {
@@ -206,7 +206,7 @@ function deleteResourcesByMovieTheater(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -269,7 +269,7 @@ function deleteResourcesBySeller(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -309,7 +309,7 @@ function deleteResourcesByAggregateOffer(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -369,7 +369,7 @@ function deleteResourcesByOfferCatalog(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -411,7 +411,7 @@ function deleteResourcesByProduct(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }

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

@@ -10,9 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
+const order_1 = require("../../repo/order");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -26,9 +29,12 @@ const PaymentService = require("../payment");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield PaymentService.pay(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
             paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),

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

@@ -14,6 +14,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const OrderService = require("../order");
@@ -21,17 +22,15 @@ const OrderService = require("../order");
  * タスク実行関数
  */
 function call(data) {
-    return (settings) => __awaiter(this, void 0, void 0, function* () {
-        // if (settings.redisClient === undefined) {
-        //     throw new factory.errors.Argument('settings', 'redisClient required');
-        // }
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
-            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
-            action: new action_1.MongoRepository(settings.connection),
-            order: new order_1.MongoRepository(settings.connection),
-            task: new task_1.MongoRepository(settings.connection),
-            transaction: new transaction_1.MongoRepository(settings.connection)
+            acceptedOffer: new acceptedOffer_1.MongoRepository(connection),
+            accountingReport: new accountingReport_1.MongoRepository(connection),
+            action: new action_1.MongoRepository(connection),
+            order: new order_1.MongoRepository(connection),
+            orderInTransaction: new orderInTransaction_1.MongoRepository(connection),
+            task: new task_1.MongoRepository(connection),
+            transaction: new transaction_1.MongoRepository(connection)
         });
     });
 }

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

@@ -22,9 +22,6 @@ const returnOrder_1 = require("../order/returnOrder");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        // if (settings.redisClient === undefined) {
-        //     throw new factory.errors.Argument('settings', 'redisClient required');
-        // }
         yield (0, returnOrder_1.returnOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),

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

@@ -111,7 +111,7 @@ function returnPayTransaction(params) {
             throw error;
         }
         const result = { refundTransaction };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         // 潜在アクション
         yield onRefund(refundActionAttributes)({ task: repos.task });
     });

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

@@ -22,7 +22,8 @@ const CancelReservationTransactionService = require("../assetTransaction/cancelR
 const credentials_1 = require("../../credentials");
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
 });
 /**
  * タスク実行関数
@@ -68,7 +69,7 @@ function cancelReservation(params) {
             }
             throw error;
         }
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
     });
 }
 function processCancelReservation4coa(params) {

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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 order_1 = require("../../repo/order");
@@ -22,10 +23,13 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        // if (settings.redisClient === undefined) {
-        //     throw new factory.errors.Argument('settings', 'redisClient required');
-        // }
-        yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
+        var _a;
+        yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { object: Object.assign(Object.assign({}, data.object), { previousOrderStatus: (typeof data.object.previousOrderStatus === 'string')
+                    ? data.object.previousOrderStatus
+                    : factory.orderStatus.OrderInTransit, acceptedOffers: (typeof ((_a = data.object.acceptedOffers) === null || _a === void 0 ? void 0 : _a.limit) === 'number')
+                    ? data.object.acceptedOffers
+                    : { limit: 50, page: 1 } // 互換性維持対応として指定がない場合に対応
+             }), useOnOrderStatusChanged: true }))({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

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

@@ -24,7 +24,7 @@ function call(data) {
         var _a, _b;
         yield (0, reserve_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object, 
             // タスク作成前に検証済なので検証不要
-            verifyToken: false, reserveIfNotYet: data.reserveIfNotYet }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
+            verifyToken: false }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
@@ -27,19 +28,14 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection);
-        const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
         yield EventOfferService.voidTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo,
-            stockHolder: stockHolderRepo,
-            offerRateLimit: offerRateLimitRepo,
-            reservation: reservationRepo,
-            task: taskRepo,
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
+            offerRateLimit: new offer_1.RedisRepository(settings.redisClient),
+            orderInTransaction: new orderInTransaction_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });

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

@@ -261,7 +261,7 @@ function deleteTransactionById(params) {
             deletedReservationNumbers,
             deleteActionResult
         };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 function deleteReservationsByPlaceOrder(params) {

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

@@ -20,33 +20,17 @@ function createMoneyTransferActions(params) {
         var _a;
         const actionResult = a.result;
         const pendingTransaction = (_a = a.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction;
-        // const fromLocation = params.transaction.object.fromLocation;
         if (actionResult !== undefined && pendingTransaction !== undefined) {
             moneyTransferActions.push({
                 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
                 },
-                // agent: Projectに統一(2022-05-16~)
                 agent: params.transaction.project,
-                // agent: params.transaction.agent,
-                // ↓recipient廃止(2022-05-16~)
-                // recipient: a.recipient,
-                // amount: {
-                //     typeOf: 'MonetaryAmount',
-                //     value: a.object.itemOffered.amount.value,
-                //     currency: a.object.itemOffered.amount.currency
-                // },
-                // fromLocation: fromLocation,
-                // toLocation: params.transaction.object.toLocation,
-                purpose: {
-                    typeOf: params.transaction.typeOf,
-                    id: params.transaction.id
-                }
-                // ...(typeof a.object.description === 'string') ? { description: a.object.description } : {}
+                purpose: { typeOf: params.transaction.typeOf, id: params.transaction.id }
             });
         }
     });

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 };