@chevre/domain 21.35.0-alpha.7 → 21.35.0-alpha.9

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

@@ -97,19 +97,6 @@ const indexes = [
         { expires: 1, startDate: -1 },
         { name: 'searchByExpires-v2' }
     ],
-    [
-        { tasksExportationStatus: 1, startDate: -1 },
-        { name: 'searchByTasksExportationStatus-v2' }
-    ],
-    [
-        { tasksExportedAt: 1, startDate: -1 },
-        {
-            name: 'searchByTasksExportedAt-v2',
-            partialFilterExpression: {
-                tasksExportedAt: { $exists: true }
-            }
-        }
-    ],
     [
         { 'object.accountId': 1, startDate: -1 },
         {
@@ -266,10 +253,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { typeOf: 1, status: 1, tasksExportationStatus: 1 },
-        { name: 'startExportTasks' }
-    ],
     [
         { status: 1, expires: 1 },
         { name: 'makeExpired' }

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

@@ -80,19 +80,6 @@ const indexes = [
         { expires: 1, startDate: -1 },
         { name: 'searchByExpiresAndStartDate' }
     ],
-    [
-        { tasksExportationStatus: 1, startDate: -1 },
-        { name: 'searchByTasksExportationStatusAndStartDate' }
-    ],
-    [
-        { tasksExportedAt: 1, startDate: -1 },
-        {
-            name: 'searchByTasksExportedAtAndStartDate',
-            partialFilterExpression: {
-                tasksExportedAt: { $exists: true }
-            }
-        }
-    ],
     [
         { 'result.order.confirmationNumber': 1, startDate: -1 },
         {
@@ -201,19 +188,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { typeOf: 1, status: 1, tasksExportationStatus: 1 },
-        { name: 'startExportTasks' }
-    ],
-    [
-        { 'project.id': 1, typeOf: 1, status: 1, tasksExportationStatus: 1 },
-        {
-            name: 'startExportTasks-v2',
-            partialFilterExpression: {
-                'project.id': { $exists: true }
-            }
-        }
-    ],
     [
         { status: 1, expires: 1 },
         { name: 'makeExpired' }

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

@@ -0,0 +1,21 @@
+import type { MongoRepository as ActionRepo } from '../../../repo/action';
+import type { IPlacingOrder, MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import * as factory from '../../../factory';
+type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
+declare function createPlacingOrderFromExistingTransaction(params: {
+    project: {
+        id: string;
+    };
+    confirmationNumber: string;
+    orderNumber: string;
+}): (repos: {
+    action: ActionRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    transaction: TransactionRepo;
+}) => Promise<{
+    order: IPlacingOrder;
+    placeOrderTransaction: IPlaceOrderTransaction;
+    serialNumbers: string[];
+}>;
+export { createPlacingOrderFromExistingTransaction };

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

@@ -0,0 +1,89 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPlacingOrderFromExistingTransaction = void 0;
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const factory_1 = require("./factory");
+const debug = createDebug('chevre-domain:service:order');
+// tslint:disable-next-line:max-func-body-length
+function createPlacingOrderFromExistingTransaction(params) {
+    // tslint:disable-next-line:max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const confirmationNumber = String(params.confirmationNumber);
+        const orderNumber = params.orderNumber;
+        let order;
+        const placeOrderTransactions = yield repos.transaction.search({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: params.project.id } },
+            typeOf: factory.transactionType.PlaceOrder,
+            statuses: [factory.transactionStatusType.Confirmed],
+            result: {
+                order: {
+                    confirmationNumber: { $eq: confirmationNumber },
+                    orderNumbers: [orderNumber]
+                }
+            },
+            inclusion: ['project', 'typeOf', 'result', 'object', 'seller'] // potentialActionsは必要なし(2024-01-19~)
+        });
+        const placeOrderTransactionWithResult = placeOrderTransactions.shift();
+        if (placeOrderTransactionWithResult === undefined) {
+            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+        }
+        let authorizePaymentActions = [];
+        let authorizeOfferActionsWithInstrument = [];
+        const authorizeActionsAsResult = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
+        if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
+            const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
+            if (completedAuthorizeActionIds.length > 0) {
+                authorizePaymentActions = yield repos.action.search({
+                    typeOf: factory.actionType.AuthorizeAction,
+                    purpose: {
+                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                        id: { $in: [placeOrderTransactionWithResult.id] }
+                    },
+                    object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
+                    id: { $in: completedAuthorizeActionIds }
+                }, ['result'], []);
+                authorizeOfferActionsWithInstrument = (yield repos.action.search({
+                    typeOf: factory.actionType.AuthorizeAction,
+                    purpose: {
+                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                        id: { $in: [placeOrderTransactionWithResult.id] }
+                    },
+                    object: {
+                        typeOf: {
+                            $in: [
+                                factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+                                factory.offerType.Offer
+                            ]
+                        }
+                    },
+                    id: { $in: completedAuthorizeActionIds }
+                }, ['instrument'], []));
+                debug('createPlacingOrderFromExistingTransaction: authorizeOfferActionsWithInstrument found:', JSON.stringify(authorizeOfferActionsWithInstrument));
+            }
+        }
+        // orderedItem生成のためにacceptedOffersを取得
+        let acceptedOffers;
+        const serialNumbers = authorizeOfferActionsWithInstrument
+            .filter(({ instrument }) => typeof instrument.transactionNumber === 'string')
+            .map(({ instrument }) => String(instrument.transactionNumber));
+        // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
+        acceptedOffers = (yield repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+            .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
+        order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
+        return { order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers };
+    });
+}
+exports.createPlacingOrderFromExistingTransaction = createPlacingOrderFromExistingTransaction;

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

@@ -1,8 +1,10 @@
 import type { IPlacingOrder } from '../../../repo/orderInTransaction';
 import * as factory from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
+type IOrderAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IItemOffered>;
 declare function createPlacingOrder(params: {
     transaction: IPlaceOrderTransaction;
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
+    acceptedOffers: IOrderAcceptedOffer[];
 }): IPlacingOrder;
-export { createPlacingOrder };
+export { createPlacingOrder, IOrderAcceptedOffer };

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

@@ -4,6 +4,7 @@ exports.createPlacingOrder = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
 const result_1 = require("../../transaction/placeOrderInProgress/result");
+const orderedItem_1 = require("../../transaction/placeOrderInProgress/result/orderedItem");
 function createPlacingOrder(params) {
     var _a, _b;
     const { transaction, authorizePaymentActions } = params;
@@ -11,17 +12,45 @@ function createPlacingOrder(params) {
     if (orderByTransaction === undefined) {
         throw new factory.errors.NotFound('transaction.result.order');
     }
-    const orderedItems = (Array.isArray(orderByTransaction.orderedItem)) ? orderByTransaction.orderedItem : [];
+    // const orderedItems: factory.order.IOrderedItem[]
+    //     = (Array.isArray(orderByTransaction.orderedItem)) ? orderByTransaction.orderedItem : [];
     const customer = (0, result_1.createCustomer)({ transaction });
     const seller = (0, result_1.createSeller)({ transaction });
     const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
     const broker = (typeof ((_b = transaction.object.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = (0, result_1.createPaymentMethods)({ authorizePaymentActions });
+    const eventReservationAcceptedOffers = [];
+    const productAcceptedOffers = [];
+    const moneyTransferAcceptedOffers = [];
+    params.acceptedOffers.forEach((acceptedOffer) => {
+        const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
+        switch (itemOfferedTypeOf) {
+            case factory.reservationType.BusReservation:
+            case factory.reservationType.EventReservation:
+                eventReservationAcceptedOffers.push(acceptedOffer);
+                break;
+            case factory.permit.PermitType.Permit:
+                productAcceptedOffers.push(acceptedOffer);
+                break;
+            case factory.actionType.MoneyTransfer:
+                moneyTransferAcceptedOffers.push(acceptedOffer);
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
+        }
+    });
+    const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
+        eventReservationAcceptedOffers,
+        productAcceptedOffers,
+        moneyTransferAcceptedOffers
+    });
     return Object.assign(Object.assign(Object.assign(Object.assign({}, orderByTransaction), { customer,
         seller,
         paymentMethods,
         price, orderDate: moment(orderByTransaction.orderDate)
-            .toDate(), orderedItem: orderedItems }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined // 2024-06-17~
+            .toDate(), 
+        // orderedItem: orderedItems,
+        orderedItem }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined // 2024-06-17~
     // discontinue(2024-06-17~)
     // ...(params.dateReturned !== null && params.dateReturned !== undefined)
     //     ? {

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

@@ -0,0 +1,10 @@
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+declare function voidAcceptedOfferIfNecessary(params: {
+    object: {
+        orderNumber: string;
+    };
+    serialNumbers: string[];
+}): (repos: {
+    orderInTransaction: OrderInTransactionRepo;
+}) => Promise<void>;
+export { voidAcceptedOfferIfNecessary };

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

@@ -0,0 +1,34 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.voidAcceptedOfferIfNecessary = void 0;
+const createDebug = require("debug");
+// import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+// import * as factory from '../../../factory';
+const debug = createDebug('chevre-domain:service:order');
+// type IPlaceOrderTransaction = Pick<
+//     factory.transaction.placeOrder.ITransaction,
+//     'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'
+// >;
+function voidAcceptedOfferIfNecessary(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (Array.isArray(params.serialNumbers) && params.serialNumbers.length > 0) {
+            // 取引に保管された承認アクション以外のアクションについて、オファーを除外する
+            debug('voidAcceptedOfferBySerialNumber processing...', params.object.orderNumber, 'serialNumbersMustBeIn:', params.serialNumbers);
+            const voidAcceptedOfferBySerialNumberResult = yield repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
+                orderNumber: params.object.orderNumber,
+                acceptedOffers: { serialNumber: { $nin: params.serialNumbers } }
+            });
+            debug('voidAcceptedOfferBySerialNumber processed.', params.object.orderNumber, 'voidAcceptedOfferBySerialNumberResult:', voidAcceptedOfferBySerialNumberResult);
+        }
+    });
+}
+exports.voidAcceptedOfferIfNecessary = voidAcceptedOfferIfNecessary;

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

@@ -6,22 +6,6 @@ import type { MongoRepository as OrderInTransactionRepo } from '../../repo/order
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
-import { IExternalOrder } from './onOrderStatusChanged';
-/**
- * 注文取引なしに注文を作成する
- */
-declare function placeOrderWithoutTransaction(params: {
-    agent?: factory.action.trade.order.IAgent;
-    project: {
-        id: string;
-    };
-    object: IExternalOrder;
-}): (repos: {
-    accountingReport: AccountingReportRepo;
-    action: ActionRepo;
-    order: OrderRepo;
-    task: TaskRepo;
-}) => Promise<void>;
 /**
  * 注文を作成する
  */
@@ -46,4 +30,4 @@ declare function placeOrder(params: {
 }) => Promise<{
     order: factory.transaction.placeOrder.IOrderAsResult;
 }>;
-export { placeOrder, placeOrderWithoutTransaction };
+export { placeOrder };

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

@@ -9,141 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
-const createDebug = require("debug");
+exports.placeOrder = void 0;
 const factory = require("../../factory");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory_1 = require("./placeOrder/factory");
-const debug = createDebug('chevre-domain:service:order');
-function createPlacingOrderFromExistingTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const confirmationNumber = String(params.confirmationNumber);
-        const orderNumber = params.orderNumber;
-        let order;
-        const placeOrderTransactions = yield repos.transaction.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            typeOf: factory.transactionType.PlaceOrder,
-            statuses: [factory.transactionStatusType.Confirmed],
-            result: {
-                order: {
-                    confirmationNumber: { $eq: confirmationNumber },
-                    orderNumbers: [orderNumber]
-                }
-            },
-            inclusion: ['project', 'typeOf', 'result', 'object', 'seller'] // potentialActionsは必要なし(2024-01-19~)
-        });
-        const placeOrderTransactionWithResult = placeOrderTransactions.shift();
-        if (placeOrderTransactionWithResult === undefined) {
-            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
-        }
-        let authorizePaymentActions = [];
-        const authorizeActionsAsResult = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
-        if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
-            const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
-            if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = yield repos.action.search({
-                    typeOf: factory.actionType.AuthorizeAction,
-                    purpose: {
-                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                        id: { $in: [placeOrderTransactionWithResult.id] }
-                    },
-                    object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
-                    id: { $in: completedAuthorizeActionIds }
-                }, ['result'], []);
-                debug('createPlacingOrderFromExistingTransaction: authorizePaymentActions found:', JSON.stringify(authorizePaymentActions));
-            }
-        }
-        order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions });
-        return { order, placeOrderTransaction: placeOrderTransactionWithResult };
-    });
-}
-/**
- * 注文取引なしに注文を作成する
- */
-function placeOrderWithoutTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const order = params.object;
-        const simpleOrder = {
-            typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
-            orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
-            orderDate: order.orderDate
-        };
-        const orderActionAttributes = {
-            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
-            object: simpleOrder,
-            potentialActions: {},
-            project: order.project,
-            // purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
-            typeOf: factory.actionType.OrderAction
-        };
-        const action = yield repos.action.start(orderActionAttributes);
-        try {
-            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { 
-                // discounts: [], // 廃止(2024-04-16~)
-                acceptedOffers: [] }));
-        }
-        catch (error) {
-            try {
-                yield repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
-    });
-}
-exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
-function voidAcceptedOfferIfNecessary(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        // 取引に保管された承認アクション以外のアクションについて、オファーを除外する
-        const authorizeActionsAsResult = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
-        if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
-            const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
-            debug(completedAuthorizeActionIds.length, 'completedAuthorizeActionIds found from transaction', params.purpose.id);
-            const authorizeActionsWithInstrument = yield repos.action.search({
-                typeOf: factory.actionType.AuthorizeAction,
-                purpose: {
-                    typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                    id: { $in: [params.purpose.id] }
-                },
-                object: {
-                    typeOf: {
-                        $in: [
-                            factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                            factory.offerType.Offer
-                        ]
-                    }
-                },
-                id: { $in: completedAuthorizeActionIds }
-            }, ['instrument'], []);
-            const serialNumbersMustBeIn = authorizeActionsWithInstrument
-                .filter(({ instrument }) => typeof instrument.transactionNumber === 'string')
-                .map(({ instrument }) => String(instrument.transactionNumber));
-            debug('voidAcceptedOfferBySerialNumber processing...', params.object.orderNumber, 'serialNumbersMustBeIn:', serialNumbersMustBeIn);
-            const voidAcceptedOfferBySerialNumberResult = yield repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
-                orderNumber: params.object.orderNumber,
-                acceptedOffers: { serialNumber: { $nin: serialNumbersMustBeIn } }
-            });
-            debug('voidAcceptedOfferBySerialNumber processed.', params.object.orderNumber, 'voidAcceptedOfferBySerialNumberResult:', voidAcceptedOfferBySerialNumberResult);
-        }
-    });
-}
+const createPlacingOrderFromExistingTransaction_1 = require("./placeOrder/createPlacingOrderFromExistingTransaction");
+const voidAcceptedOfferIfNecessary_1 = require("./placeOrder/voidAcceptedOfferIfNecessary");
 /**
  * 注文を作成する
  */
