@chevre/domain 22.2.0-alpha.3 → 22.2.0-alpha.30

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -31,7 +31,7 @@ function payMovieTicket(params) {
             processSeatInfoSyncResult: { seatInfoSyncIn },
             project: { id: params.project.id }
         });
-        let action = yield repos.action.start(startingAction, { recipe });
+        const action = yield repos.action.start(startingAction, { recipe });
         let processSeatInfoSyncResult;
         try {
             // 着券済に対する冪等性を確保する必要はあるが、
@@ -91,9 +91,17 @@ function payMovieTicket(params) {
         //     ? { seatInfoSyncResult: <factory.action.trade.pay.ISeatInfoSyncResult>seatInfoSyncResult }
         //     : undefined
         };
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result, recipe }));
-        yield (0, onPaid_1.onPaid)(action)(repos);
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result, recipe });
+        yield (0, onPaid_1.onPaid)({
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            id: action.id,
+            object: startingAction.object,
+            potentialActions: startingAction.potentialActions,
+            project: startingAction.project,
+            purpose: startingAction.purpose,
+            typeOf: action.typeOf
+        })(repos);
+        // return action;
     });
 }
 exports.payMovieTicket = payMovieTicket;

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -58,7 +58,7 @@ function refundMovieTicket(params) {
         const refundActionAttributes = Object.assign({ agent, object, potentialActions, project, purpose, recipient, typeOf }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined
         // instrument // discontinue(2024-06-10~)
         );
-        let action = yield repos.action.start(refundActionAttributes, { recipe });
+        const action = yield repos.action.start(refundActionAttributes, { recipe });
         let processSeatInfoSyncCancelResult;
         let processSeatInfoSyncResult;
         try {
@@ -92,8 +92,10 @@ function refundMovieTicket(params) {
         }
         // アクションとしてはFailedだが後続処理を実行するケースに対応(2024-03-21~)
         const seatInfoSyncResultAsError = processSeatInfoSyncResult === null || processSeatInfoSyncResult === void 0 ? void 0 : processSeatInfoSyncResult.seatInfoSyncResultAsError;
+        let actionStatus;
         if (seatInfoSyncResultAsError !== undefined) {
-            action = (yield repos.action.giveUpWithObject({ typeOf: action.typeOf, id: action.id, error: seatInfoSyncResultAsError }));
+            yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: seatInfoSyncResultAsError });
+            actionStatus = factory.actionStatusType.FailedActionStatus;
         }
         else {
             // add recipe(2024-06-04~)
@@ -107,9 +109,18 @@ function refundMovieTicket(params) {
             //     ? { seatInfoSyncCancelResult: processSeatInfoSyncCancelResult.seatInfoSyncCancelResult }
             //     : undefined
             };
-            action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe }));
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+            actionStatus = factory.actionStatusType.CompletedActionStatus;
         }
-        yield (0, onRefund_1.onRefund)(action)(repos);
+        yield (0, onRefund_1.onRefund)({
+            actionStatus,
+            id: action.id,
+            object: refundActionAttributes.object,
+            potentialActions: refundActionAttributes.potentialActions,
+            project: refundActionAttributes.project,
+            purpose: refundActionAttributes.purpose,
+            typeOf: action.typeOf
+        })(repos);
     });
 }
 exports.refundMovieTicket = refundMovieTicket;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -150,7 +150,7 @@ function checkByIdentifierIfNotYet(params) {
                             reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
                         }
                     }
