@chevre/domain 22.14.0-alpha.2 → 22.14.0-alpha.20

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

@@ -13,7 +13,6 @@ exports.validateStartRequest = validateStartRequest;
 const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../factory");
-const ROLE_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
 function verifyOfferedByToken(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
@@ -55,9 +54,9 @@ function validateStartRequest(params) {
             if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
                 throw new factory.errors.NotFound('store.id');
             }
-            const validForMemberTierToken = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+            const tokenizedMemberProgramTier = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
             yield validateEventOfferPeriod(Object.assign({ event,
-                now, availableAt: { id: params.store.id } }, (typeof validForMemberTierToken === 'string') ? { validForMemberTierToken } : undefined))(repos);
+                now, availableAt: { id: params.store.id } }, (typeof (tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token) === 'string') ? { tokenizedMemberProgramTier } : undefined))(repos);
         }
         if (params.validateEvent === true) {
             validateEvent({ event, object: params.object });
@@ -67,7 +66,7 @@ function validateStartRequest(params) {
 function validateMemberTier(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
-        const { acceptedDate, event, availableAt, verifiedValidForMemberTier, memberProgramIdentifierMustBe } = params;
+        const { acceptedDate, event, verifiedValidForMemberTier, memberProgramIdentifierMustBe, aggregateOfferIdentifier } = params;
         const tierIdentifier = (_b = (_a = verifiedValidForMemberTier.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.identifier;
         const memberProgramIdentifier = (_e = (_d = (_c = verifiedValidForMemberTier.member) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.isTierOf) === null || _e === void 0 ? void 0 : _e.identifier;
         if (typeof tierIdentifier !== 'string') {
@@ -79,28 +78,36 @@ function validateMemberTier(params) {
         if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
             throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
         }
-        // イベントオファーを検索して有効期間検証
-        const eventOfferForMemberTier = (yield repos.eventOffer.projectFields({
+        // 有効なプロダクトオファーを検証
+        const productOfferForMemberTier = (yield repos.productOffer.findProductOffers({
             limit: 1,
             page: 1,
             project: { id: { $eq: event.project.id } },
-            availableAtOrFrom: { id: { $eq: availableAt.id } },
-            itemOffered: { id: { $eq: event.id } },
-            validForMemberTier: { identifier: { $eq: tierIdentifier } }
-        }, ['validFrom', 'validThrough'])).shift();
-        if (eventOfferForMemberTier === undefined) {
-            throw new factory.errors.NotFound(factory.offerType.Offer, 'event offer for member tier not found');
-        }
-        let validThroughMoment;
-        let validFromMoment;
-        validThroughMoment = moment(eventOfferForMemberTier.validThrough, ROLE_DATE_FORMAT, true);
-        validFromMoment = moment(eventOfferForMemberTier.validFrom, ROLE_DATE_FORMAT, true);
-        if (acceptedDate.isBefore(validFromMoment)) {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `the offer id valid from ${validFromMoment}`);
-        }
-        if (acceptedDate.isAfter(validThroughMoment)) {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `the offer id valid through ${validThroughMoment}`);
+            // availableAtOrFrom: { id: { $eq: availableAt.id } },
+            itemOffered: { identifier: { $eq: aggregateOfferIdentifier } }, // オファーコレクションコード
+            validForMemberTier: { identifier: { $eq: tierIdentifier } },
+            validFrom: { $lte: acceptedDate.toDate() },
+            validThrough: { $gte: acceptedDate.toDate() }
+        }, ['identifier'])).shift();
+        if (productOfferForMemberTier === undefined) {
+            throw new factory.errors.NotFound(factory.offerType.Offer, 'product offer for member tier not found');
         }
+        // let validThroughMoment: moment.Moment;
+        // let validFromMoment: moment.Moment;
+        // validThroughMoment = moment(productOfferForMemberTier.validThrough, ROLE_DATE_FORMAT, true);
+        // validFromMoment = moment(productOfferForMemberTier.validFrom, ROLE_DATE_FORMAT, true);
+        // if (acceptedDate.isBefore(validFromMoment)) {
+        //     throw new factory.errors.Argument(
+        //         'reservationFor.offers.validForMemberTier',
+        //         `the offer id valid from ${validFromMoment}`
+        //     );
+        // }
+        // if (acceptedDate.isAfter(validThroughMoment)) {
+        //     throw new factory.errors.Argument(
+        //         'reservationFor.offers.validForMemberTier',
+        //         `the offer id valid through ${validThroughMoment}`
+        //     );
+        // }
     });
 }
 /**
@@ -108,19 +115,19 @@ function validateMemberTier(params) {
  */
 function validateEventOfferPeriod(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { event, availableAt, validForMemberTierToken } = params;
+        var _a;
+        const { event, availableAt, tokenizedMemberProgramTier } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
         const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
             var _a, _b;
             // support non-array(2024-10-11~)
-            return (Array.isArray(offer.availableAtOrFrom) && ((_a = offer.availableAtOrFrom.at(0)) === null || _a === void 0 ? void 0 : _a.id) === params.availableAt.id)
-                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === params.availableAt.id);
+            return (Array.isArray(offer.availableAtOrFrom) && ((_a = offer.availableAtOrFrom.at(0)) === null || _a === void 0 ? void 0 : _a.id) === availableAt.id)
+                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === availableAt.id);
         });
         if (makesOfferOnApplication === undefined) {
-            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
+            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${availableAt.id}`);
         }
         const validFrom = makesOfferOnApplication.validFrom;
         const validThrough = makesOfferOnApplication.validThrough;
@@ -136,38 +143,53 @@ function validateEventOfferPeriod(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
+        // 有効メンバープログラムティアが存在する場合
         // support validForMemberTier(2025-05-14~)
-        const memberProgramIdentifierMustBe = (_b = (_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.isTierOf) === null || _b === void 0 ? void 0 : _b.identifier;
-        if (typeof memberProgramIdentifierMustBe === 'string') {
-            if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier');
-            }
-            // トークン検証
-            const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.event.project.id } },
-                identifier: { $eq: memberProgramIdentifierMustBe }
-            })).shift();
-            if (memberProgram === undefined) {
-                throw new factory.errors.NotFound('MemberProgram');
-            }
-            const issuer = yield repos.issuer.findByIdentifier({
-                project: { id: params.event.project.id },
-                identifier: memberProgram.hostingOrganization.identifier
-            });
-            if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
-                throw new factory.errors.NotFound('issuer.tokenSecret');
+        if (makesOfferOnApplication.typeOf === factory.offerType.AggregateOffer) {
+            const validForMemberTierExists = makesOfferOnApplication.validForMemberTier.typeOf === 'MemberProgramTier';
+            if (validForMemberTierExists) {
+                const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
+                const memberProgramIdentifierMustBe = (_a = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf) === null || _a === void 0 ? void 0 : _a.identifier;
+                // ティアトークンが必須
+                if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
+                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.token');
+                }
+                // メンバープログラムコード指定が必須
+                if (typeof memberProgramIdentifierMustBe !== 'string' || memberProgramIdentifierMustBe === '') {
+                    throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.isTierOf.identifier');
+                }
+                // 有効メンバープログラムティアが存在する場合、オファーコレクションコードが必須
+                const aggregateOfferIdentifier = makesOfferOnApplication.identifier;
+                if (typeof aggregateOfferIdentifier !== 'string' || aggregateOfferIdentifier === '') {
+                    throw new factory.errors.NotFound('makesOfferOnApplication.identifier');
+                }
+                // トークン検証
+                const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.event.project.id } },
+                    identifier: { $eq: memberProgramIdentifierMustBe }
+                })).shift();
+                if (memberProgram === undefined) {
+                    throw new factory.errors.NotFound('MemberProgram', `MemberProgram '${memberProgramIdentifierMustBe}' not found`);
+                }
+                const issuer = yield repos.issuer.findByIdentifier({
+                    project: { id: params.event.project.id },
+                    identifier: memberProgram.hostingOrganization.identifier
+                });
+                if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
+                    throw new factory.errors.NotFound('issuer.tokenSecret');
+                }
+                const verifiedValidForMemberTier = yield verifyOfferedByToken({
+                    secret: issuer.tokenSecret,
+                    issuer: issuer.url,
+                    token: validForMemberTierToken
+                });
+                yield validateMemberTier({
+                    event, acceptedDate, verifiedValidForMemberTier,
+                    memberProgramIdentifierMustBe, aggregateOfferIdentifier
+                })(repos);
             }
-            const verifiedValidForMemberTier = yield verifyOfferedByToken({
-                secret: issuer.tokenSecret,
-                issuer: issuer.url,
-                token: validForMemberTierToken
-            });
-            yield validateMemberTier({
-                event, availableAt, acceptedDate, verifiedValidForMemberTier,
-                memberProgramIdentifierMustBe
-            })(repos);
         }
     });
 }

package/lib/chevre/service/event.js

@@ -63,7 +63,8 @@ function importFromCOA(params) {
             object: Object.assign(Object.assign({}, params), { startDate: `${moment(targetImportFrom) // debug(2024-04-26~)
                     .toISOString()}/${moment(targetImportThrough)
                     .toISOString()}`, superEvent: { location: { branchCode: params.locationBranchCode } }, typeOf: factory.eventType.ScreeningEvent }),
-            instrument
+            instrument,
+            targetCollection: { typeOf: factory.eventType.ScreeningEvent }
         };
         const action = yield repos.action.start(actionAttributes);
         let savedScreeningEventsCount = 0;
@@ -150,7 +151,8 @@ function processUpdateMovieTheater(params) {
                 theaterCode: params.locationBranchCode,
                 typeOf: 'WebAPI',
                 identifier: factory.service.webAPI.Identifier.COA
-            }
+            },
+            targetCollection: { typeOf: factory.placeType.MovieTheater }
         };
         const action = yield repos.action.start(actionAttributes);
         let seller;
@@ -345,6 +347,12 @@ function createScreeningEvents(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = params.project;
+        if (typeof params.instrument.begin !== 'string') {
+            throw new factory.errors.ArgumentNull('instrument.begin');
+        }
+        if (typeof params.instrument.end !== 'string') {
+            throw new factory.errors.ArgumentNull('instrument.end');
+        }
         // COAからイベント取得;
         const schedulesFromCOA = yield repos.masterService.schedule({
             theaterCode: params.instrument.theaterCode,

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;

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

@@ -48,8 +48,8 @@ function createReserveTransactionStartParams(params) {
         //     }
         // ]
     };
-    const validForMemberTierToken = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
-    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
+    const validForMemberTier = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
+    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.assetTransactionType.Reserve,

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

@@ -8,7 +8,6 @@ import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/even
 import { EventSeriesRepo } from '../../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../../repo/offer/event';
 import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../../repo/offerCatalogItem';
@@ -28,7 +27,7 @@ declare function processStartReserve4chevre(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'> & {
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
@@ -53,7 +52,6 @@ declare function processStartReserve4chevre(params: {
     authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -20,13 +20,13 @@ function processStartReserve4chevre(params, options) {
     //     jwt: JWTCredentials;
     // }
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
             // object: <IObjectWithDetail>action.object,
-            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === 'string')
+            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_b = (_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === null || _b === void 0 ? void 0 : _b.token) === 'string')
                 ? { offers: { validForMemberTier: event.offers.validForMemberTier } }
                 : undefined), transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));

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

@@ -8,7 +8,6 @@ import type { EventRepo } from '../../../repo/event';
 import { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../repo/offer/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
@@ -33,7 +32,6 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -99,8 +99,8 @@ function validateCreateRequest(params) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         // support validForMemberTier(2025-05-14~)
-        const validForMemberTierToken = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
-        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined);
+        const validForMemberTier = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined);
         return { transaction, event };
     });
 }

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

@@ -8,7 +8,6 @@ import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../repo/orderNumber';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { ProductRepo } from '../../repo/product';
-import type { ProductOfferRepo } from '../../repo/productOffer';
 import type { ProjectRepo } from '../../repo/project';
 import type { ServiceOutputRepo } from '../../repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
@@ -24,7 +23,6 @@ export interface IAuthorizeOperationRepos {
     orderNumber: OrderNumberRepo;
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
     project: ProjectRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
@@ -65,7 +63,6 @@ export declare function search(params: {
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];
     product: Pick<factory.product.IProduct, "id" | "productID" | "typeOf" | "name" | "project" | "serviceOutput" | "serviceType" | "description">;

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

@@ -13,7 +13,6 @@ exports.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
 exports.search = search;
 exports.authorize = authorize;
 exports.voidTransaction = voidTransaction;
-const moment = require("moment");
 const factory = require("../../factory");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 const availableProductTypes_1 = require("../../factory/availableProductTypes");
@@ -28,8 +27,8 @@ exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
  */
 function search(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // const now = moment();
         var _a;
-        const now = moment();
         const searchProductsResult = yield repos.product.projectFields({
             limit: 1,
             page: 1,
@@ -47,28 +46,24 @@ function search(params) {
             || product.typeOf === factory.product.ProductType.PaymentCard) {
             const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
             if (typeof sellerId === 'string') {
-                // const productOffers = product.offers;
-                // if (!Array.isArray(productOffers)) {
+                // productsドキュメント参照のoffers検証は廃止(2025-09-22~)
+                // const productOffers = await repos.productOffer.search({
+                //     project: { id: { $eq: params.project.id } },
+                //     itemOffered: { id: { $eq: params.itemOffered.id } },
+                //     seller: { id: { $eq: sellerId } }
+                // });
+                // const hasValidOffer = productOffers.some((o) => {
+                //     return o.seller?.id === sellerId
+                //         && o.validFrom !== undefined
+                //         && moment(o.validFrom)
+                //             .isSameOrBefore(now)
+                //         && o.validThrough !== undefined
+                //         && moment(o.validThrough)
+                //             .isSameOrAfter(now);
+                // });
+                // if (!hasValidOffer) {
                 //     return { offers: [], product };
                 // }
-                const productOffers = yield repos.productOffer.search({
-                    project: { id: { $eq: params.project.id } },
-                    itemOffered: { id: { $eq: params.itemOffered.id } },
-                    seller: { id: { $eq: sellerId } }
-                });
-                const hasValidOffer = productOffers.some((o) => {
-                    var _a;
-                    return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === sellerId
-                        && o.validFrom !== undefined
-                        && moment(o.validFrom)
-                            .isSameOrBefore(now)
-                        && o.validThrough !== undefined
-                        && moment(o.validThrough)
-                            .isSameOrAfter(now);
-                });
-                if (!hasValidOffer) {
-                    return { offers: [], product };
-                }
             }
         }
         const offers = yield (0, searchProductOffers_1.searchProductOffers)({
@@ -282,7 +277,7 @@ function processVoidRegisterServiceTransaction(params) {
  * 受け入れらたオファーの内容を検証
  */
 function validateAcceptedOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return (__) => __awaiter(this, void 0, void 0, function* () {
         let acceptedOfferWithoutDetail = params.object;
         if (!Array.isArray(acceptedOfferWithoutDetail)) {
             acceptedOfferWithoutDetail = [acceptedOfferWithoutDetail];
@@ -297,22 +292,18 @@ function validateAcceptedOffers(params) {
             typeOf: params.seller.typeOf
         };
         // 販売者を検証
-        // const productOffers = params.product.offers;
-        // if (!Array.isArray(productOffers)) {
-        //     throw new factory.errors.Argument('Product', 'Product offers undefined');
+        // productsドキュメント参照のoffers検証は廃止(2025-09-22~)
+        // const productOffers = await repos.productOffer.search({
+        //     project: { id: { $eq: params.product.project.id } },
+        //     itemOffered: { id: { $eq: String(params.product.id) } },
+        //     seller: { id: { $eq: params.seller.id } }
+        // });
+        // const hasValidOffer = productOffers.some((o) => {
+        //     return o.seller?.id === params.seller.id;
+        // });
+        // if (!hasValidOffer) {
+        //     throw new factory.errors.Argument('Product', 'Product has no valid offer');
         // }
-        const productOffers = yield repos.productOffer.search({
-            project: { id: { $eq: params.product.project.id } },
-            itemOffered: { id: { $eq: String(params.product.id) } },
-            seller: { id: { $eq: params.seller.id } }
-        });
-        const hasValidOffer = productOffers.some((o) => {
-            var _a;
-            return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === params.seller.id;
-        });
-        if (!hasValidOffer) {
-            throw new factory.errors.Argument('Product', 'Product has no valid offer');
-        }
         // 利用可能なチケットオファーであれば受け入れる
         return Promise.all(acceptedOfferWithoutDetail.map((offerWithoutDetail) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
 const moment = require("moment-timezone");
 const factory = require("../../factory");
-// import { createMaskedCustomer } from '../../factory/order';
 function createAccountingReportIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const order4report = createOrder4report(params);

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

@@ -44,7 +44,7 @@ function deleteOrder(params) {
         // 経理レポート削除
         yield repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
         // メモ削除(2024-02-15~)
-        yield repos.note.deleteManyByAbout({
+        yield repos.note.deleteNotesByAbout({
             about: {
                 id: order.id,
                 typeOf: factory.order.OrderType.Order

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

@@ -116,8 +116,8 @@ function createCreateAccountingReportTask(order) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: { mainEntity: { orderNumber: order.orderNumber } },
-            project: { id: order.project.id }
+            object: { mainEntity: { orderNumber: order.orderNumber } }
+            // project: { id: order.project.id }
         }
     };
     return [task];

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -127,7 +127,7 @@ function createCheckResourceTask(order) {
             orderNumber: order.orderNumber,
             typeOf: order.typeOf
         },
-        project: order.project,
+        // project: order.project,
         typeOf: factory.actionType.CheckAction
     };
     const taskIdentifier = util.format('%s:%s:%s:%s', order.project.id, factory.taskName.CheckResource, order.typeOf, order.orderNumber);

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

@@ -28,8 +28,7 @@ function useReservation(params) {
         // const ticketToken = params?.instrument?.ticketToken;
         if (Array.isArray(params.instrument)) {
             for (const eachInstrument of params.instrument) {
-                if (eachInstrument.typeOf === factory.action.check.token.ObjectType.Ticket
-                    && typeof eachInstrument.ticketToken === 'string') {
+                if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
                     ticketToken = eachInstrument.ticketToken;
                     break;
                 }
@@ -62,7 +61,7 @@ function useReservation(params) {
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
-            Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }),
+            Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: 'Ticket' }),
             // support orderAsInstrument(2025-02-18~)
             ...(Array.isArray(params.instrument))
                 ? params.instrument.filter(({ typeOf }) => typeOf === factory.order.OrderType.Order)

package/lib/chevre/service/reserve/verifyToken4reservation.d.ts

@@ -1,4 +1,3 @@
-import * as factory from '../../factory';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { TicketRepo } from '../../repo/ticket';
@@ -12,7 +11,6 @@ export declare function verifyToken4reservation(params: {
     seller?: {
         id?: string;
     };
-    agent: factory.action.check.token.IAgent;
     reservationId: string;
     ticket: {
         /**

package/lib/chevre/service/task/checkResource.d.ts

@@ -1,6 +1,6 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.checkResource.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.checkResource.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -24,17 +24,19 @@ const validateOrder_1 = require("../validation/validateOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient }) {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
         const actionRepo = new action_1.ActionRepo(connection);
+        const { data } = params;
         const actionAttributes = {
-            agent: { id: data.project.id, typeOf: factory.organizationType.Project },
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             object: data.object,
-            project: { id: data.project.id, typeOf: factory.organizationType.Project },
-            typeOf: factory.actionType.CheckAction
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.CheckAction,
+            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
         };
         const action = yield actionRepo.start(actionAttributes);
         const objectTypeOf = data.object.typeOf;
@@ -43,7 +45,7 @@ function call(data) {
                 case factory.order.OrderType.Order:
                     yield (0, validateOrder_1.validateOrder)({
                         orderNumber: data.object.orderNumber,
-                        project: { id: data.project.id }
+                        project: { id: params.project.id }
                     })({
                         acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
                         assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -56,7 +58,7 @@ function call(data) {
                 case factory.eventType.ScreeningEvent:
                     yield (0, validateEvent_1.validateEvent)({
                         id: data.object.id,
-                        project: { id: data.project.id }
+                        project: { id: params.project.id }
                     })({
                         event: new event_1.EventRepo(connection),
                         stockHolder: new stockHolder_1.StockHolderRepo({ connection })

package/lib/chevre/service/task/createAccountingReport.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.CreateAccountingReport>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.CreateAccountingReport>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;