@chevre/domain 21.18.0-alpha.4 → 21.18.0-alpha.41

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

@@ -36,7 +36,7 @@ function publishPaymentUrl(params) {
         }
         yield validateSeller(params)(repos);
         // 決済サービス確認
-        const paymentServiceId = yield getPaymentServiceId(params)();
+        const paymentServiceId = getPaymentServiceId(params);
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
@@ -150,29 +150,27 @@ function start(params, options) {
 }
 exports.start = start;
 function getPaymentServiceId(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let paymentServiceId = '';
-        const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
-        if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            paymentServiceId = params.object.id;
-        }
-        else {
-            switch (paymentServiceType) {
-                case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    // 対面決済は特に何もしない
-                    break;
-                case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                case factory.service.paymentService.PaymentServiceType.CreditCard:
-                case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                    // リクエストでの指定を必須化(2022-04-12~)
-                    throw new factory.errors.ArgumentNull('object.id');
-                default:
-                    throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
-            }
+    var _a;
+    let paymentServiceId = '';
+    const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
+    if (typeof params.object.id === 'string' && params.object.id.length > 0) {
+        paymentServiceId = params.object.id;
+    }
+    else {
+        switch (paymentServiceType) {
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                // 対面決済は特に何もしない
+                break;
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+                // リクエストでの指定を必須化(2022-04-12~)
+                throw new factory.errors.ArgumentNull('object.id');
+            default:
+                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
-        return paymentServiceId;
-    });
+    }
+    return paymentServiceId;
 }
 function fixPaymentService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -184,16 +182,27 @@ function fixPaymentService(params) {
                 // no op
                 // FaceToFaceの場合プロダクトは存在しない
                 break;
+            // PaymentCardの場合、プロダクト検索
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+                paymentService = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
+                    id: { $eq: getPaymentServiceId(params) }
+                }, [], [])).shift();
+                if (paymentService === undefined) {
+                    throw new factory.errors.NotFound('PaymentService');
+                }
+                break;
             default:
-                const paymentServiceId = yield getPaymentServiceId(params)();
-                const paymentServices = yield repos.product.search({
+                paymentService = (yield repos.product.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
                     typeOf: { $eq: paymentServiceType },
-                    id: { $eq: paymentServiceId }
-                }, [], []);
-                paymentService = paymentServices.shift();
+                    id: { $eq: getPaymentServiceId(params) }
+                }, [], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }
@@ -365,25 +374,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/assetTransaction/refund/factory.d.ts

@@ -6,5 +6,5 @@ export declare function createStartParams(params: factory.assetTransaction.refun
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     payAction: factory.action.trade.pay.IAction;
-    paymentService?: factory.service.paymentService.IService;
+    paymentService?: factory.product.IProduct | factory.service.paymentService.IService;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Refund>;

package/lib/chevre/service/assetTransaction/refund/factory.js

@@ -54,11 +54,6 @@ exports.createStartParams = createStartParams;
 function createInformPaymentParams(params) {
     var _a, _b, _c;
     const informPaymentParams = [];
-    // 廃止(2022-10-29~)
-    // const informPaymentParamsByGlobalSettings = settings.onPaymentStatusChanged?.informPayment;
-    // if (Array.isArray(informPaymentParamsByGlobalSettings)) {
-    //     informPaymentParams.push(...informPaymentParamsByGlobalSettings);
-    // }
     // プロダクト設定を適用
     const informPaymentParamsByProduct = (_c = (_b = (_a = params.paymentService) === null || _a === void 0 ? void 0 : _a.availableChannel) === null || _b === void 0 ? void 0 : _b.onPaymentStatusChanged) === null || _c === void 0 ? void 0 : _c.informPayment;
     if (Array.isArray(informPaymentParamsByProduct)) {

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

@@ -84,15 +84,27 @@ function fixPaymentService(params) {
                 // no op
                 // FaceToFaceの場合プロダクトは存在しない
                 break;
+            // PaymentCardの場合、プロダクト検索
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+                paymentService = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.payAction.project.id } },
+                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
+                    id: { $eq: paymentServiceId }
+                }, [], [])).shift();
+                if (paymentService === undefined) {
+                    throw new factory.errors.NotFound('PaymentService');
+                }
+                break;
             default:
-                const paymentServices = yield repos.product.search({
+                paymentService = (yield repos.product.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },
                     typeOf: { $eq: params.paymentServiceType },
                     id: { $eq: paymentServiceId }
-                }, [], []);
-                paymentService = paymentServices.shift();
+                }, [], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

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

