@chevre/domain 21.18.0-alpha.12 → 21.18.0-alpha.14

package/example/src/chevre/aggreateOwnershipInfosByOrder.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
+
+    const ownershipInfos = await acceptedOfferRepo.aggreateOwnershipInfosByOrder(
+        {
+            orderNumber: { $eq: 'CIN4-3943271-4221863' }
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(ownershipInfos, { depth: 1 });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchOrders.ts

@@ -10,6 +10,17 @@ async function main() {
 
     const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
 
+    const order = await orderRepo.findByOrderNumber({
+        orderNumber: 'CIN4-3943271-4221863',
+        project: { id: project.id },
+        inclusion: [
+            'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
+            'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
+        ],
+        exclusion: []
+    });
+    console.log(order);
+
     const orders = await orderRepo.search(
         {
             limit: 10,

package/example/src/chevre/searchTransactions.ts

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+
+    const transactions = await transactionRepo.search<chevre.factory.transactionType.PlaceOrder>({
+        limit: 1,
+        page: 1,
+        project: { id: { $eq: project.id } },
+        typeOf: chevre.factory.transactionType.PlaceOrder,
+        statuses: [chevre.factory.transactionStatusType.Confirmed],
+        result: {
+            order: {
+                confirmationNumber: { $eq: '14438' },
+                orderNumbers: ['CIN3-0760465-8981560']
+            }
+        },
+        inclusion: ['id'],
+        exclusion: []
+    });
+    console.log('transactions found', transactions);
+    console.log(transactions.length, 'transactions found');
+
+    const transaction = await transactionRepo.findById({
+        typeOf: chevre.factory.transactionType.PlaceOrder,
+        id: '6570f9d7834f9638ceec86ad',
+        inclusion: ['_id', 'typeOf', 'status']
+    });
+    console.log('transaction found', transaction);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -16,6 +16,13 @@ export declare class MongoRepository {
      * オファー展開の注文検索
      */
     searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
+    aggreateOwnershipInfosByOrder(filter: {
+        orderNumber: {
+            $eq: string;
+        };
+    }): Promise<{
+        identifier: string;
+    }[]>;
     /**
      * 注文オファーを展開して検索する
      */

package/lib/chevre/repo/acceptedOffer.js

@@ -51,6 +51,34 @@ class MongoRepository {
                 .exec();
         });
     }
+    aggreateOwnershipInfosByOrder(filter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregate = this.orderModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$acceptedOffers',
+                        includeArrayIndex: 'acceptedOfferIndex'
+                    }
+                },
+                { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
+                {
+                    $project: {
+                        _id: 0,
+                        // acceptedOfferIndex: '$acceptedOfferIndex',
+                        // itemOfferedTypeOf: '$acceptedOffers.itemOffered.typeOf',
+                        // customerId: '$customer.id',
+                        // orderNumber: '$orderNumber',
+                        identifier: {
+                            $concat: ['$customer.id', '-', '$acceptedOffers.itemOffered.typeOf', '-', '$orderNumber', '-', { $toString: '$acceptedOfferIndex' }]
+                        }
+                    }
+                }
+            ]);
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     /**
      * 注文オファーを展開して検索する
      */

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

@@ -25,6 +25,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IKeyOfProjection = keyof Omit<factory.order.IOrder, 'acceptedOffers'> | '_id';
+export type IReturnedOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'>;
 /**
  * 注文リポジトリ
  */
@@ -57,7 +58,7 @@ export declare class MongoRepository {
         orderNumber: string;
         dateReturned: Date;
         returner: factory.order.IReturner;
-    }): Promise<factory.order.IOrder>;
+    }): Promise<IReturnedOrder>;
     /**
      * 変更可能な属性を更新する
      */

package/lib/chevre/repo/order.js

@@ -741,9 +741,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 +754,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 */

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

