@chevre/domain 21.25.0-alpha.0 → 21.25.0-alpha.10

package/example/src/chevre/deleteOwnershipInfosByWebApplication.ts

@@ -0,0 +1,80 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+
+    const cursor = ownershipInfoRepo.getCursor(
+        {
+            'ownedBy.typeOf': { $eq: chevre.factory.creativeWorkType.WebApplication }
+        },
+        {
+        }
+    );
+    console.log('infos found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const ownershipInfo: Pick<
+            chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IGood>,
+            'id' | 'project' | 'identifier' | 'ownedBy' | 'ownedFrom' | 'ownedThrough'
+        > = doc.toObject();
+
+        let noNeedToDelete = true;
+        let ownedById: string | undefined;
+        let ownedByTypeOf: string;
+        if (Array.isArray(ownershipInfo.ownedBy)) {
+            ownedByTypeOf = ownershipInfo.ownedBy[0].typeOf;
+            if (ownershipInfo.ownedBy.every(({ typeOf }) => typeOf === chevre.factory.creativeWorkType.WebApplication)) {
+                noNeedToDelete = false;
+                ownedById = ownershipInfo.ownedBy[0].id;
+            }
+        } else {
+            ownedByTypeOf = ownershipInfo.ownedBy.typeOf;
+            if (ownershipInfo.ownedBy.typeOf === chevre.factory.creativeWorkType.WebApplication) {
+                noNeedToDelete = false;
+                ownedById = ownershipInfo.ownedBy.id;
+            }
+        }
+
+        if (noNeedToDelete) {
+            console.log(
+                'noNeedToDelete.',
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                i, updateCount);
+        } else {
+            console.log(
+                'deleting...',
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                i, updateCount);
+            if (typeof ownedById === 'string') {
+                await ownershipInfoRepo.deleteByIdAndOwnedById({
+                    project: { id: ownershipInfo.project.id },
+                    id: ownershipInfo.id,
+                    ownedBy: { id: ownedById }
+                });
+            }
+            updateCount += 1;
+            console.log(
+                'deleted.',
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                i, updateCount);
+        }
+    });
+
+    console.log(i, 'infos checked');
+    console.log(updateCount, 'infos updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -20,7 +20,7 @@ async function main() {
             runsAt: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(236, 'days')
+                    .add(277, 'days')
                     .toDate(),
                 $lte: moment()
                     // tslint:disable-next-line:no-magic-numbers

package/example/src/chevre/searchSlicedAcceptedOffersByOrderNumber.ts

@@ -6,14 +6,17 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
+    const limit = 1;
+    const page = 2;
     const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
 
     const result = await acceptedOfferRepo.searchSlicedAcceptedOffersByOrderNumber(
         {
-            orderNumber: { $eq: 'CIN1-3748070-2008463' },
-            project: { id: { $eq: String(process.env.PROJECT_ID) } },
+            orderNumber: { $eq: 'TTT6-4203485-8379924' },
+            // project: { id: { $eq: String(process.env.PROJECT_ID) } },
+            project: { id: { $eq: 'ttts-development' } },
             // tslint:disable-next-line:no-magic-numbers
-            $slice: [0, 2]
+            $slice: [limit * (page - 1), limit]
         }
     );
     console.log(result);

package/lib/chevre/emailMessageBuilder.d.ts

@@ -3,10 +3,6 @@ import * as factory from './factory';
  * 注文配送メッセージを作成する
  */
 export declare function createSendOrderMessage(params: {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
     order: factory.order.IOrder;
     email?: factory.creativeWork.message.email.ICustomization;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;

package/lib/chevre/factory/event.js

@@ -15,11 +15,14 @@ function minimizeSuperEvent(params) {
         : undefined), (typeof params.superEventFromDB.workPerformed.contentRating === 'string')
         ? { contentRating: params.superEventFromDB.workPerformed.contentRating }
         : undefined);
-    const location = Object.assign(Object.assign({ typeOf: factory.placeType.MovieTheater, id: params.superEventFromDB.location.id, branchCode: params.superEventFromDB.location.branchCode }, (params.superEventFromDB.location.name !== undefined)
+    const location = Object.assign({ typeOf: factory.placeType.MovieTheater, id: params.superEventFromDB.location.id, branchCode: params.superEventFromDB.location.branchCode }, (params.superEventFromDB.location.name !== undefined)
         ? { name: params.superEventFromDB.location.name }
-        : undefined), (typeof params.superEventFromDB.location.kanaName === 'string')
-        ? { kanaName: params.superEventFromDB.location.kanaName }
-        : undefined);
+        : undefined
+    // 廃止(2024-03-05~)
+    // ...(typeof params.superEventFromDB.location.kanaName === 'string')
+    //     ? { kanaName: params.superEventFromDB.location.kanaName }
+    //     : undefined
+    );
     return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.eventType.ScreeningEventSeries, 
         // 不要なので廃止(2023-06-09~)
         // project: { typeOf: chevre.factory.organizationType.Project, id: params.project.id },

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

@@ -10,17 +10,18 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'>
 export declare class MongoRepository {
     private readonly orderModel;
     constructor(connection: Connection);
-    searchByOrderNumber(params: {
+    /**
+     * 取引進行中の注文からacceptedOffersを検索する
+     */
+    findAcceptedOffersByOrderNumber(params: {
         orderNumber: {
             $eq: string;
         };
-    }): Promise<IOrderInTransaction[]>;
+    }): Promise<factory.order.IAcceptedOffer<factory.order.IItemOffered>[]>;
     /**
      * 注文を受注する
      */
-    placeOrder(order: Omit<factory.order.IOrder, 'id'> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }): Promise<void>;
+    placeOrder(order: Omit<factory.order.IOrder, 'id'>): Promise<void>;
     acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongodb").UpdateResult | undefined>;
     /**
      * serialNumberからオファーを除外する

package/lib/chevre/repo/orderInTransaction.js

@@ -8,17 +8,6 @@ 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.MongoRepository = void 0;
 const createDebug = require("debug");
@@ -32,30 +21,32 @@ class MongoRepository {
     constructor(connection) {
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
     }
-    searchByOrderNumber(params) {
+    /**
+     * 取引進行中の注文からacceptedOffersを検索する
+     */
+    findAcceptedOffersByOrderNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
-            return this.orderModel.find({
+            const doc = yield this.orderModel.findOne({
                 orderNumber: { $eq: params.orderNumber.$eq },
                 typeOf: { $eq: factory.transactionType.PlaceOrder }
-            })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            }, { acceptedOffers: 1 })
+                .lean()
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('orderInTransaction');
+            }
+            return doc.acceptedOffers;
         });
     }
     /**
      * 注文を受注する
      */
