@chevre/domain 22.14.0-alpha.14 → 22.14.0-alpha.16

package/example/src/chevre/findReservationByCode.ts

@@ -22,7 +22,6 @@ async function main() {
 
     await (await chevre.service.reserve.createService()).verifyToken4reservation({
         project: { id: project.id },
-        agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
         reservationId: RESERVATION_ID,
         ticket: {
             ticketToken: CODE

package/lib/chevre/repo/action.d.ts

@@ -2,7 +2,7 @@ import { factory as surfrockFactory } from '@surfrock/sdk';
 import { Connection, FilterQuery, UpdateQuery } from 'mongoose';
 import * as factory from '../factory';
 export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction | factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
-export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.token.IAction) : T extends factory.actionType.CreateAction ? factory.action.create.IAction : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
+export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.thing.IAction) : T extends factory.actionType.CreateAction ? factory.action.create.IAction : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
     error?: any;
     purpose?: never;
 } : factory.action.IAction<factory.action.IAttributes<T, any, any>>;

package/lib/chevre/repo/productOffer.d.ts

@@ -1,77 +1,7 @@
 import { Connection } from 'mongoose';
-import * as factory from '../factory';
 /**
  * プロダクトオファーリポジトリ
  */
 export declare class ProductOfferRepo {
-    private readonly productModel;
-    constructor(connection: Connection);
-    /**
-     * プロダクトオファー検索
-     */
-    search(params: {
-        limit?: number;
-        page?: number;
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        itemOffered?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        seller?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-    }): Promise<(Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'> & {
-        itemOffered: Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'>;
-    })[]>;
-    create(params: factory.product.IOffer & {
-        project: {
-            id: string;
-        };
-        itemOffered: {
-            /**
-             * プロダクトID
-             */
-            id: string;
-        };
-    }): Promise<{
-        id: string;
-    }>;
-    update(params: factory.product.IOffer & {
-        project: {
-            id: string;
-        };
-        itemOffered: {
-            /**
-             * プロダクトID
-             */
-            id: string;
-        };
-    }): Promise<{
-        id: string;
-    }>;
-    deleteOne(params: Pick<factory.product.IOffer, 'seller'> & {
-        project: {
-            id: string;
-        };
-        itemOffered: {
-            /**
-             * プロダクトID
-             */
-            id: string;
-        };
-    }): Promise<{
-        id: string;
-    }>;
-    deleteManyBySellerId(params: Pick<factory.product.IOffer, 'seller'> & {
-        project: {
-            id: string;
-        };
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
+    constructor(__: Connection);
 }

package/lib/chevre/repo/productOffer.js

@@ -1,201 +1,18 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductOfferRepo = void 0;
-const mongoose_1 = require("mongoose");
-const product_1 = require("./mongoose/schemas/product");
-const factory = require("../factory");
-const settings_1 = require("../settings");
+// import * as factory from '../factory';
+// import { MONGO_MAX_TIME_MS } from '../settings';
+// import { createSchema, IModel, modelName } from './mongoose/schemas/product';
+// type IMatchStage = PipelineStage.Match;
 /**
  * プロダクトオファーリポジトリ
  */
+// tslint:disable-next-line:no-unnecessary-class
 class ProductOfferRepo {
-    constructor(connection) {
-        this.productModel = connection.model(product_1.modelName, (0, product_1.createSchema)());
-    }
-    /**
-     * プロダクトオファー検索
-     */
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
-            const matchStages = [{
-                    $match: {
-                        typeOf: {
-                            $in: [
-                                factory.product.ProductType.MembershipService,
-                                factory.product.ProductType.PaymentCard
-                            ]
-                        }
-                    }
-                }];
-            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof projectIdEq === 'string') {
-                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-            }
-            const itemOfferedIdEq = (_d = (_c = params.itemOffered) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
-            if (typeof itemOfferedIdEq === 'string') {
-                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(itemOfferedIdEq) } } });
-            }
-            const sellerIdEq = (_f = (_e = params.seller) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
-            if (typeof sellerIdEq === 'string') {
-                matchStages.push({ $match: { 'offers.seller.id': { $exists: true, $eq: sellerIdEq } } });
-            }
-            const aggregate = this.productModel.aggregate([
-                { $sort: { productID: factory.sortType.Ascending } },
-                {
-                    $unwind: {
-                        path: '$offers'
-                    }
-                },
-                ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        itemOffered: {
-                            id: { $toString: '$_id' },
-                            name: '$name',
-                            typeOf: '$typeOf'
-                        },
-                        availabilityEnds: '$offers.availabilityEnds',
-                        availabilityStarts: '$offers.availabilityStarts',
-                        validFrom: '$offers.validFrom',
-                        validThrough: '$offers.validThrough',
-                        seller: '$offers.seller'
-                    }
-                }
-            ]);
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    create(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
-            if (typeof sellerId !== 'string' || sellerId.length === 0) {
-                throw new factory.errors.ArgumentNull('seller.id');
-            }
-            // プロダクト存在確認
-            let doc = yield this.productModel.findOne({
-                'project.id': { $eq: params.project.id },
-                _id: { $eq: params.itemOffered.id }
-            }, { _id: 1 })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound('Product');
-            }
-            const creatingOffer = {
-                priceCurrency: factory.priceCurrency.JPY,
-                availabilityEnds: params.availabilityEnds,
-                availabilityStarts: params.availabilityStarts,
-                validFrom: params.validFrom,
-                validThrough: params.validThrough,
-                seller: { id: sellerId },
-                typeOf: factory.offerType.Offer
-            };
-            doc = yield this.productModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                _id: { $eq: params.itemOffered.id },
-                'offers.seller.id': { $ne: sellerId }
-            }, {
-                $push: { offers: creatingOffer }
-            }, {
-                new: true,
-                projection: { _id: 1 }
-            })
-                .exec();
-            // 存在しなければプロバイダーID重複
-            if (doc === null) {
-                throw new factory.errors.AlreadyInUse('offers.seller', ['id']);
-            }
-            return doc.toObject();
-        });
-    }
-    update(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
-            if (typeof sellerId !== 'string' || sellerId.length === 0) {
-                throw new factory.errors.ArgumentNull('seller.id');
-            }
-            const doc = yield this.productModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                _id: { $eq: params.itemOffered.id },
-                'offers.seller.id': { $exists: true, $eq: sellerId }
-            }, Object.assign(Object.assign(Object.assign(Object.assign({}, (params.availabilityEnds instanceof Date)
-                ? { 'offers.$[offerBySeller].availabilityEnds': params.availabilityEnds }
-                : undefined), (params.availabilityStarts instanceof Date)
-                ? { 'offers.$[offerBySeller].availabilityStarts': params.availabilityStarts }
-                : undefined), (params.validFrom instanceof Date)
-                ? { 'offers.$[offerBySeller].validFrom': params.validFrom }
-                : undefined), (params.validThrough instanceof Date)
-                ? { 'offers.$[offerBySeller].validThrough': params.validThrough }
-                : undefined), {
-                new: true,
-                arrayFilters: [
-                    { 'offerBySeller.seller.id': { $eq: sellerId } }
-                ],
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound('Product');
-            }
-            return doc.toObject();
-        });
-    }
-    deleteOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
-            if (typeof sellerId !== 'string' || sellerId.length === 0) {
-                throw new factory.errors.ArgumentNull('seller.id');
-            }
-            const doc = yield this.productModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                _id: { $eq: params.itemOffered.id },
-                'offers.seller.id': { $exists: true, $eq: sellerId }
-            }, {
-                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
-            }, {
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound('Product');
-            }
-            return doc.toObject();
-        });
-    }
-    deleteManyBySellerId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
-            if (typeof sellerId !== 'string' || sellerId.length === 0) {
-                throw new factory.errors.ArgumentNull('seller.id');
-            }
-            return this.productModel.updateMany({
-                'project.id': { $eq: params.project.id },
-                'offers.seller.id': { $exists: true, $eq: sellerId }
-            }, {
-                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
-            })
-                .exec();
-        });
+    // private readonly productModel: IModel;
+    constructor(__) {
+        // this.productModel = connection.model(modelName, createSchema());
     }
 }
 exports.ProductOfferRepo = ProductOfferRepo;

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.d.ts

