@chevre/domain 22.7.0-alpha.9 → 22.7.0

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre/requestedProgramMembershipUsed2permit.js

@@ -11,51 +11,55 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestedProgramMembershipUsed2permit = void 0;
 const factory = require("../../../../../factory");
-const CodeService = require("../../../../code");
 /**
  * チケット化された適用メンバーシップをPermitに変換する
  */
 function requestedProgramMembershipUsed2permit(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
-        // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
+        // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof programMembershipUsed === 'string') {
-            const { authorizedObject } = yield CodeService.verifyToken({
-                project: { id: params.project.id },
-                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-                token: String(programMembershipUsed)
-            })(repos, credentials);
-            const permitOwnershipInfo = authorizedObject;
-            if (Array.isArray(permitOwnershipInfo)) {
-                throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
-            }
-            if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
-                throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
-            }
-            const typeOfGood = permitOwnershipInfo.typeOfGood;
-            if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
-            }
-            const issuedThroughTypeOf = (_a = typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
-            if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
-                throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
-            }
-            if (typeof ((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
-                throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-            }
-            if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
-                programMembershipUsedAsPermit = {
-                    identifier: typeOfGood.identifier,
-                    issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
-                    typeOf: factory.permit.PermitType.Permit
-                };
-            }
-            else {
-                throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
-            }
+            throw new factory.errors.NotImplemented('programMembershipUsed as string not implemented');
+            // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
+            // const { authorizedObject } = await CodeService.verifyToken({
+            //     project: { id: params.project.id },
+            //     agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            //     token: String(programMembershipUsed)
+            // })(repos);
+            // const permitOwnershipInfo = authorizedObject;
+            // if (Array.isArray(permitOwnershipInfo)) {
+            //     throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
+            // }
+            // if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
+            //     throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
+            // }
+            // const typeOfGood = permitOwnershipInfo.typeOfGood;
+            // if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+            //     throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
+            // }
+            // const issuedThroughTypeOf = typeOfGood.issuedThrough?.typeOf;
+            // if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
+            //     throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
+            // }
+            // if (typeof typeOfGood.issuedThrough?.id !== 'string') {
+            //     throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
+            // }
+            // if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
+            //     programMembershipUsedAsPermit = {
+            //         identifier: typeOfGood.identifier,
+            //         issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+            //         typeOf: factory.permit.PermitType.Permit
+            //     };
+            // } else {
+            //     throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+            // }
         }
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
@@ -97,7 +101,7 @@ function requestedProgramMembershipUsed2permit(params) {
                 if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                     throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
                 }
-                const issuedThroughTypeOf = (_c = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.typeOf;
+                const issuedThroughTypeOf = (_a = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
                 if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
                     programMembershipUsedAsPermit = {
                         identifier: permitOwnershipInfo.typeOfGood.identifier,
@@ -107,7 +111,7 @@ function requestedProgramMembershipUsed2permit(params) {
                 }
                 else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
                     || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                    if (typeof ((_d = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _d === void 0 ? void 0 : _d.id) !== 'string') {
+                    if (typeof ((_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
                         throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
                     }
                     programMembershipUsedAsPermit = {

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -1,6 +1,5 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
-import type { JWTCredentials } from '../../../../credentials/jwt';
 import type { ActionRepo } from '../../../../repo/action';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
@@ -59,9 +58,7 @@ declare function processStartReserve4chevre(params: {
     task: TaskRepo;
     ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;
-}, settings: Settings, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<{
+}, settings: Settings) => Promise<{
     acceptedOffers4result: IResultAcceptedOffer[];
 }>;
 export { processStartReserve4chevre };

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.js

@@ -15,7 +15,11 @@ const ReserveTransactionService = require("../../../assetTransaction/reserve");
 const factory_1 = require("./factory");
 const requestedProgramMembershipUsed2permit_1 = require("./processStartReserve4chevre/requestedProgramMembershipUsed2permit");
 function processStartReserve4chevre(params, options) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
@@ -23,7 +27,7 @@ function processStartReserve4chevre(params, options) {
             // object: <IObjectWithDetail>action.object,
             acceptedOffers: params.acceptedOffers, event: { id: event.id }, transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
-        const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos, credentials);
+        const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos);
         const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 
             // discontinue preSearchedEvent(2024-07-17~)
             // preSearchedEvent: event,
@@ -43,7 +47,11 @@ function processStartReserve4chevre(params, options) {
 }
 exports.processStartReserve4chevre = processStartReserve4chevre;
 function validateObjectWithoutDetail(params, placeOrder) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
@@ -53,7 +61,7 @@ function validateObjectWithoutDetail(params, placeOrder) {
                     project: { id: params.project.id },
                     programMembershipUsed: (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed,
                     placeOrder: { id: placeOrder.id }
-                })(repos, credentials);
+                })(repos);
                 // 適用メンバーシップがあればacceptedOfferを強制的に上書き
                 if (programMembershipUsedAsPermit !== undefined) {
                     acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_c = acceptedOffer.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed: programMembershipUsedAsPermit }) }) });

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