-    placeOrder(order
-    // options: {
-    //     ignoreAccpetedOffersFromResult: boolean;
-    // }
-    ) {
+    placeOrder(order) {
         return __awaiter(this, void 0, void 0, function* () {
             let setFields;
             // acceptedOffersを上書きしない
-            const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
-            setFields = orderWithoutAcceptedOffers;
+            // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
+            setFields = order;
             debug('placing an order...', order.orderNumber, 'setFields:', setFields);
             // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
             yield this.orderModel.updateOne({

package/lib/chevre/service/delivery/factory.d.ts

@@ -7,4 +7,5 @@ export declare function createOwnershipInfosFromOrder(params: {
     order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
         acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     };
+    offerIndexBase: number;
 }): IOwnershipInfo[];

package/lib/chevre/service/delivery/factory.js

@@ -19,7 +19,12 @@ function createOwnershipInfosFromOrder(params) {
         let ownershipInfo;
         const ownedFrom = moment(params.order.orderDate)
             .toDate();
-        const identifier = createOwnershipInfoIdentifier({ order: params.order, itemOffered, offerIndex });
+        const identifier = createOwnershipInfoIdentifier({
+            order: params.order,
+            itemOffered,
+            offerIndex,
+            offerIndexBase: params.offerIndexBase
+        });
         const acquiredFrom = createAcquiredFrom(params);
         const ownedBy = createOwnedby(params);
         const itemOfferedType = itemOffered.typeOf;
@@ -60,7 +65,7 @@ function createOwnershipInfosFromOrder(params) {
 }
 exports.createOwnershipInfosFromOrder = createOwnershipInfosFromOrder;
 function createOwnershipInfoIdentifier(params) {
-    return util.format('%s-%s-%s-%s', params.order.customer.id, params.itemOffered.typeOf, params.order.orderNumber, params.offerIndex);
+    return util.format('%s-%s-%s-%s', params.order.customer.id, params.itemOffered.typeOf, params.order.orderNumber, (params.offerIndexBase + params.offerIndex));
 }
 function createAcquiredFrom(params) {
     // 最低限の情報に絞る

package/lib/chevre/service/event/createEvent.js

@@ -42,7 +42,8 @@ function createEvent(params) {
                             const location = {
                                 branchCode: movieTheater.branchCode,
                                 id: movieTheater.id,
-                                kanaName: movieTheater.kanaName,
+                                // 廃止(2024-03-05~)
+                                // kanaName: movieTheater.kanaName,
                                 name: movieTheater.name,
                                 typeOf: factory.placeType.MovieTheater
                             };

package/lib/chevre/service/event.js

@@ -232,7 +232,7 @@ function saveScreeningEventSeries(params) {
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        }, [], []);
+        }, ['additionalProperty', 'codeValue'], []);
         const screeningEventSerieses = filmsFromCOA.map((filmFromCOA) => {
             return createScreeningEventSeriesFromCOA({
                 project: project,
@@ -570,19 +570,7 @@ function createScreeningEventSeriesFromCOA(params) {
         titleBranchNum: params.filmFromCOA.titleBranchNum
     });
     const { additionalProperty, coaInfo } = createScreeningEventSeriesAdditionalPropertyFromCOA(params);
-    let unacceptedPaymentMethod;
-    // flgMvtkUseはムビチケ、MGチケットの両方に適用される
-    if (coaInfo.flgMvtkUse === '1') {
-        // no op
-    }
-    else {
-        if (!Array.isArray(unacceptedPaymentMethod)) {
-            unacceptedPaymentMethod = [];
-        }
-        // flgMvtkUseで決済方法区分から動的に
-        const unavailablePaymentMethodTypes = params.availablePaymentMethodTypes.filter((categoryCode) => { var _a, _b; return ((_b = (_a = categoryCode.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === 'flgMvtkUse')) === null || _b === void 0 ? void 0 : _b.value) === '1'; });
-        unacceptedPaymentMethod.push(...unavailablePaymentMethodTypes.map((c) => c.codeValue));
-    }
+    const { unacceptedPaymentMethod } = createScreeningEventSeriesUnacceptedPaymentMethodFromCOA(params);
     const workPerformed = Object.assign({ id: `${params.movieTheater.branchCode}-${params.filmFromCOA.titleCode}`, identifier: params.filmFromCOA.titleCode, name: {
             ja: params.filmFromCOA.titleNameOrig
         }, duration: moment.duration(params.filmFromCOA.showTime, 'm')
@@ -605,7 +593,8 @@ function createScreeningEventSeriesFromCOA(params) {
             id: (params.movieTheater.id !== undefined) ? params.movieTheater.id : '',
             branchCode: params.movieTheater.branchCode,
             name: params.movieTheater.name,
-            kanaName: params.movieTheater.kanaName,
+            // 廃止(2024-03-05~)
+            // kanaName: params.movieTheater.kanaName,
             typeOf: params.movieTheater.typeOf
         },
         // 必須化(2023-07-12~)
@@ -623,15 +612,7 @@ function createScreeningEventSeriesFromCOA(params) {
     };
 }
 function createScreeningEventSeriesAdditionalPropertyFromCOA(params) {
-    const coaInfo = {
-        titleBranchNum: params.filmFromCOA.titleBranchNum,
-        kbnEirin: params.eirinKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEirin)[0],
-        kbnEizou: params.eizouKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEizou)[0],
-        kbnJoueihousiki: params.joueihousikiKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJoueihousiki)[0],
-        kbnJimakufukikae: params.jimakufukikaeKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJimakufukikae)[0],
-        flgMvtkUse: params.filmFromCOA.flgMvtkUse,
-        dateMvtkBegin: params.filmFromCOA.dateMvtkBegin
-    };
+    const coaInfo = Object.assign(Object.assign({ titleBranchNum: params.filmFromCOA.titleBranchNum, kbnEirin: params.eirinKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEirin)[0], kbnEizou: params.eizouKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEizou)[0], kbnJoueihousiki: params.joueihousikiKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJoueihousiki)[0], kbnJimakufukikae: params.jimakufukikaeKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJimakufukikae)[0], flgMvtkUse: params.filmFromCOA.flgMvtkUse, dateMvtkBegin: params.filmFromCOA.dateMvtkBegin }, (typeof params.filmFromCOA.flgMgtkUse === 'string') ? { flgMgtkUse: params.filmFromCOA.flgMgtkUse } : undefined), (typeof params.filmFromCOA.dateMgtkBegin === 'string') ? { dateMgtkBegin: params.filmFromCOA.dateMgtkBegin } : undefined);
     return {
         coaInfo,
         additionalProperty: [
@@ -640,6 +621,34 @@ function createScreeningEventSeriesAdditionalPropertyFromCOA(params) {
         ]
     };
 }
+function createScreeningEventSeriesUnacceptedPaymentMethodFromCOA(params) {
+    let unacceptedPaymentMethod;
+    // flgMvtkUseはムビチケ、MGチケットの両方に適用される(<-flgMgtkUseが追加されるまで)(~2024-03-05)
+    if (params.filmFromCOA.flgMvtkUse === '1') {
+        // no op
+    }
+    else {
+        if (!Array.isArray(unacceptedPaymentMethod)) {
+            unacceptedPaymentMethod = [];
+        }
+        // flgMvtkUseで決済方法区分から動的に
+        unacceptedPaymentMethod.push(...params.availablePaymentMethodTypes.filter(({ additionalProperty }) => { var _a; return ((_a = additionalProperty === null || additionalProperty === void 0 ? void 0 : additionalProperty.find(({ name }) => name === 'flgMvtkUse')) === null || _a === void 0 ? void 0 : _a.value) === '1'; })
+            .map(({ codeValue }) => codeValue));
+    }
+    if (params.filmFromCOA.flgMgtkUse === '0') {
+        if (!Array.isArray(unacceptedPaymentMethod)) {
+            unacceptedPaymentMethod = [];
+        }
+        // flgMgtkUseで決済方法区分から動的に
+        unacceptedPaymentMethod.push(...params.availablePaymentMethodTypes.filter(({ additionalProperty }) => { var _a; return ((_a = additionalProperty === null || additionalProperty === void 0 ? void 0 : additionalProperty.find(({ name }) => name === 'flgMgtkUse')) === null || _a === void 0 ? void 0 : _a.value) === '1'; })
+            .map(({ codeValue }) => codeValue));
+    }
+    if (Array.isArray(unacceptedPaymentMethod)) {
+        // 重複排除
+        unacceptedPaymentMethod = [...new Set(unacceptedPaymentMethod)];
+    }
+    return { unacceptedPaymentMethod };
+}
 /**
  * COA情報からイベントIDを作成する
  */

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

@@ -13,6 +13,15 @@ export declare function createActionAttributes(params: {
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     transactionNumber: string;
 }): factory.action.authorize.offer.product.IAttributes;
+type IResultAcceptedOffer = factory.action.authorize.offer.product.IResultAcceptedOffer;
+export declare function responseBody2resultAcceptedOffer(params: {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+    responseBody: factory.assetTransaction.registerService.ITransaction;
+    acceptedOffer: factory.action.authorize.offer.product.IObject;
+}): IResultAcceptedOffer;
 export declare function createResult(params: {
     project: {
         id: string;
@@ -22,3 +31,4 @@ export declare function createResult(params: {
     responseBody: factory.assetTransaction.registerService.ITransaction;
     acceptedOffer: factory.action.authorize.offer.product.IObject;
 }): factory.action.authorize.offer.product.IResult;
+export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResult = exports.createActionAttributes = exports.createRegisterServiceStartParams = void 0;
+exports.createResult = exports.responseBody2resultAcceptedOffer = exports.createActionAttributes = exports.createRegisterServiceStartParams = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
 function createRegisterServiceStartParams(params) {
@@ -150,6 +150,7 @@ function responseBody2resultAcceptedOffer(params) {
     }
     return acceptedOffers;
 }
+exports.responseBody2resultAcceptedOffer = responseBody2resultAcceptedOffer;
 function createResult(params) {
     const acceptedOffers4result = responseBody2resultAcceptedOffer(params);
     // 金額計算

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

@@ -147,11 +147,12 @@ function authorize(params) {
             });
             requestBody = startParams;
             responseBody = yield RegisterServiceTransaction.start(startParams)(repos);
+            const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({ project: action.project, responseBody, acceptedOffer });
             result = (0, factory_1.createResult)({ project: action.project, requestBody, responseBody, acceptedOffer });
             yield (0, any_1.acceptOffer)({
                 project: transaction.project,
                 purpose: { id: transaction.id },
-                acceptedOffers: result.acceptedOffers
+                acceptedOffers: acceptedOffers4result
             })(repos);
         }
         catch (error) {

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

@@ -81,7 +81,8 @@ function deleteOwnershipInfosByOrder(order) {
             order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
-                }) })
+                }) }),
+            offerIndexBase: 0
         });
         const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
         if (ownershipIdentifiers.length > 0) {

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

@@ -18,75 +18,9 @@ const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusCha
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const debug = createDebug('chevre-domain:service:order');
 function createOrder(params) {
-    // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
-    // const acceptedOffers = (Array.isArray(params.acceptedOffers))
-    //     ? params.acceptedOffers.map((o) => {
-    //         if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
-    //             let itemOffered = o.itemOffered;
-    //             const reservationFor = itemOffered.reservationFor;
-    //             itemOffered = {
-    //                 ...itemOffered,
-    //                 reservationFor: {
-    //                     ...reservationFor,
-    //                     ...(reservationFor.doorTime !== undefined && reservationFor.doorTime !== null)
-    //                         ? {
-    //                             doorTime: moment(reservationFor.doorTime)
-    //                                 .toDate()
-    //                         }
-    //                         : undefined,
-    //                     ...(reservationFor.endDate !== undefined)
-    //                         ? {
-    //                             endDate: moment(reservationFor.endDate)
-    //                                 .toDate()
-    //                         }
-    //                         : undefined,
-    //                     ...(reservationFor.startDate !== undefined)
-    //                         ? {
-    //                             startDate: moment(reservationFor.startDate)
-    //                                 .toDate()
-    //                         }
-    //                         : undefined
-    //                 }
-    //             };
-    //             return {
-    //                 ...o,
-    //                 itemOffered
-    //             };
-    //         } else if (o.itemOffered.typeOf === factory.reservationType.BusReservation) {
-    //             let itemOffered = o.itemOffered;
-    //             const reservationFor = itemOffered.reservationFor;
-    //             itemOffered = {
-    //                 ...itemOffered,
-    //                 reservationFor: {
-    //                     ...reservationFor,
-    //                     ...(reservationFor.arrivalTime !== undefined)
-    //                         ? {
-    //                             arrivalTime: moment(reservationFor.arrivalTime)
-    //                                 .toDate()
-    //                         }
-    //                         : undefined,
-    //                     ...(reservationFor.departureTime !== undefined)
-    //                         ? {
-    //                             departureTime: moment(reservationFor.departureTime)
-    //                                 .toDate()
-    //                         }
-    //                         : undefined
-    //                 }
-    //             };
-    //             return {
-    //                 ...o,
-    //                 itemOffered
-    //             };
-    //         } else {
-    //             return o;
-    //         }
-    //     })
-    //     : [];
     const orderedItems = (Array.isArray(params.orderedItem)) ? params.orderedItem : [];
     return Object.assign(Object.assign(Object.assign({}, params), { orderDate: moment(params.orderDate)
-            .toDate(), 
-        // acceptedOffers,
-        orderedItem: orderedItems }), (params.dateReturned !== null && params.dateReturned !== undefined)
+            .toDate(), orderedItem: orderedItems }), (params.dateReturned !== null && params.dateReturned !== undefined)
         ? {
             dateReturned: moment(params.dateReturned)
                 .toDate()
@@ -124,7 +58,6 @@ function createOrderFromBody(params) {
             throw new factory.errors.NotFound('transaction.result.order');
         }
         order = createOrder(orderByTransaction);
-        // const { result, ...placeOrderTransaction } = placeOrderTransactionWithResult;
         return { order, placeOrderTransaction: placeOrderTransactionWithResult };
     });
 }

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

@@ -103,15 +103,20 @@ function sendOrder(params) {
                     createOwnerships = true;
             }
             try {
+                const offerIndexBase = (limit * (page - 1));
                 const searchSlicedAcceptedOffersResult = yield repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
-                    $slice: [limit * (page - 1), limit],
+                    $slice: [offerIndexBase, limit],
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
+                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
-                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order: Object.assign(Object.assign({}, order), { acceptedOffers }) });
+                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                        order: Object.assign(Object.assign({}, order), { acceptedOffers }),
+                        offerIndexBase
+                    });
                     ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                         return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                     })));

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

@@ -21,7 +21,7 @@ export declare function creatPayTransactionStartParams(params: {
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObject;
     payTransaction: factory.assetTransaction.pay.ITransaction;
-}): factory.action.authorize.paymentMethod.any.IResult;
+}): factory.action.authorize.paymentMethod.any.IResultAsInvoice[];
 /**
  * 通知対象としてのアクションを最適化
  */

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

@@ -2,6 +2,7 @@ import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as CodeRepo } from '../../../repo/code';
 import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
 import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
@@ -13,6 +14,7 @@ interface IConfirmOperationRepos {
     emailMessage?: EmailMessageRepo;
     project: ProjectRepo;
     transaction: TransactionRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     confirmationNumber: ConfirmationNumberRepo;
 }
@@ -27,6 +29,10 @@ type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
          * 同期的にに注文コードを発行する場合に指定
          */
         publishCodeExpiresInSeconds?: number;
+        /**
+         * 取引検証時にorderInTransactionからオファーを検索するかどうか
+         */
+        useAcceptedOffersFromOrderInTransaction: boolean;
     };
 };
 /**