@chevre/domain 21.37.0 → 22.0.0-alpha.1

package/lib/chevre/service/transaction/{placeOrderInProgress → placeOrder}/confirm.js

@@ -15,13 +15,14 @@ const moment = require("moment");
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
 const availableProductTypes_1 = require("../../../factory/availableProductTypes");
-const potentialActions_1 = require("./potentialActions");
-const publishCode_1 = require("./publishCode");
+const factory_1 = require("../../order/placeOrder/factory");
+const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
+const result_1 = require("./confirm/factory/result");
+const potentialActions_1 = require("./confirm/potentialActions");
+const publishCode_1 = require("./confirm/publishCode");
+const validation_1 = require("./confirm/validation");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
 const publishOrderNumberIfNotExist_1 = require("./publishOrderNumberIfNotExist");
-const result_1 = require("./result");
-const orderedItem_1 = require("./result/orderedItem");
-const validation_1 = require("./validation");
 const debug = createDebug('chevre-domain:service:transaction');
 function processTransactionNotInProgress(transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -108,7 +109,7 @@ function confirm(params) {
         // retrieve customer from orderInTransaction(2024-06-24~)
         // let customer: factory.order.ICustomer = createCustomer({ transaction });
         const customer = yield repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
-        const seller = (0, result_1.createSeller)({ transaction });
+        const seller = (0, factory_1.createSeller)({ transaction });
         const { paymentMethods, result, eventId, reservationIds } = createResult(Object.assign(Object.assign(Object.assign({}, params), { orderNumber, transaction,
             authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions,
             acceptedOffers, payTransactions, customer }), (typeof code === 'string') ? { code } : undefined));
@@ -276,27 +277,23 @@ function createResult(params) {
     });
     // 取引の確定条件が全て整っているかどうか確認
     (0, validation_1.validateTransaction)(transaction, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer);
-    const { paymentMethods, price } = (0, result_1.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
+    const { paymentMethods, price } = (0, factory_1.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,
         productAcceptedOffers,
         moneyTransferAcceptedOffers
     });
     // 注文作成
-    const order = (0, result_1.createOrder)({
+    const orderAsResult = (0, result_1.createOrderAsResult)({
         orderNumber: params.orderNumber,
-        transaction,
         orderDate: params.result.order.orderDate,
         orderStatus: factory.orderStatus.OrderPaymentDue,
-        isGift: false,
-        orderedItem, paymentMethods, price
-        // authorizePaymentActions: params.authorizePaymentActions
-        // eventReservationAcceptedOffers,
-        // productAcceptedOffers,
-        // moneyTransferAcceptedOffers
+        // orderedItem,
+        // paymentMethods,
+        price
     });
     (0, validation_1.validateEventOffers)({
-        order: order,
+        order: orderAsResult,
         paymentMethods,
         authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
     });
@@ -313,22 +310,19 @@ function createResult(params) {
     (0, validation_1.validatePaymentMethods)({ order: { paymentMethods } });
     // 確認番号を発行
     const { confirmationNumber, identifier, url } = createConfirmationNumber({
-        order: order,
+        order: orderAsResult,
         transaction: transaction,
         result: params.result
     });
-    order.confirmationNumber = confirmationNumber;
-    order.identifier = identifier;
-    order.url = url;
+    orderAsResult.confirmationNumber = confirmationNumber;
+    orderAsResult.identifier = identifier;
+    orderAsResult.url = url;
     const authorizeActions = [
         ...params.authorizePaymentActions.map(({ id }) => ({ id })),
         ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
         ...params.authorizeProductOfferActions.map(({ id }) => ({ id })),
         ...params.authorizeMoneyTansferActions.map(({ id }) => ({ id }))
     ];
-    // params.authorizeActions.map(({ id }) => ({ id }));
-    // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
-    // const orderAsResult: factory.transaction.placeOrder.IOrderAsResult = order;
     let eventId;
     let reservationIds;
     if (params.options.expectsReservationIds) {
@@ -337,8 +331,7 @@ function createResult(params) {
         eventId = reservationIdsResult.eventId;
         reservationIds = reservationIdsResult.reservationIds;
     }
-    return Object.assign(Object.assign({ paymentMethods, result: Object.assign({ order,
-            authorizeActions, numAcceptedOffers: params.acceptedOffers.length }, (typeof params.code === 'string') ? { code: params.code } : undefined) }, (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
+    return Object.assign(Object.assign({ paymentMethods, result: Object.assign({ order: orderAsResult, authorizeActions, numAcceptedOffers: params.acceptedOffers.length }, (typeof params.code === 'string') ? { code: params.code } : undefined) }, (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
 }
 function searchAuthorizeActions(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts

@@ -0,0 +1,17 @@
+import type { TaskRepo } from '../../../repo/task';
+import type { TransactionRepo } from '../../../repo/transaction';
+type ITaskAndTransactionOperation<T> = (repos: {
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<T>;
+/**
+ * 取引のタスクを出力します
+ */
+export declare function exportTasksById(params: {
+    id: string;
+    /**
+     * タスク実行日時バッファ
+     */
+    runsTasksAfterInSeconds?: number;
+}): ITaskAndTransactionOperation<void>;
+export {};

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

@@ -0,0 +1,39 @@
+"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.exportTasksById = void 0;
+const moment = require("moment");
+const factory = require("../../../factory");
+const factory_1 = require("./exportTasks/factory");
+/**
+ * 取引のタスクを出力します
+ */
+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
+        }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);
+        // タスク実行日時バッファの指定があれば調整
+        let taskRunsAt = new Date();
+        if (typeof params.runsTasksAfterInSeconds === 'number') {
+            taskRunsAt = moment(taskRunsAt)
+                .add(params.runsTasksAfterInSeconds, 'seconds')
+                .toDate();
+        }
+        const taskAttributes = (0, factory_1.createTasks)({
+            transaction,
+            runsAt: taskRunsAt
+        });
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+    });
+}
+exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/{placeOrderInProgress → placeOrder}/publishConfirmationNumberIfNotExist.d.ts

@@ -1,5 +1,5 @@
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
-import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import type { TransactionRepo } from '../../../repo/transaction';
 import * as factory from '../../../factory';
 /**
  * 未発行であれば、注文の確認番号を発行して取引に保管する

package/lib/chevre/service/transaction/{placeOrderInProgress → placeOrder}/publishOrderNumberIfNotExist.d.ts

@@ -1,6 +1,6 @@
-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 type { OrderNumberRepo } from '../../../repo/orderNumber';
+import type { ProjectRepo } from '../../../repo/project';
+import type { TransactionRepo } from '../../../repo/transaction';
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */

package/lib/chevre/service/transaction/{placeOrderInProgress/validation → placeOrder/start}/validateStartRequest.d.ts

@@ -1,6 +1,6 @@
-import type { MongoRepository as MemberRepo } from '../../../../repo/member';
-import type { MongoRepository as ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
-import type { MongoRepository as SellerRepo } from '../../../../repo/seller';
+import type { MemberRepo } from '../../../../repo/member';
+import type { ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
+import type { SellerRepo } from '../../../../repo/seller';
 import * as factory from '../../../../factory';
 type ISeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
 declare function validateStartRequest(params: {

package/lib/chevre/service/transaction/{placeOrderInProgress → placeOrder}/start.d.ts

@@ -1,8 +1,8 @@
-import type { MongoRepository as MemberRepo } from '../../../repo/member';
+import type { MemberRepo } from '../../../repo/member';
 import type { PassportRepo } from '../../../repo/passport';
-import type { MongoRepository as ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
-import type { MongoRepository as SellerRepo } from '../../../repo/seller';
-import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
+import type { SellerRepo } from '../../../repo/seller';
+import type { IStartedTransaction, TransactionRepo } from '../../../repo/transaction';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
     member: MemberRepo;

package/lib/chevre/service/transaction/{placeOrderInProgress → placeOrder}/start.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
 const factory = require("../../../factory");
 const factory_1 = require("./start/factory");
-const validateStartRequest_1 = require("./validation/validateStartRequest");
+const validateStartRequest_1 = require("./start/validateStartRequest");
 /**
  * 取引開始
  */
@@ -39,11 +39,13 @@ function start(params, options) {
                     limit: 1, page: 1,
                     typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },
+                    status: { $in: [factory.transactionStatusType.InProgress] },
                     agent: { identifiers: [{ name: factory_1.AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] },
                     inclusion: ['expires', 'startDate', 'status']
                 })).shift();
                 if (alreadyStartedTransaction !== undefined) {
-                    transaction = alreadyStartedTransaction;
+                    const { id, startDate, expires, status } = alreadyStartedTransaction;
+                    transaction = { id, startDate, expires, status };
                 }
                 else {
                     throw error;

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

@@ -1,16 +1,8 @@
-import type { MongoRepository as TaskRepo } from '../../repo/task';
-import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
-export type ITaskAndTransactionOperation<T> = (repos: {
-    task: TaskRepo;
-    transaction: TransactionRepo;
-}) => Promise<T>;
 /**
- * 取引のタスクを出力します
+ * 注文取引サービス
  */
-export declare function exportTasksById(params: {
-    id: string;
-    /**
-     * タスク実行日時バッファ
-     */
-    runsTasksAfterInSeconds?: number;
-}): ITaskAndTransactionOperation<void>;
+import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
+import { confirm } from './placeOrder/confirm';
+import { exportTasksById } from './placeOrder/exportTasksById';
+import { start } from './placeOrder/start';
+export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, exportTasksById };

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

@@ -1,42 +1,16 @@
 "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.exportTasksById = void 0;
+exports.exportTasksById = exports.start = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = void 0;
 /**
  * 注文取引サービス
  */
-const moment = require("moment");
-const factory = require("../../factory");
-const factory_1 = require("./placeOrder/exportTasks/factory");
-/**
- * 取引のタスクを出力します
- */
-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
-        }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);
-        // タスク実行日時バッファの指定があれば調整
-        let taskRunsAt = new Date();
-        if (typeof params.runsTasksAfterInSeconds === 'number') {
-            taskRunsAt = moment(taskRunsAt)
-                .add(params.runsTasksAfterInSeconds, 'seconds')
-                .toDate();
-        }
-        const taskAttributes = (0, factory_1.createTasks)({
-            transaction,
-            runsAt: taskRunsAt
-        });
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
-}
-exports.exportTasksById = exportTasksById;
+const order_1 = require("../../factory/order");
+Object.defineProperty(exports, "POINT_AWARD_IDENTIFIER_NAME", { enumerable: true, get: function () { return order_1.POINT_AWARD_IDENTIFIER_NAME; } });
+const confirm_1 = require("./placeOrder/confirm");
+Object.defineProperty(exports, "confirm", { enumerable: true, get: function () { return confirm_1.confirm; } });
+const exportTasksById_1 = require("./placeOrder/exportTasksById");
+Object.defineProperty(exports, "exportTasksById", { enumerable: true, get: function () { return exportTasksById_1.exportTasksById; } });
+// import { publishConfirmationNumberIfNotExist } from './placeOrder/publishConfirmationNumberIfNotExist';
+// import { publishOrderNumberIfNotExist } from './placeOrder/publishOrderNumberIfNotExist';
+const start_1 = require("./placeOrder/start");
+Object.defineProperty(exports, "start", { enumerable: true, get: function () { return start_1.start; } });

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

@@ -1,13 +1,13 @@
 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';
+import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { EventRepo } from '../../../repo/event';
+import type { MerchantReturnPolicyRepo } from '../../../repo/merchantReturnPolicy';
+import type { OfferRepo } from '../../../repo/offer';
+import type { OfferItemConditionRepo } from '../../../repo/offerItemCondition';
+import type { OrderRepo } from '../../../repo/order';
+import type { ProjectRepo } from '../../../repo/project';
+import type { ReservationRepo } from '../../../repo/reservation';
+import type { SellerRepo } from '../../../repo/seller';
 interface IPreStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;

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

@@ -1,17 +1,17 @@
 import * as factory from '../../factory';
-import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
-import type { MongoRepository as EventRepo } from '../../repo/event';
-import type { MongoRepository as MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
+import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { EmailMessageRepo } from '../../repo/emailMessage';
+import type { EventRepo } from '../../repo/event';
+import type { MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
 import type { MessageRepo } from '../../repo/message';
-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';
-import type { MongoRepository as TaskRepo } from '../../repo/task';
-import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../repo/transaction';
+import type { OfferRepo } from '../../repo/offer';
+import type { OfferItemConditionRepo } from '../../repo/offerItemCondition';
+import type { OrderRepo } from '../../repo/order';
+import type { ProjectRepo } from '../../repo/project';
+import type { ReservationRepo } from '../../repo/reservation';
+import type { SellerRepo } from '../../repo/seller';
+import type { TaskRepo } from '../../repo/task';
+import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
 import { preStart } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;

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

@@ -1,20 +1,18 @@
 import * as factory from '../factory';
-import type { MongoRepository as OrderInTransactionRepo } from '../repo/orderInTransaction';
-import type { RedisRepository as OrderNumberRepo } from '../repo/orderNumber';
-import type { MongoRepository as ProjectRepo } from '../repo/project';
-import type { MongoRepository as TaskRepo } from '../repo/task';
-import type { MongoRepository as TransactionRepo } from '../repo/transaction';
+import type { OrderInTransactionRepo } from '../repo/orderInTransaction';
+import type { OrderNumberRepo } from '../repo/orderNumber';
+import type { ProjectRepo } from '../repo/project';
+import type { TaskRepo } from '../repo/task';
+import type { TransactionRepo } from '../repo/transaction';
 import { deleteTransaction } from './transaction/deleteTransaction';
 import * as MoneyTransferTransactionService from './transaction/moneyTransfer';
 import * as PlaceOrderTransactionService from './transaction/placeOrder';
-import * as PlaceOrderInProgressTransactionService from './transaction/placeOrderInProgress';
 import * as ReturnOrderTransactionService from './transaction/returnOrder';
 export type ITransactionOperation<T> = (repos: {
     transaction: TransactionRepo;
 }) => Promise<T>;
 export import moneyTransfer = MoneyTransferTransactionService;
 export import placeOrder = PlaceOrderTransactionService;
-export import placeOrderInProgress = PlaceOrderInProgressTransactionService;
 export import returnOrder = ReturnOrderTransactionService;
 export { deleteTransaction };
 /**
@@ -43,10 +41,6 @@ export type IExportTasksOperation<T> = (repos: {
  * ひとつの取引のタスクをエクスポートする
  */
 export declare function exportTasks<T extends factory.transactionType>(params: {
-    project?: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
     /**
      * タスク実行日時バッファ
      */

package/lib/chevre/service/transaction.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportTasks = exports.updateAgent = exports.deleteTransaction = exports.returnOrder = exports.placeOrderInProgress = exports.placeOrder = exports.moneyTransfer = void 0;
+exports.exportTasks = exports.updateAgent = exports.deleteTransaction = exports.returnOrder = exports.placeOrder = exports.moneyTransfer = void 0;
 /**
  * 取引サービス
  */
@@ -19,12 +19,11 @@ const deleteTransaction_1 = require("./transaction/deleteTransaction");
 Object.defineProperty(exports, "deleteTransaction", { enumerable: true, get: function () { return deleteTransaction_1.deleteTransaction; } });
 const MoneyTransferTransactionService = require("./transaction/moneyTransfer");
 const PlaceOrderTransactionService = require("./transaction/placeOrder");
-const PlaceOrderInProgressTransactionService = require("./transaction/placeOrderInProgress");
+const publishOrderNumberIfNotExist_1 = require("./transaction/placeOrder/publishOrderNumberIfNotExist");
 const ReturnOrderTransactionService = require("./transaction/returnOrder");
 const settings_1 = require("../settings");
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
-exports.placeOrderInProgress = PlaceOrderInProgressTransactionService;
 exports.returnOrder = ReturnOrderTransactionService;
 function fixCustomer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -56,7 +55,15 @@ function fixCustomer(params) {
             if (typeof ((_a = trasactionObject.customer) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
                 customer = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: trasactionObject.customer.typeOf, id: trasactionObject.customer.id }, (Array.isArray(trasactionObject.customer.identifier))
                     ? { identifier: trasactionObject.customer.identifier }
-                    : undefined), (Array.isArray(params.agent.additionalProperty)) ? { additionalProperty: params.agent.additionalProperty } : {}), (typeof params.agent.age === 'string') ? { age: params.agent.age } : {}), (typeof params.agent.address === 'string') ? { address: params.agent.address } : {}), (typeof params.agent.email === 'string') ? { email: params.agent.email } : {}), (typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName } : {}), (typeof params.agent.gender === 'string') ? { gender: params.agent.gender } : {}), (typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName } : {}), (typeof params.agent.name === 'string') ? { name: params.agent.name } : {}), (typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : {}), (typeof params.agent.url === 'string') ? { url: params.agent.url } : {});
+                    : /* istanbul ignore next */ undefined), (Array.isArray(params.agent.additionalProperty))
+                    ? { additionalProperty: params.agent.additionalProperty }
+                    : /* istanbul ignore next */ undefined), (typeof params.agent.age === 'string') ? { age: params.agent.age }
+                    : /* istanbul ignore next */ undefined), (typeof params.agent.address === 'string') ? { address: params.agent.address }
+                    : /* istanbul ignore next */ undefined), (typeof params.agent.email === 'string') ? { email: params.agent.email }
+                    : /* istanbul ignore next */ undefined), (typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName }
+                    : /* istanbul ignore next */ undefined), (typeof params.agent.gender === 'string') ? { gender: params.agent.gender }
+                    : /* istanbul ignore next */ undefined), (typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName }
+                    : /* istanbul ignore next */ undefined), (typeof params.agent.name === 'string') ? { name: params.agent.name } : /* istanbul ignore next */ undefined), (typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : /* istanbul ignore next */ undefined), (typeof params.agent.url === 'string') ? { url: params.agent.url } : /* istanbul ignore next */ undefined);
             }
         }
         return { customer, transaction };