@@ -1,6 +1,5 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { JWTCredentials } from '../../../credentials/jwt';
 import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
@@ -49,9 +48,7 @@ interface IAuthorizeRepos {
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
-type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<T>;
+type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail;
 interface IAuthorizeOptions {

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

@@ -20,7 +20,11 @@ const searchOffersByIds_1 = require("./searchOffersByIds");
  * 興行オファー承認
  */
 function authorize(params, options) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { noOfferSpecified } = options;
         const { transaction, event } = yield validateCreateRequest(params)(repos);
@@ -42,7 +46,7 @@ function authorize(params, options) {
         const action = yield repos.action.start(actionAttributes);
         try {
             const processStartReserveResult = yield (0, processStartReserve4chevre_1.processStartReserve4chevre)(Object.assign({ acceptedOffers, event,
-                transactionNumber, transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers, unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined), options)(repos, settings, credentials);
+                transactionNumber, transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers, unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined), options)(repos, settings);
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
             // add orderInTransaction(2024-01-15~)
             if (!noOfferSpecified) {

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

@@ -10,10 +10,11 @@ interface IAcceptRepos {
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }
-type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'potentialActions' | 'purpose'> & {
+type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'potentialActions' | 'purpose' | 'agent'> & {
     sameAs: {
         id: string;
     };
+    isMember: boolean;
 };
 /**
  * COA興行オファー採用

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

@@ -58,7 +58,8 @@ function acceptOffer(params) {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,
             object: params.object,
-            agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            // agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            agent: { id: params.agent.id, typeOf: params.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
             potentialActions: params.potentialActions,
@@ -76,7 +77,9 @@ function acceptOffer(params) {
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
                 identifier: params.object.appliesToSurfrock.identifier,
                 serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
-            }, params.object.flgMember)({
+            }, 
+            // params.object.flgMember
+            (params.isMember) ? factory.action.accept.coaOffer.FlgMember.Member : factory.action.accept.coaOffer.FlgMember.NonMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });
@@ -132,7 +135,8 @@ function reAcceptOffer(params) {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,
             object: params.object,
-            agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            // agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            agent: { id: params.agent.id, typeOf: params.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
             potentialActions: params.potentialActions,
@@ -148,7 +152,9 @@ function reAcceptOffer(params) {
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
                 identifier: params.object.appliesToSurfrock.identifier,
                 serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
-            }, params.object.flgMember)({
+            }, 
+            // params.object.flgMember
+            (params.isMember) ? factory.action.accept.coaOffer.FlgMember.Member : factory.action.accept.coaOffer.FlgMember.NonMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });

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

@@ -3,12 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
 function categoryCodeChargePriceSpec2component(params) {
-    var _a;
-    return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToCategoryCode: params.appliesToCategoryCode }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
+    return {
+        id: params.id,
+        typeOf: params.typeOf,
+        name: params.name,
+        price: params.price,
+        priceCurrency: params.priceCurrency,
+        valueAddedTaxIncluded: params.valueAddedTaxIncluded,
+        appliesToCategoryCode: params.appliesToCategoryCode
+        // ...(typeof params.accounting?.typeOf === 'string') ? { accounting: params.accounting } : undefined // 不要(2024-12-15~)
+    };
 }
 function mvtkChargePriceSpec2component(params) {
-    var _a;
-    return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToVideoFormat: params.appliesToVideoFormat, appliesToMovieTicket: params.appliesToMovieTicket }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
+    return {
+        id: params.id,
+        typeOf: params.typeOf,
+        name: params.name,
+        price: params.price,
+        priceCurrency: params.priceCurrency,
+        valueAddedTaxIncluded: params.valueAddedTaxIncluded,
+        appliesToVideoFormat: params.appliesToVideoFormat,
+        appliesToMovieTicket: params.appliesToMovieTicket
+        // ...(typeof params.accounting?.typeOf === 'string') ? { accounting: params.accounting } : undefined // 不要(2024-12-15~)
+    };
 }
 // tslint:disable-next-line:max-func-body-length
 function createCompoundPriceSpec4event(params) {
@@ -17,7 +34,6 @@ function createCompoundPriceSpec4event(params) {
     if (params.offer.priceSpecification === undefined) {
         throw new factory.errors.NotFound(`priceSpecification of the offer: ${params.offer.id}`);
     }
-    const unitPriceSpec = Object.assign(Object.assign({}, params.offer.priceSpecification), { name: params.offer.name });
     let videoFormatChargeSpecComponents = [];
     let soundFormatChargeSpecComponents = [];
     // 区分加算料金を適用しないオプションを追加(2023-01-26~)
@@ -26,6 +42,7 @@ function createCompoundPriceSpec4event(params) {
         videoFormatChargeSpecComponents = params.videoFormatChargeSpecs.map(categoryCodeChargePriceSpec2component);
         soundFormatChargeSpecComponents = params.soundFormatChargeSpecs.map(categoryCodeChargePriceSpec2component);
     }
+    const unitPriceSpec = Object.assign(Object.assign({}, params.offer.priceSpecification), { name: params.offer.name });
     const mvtkPriceComponents = [];
     // 複数決済カード対応(2022-07-11~)
     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {

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

@@ -1,6 +1,5 @@
 import type { EventRepo } from '../repo/event';
 import type { SeatRepo } from '../repo/place/seat';
-import type { PriceSpecificationRepo } from '../repo/priceSpecification';
 import type { StockHolderRepo } from '../repo/stockHolder';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
@@ -20,7 +19,12 @@ export declare function addOffers2Seat(params: {
      */
     priceSpecs: ICategoryCodeChargeSpecification[];
 }): factory.place.seat.IPlaceWithOffer;
-type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'containedInPlace' | 'offers' | 'seatingType' | 'typeOf' | 'name'>;
+type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'name' | 'seatingType'> & {
+    containedInPlace?: {
+        branchCode?: string;
+    };
+    offers?: Pick<factory.place.seat.IOffer, 'availability'>[];
+};
 /**
  * イベントに対する座席オファーを検索する
  */
@@ -39,15 +43,9 @@ export declare function searchEventSeatOffersWithPaging(params: {
         id: string;
     };
     $projection?: factory.place.seat.IProjection;
-    options: {
-        /**
-         * add option(2024-10-23~)
-         */
-        excludePriceSpecification: boolean;
-    };
+    options: {};
 }): (repos: {
     event: EventRepo;
-    priceSpecification: PriceSpecificationRepo;
     stockHolder: StockHolderRepo;
     seat: SeatRepo;
 }) => Promise<ISeatAsEventOffer[]>;

package/lib/chevre/service/offer.js

@@ -60,7 +60,7 @@ function searchEventSeatOffersWithPaging(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const { excludePriceSpecification } = params.options;
+        // const { excludePriceSpecification } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered']);
@@ -99,36 +99,37 @@ function searchEventSeatOffersWithPaging(params) {
                     })
                 });
                 // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                const uniqueSeatingTypes = yield repos.seat.aggregateSeatingTypes({