@@ -5,7 +5,6 @@ import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
 import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { ProductRepo } from '../../../../repo/product';
-import type { ProductOfferRepo } from '../../../../repo/productOffer';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 declare function createSubReservations(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
@@ -25,6 +24,5 @@ declare function createSubReservations(params: {
     offerCatalog: OfferCatalogRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
 }) => Promise<IObjectSubReservation[]>;
 export { createSubReservations };

package/lib/chevre/service/assetTransaction/reserve/start.d.ts

@@ -14,7 +14,6 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
-import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
@@ -34,7 +33,6 @@ interface IStartOperationRepos {
     offerRateLimit: OfferRateLimitRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;

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

@@ -16,7 +16,6 @@ import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { SeatRepo } from '../../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../../repo/product';
-import type { ProductOfferRepo } from '../../../../repo/productOffer';
 import type { ProjectRepo } from '../../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../../repo/setting';
@@ -63,7 +62,6 @@ declare function processStartReserve4chevre(params: {
     offerRateLimit: OfferRateLimitRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;

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

@@ -18,7 +18,6 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
-import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
@@ -47,7 +46,6 @@ interface IAuthorizeRepos {
     paymentService: PaymentServiceRepo;
     priceSpecification: PriceSpecificationRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
     project: ProjectRepo;
     seat: SeatRepo;
     setting: SettingRepo;

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/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/onResourceUpdated/onResourceDeleted.d.ts

@@ -17,7 +17,6 @@ import type { MovieTheaterRepo } from '../../../repo/place/movieTheater';
 import type { ScreeningRoomRepo } from '../../../repo/place/screeningRoom';
 import type { ProductRepo } from '../../../repo/product';
 import type { ProductModelRepo } from '../../../repo/productModel';
-import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 export declare function onResourceDeleted(params: factory.task.onResourceUpdated.IData): (repos: {
@@ -39,7 +38,6 @@ export declare function onResourceDeleted(params: factory.task.onResourceUpdated
     screeningRoom: ScreeningRoomRepo;
     product: ProductRepo;
     productModel: ProductModelRepo;
-    productOffer: ProductOfferRepo;
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -252,11 +252,12 @@ function deleteResourcesBySeller(params) {
                     project: { id: params.project.id },
                     id: sellerId
                 });
+                // productsドキュメント参照のoffers検証は廃止(2025-09-22~)
                 // プロダクトオファー削除
-                const deleteProductOfferResult = yield repos.productOffer.deleteManyBySellerId({
-                    project: { id: params.project.id },
-                    seller: { id: sellerId }
-                });
+                // const deleteProductOfferResult = await repos.productOffer.deleteManyBySellerId({
+                //     project: { id: params.project.id },
+                //     seller: { id: sellerId }
+                // });
                 // イベント削除
                 const deleteEventResult = yield repos.event.deleteManyEventByOrganizerId({
                     project: { id: params.project.id },
@@ -278,7 +279,8 @@ function deleteResourcesBySeller(params) {
                     parentOrganization: { id: sellerId }
                 });
                 deleteResult = {
-                    deleteMemberResult, deletePaymentServiceProviderResult, deleteProductOfferResult,
+                    deleteMemberResult, deletePaymentServiceProviderResult,
+                    // deleteProductOfferResult,
                     deleteEventResult, deleteEventSeriesResult, deleteScreeningRoomResult, deleteMovieTheaterResult
                 };
             }

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

@@ -29,7 +29,6 @@ const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
 const productModel_1 = require("../../repo/productModel");
-const productOffer_1 = require("../../repo/productOffer");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const onAggregateOfferUpdated_1 = require("./onResourceUpdated/onAggregateOfferUpdated");
@@ -61,7 +60,7 @@ function call(data) {
             screeningRoom: new screeningRoom_1.ScreeningRoomRepo(connection),
             product: new product_1.ProductRepo(connection),
             productModel: new productModel_1.ProductModelRepo(connection),
-            productOffer: new productOffer_1.ProductOfferRepo(connection),
+            // productOffer: new ProductOfferRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
         });

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

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
@@ -31,7 +30,7 @@ function call(data) {
             instrument = data.instrument;
         }
         else {
-            if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.action.check.token.ObjectType.Ticket) {
+            if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === 'Ticket') {
                 instrument = [data.instrument];
             }
         }

package/lib/chevre/service/taskHandler.js

@@ -50,6 +50,7 @@ function executeTask(task, next) {
                 case factory.taskName.AuthorizePayment:
                 case factory.taskName.CancelPendingReservation:
                 case factory.taskName.CheckMovieTicket:
+                case factory.taskName.CheckResource:
                 case factory.taskName.CreateAccountingReport:
                 case factory.taskName.DeletePerson:
                 case factory.taskName.HandleNotification:

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.d.ts

@@ -1,5 +1,4 @@
 import * as factory from '../../../../factory';
-export type IAction = factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>;
 /**
  * ポイント特典返却アクションを作成する
  */

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.399.0-alpha.15",
+    "@chevre/factory": "4.399.0-alpha.16",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.14.0-alpha.14"
+  "version": "22.14.0-alpha.16"
 }