-                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['_id'], [])).shift();
+                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'], [])).shift();
             debug('alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'placeOrderId:', placeOrderId);
             if (alreadyCheckedAction !== undefined) {
                 const recipe = yield repos.action.findRecipeByAction({

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

@@ -21,7 +21,7 @@ declare function payPaymentCard(params: factory.action.trade.pay.IAttributes): (
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
+}) => Promise<void>;
 declare function refundPaymentCard(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
@@ -29,5 +29,5 @@ declare function refundPaymentCard(params: factory.task.refund.IData): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
     transactionNumber: TransactionNumberRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
+}) => Promise<void>;
 export { authorize, payPaymentCard, refundPaymentCard, voidTransaction };

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

@@ -79,9 +79,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
-        // const paymentCatdProduct = <Pick<factory.product.IProduct, 'serviceOutput'>>
-        //     await repos.product.findProductById({ id: paymentServiceId }, ['serviceOutput'], []);
-        const paymentCatdProduct = (yield repos.product.searchProducts({
+        const paymentCatdProduct = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: paymentServiceId },
@@ -235,12 +233,11 @@ function payPaymentCard(params) {
         var _a, _b, _c;
         const payObject = params.object;
         const paymentServiceId = payObject[0].id;
-        // アクション開始
-        let action = yield repos.action.start(params);
+        const action = yield repos.action.start(params);
         try {
             const transactionNumber = payObject[0].paymentMethod.paymentMethodId;
             const availableChannel = yield repos.product.findAvailableChannel({
-                project: { id: action.project.id },
+                project: { id: params.project.id },
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
@@ -267,9 +264,17 @@ function payPaymentCard(params) {
         }
         // アクション完了
         const actionResult = {};
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
-        yield (0, onPaid_1.onPaid)(action)(repos);
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield (0, onPaid_1.onPaid)({
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            id: action.id,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
+            typeOf: action.typeOf
+        })(repos);
+        // return action;
     });
 }
 exports.payPaymentCard = payPaymentCard;
@@ -289,11 +294,11 @@ function refundPaymentCard(params) {
         if (typeof accountNumber !== 'string') {
             throw new factory.errors.ArgumentNull('serviceOutput.paymentAccount.accountNumber');
         }
-        let action = yield repos.action.start(params);
+        const action = yield repos.action.start(params);
         let accountTransactionNumber4refund;
         try {
             const availableChannel = yield repos.product.findAvailableChannel({
-                project: { id: action.project.id },
+                project: { id: params.project.id },
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
@@ -309,7 +314,7 @@ function refundPaymentCard(params) {
             });
             // 返金のユニークネスを保証するため識別子を指定する
             const accountTransactionIdentifier = (0, accountTransactionIdentifier_1.createRefundIdentifier)({
-                project: { id: action.project.id },
+                project: { id: params.project.id },
                 paymentMethodId
             });
             // すでに返金済かどうか確認
@@ -318,7 +323,7 @@ function refundPaymentCard(params) {
                 // 口座取引で確認する(2022-10-27~)
                 const searchAccountTransactionsResult = yield accountTransactionService.search({
                     limit: 100,
-                    project: { id: { $eq: action.project.id } },
+                    project: { id: { $eq: params.project.id } },
                     identifier: { $eq: accountTransactionIdentifier }
                 });
                 const existingAccountTransactions = searchAccountTransactionsResult.data;
@@ -381,9 +386,17 @@ function refundPaymentCard(params) {
         const result = {
             accountTransaction: { transactionNumber: accountTransactionNumber4refund }
         };
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result }));
-        yield (0, onRefund_1.onRefund)(action)(repos);
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        yield (0, onRefund_1.onRefund)({
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            id: action.id,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
+            typeOf: action.typeOf
+        })(repos);
+        // return action;
     });
 }
 exports.refundPaymentCard = refundPaymentCard;

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

@@ -29,7 +29,7 @@ export declare function fixOrderAsPurpose(params: {
 }, transaction: factory.assetTransaction.pay.ITransaction): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;
-}) => Promise<Pick<factory.order.IOrder, "typeOf" | "confirmationNumber" | "orderNumber"> & {
+}) => Promise<Pick<factory.order.IOrder, "confirmationNumber" | "typeOf" | "orderNumber"> & {
     acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
 }>;
 /**

package/lib/chevre/service/report/ownershipInfo.d.ts

@@ -21,5 +21,7 @@ export interface IOwnershipInfoReport {
     };
 }
 export declare function ownershipInfo2report(params: {
-    ownershipInfo: factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>;
+    ownershipInfo: factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+        id: string;
+    };
 }): IOwnershipInfoReport;

package/lib/chevre/service/report/telemetry.js

@@ -217,7 +217,7 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
             startThrough: measuredThrough
         });
         // 計測期間内に開始され、かつ、すでに終了している取引を検索
-        const startedAndEndedTransactions = yield repos.transaction.search({
+        const startedAndEndedTransactions = yield repos.transaction.projectFields({
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             startFrom: measuredFrom,
@@ -227,7 +227,7 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         });
         const numberOfStartedAndConfirmed = startedAndEndedTransactions.filter((transaction) => transaction.status === factory.transactionStatusType.Confirmed).length;
         const numberOfStartedAndExpired = startedAndEndedTransactions.filter((transaction) => transaction.status === factory.transactionStatusType.Expired).length;
-        const endedTransactions = yield repos.transaction.search({
+        const endedTransactions = yield repos.transaction.projectFields({
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             endFrom: measuredFrom,

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

@@ -61,7 +61,7 @@ function cancelPengindIfNotYet(params) {
                 id: { $in: [params.purpose.id] },
                 typeOf: { $in: [params.purpose.typeOf] }
             }
-        }, ['_id'], []);
+        }, ['id'], []);
         if (completedActions.length === 0) {
             const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
             if (actionAttributes !== undefined) {

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

@@ -133,7 +133,7 @@ params, options) {
                 id: { $in: [actionAttributes.purpose.id] },
                 typeOf: { $in: [actionAttributes.purpose.typeOf] }
             }
-        }, ['_id'], []);
+        }, ['id'], []);
         debug(completedActions.length, 'completed reserveAction found. byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(actionAttributes);

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

@@ -17,7 +17,6 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
 const event_1 = require("../../repo/event");
-const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -55,7 +54,6 @@ function call(params) {
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo(redisClient),
                 event: new event_1.EventRepo(connection),
-                ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

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

@@ -67,22 +67,26 @@ function onAuthorizationCreated(params) {
                 }
                 break;
             case 'OwnershipInfo':
-                // 所有権検索
-                const ownershipInfoId = authorization.object.id;
-                if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
-                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
-                    // 座席予約に対する所有権であれば発券
-                    if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
-                        || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
-                        const reservationId = String(ownershipInfo.typeOfGood.id);
-                        reservationIds = [reservationId];
-                        const { reservationFor } = yield repos.reservation.projectFieldsById({
-                            id: reservationId,
-                            inclusion: ['reservationFor.id']
-                        });
-                        reservationForIds = [String(reservationFor.id)];
-                    }
-                }
+                // 所有権に対する承認はいったん廃止したので、所有権のケースは処理不要(2024-08-21~)
+                reservationIds = [];
+                // const ownershipInfoId = authorization.object.id;
+                // if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
+                //     const ownershipInfo = <Pick<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, 'id' | 'typeOfGood'>>
+                //         await repos.ownershipInfo.projectFieldsById({ id: ownershipInfoId }, ['typeOfGood']);
+                //     // 予約に対する所有権であれば発券
+                //     if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
+                //         || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
+                //         const reservationId = String(ownershipInfo.typeOfGood.id);
+                //         reservationIds = [reservationId];
+                //         const { reservationFor } = <{ reservationFor: { id: string } }>await repos.reservation.projectFieldsById<
+                //             factory.reservationType.EventReservation | factory.reservationType.BusReservation
+                //         >({
+                //             id: reservationId,
+                //             inclusion: ['reservationFor.id']
+                //         });
+                //         reservationForIds = [String(reservationFor.id)];
+                //     }
+                // }
                 break;
             default:
             // no op

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -343,10 +343,10 @@ function deleteResourcesByOfferCatalog(params) {
             const action = yield repos.action.start(deleteActionAttributes);
             try {
                 // カタログからプロダクト検索
-                const productsWithCatalog = yield repos.product.searchProducts({
+                const productsWithCatalog = yield repos.product.projectFields({
                     project: { id: { $eq: params.project.id } },
                     hasOfferCatalog: { id: { $eq: catalogId } }
-                }, ['_id'], []);
+                }, ['id'], []);
                 let deleteEventResult;
                 let updateOfferResult;
                 if (productsWithCatalog.length > 0) {

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.js

@@ -29,7 +29,7 @@ function syncCategoryCode(params) {
         }
         else {
             for (const categoryCodeId of params.ids) {
-                const syncingCategoryCode = (yield repos.categoryCode.search({
+                const syncingCategoryCode = (yield repos.categoryCode.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

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

@@ -8,6 +8,17 @@ 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.call = void 0;
 const factory = require("../../factory");
@@ -275,7 +286,7 @@ function createInformMovieTasks(params) {
 }
 function createInformProductTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const products4inform = yield repos.product.searchProducts({
+        const products4inform = yield repos.product.projectFields({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);
@@ -322,7 +333,7 @@ function createInformProductTasks(params) {
 }
 function createInformCategoryCodeTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const categoryCodes4inform = yield repos.categoryCode.search({
+        const categoryCodes4inform = yield repos.categoryCode.projectFields({
             id: { $in: params.ids },
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.DistributorType } }
@@ -484,10 +495,11 @@ function createInformAccountTitleTasks(params) {
                 accountTitles4inform.forEach((accountTitle4inform) => {
                     var _a;
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete accountTitle4inform._id;
+                    // delete accountTitle4inform._id;
+                    const { _id } = accountTitle4inform, informObject = __rest(accountTitle4inform, ["_id"]);
                     const informActionAttributes = {
                         // agent: accountTitle4inform.project,
-                        object: accountTitle4inform,
+                        object: informObject,
                         // project: accountTitle4inform.project,
                         recipient: {
                             id: '',

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

@@ -13,9 +13,11 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const authorization_1 = require("../../repo/authorization");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const transactionProcess_1 = require("../../repo/transactionProcess");
@@ -38,9 +40,11 @@ function call(params) {
             yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                authorization: new authorization_1.AuthorizationRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
+                ticket: new ticket_1.TicketRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
             }, settings);

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

@@ -76,7 +76,7 @@ function fixOrderAndTransaction(params) {
         }
         // const orderNumber = params.purpose.orderNumber;
         const orderNumber = orderByPaymentMethodId.orderNumber;
-        const returnOrderTransaction = (yield repos.transaction.search({
+        const returnOrderTransaction = (yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.ReturnOrder,

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -39,7 +39,7 @@ function createDeleteTransactionTasksByAgentId(params) {
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
         if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
             const transactionTypeOf = params.object.typeOf;
-            const transactions = yield repos.transaction.search({
+            const transactions = yield repos.transaction.projectFields({
                 project: { id: { $eq: params.object.project.id } },
                 agent: {
                     ids: [agentIdSpecified],
@@ -128,7 +128,7 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory.errors.ArgumentNull('object.id');
         }
-        const transaction = (yield repos.transaction.search({
+        const transaction = (yield repos.transaction.projectFields({
             ids: [deletingTransactionId],
             typeOf: params.object.typeOf,
             inclusion: ['typeOf', 'project', 'status', 'result']

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -28,7 +28,7 @@ const CodeService = require("../code");
 function start(params) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
-        const sellers = yield repos.seller.search({
+        const sellers = yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.seller.id }
@@ -162,7 +162,7 @@ function fixToLocation(params) {
 function processAuthorizePaymentCard(params) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.purpose.id
         }, ['agent', 'project', 'recipient', 'seller', 'typeOf', 'object']);
@@ -504,7 +504,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['typeOf', 'status', 'project']);
@@ -562,7 +562,7 @@ function searchAuthorizeActions(params) {
  */
 function exportTasksById(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['endDate', 'status', 'project', 'startDate', 'typeOf', 'object', 'potentialActions']);

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -41,7 +41,7 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'price'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'instrument' | 'object' | 'result'>[];
 }): void;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -350,11 +350,12 @@ exports.validatePaymentMethods = validatePaymentMethods;
 // tslint:disable-next-line:max-func-body-length
 function validateEventOffers(params) {
     var _a, _b;
-    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = params.paymentMethods.find((referenceInvoice) => {
+    const { paymentMethods } = params;
+    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = paymentMethods.find((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     })) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
-    const numCreditCardOrFaceToFacePaymentMethod = params.paymentMethods.filter((referenceInvoice) => {
+    const numCreditCardOrFaceToFacePaymentMethod = paymentMethods.filter((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
@@ -411,5 +412,38 @@ function validateEventOffers(params) {
             });
         }
     });
+    // check programMembershipUsed(2024-08-15~)
+    const programMembershipRequired = params.authorizeEventServiceOfferActions.reduce((a, b) => {
+        var _a, _b;
+        const programMembershipUsedfromResult = (_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput.programMembershipUsed;
+        if (Array.isArray(programMembershipUsedfromResult)) {
+            a.push(...programMembershipUsedfromResult);
+        }
+        return a;
+    }, []);
+    const satisfyProgramMembershipRequirement = programMembershipRequired.every(({ identifier, issuedThrough }) => {
+        let satisfyThisRequirement = false;
+        switch (issuedThrough.typeOf) {
+            case factory.product.ProductType.MembershipService:
+                // 検証の必要なし
+                satisfyThisRequirement = true;
+                break;
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.id === issuedThrough.id
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            default:
+            // no op
+        }
+        return satisfyThisRequirement;
+    });
+    if (!satisfyProgramMembershipRequirement) {
+        throw new factory.errors.Argument('Transaction', `programMembershipUsed requirement not satisfied`);
+    }
 }
 exports.validateEventOffers = validateEventOffers;

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -59,7 +59,7 @@ function confirm(params, options) {
             status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
+        const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
         const confirmResult = yield processTransactionNotInProgress(transaction)(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
@@ -293,7 +293,7 @@ function createResult(params, options) {
         price
     });
     (0, validation_1.validateEventOffers)({
-        order: orderAsResult,
+        order: { price },
         paymentMethods,
         authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
     });

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -18,7 +18,7 @@ const factory_1 = require("./exportTasks/factory");
  */
 function exportTasksById(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.d.ts

@@ -1,8 +1,8 @@
 import type { MemberRepo } from '../../../../repo/member';
 import type { ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
-import type { SellerRepo } from '../../../../repo/seller';
+import type { ISellerWithId, SellerRepo } from '../../../../repo/seller';
 import * as factory from '../../../../factory';
-type ISeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
+type ISeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
 declare function validateStartRequest(params: {
     project: {
         id: string;

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js

@@ -67,7 +67,7 @@ function validateStartRequest(params) {
         if (projectMakesOffer === undefined) {
             throw new factory.errors.Argument('project', 'project makes no offers');
         }
-        const seller = (yield repos.seller.search({
+        const seller = (yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/transaction/placeOrder/start.js

@@ -35,7 +35,7 @@ function start(params, options) {
             }
             catch (error) {
                 // in case already locked
-                const alreadyStartedTransaction = (yield repos.transaction.search({
+                const alreadyStartedTransaction = (yield repos.transaction.projectFields({
                     limit: 1, page: 1,
                     typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },