@chevre/domain 28.0.0-alpha.1 → 28.0.0-alpha.3

package/lib/chevre/repo/adminTransaction.d.ts

@@ -1,6 +1,5 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/transaction';
 /**
  * 取引管理リポジトリ
  */
@@ -43,7 +42,7 @@ export declare class AdminTransactionRepo {
         expires: {
             $lt: Date;
         };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
+    }): Promise<Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'> | undefined>;
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
@@ -51,7 +50,7 @@ export declare class AdminTransactionRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
-    getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+    getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
@@ -66,30 +65,26 @@ export declare class AdminTransactionRepo {
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
-        typeOf: factory.transactionType.ReturnOrder;
+        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
+        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
-        result?: undefined;
+        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        recipient?: undefined;
+        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+    }, import("mongoose").QueryOptions<{
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
@@ -104,28 +99,39 @@ export declare class AdminTransactionRepo {
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
+    }>, (import("mongoose").Document<unknown, Record<string, never>, {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        error?: any;
+        project: import("@chevre/factory/lib/chevre/transaction").IProject;
+        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
+        typeOf: factory.transactionType.PlaceOrder;
+        expires: Date;
+        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
+        startDate: Date;
+        endDate?: Date | undefined;
+        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
+        status: factory.transactionStatusType;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: undefined;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & {
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
-        typeOf: factory.transactionType.ReturnOrder;
+        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
+        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
-        result?: undefined;
+        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        recipient?: undefined;
+        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }))) | null>;
+    }) | null>;
 }

package/lib/chevre/repo/mongoose/schemas/transaction.d.ts

@@ -1,9 +1,8 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IPlaceOrder = Omit<factory.transaction.placeOrder.ITransaction, 'id'>;
-type IReturnOrder = Omit<factory.transaction.returnOrder.ITransaction, 'id'>;
-type IDocType = IPlaceOrder | IReturnOrder;
+type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'endDate' | 'error' | 'expires' | 'instrument' | 'object' | 'potentialActions' | 'project' | 'result' | 'seller' | 'startDate' | 'status' | 'tasksExportAction' | 'typeOf'>;
+type IDocType = IPlaceOrder;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/transaction.js

@@ -13,7 +13,7 @@ const schemaDefinition = {
     status: String,
     typeOf: String,
     agent: mongoose_1.SchemaTypes.Mixed,
-    recipient: mongoose_1.SchemaTypes.Mixed,
+    // recipient: SchemaTypes.Mixed, // discontinue(2026-09-09~)
     seller: mongoose_1.SchemaTypes.Mixed,
     error: mongoose_1.SchemaTypes.Mixed,
     result: mongoose_1.SchemaTypes.Mixed,

package/lib/chevre/repo/order.js

@@ -613,7 +613,9 @@ class OrderRepo {
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [
-                    'project', 'typeOf', 'orderNumber', 'dateReturned',
+                    'project', 'typeOf', 'orderNumber',
+                    'orderStatus', // すでに変更済かどうか検証するので必要
+                    'dateReturned',
                     'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
                 ]
             });

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

@@ -16,8 +16,8 @@ export type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IKey
     id: string;
 };
 type IStartedPlaceOrderFields = 'expires' | 'id' | 'startDate' | 'status';
-export type IStartedPlaceOrder = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IStartedPlaceOrderFields>;
-type IFindParams = factory.transaction.ISearchConditions<factory.transactionType.PlaceOrder>;
+export type IStartedPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IStartedPlaceOrderFields>;
+type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent' | 'ids' | 'limit' | 'object' | 'page' | 'project' | 'seller' | 'sort' | 'startFrom' | 'startThrough' | 'status' | 'statuses' | 'tasksExportAction'> & {};
 /**
  * 注文取引リポジトリ
  */
