@chevre/domain 22.2.0-alpha.9 → 22.3.0-alpha.0

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -23,7 +23,7 @@ function changeOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['typeOf', 'agent', 'project', 'seller']);
@@ -40,6 +40,9 @@ function changeOffers(params) {
         if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
+        if (authorizeAction.result === undefined) {
+            throw new factory.errors.NotFound('authorizeAction.result');
+        }
         const originalAcceptActionId = authorizeAction.object.id;
         if (typeof originalAcceptActionId !== 'string' || originalAcceptActionId === '') {
             throw new factory.errors.NotFound('authorizeAction.object.id');
@@ -77,15 +80,15 @@ function changeOffers(params) {
             'superEvent', 'typeOf', 'identifier', 'name'
         ] // optimize(2024-07-18~)
         );
-        const availablePaymentMethodTypes = yield repos.categoryCode.search({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, [], []);
-        const seatingTypes = yield repos.categoryCode.search({
+        const seatingTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         }, [], []);
-        const videoFormatTypes = yield repos.categoryCode.search({
+        const videoFormatTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
         }, [], []);
@@ -153,12 +156,17 @@ function changeOffers(params) {
             }
             throw error;
         }
-        // 座席予約承認アクションの供給情報を変更する
-        return repos.action.updateAuthorizeEventOfferAction({
+        // 承認アクションを再完了
+        yield repos.action.reCompleteAuthorizeEventOfferAction({
             id: params.id,
             object: authorizeAction.object,
             result: actionResult
         });
+        return {
+            id: params.id,
+            instrument: authorizeAction.instrument,
+            result: actionResult
+        };
     });
 }
 exports.changeOffers = changeOffers;

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

@@ -1,12 +1,15 @@
+import type * as COAService from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
-export type IAcceptedOffer4COA = factory.action.authorize.offer.eventService.IAcceptedOffer4COA;
+export type IAcceptedOffer4COA = factory.action.accept.coaOffer.IAcceptedOffer4COA;
+export type IRequestBody = COAService.factory.reserve.IUpdTmpReserveSeatArgs;
+export type IResponseBody = COAService.factory.reserve.IUpdTmpReserveSeatResult;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
+    acceptedOffers: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
     event: {
         id: string;
         typeOf: factory.eventType.ScreeningEvent;
@@ -21,13 +24,13 @@ export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
     eligibleMonetaryAmount: factory.offer.IEligibleMonetaryAmount[];
 };
-type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;
+type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IReservation>;
 /**
  * COA仮予約結果から注文アイテムを生成する
  */
 export declare function responseBody2acceptedOffers4result(params: {
-    responseBody: factory.action.authorize.offer.eventService.IResponseBody<factory.service.webAPI.Identifier.COA>;
-    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
+    responseBody: IResponseBody;
+    acceptedOffer: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.d.ts

@@ -1,7 +1,7 @@
 import * as factory from '../../../factory';
 import type { OfferRepo } from '../../../repo/offer';
 import { IAcceptedOffer4COA } from './factory';
-export type IAcceptedOfferBeforeAuthorize4COA = factory.action.authorize.offer.eventService.IAcceptedOfferBeforeAuthorize4COA;
+export type IAcceptedOfferBeforeAuthorize4COA = factory.action.accept.coaOffer.IAcceptedOfferBeforeAuthorize4COA;
 /**
  * 受け入れらたオファーの内容を検証
  */

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.js

@@ -98,12 +98,44 @@ function createPriceComponent(params) {
             eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
         }
     }
-    const accountsReceivable = (ticketInfo.mvtkAppPrice > 0) ? ticketInfo.mvtkAppPrice : ticketInfo.stdPrice;
-    const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price: Number(ticketInfo.stdPrice), priceCurrency: factory.priceCurrency.JPY, referenceQuantity: {
-            typeOf: 'QuantitativeValue',
-            unitCode: factory.unitCode.C62,
-            value: 1
-        }, valueAddedTaxIncluded: true, accounting: {
+    const { disPrice, limitCount, stdPrice } = ticketInfo;
+    if (typeof stdPrice !== 'number') {
+        throw new factory.errors.Argument('ticketInfo.stdPrice', 'must be number');
+    }
+    const accountsReceivable = (ticketInfo.mvtkAppPrice > 0) ? ticketInfo.mvtkAppPrice : stdPrice;
+    // const maxPrice: number = stdPrice;
+    let price = stdPrice;
+    // support disPrice(2024-09-02~)
+    if (typeof disPrice === 'number' && disPrice > 0) {
+        price -= disPrice;
+    }
+    let referenceQuantity = {
+        typeOf: 'QuantitativeValue',
+        unitCode: factory.unitCode.C62,
+        value: 1
+    };
+    switch (ticketInfo.limitUnit) {
+        case '001':
+            referenceQuantity = {
+                typeOf: 'QuantitativeValue',
+                unitCode: factory.unitCode.C62,
+                value: Number(limitCount)
+            };
+            price = Number(limitCount) * price;
+            break;
+        case '002':
+            referenceQuantity = {
+                typeOf: 'QuantitativeValue',
+                unitCode: factory.unitCode.C62,
+                value: 1,
+                minValue: Number(limitCount)
+            };
+            break;
+        default:
+        // no op
+        // referenceQuantity.value = 1;
+    }
+    const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price, priceCurrency: factory.priceCurrency.JPY, referenceQuantity, valueAddedTaxIncluded: true, accounting: {
             typeOf: 'Accounting',
             accountsReceivable
         } }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
@@ -114,17 +146,6 @@ function createPriceComponent(params) {
             ]
         }
         : undefined);