-                    project: { id: { $eq: event.project.id } },
-                    containedInPlace: {
-                        containedInPlace: {
-                            branchCode: { $eq: roomBranchCode },
-                            containedInPlace: { branchCode: { $eq: movieTheaterBranchCode } }
-                        }
-                    }
-                });
+                // const uniqueSeatingTypes = await repos.seat.aggregateSeatingTypes({
+                //     project: { id: { $eq: event.project.id } },
+                //     containedInPlace: {
+                //         containedInPlace: {
+                //             branchCode: { $eq: roomBranchCode },
+                //             containedInPlace: { branchCode: { $eq: movieTheaterBranchCode } }
+                //         }
+                //     }
+                // });
                 // 座席タイプ価格仕様を検索
-                let priceSpecs = [];
-                if (!excludePriceSpecification) {
-                    if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
-                        priceSpecs = yield repos.priceSpecification.search({
-                            project: { id: { $eq: event.project.id } },
-                            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                            appliesToCategoryCode: {
-                                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
-                                codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                            }
-                        });
-                    }
-                }
+                // let priceSpecs: ICategoryCodeChargeSpecification[] = [];
+                // if (!excludePriceSpecification) {
+                //     if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
+                //         priceSpecs =
+                //             await repos.priceSpecification.search<factory.priceSpecificationType.CategoryCodeChargeSpecification>({
+                //                 project: { id: { $eq: event.project.id } },
+                //                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                //                 appliesToCategoryCode: {
+                //                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
+                //                     codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
+                //                 }
+                //             });
+                //     }
+                // }
                 offers = seats.map((seat, index) => {
                     return addOffers2Seat({
                         seat,
                         availability: (typeof availabilities[index] === 'string')
                             ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
                             : factory.itemAvailability.InStock,
-                        priceSpecs
+                        priceSpecs: [] // priceSpecsをレスポンスから廃止(2024-12-22~)
                     });
                 });
             }

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