@@ -34,7 +34,7 @@ export declare class PlaceOrderRepo {
     findPlaceOrderTransactions(params: Omit<IFindParams, 'result'> & {
         result?: never;
         inclusion: IKeyOfProjection[];
-    }): Promise<(Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IKeyOfProjection> & {
+    }): Promise<(Pick<factory.transaction.placeOrder.ITransaction, IKeyOfProjection> & {
         id: string;
     })[]>;
     /**
@@ -71,7 +71,7 @@ export declare class PlaceOrderRepo {
     /**
      * 取引を開始する
      */
-    startPlaceOrder(params: factory.transaction.IStartParams<factory.transactionType.PlaceOrder>): Promise<IStartedPlaceOrder>;
+    startPlaceOrder(params: factory.transaction.placeOrder.IStartParams): Promise<IStartedPlaceOrder>;
     /**
      * 取引を確定する
      */
@@ -83,8 +83,8 @@ export declare class PlaceOrderRepo {
             orderNumber: string;
             confirmationNumber: string;
         };
-        result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
-        potentialActions?: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
+        result: factory.transaction.placeOrder.IResult;
+        potentialActions?: factory.transaction.placeOrder.IPotentialActions;
     }): Promise<void>;
     /**
      * 取引を中止する

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

@@ -35,17 +35,17 @@ class PlaceOrderRepo {
         this.transactionModel = connection.model(transaction_2.modelName, (0, transaction_2.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        if (params.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
-            throw new factory_1.factory.errors.Argument('typeOf', `must be ${factory_1.factory.transactionType.PlaceOrder}`);
-        }
+        // if (params.typeOf !== factory.transactionType.PlaceOrder) {
+        //     throw new factory.errors.Argument('typeOf', `must be ${factory.transactionType.PlaceOrder}`);
+        // }
         const andConditions = [];
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        if (typeof params.typeOf === 'string') {
-            andConditions.push({ typeOf: { $eq: params.typeOf } });
-        }
+        // if (typeof params.typeOf === 'string') {
+        //     andConditions.push({ typeOf: { $eq: params.typeOf } });
+        // }
         if (params.startFrom !== undefined) {
             andConditions.push({
                 startDate: { $gte: params.startFrom }
@@ -56,22 +56,22 @@ class PlaceOrderRepo {
                 startDate: { $lte: params.startThrough }
             });
         }
-        if (params.endFrom !== undefined) {
-            andConditions.push({
-                endDate: {
-                    $exists: true,
-                    $gte: params.endFrom
-                }
-            });
-        }
-        if (params.endThrough !== undefined) {
-            andConditions.push({
-                endDate: {
-                    $exists: true,
-                    $lt: params.endThrough
-                }
-            });
-        }
+        // if (params.endFrom !== undefined) {
+        //     andConditions.push({
+        //         endDate: {
+        //             $exists: true,
+        //             $gte: params.endFrom
+        //         }
+        //     });
+        // }
+        // if (params.endThrough !== undefined) {
+        //     andConditions.push({
+        //         endDate: {
+        //             $exists: true,
+        //             $lt: params.endThrough
+        //         }
+        //     });
+        // }
         if (Array.isArray(params.ids)) {
             andConditions.push({
                 _id: { $in: params.ids }
@@ -122,18 +122,6 @@ class PlaceOrderRepo {
         if (Array.isArray(sellerIdIn)) {
             andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });
         }
-        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
-        // const resultOrderNumberIn = params.result?.order?.orderNumbers;
-        // if (Array.isArray(resultOrderNumberIn)) {
-        //     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
-        // }
-        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
-        // const resultOrderConfirmationNumberEq = params.result?.order?.confirmationNumber?.$eq;
-        // if (typeof resultOrderConfirmationNumberEq === 'string') {
-        //     andConditions.push({
-        //         'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
-        //     });
-        // }
         const objectOrderNumberEq = params.object?.orderNumber?.$eq;
         if (typeof objectOrderNumberEq === 'string') {
             andConditions.push({ 'object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });

package/lib/chevre/repo/transaction/returnOrderInProgress.d.ts

@@ -15,7 +15,7 @@ export declare class ReturnOrderInProgressRepo {
     /**
      * 取引を開始する
      */
-    startReturnOrder(params: factory.transaction.returnOrder.IStartParams): Promise<IStartedTransaction>;
+    startReturnOrder(params: Pick<factory.transaction.returnOrder.IStartParams, 'agent' | 'expiresInSeconds' | 'object' | 'project' | 'typeOf'>): Promise<IStartedTransaction>;
     findReturnOrderById(params: {
         id: string;
     }): Promise<IReturnOrderAsFindResult>;

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

@@ -26,7 +26,7 @@ export declare class TransactionRepo {
             endDate?: factory.sortType;
             startDate?: factory.sortType;
         };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
