@chevre/domain 21.33.0-alpha.5 → 21.33.0-alpha.7

package/example/src/chevre/findTransactionById.ts

@@ -10,8 +10,8 @@ async function main() {
 
     const transaction = await transactionRepo.findById({
         typeOf: chevre.factory.transactionType.PlaceOrder,
-        id: '65ab04d5206595479469f50c',
-        inclusion: ['endDate', 'id', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']
+        id: '6656d35dd1f13f8c658be102',
+        inclusion: ['typeOf']
     });
     console.log('transaction:', transaction);
 }

package/example/src/chevre/findTransactionInProgressById.ts

@@ -12,8 +12,8 @@ async function main() {
         {
             typeOf: chevre.factory.transactionType.PlaceOrder,
             id: '6656d35dd1f13f8c658be102'
-        }
-        // ['_id']
+        },
+        ['_id']
     );
     console.log('transaction:', transaction);
 }

package/example/src/chevre/searchTransactions.ts

@@ -5,6 +5,10 @@ import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
@@ -15,25 +19,19 @@ async function main() {
         page: 1,
         project: { id: { $eq: project.id } },
         typeOf: chevre.factory.transactionType.PlaceOrder,
-        statuses: [chevre.factory.transactionStatusType.Confirmed],
-        result: {
-            order: {
-                confirmationNumber: { $eq: '14438' },
-                orderNumbers: ['CIN3-0760465-8981560']
-            }
-        },
-        inclusion: ['id'],
+        // statuses: [chevre.factory.transactionStatusType.Confirmed],
+        // result: {
+        //     order: {
+        //         confirmationNumber: { $eq: '14438' },
+        //         orderNumbers: ['CIN3-0760465-8981560']
+        //     }
+        // },
+        tasksExportAction: { actionStatus: { $eq: chevre.factory.actionStatusType.PotentialActionStatus } },
+        inclusion: ['_id'],
         exclusion: []
     });
     console.log('transactions found', transactions);
     console.log(transactions.length, 'transactions found');
-
-    const transaction = await transactionRepo.findById({
-        typeOf: chevre.factory.transactionType.PlaceOrder,
-        id: '6570f9d7834f9638ceec86ad',
-        inclusion: ['_id', 'typeOf', 'status']
-    });
-    console.log('transaction found', transaction);
 }
 
 main()

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -59,7 +59,7 @@ async function main() {
                 retUrl: String(process.env.SECURE_TRAN_RET_URL)
             }
         },
