@chevre/domain 22.14.0-alpha.17 → 22.14.0-alpha.3

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

@@ -8,6 +8,7 @@ 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';
@@ -52,6 +53,7 @@ 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.d.ts

@@ -8,6 +8,7 @@ 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';
@@ -32,6 +33,7 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -8,6 +8,7 @@ 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';
@@ -23,6 +24,7 @@ export interface IAuthorizeOperationRepos {
     orderNumber: OrderNumberRepo;
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     project: ProjectRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
@@ -63,6 +65,7 @@ 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,6 +13,7 @@ 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");
@@ -27,8 +28,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,
@@ -46,24 +47,28 @@ 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') {
-                // 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) {
+                // const productOffers = product.offers;
+                // if (!Array.isArray(productOffers)) {
                 //     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)({
@@ -277,7 +282,7 @@ function processVoidRegisterServiceTransaction(params) {
  * 受け入れらたオファーの内容を検証
  */
 function validateAcceptedOffers(params) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         let acceptedOfferWithoutDetail = params.object;
         if (!Array.isArray(acceptedOfferWithoutDetail)) {
             acceptedOfferWithoutDetail = [acceptedOfferWithoutDetail];
@@ -292,18 +297,22 @@ function validateAcceptedOffers(params) {
             typeOf: params.seller.typeOf
         };
         // 販売者を検証
-        // 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 = params.product.offers;
+        // if (!Array.isArray(productOffers)) {
+        //     throw new factory.errors.Argument('Product', 'Product offers undefined');
         // }
+        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,6 +12,7 @@ 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/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,7 +28,8 @@ function useReservation(params) {
         // const ticketToken = params?.instrument?.ticketToken;
         if (Array.isArray(params.instrument)) {
             for (const eachInstrument of params.instrument) {
-                if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
+                if (eachInstrument.typeOf === factory.action.check.token.ObjectType.Ticket
+                    && typeof eachInstrument.ticketToken === 'string') {
                     ticketToken = eachInstrument.ticketToken;
                     break;
                 }
@@ -61,7 +62,7 @@ function useReservation(params) {
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
-            Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: 'Ticket' }),
+            Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.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,3 +1,4 @@
+import * as factory from '../../factory';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { TicketRepo } from '../../repo/ticket';
@@ -11,6 +12,7 @@ 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 { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.checkResource.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
+export declare function call(data: factory.task.checkResource.IData): IOperationExecute<void>;

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

@@ -24,19 +24,17 @@ const validateOrder_1 = require("../validation/validateOrder");
 /**
  * タスク実行関数
  */
-function call(params) {
+function call(data) {
     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: params.project.id, typeOf: factory.organizationType.Project },
+            agent: { id: data.project.id, typeOf: factory.organizationType.Project },
             object: data.object,
-            project: { id: params.project.id, typeOf: factory.organizationType.Project },
-            typeOf: factory.actionType.CheckAction,
-            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
+            project: { id: data.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.CheckAction
         };
         const action = yield actionRepo.start(actionAttributes);
         const objectTypeOf = data.object.typeOf;
@@ -45,7 +43,7 @@ function call(params) {
                 case factory.order.OrderType.Order:
                     yield (0, validateOrder_1.validateOrder)({
                         orderNumber: data.object.orderNumber,
-                        project: { id: params.project.id }
+                        project: { id: data.project.id }
                     })({
                         acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
                         assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -58,7 +56,7 @@ function call(params) {
                 case factory.eventType.ScreeningEvent:
                     yield (0, validateEvent_1.validateEvent)({
                         id: data.object.id,
-                        project: { id: params.project.id }
+                        project: { id: data.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 { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.ITask<factory.taskName.CreateAccountingReport>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
+export declare function call(data: factory.task.IData<factory.taskName.CreateAccountingReport>): IOperationExecute<void>;

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

@@ -19,9 +19,9 @@ const createAccountingReportIfNotExist_1 = require("../order/createAccountingRep
 /**
  * タスク実行関数
  */
-function call(params) {
+function call(data) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield createAccountingReport(params)({
+        yield createAccountingReport(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
@@ -31,9 +31,8 @@ function call(params) {
 }
 function createAccountingReport(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { data } = params;
         const order = yield repos.order.projectFieldsByOrderNumber({
-            orderNumber: data.object.mainEntity.orderNumber,
+            orderNumber: params.object.mainEntity.orderNumber,
             project: { id: params.project.id },
             inclusion: [
                 'orderNumber', 'project', 'customer', 'confirmationNumber',
@@ -42,26 +41,28 @@ function createAccountingReport(params) {
         });
         const simpleOrder = {
             typeOf: order.typeOf,
+            // seller: {
+            //     id: order.seller.id,
+            //     typeOf: order.seller.typeOf,
+            //     name: order.seller.name
+            // }, // 廃止(2024-03-06~)
+            // customer: { typeOf: order.customer.typeOf, id: order.customer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
+            // price: order.price,
+            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
-        const actionObject = {
-            // ...params,
-            mainEntity: { orderNumber: simpleOrder.orderNumber },
-            typeOf: 'Report'
-        };
         const actionAttributes = {
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             typeOf: factory.actionType.CreateAction,
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            object: actionObject,
-            purpose: simpleOrder,
-            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-21~)
+            object: Object.assign(Object.assign({}, params), { typeOf: 'Report' }),
+            purpose: simpleOrder
         };
         const action = yield repos.action.start(actionAttributes);
         try {
             const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                orderNumber: { $eq: data.object.mainEntity.orderNumber },
+                orderNumber: { $eq: params.object.mainEntity.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(Object.assign(Object.assign({}, order), { acceptedOffers }))(repos);
@@ -75,7 +76,6 @@ function createAccountingReport(params) {
             }
             throw error;
         }
-        const result = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
     });
 }

package/lib/chevre/service/task/createEvent/createEventBySchedule.d.ts

@@ -10,7 +10,7 @@ import type { ScheduleRepo } from '../../../repo/schedule';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-export declare function createEventBySchedule(params: factory.task.createEvent.IAddEventByScheduleAction): (repos: {
+export declare function createEventBySchedule(params: factory.task.createEvent.ICreateEventByScheduleAction): (repos: {
     action: ActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

package/lib/chevre/service/task/createEvent/createEventBySchedule.js

@@ -34,10 +34,9 @@ function updateEvent4ttts(params) {
             // replacee: reservation,
             // replacer: params.attributes, // $unsetもありうるのでいったん保留
             targetCollection: {
-                // id: params.attributes.identifier,
+                id: params.attributes.identifier,
                 typeOf: factory.eventType.ScreeningEvent
-            },
-            instrument: { typeOf: 'Task' }
+            }
         };
         const action = yield repos.action.start(actionAttributes);
         let savedEvent;

package/lib/chevre/service/task/createEvent/createEventSeries.d.ts

@@ -4,7 +4,7 @@ import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { MovieTheaterRepo } from '../../../repo/place/movieTheater';
 import type { TaskRepo } from '../../../repo/task';
-export declare function createEventSeries(params: factory.task.createEvent.IAddEventSeriesAction): (repos: {
+export declare function createEventSeries(params: factory.task.createEvent.ICreateEventSeriesAction): (repos: {
     action: ActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

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

@@ -95,18 +95,17 @@ function deleteById(params, setting) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const deleteObject = {
-            id: params.id,
-            typeOf: factory.personType.Person,
-            migrate: params.migrate,
-            physically: params.physically
-            // discontinue(2025-03-29~)
-            // ...(typeof params.migratePersonRecipientUrl === 'string')
-            //     ? { migratePersonRecipientUrl: params.migratePersonRecipientUrl } : undefined
-        };
         const deleteMemberAction = {
             agent: params.agent,
-            object: deleteObject,
+            object: {
+                id: params.id,
+                typeOf: factory.personType.Person,
+                migrate: params.migrate,
+                physically: params.physically
+                // discontinue(2025-03-29~)
+                // ...(typeof params.migratePersonRecipientUrl === 'string')
+                //     ? { migratePersonRecipientUrl: params.migratePersonRecipientUrl } : undefined
+            },
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             typeOf: factory.actionType.DeleteAction
         };
@@ -387,7 +386,7 @@ function createDeleteTransactionTask(params) {
                 executionResults: [],
                 data: {
                     object: {
-                        specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId,
+                        specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.AgentId,
                         agent: { id: params.id },
                         project: { id: params.project.id },
                         typeOf: transactionType

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -17,6 +17,7 @@ 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: {
@@ -38,6 +39,7 @@ 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,12 +252,11 @@ function deleteResourcesBySeller(params) {
                     project: { id: params.project.id },
                     id: sellerId
                 });
-                // productsドキュメント参照のoffers検証は廃止(2025-09-22~)
                 // プロダクトオファー削除
-                // const deleteProductOfferResult = await repos.productOffer.deleteManyBySellerId({
-                //     project: { id: params.project.id },
-                //     seller: { id: sellerId }
-                // });
+                const deleteProductOfferResult = yield repos.productOffer.deleteManyBySellerId({
+                    project: { id: params.project.id },
+                    seller: { id: sellerId }
+                });
                 // イベント削除
                 const deleteEventResult = yield repos.event.deleteManyEventByOrganizerId({
                     project: { id: params.project.id },
@@ -279,8 +278,7 @@ 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,6 +29,7 @@ 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");
@@ -60,7 +61,7 @@ function call(data) {
             screeningRoom: new screeningRoom_1.ScreeningRoomRepo(connection),
             product: new product_1.ProductRepo(connection),
             productModel: new productModel_1.ProductModelRepo(connection),
-            // productOffer: new ProductOfferRepo(connection),
+            productOffer: new productOffer_1.ProductOfferRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
         });

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

@@ -10,6 +10,7 @@ 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");
@@ -30,7 +31,7 @@ function call(data) {
             instrument = data.instrument;
         }
         else {
-            if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === 'Ticket') {
+            if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.action.check.token.ObjectType.Ticket) {
                 instrument = [data.instrument];
             }
         }

package/lib/chevre/service/taskHandler.js

@@ -50,8 +50,6 @@ 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:
                 case factory.taskName.ImportEventCapacitiesFromCOA:

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -19,7 +19,7 @@ const deleteOrder_1 = require("../order/deleteOrder");
 function deleteTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.object.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
+        if (params.object.specifyingMethod === factory.task.deleteTransaction.SpecifyingMethod.AgentId) {
             // transaction.agent.id指定による取引削除に対応(2023-06-30~)
             yield createDeleteTransactionTasksByAgentId(params)(repos);
         }
@@ -31,8 +31,8 @@ function deleteTransaction(params) {
 function createDeleteTransactionTasksByAgentId(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
-            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId}`);
+        if (params.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.AgentId) {
+            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.task.deleteTransaction.SpecifyingMethod.Id}`);
         }
         const agentIdSpecified = params.object.agent.id;
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
@@ -61,7 +61,7 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
                                         ? { confirmationNumber: transaction.object.confirmationNumber }
                                         : undefined), (typeof transaction.object.orderNumber === 'string')
                                         ? { orderNumber: transaction.object.orderNumber }
@@ -81,7 +81,7 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: {
+                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: {
                                         order: transaction.object.order
                                     }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
                             }
@@ -99,7 +99,7 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
                                         ? { pendingTransaction: transaction.object.pendingTransaction }
                                         : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
                             }
@@ -120,8 +120,8 @@ function deleteTransactionById(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         if (typeof params.object.specifyingMethod === 'string'
-            && params.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
-            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id}`);
+            && params.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.Id) {
+            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.task.deleteTransaction.SpecifyingMethod.Id}`);
         }
         const deletingTransactionId = params.object.id;
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
@@ -364,7 +364,7 @@ function deleteMessagesByPlaceOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let deleteResult;
         if (params.transaction.typeOf === factory.transactionType.PlaceOrder
-            && params.transaction.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
+            && params.transaction.specifyingMethod === factory.task.deleteTransaction.SpecifyingMethod.Id) {
             const orderNumber = params.transaction.object.orderNumber;
             if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                 const deleteReservationsResult = yield repos.message.deleteByMainEntityOrderNumber({

package/lib/chevre/service/transaction/moneyTransfer/exportTasks/factory.js

@@ -53,7 +53,7 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
                     ? { pendingTransaction: transaction.object.pendingTransaction }
                     : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
         }

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -87,7 +87,7 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
                     ? { confirmationNumber: transaction.object.confirmationNumber }
                     : undefined), (typeof transaction.object.orderNumber === 'string')
                     ? { orderNumber: transaction.object.orderNumber }

package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js

@@ -53,7 +53,7 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: {
+            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: {
                     order: transaction.object.order
                 }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
         }

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

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