@@ -47,7 +47,6 @@ 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';
@@ -88,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,8 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = exports.AcceptedOffer = void 0;
-exports.rateLimit = 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;
@@ -128,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/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>;

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processUnlockRegisterMembershipService = exports.voidTransaction = exports.authorize = exports.search = exports.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
+exports.voidTransaction = exports.authorize = exports.search = exports.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
@@ -129,11 +129,12 @@ function authorize(params) {
         try {
             // 会員の場合のみ排他ロック
             if (params.agent.typeOf === factory.personType.Person) {
-                yield processLockRegisterMembershipService({
-                    agent: params.agent,
-                    product: product,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                })(repos);
+                // 廃止(2023-12-07~)
+                // await processLockRegisterMembershipService({
+                //     agent: params.agent,
+                //     product: product,
+                //     purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                // })(repos);
             }
             // サービス登録開始
             const startParams = (0, factory_1.createRegisterServiceStartParams)({
@@ -155,11 +156,12 @@ function authorize(params) {
                 // no op
             }
             try {
-                yield processUnlockRegisterMembershipService({
-                    agent: params.agent,
-                    product: { id: String(product.id) },
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                })(repos);
+                // 廃止(2023-12-07~)
+                // await processUnlockRegisterMembershipService({
+                //     agent: params.agent,
+                //     product: { id: String(product.id) },
+                //     purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                // })(repos);
             }
             catch (error) {
                 // 失敗したら仕方ない
@@ -233,11 +235,12 @@ function voidTransaction(params) {
             var _b, _c;
             const productId = (_c = (_b = action.object[0]) === null || _b === void 0 ? void 0 : _b.itemOffered) === null || _c === void 0 ? void 0 : _c.id;
             if (typeof productId === 'string') {
-                yield processUnlockRegisterMembershipService({
-                    agent: { id: transaction.agent.id },
-                    product: { id: productId },
-                    purpose: params.purpose
-                })(repos);
+                // 廃止(2023-12-07~)
+                // await processUnlockRegisterMembershipService({
+                //     agent: { id: transaction.agent.id },
+                //     product: { id: productId },
+                //     purpose: params.purpose
+                // })(repos);
             }
             yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
             yield processVoidRegisterServiceTransaction({
@@ -382,29 +385,43 @@ function createServiceOutputIdentifier(params) {
         })));
     });
 }
-function processLockRegisterMembershipService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.product.typeOf === factory.product.ProductType.MembershipService) {
-            yield repos.registerActionInProgress.lock({
-                agent: { id: params.agent.id },
-                product: { id: String(params.product.id) }
-            }, params.purpose.id);
-        }
-    });
-}
-function processUnlockRegisterMembershipService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 登録ロックIDが取引IDであればロック解除
-        const holder = yield repos.registerActionInProgress.getHolder({
-            agent: { id: params.agent.id },
-            product: { id: params.product.id }
-        });
-        if (holder === params.purpose.id) {
-            yield repos.registerActionInProgress.unlock({
-                agent: { id: params.agent.id },
-                product: { id: params.product.id }
-            });
-        }
-    });
-}
-exports.processUnlockRegisterMembershipService = processUnlockRegisterMembershipService;
+// function processLockRegisterMembershipService(params: {
+//     agent: { id: string };
+//     product: factory.product.IProduct;
+//     purpose: factory.action.authorize.offer.product.IPurpose;
+// }) {
+//     return async (repos: {
+//         registerActionInProgress: RegisterServiceInProgressRepo;
+//     }) => {
+//         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
+//             await repos.registerActionInProgress.lock(
+//                 {
+//                     agent: { id: params.agent.id },
+//                     product: { id: String(params.product.id) }
+//                 },
+//                 params.purpose.id
+//             );
+//         }
+//     };
+// }
+// export function processUnlockRegisterMembershipService(params: {
+//     agent: { id: string };
+//     product: { id: string };
+//     purpose: factory.action.authorize.offer.product.IPurpose;
+// }) {
+//     return async (repos: {
+//         registerActionInProgress: RegisterServiceInProgressRepo;
+//     }) => {
+//         // 登録ロックIDが取引IDであればロック解除
+//         const holder = await repos.registerActionInProgress.getHolder({
+//             agent: { id: params.agent.id },
+//             product: { id: params.product.id }
+//         });
+//         if (holder === params.purpose.id) {
+//             await repos.registerActionInProgress.unlock({
+//                 agent: { id: params.agent.id },
+//                 product: { id: params.product.id }
+//             });
+//         }
+//     };
+// }

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

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

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

@@ -13,7 +13,6 @@ exports.findPlaceOrderTransaction = void 0;
 const factory = require("../../factory");
 function findPlaceOrderTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 注文取引検索
         const placeOrderTransactions = yield repos.transaction.search({
             limit: 1,
             page: 1,
@@ -26,7 +25,7 @@ function findPlaceOrderTransaction(params) {
                     orderNumbers: [params.orderNumber]
                 }
             },
-            inclusion: [],
+            inclusion: ['id', 'potentialActions', 'project', 'typeOf'],
             exclusion: []
         });
         const placeOrderTransaction = placeOrderTransactions.shift();

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