-        purpose: { id: transaction.id, typeOf: transaction.typeOf },
+        purpose: { id: transaction.id, typeOf: chevre.factory.transactionType.PlaceOrder },
         paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
         location: {
             typeOf: chevre.factory.creativeWorkType.WebApplication,
@@ -106,7 +106,7 @@ async function main() {
                                     method: '1',
                                     creditCard
                                 },
-                                purpose: { id: transaction.id, typeOf: transaction.typeOf },
+                                purpose: { id: transaction.id, typeOf: chevre.factory.transactionType.PlaceOrder },
                                 paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
                                 location: {
                                     typeOf: chevre.factory.creativeWorkType.WebApplication,
@@ -140,7 +140,7 @@ async function main() {
                         } else if (jobCd === 'VOID') {
                             await (await chevre.service.payment.any.createService()).invalidatePaymentUrl({
                                 project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-                                purpose: { id: transaction.id, typeOf: transaction.typeOf }
+                                purpose: { id: transaction.id, typeOf: chevre.factory.transactionType.PlaceOrder }
                             })({
                                 accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
                                 action: await chevre.repository.Action.createInstance(mongoose.connection),

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

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Transaction";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

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

@@ -51,17 +51,6 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * 取引スキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
     [
         { createdAt: 1 },
@@ -234,42 +223,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'agent.familyName': 1, startDate: -1 },
-        {
-            name: 'searchByAgentFamilyName',
-            partialFilterExpression: {
-                'agent.familyName': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.givenName': 1, startDate: -1 },
-        {
-            name: 'searchByAgentGivenName',
-            partialFilterExpression: {
-                'agent.givenName': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.email': 1, startDate: -1 },
-        {
-            name: 'searchByAgentEmail',
-            partialFilterExpression: {
-                'agent.email': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.telephone': 1, startDate: -1 },
-        {
-            name: 'searchByAgentTelephone',
-            partialFilterExpression: {
-                'agent.telephone': { $exists: true }
-            }
-        }
-    ],
     [
         { 'seller.typeOf': 1, startDate: -1 },
         {
@@ -305,33 +258,45 @@ const indexes = [
     ],
     [
         { tasksExportationStatus: 1, updatedAt: 1 },
-        {
-            name: 'reexportTasks'
-        }
+        { name: 'reexportTasks' }
     ],
     [
-        { 'project.id': 1, tasksExportationStatus: 1, updatedAt: 1 },
-        {
-            name: 'reexportTasks-v2',
-            partialFilterExpression: {
-                'project.id': { $exists: true }
-            }
-        }
+        { status: 1, expires: 1 },
+        { name: 'makeExpired' }
     ],
     [
-        { status: 1, expires: 1 },
+        { 'tasksExportAction.actionStatus': 1, startDate: -1 },
         {
-            name: 'makeExpired'
+            name: 'searchByTasksExportActionActionStatus',
+            partialFilterExpression: {
+                'tasksExportAction.actionStatus': { $exists: true }
+            }
         }
     ],
     [
-        { 'project.id': 1, status: 1, expires: 1 },
+        { 'tasksExportAction.startDate': 1, startDate: -1 },
         {
-            name: 'makeExpired-v2',
+            name: 'searchByTasksExportActionActionStartDate',
             partialFilterExpression: {
-                'project.id': { $exists: true }
+                'tasksExportAction.startDate': { $exists: true }
             }
         }
     ]
 ];
 exports.indexes = indexes;
+/**
+ * 取引スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection<T extends factory.transactionType> = keyof factory.transaction.ITransaction<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'object.orderNumber';
+type IKeyOfProjection<T extends factory.transactionType> = Exclude<keyof factory.transaction.ITransaction<T>, 'id'> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'object.orderNumber';
 interface IAggregationByStatus {
     transactionCount: number;
     avgDuration: number;
@@ -49,7 +49,9 @@ export interface IAggregatePlaceOrder {
     statuses: IStatus[];
 }
 type IOmittedFieldsInProgress = 'tasksExportAction' | 'tasksExportedAt' | 'tasksExportationStatus';
-type ITransactionInProgress<T extends factory.transactionType> = T extends factory.transactionType.MoneyTransfer ? Omit<factory.transaction.moneyTransfer.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.PlaceOrder ? Omit<factory.transaction.placeOrder.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.ReturnOrder ? Omit<factory.transaction.returnOrder.ITransaction, IOmittedFieldsInProgress> : never;
+export type ITransactionInProgress<T extends factory.transactionType> = T extends factory.transactionType.MoneyTransfer ? Omit<factory.transaction.moneyTransfer.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.PlaceOrder ? Omit<factory.transaction.placeOrder.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.ReturnOrder ? Omit<factory.transaction.returnOrder.ITransaction, IOmittedFieldsInProgress> : never;
+type IStartedTransactionFields = 'expires' | 'id' | 'startDate' | 'status';
+export type IStartedTransaction = Pick<factory.transaction.ITransaction<factory.transactionType>, IStartedTransactionFields>;
 /**
  * 取引リポジトリ
  */
@@ -60,7 +62,7 @@ export declare class MongoRepository {
     /**
      * 取引を開始する
      */
-    start<T extends factory.transactionType>(params: factory.transaction.IStartParams<T>): Promise<factory.transaction.ITransaction<T>>;
+    start<T extends factory.transactionType>(params: factory.transaction.IStartParams<T>): Promise<IStartedTransaction>;
     /**
      * 特定取引検索
      */
@@ -76,7 +78,7 @@ export declare class MongoRepository {
     findInProgressById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-    }, inclusion?: IKeyOfProjection<T>[]): Promise<ITransactionInProgress<T>>;
+    }, inclusion: IKeyOfProjection<T>[]): Promise<ITransactionInProgress<T>>;
     /**
      * 取引の注文番号を検索する
      */

package/lib/chevre/repo/transaction.js

@@ -11,20 +11,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const moment = require("moment");
+const transaction_1 = require("../eventEmitter/transaction");
 const factory = require("../factory");
-const transaction_1 = require("./mongoose/schemas/transaction");
-const transaction_2 = require("../eventEmitter/transaction");
 const settings_1 = require("../settings");
+const transaction_2 = require("./mongoose/schemas/transaction");
 /**
  * 取引リポジトリ
  */
 class MongoRepository {
     constructor(connection) {
-        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
+        this.transactionModel = connection.model(transaction_2.modelName, (0, transaction_2.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -175,23 +175,27 @@ class MongoRepository {
                 tasksExportationStatus: { $in: params.tasksExportationStatuses }
             });
         }
+        const tasksExportActionStatusEq = (_b = (_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.actionStatus) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof tasksExportActionStatusEq === 'string') {
+            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
+        }
         switch (params.typeOf) {
             case factory.transactionType.PlaceOrder:
-                const sellerIdIn = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.ids;
+                const sellerIdIn = (_c = params.seller) === null || _c === void 0 ? void 0 : _c.ids;
                 if (Array.isArray(sellerIdIn)) {
                     andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });
                 }
-                const resultOrderNumberIn = (_c = (_b = params.result) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.orderNumbers;
+                const resultOrderNumberIn = (_e = (_d = params.result) === null || _d === void 0 ? void 0 : _d.order) === null || _e === void 0 ? void 0 : _e.orderNumbers;
                 if (Array.isArray(resultOrderNumberIn)) {
                     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
                 }
-                const resultOrderConfirmationNumberEq = (_f = (_e = (_d = params.result) === null || _d === void 0 ? void 0 : _d.order) === null || _e === void 0 ? void 0 : _e.confirmationNumber) === null || _f === void 0 ? void 0 : _f.$eq;
+                const resultOrderConfirmationNumberEq = (_h = (_g = (_f = params.result) === null || _f === void 0 ? void 0 : _f.order) === null || _g === void 0 ? void 0 : _g.confirmationNumber) === null || _h === void 0 ? void 0 : _h.$eq;
                 if (typeof resultOrderConfirmationNumberEq === 'string') {
                     andConditions.push({
                         'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
                     });
                 }
-                const objectOrderNumberEq = (_h = (_g = params.object) === null || _g === void 0 ? void 0 : _g.orderNumber) === null || _h === void 0 ? void 0 : _h.$eq;
+                const objectOrderNumberEq = (_k = (_j = params.object) === null || _j === void 0 ? void 0 : _j.orderNumber) === null || _k === void 0 ? void 0 : _k.$eq;
                 if (typeof objectOrderNumberEq === 'string') {
                     andConditions.push({ 'object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
                 }
@@ -224,11 +228,16 @@ class MongoRepository {
      * 取引を開始する
      */
     start(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            const status = factory.transactionStatusType.InProgress;
+            const tasksExportAction = { actionStatus: factory.actionStatusType.PotentialActionStatus };
+            const tasksExportationStatus = factory.transactionTasksExportationStatus.Unexported;
             const startDate = new Date();
             let expires;
-            if (params.typeOf === factory.transactionType.PlaceOrder
-                || params.typeOf === factory.transactionType.ReturnOrder) {
+            const { typeOf } = params;
+            if (typeOf === factory.transactionType.PlaceOrder
+                || typeOf === factory.transactionType.ReturnOrder) {
                 // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
                 if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
                     expires = moment(startDate)
@@ -242,17 +251,42 @@ class MongoRepository {
             else {
                 expires = params.expires;
             }
-            const transaction = yield this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportAction: {
-                    actionStatus: factory.actionStatusType.PotentialActionStatus
-                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
-                .then((doc) => doc.toObject());
+            let creatingTransaction;
+            if (typeOf === factory.transactionType.MoneyTransfer) {
+                const { agent, project, object, seller, recipient } = params;
+                creatingTransaction = {
+                    status, startDate, expires, typeOf, tasksExportAction, tasksExportationStatus,
+                    agent, project, seller, object, recipient
+                };
+            }
+            else if (typeOf === factory.transactionType.PlaceOrder) {
+                const { agent, project, object, seller } = params;
+                creatingTransaction = {
+                    status, startDate, expires, typeOf, tasksExportAction, tasksExportationStatus,
+                    agent, project, seller, object
+                };
+            }
+            else if (typeOf === factory.transactionType.ReturnOrder) {
+                const { agent, project, object, seller } = params;
+                creatingTransaction = {
+                    status, startDate, expires, typeOf, tasksExportAction, tasksExportationStatus,
+                    agent, project, seller, object
+                };
+            }
+            else {
+                throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
+            }
+            // reimplemnt with insertMany(2024-05-30~)
+            // const transaction = await this.transactionModel.create<AnyKeys<factory.transaction.ITransaction<T>>>(creatingTransaction)
+            //     .then((doc: HydratedDocument<factory.transaction.ITransaction<T>>) => doc.toObject());
+            const result = yield this.transactionModel.insertMany(creatingTransaction, { rawResult: true });
+            const id = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof id !== 'string') {
+                throw new factory.errors.ServiceUnavailable('transaction not saved');
+            }
             // 取引開始時にも取引イベントエミッター連携(2024-03-21~)
-            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
-                id: transaction.id,
-                typeOf: transaction.typeOf,
-                status: factory.transactionStatusType.InProgress
-            });
-            return transaction;
+            transaction_1.transactionEventEmitter.emitTransactionStatusChanged({ id, typeOf, status });
+            return { expires, id, startDate, status }; // minimize response(2024-05-30~)
         });
     }
     /**
@@ -293,7 +327,8 @@ class MongoRepository {
     /**
      * 進行中の取引を取得する
      */
-    findInProgressById(params, inclusion) {
+    findInProgressById(params, inclusion // make required(2024-05-29~)
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
             let projection = {};
             if (Array.isArray(inclusion) && inclusion.length > 0) {
@@ -462,7 +497,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+            transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
                 id: params.id,
                 typeOf: params.typeOf,
                 status: factory.transactionStatusType.Confirmed
@@ -531,7 +566,7 @@ class MongoRepository {
                         tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
                     })
                         .exec();
-                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                    transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
                         id: reexportingTransaction.id,
                         typeOf: reexportingTransaction.typeOf,
                         status: reexportingTransaction.status
@@ -564,7 +599,7 @@ class MongoRepository {
                 .exec();
             if (delayedTransactions.length > 0) {
                 delayedTransactions.forEach((delayedTransaction) => {
-                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                    transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
                         id: delayedTransaction.id,
                         typeOf: delayedTransaction.typeOf,
                         status: delayedTransaction.status
@@ -621,7 +656,7 @@ class MongoRepository {
                 })
                     .exec();
                 expiringTransactions.forEach((expiringTransaction) => {
-                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                    transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
                         id: expiringTransaction.id,
                         typeOf: expiringTransaction.typeOf,
                         status: factory.transactionStatusType.Expired
@@ -665,7 +700,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+            transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
                 id: params.id,
                 typeOf: params.typeOf,
                 status: factory.transactionStatusType.Canceled

package/lib/chevre/service/offer/event/authorize.js

@@ -118,7 +118,7 @@ function validateCreateRequest(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        });
+        }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'object']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -43,7 +43,7 @@ function voidTransactionByActionId(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
-        });
+        }, ['typeOf', 'object']);
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -45,7 +45,7 @@ function acceptOffer(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
-        });
+        }, ['project', 'agent', 'typeOf']);
         const coaInfo = yield findCOAInfo({
             id: params.object.event.id,
             project: { id: transaction.project.id }
@@ -122,7 +122,7 @@ function reAcceptOffer(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
-        });
+        }, ['project', 'agent', 'typeOf']);
         const coaInfo = yield findCOAInfo({
             id: params.object.event.id,
             project: { id: transaction.project.id }

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -26,7 +26,7 @@ function authorize(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        });
+        }, ['agent', 'project', 'seller', 'typeOf', 'object']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/offer/eventServiceByCOA/cancel.js

@@ -25,7 +25,7 @@ function cancel(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        });
+        }, ['typeOf', 'object', 'agent']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -26,7 +26,7 @@ function changeOffers(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        });
+        }, ['typeOf', 'object', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -19,7 +19,7 @@ function authorize(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
-        });
+        }, ['seller', 'project', 'agent', 'typeOf']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js

@@ -16,10 +16,10 @@ function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let transaction;
         if (params.agent !== undefined && params.agent !== null && typeof params.agent.id === 'string') {
-            transaction = yield repos.transaction.findInProgressById({
+            transaction = (yield repos.transaction.findInProgressById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
-            });
+            }, ['typeOf']));
         }
         let authorizeActions;
         if (typeof params.id === 'string') {

package/lib/chevre/service/offer/product.js

@@ -92,7 +92,7 @@ function authorize(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        });
+        }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/order/findPlaceOrderTransaction.js

@@ -25,7 +25,7 @@ function findPlaceOrderTransaction(params) {
                     orderNumbers: [params.orderNumber]
                 }
             },
-            inclusion: ['id', 'potentialActions', 'project', 'typeOf'],
+            inclusion: ['potentialActions', 'project', 'typeOf'],
             exclusion: []
         });
         const placeOrderTransaction = placeOrderTransactions.shift();

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