@@ -80,7 +87,7 @@ function updateAgent(params) {
         // });
         // also save in orderInTransaction(2024-06-20~)
         if (customer !== undefined) {
-            const orderNumber = yield PlaceOrderInProgressTransactionService.publishOrderNumberIfNotExist({
+            const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
                 project: { id: transaction.project.id },
                 id: params.id,
                 object: { orderDate: new Date() }
@@ -108,13 +115,13 @@ exports.updateAgent = updateAgent;
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.startExportTasks(Object.assign(Object.assign(Object.assign({ status: params.status, tasksExportAction: {
+        const transaction = yield repos.transaction.startExportTasks(Object.assign(Object.assign({ status: params.status, tasksExportAction: {
                 agent: {
                     name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
                         ? params.tasksExportAction.agent.name
                         : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
                 }
-            } }, (params.typeOf !== undefined) ? { typeOf: params.typeOf } : undefined), (params.project !== undefined) ? { project: params.project } : undefined), (typeof params.id === 'string') ? { id: params.id } : undefined));
+            } }, (params.typeOf !== undefined) ? { typeOf: params.typeOf } : undefined), (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {
             return;
         }

package/lib/chevre/service/validation/validateOrder.d.ts

@@ -1,6 +1,6 @@
-import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
-import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { OrderRepo } from '../../repo/order';
 export declare function validateOrder(params: {
     orderNumber: string;
     project: {

package/lib/chevre/service/validation/validateOrder.js

@@ -15,7 +15,7 @@ const moment = require("moment");
 const factory = require("../../factory");
 const factory_1 = require("../offer/event/authorize/factory");
 const factory_2 = require("../offer/product/factory");
-const validateMovieTicket_1 = require("../transaction/placeOrderInProgress/validation/validateMovieTicket");
+const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
 // const debug = createDebug('chevre-domain:service:validation');
 function validateOrder(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.377.0",
+    "@chevre/factory": "4.378.0-alpha.0",
     "@cinerino/sdk": "8.2.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -38,7 +38,7 @@
     "@types/json2csv": "^4.5.1",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.difference": "^4.5.6",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "10.0.7",
     "@types/moment-timezone": "^0.5.30",
     "@types/node": "18.19.2",
     "@types/power-assert": "^1.5.3",
@@ -51,10 +51,10 @@
     "csvtojson": "^2.0.10",
     "googleapis": "^85.0.0",
     "json2csv": "4.5.4",
-    "mocha": "^5.2.0",
+    "mocha": "10.6.0",
     "mongoose": "7.0.5",
     "nock": "13.4.0",
-    "nyc": "^15.1.0",
+    "nyc": "17.0.0",
     "power-assert": "^1.6.1",
     "redis": "4.6.5",
     "rimraf": "^2.7.1",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.37.0"
+  "version": "22.0.0-alpha.1"
 }

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

@@ -1,24 +0,0 @@
-import * as factory from '../../../factory';
-/**
- * 注文を生成する
- */
-declare function createOrder(params: {
-    orderNumber: string;
-    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object' | 'seller' | 'project'>;
-    orderDate: Date;
-    orderStatus: factory.orderStatus;
-    isGift: boolean;
-    orderedItem: factory.order.IOrderedItem[];
-    paymentMethods: factory.order.IReferencedInvoice[];
-    price: number;
-}): factory.transaction.placeOrder.IOrderAsResult;
-declare function createSeller(params: {
-    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'seller'>;
-}): factory.order.ISeller;
-declare function createPaymentMethods(params: {
-    authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
-}): {
-    paymentMethods: factory.order.IReferencedInvoice[];
-    price: number;
-};
-export { createOrder, createSeller, createPaymentMethods };