@chevre/domain 24.0.0-alpha.5 → 24.0.0-alpha.50

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

@@ -32,18 +32,26 @@ const factory = __importStar(require("../../../factory"));
  */
 function authorizeByAcceptAction(params) {
     return async (repos) => {
-        const acceptAction = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            id: { $in: [params.object.id] },
-            typeOf: { $eq: factory.actionType.AcceptAction },
-            purpose: { id: { $in: [params.purpose.id] } },
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
-        }, ['result', 'object', 'potentialActions'])).shift();
-        if (acceptAction === undefined) {
-            throw new factory.errors.NotFound(factory.actionType.AcceptAction);
-        }
+        // const acceptAction = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: params.project.id } },
+        //         id: { $in: [params.object.id] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction },
+        //         purpose: { id: { $in: [params.purpose.id] } },
+        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
+        //     },
+        //     ['result', 'object', 'potentialActions']
+        // )).shift();
+        // if (acceptAction === undefined) {
+        //     throw new factory.errors.NotFound(factory.actionType.AcceptAction);
+        // }
+        const acceptAction = await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: params.project.id },
+            id: params.object.id,
+            purpose: { id: params.purpose.id },
+        }, ['result', 'object', 'potentialActions']);
         const acceptResult = acceptAction.result;
         if (acceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
@@ -67,7 +75,7 @@ function authorizeByAcceptAction(params) {
         }
         else {
             // recipe依存へ変更(2024-06-11~)
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: params.object.id }
             });

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

@@ -17,7 +17,7 @@ export declare function changeOffers(params: {
     transaction: {
         id: string;
     };
-    options: {};
+    options: Record<string, never>;
 }): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
     result: IAuthorizeOfferAction['result'];
 }>;

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

@@ -32,19 +32,20 @@ const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
 const factory = __importStar(require("../../../factory"));
+// type IAcceptAction = Pick<factory.action.accept.coaOffer.IAction, 'result'>;
 /**
  * COA興行オファー承認のオファーを変更
  */
 function changeOffers(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['typeOf', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');
@@ -61,13 +62,21 @@ function changeOffers(params) {
         if (typeof originalAcceptActionId !== 'string' || originalAcceptActionId === '') {
             throw new factory.errors.NotFound('authorizeAction.object.id');
         }
-        const originalAcceptResult = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: authorizeAction.project.id } },
-            id: { $in: [originalAcceptActionId] },
-            typeOf: { $eq: factory.actionType.AcceptAction }
-        }, ['result'])).shift()?.result;
+        // const originalAcceptResult = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: authorizeAction.project.id } },
+        //         id: { $in: [originalAcceptActionId] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction }
+        //     },
+        //     ['result']
+        // )).shift()?.result;
+        const originalAcceptResult = (await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: authorizeAction.project.id },
+            id: originalAcceptActionId,
+            purpose: { id: authorizeAction.purpose.id },
+        }, ['result'])).result;
         if (originalAcceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
         }
