@chevre/domain 24.0.0-alpha.1 → 24.0.0-alpha.11

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

@@ -30,11 +30,14 @@ exports.authorize = authorize;
 const moment_1 = __importDefault(require("moment"));
 const factory = __importStar(require("../../../factory"));
 const MoneyTransferAssetTransactionService = __importStar(require("../../assetTransaction/moneyTransfer"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 function authorize(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf: ${params.purpose.typeOf} not implemented`);
+        }
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['seller', 'project', 'agent', 'typeOf']);
@@ -42,7 +45,7 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         const now = new Date();
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }
@@ -51,7 +54,7 @@ function authorize(params) {
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         let requestBody;
         let responseBody;
-        let acceptedOffers4result = [];
+        let acceptedOffers4result;
         // 承認アクションを開始
         const actionAttributes = createAuthorizeMoneyTransferOfferActionattributes({
             transaction,
@@ -189,66 +192,59 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
 }
 function processStartDepositTransaction(params) {
     return async (repos) => {
-        let requestBody;
-        let responseBody;
-        try {
-            const description = `for ${params.transaction.typeOf} Transaction ${params.transaction.id}`;
-            // 最大1ヵ月のオーソリ
-            const expires = (0, moment_1.default)()
-                .add(1, 'month')
-                .toDate();
-            const toLocation = {
-                typeOf: factory.permit.PermitType.Permit,
-                identifier: params.object.itemOffered.toLocation.identifier,
-                issuedThrough: { id: params.object.itemOffered.toLocation.issuedThrough?.id }
-            };
-            // 販売者が取引人に入金
-            requestBody = {
-                typeOf: factory.assetTransactionType.MoneyTransfer,
-                project: { typeOf: factory.organizationType.Project, id: params.project.id },
-                transactionNumber: params.transactionNumber,
-                agent: {
-                    // project: params.transaction.project,
-                    typeOf: params.transaction.seller.typeOf,
-                    id: String(params.transaction.seller.id),
-                    name: (typeof params.transaction.seller.name === 'string')
-                        ? params.transaction.seller.name
-                        : String(params.transaction.seller.name?.ja)
-                },
-                object: {
-                    amount: {
-                        typeOf: 'MonetaryAmount',
-                        value: Number(params.object.itemOffered.amount.value),
-                        currency: ''
-                    },
-                    fromLocation: {
-                        typeOf: params.transaction.agent.typeOf,
-                        id: params.transaction.agent.id,
-                        name: (typeof params.transaction.agent.name === 'string')
-                            ? params.transaction.agent.name
-                            : `${params.transaction.typeOf} Transaction ${params.transaction.id}`
-                    },
-                    toLocation,
-                    description: description,
-                    pendingTransaction: {
-                        typeOf: factory.account.transactionType.Deposit,
-                        transactionNumber: params.transactionNumber
-                    }
+        const description = `for ${params.transaction.typeOf} Transaction ${params.transaction.id}`;
+        // 最大1ヵ月のオーソリ
+        const expires = (0, moment_1.default)()
+            .add(1, 'month')
+            .toDate();
+        const toLocation = {
+            typeOf: factory.permit.PermitType.Permit,
+            identifier: params.object.itemOffered.toLocation.identifier,
+            issuedThrough: { id: params.object.itemOffered.toLocation.issuedThrough?.id }
+        };
+        // 販売者が取引人に入金
+        const requestBody = {
+            typeOf: factory.assetTransactionType.MoneyTransfer,
+            project: { typeOf: factory.organizationType.Project, id: params.project.id },
+            transactionNumber: params.transactionNumber,
+            agent: {
+                // project: params.transaction.project,
+                typeOf: params.transaction.seller.typeOf,
+                id: String(params.transaction.seller.id),
+                name: (typeof params.transaction.seller.name === 'string')
+                    ? params.transaction.seller.name
+                    : String(params.transaction.seller.name?.ja)
+            },
+            object: {
+                amount: {
+                    typeOf: 'MonetaryAmount',
+                    value: Number(params.object.itemOffered.amount.value),
+                    currency: ''
                 },
-                recipient: {
+                fromLocation: {
                     typeOf: params.transaction.agent.typeOf,
                     id: params.transaction.agent.id,
                     name: (typeof params.transaction.agent.name === 'string')
                         ? params.transaction.agent.name
                         : `${params.transaction.typeOf} Transaction ${params.transaction.id}`
                 },
-                expires: expires
-            };
-            responseBody = await MoneyTransferAssetTransactionService.start(requestBody)(repos);
-        }
-        catch (error) {
-            throw error;
-        }
+                toLocation,
+                description: description,
+                pendingTransaction: {
+                    typeOf: factory.account.transactionType.Deposit,
+                    transactionNumber: params.transactionNumber
+                }
+            },
+            recipient: {
+                typeOf: params.transaction.agent.typeOf,
+                id: params.transaction.agent.id,
+                name: (typeof params.transaction.agent.name === 'string')
+                    ? params.transaction.agent.name
+                    : `${params.transaction.typeOf} Transaction ${params.transaction.id}`
+            },
+            expires: expires
+        };
+        const responseBody = await MoneyTransferAssetTransactionService.start(requestBody)(repos);
         return { requestBody, responseBody };
     };
 }

package/lib/chevre/service/offer/moneyTransfer/voidTransaction.d.ts

@@ -1,9 +1,9 @@
 import * as factory from '../../../factory';
 import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidMoneyTransferTransaction>): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

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

@@ -28,9 +28,12 @@ const factory = __importStar(require("../../../factory"));
 const MoneyTransferAssetTransactionService = __importStar(require("../../assetTransaction/moneyTransfer"));
 function voidTransaction(params) {
     return async (repos) => {
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf: ${params.purpose.typeOf} not implemented`);
+        }
         let transaction;
         if (params.agent !== undefined && params.agent !== null && typeof params.agent.id === 'string') {
-            transaction = await repos.transaction.projectFieldsInProgressById({
+            transaction = await repos.placeOrder.findPlaceOrderInProgressById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             }, ['typeOf']);

package/lib/chevre/service/offer/product.d.ts

@@ -11,7 +11,7 @@ import type { ProductRepo } from '../../repo/product';
 import type { ProjectRepo } from '../../repo/project';
 import type { ServiceOutputRepo } from '../../repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 export interface IAuthorizeOperationRepos {
     account: AccountRepo;
@@ -26,7 +26,7 @@ export interface IAuthorizeOperationRepos {
     project: ProjectRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeOperationRepos) => Promise<T>;
@@ -96,5 +96,5 @@ export declare function authorize(params: {
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidRegisterServiceTransaction>): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

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

@@ -31,7 +31,7 @@ const factory = __importStar(require("../../factory"));
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 const availableProductTypes_1 = require("../../factory/availableProductTypes");
 const RegisterServiceTransaction = __importStar(require("../assetTransaction/registerService"));
-const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("./any");
 const factory_1 = require("./product/factory");
 const searchProductOffers_1 = require("./product/searchProductOffers");
@@ -99,7 +99,7 @@ function search(params) {
 function authorize(params) {
     return async (repos) => {
         const now = new Date();
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
@@ -117,7 +117,7 @@ function authorize(params) {
             })(repos);
         }
         // ポイント特典の識別子に利用するため注文番号を先に発行
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
@@ -214,7 +214,7 @@ function fixProductAndOffers(params) {
 }
 function voidTransaction(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['agent', 'status', 'typeOf']);

package/lib/chevre/service/order/confirmPayTransaction.d.ts

@@ -7,7 +7,6 @@ import type { EventRepo } from '../../repo/event';
 import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
 declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction> & {
     project: {
         id: string;
@@ -22,6 +21,5 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
     event: EventRepo;
     project: ProjectRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
 }) => Promise<void>;
 export { confirmPayTransaction };

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

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = confirmPayTransaction;
 const factory = __importStar(require("../../factory"));
+// import type { TransactionRepo } from '../../repo/transaction';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
 function confirmPayTransaction(data, options) {
     return async (repos) => {

package/lib/chevre/service/order/findPlaceOrderTransaction.d.ts

@@ -1,4 +1,4 @@
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 type ITransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'potentialActions' | 'project' | 'typeOf'>;
 export declare function findPlaceOrderTransaction(params: {
@@ -8,6 +8,6 @@ export declare function findPlaceOrderTransaction(params: {
     confirmationNumber: string;
     orderNumber: string;
 }): (repos: {
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<ITransaction>;
 export {};

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

@@ -27,7 +27,7 @@ exports.findPlaceOrderTransaction = findPlaceOrderTransaction;
 const factory = __importStar(require("../../factory"));
 function findPlaceOrderTransaction(params) {
     return async (repos) => {
-        const placeOrderTransactions = await repos.transaction.projectFields({
+        const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts

@@ -3,7 +3,7 @@ import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 declare function onAssetTransactionStatusChanged(params: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): (repos: {
@@ -12,7 +12,7 @@ declare function onAssetTransactionStatusChanged(params: factory.task.IData<fact
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<void>;
 declare function paymentDue2Processing(params: {
     project: {
@@ -26,7 +26,7 @@ declare function paymentDue2Processing(params: {
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<void>;
 declare function processing2inTransit(params: {
     project: {
@@ -37,6 +37,6 @@ declare function processing2inTransit(params: {
 }): (repos: {
     order: OrderRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<void>;
 export { onAssetTransactionStatusChanged, paymentDue2Processing, processing2inTransit };

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

@@ -193,7 +193,7 @@ function isProcessable(params) {
             inclusion: ['paymentMethods']
         });
         // PayTransactionのステータス検証
-        let allPayTransactionConfirmed = false;
+        let allPayTransactionConfirmed;
         const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
             .map((invoice) => invoice.paymentMethodId);
         if (paymentMethodIds.length > 0) {
@@ -217,7 +217,7 @@ function paymentDue2Processing(params) {
             project: { id: params.project.id },
             confirmationNumber: params.confirmationNumber,
             orderNumber: params.orderNumber
-        })({ transaction: repos.transaction });
+        })(repos);
         // const existingOrder: Pick<factory.order.IOrder, 'project'> = await repos.order.projectFieldsByOrderNumber({
         //     orderNumber: params.orderNumber,
         //     project: { id: params.project.id },
@@ -305,19 +305,13 @@ function cancelOrderIfExist(params) {
                 project: { id: params.project.id },
                 confirmationNumber: orderByPaymentMethodId.confirmationNumber,
                 orderNumber: orderByPaymentMethodId.orderNumber
-            })({ transaction: repos.transaction });
-            let order;
-            try {
-                order = await repos.order.changeStatus({
-                    project: { id: params.project.id },
-                    orderNumber: orderByPaymentMethodId.orderNumber,
-                    orderStatus: factory.orderStatus.OrderCancelled,
-                    previousOrderStatus: factory.orderStatus.OrderPaymentDue
-                });
-            }
-            catch (error) {
-                throw error;
-            }
+            })(repos);
+            const order = await repos.order.changeStatus({
+                project: { id: params.project.id },
+                orderNumber: orderByPaymentMethodId.orderNumber,
+                orderStatus: factory.orderStatus.OrderCancelled,
+                previousOrderStatus: factory.orderStatus.OrderPaymentDue
+            });
             if (params.useOnOrderStatusChanged) {
                 await (0, onOrderStatusChanged_1.onOrderCancelled)({
                     order: {
@@ -440,10 +434,7 @@ function processing2inTransit(params) {
                     ...order,
                     orderStatus: factory.orderStatus.OrderInTransit
                 }
-            })({
-                task: repos.task,
-                transaction: repos.transaction
-            }, settings);
+            })(repos, settings);
         }
     };
 }

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

@@ -37,7 +37,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderCancelled(params) {
     return async (repos) => {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
-        let tasks = [];
+        let tasks;
         switch (params.order.orderStatus) {
             // OrderCancelled追加(2023-08-30~)
             case factory.orderStatus.OrderCancelled:

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

@@ -41,7 +41,7 @@ function onOrderDelivered(params) {
     ) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
-        let tasks = [];
+        let tasks;
         // const sendOrderPotentialActions =
         //     params.placeOrderTransaction?.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions;
         switch (params.order.orderStatus) {

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

@@ -41,7 +41,7 @@ function onOrderDeliveredPartially(params) {
     ) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
-        let tasks = [];
+        let tasks;
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderInTransit:
                 tasks = [

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts

@@ -1,5 +1,5 @@
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 declare function onOrderInTransit(params: {
@@ -8,6 +8,6 @@ declare function onOrderInTransit(params: {
     };
 }): (repos: {
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<void>;
 export { onOrderInTransit };

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

@@ -103,7 +103,7 @@ function createSendOrderTaskIfNotExist(params) {
 }
 function createOnAuthorizationCreatedTask(order) {
     return async (repos) => {
-        const placeOrderTransaction = (await repos.transaction.projectFields({
+        const placeOrderTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.PlaceOrder,

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

@@ -37,7 +37,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderPaymentDue(params) {
     return async (repos) => {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
-        let tasks = [];
+        let tasks;
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,

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

@@ -43,7 +43,7 @@ function onOrderProcessing(params) {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         const { numTryConfirmReserveTransaction } = settings;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
-        let tasks = [];
+        let tasks;
         let creatingCheckResourceTask;
         const sendEmailMessageByOnOrderProcessing = params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
         switch (params.order.orderStatus) {

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

@@ -43,7 +43,7 @@ function onOrderReturned(params) {
     ) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
-        let tasks = [];
+        let tasks;
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,

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

@@ -32,8 +32,7 @@ function onOrderUpdated(params) {
     // settings: Settings
     ) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
-        let tasks = [];
-        tasks = (0, factory_1.createInformTasks)({
+        const tasks = (0, factory_1.createInformTasks)({
             typeOf: factory.order.OrderType.Order,
             orderNumber: params.orderNumber,
             project: { id: params.project.id, typeOf: factory.organizationType.Project },

package/lib/chevre/service/order/payOrder.d.ts

@@ -2,7 +2,7 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 /**
@@ -13,6 +13,6 @@ declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPay
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<void>;
 export { payOrder };

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts

@@ -1,6 +1,6 @@
 import type { ActionRepo } from '../../../repo/action';
 import type { IPlacingOrder, OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
 declare function createPlacingOrderFromExistingTransaction(params: {
@@ -12,7 +12,7 @@ declare function createPlacingOrderFromExistingTransaction(params: {
 }): (repos: {
     action: ActionRepo;
     orderInTransaction: OrderInTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<{
     order: IPlacingOrder;
     placeOrderTransaction: IPlaceOrderTransaction;

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

@@ -30,8 +30,7 @@ function createPlacingOrderFromExistingTransaction(params) {
     return async (repos) => {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
-        let order;
-        const placeOrderTransactions = await repos.transaction.projectFields({
+        const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -102,7 +101,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                 throw error;
             }
         }
-        order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
+        const order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
         return { order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers };
     };
 }

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

@@ -5,7 +5,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 /**
@@ -29,7 +29,7 @@ declare function placeOrder(params: {
     orderInTransaction: OrderInTransactionRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<{
     order: factory.transaction.placeOrder.IOrderAsResult;
 }>;

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

@@ -4,7 +4,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 import * as factory from '../../factory';
 declare function returnOrder(params: {
     agent: factory.action.transfer.returnAction.order.IAgent;
@@ -23,6 +23,6 @@ declare function returnOrder(params: {
     ownershipInfo: OwnershipInfoRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    returnOrder: ReturnOrderRepo;
 }) => Promise<void>;
 export { returnOrder };

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

@@ -72,7 +72,7 @@ function returnOrder(params) {
                 throw new factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
         }
         // 返品取引検索
-        const returnOrderTransactions = await repos.transaction.projectFields({
+        const returnOrderTransactions = await repos.returnOrder.findReturnOrderTransactions({
             limit: 1,
             page: 1,
             project: { id: { $eq: order.project.id } },
@@ -105,7 +105,7 @@ function returnOrder(params) {
             recipient,
             typeOf: factory.actionType.ReturnAction
         };
-        let returnedOwnershipInfos = [];
+        let returnedOwnershipInfos;
         let returnedOrder;
         const action = await repos.action.start(returnOrderActionAttributes);
         try {

package/lib/chevre/service/order/sendOrder.d.ts

@@ -4,7 +4,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 type ISendOperation<T> = (repos: {
@@ -14,7 +14,7 @@ type ISendOperation<T> = (repos: {
     ownershipInfo: OwnershipInfoRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<T>;
 /**
  * 注文を配送する

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

@@ -63,7 +63,7 @@ function sendOrder(params) {
                 project: { id: params.project.id },
                 confirmationNumber,
                 orderNumber
-            })({ transaction: repos.transaction });
+            })(repos);
             // 注文取得
             let order = await repos.order.projectFieldsByOrderNumber({
                 orderNumber,