@@ -5,6 +5,8 @@ import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { ReservationRepo } from '../../repo/reservation';
+import type { SettingRepo } from '../../repo/setting';
+import type { TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
 /**
  * 注文に関わるリソースを削除する
@@ -20,5 +22,7 @@ declare function deleteOrder(params: {
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
+    task: TaskRepo;
 }) => Promise<void>;
 export { deleteOrder };

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

@@ -22,7 +22,7 @@ function deleteOrder(params) {
             limit: 1,
             page: 1,
             orderNumbers: [params.object.orderNumber]
-        }, { inclusion: ['orderDate', 'project', 'customer', 'orderNumber', 'seller'] });
+        }, { inclusion: ['orderDate', 'project', 'customer', 'orderNumber', 'seller', 'broker'] });
         const order = orders.shift();
         if (order === undefined) {
             // すでに削除済
@@ -50,15 +50,58 @@ function deleteOrder(params) {
                 typeOf: factory.order.OrderType.Order
             }
         });
-        // 終了済の関連イベントを削除(2023-08-16~)
-        // if (USE_DELETE_EVENT_BY_ORDER) {
-        //     await deleteEventsByOrder(order)(repos);
-        // }
         // 注文削除
         yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
+        // deletePerson(2024-12-25~)
+        yield deletePersonIfNecessary(order)(repos);
     });
 }
 exports.deleteOrder = deleteOrder;
+function deletePersonIfNecessary(order) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // 代理注文を除く
+        const isCustomerPerson = order.customer.typeOf === factory.personType.Person
+            && typeof ((_a = order.broker) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string';
+        if (isCustomerPerson) {
+            const ordersByPerson = yield repos.order.projectFields({
+                limit: 1,
+                page: 1,
+                customer: { ids: [order.customer.id] }
+            }, { inclusion: ['orderNumber'] });
+            if (ordersByPerson.length === 0) {
+                const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
+                if (typeof (setting === null || setting === void 0 ? void 0 : setting.userPoolIdNew) !== 'string') {
+                    throw new factory.errors.NotFound('setting.userPoolIdNew');
+                }
+                const deletePersonTask = {
+                    project: { typeOf: factory.organizationType.Project, id: order.project.id },
+                    name: factory.taskName.DeletePerson,
+                    status: factory.taskStatus.Ready,
+                    runsAt: new Date(),
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: {
+                        id: order.customer.id,
+                        agent: {
+                            id: order.project.id,
+                            typeOf: factory.organizationType.Project,
+                            name: factory.organizationType.Project
+                        },
+                        physically: true,
+                        userPoolId: setting.userPoolIdNew,
+                        // project: { id: order.project.id },
+                        migrate: false,
+                        useUsernameAsGMOMemberId: false,
+                        executeBackground: true
+                    }
+                };
+                yield repos.task.saveMany([deletePersonTask], { emitImmediately: true });
+            }
+        }
+    });
+}
 function deleteReservationsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({

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

@@ -27,7 +27,7 @@ export declare function creatPayTransactionStartParams(params: {
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
-    payTransaction: factory.assetTransaction.pay.ITransaction;
+    payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
     permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**

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

@@ -3,7 +3,6 @@
  */
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
-import type { JWTCredentials } from '../../credentials/jwt';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -91,9 +90,7 @@ interface IAuthorizeRepos {
     transactionNumber: TransactionNumberRepo;
     transactionProcess: TransactionProcessRepo;
 }
-type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<T>;
+type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;