@@ -126,7 +135,7 @@ function changeOffers(params) {
         // authorizeAction.object.acceptedOffer = acceptedOffers; // discontinue acceptedOffers(2024-06-21~)
         // recipe依存へ変更(2024-06-11~)
         // const updTmpReserveSeatResult = authorizeAction.result?.responseBody;
-        const recipe = await repos.action.findRecipeByAction({
+        const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
             project: { id: transaction.project.id },
             recipeFor: { id: originalAcceptActionId }
         });

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
@@ -35,7 +35,7 @@ declare function findAcceptAction(params: {
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action: AcceptCOAOfferActionRepo;
     task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction };

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

@@ -53,7 +53,7 @@ function findAcceptAction(params) {
         switch (task.status) {
             case factory.taskStatus.Ready:
                 break;
-            default:
+            default: {
                 // タスクがReadyでなければアクション検索
                 const acceptAction = (await repos.action.searchBySameAs({
                     sameAs: { id: { $eq: task.id } },
@@ -77,6 +77,7 @@ function findAcceptAction(params) {
                             : undefined
                     };
                 }
+            }
         }
         return action;
     };

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

@@ -4,26 +4,26 @@ export declare function createRegisterServiceStartParams(params: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
-    object: factory.action.authorize.offer.product.IObject;
+    object: factory.action.authorize.offer.product.IAcceptedOffer[];
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType>, 'seller' | 'expires'>;
     transactionNumber: string;
 }): factory.assetTransaction.registerService.IStartParamsWithoutDetail;
 export declare function createActionAttributes(params: {
-    acceptedOffer: factory.action.authorize.offer.product.IObject;
+    acceptedOffer: factory.action.authorize.offer.product.IAcceptedOffer[];
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     transactionNumber: string;
 }): factory.action.authorize.offer.product.IAttributes;
 export declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer;
 }): number;
-type IResultAcceptedOffer = factory.action.authorize.offer.product.IResultAcceptedOffer;
+type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IPermit>[];
 export declare function responseBody2resultAcceptedOffer(params: {
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
     responseBody: factory.assetTransaction.registerService.ITransaction;
-    acceptedOffer: factory.action.authorize.offer.product.IObject;
+    acceptedOffer: factory.action.authorize.offer.product.IAcceptedOffer[];
 }): IResultAcceptedOffer;
 export declare function createResult(params: {
     project: {
@@ -32,6 +32,6 @@ export declare function createResult(params: {
     };
     requestBody: factory.assetTransaction.registerService.IStartParamsWithoutDetail;
     responseBody: factory.assetTransaction.registerService.ITransaction;
-    acceptedOffer: factory.action.authorize.offer.product.IObject;
+    acceptedOffer: factory.action.authorize.offer.product.IAcceptedOffer[];
 }): factory.action.authorize.offer.product.IResult;
 export {};

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

@@ -79,6 +79,13 @@ function createRegisterServiceStartParams(params) {
 }
 function createActionAttributes(params) {
     const transaction = params.transaction;
+    const actionObject = {
+        typeOf: factory.action.authorize.offer.product.ObjectType.AggregateOffer,
+        itemOffered: {
+            id: params.acceptedOffer[0].itemOffered.id,
+            typeOf: params.acceptedOffer[0].itemOffered.typeOf
+        }
+    };
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
@@ -86,7 +93,8 @@ function createActionAttributes(params) {
             typeOf: factory.assetTransactionType.RegisterService,
             transactionNumber: params.transactionNumber
         },
-        object: params.acceptedOffer,
+        // object: params.acceptedOffer,
+        object: actionObject, // optimize(2026-03-13~)
         agent: {
             id: transaction.seller.id,
             typeOf: transaction.seller.typeOf,
@@ -199,7 +207,7 @@ function responseBody2resultAcceptedOffer(params) {
             const permitAcceptedOffer = {
                 typeOf: responseBodyObject.typeOf,
                 id: offer.id,
-                name: offer.name,
+                // name: offer.name,
                 itemOffered,
                 priceSpecification,
                 serialNumber: params.responseBody.transactionNumber
@@ -214,10 +222,10 @@ function createResult(params) {
     // 金額計算
     const amount = acceptedOffers2amount({ acceptedOffers: acceptedOffers4result });
     return {
+        typeOf: factory.offerType.AggregateOffer,
         price: amount,
         priceCurrency: factory.priceCurrency.JPY,
-        // acceptedOffers: acceptedOffers4result, // discontinue(2024-06-17~)
-        requestBody: params.requestBody,
-        responseBody: params.responseBody
+        // requestBody: params.requestBody, // discontinue(2026-03-13~)
+        // responseBody: params.responseBody // discontinue(2026-03-13~)
     };
 }

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

@@ -1,6 +1,6 @@
 import * as factory from '../../factory';
 import type { AccountRepo } from '../../repo/account';
-import type { ActionRepo } from '../../repo/action';
+import type { AuthorizeProductOfferActionRepo } from '../../repo/action/authorizeProductOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { OfferRepo } from '../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../repo/offerCatalog';
@@ -11,11 +11,12 @@ import type { ProductRepo } from '../../repo/product';
 import type { ProjectRepo } from '../../repo/project';
 import type { ServiceOutputRepo } from '../../repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 export interface IAuthorizeOperationRepos {
     account: AccountRepo;
-    action: ActionRepo;
+    action?: never;
+    authorizeProductOfferAction: AuthorizeProductOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -26,7 +27,7 @@ export interface IAuthorizeOperationRepos {
     project: ProjectRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeOperationRepos) => Promise<T>;
@@ -76,7 +77,7 @@ export declare function authorize(params: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
-    object: factory.action.authorize.offer.product.IObject;
+    object: factory.action.authorize.offer.product.IAcceptedOffer[];
     agent: {
         id: string;
         typeOf: factory.personType.Person | factory.creativeWorkType.WebApplication;
@@ -94,7 +95,8 @@ export declare function authorize(params: {
     result: IAuthorizeOfferAction['result'];
 }>;
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidRegisterServiceTransaction>): (repos: {
-    action: ActionRepo;
+    action?: never;
+    authorizeProductOfferAction: AuthorizeProductOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

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

@@ -31,7 +31,7 @@ const factory = __importStar(require("../../factory"));
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 const availableProductTypes_1 = require("../../factory/availableProductTypes");
 const RegisterServiceTransaction = __importStar(require("../assetTransaction/registerService"));
-const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("./any");
 const factory_1 = require("./product/factory");
 const searchProductOffers_1 = require("./product/searchProductOffers");
@@ -99,7 +99,7 @@ function search(params) {
 function authorize(params) {
     return async (repos) => {
         const now = new Date();
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
@@ -117,7 +117,7 @@ function authorize(params) {
             })(repos);
         }
         // ポイント特典の識別子に利用するため注文番号を先に発行
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
@@ -128,7 +128,7 @@ function authorize(params) {
             availableOffers,
             seller: transaction.seller,
             orderNumber
-        })(repos);
+        })({});
         acceptedOffer = await createServiceOutputIdentifier({ acceptedOffer, product })(repos);
         let requestBody;
         let responseBody;
@@ -142,7 +142,7 @@ function authorize(params) {
             transaction: transaction,
             transactionNumber: transactionNumber
         });
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.authorizeProductOfferAction.start(actionAttributes);
         try {
             // 会員の場合のみ排他ロック
             // if (params.agent.typeOf === factory.personType.Person) {
@@ -168,14 +168,14 @@ function authorize(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.authorizeProductOfferAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
             }
             throw error;
         }
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.authorizeProductOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
     };
 }
@@ -214,7 +214,7 @@ function fixProductAndOffers(params) {
 }
 function voidTransaction(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['agent', 'status', 'typeOf']);
@@ -230,28 +230,32 @@ function voidTransaction(params) {
         }
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+            const action = await repos.authorizeProductOfferAction.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
             if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
                 throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
             }
             authorizeActions = [action];
         }
         else {
-            authorizeActions = await repos.action.searchByPurpose({
-                typeOf: factory.actionType.AuthorizeAction,
+            authorizeActions = await repos.authorizeProductOfferAction.findAuthorizeProductOfferActionsByPurpose({
+                // typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
                     typeOf: params.purpose.typeOf,
                     id: params.purpose.id
                 }
             })
                 .then((actions) => actions
-                .filter((a) => Array.isArray(a.object)
-                && a.object.length > 0
-                && a.object[0].typeOf === factory.offerType.Offer
-                && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0));
+                .filter((a) => 
+            // Array.isArray(a.object)
+            // && a.object.length > 0
+            // && a.object[0].typeOf === factory.offerType.Offer
+            // && availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0
+            a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
+                && availableProductTypes_1.availableProductTypes.indexOf(a.object.itemOffered.typeOf) >= 0));
         }
         await Promise.all(authorizeActions.map(async (action) => {
-            const productId = action.object[0]?.itemOffered?.id;
+            // const productId = action.object[0]?.itemOffered?.id;
+            const productId = action.object?.itemOffered?.id;
             if (typeof productId === 'string') {
                 // 廃止(2023-12-07~)
                 // await processUnlockRegisterMembershipService({
@@ -260,7 +264,7 @@ function voidTransaction(params) {
                 //     purpose: params.purpose
                 // })(repos);
             }
-            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            await repos.authorizeProductOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             await processVoidRegisterServiceTransaction({
                 action,
                 project: params.project

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

@@ -5,9 +5,8 @@ import type { StockHolderRepo } from '../repo/stockHolder';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
 import * as EventServiceByCOAOfferService from './offer/eventServiceByCOA';
-import * as MoneyTransferOfferService from './offer/moneyTransfer';
 import * as ProductOfferService from './offer/product';
-export { EventOfferService as event, EventServiceByCOAOfferService as eventServiceByCOA, MoneyTransferOfferService as moneyTransfer, ProductOfferService as product };
+export { EventOfferService as event, EventServiceByCOAOfferService as eventServiceByCOA, ProductOfferService as product };
 type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'name' | 'seatingType'> & {
     containedInPlace?: {
         branchCode?: string;

package/lib/chevre/service/offer.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+exports.product = exports.eventServiceByCOA = exports.event = void 0;
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
 exports.findEventSeatOffersBySection = findEventSeatOffersBySection;
 const moment_1 = __importDefault(require("moment"));
@@ -35,8 +35,6 @@ const EventOfferService = __importStar(require("./offer/event"));
 exports.event = EventOfferService;
 const EventServiceByCOAOfferService = __importStar(require("./offer/eventServiceByCOA"));
 exports.eventServiceByCOA = EventServiceByCOAOfferService;
-const MoneyTransferOfferService = __importStar(require("./offer/moneyTransfer"));
-exports.moneyTransfer = MoneyTransferOfferService;
 const ProductOfferService = __importStar(require("./offer/product"));
 exports.product = ProductOfferService;
 /**
@@ -47,13 +45,15 @@ function searchEventSeatOffersWithPaging(params) {
         const { includeSectionCodeOnlyFirstElement, useDefaultSection } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
-        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer', 'location', 'superEvent']);
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = event.location.branchCode;
+            const movieTheaterBranchCode = event.superEvent.location.branchCode;
             let defaultSectionCode;
             if (useDefaultSection) {
                 const defaultSection = (await repos.section.findSectionsByRoom({
@@ -161,7 +161,7 @@ function findEventSeatOffersBySection(params) {
             organizer: { id: { $eq: sellerId } },
             id: { $eq: eventId },
             typeOf: factory.eventType.ScreeningEvent
-        }, ['startDate', 'offers.itemOffered'])).shift();
+        }, ['startDate', 'offers.itemOffered', 'location', 'superEvent'])).shift();
         if (event === undefined) {
             throw new factory.errors.NotFound(factory.eventType.ScreeningEvent);
         }
@@ -169,8 +169,10 @@ function findEventSeatOffersBySection(params) {
         const eventOffers = event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = event.location.branchCode;
+            const movieTheaterBranchCode = event.superEvent.location.branchCode;
             const seats = await repos.seat.projectSeatsByScreeningRoom({
                 limit,
                 page,

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

@@ -7,13 +7,12 @@ import type { EventRepo } from '../../repo/event';
 import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
 declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction> & {
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
-}, options: {}): (repos: {
+}, options: Record<string, never>): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -22,6 +21,5 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
     event: EventRepo;
     project: ProjectRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
 }) => Promise<void>;
 export { confirmPayTransaction };

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

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = confirmPayTransaction;
 const factory = __importStar(require("../../factory"));
+// import type { TransactionRepo } from '../../repo/transaction';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
 function confirmPayTransaction(data, options) {
     return async (repos) => {

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

@@ -119,7 +119,7 @@ function deleteReservationsByOrder(order) {
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
             acceptedOffers: {
-                itemOffered: { typeOf: { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] } }
+                itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
         });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
@@ -147,7 +147,7 @@ function deleteOwnershipInfosByOrder(order) {
                 project: { id: order.project.id },
                 identifiers: ownershipIdentifiers,
                 // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-                ownedThrough: { $lt: now }
+                ownedThrough: { $lte: now }
             });
         }
     };

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

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

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

@@ -27,7 +27,7 @@ exports.findPlaceOrderTransaction = findPlaceOrderTransaction;
 const factory = __importStar(require("../../factory"));
 function findPlaceOrderTransaction(params) {
     return async (repos) => {
-        const placeOrderTransactions = await repos.transaction.projectFields({
+        const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/order/onAssetTransactionStatusChanged/isDeliverable.d.ts

@@ -0,0 +1,16 @@
+import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { OrderRepo } from '../../../repo/order';
+import * as factory from '../../../factory';
+declare function isDeliverable(params: {
+    project: {
+        id: string;
+    };
+    orderNumber: string;
+    assetTransactionType: factory.assetTransactionType.Reserve | factory.assetTransactionType.MoneyTransfer | factory.assetTransactionType.RegisterService;
+}): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}) => Promise<boolean>;
+export { isDeliverable };