-    switch (ticketInfo.limitUnit) {
-        case '001':
-            unitPriceSpec.referenceQuantity.value = Number(ticketInfo.limitCount);
-            unitPriceSpec.price = Number(ticketInfo.limitCount) * Number(ticketInfo.stdPrice);
-            break;
-        case '002':
-            unitPriceSpec.referenceQuantity.minValue = Number(ticketInfo.limitCount);
-            break;
-        default:
-            unitPriceSpec.referenceQuantity.value = 1;
-    }
     // 区分加算料金
     const categoryCodeChargeSpecs = [];
     // movieTicketTypeChargePriceSpecにaddPriceが含まれる場合は除く

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -16,7 +16,7 @@ const MoneyTransferAssetTransactionService = require("../../assetTransaction/mon
 const any_1 = require("../any");
 function authorize(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['seller', 'project', 'agent', 'typeOf']);

package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js

@@ -16,7 +16,7 @@ function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let transaction;
         if (params.agent !== undefined && params.agent !== null && typeof params.agent.id === 'string') {
-            transaction = (yield repos.transaction.findInProgressById({
+            transaction = (yield repos.transaction.projectFieldsInProgressById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             }, ['typeOf']));

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

@@ -19,9 +19,7 @@ function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // プロダクト検索
-        // const productWithOffers = <Pick<factory.product.IProduct, 'hasOfferCatalog' | 'project'>>
-        //     await repos.product.findProductById({ id: params.itemOffered.id }, ['hasOfferCatalog', 'project'], []);
-        const productWithOffers = (yield repos.product.searchProducts({
+        const productWithOffers = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.itemOffered.id }

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

@@ -68,7 +68,7 @@ export declare function search(params: {
     productOffer: ProductOfferRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];
-    product: Omit<factory.product.IProduct, "offers">;
+    product: factory.product.IProduct;
 }>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**
@@ -93,7 +93,9 @@ export declare function authorize(params: {
     transaction: {
         id: string;
     };
-}): IAuthorizeOperation<IAuthorizeOfferAction>;
+}): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id'> & {
+    result: IAuthorizeOfferAction['result'];
+}>;
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidRegisterServiceTransaction>): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -27,7 +27,7 @@ function search(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = moment();
-        const searchProductsResult = yield repos.product.searchProducts({
+        const searchProductsResult = yield repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -89,7 +89,7 @@ function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
@@ -127,7 +127,6 @@ function authorize(params) {
         const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
             startDate: new Date()
         });
-        // 承認アクション開始
         const actionAttributes = (0, factory_1.createActionAttributes)({
             acceptedOffer: acceptedOffer,
             transaction: transaction,
@@ -147,8 +146,10 @@ function authorize(params) {
             });
             requestBody = startParams;
             responseBody = yield RegisterServiceTransaction.start(startParams)(repos);
-            const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({ project: action.project, responseBody, acceptedOffer });
-            result = (0, factory_1.createResult)({ project: action.project, requestBody, responseBody, acceptedOffer });
+            const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({
+                project: actionAttributes.project, responseBody, acceptedOffer
+            });
+            result = (0, factory_1.createResult)({ project: actionAttributes.project, requestBody, responseBody, acceptedOffer });
             yield (0, any_1.acceptOffer)({
                 project: transaction.project,
                 purpose: { id: transaction.id },
@@ -164,7 +165,8 @@ function authorize(params) {
             }
             throw error;
         }
-        return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        return { id: action.id, result };
     });
 }
 exports.authorize = authorize;
@@ -172,7 +174,7 @@ function fixProductAndOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const productId = String((_b = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id);
-        const searchProductsResult = yield repos.product.searchProducts({
+        const searchProductsResult = yield repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -189,7 +191,7 @@ function fixProductAndOffers(params) {
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['agent', 'status', 'typeOf']);
@@ -344,9 +346,7 @@ function checkIfRegistered(params) {
         // メンバーシップについては、登録済かどうか確認する
         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
             // プロダクトによって発行されたPermitを所有していれば、登録済
-            const searchOwnershipInfosResult = yield repos.ownershipInfo.search({
-                // iss: params.iss,
-                // project: { id: { $eq: params.project.id } },
+            const searchOwnershipInfosResult = yield repos.ownershipInfo.projectFields({
                 limit: 1,
                 page: 1,
                 ownedBy: { id: params.agent.id },
@@ -359,7 +359,7 @@ function checkIfRegistered(params) {
                 },
                 ownedFrom: params.now,
                 ownedThrough: params.now
-            });
+            }, []);
             const ownershipInfos = searchOwnershipInfosResult;
             if (ownershipInfos.length > 0) {
                 // Already registered

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

@@ -13,7 +13,7 @@ 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({
+        const placeOrderTransactions = yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

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

@@ -7,5 +7,5 @@ import * as factory from '../../../../factory';
  */
 declare function createOnOrderCancelledTasksByTransaction(params: {
     transaction?: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
-}): (import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | 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/createAccountingReport").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/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)[];
+}): (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/createAccountingReport").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/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/onOrderDeliveredPartially/factory.d.ts

@@ -13,5 +13,5 @@ declare function createInformTasks(params: {
 }, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
-}): (import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | 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/createAccountingReport").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/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)[];
+}): (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/createAccountingReport").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/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 { createInformTasks, createNextSendOrderTasks, IInTransitOrder };

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

@@ -80,7 +80,7 @@ function createSendOrderTaskIfNotExist(params) {
 function createOnAuthorizationCreatedTask(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const placeOrderTransaction = (yield repos.transaction.search({
+        const placeOrderTransaction = (yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.PlaceOrder,

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

@@ -8,5 +8,5 @@ declare function createInformTasks(order: IReturnedOrder, settings: Settings): f
 declare function createOnOrderReturnedTasksByTransaction(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | 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/createAccountingReport").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/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)[];
+}): (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/createAccountingReport").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/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 { createInformTasks, createOnOrderReturnedTasksByTransaction };

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

@@ -19,7 +19,7 @@ function createPlacingOrderFromExistingTransaction(params) {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
         let order;
-        const placeOrderTransactions = yield repos.transaction.search({
+        const placeOrderTransactions = yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -43,7 +43,7 @@ function createPlacingOrderFromExistingTransaction(params) {
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = yield repos.action.search({
+                authorizePaymentActions = (yield repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
                         typeOf: { $in: [factory.transactionType.PlaceOrder] },
@@ -51,7 +51,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                     },
                     object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['result'], []);
+                }, ['result'], []));
                 authorizeOfferActionsWithInstrument = (yield repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {

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

@@ -70,7 +70,7 @@ function placeOrder(params) {
                 id: { $in: [orderActionPurpose.id] },
                 typeOf: { $in: [orderActionPurpose.typeOf] }
             }
-        }, ['_id'], []);
+        }, ['id'], []);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {

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

@@ -44,7 +44,7 @@ function returnOrder(params) {
                 throw new factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
         }
         // 返品取引検索
-        const returnOrderTransactions = yield repos.transaction.search({
+        const returnOrderTransactions = yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: order.project.id } },

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

@@ -33,4 +33,4 @@ export declare function createAuthorizeResult(params: {
 /**
  * 通知対象としてのアクションを最適化
  */
-export declare function optimizeAction4inform(action: factory.action.trade.pay.IAction | factory.action.trade.refund.IAction): IOnPaymentStatusChangedParams;
+export declare function optimizeAction4inform(action: Pick<factory.action.trade.pay.IAction, 'id' | 'object' | 'project' | 'typeOf'> | Pick<factory.action.trade.refund.IAction, 'id' | 'object' | 'project' | 'typeOf'>): IOnPaymentStatusChangedParams;

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

@@ -8,7 +8,7 @@ import type { TaskRepo } from '../../../repo/task';
 /**
  * 決済後のアクション
  */
-declare function onPaid(payAction: factory.action.trade.pay.IAction): (repos: {
+declare function onPaid(payAction: Pick<factory.action.trade.pay.IAction, 'actionStatus' | 'id' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf'>): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;

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

@@ -8,7 +8,7 @@ import type { TaskRepo } from '../../../repo/task';
 /**
  * 返金後のアクション
  */
-declare function onRefund(refundAction: factory.action.trade.refund.IAction): (repos: {
+declare function onRefund(refundAction: Pick<factory.action.trade.refund.IAction, 'actionStatus' | 'id' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf'>): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;

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

@@ -1,14 +1,11 @@
 import * as factory from '../../../factory';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { TicketRepo } from '../../../repo/ticket';
-type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
-    ticketToken?: string;
-};
 declare function verifyTicketTokenAsNeeded(params: {
     project: {
         id: string;
     };
-    object: IObjectWithoutDetail;
+    object: Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'ticketToken'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
 }): (repos: {

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js

@@ -15,20 +15,19 @@ function verifyTicketTokenAsNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const { paymentServiceType, object, project } = params;
-        const { ticketToken } = object;
+        const { issuedThrough, ticketToken } = object;
         let permit;
-        switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.CreditCard:
-            case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-                if (typeof ticketToken === 'string' && ticketToken !== '') {
-                    let authorizedObject;
-                    const ticket = (yield repos.ticket.search({
+        // メンバーシップチケットが指定された場合、メンバーシップコードへ変換する
+        if (typeof ticketToken === 'string' && ticketToken !== '') {
+            switch (paymentServiceType) {
+                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                    const ticket = (yield repos.ticket.projectFields({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },
                         ticketToken: { $eq: ticketToken }
-                    })).shift();
+                    }, ['ticketToken'])).shift();
                     if (ticket === undefined) {
                         throw new factory.errors.NotFound('Ticket');
                     }
@@ -37,7 +36,7 @@ function verifyTicketTokenAsNeeded(params) {
                         project: { id: params.project.id },
                         code: ticket.ticketToken
                     });
-                    authorizedObject = validAuthorization.object;
+                    const authorizedObject = validAuthorization.object;
                     if (authorizedObject.typeOf !== 'OwnershipInfo') {
                         throw new factory.errors.Argument('ticketToken', 'must be OwnershipInfo');
                     }
@@ -46,29 +45,25 @@ function verifyTicketTokenAsNeeded(params) {
                         || validAuthorization.audience.id !== params.purpose.id) {
                         throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
                     }
-                    const permitOwnershipInfo = authorizedObject;
-                    // const ownershipInfoId = authorizedObject.id;
-                    // const permitOwnershipInfo = (await repos.ownershipInfo.search({
-                    //     limit: 1,
-                    //     page: 1,
-                    //     project: { id: { $eq: params.project.id } },
-                    //     ids: [ownershipInfoId]
-                    // })).shift();
-                    // if (permitOwnershipInfo === undefined) {
-                    //     throw new factory.errors.NotFound('OwnershipInfo');
-                    // }
-                    const { typeOfGood } = permitOwnershipInfo;
+                    const { typeOfGood } = authorizedObject;
                     if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                         throw new factory.errors.Argument('ticketToken', 'must be Permit');
                     }
                     if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
                         throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
                     }
+                    // CreditCardの場合、発行サービスIDを検証
+                    if (typeOfGood.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                        if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                            throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                        }
+                    }
                     permit = { identifier: typeOfGood.identifier };
-                }
-                break;
-            default:
-            // no op
+                    break;
+                default:
+                    // no op
+                    throw new factory.errors.NotImplemented(`ticketToken issued through ${paymentServiceType} not implemented`);
+            }
         }
         return { permit };
     });

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

@@ -95,9 +95,11 @@ type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings, crede
 interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    authorization: AuthorizationRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -115,7 +117,7 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'ticketToken'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;