@chevre/domain 21.18.0-alpha.9 → 21.18.0

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -1,23 +1,23 @@
 import * as factory from '../../../../factory';
 type IProcessingOrder = factory.order.IOrder & {
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     orderStatus: factory.orderStatus.OrderProcessing;
 };
-type IOrderWithToken = IProcessingOrder & {
-    token?: string;
-};
-declare function getOrderWithToken(params: {
-    order: IProcessingOrder;
-    expiresIn: number;
-}): Promise<IOrderWithToken>;
-declare function createInformTasks(order: IOrderWithToken): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createInformTasks(order: IProcessingOrder): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
-    order: factory.order.IOrder;
+    order: factory.order.IOrder & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
 declare function createConfirmReservationActionObject4COAByOrder(params: {
-    order: factory.order.IOrder;
+    order: factory.order.IOrder & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>[];
 declare function createConfirmRegisterServiceActionObjectByOrder(params: {
-    order: factory.order.IOrder;
+    order: factory.order.IOrder & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.action.interact.confirm.registerService.IObject[];
 type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-export { IExternalOrder, getOrderWithToken, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };
+export { IExternalOrder, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };

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

@@ -1,61 +1,14 @@
 "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());
-    });
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = void 0;
 const google_libphonenumber_1 = require("google-libphonenumber");
-const jwt = require("jsonwebtoken");
 const util_1 = require("util");
-const credentials_1 = require("../../../../credentials");
 const factory = require("../../../../factory");
 const order_1 = require("../../../../factory/order");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
 const settings_1 = require("../../../../settings");
 const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-function getOrderWithToken(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (typeof credentials_1.credentials.hub.clientId !== 'string') {
-            return params.order;
-        }
-        // 最適化(2023-01-31~)
-        const order4token = {
-            typeOf: params.order.typeOf,
-            orderNumber: params.order.orderNumber
-        };
-        const token = yield new Promise((resolve, reject) => {
-            // 所有権を暗号化する
-            jwt.sign(order4token, credentials_1.credentials.jwt.secret, {
-                audience: [credentials_1.credentials.hub.clientId],
-                issuer: credentials_1.credentials.jwt.issuer,
-                expiresIn: params.expiresIn
-            }, (err, encoded) => {
-                if (err instanceof Error) {
-                    reject(err);
-                }
-                else {
-                    if (typeof encoded !== 'string') {
-                        reject(new factory.errors.ServiceUnavailable('order cannot be signed unexpectedly'));
-                    }
-                    else {
-                        resolve(encoded);
-                    }
-                }
-            });
-        });
-        return Object.assign(Object.assign({}, params.order), { 
-            // 注文トークンを情報付加
-            token });
-    });
-}
-exports.getOrderWithToken = getOrderWithToken;
 const ASTERISK_CHARACTER = '*';
 function createInformTasks(order) {
     const taskRunsAt = new Date();
@@ -95,7 +48,7 @@ function createInformTasks(order) {
 exports.createInformTasks = createInformTasks;
 function creteOrder4inform(order) {
     // 冗長な個人情報をmask
-    return Object.assign(Object.assign({ 
+    return Object.assign({ 
         // whitelistで作成する(2022-07-19~)
         project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
         // mask
@@ -112,20 +65,18 @@ function creteOrder4inform(order) {
             return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)
                 ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
                 : undefined);
-        }) }, (typeof order.token === 'string') ? { token: order.token } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }) }, (typeof order.id === 'string') ? { id: order.id } : undefined);
 }
 function createConfirmReservationActionObject4ChevreByOrder(params) {
-    const chevreReservationNumbers = (Array.isArray(params.order.acceptedOffers))
-        ? params.order.acceptedOffers.filter((o) => {
-            var _a;
-            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
-                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
-        })
-            .map((o) => {
-            return o.itemOffered.reservationNumber;
-        })
-        : [];
+    const chevreReservationNumbers = params.order.acceptedOffers.filter((o) => {
+        var _a;
+        return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+            || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
+    })
+        .map((o) => {
+        return o.itemOffered.reservationNumber;
+    });
     return [...new Set(chevreReservationNumbers)].map((reservationNumber) => {
         return {
             potentialActions: {
@@ -145,13 +96,11 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
 exports.createConfirmReservationActionObject4ChevreByOrder = createConfirmReservationActionObject4ChevreByOrder;
 function createConfirmReservationActionObject4COAByOrder(params) {
     // COA予約のみ
-    const coaReservationOffers = (Array.isArray(params.order.acceptedOffers))
-        ? params.order.acceptedOffers.filter((o) => {
-            var _a;
-            return o.itemOffered.typeOf === factory.reservationType.EventReservation
-                && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
-        })
-        : [];
+    const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
+        var _a;
+        return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
+    });
     const coaReservationNumbers = [...new Set(coaReservationOffers
             .map((o) => {
             return o.itemOffered.reservationNumber;
@@ -220,14 +169,6 @@ exports.createConfirmReservationActionObject4COAByOrder = createConfirmReservati
 function createConfirmRegisterServiceActionObjectByOrder(params) {
     // いったん保留
     const chevreTransactionNumbers = [];
-    // const chevreReservationNumbers: string[] = (Array.isArray(params.order.acceptedOffers))
-    //     ? params.order.acceptedOffers.filter((o) => {
-    //         return o.itemOffered.typeOf === factory.permit.PermitType.Permit;
-    //     })
-    //         .map((o) => {
-    //             return (<factory.order.IPermit>o.itemOffered).identifier;
-    //         })
-    //     : [];
     return [...new Set(chevreTransactionNumbers)].map((transactionNumber) => {
         return {
             endDate: params.order.orderDate,

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

@@ -1,10 +1,11 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { IExternalOrder } from './onOrderProcessing/factory';
-type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderProcessing(params: {
     order: Omit<factory.order.IOrder, 'orderStatus'> & {
         orderStatus: factory.orderStatus.OrderProcessing;
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {

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

@@ -19,7 +19,6 @@ const order_1 = require("../../../factory/order");
 const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
-const TOKEN_EXPIRES_IN = 604800;
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -41,9 +40,8 @@ function onOrderProcessing(params) {
         };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
-                const orderWithToken = yield (0, factory_1.getOrderWithToken)({ order: params.order, expiresIn: TOKEN_EXPIRES_IN });
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(orderWithToken),
+                    ...(0, factory_1.createInformTasks)(params.order),
                     ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
                 ];
                 break;

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

@@ -1,9 +1,9 @@
 import type { MongoRepository as AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-type IReturnOrderTransaction = factory.transaction.ITransaction<factory.transactionType.ReturnOrder>;
+type IReturnOrderTransaction = Pick<factory.transaction.returnOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderReturned(params: {
-    order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate' | 'orderStatus'> & {
+    order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
         orderStatus: factory.orderStatus.OrderReturned;
     };
     returnOrderTransaction?: IReturnOrderTransaction;

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

@@ -44,8 +44,8 @@ function onOrderReturned(params) {
                     return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
                 })) === null || _d === void 0 ? void 0 : _d.potentialActions;
                 const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
-                const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber'))[0];
-                const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+                const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
+                const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order),
                     ...createReturnReserveTransactionTasks(Object.assign(Object.assign({}, params.order), { reservationNumbers,
@@ -65,6 +65,7 @@ function onOrderReturned(params) {
 }
 exports.onOrderReturned = onOrderReturned;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
+    debug('onOrderReturn.createReturnReserveTransactionTasks processing...', 'project:', order.project.id, 'orderNumber:', simpleOrder.orderNumber, 'reservationNumbers:', order.reservationNumbers, 'offeredThroughIdentifier:', order.offeredThroughIdentifier, 'reservationForSuperEventLocationBranchCodes:', order.reservationForSuperEventLocationBranchCodes);
     const taskRunsAt = new Date();
     const taskRunsAt4coa = new Date();
     const tasks = [];
@@ -74,7 +75,6 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
         name: order.seller.name
     };
     // 注文アイテムから返却アクションを作成する
-    // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
     for (const reservationNumber of order.reservationNumbers) {
         // const reservation = acceptedOffer.itemOffered;
         // 予約番号ごとに返却アクションを作成する

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

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
@@ -6,6 +7,7 @@ import * as factory from '../../factory';
  * 注文を決済する
  */
 declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

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

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
@@ -34,6 +35,7 @@ declare function placeOrder(params: {
     };
     useOnOrderStatusChanged: boolean;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     order: OrderRepo;

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

@@ -8,12 +8,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
 const moment = require("moment");
 const order_1 = require("../../factory/order");
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
-const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
@@ -78,17 +88,31 @@ function createOrderFromBody(params) {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
         let order;
-        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
-            project: { id: params.project.id },
-            confirmationNumber,
-            orderNumber
-        })(repos);
-        const orderByTransaction = (_a = placeOrderTransaction.result) === null || _a === void 0 ? void 0 : _a.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: ['id', 'potentialActions', 'project', 'typeOf', 'result'],
+            exclusion: []
+        });
+        const placeOrderTransactionWithResult = placeOrderTransactions.shift();
+        if (placeOrderTransactionWithResult === undefined) {
+            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+        }
+        const orderByTransaction = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.order;
         if (orderByTransaction === undefined) {
             throw new factory.errors.NotFound('transaction.result.order');
         }
-        order = orderByTransaction;
-        order = createOrder(order);
+        order = createOrder(orderByTransaction);
+        const { result } = placeOrderTransactionWithResult, placeOrderTransaction = __rest(placeOrderTransactionWithResult, ["result"]);
         return { order, placeOrderTransaction };
     });
 }
@@ -124,7 +148,7 @@ function placeOrderWithoutTransaction(params) {
         };
         const action = yield repos.action.start(orderActionAttributes);
         try {
-            yield repos.order.createIfNotExist(order);
+            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { discounts: [], acceptedOffers: [] }));
         }
         catch (error) {
             // actionにエラー結果を追加
@@ -138,8 +162,8 @@ function placeOrderWithoutTransaction(params) {
             throw error;
         }
         yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
-        // 経理レポートを保管
-        yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
+        // 経理レポートを保管は外部注文の場合保留(2023-12-08~)
+        // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
@@ -223,7 +247,19 @@ function placeOrder(params) {
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
                 yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
-                    order: Object.assign(Object.assign({}, order), { orderStatus: order.orderStatus })
+                    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: order.orderStatus
+                    }
                 })({
                     task: repos.task
                 });
@@ -232,7 +268,19 @@ function placeOrder(params) {
                 // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
                 // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
                 yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
-                    order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderPaymentDue })
+                    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
                 });

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

@@ -10,10 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.returnOrder = void 0;
+const createDebug = require("debug");
 const order_1 = require("../../factory/order");
-const factory_1 = require("../delivery/factory");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 function returnOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -29,8 +30,8 @@ function returnOrder(params) {
             orderNumber,
             project: { id: params.project.id },
             inclusion: [
-            // 'project', 'typeOf', 'orderNumber', 'dateReturned', 'id', 'customer',
-            // 'returner', 'seller', 'price', 'priceCurrency', 'orderDate', 'orderStatus'
+                'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
+                'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
             ],
             exclusion: []
         });
@@ -42,7 +43,7 @@ function returnOrder(params) {
             typeOf: factory.transactionType.ReturnOrder,
             statuses: [factory.transactionStatusType.Confirmed],
             object: { order: { orderNumbers: [orderNumber] } },
-            inclusion: [],
+            inclusion: ['id', 'typeOf', 'potentialActions'],
             exclusion: []
         });
         const returnOrderTransaction = returnOrderTransactions.shift();
@@ -69,13 +70,15 @@ function returnOrder(params) {
             project: order.project,
             recipient: order.seller,
             typeOf: factory.actionType.ReturnAction
-            // ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined
         };
         let returnedOwnershipInfos = [];
         // アクション開始
         const action = yield repos.action.start(returnOrderActionAttributes);
         try {
-            returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({ ownershipInfo: repos.ownershipInfo });
+            returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({
+                acceptedOffer: repos.acceptedOffer,
+                ownershipInfo: repos.ownershipInfo
+            });
             // 注文ステータス変更
             order = yield repos.order.returnOrder({
                 project: { id: order.project.id },
@@ -83,6 +86,7 @@ function returnOrder(params) {
                 dateReturned,
                 returner
             });
+            debug('repos.order.returnOrder processed. returnedOrder:', order);
         }
         catch (error) {
             // actionにエラー結果を追加
@@ -99,7 +103,20 @@ function returnOrder(params) {
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
         if (params.useOnOrderStatusChanged) {
             yield (0, onOrderStatusChanged_1.onOrderReturned)({
-                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderReturned }),
+                order: {
+                    project: order.project,
+                    typeOf: order.typeOf,
+                    orderNumber: order.orderNumber,
+                    dateReturned: order.dateReturned,
+                    id: order.id,
+                    customer: order.customer,
+                    returner: order.returner,
+                    seller: order.seller,
+                    price: order.price,
+                    priceCurrency: order.priceCurrency,
+                    orderDate: order.orderDate,
+                    orderStatus: factory.orderStatus.OrderReturned
+                },
                 returnOrderTransaction
             })({
                 acceptedOffer: repos.acceptedOffer,
@@ -112,10 +129,11 @@ exports.returnOrder = returnOrder;
 function processReturnOrder(order, dateReturned) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const returnedOwnershipInfos = [];
-        // tslint:disable-next-line:no-suspicious-comment
-        // TODO 注文配送によって発生した所有権の特定を他の方法で行えないか？
         // 所有権の所有期間変更
-        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+        // 注文オファーリポジトリから所有権識別子を検索する(2023-12-07~)
+        const ownershipInfos = yield repos.acceptedOffer.aggreateOwnershipInfosByOrder({ orderNumber: { $eq: order.orderNumber } });
+        // const ownershipInfos = createOwnershipInfosFromOrder({ order });
+        debug('processing findByIdentifierAndUpdateOwnedThrough...', ownershipInfos);
         if (Array.isArray(ownershipInfos)) {
             yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                 const ownershipInfoReturned = yield repos.ownershipInfo.findByIdentifierAndUpdateOwnedThrough({

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

@@ -1,15 +1,15 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
 type ISendOperation<T> = (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<T>;

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

@@ -37,7 +37,7 @@ function sendOrder(params) {
             let order = yield repos.order.findByOrderNumber({
                 orderNumber,
                 project: { id: params.project.id },
-                inclusion: [],
+                inclusion: ['confirmationNumber', 'project', 'typeOf', 'seller', 'orderNumber', 'price', 'priceCurrency', 'orderDate', 'customer', '_id'],
                 exclusion: []
             });
             // プロジェクト条件検証
@@ -76,7 +76,12 @@ function sendOrder(params) {
             let ownershipInfos;
             try {
                 // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                            orderNumber: { $eq: order.orderNumber },
+                            project: { id: { $eq: order.project.id } }
+                        }) })
+                });
                 ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));
@@ -101,10 +106,17 @@ function sendOrder(params) {
             yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             if (params.useOnOrderStatusChanged) {
                 yield (0, onOrderStatusChanged_1.onOrderDelivered)({
-                    order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderDelivered }),
+                    order: {
+                        id: order.id,
+                        customer: order.customer,
+                        orderDate: order.orderDate,
+                        orderNumber: order.orderNumber,
+                        project: order.project,
+                        typeOf: order.typeOf,
+                        orderStatus: factory.orderStatus.OrderDelivered
+                    },
                     placeOrderTransaction
                 })({
-                    registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
                 });
             }

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

@@ -6,6 +6,7 @@ import type { MongoRepository as AccountingReportRepo } from '../../repo/account
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../../repo/event';
+import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
@@ -27,8 +28,8 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
@@ -38,8 +39,8 @@ declare function invalidatePaymentUrl(params: factory.task.IData<factory.taskNam
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
@@ -52,7 +53,6 @@ declare function processVoidPayTransaction(params: factory.task.IData<factory.ta
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
-    product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
@@ -63,6 +63,7 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
@@ -75,9 +76,9 @@ type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 interface IPublishPaymentUrlRepos {
     assetTransaction: AssetTransactionRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
-    product: ProductRepo;
     project: ProjectRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;

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

@@ -114,7 +114,7 @@ function processVoidPayTransaction(params) {
             transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id,
-                inclusion: ['_id', 'typeOf', 'status', 'result.order.paymentMethods']
+                inclusion: ['_id', 'typeOf', 'status', 'result']
             }));
         }
         // 承認アクションを取得