@@ -44,8 +44,7 @@ function createOrderFromBody(params) {
                     orderNumbers: [orderNumber]
                 }
             },
-            // inclusion: ['id', 'potentialActions', 'project', 'typeOf', 'result'],
-            inclusion: ['id', 'project', 'typeOf', 'result'],
+            inclusion: ['project', 'typeOf', 'result'],
             exclusion: []
         });
         const placeOrderTransactionWithResult = placeOrderTransactions.shift();

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

@@ -52,7 +52,7 @@ function returnOrder(params) {
             typeOf: factory.transactionType.ReturnOrder,
             statuses: [factory.transactionStatusType.Confirmed],
             object: { order: { orderNumbers: [orderNumber] } },
-            inclusion: ['id', 'typeOf', 'potentialActions'],
+            inclusion: ['typeOf', 'potentialActions'],
             exclusion: []
         });
         const returnOrderTransaction = returnOrderTransactions.shift();

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

@@ -14,7 +14,7 @@ export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
     object: factory.action.authorize.paymentMethod.any.IObject;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: Omit<factory.transaction.ITransaction<factory.transactionType>, 'tasksExportAction' | 'tasksExportedAt' | 'tasksExportationStatus'>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType>, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail;

package/lib/chevre/service/payment/any.js

@@ -117,7 +117,7 @@ function processVoidPayTransaction(params) {
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
-            transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
+            transaction = (yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status']));
         }
         else {
             transaction = (yield repos.transaction.findById({
@@ -225,7 +225,7 @@ function publishPaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         try {
-            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
+            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['expires', 'seller', 'project']);
             const paymentServiceType = params.paymentServiceType;
             // 取引番号生成
             const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
@@ -298,7 +298,7 @@ function authorize(params) {
                 transaction: repos.transaction
             });
         }
-        const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
+        const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['agent', 'expires', 'object', 'typeOf', 'project', 'seller']);
         const paymentServiceType = params.paymentServiceType;
         // 取引番号生成
         let transactionNumber;

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

@@ -1,4 +1,3 @@
-import * as factory from '../../factory';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/code';
@@ -8,7 +7,7 @@ import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as SellerRepo } from '../../repo/seller';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
-import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
 import { IPassportValidator as IWaiterPassportValidator, moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
 export interface IStartOperationRepos {
@@ -38,7 +37,7 @@ export type IStartParams = MoneyTransferFactory.IStartParams;
  * 取引開始
  * 通貨転送資産取引サービスを利用して転送取引を開始する
  */
-export declare function start(params: IStartParams): IStartOperation<factory.transaction.moneyTransfer.ITransaction>;
+export declare function start(params: IStartParams): IStartOperation<IStartedTransaction>;
 export type IAuthorizeOperation<T> = (repos: {
     action: ActionRepo;
     authorization: AuthorizationRepo;

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

@@ -53,7 +53,9 @@ function start(params) {
         let transaction;
         try {
             transaction = yield repos.transaction.start(startParams);
-            yield authorizePaymentCard({ transaction })(repos);
+            yield authorizePaymentCard({
+                transaction: Object.assign(Object.assign({}, transaction), { object: startParams.object, seller: startParams.seller, agent: startParams.agent, project: startParams.project, typeOf: startParams.typeOf })
+            })(repos);
         }
         catch (error) {
             throw error;
@@ -164,7 +166,7 @@ function processAuthorizePaymentCard(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.purpose.id
-        });
+        }, ['_id', 'agent', 'project', 'recipient', 'seller', 'typeOf', 'object']);
         const recipient = {
             typeOf: transaction.recipient.typeOf,
             id: transaction.recipient.id,

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

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

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

@@ -1,8 +1,7 @@
 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 { MongoRepository as TransactionRepo } from '../../../repo/transaction';
-import * as factory from '../../../factory';
+import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
     member: MemberRepo;
@@ -15,5 +14,5 @@ type IStartParams = PlaceOrderFactory.IStartParams;
 /**
  * 取引開始
  */
-declare function start(params: IStartParams): IStartOperation<factory.transaction.placeOrder.ITransaction>;
+declare function start(params: IStartParams): IStartOperation<IStartedTransaction>;
 export { start };

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

@@ -10,7 +10,7 @@ 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 { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../repo/transaction';
 import { preStart } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
@@ -32,7 +32,7 @@ type ITaskAndTransactionOperation<T> = (repos: {
 /**
  * 返品取引開始
  */
-declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<factory.transaction.returnOrder.ITransaction>;
+declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
 /**
  * 取引確定
  */

package/lib/chevre/service/transaction.js

@@ -48,7 +48,7 @@ function updateAgent(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: params.typeOf,
             id: params.id
-        });
+        }, ['agent', 'object', 'typeOf']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
@@ -61,9 +61,10 @@ function updateAgent(params) {
         let customer;
         if (transaction.typeOf === factory.transactionType.PlaceOrder) {
             // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
-            if (typeof ((_a = transaction.object.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: transaction.object.customer.typeOf, id: transaction.object.customer.id }, (Array.isArray(transaction.object.customer.identifier))
-                    ? { identifier: transaction.object.customer.identifier }
+            const trasactionObject = transaction.object;
+            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 } : {});
             }
         }

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.371.0-alpha.6",
-    "@cinerino/sdk": "7.0.0-alpha.10",
+    "@chevre/factory": "4.372.0",
+    "@cinerino/sdk": "7.0.0-alpha.12",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.5"
+  "version": "21.33.0-alpha.7"
 }