@@ -155,19 +26,15 @@ function placeOrder(params) {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         // 注文番号から取引と注文をfixする
-        const { order, placeOrderTransaction } = yield createPlacingOrderFromExistingTransaction({
+        const { order, placeOrderTransaction, serialNumbers } = yield (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
-        })({
-            action: repos.action,
-            transaction: repos.transaction
-        });
+        })(repos);
         // USE_ORDER_PAYMENT_DUE_ON_PLACED設定を廃止したので、必ずOrderPaymentDueのはず(2024-01-10~)
         if (order.orderStatus !== factory.orderStatus.OrderPaymentDue) {
             throw new factory.errors.ServiceUnavailable(`orderStatus must be ${factory.orderStatus.OrderPaymentDue}`);
         }
-        // const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
             // seller: {
@@ -198,9 +65,7 @@ function placeOrder(params) {
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
             typeOf: { $eq: orderActionAttributes.typeOf },
-            object: {
-                orderNumber: { $in: [orderActionAttributes.object.orderNumber] }
-            },
+            object: { orderNumber: { $in: [orderActionAttributes.object.orderNumber] } },
             purpose: {
                 id: { $in: [orderActionPurpose.id] },
                 typeOf: { $in: [orderActionPurpose.typeOf] }
@@ -210,22 +75,13 @@ function placeOrder(params) {
             const action = yield repos.action.start(orderActionAttributes);
             try {
                 // 冗長なオファーを除外する(念のため)
-                yield voidAcceptedOfferIfNecessary({
+                yield (0, voidAcceptedOfferIfNecessary_1.voidAcceptedOfferIfNecessary)({
                     object: { orderNumber: order.orderNumber },
-                    purpose: placeOrderTransaction
+                    // purpose: placeOrderTransaction,
+                    serialNumbers
                 })(repos);
-                // acceptedOffersの内容検証(開発)
-                // if (USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
-                //     if (USE_VERIFY_ACCEPTED_OFFERS) {
-                //         await verifyAcceptedOffers({ order })(repos);
-                //     }
-                // }
-                // const ignoreAccpetedOffersFromResult = placeOrderTransaction.result?.options?.ignoreAccpetedOffersFromResult === true;
                 // orderInTransactionを考慮(2024-01-14~)
                 yield repos.orderInTransaction.placeOrder(order);
-                // if (!ignoreAccpetedOffersFromResult) {
-                //     await repos.order.createIfNotExist(order);
-                // }
             }
             catch (error) {
                 try {
@@ -239,9 +95,7 @@ function placeOrder(params) {
             yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
         if (params.useOnOrderStatusChanged) {
-            // 経理レポートを保管
-            // CreateAccountingReportへ移行(2024-02-02~)
-            // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
+            // 経理レポートを保管->CreateAccountingReportへ移行(2024-02-02~)
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
                 yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
@@ -250,7 +104,6 @@ function placeOrder(params) {
                         project: placeOrderTransaction.project,
                         orderNumber: order.orderNumber,
                         confirmationNumber: order.confirmationNumber,
-                        // customer: order.customer,
                         orderDate: order.orderDate,
                         seller: order.seller,
                         typeOf: order.typeOf,
@@ -261,26 +114,6 @@ function placeOrder(params) {
                 })({
                     task: repos.task
                 });
-                // } else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
-                //     // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
-                //     // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
-                //     await onOrderPaymentDue({
-                //         order: {
-                //             paymentMethods: order.paymentMethods,
-                //             project: order.project,
-                //             orderNumber: order.orderNumber,
-                //             confirmationNumber: order.confirmationNumber,
-                //             customer: order.customer,
-                //             orderDate: order.orderDate,
-                //             seller: order.seller,
-                //             typeOf: order.typeOf,
-                //             price: order.price,
-                //             priceCurrency: order.priceCurrency,
-                //             orderStatus: factory.orderStatus.OrderPaymentDue
-                //         }
-                //     })({
-                //         task: repos.task
-                //     });
             }
             else {
                 throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);

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

@@ -0,0 +1,22 @@
+import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
+import type { MongoRepository as ActionRepo } from '../../repo/action';
+import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { MongoRepository as TaskRepo } from '../../repo/task';
+import * as factory from '../../factory';
+import { IExternalOrder } from './onOrderStatusChanged';
+/**
+ * 注文取引なしに注文を作成する
+ */
+declare function placeOrderWithoutTransaction(params: {
+    agent?: factory.action.trade.order.IAgent;
+    project: {
+        id: string;
+    };
+    object: IExternalOrder;
+}): (repos: {
+    accountingReport: AccountingReportRepo;
+    action: ActionRepo;
+    order: OrderRepo;
+    task: TaskRepo;
+}) => Promise<void>;
+export { placeOrderWithoutTransaction };

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

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.placeOrderWithoutTransaction = void 0;
+const factory = require("../../factory");
+/**
+ * 注文取引なしに注文を作成する
+ */
+function placeOrderWithoutTransaction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const order = params.object;
+        const simpleOrder = {
+            typeOf: order.typeOf,
+            // seller: {
+            //     id: order.seller.id,
+            //     typeOf: order.seller.typeOf,
+            //     name: order.seller.name
+            // }, // 廃止(2024-03-06~)
+            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
+            orderNumber: order.orderNumber,
+            price: order.price,
+            priceCurrency: order.priceCurrency,
+            orderDate: order.orderDate
+        };
+        const orderActionAttributes = {
+            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
+            object: simpleOrder,
+            potentialActions: {},
+            project: order.project,
+            // purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
+            typeOf: factory.actionType.OrderAction
+        };
+        const action = yield repos.action.start(orderActionAttributes);
+        try {
+            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { 
+                // discounts: [], // 廃止(2024-04-16~)
+                acceptedOffers: [] }));
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+    });
+}
+exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;

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

@@ -7,6 +7,7 @@ import { onAssetTransactionStatusChanged, paymentDue2Processing } from './order/
 import { onOrderProcessing } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { payOrder } from './order/payOrder';
-import { placeOrder, placeOrderWithoutTransaction } from './order/placeOrder';
+import { placeOrder } from './order/placeOrder';
+import { placeOrderWithoutTransaction } from './order/placeOrderWithoutTransaction';
 import { sendOrder } from './order/sendOrder';
 export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderProcessing, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };

package/lib/chevre/service/order.js

@@ -19,6 +19,7 @@ const payOrder_1 = require("./order/payOrder");
 Object.defineProperty(exports, "payOrder", { enumerable: true, get: function () { return payOrder_1.payOrder; } });
 const placeOrder_1 = require("./order/placeOrder");
 Object.defineProperty(exports, "placeOrder", { enumerable: true, get: function () { return placeOrder_1.placeOrder; } });
-Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrder_1.placeOrderWithoutTransaction; } });
+const placeOrderWithoutTransaction_1 = require("./order/placeOrderWithoutTransaction");
+Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrderWithoutTransaction_1.placeOrderWithoutTransaction; } });
 const sendOrder_1 = require("./order/sendOrder");
 Object.defineProperty(exports, "sendOrder", { enumerable: true, get: function () { return sendOrder_1.sendOrder; } });

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

@@ -20,9 +20,11 @@ function createOrder(params) {
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
     return Object.assign({ typeOf: factory.order.OrderType.Order, price: params.price, priceCurrency: factory.priceCurrency.JPY, 
         // discounts: discounts, // 廃止(2024-04-16~)
-        confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: params.orderedItem, url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [] }, (settings_1.USE_EXPERIMENTAL_FEATURE)
+        confirmationNumber: '', orderNumber: params.orderNumber, url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [] }, (settings_1.USE_EXPERIMENTAL_FEATURE)
         ? {}
-        : Object.assign(Object.assign({ paymentMethods: params.paymentMethods, customer, project: params.transaction.project, seller, isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined));
+        : Object.assign(Object.assign({ orderedItem: params.orderedItem, paymentMethods: params.paymentMethods, // discontinue(2024-06-17~)
+            customer, project: params.transaction.project, // discontinue(2024-06-17~)
+            seller, isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined));
 }
 exports.createOrder = createOrder;
 function createSeller(params) {

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.375.0-alpha.6",
+    "@chevre/factory": "4.375.0-alpha.7",
     "@cinerino/sdk": "7.3.0-alpha.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.7"
+  "version": "21.35.0-alpha.9"
 }