@@ -212,8 +212,11 @@ function cancelOrderIfExist(params) {
             }
             if (params.useOnOrderStatusChanged) {
                 yield (0, onOrderStatusChanged_1.onOrderCancelled)({
-                    order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderCancelled // 強制的にOrderCancelledとして処理する
-                     }),
+                    order: {
+                        orderDate: order.orderDate,
+                        orderNumber: order.orderNumber,
+                        orderStatus: factory.orderStatus.OrderCancelled // 強制的にOrderCancelledとして処理する
+                    },
                     placeOrderTransaction
                 })({
                     task: repos.task

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

@@ -6,6 +6,6 @@ import * as factory from '../../../../factory';
  * 注文中止時のアクション
  */
 declare function createOnOrderCancelledTasksByTransaction(params: {
-    transaction?: factory.transaction.placeOrder.ITransaction;
+    transaction?: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
 }): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createOnOrderCancelledTasksByTransaction };

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

@@ -1,8 +1,8 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
 declare function onOrderCancelled(params: {
-    order: factory.order.IOrder;
+    order: Pick<factory.order.IOrder, 'orderNumber' | 'orderDate' | 'orderStatus'>;
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
     task: TaskRepo;

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../../factory';
-type IDeliveredOrder = factory.order.IOrder & {
+type IDeliveredOrder = Pick<factory.order.IOrder, 'id' | 'customer' | 'orderNumber' | 'project' | 'typeOf'> & {
     orderStatus: factory.orderStatus.OrderDelivered;
 };
 declare function createInformTasks(order: IDeliveredOrder): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];

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

@@ -1,14 +1,12 @@
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../../repo/action/registerServiceInProgress';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'potentialActions'>;
 declare function onOrderDelivered(params: {
-    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+    order: Pick<factory.order.IOrder, 'id' | 'customer' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> & {
         orderStatus: factory.orderStatus.OrderDelivered;
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
-    registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { onOrderDelivered };

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

@@ -15,7 +15,6 @@ exports.onOrderDelivered = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../factory");
-const product_1 = require("../../offer/product");
 const factory_1 = require("./onOrderDelivered/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderDelivered(params) {
@@ -23,20 +22,6 @@ function onOrderDelivered(params) {
         var _a, _b, _c, _d, _e;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
-        // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
-        // const simpleOrder: factory.order.ISimpleOrder = {
-        //     typeOf: params.order.typeOf,
-        //     seller: {
-        //         id: params.order.seller.id,
-        //         typeOf: params.order.seller.typeOf,
-        //         name: params.order.seller.name
-        //     },
-        //     customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-        //     orderNumber: params.order.orderNumber,
-        //     price: params.order.price,
-        //     priceCurrency: params.order.priceCurrency,
-        //     orderDate: params.order.orderDate
-        // };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
                 tasks = [
@@ -50,24 +35,22 @@ function onOrderDelivered(params) {
                 try {
                     const placeOrderTransaction = params.placeOrderTransaction;
                     if (typeof (placeOrderTransaction === null || placeOrderTransaction === void 0 ? void 0 : placeOrderTransaction.id) === 'string') {
+                        // 廃止(2023-12-07~)
                         // プロダクト登録プロセスロック解除(orderからproductIdを抽出する)
-                        if (Array.isArray(params.order.acceptedOffers)) {
-                            const productIds4unlock = params.order.acceptedOffers
-                                .filter((o) => {
-                                var _a;
-                                return o.itemOffered.typeOf === factory.permit.PermitType.Permit
-                                    && typeof ((_a = o.itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) === 'string'
-                                    && o.itemOffered.issuedThrough.id.length > 0;
-                            })
-                                .map((o) => { var _a; return String((_a = o.itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.id); });
-                            yield Promise.all(productIds4unlock.map((productId) => __awaiter(this, void 0, void 0, function* () {
-                                yield (0, product_1.processUnlockRegisterMembershipService)({
-                                    agent: { id: String(params.order.customer.id) },
-                                    product: { id: productId },
-                                    purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
-                                })(repos);
-                            })));
-                        }
+                        // if (Array.isArray(params.order.acceptedOffers)) {
+                        //     const productIds4unlock = params.order.acceptedOffers
+                        //         .filter((o) => o.itemOffered.typeOf === factory.permit.PermitType.Permit
+                        //             && typeof o.itemOffered.issuedThrough?.id === 'string'
+                        //             && o.itemOffered.issuedThrough.id.length > 0)
+                        //         .map((o) => String((<factory.order.IPermit>o.itemOffered).issuedThrough?.id));
+                        //     await Promise.all(productIds4unlock.map(async (productId) => {
+                        //         await processUnlockRegisterMembershipService({
+                        //             agent: { id: String(params.order.customer.id) },
+                        //             product: { id: productId },
+                        //             purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
+                        //         })(repos);
+                        //     }));
+                        // }
                     }
                 }
                 catch (error) {

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

@@ -1,7 +1,7 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 declare function onOrderPaymentDue(params: {
-    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'customer' | 'orderDate' | 'seller' | 'typeOf' | 'price' | 'priceCurrency'> & {
         orderStatus: factory.orderStatus.OrderPaymentDue;
     };
 }): (repos: {

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

@@ -1,7 +1,7 @@
 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;

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/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 };
     });
 }
@@ -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,5 +1,4 @@
 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';
@@ -9,7 +8,6 @@ type ISendOperation<T> = (repos: {
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<T>;

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

@@ -101,10 +101,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.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']
             }));
         }
         // 承認アクションを取得

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

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
@@ -23,20 +21,18 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const orderRepo = new order_1.MongoRepository(settings.connection);
         const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
         yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             action: actionRepo,
             order: orderRepo,
             ownershipInfo: ownershipInfoRepo,
-            registerActionInProgress: registerServiceInProgressRepo,
             task: taskRepo,
             transaction: transactionRepo
         });

package/lib/chevre/service/task/voidRegisterServiceTransaction.js

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const transaction_1 = require("../../repo/transaction");
 const ProductOfferService = require("../offer/product");
@@ -21,17 +19,15 @@ const ProductOfferService = require("../offer/product");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         const actionRepo = new action_1.MongoRepository(settings.connection);
-        const registerActionInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield ProductOfferService.voidTransaction(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            registerActionInProgress: registerActionInProgressRepo,
             transaction: transactionRepo
         });
     });

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.344.0",
+    "@chevre/factory": "4.345.0",
     "@cinerino/sdk": "5.3.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.12"
+  "version": "21.18.0-alpha.14"
 }

package/lib/chevre/repo/action/registerServiceInProgress.d.ts

@@ -1,29 +0,0 @@
-import { RedisClientType } from 'redis';
-/**
- * 進行アクションキーインターフェース
- */
-export interface IProgressKey {
-    agent: {
-        id: string;
-    };
-    product: {
-        id: string;
-    };
-}
-/**
- * 進行中サービス登録アクションリポジトリ
- */
-export declare class RedisRepository {
-    private static readonly KEY_PREFIX;
-    private readonly redisClient;
-    constructor(redisClient: RedisClientType);
-    /**
-     * ロックする
-     */
-    lock(progressKey: IProgressKey, holder: string): Promise<boolean>;
-    /**
-     * メンバーシップ登録進行ロックを解除する
-     */
-    unlock(progressKey: IProgressKey): Promise<void>;
-    getHolder(progressKey: IProgressKey): Promise<string | null>;
-}

package/lib/chevre/repo/action/registerServiceInProgress.js

@@ -1,58 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisRepository = void 0;
-/**
- * 進行中サービス登録アクションリポジトリ
- */
-class RedisRepository {
-    constructor(redisClient) {
-        this.redisClient = redisClient;
-    }
-    /**
-     * ロックする
-     */
-    lock(progressKey, holder) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-            const ttl = 7200;
-            const [setNXReply] = yield this.redisClient.multi()
-                .setNX(key, holder)
-                .expire(key, ttl)
-                .exec();
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else: please write tests */
-            if (setNXReply === 1 || setNXReply === true) {
-                return true;
-            }
-            else {
-                throw new Error('Already in progress.');
-            }
-        });
-    }
-    /**
-     * メンバーシップ登録進行ロックを解除する
-     */
-    unlock(progressKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-            yield this.redisClient.del([key]);
-        });
-    }
-    getHolder(progressKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-            return this.redisClient.get(key);
-        });
-    }
-}
-RedisRepository.KEY_PREFIX = 'cinerino:registerProgramMembershipActionInProgress';
-exports.RedisRepository = RedisRepository;