@chevre/domain 21.18.0-alpha.2 → 21.18.0-alpha.20

package/lib/chevre/repo/order.js

@@ -697,7 +697,8 @@ class MongoRepository {
                 projection: {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    acceptedOffers: 0 // 除外(2023-12-08~)
                 }
             })
                 .exec();
@@ -707,7 +708,9 @@ class MongoRepository {
                     orderNumber: params.orderNumber,
                     project: { id: params.project.id },
                     inclusion: [],
-                    exclusion: []
+                    exclusion: [
+                        'acceptedOffers' // 除外(2023-12-08~)
+                    ]
                 });
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */
@@ -741,9 +744,11 @@ class MongoRepository {
             }, {
                 new: true,
                 projection: {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
+                    _id: 1, project: 1, typeOf: 1, orderNumber: 1, dateReturned: 1,
+                    customer: 1, returner: 1, seller: 1, price: 1, priceCurrency: 1, orderDate: 1 // optimize(2023-12-07~)
+                    // __v: 0,
+                    // createdAt: 0,
+                    // updatedAt: 0
                 }
             })
                 .exec();
@@ -752,8 +757,11 @@ class MongoRepository {
                 const order = yield this.findByOrderNumber({
                     orderNumber: params.orderNumber,
                     project: { id: params.project.id },
-                    inclusion: [],
-                    exclusion: []
+                    inclusion: [
+                        'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
+                        'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
+                    ],
+                    exclusion: [] // 除外(2023-12-07~)
                 });
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */
@@ -825,17 +833,20 @@ class MongoRepository {
     }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
+            let projection = { _id: 1 };
             if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
                 params.inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    if (String(field) !== 'acceptedOffers') {
+                        projection[field] = 1;
+                    }
                 });
             }
             else {
                 projection = {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    acceptedOffers: 0
                 };
                 if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
                     params.exclusion.forEach((field) => {
@@ -859,14 +870,17 @@ class MongoRepository {
             let projection = {};
             if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
                 params.inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    if (String(field) !== 'acceptedOffers') {
+                        projection[field] = 1;
+                    }
                 });
             }
             else {
                 projection = {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    acceptedOffers: 0 // defaultで除外(2023-12-08~)
                 };
                 if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
                     params.exclusion.forEach((field) => {
@@ -929,19 +943,30 @@ class MongoRepository {
     /**
      * 注文を検索する
      */
-    search(params, projection) {
+    search(params, 
+    // 必須化(2023-12-08~)
+    projection) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const projectionSpecified = projection !== undefined && projection !== null;
-            const positiveProjectionExists = (projectionSpecified)
-                ? Object.values(projection)
-                    .some((value) => value !== 0)
-                : false;
+            let projectStage = {};
+            const positiveProjectionFields = (projection !== undefined && projection !== null)
+                ? Object.keys(projection)
+                    .filter((key) => projection[key] !== 0
+                    && key !== 'acceptedOffers' // defaultで隠蔽(2023-12-06~)
+                )
+                : [];
+            if (Array.isArray(positiveProjectionFields) && positiveProjectionFields.length > 0) {
+                projectStage = {};
+                positiveProjectionFields.forEach((field) => {
+                    projectStage[field] = 1;
+                });
+            }
+            else {
+                projectStage = Object.assign({ __v: 0, createdAt: 0, updatedAt: 0, acceptedOffers: 0 }, projection);
+            }
             const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select((projectionSpecified && positiveProjectionExists)
-                ? projection
-                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+                .select(projectStage);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -959,165 +984,6 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    /**
-     * 注文の受入オファーIDリストを検索する
-     */
-    searchAcceptedOfferIds(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select({
-                'acceptedOffers.id': 1
-            });
-            const orders = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => {
-                return doc.toObject();
-            }));
-            const offerIds = orders.reduce((a, b) => {
-                const offerIdsByOrder = (Array.isArray(b.acceptedOffers))
-                    ? b.acceptedOffers.filter((offer) => typeof offer.id === 'string')
-                        .map((offer) => {
-                        return String(offer.id);
-                    })
-                    : [];
-                return [...a, ...offerIdsByOrder];
-            }, []);
-            return [...new Set(offerIds)];
-        });
-    }
-    /**
-     * オファー展開の注文検索
-     */
-    searchWithUnwoundAcceptedOffers(params, projection) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const aggregate = this.orderModel.aggregate();
-            // pipelineの順序に注意
-            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
-                aggregate.sort({ orderDate: params.sort.orderDate });
-            }
-            aggregate.unwind('$acceptedOffers');
-            conditions.forEach((c) => {
-                aggregate.match(c);
-            });
-            aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate
-                // .allowDiskUse(true) // false化(2023-11-30~)
-                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * オファーのみ展開して検索する
-     */
-    searchAcceptedOffers(params, inclusion) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const aggregate = this.orderModel.aggregate();
-            // pipelineの順序に注意
-            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
-                aggregate.sort({ orderDate: params.sort.orderDate });
-            }
-            aggregate.unwind('$acceptedOffers');
-            conditions.forEach((c) => {
-                aggregate.match(c);
-            });
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                const specifiedProjection = {
-                    _id: 0
-                };
-                inclusion.forEach((key) => {
-                    specifiedProjection[key] = `$acceptedOffers.${key}`;
-                });
-                aggregate.project(specifiedProjection);
-            }
-            else {
-                aggregate.project({
-                    _id: 0,
-                    itemOffered: '$acceptedOffers.itemOffered',
-                    priceSpecification: '$acceptedOffers.priceSpecification',
-                    typeOf: '$acceptedOffers.typeOf',
-                    id: '$acceptedOffers.id',
-                    offeredThrough: '$acceptedOffers.offeredThrough',
-                    name: '$acceptedOffers.name'
-                });
-            }
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate
-                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * 注文に含まれる予約番号を検索する
-     */
-    searchReservationNumbersByOrderNumbers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
-                return [];
-            }
-            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
-                'acceptedOffers.itemOffered.reservationNumber': { $exists: true },
-                orderNumber: { $in: params.orderNumber.$in }
-            })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * 注文に含まれるイベントIDを検索する
-     */
-    searchReservationForIdsByOrderNumbers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
-                return [];
-            }
-            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationFor.id', {
-                'acceptedOffers.itemOffered.reservationFor.id': { $exists: true },
-                orderNumber: { $in: params.orderNumber.$in }
-            })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * 注文に含まれるacceptedOffersを検索する
-     */
-    searchAcceptedOffersByOrderNumbers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
-                return [];
-            }
-            const aggregate = this.orderModel.aggregate();
-            aggregate.unwind('$acceptedOffers');
-            aggregate.match({ orderNumber: { $in: params.orderNumber.$in } });
-            aggregate.project({
-                _id: 0,
-                id: '$acceptedOffers.id',
-                priceSpecification: '$acceptedOffers.priceSpecification'
-            });
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
     getCursor(conditions, projection) {
         return this.orderModel.find(conditions, projection)
             .sort({ orderDate: factory.sortType.Descending })

package/lib/chevre/repo/place.js

@@ -625,7 +625,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -722,17 +722,21 @@ class MongoRepository {
                 { $unwind: '$containsPlace' },
                 ...matchStages,
                 {
-                    $project: Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', containedInPlace: {
-                            typeOf: '$typeOf',
-                            branchCode: '$branchCode',
-                            name: '$name',
+                    $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.containedInPlace) === 1)
+                        ? {
                             containedInPlace: {
-                                id: '$containedInPlace.id',
-                                typeOf: '$containedInPlace.typeOf',
-                                branchCode: '$containedInPlace.branchCode',
-                                name: '$containedInPlace.name'
+                                typeOf: '$typeOf',
+                                branchCode: '$branchCode',
+                                name: '$name',
+                                containedInPlace: {
+                                    id: '$containedInPlace.id',
+                                    typeOf: '$containedInPlace.typeOf',
+                                    branchCode: '$containedInPlace.branchCode',
+                                    name: '$containedInPlace.name'
+                                }
                             }
-                        }, additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.seatCount) === 1)
+                        }
+                        : undefined), (((_q = searchConditions.$projection) === null || _q === void 0 ? void 0 : _q.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {

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

@@ -24,6 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection<T extends factory.transactionType> = keyof factory.transaction.ITransaction<T> | '_id' | '__v' | 'createdAt' | 'updatedAt';
 interface IAggregationByStatus {
     transactionCount: number;
     avgDuration: number;
@@ -64,8 +65,8 @@ export declare class MongoRepository {
     findById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-        inclusion?: string[];
-        exclusion?: string[];
+        inclusion?: IKeyOfProjection<T>[];
+        exclusion?: IKeyOfProjection<T>[];
     }): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 進行中の取引を取得する
@@ -187,8 +188,8 @@ export declare class MongoRepository {
      * 取引を検索する
      */
     search<T extends factory.transactionType>(params: factory.transaction.ISearchConditions<T> & {
-        inclusion: string[];
-        exclusion: string[];
+        inclusion: IKeyOfProjection<T>[];
+        exclusion: IKeyOfProjection<T>[];
     }): Promise<factory.transaction.ITransaction<T>[]>;
     /**
      * 特定の取引を更新する(汎用)

package/lib/chevre/repository.d.ts

@@ -1,6 +1,7 @@
 /**
  * リポジトリ
  */
+import type { MongoRepository as AcceptedOfferRepo } from './repo/acceptedOffer';
 import type { MongoRepository as AccountRepo } from './repo/account';
 import type { MongoRepository as AccountingReportRepo } from './repo/accountingReport';
 import type { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
@@ -46,11 +47,14 @@ import type { MongoRepository as TelemetryRepo } from './repo/telemetry';
 import type { MongoRepository as TransactionRepo } from './repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from './repo/transactionNumber';
 import type { MongoRepository as TripRepo } from './repo/trip';
-import type { RedisRepository as RegisterServiceActionInProgress } from './repo/action/registerServiceInProgress';
 import type { RedisRepository as ConfirmationNumberRepo } from './repo/confirmationNumber';
 import type { RedisRepository as OrderNumberRepo } from './repo/orderNumber';
 import type { GMORepository as CreditCardRepo } from './repo/paymentMethod/creditCard';
 import type { CognitoRepository as PersonRepo } from './repo/person';
+export type AcceptedOffer = AcceptedOfferRepo;
+export declare namespace AcceptedOffer {
+    function createInstance(...params: ConstructorParameters<typeof AcceptedOfferRepo>): Promise<AcceptedOfferRepo>;
+}
 export type Account = AccountRepo;
 export declare namespace Account {
     function createInstance(...params: ConstructorParameters<typeof AccountRepo>): Promise<AccountRepo>;
@@ -83,12 +87,6 @@ export type Aggregation = AggregationRepo;
 export declare namespace Aggregation {
     function createInstance(...params: ConstructorParameters<typeof AggregationRepo>): Promise<AggregationRepo>;
 }
-export declare namespace action {
-    type RegisterServiceInProgress = RegisterServiceActionInProgress;
-    namespace RegisterServiceInProgress {
-        function createInstance(...params: ConstructorParameters<typeof RegisterServiceActionInProgress>): Promise<RegisterServiceActionInProgress>;
-    }
-}
 export type AssetTransaction = AssetTransactionRepo;
 export declare namespace AssetTransaction {
     function createInstance(...params: ConstructorParameters<typeof AssetTransactionRepo>): Promise<AssetTransactionRepo>;

package/lib/chevre/repository.js

@@ -9,7 +9,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+var AcceptedOffer;
+(function (AcceptedOffer) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/acceptedOffer'))).MongoRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    AcceptedOffer.createInstance = createInstance;
+})(AcceptedOffer = exports.AcceptedOffer || (exports.AcceptedOffer = {}));
 var Account;
 (function (Account) {
     let repo;
@@ -114,22 +127,6 @@ var Aggregation;
     }
     Aggregation.createInstance = createInstance;
 })(Aggregation = exports.Aggregation || (exports.Aggregation = {}));
-var action;
-(function (action) {
-    let RegisterServiceInProgress;
-    (function (RegisterServiceInProgress) {
-        let repo;
-        function createInstance(...params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (repo === undefined) {
-                    repo = (yield Promise.resolve().then(() => require('./repo/action/registerServiceInProgress'))).RedisRepository;
-                }
-                return new repo(...params);
-            });
-        }
-        RegisterServiceInProgress.createInstance = createInstance;
-    })(RegisterServiceInProgress = action.RegisterServiceInProgress || (action.RegisterServiceInProgress = {}));
-})(action = exports.action || (exports.action = {}));
 var AssetTransaction;
 (function (AssetTransaction) {
     let repo;

package/lib/chevre/service/assetTransaction/pay/potentialActions.d.ts

@@ -6,5 +6,7 @@ export type IUnitPriceSpecification = factory.unitPriceOffer.IUnitPriceOfferPric
 export declare function createPotentialActions(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
     potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
-    order: factory.order.IOrder;
+    order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.assetTransaction.IPotentialActions<factory.assetTransactionType.Pay>;

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -214,12 +214,12 @@ function reservationPriceComponent2invoicePriceComponent(component) {
     }
 }
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
-    var _a, _b;
+    var _a;
     let ticketToken;
     let reservationNumber = '';
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
-    const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
+    const reservationOffer = order.acceptedOffers.find((o) => {
         var _a, _b, _c, _d;
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す
@@ -259,7 +259,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
             ticketToken = ticketTokenByReservationOffer;
         }
         reservationNumber = reservationOffer.itemOffered.reservationNumber;
-        const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
+        const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
         if (Array.isArray(priceComponent)) {
             priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
         }

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -3,6 +3,7 @@
  */
 import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
+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 AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -38,6 +39,7 @@ export interface ICancelRepos {
 }
 export type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
 export interface IConfirmRepos {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/assetTransaction/pay.js

@@ -365,25 +365,29 @@ exports.confirm = confirm;
 function fixOrderAsPurpose(params, transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
-        let order;
         const payPurposeConfirmationNumber = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.pay) === null || _b === void 0 ? void 0 : _b.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber;
         const payPurposeOrderNumber = (_f = (_e = (_d = params.potentialActions) === null || _d === void 0 ? void 0 : _d.pay) === null || _e === void 0 ? void 0 : _e.purpose) === null || _f === void 0 ? void 0 : _f.orderNumber;
         if (typeof payPurposeConfirmationNumber !== 'string' || payPurposeConfirmationNumber.length === 0
             || typeof payPurposeOrderNumber !== 'string' || payPurposeOrderNumber.length === 0) {
             throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
         }
-        const orders = yield repos.order.search({
+        const ordersWithoutAcceptedOffers = yield repos.order.search({
             limit: 1,
             page: 1,
             project: { id: { $eq: transaction.project.id } },
             confirmationNumbers: [payPurposeConfirmationNumber],
             orderNumbers: [payPurposeOrderNumber]
-        });
-        order = orders.shift();
-        if (order === undefined) {
+        }, { typeOf: 1, confirmationNumber: 1, orderNumber: 1 });
+        const orderWithoutAcceptedOffers = ordersWithoutAcceptedOffers.shift();
+        if (orderWithoutAcceptedOffers === undefined) {
             throw new factory.errors.NotFound('Order as purpose');
         }
-        return order;
+        // 全acceptedOffersを検索(2023-12-06~)
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: orderWithoutAcceptedOffers.orderNumber },
+            project: { id: { $eq: transaction.project.id } }
+        });
+        return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffers });
     });
 }
 /**

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

@@ -4,5 +4,7 @@ export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.owners
  * 注文から所有権を作成する
  */
 export declare function createOwnershipInfosFromOrder(params: {
-    order: Pick<factory.order.IOrder, 'acceptedOffers' | 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'>;
+    order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): IOwnershipInfo[];

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

@@ -11,8 +11,10 @@ const factory_2 = require("./reservation/factory");
  */
 function createOwnershipInfosFromOrder(params) {
     const ownershipInfos = [];
-    const acceptedOffers = (Array.isArray(params.order.acceptedOffers)) ? params.order.acceptedOffers : [];
-    acceptedOffers.forEach((acceptedOffer, offerIndex) => {
+    if (!Array.isArray(params.order.acceptedOffers)) {
+        throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    }
+    params.order.acceptedOffers.forEach((acceptedOffer, offerIndex) => {
         const itemOffered = acceptedOffer.itemOffered;
         let ownershipInfo;
         const ownedFrom = moment(params.order.orderDate)

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

@@ -4,7 +4,6 @@ import type { MongoRepository as AssetRepo } from '../repo/assetTransaction';
 import type { MongoRepository as ProductRepo } from '../repo/product';
 import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { RedisRepository as TransactionNumberRepo } from '../repo/transactionNumber';
-import { createOwnershipInfosFromOrder } from './delivery/factory';
 /**
  * 特典付与
  */
@@ -25,4 +24,4 @@ declare function returnPointAward(params: factory.task.IData<factory.taskName.Re
     project: ProjectRepo;
     transactionNumber: TransactionNumberRepo;
 }) => Promise<void>;
-export { createOwnershipInfosFromOrder, givePointAward, returnPointAward };
+export { givePointAward, returnPointAward };

package/lib/chevre/service/delivery.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.returnPointAward = exports.givePointAward = exports.createOwnershipInfosFromOrder = void 0;
+exports.returnPointAward = exports.givePointAward = void 0;
 /**
  * 配送サービス
  * ここでいう「配送」とは、「エンドユーザーが獲得した所有権を利用可能な状態にすること」を指します。
@@ -21,8 +21,6 @@ exports.returnPointAward = exports.givePointAward = exports.createOwnershipInfos
 const moment = require("moment");
 const factory = require("../factory");
 const MoneyTransferAssetTransactionService = require("./assetTransaction/moneyTransfer");
-const factory_1 = require("./delivery/factory");
-Object.defineProperty(exports, "createOwnershipInfosFromOrder", { enumerable: true, get: function () { return factory_1.createOwnershipInfosFromOrder; } });
 const accountTransactionIdentifier_1 = require("../factory/accountTransactionIdentifier");
 /**
  * 特典付与

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

@@ -1,7 +1,6 @@
 import * as factory from '../../factory';
 import type { MongoRepository as AccountRepo } from '../../repo/account';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as OfferRepo } from '../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalog';
@@ -23,7 +22,6 @@ export interface IAuthorizeOperationRepos {
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
     project: ProjectRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
     transaction: TransactionRepo;
@@ -94,17 +92,5 @@ export declare function authorize(params: {
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidRegisterServiceTransaction>): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
-export declare function processUnlockRegisterMembershipService(params: {
-    agent: {
-        id: string;
-    };
-    product: {
-        id: string;
-    };
-    purpose: factory.action.authorize.offer.product.IPurpose;
-}): (repos: {
-    registerActionInProgress: RegisterServiceInProgressRepo;
-}) => Promise<void>;