+    }): Promise<Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'> | null>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
         id: string;
     };
     broker?: factory.reservation.IBroker;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'expires' | 'seller'>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 declare function createAuthorizeSeatReservationActionAttributes(params: {
@@ -18,7 +18,7 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
          */
         transactionNumber: string;
     };
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
 }): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
     acceptedOffers: Pick<IResultAcceptedOffer, 'priceSpecification' | 'id'>[];

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -31,7 +31,7 @@ declare function processStartReserve4chevre(params: {
     };
     broker?: factory.reservation.IBroker;
     transactionNumber: string;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
     availableAtOrFrom: {
         id: string;
     };

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -8,7 +8,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     /**
      * 仮予約済のCOA予約取引
      */

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.js

@@ -36,7 +36,7 @@ function cancelOrderIfExist(params) {
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
-                typeOf: factory_1.factory.transactionType.PlaceOrder,
+                // typeOf: factory.transactionType.PlaceOrder,
                 statuses: [factory_1.factory.transactionStatusType.Confirmed],
                 // resultではなくobjectで参照するように変更(2026-06-16~)
                 object: {

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

@@ -83,7 +83,7 @@ function createOnAuthorizationCreatedTask(order) {
         const placeOrderTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
+            // typeOf: factory.transactionType.PlaceOrder,
             object: { orderNumber: { $eq: order.orderNumber } },
             inclusion: ['result']
         })).shift();

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

@@ -11,7 +11,7 @@ function createPlacingOrderFromExistingTransaction(params) {
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
+            // typeOf: factory.transactionType.PlaceOrder,
             statuses: [factory_1.factory.transactionStatusType.Confirmed],
             // resultではなくobjectで参照するように変更(2026-06-16~)
             object: {

package/lib/chevre/service/payment/any/factory.d.ts

@@ -8,7 +8,7 @@ export declare function creatPublishPaymentUrlParams(params: {
     accountId?: string;
     object: Pick<factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
     identifier?: string;
@@ -26,7 +26,7 @@ export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
     order: {

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

@@ -36,7 +36,7 @@ function deleteTransactionById(params) {
         if (params.object.typeOf === factory_1.factory.transactionType.PlaceOrder) {
             transaction = (await repos.placeOrder.findPlaceOrderTransactions({
                 ids: [deletingTransactionId],
-                typeOf: params.object.typeOf,
+                // typeOf: params.object.typeOf,
                 inclusion: ['typeOf', 'project', 'status']
             })).shift();
         }

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

@@ -6,10 +6,10 @@ type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceO
  * 取引削除タスクを分離(2026-08-02~)
  */
 export declare function createImmediateTasks(params: {
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     taskRunsAt: Date;
 }): IPlaceOrderPotentialTask[];
 export declare function createScheduledTasks(params: {
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'status' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'endDate' | 'id' | 'object' | 'project' | 'status' | 'typeOf'>;
 }, setting: Pick<ISetting, 'storage'> | null): factory.task.deleteTransaction.IAttributes;
 export {};

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

@@ -34,7 +34,7 @@ function start(params, options) {
                 // in case already locked
                 const alreadyStartedTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
                     limit: 1, page: 1,
-                    typeOf: factory_1.factory.transactionType.PlaceOrder,
+                    // typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },
                     status: { $in: [factory_1.factory.transactionStatusType.InProgress] },
                     agent: { identifiers: [{ name: factory_2.AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] },

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

@@ -4,9 +4,7 @@ exports.createPotentialActions = createPotentialActions;
 const factory_1 = require("../../../factory");
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-async function createPotentialActions(params, 
-// settings: Settings
-setting) {
+async function createPotentialActions(params, setting) {
     const emailMessages = [];
     const returnOrderActions = await Promise.all(params.orders.map(async (order) => {
         let returnOrderParams = params.potentialActions?.returnOrder;

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

@@ -23,10 +23,22 @@ interface IPreStartOperationRepos {
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
 type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+/**
+ * 注文返品開始パラメータ
+ */
+export interface IStartParamsWithoutDetail {
+    project: Pick<factory.project.IProject, 'id' | 'typeOf'>;
+    expiresInSeconds: number;
+    agent: factory.transaction.returnOrder.IAgent;
+    object: {
+        order: [factory.transaction.returnOrder.IReturnableOrder];
+        reason: factory.transaction.returnOrder.Reason;
+    };
+}
 /**
  * 返品取引開始前処理
  */
-declare function preStart(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IPreStartOperation<{
+declare function preStart(params: IStartParamsWithoutDetail): IPreStartOperation<{
     transactionObject: factory.transaction.returnOrder.IObject;
     seller: IFixedSeller;
     expiresInSeconds: number;

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

@@ -13,7 +13,7 @@ import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, ReturnOrderInProgressRepo } from '../../repo/transaction/returnOrderInProgress';
-import { preStart } from './returnOrder/preStart';
+import { preStart, IStartParamsWithoutDetail } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -31,7 +31,7 @@ type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 /**
  * 返品取引開始
  */
-declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
+declare function start(params: IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
 interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
     message: MessageRepo;
@@ -43,7 +43,18 @@ interface IConfirmRepos {
 /**
  * 取引確定
  */
-declare function confirm(params: factory.transaction.returnOrder.IConfirmParams & {
+declare function confirm(params: {
+    /**
+     * 取引ID
+     */
+    id: string;
+    agent: {
+        id: string;
+    };
+    /**
+     * 取引確定後アクション
+     */
+    potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     object: {
         order: {
             dateReturned: Date;

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

@@ -16,16 +16,11 @@ Object.defineProperty(exports, "preStart", { enumerable: true, get: function ()
  */
 function start(params) {
     return async (repos) => {
-        const { transactionObject, expiresInSeconds, seller } = await (0, preStart_1.preStart)(params)(repos);
+        const { transactionObject, expiresInSeconds, seller: _seller } = await (0, preStart_1.preStart)(params)(repos);
         const returnOrderAttributes = {
             project: params.project,
             typeOf: factory_1.factory.transactionType.ReturnOrder,
             agent: params.agent,
-            seller: {
-                id: String(seller.id),
-                typeOf: seller.typeOf,
-                name: seller.name
-            },
             object: transactionObject,
             expiresInSeconds
         };

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

@@ -44,4 +44,4 @@ export declare function exportOneTransactionTasksIfExists(params: {
         endDate?: factory.sortType;
         startDate?: factory.sortType;
     };
-}): IExportTasksOperation<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
+}): IExportTasksOperation<Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'> | undefined>;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.5.0-alpha.8",
+    "@chevre/factory": "11.0.0-alpha.1",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.1"
+  "version": "28.0.0-alpha.3"
 }