@@ -44,7 +44,15 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        const product = yield repos.product.findById({ id: productId }, [], []);
+        // const product = await repos.product.findProductById({ id: productId }, [], []);
+        const product = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: productId }
+        }, [], [])).shift();
+        if (product === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
@@ -130,7 +138,15 @@ function createTransactionObject(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id }, [], []);
+        // const product = await repos.product.findProductById({ id: params.issuedThrough.id }, [], []);
+        const product = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.issuedThrough.id }
+        }, [], [])).shift();
+        if (product === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

package/lib/chevre/service/assetTransaction/reserve/factory/price.js

@@ -180,7 +180,7 @@ function eventOfferUnitPriceSpec2reservationUnitPriceSpec(params) {
             : undefined), (typeof ((_a = accounting.operatingRevenue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? {
                 operatingRevenue: {
-                    project: accounting.operatingRevenue.project,
+                    // project: accounting.operatingRevenue.project, // 削除(2023-12-13~)
                     typeOf: accounting.operatingRevenue.typeOf,
                     codeValue: accounting.operatingRevenue.codeValue
                 }

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

@@ -558,6 +558,7 @@ function validateAdvanceBookingRequirement(params) {
     }
 }
 function validateProgramMembershipUsed(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const now = new Date();
@@ -572,7 +573,27 @@ function validateProgramMembershipUsed(params) {
             if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
             }
-            const permitIssuedThrough = yield repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
+            let permitIssuedThrough;
+            // まずメンバーシップを検索して、存在しなければCreditCardを検索(どちらが発行元サービスか不明なので)
+            permitIssuedThrough = (yield repos.product.searchProducts({
+                limit: 1,
+                page: 1,
+                id: { $eq: issuedThroughId },
+                typeOf: { $eq: factory.product.ProductType.MembershipService }
+            }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+            if (permitIssuedThrough === undefined) {
+                permitIssuedThrough = (yield repos.product.searchPaymentServices({
+                    limit: 1,
+                    page: 1,
+                    id: { $eq: issuedThroughId },
+                    typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
+                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+            }
+            if (typeof (permitIssuedThrough === null || permitIssuedThrough === void 0 ? void 0 : permitIssuedThrough.typeOf) !== 'string') {
+                throw new factory.errors.NotFound(`Permit issuer service [${issuedThroughId}]`);
+            }
+            // permitIssuedThrough =
+            //     await repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
             switch (permitIssuedThrough.typeOf) {
                 // 発行サービスがCreditCardのケースに対応(2023-09-01~)
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
@@ -637,7 +658,16 @@ function validateProgramMembershipUsed(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        // const product = <Pick<factory.product.IProduct, 'availableChannel'>>
+        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        const product = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.issuedThrough.id }
+        }, ['availableChannel'], [])).shift();
+        if (product === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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/event.js

@@ -278,7 +278,7 @@ function saveScreeningEventSeries(params) {
                 yield repos.creativeWork.upsertMoviesByIdentifier(saveParams.map((saveScreeningEventSeriesParams) => {
                     var _a;
                     return {
-                        attributes: Object.assign(Object.assign({ typeOf: factory.creativeWorkType.Movie, project: params.project, identifier: saveScreeningEventSeriesParams.attributes.workPerformed.identifier, name: { ja: (_a = saveScreeningEventSeriesParams.attributes.workPerformed.name) === null || _a === void 0 ? void 0 : _a.ja }, offers: { typeOf: factory.offerType.Offer } }, (typeof saveScreeningEventSeriesParams.attributes.workPerformed.contentRating === 'string')
+                        $set: Object.assign(Object.assign({ typeOf: factory.creativeWorkType.Movie, project: params.project, identifier: saveScreeningEventSeriesParams.attributes.workPerformed.identifier, name: { ja: (_a = saveScreeningEventSeriesParams.attributes.workPerformed.name) === null || _a === void 0 ? void 0 : _a.ja }, offers: { typeOf: factory.offerType.Offer } }, (typeof saveScreeningEventSeriesParams.attributes.workPerformed.contentRating === 'string')
                             ? { contentRating: saveScreeningEventSeriesParams.attributes.workPerformed.contentRating }
                             : undefined), (typeof saveScreeningEventSeriesParams.attributes.workPerformed.duration === 'string')
                             ? { duration: saveScreeningEventSeriesParams.attributes.workPerformed.duration }

package/lib/chevre/service/moneyTransfer.js

@@ -326,7 +326,17 @@ function getIssuedThroughIdByAction(params) {
 function createPermitServiceCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const paymentCardService = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        // const paymentCardService = <Pick<factory.product.IProduct, 'availableChannel'>>
+        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        const paymentCardService = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.issuedThrough.id },
+            typeOf: { $eq: factory.product.ProductType.PaymentCard }
+        }, ['availableChannel'], [])).shift();
+        if (paymentCardService === undefined) {
+            throw new factory.errors.NotFound(factory.product.ProductType.PaymentCard);
+        }
         const permitServiceEndpoint = (_a = paymentCardService.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = paymentCardService.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = paymentCardService.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -44,5 +44,5 @@ export declare function coaTicket2offer(params: {
     ticketResult: COA.factory.master.ITicketResult;
     defaultCurrencyType?: factory.categoryCode.ICategoryCode;
     defaultMembershipType?: factory.categoryCode.ICategoryCode;
-}): factory.unitPriceOffer.IUnitPriceOffer;
+}): Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
 export {};

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

@@ -174,7 +174,7 @@ function responseBody2acceptedOffers4result(params) {
                             : undefined), (typeof ((_a = accounting.operatingRevenue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                             ? {
                                 operatingRevenue: {
-                                    project: accounting.operatingRevenue.project,
+                                    // project: accounting.operatingRevenue.project, // 削除(2023-12-13~)
                                     typeOf: accounting.operatingRevenue.typeOf,
                                     codeValue: accounting.operatingRevenue.codeValue
                                 }
@@ -340,7 +340,9 @@ function coaTicket2offer(params) {
             ? params.ticketResult.ticketNameEng
             : ''
     };
-    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: offerName, description: {
+    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
+        // id: '',
+        identifier: identifier, name: offerName, description: {
             ja: '',
             en: ''
         }, alternateName: {

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -18,9 +18,17 @@ function searchTicketOffersByItemOffered(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        let eventService;
+        // let eventService: Pick<factory.product.IProduct, 'hasOfferCatalog' | 'project'> | undefined;
         let catalogId;
-        eventService = yield repos.product.findById({ id: (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id }, ['hasOfferCatalog', 'project'], []);
+        // const eventService = await repos.product.findProductById({ id: params.itemOffered?.id }, ['hasOfferCatalog', 'project'], []);
+        const eventService = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: String((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) }
+        }, ['hasOfferCatalog', 'project'], [])).shift();
+        if (eventService === undefined) {
+            throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+        }
         if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             catalogId = eventService.hasOfferCatalog.id;
         }
@@ -370,7 +378,16 @@ function searchOfferAppliesToMovieTicket(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            const eventService = (yield repos.product.searchProducts({
+                limit: 1,
+                page: 1,
+                id: { $eq: eventOffers.itemOffered.id }
+            }, ['hasOfferCatalog'], [])).shift();
+            if (eventService === undefined) {
+                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+            }
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }
@@ -417,7 +434,16 @@ function searchOfferCatalogItems(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            const eventService = (yield repos.product.searchProducts({
+                limit: 1,
+                page: 1,
+                id: { $eq: eventOffers.itemOffered.id }
+            }, ['hasOfferCatalog'], [])).shift();
+            if (eventService === undefined) {
+                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+            }
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }
@@ -477,7 +503,16 @@ function searchOfferCatalogItemAvailability(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            const eventService = (yield repos.product.searchProducts({
+                limit: 1,
+                page: 1,
+                id: { $eq: eventOffers.itemOffered.id }
+            }, ['hasOfferCatalog'], [])).shift();
+            if (eventService === undefined) {
+                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+            }
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }

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

@@ -121,7 +121,7 @@ function responseBody2resultAcceptedOffer(params) {
                                     : undefined), (typeof ((_b = component.accounting.operatingRevenue) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
                                     ? {
                                         operatingRevenue: {
-                                            project: component.accounting.operatingRevenue.project,
+                                            // project: component.accounting.operatingRevenue.project, // 削除(2023-12-13~)
                                             typeOf: component.accounting.operatingRevenue.typeOf,
                                             codeValue: component.accounting.operatingRevenue.codeValue
                                         }

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

@@ -20,7 +20,16 @@ function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // プロダクト検索
-        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id }, ['hasOfferCatalog', 'project'], []);
+        // const productWithOffers = <Pick<factory.product.IProduct, 'hasOfferCatalog' | 'project'>>
+        //     await repos.product.findProductById({ id: params.itemOffered.id }, ['hasOfferCatalog', 'project'], []);
+        const productWithOffers = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.itemOffered.id }
+        }, ['hasOfferCatalog', 'project'], [])).shift();
+        if (productWithOffers === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const offerCatalogId = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof offerCatalogId !== 'string') {
             return [];

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>;