@chevre/domain 21.20.0-alpha.2 → 21.20.0-alpha.20

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -4,7 +4,6 @@ import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTr
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
-import { IUseReservationAction } from './potentialActions/onReservationUsed';
 /**
  * 予約使用
  */
@@ -33,4 +32,4 @@ export declare function useReservation(params: {
     order: OrderRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
-}) => Promise<IUseReservationAction>;
+}) => Promise<void>;

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

@@ -68,7 +68,7 @@ function useReservation(params) {
                 }
             }
             : undefined);
-        let action = yield repos.action.start(actionAttributes);
+        const action = yield repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory.errors.Argument('object', 'number of using reservations must be 1');
@@ -88,9 +88,9 @@ function useReservation(params) {
             throw error;
         }
         // アクション完了
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} }));
-        yield (0, onReservationUsed_1.onReservationUsed)(action, attendedReservation)({ task: repos.task });
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation)({ task: repos.task });
+        // return action;
     });
 }
 exports.useReservation = useReservation;

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -33,6 +33,8 @@ function verifyToken4reservation(params) {
                 });
                 // ステータス検証
                 switch (order.orderStatus) {
+                    case factory.orderStatus.OrderProcessing: // OrderProcessingも許可(2024-01-10~)
+                    case factory.orderStatus.OrderInTransit: // OrderInTransitも許可(2024-01-12~)
                     case factory.orderStatus.OrderDelivered:
                         break;
                     default:

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

@@ -78,7 +78,7 @@ function confirmRegisterServiceTransaction(params) {
         }
         // アクション完了
         const result = {};
-        yield repos.action.complete({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
         yield onRegistered(confirmActionAttributes)(repos);
     });
 }

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

@@ -12,7 +12,10 @@ export declare function call(data: factory.task.IData<factory.taskName.ConfirmRe
 /**
  * 予約を確定する
  */
-export declare function confirmReserveTransaction(params: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>): (repos: {
+export declare function confirmReserveTransaction(params: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>, options: {
+    sendOrder: boolean;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;

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

@@ -28,7 +28,10 @@ const coaAuthClient = new COA.auth.RefreshToken({
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield confirmReserveTransaction(data)({
+        yield confirmReserveTransaction(data, {
+            sendOrder: true,
+            useOnOrderStatusChanged: true
+        })({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
@@ -41,7 +44,7 @@ exports.call = call;
 /**
  * 予約を確定する
  */
-function confirmReserveTransaction(params) {
+function confirmReserveTransaction(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // アクション開始
         const confirmActionAttributes = params;
@@ -88,7 +91,43 @@ function confirmReserveTransaction(params) {
         }
         // アクション完了
         const result = {};
-        yield repos.action.complete({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        // sendOrder連携(2024-01-11~)
+        yield onConfirmed(params, options)({
+            task: repos.task
+        });
     });
 }
 exports.confirmReserveTransaction = confirmReserveTransaction;
+function onConfirmed(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (options.sendOrder === true) {
+            // タスク冪等作成
+            const onAssetTransactionStatusChangedTaskData = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: {
+                    typeOf: params.object.typeOf,
+                    transactionNumber: params.object.transactionNumber,
+                    status: factory.transactionStatusType.Confirmed
+                },
+                purpose: {
+                    confirmationNumber: '',
+                    orderNumber: params.purpose.orderNumber,
+                    typeOf: factory.order.OrderType.Order
+                },
+                useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
+            };
+            const onAssetTransactionStatusChangedTask = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                name: factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: onAssetTransactionStatusChangedTaskData
+            };
+            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+        }
+    });
+}

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/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

@@ -68,7 +68,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.OrderProcessing, 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/voidPayTransaction.js

@@ -15,7 +15,7 @@ const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-const project_1 = require("../../repo/project");
+// import { MongoRepository as ProjectRepo } from '../../repo/project';
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -32,7 +32,7 @@ function call(data) {
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
             paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
-            project: new project_1.MongoRepository(settings.connection),
+            // project: new ProjectRepo(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_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.js

@@ -235,7 +235,7 @@ function processAuthorizePaymentCard(params) {
             // requestBody: requestBody,
             responseBody: responseBody
         };
-        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) {
@@ -472,10 +472,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/placeOrderInProgress/potentialActions.js

@@ -16,6 +16,7 @@ const registerService_1 = require("./potentialActions/registerService");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
+const settings_1 = require("../../../settings");
 /**
  * 取引のポストアクションを作成する
  */
@@ -43,11 +44,14 @@ function createPotentialActions(params) {
             priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
+        const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {
+                limit: settings_1.DELIVER_ORDER_LIMIT,
+                page: 1 // page1から配送
+            } });
         const sendOrderActionAttributes = {
             project: params.transaction.project,
             typeOf: factory.actionType.SendAction,
-            // 取引から注文作成するように変更したのでminimizeする(2022-04-18~)
-            object: simpleOrder,
+            object: sendOrderObject,
             agent: params.transaction.project,
             recipient: {
                 typeOf: params.order.customer.typeOf,

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

@@ -22,7 +22,6 @@ const validation_1 = require("./placeOrderInProgress/validation");
 const validateSeller_1 = require("./placeOrderInProgress/validation/validateSeller");
 const validation_2 = require("./validation");
 const errorHandler_1 = require("../../errorHandler");
-const settings_1 = require("../../settings");
 exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 /**
  * 取引開始
@@ -220,7 +219,8 @@ function createResult(params) {
         orderDate: params.result.order.orderDate,
         // OrderPaymentDueオプションを追加(2023-08-25~)
         // 注文作成時のステータスとなる
-        orderStatus: (settings_1.USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
+        // orderStatus: (USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
+        orderStatus: factory.orderStatus.OrderPaymentDue,
         isGift: false,
         authorizeActions: params.authorizeActions
     });

package/lib/chevre/service/transaction/returnOrder/preStart.d.ts

@@ -0,0 +1,32 @@
+import * as factory from '../../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { MongoRepository as EventRepo } from '../../../repo/event';
+import type { MongoRepository as MerchantReturnPolicyRepo } from '../../../repo/merchantReturnPolicy';
+import type { MongoRepository as OfferRepo } from '../../../repo/offer';
+import type { MongoRepository as OfferItemConditionRepo } from '../../../repo/offerItemCondition';
+import type { MongoRepository as OrderRepo } from '../../../repo/order';
+import type { MongoRepository as ProjectRepo } from '../../../repo/project';
+import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
+import type { MongoRepository as SellerRepo } from '../../../repo/seller';
+interface IPreStartOperationRepos {
+    acceptedOffer: AcceptedOfferRepo;
+    event: EventRepo;
+    merchantReturnPolicy: MerchantReturnPolicyRepo;
+    offer: OfferRepo;
+    offerItemCondition: OfferItemConditionRepo;
+    order: OrderRepo;
+    project: ProjectRepo;
+    reservation: ReservationRepo;
+    seller: SellerRepo;
+}
+type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
+type IFixedSeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+/**
+ * 返品取引開始前処理
+ */
+declare function preStart(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IPreStartOperation<{
+    transactionObject: factory.transaction.returnOrder.IObject;
+    seller: IFixedSeller;
+    expiresInSeconds: number;
+}>;
+export { preStart };