@chevre/domain 24.0.0-alpha.17 → 24.0.0-alpha.19

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

@@ -1,10 +1,10 @@
 import * as factory from '../../factory';
-import { IKeyOfProjection, ActionProcessRepo } from './actionProcess';
+import { IActionRecipe, IKeyOfProjection, ActionProcessRepo } from './actionProcess';
 export type IAcceptCOAOfferAction = factory.action.accept.coaOffer.IAction;
 /**
  * COAオファー採用リポジトリ
  */
-export declare class AcceptCOAOfferActionRepo extends ActionProcessRepo<IAcceptCOAOfferAction> {
+export declare class AcceptCOAOfferActionRepo extends ActionProcessRepo<IAcceptCOAOfferAction, IActionRecipe<factory.recipe.RecipeCategory.acceptCOAOffer>> {
     /**
      * 完了済の採用アクションを参照する
      */

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

@@ -0,0 +1,8 @@
+import * as factory from '../../factory';
+import { IActionRecipe, ActionProcessRepo } from './actionProcess';
+export type IAcceptPayAction = factory.action.accept.pay.IAction;
+/**
+ * 決済採用リポジトリ
+ */
+export declare class AcceptPayActionRepo extends ActionProcessRepo<IAcceptPayAction, IActionRecipe<factory.recipe.RecipeCategory.publishPaymentUrl>> {
+}

package/lib/chevre/repo/action/acceptPay.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcceptPayActionRepo = void 0;
+// import { MONGO_MAX_TIME_MS } from '../settings';
+// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
+// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
+const actionProcess_1 = require("./actionProcess");
+/**
+ * 決済採用リポジトリ
+ */
+class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
+}
+exports.AcceptPayActionRepo = AcceptPayActionRepo;

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

@@ -17,7 +17,7 @@ export interface ICancelActionAction {
         typeOf: 'Task';
     };
 }
-export type IActionRecipe<T extends factory.recipe.RecipeCategory> = T extends factory.recipe.RecipeCategory.checkMovieTicket ? factory.action.check.paymentMethod.movieTicket.IRecipe : T extends factory.recipe.RecipeCategory.payCreditCard ? factory.action.trade.pay.IPayCreditCardRecipe : T extends factory.recipe.RecipeCategory.payMovieTicket ? factory.action.trade.pay.IPayMovieTicketRecipe : T extends factory.recipe.RecipeCategory.publishPaymentUrl ? factory.action.accept.pay.IRecipe : T extends factory.recipe.RecipeCategory.refundCreditCard ? factory.action.trade.refund.IRefundCreditCardRecipe : T extends factory.recipe.RecipeCategory.refundMovieTicket ? factory.action.trade.refund.IRefundMovieTicketRecipe : T extends factory.recipe.RecipeCategory.acceptCOAOffer ? factory.action.accept.coaOffer.IRecipe : T extends factory.recipe.RecipeCategory.confirmCOAReserve ? factory.action.interact.confirm.reservation.IConfirmCOAReserveRecipe : never;
+export type IActionRecipe<T extends factory.recipe.RecipeCategory> = T extends factory.recipe.RecipeCategory.checkMovieTicket ? factory.action.check.paymentMethod.movieTicket.IRecipe : T extends factory.recipe.RecipeCategory.payCreditCard ? factory.action.trade.pay.IPayCreditCardRecipe : T extends factory.recipe.RecipeCategory.payMovieTicket ? factory.action.trade.pay.IPayMovieTicketRecipe : T extends factory.recipe.RecipeCategory.publishPaymentUrl ? factory.action.accept.pay.IRecipe : T extends factory.recipe.RecipeCategory.refundCreditCard ? factory.action.trade.refund.IRefundCreditCardRecipe : T extends factory.recipe.RecipeCategory.refundMovieTicket ? factory.action.trade.refund.IRefundMovieTicketRecipe : T extends factory.recipe.RecipeCategory.authorizeInvoice ? factory.action.authorize.invoice.IAuthorizeInvoiceRecipe : T extends factory.recipe.RecipeCategory.authorizeInvoice3ds ? factory.action.authorize.invoice.IAuthorizeInvoice3dsRecipe : T extends factory.recipe.RecipeCategory.acceptCOAOffer ? factory.action.accept.coaOffer.IRecipe : T extends factory.recipe.RecipeCategory.confirmCOAReserve ? factory.action.interact.confirm.reservation.IConfirmCOAReserveRecipe : T extends factory.recipe.RecipeCategory.cancelPendingCOAReserve ? factory.action.cancel.coaReserve.ICancelPendingCOAReserveRecipe : T extends factory.recipe.RecipeCategory.returnCOAReserve ? factory.action.transfer.returnAction.reserveTransaction.IReturnCOAReserveRecipe : T extends factory.recipe.RecipeCategory.sendEmailMessage ? factory.action.transfer.send.message.email.IRecipe : never;
 export type IRecipeAsDocument = factory.recipe.IRecipe & {
     recipeFor: {
         id: string;
@@ -26,7 +26,7 @@ export type IRecipeAsDocument = factory.recipe.IRecipe & {
     dateCreated: Date;
     dateModified?: Date;
 };
-export type IRecipeAsActionAttributes = Pick<factory.recipe.IRecipe, 'project' | 'recipeCategory' | 'step' | 'typeOf'>;
+export type IRecipeAsActionAttributes<T extends factory.recipe.RecipeCategory> = Pick<IActionRecipe<T>, 'project' | 'recipeCategory' | 'step' | 'typeOf'>;
 export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
     knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
 };
@@ -35,7 +35,7 @@ export declare const AVAILABLE_PROJECT_FIELDS: IKeyOfProjection[];
 /**
  * アクション状態管理リポジトリ
  */
-export declare class ActionProcessRepo<TAction extends factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>> {
+export declare class ActionProcessRepo<TAction extends IAction<factory.actionType>, TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> {
     protected readonly actionModel: IActionModel;
     protected readonly actionRecipeModel: IActionRecipeModel;
     constructor(connection: Connection);
@@ -43,13 +43,13 @@ export declare class ActionProcessRepo<TAction extends factory.action.IAction<fa
      * アクション開始
      */
     start<T extends TAction['typeOf']>(attributes: factory.action.IAttributes<T, any, any>, options?: {
-        recipe?: IRecipeAsActionAttributes;
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
     completeWithVoid(params: {
         typeOf: TAction['typeOf'];
         id: string;
         result: any;
-        recipe?: IRecipeAsActionAttributes;
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<void>;
     /**
      * アクション取消
@@ -66,7 +66,7 @@ export declare class ActionProcessRepo<TAction extends factory.action.IAction<fa
         typeOf: TAction['typeOf'];
         id: string;
         error: Error | Error[];
-        recipe?: IRecipeAsActionAttributes;
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<void>;
     /**
      * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
@@ -80,7 +80,7 @@ export declare class ActionProcessRepo<TAction extends factory.action.IAction<fa
             $lt: Date;
         };
     }): Promise<any>;
-    findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
+    findRecipeByAction<T extends TActionRecipe['recipeCategory']>(params: {
         project: {
             id: string;
         };
@@ -88,10 +88,28 @@ export declare class ActionProcessRepo<TAction extends factory.action.IAction<fa
             id: string;
         };
     }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null>;
-    findById<T extends factory.actionType>(params: {
-        typeOf: T;
+    findById(params: {
+        typeOf: TAction['typeOf'];
         id: string;
-    }, inclusion?: IKeyOfProjection[], exclusion?: IKeyOfProjection[]): Promise<IAction<T>>;
+    }, inclusion?: IKeyOfProjection[], exclusion?: IKeyOfProjection[]): Promise<TAction>;
+    searchBySameAs(params: {
+        sameAs: {
+            id: {
+                $eq: string;
+            };
+        };
+        purpose?: {
+            id: {
+                $eq: string;
+            };
+        };
+        /**
+         * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
+         */
+        typeOf: {
+            $eq: TAction['typeOf'];
+        };
+    }): Promise<Pick<TAction, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
     private findActionStatusById;
     protected upsertRecipe(savingRecipe: Pick<IRecipeAsDocument, 'project' | 'recipeCategory' | 'recipeFor' | 'step' | 'typeOf'>): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/action/actionProcess.js

@@ -68,7 +68,9 @@ class ActionProcessRepo {
     /**
      * アクション開始
      */
-    async start(attributes, options) {
+    async start(
+    // public async start<T extends Exclude<TAction['typeOf'], factory.actionType.AcceptAction>>(
+    attributes, options) {
         const startDate = new Date();
         const creatingAction = {
             ...attributes,
@@ -228,6 +230,27 @@ class ActionProcessRepo {
         }
         return doc;
     }
+    async searchBySameAs(params) {
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            actionStatus: 1,
+            error: 1,
+            purpose: 1
+        };
+        const query = this.actionModel.find({
+            typeOf: { $eq: params.typeOf.$eq },
+            'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq },
+            ...(typeof params.purpose?.id.$eq === 'string')
+                ? { 'purpose.id': { $exists: true, $eq: params.purpose.id.$eq } }
+                : undefined
+        }, projection)
+            // .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })
+            .limit(1);
+        return query
+            .lean() // 2024-08-26~
+            .exec();
+    }
     async findActionStatusById(params) {
         const projection = {
             _id: 0,

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

@@ -1,17 +1,17 @@
 import * as factory from '../../factory';
-import { IRecipeAsActionAttributes, ActionProcessRepo } from './actionProcess';
+import { ActionProcessRepo } from './actionProcess';
 export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
 /**
  * オファー承認リポジトリ
  */
-export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthorizeOfferAction> {
+export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthorizeOfferAction, never> {
     /**
      * アクション再開
      */
     reStart(params: {
         typeOf: factory.actionType;
         id: string;
-        recipe?: IRecipeAsActionAttributes;
+        recipe?: never;
     }): Promise<void>;
     reCompleteAuthorizeEventOfferAction(params: {
         id: string;

package/lib/chevre/repo/action/authorizeOffer.js

@@ -53,10 +53,10 @@ class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
         if (doc === null) {
             throw new factory.errors.NotFound(this.actionModel.modelName);
         }
-        // add recipe(2024-06-09~)
-        if (params.recipe?.typeOf === 'Recipe') {
-            await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
-        }
+        // // add recipe(2024-06-09~)
+        // if (params.recipe?.typeOf === 'Recipe') {
+        //     await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
+        // }
     }
     async reCompleteAuthorizeEventOfferAction(params) {
         return this.actionModel.findOneAndUpdate({

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

@@ -0,0 +1,55 @@
+import { factory as surfrockFactory } from '@surfrock/sdk';
+import * as factory from '../../factory';
+import { ActionProcessRepo, IActionRecipe } from './actionProcess';
+export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
+    knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
+};
+export type ICheckMovieTicketAction = factory.action.check.paymentMethod.movieTicket.IAction;
+/**
+ * 決済カード認証アクションリポジトリ
+ */
+export declare class CheckMovieTicketActionRepo extends ActionProcessRepo<ICheckMovieTicketAction, IActionRecipe<factory.recipe.RecipeCategory.checkMovieTicket>> {
+    /**
+     * アクションIDからレシピのafterMediaを参照する
+     */
+    findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe(params: {
+        project: {
+            id: string;
+        };
+        recipeFor: {
+            id: string;
+        };
+    }): Promise<IMinimizedPurchaseNumberAuthResult | undefined>;
+    searchYkknInfoByCheckRecipe(filter: {
+        limit: number;
+        page: number;
+        /**
+         * 認証アクションID
+         */
+        id: string;
+        project: {
+            id: string;
+        };
+        purpose: {
+            id: string;
+        };
+    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.IValidTicket & {
+        knyknrNo: string;
+    })[]>;
+    searchMkknInfoByCheckRecipe(filter: {
+        limit: number;
+        page: number;
+        /**
+         * 認証アクションID
+         */
+        id: string;
+        project: {
+            id: string;
+        };
+        purpose: {
+            id: string;
+        };
+    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.INvalidTicket & {
+        knyknrNo: string;
+    })[]>;
+}

package/lib/chevre/repo/action/checkMovieTicket.js

@@ -0,0 +1,145 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CheckMovieTicketActionRepo = void 0;
+const factory = __importStar(require("../../factory"));
+const settings_1 = require("../../settings");
+const actionProcess_1 = require("./actionProcess");
+/**
+ * 決済カード認証アクションリポジトリ
+ */
+class CheckMovieTicketActionRepo extends actionProcess_1.ActionProcessRepo {
+    /**
+     * アクションIDからレシピのafterMediaを参照する
+     */
+    async findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe(params) {
+        const recipe = await this.actionRecipeModel.findOne({
+            'project.id': { $eq: params.project.id },
+            'recipeFor.id': { $eq: params.recipeFor.id }
+        }, {
+            project: 0,
+            typeOf: 0,
+            recipeCategory: 0,
+            recipeFor: 0,
+            dateCreated: 0,
+            dateModified: 0,
+            'step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo': 0,
+            'step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo': 0
+        }, { lean: true })
+            .exec();
+        return recipe?.step[0]?.itemListElement[0]?.itemListElement[0]?.afterMedia;
+    }
+    async searchYkknInfoByCheckRecipe(filter) {
+        const filterQuery = {
+            _id: { $eq: filter.id },
+            'project.id': { $eq: filter.project.id },
+            'purpose.id': { $exists: true, $eq: filter.purpose.id },
+            typeOf: { $eq: factory.actionType.CheckAction },
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+        };
+        const actionDoc = await this.actionModel.findOne(filterQuery, { _id: 1 }, { lean: true })
+            .exec();
+        if (actionDoc === null) {
+            throw new factory.errors.NotFound(this.actionModel.modelName);
+        }
+        const filterQuery4recipe = {
+            'recipeFor.id': { $eq: filter.id }
+        };
+        const projectStage = {
+            _id: 0,
+            knyknrNo: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.knyknrNo',
+            ykknshTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.ykknshTyp',
+            eishhshkTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.eishhshkTyp',
+            ykknKnshbtsmiNum: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.ykknKnshbtsmiNum',
+            knshknhmbiUnip: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.knshknhmbiUnip',
+            kijUnip: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.kijUnip'
+        };
+        const aggregate = this.actionRecipeModel.aggregate([
+            { $unwind: '$step' },
+            { $unwind: '$step.itemListElement' },
+            { $unwind: '$step.itemListElement.itemListElement' },
+            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut' },
+            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo' },
+            { $match: filterQuery4recipe },
+            { $project: projectStage }
+        ]);
+        if (typeof filter.limit === 'number' && filter.limit > 0) {
+            const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
+            aggregate.limit(filter.limit * page)
+                .skip(filter.limit * (page - 1));
+        }
+        return aggregate
+            .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+    }
+    async searchMkknInfoByCheckRecipe(filter) {
+        const filterQuery = {
+            _id: { $eq: filter.id },
+            'project.id': { $eq: filter.project.id },
+            'purpose.id': { $exists: true, $eq: filter.purpose.id },
+            typeOf: { $eq: factory.actionType.CheckAction },
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+        };
+        const actionDoc = this.actionModel.findOne(filterQuery, { _id: 1 }, { lean: true })
+            .exec();
+        if (actionDoc === null) {
+            throw new factory.errors.NotFound(this.actionModel.modelName);
+        }
+        const filterQuery4recipe = {
+            'recipeFor.id': { $eq: filter.id }
+        };
+        const projectStage = {
+            _id: 0,
+            knyknrNo: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.knyknrNo',
+            mkknshTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.mkknshTyp',
+            mkknKnshbtsmiNum: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.mkknKnshbtsmiNum',
+            mkjyTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.mkjyTyp',
+            yykDt: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.yykDt',
+            shyJeiDt: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shyJeiDt',
+            shyStCd: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shyStCd',
+            shyScrnCd: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shyScrnCd',
+            shySkhnCd: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shySkhnCd',
+            shySkhnNm: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shySkhnNm'
+        };
+        const aggregate = this.actionRecipeModel.aggregate([
+            { $unwind: '$step' },
+            { $unwind: '$step.itemListElement' },
+            { $unwind: '$step.itemListElement.itemListElement' },
+            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut' },
+            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo' },
+            { $match: filterQuery4recipe },
+            { $project: projectStage }
+        ]);
+        if (typeof filter.limit === 'number' && filter.limit > 0) {
+            const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
+            aggregate.limit(filter.limit * page)
+                .skip(filter.limit * (page - 1));
+        }
+        return aggregate
+            .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+    }
+}
+exports.CheckMovieTicketActionRepo = CheckMovieTicketActionRepo;

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

@@ -0,0 +1,8 @@
+import * as factory from '../../factory';
+import { ActionProcessRepo } from './actionProcess';
+export type ICheckThingAction = factory.action.check.thing.IAction;
+/**
+ * 汎用リソース検証アクションリポジトリ
+ */
+export declare class CheckThingActionRepo extends ActionProcessRepo<ICheckThingAction, never> {
+}

package/lib/chevre/repo/action/checkThing.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CheckThingActionRepo = void 0;
+// import { MONGO_MAX_TIME_MS } from '../settings';
+// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
+// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
+const actionProcess_1 = require("./actionProcess");
+/**
+ * 汎用リソース検証アクションリポジトリ
+ */
+class CheckThingActionRepo extends actionProcess_1.ActionProcessRepo {
+}
+exports.CheckThingActionRepo = CheckThingActionRepo;

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

@@ -1,39 +1,17 @@
-import { factory as surfrockFactory } from '@surfrock/sdk';
 import { FilterQuery, UpdateQuery } from 'mongoose';
 import * as factory from '../factory';
-import { IKeyOfProjection, ActionProcessRepo } from './action/actionProcess';
+import { IAction, IKeyOfProjection, ActionProcessRepo, ICancelActionAction, IActionRecipe } from './action/actionProcess';
 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.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>>;
-export interface ICancelActionAction {
-    typeOf: factory.actionType.CancelAction;
-    agent: factory.action.IParticipantAsPerson | factory.action.IParticipantAsProject | factory.action.IParticipantAsWebApplication;
-    endTime: Date;
-    startTime: Date;
-    sameAs?: {
-        id: string;
-        typeOf: 'Task';
-    };
-}
-export type IActionRecipe<T extends factory.recipe.RecipeCategory> = T extends factory.recipe.RecipeCategory.checkMovieTicket ? factory.action.check.paymentMethod.movieTicket.IRecipe : T extends factory.recipe.RecipeCategory.payCreditCard ? factory.action.trade.pay.IPayCreditCardRecipe : T extends factory.recipe.RecipeCategory.payMovieTicket ? factory.action.trade.pay.IPayMovieTicketRecipe : T extends factory.recipe.RecipeCategory.publishPaymentUrl ? factory.action.accept.pay.IRecipe : T extends factory.recipe.RecipeCategory.refundCreditCard ? factory.action.trade.refund.IRefundCreditCardRecipe : T extends factory.recipe.RecipeCategory.refundMovieTicket ? factory.action.trade.refund.IRefundMovieTicketRecipe : T extends factory.recipe.RecipeCategory.acceptCOAOffer ? factory.action.accept.coaOffer.IRecipe : T extends factory.recipe.RecipeCategory.confirmCOAReserve ? factory.action.interact.confirm.reservation.IConfirmCOAReserveRecipe : never;
-export type IRecipeAsDocument = factory.recipe.IRecipe & {
-    recipeFor: {
-        id: string;
-        typeOf: factory.actionType;
-    };
-    dateCreated: Date;
-    dateModified?: Date;
-};
-export type IRecipeAsActionAttributes = Pick<factory.recipe.IRecipe, 'project' | 'recipeCategory' | 'step' | 'typeOf'>;
-export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
-    knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
-};
+export { ICancelActionAction };
+/**
+ * 汎用アクションリポジトリで開始可能なアクションタイプ
+ */
+type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction>;
+type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl>>;
 /**
  * アクションリポジトリ
  */
-export declare class ActionRepo extends ActionProcessRepo<factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>> {
+export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActionType>, IAvailableActionRecipe> {
     static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): any[];
     /**
      * アクション検索
@@ -77,24 +55,6 @@ export declare class ActionRepo extends ActionProcessRepo<factory.action.IAction
         orderNumber: string;
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<factory.actionType>[]>;
-    searchBySameAs<T extends factory.actionType>(params: {
-        sameAs: {
-            id: {
-                $eq: string;
-            };
-        };
-        purpose?: {
-            id: {
-                $eq: string;
-            };
-        };
-        /**
-         * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
-         */
-        typeOf: {
-            $eq: T;
-        };
-    }): Promise<Pick<IAction<T>, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
     deleteByProject(params: {
         project: {
             id: string;
@@ -112,38 +72,6 @@ export declare class ActionRepo extends ActionProcessRepo<factory.action.IAction
      * イベントと入場ゲート指定で予約使用アクションを集計する
      * discontinue(2024-12-26~)
      */
-    searchYkknInfoByCheckRecipe(filter: {
-        limit: number;
-        page: number;
-        /**
-         * 認証アクションID
-         */
-        id: string;
-        project: {
-            id: string;
-        };
-        purpose: {
-            id: string;
-        };
-    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.IValidTicket & {
-        knyknrNo: string;
-    })[]>;
-    searchMkknInfoByCheckRecipe(filter: {
-        limit: number;
-        page: number;
-        /**
-         * 認証アクションID
-         */
-        id: string;
-        project: {
-            id: string;
-        };
-        purpose: {
-            id: string;
-        };
-    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.INvalidTicket & {
-        knyknrNo: string;
-    })[]>;
     /**
      * 開始日時を一定期間過ぎたアクションを削除する
      */
@@ -174,14 +102,6 @@ export declare class ActionRepo extends ActionProcessRepo<factory.action.IAction
     }): Promise<{
         deletedCount?: number;
     } | null>;
-    findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe(params: {
-        project: {
-            id: string;
-        };
-        recipeFor: {
-            id: string;
-        };
-    }): Promise<IMinimizedPurchaseNumberAuthResult | undefined>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType, any, any>>, "id"> & {
         identifier?: string;
     }> & Omit<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType, any, any>>, "id"> & {

package/lib/chevre/repo/action.js

@@ -836,27 +836,6 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
             .lean() // 2024-08-26~
             .exec();
     }
-    async searchBySameAs(params) {
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            actionStatus: 1,
-            error: 1,
-            purpose: 1
-        };
-        const query = this.actionModel.find({
-            typeOf: { $eq: params.typeOf.$eq },
-            'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq },
-            ...(typeof params.purpose?.id.$eq === 'string')
-                ? { 'purpose.id': { $exists: true, $eq: params.purpose.id.$eq } }
-                : undefined
-        }, projection)
-            // .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })
-            .limit(1);
-        return query
-            .lean() // 2024-08-26~
-            .exec();
-    }
     async deleteByProject(params) {
         await this.actionModel.deleteMany({
             'project.id': { $eq: params.project.id }
@@ -968,96 +947,6 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //     ])
     //         .exec();
     // }
-    async searchYkknInfoByCheckRecipe(filter) {
-        const filterQuery = {
-            _id: { $eq: filter.id },
-            'project.id': { $eq: filter.project.id },
-            'purpose.id': { $exists: true, $eq: filter.purpose.id },
-            typeOf: { $eq: factory.actionType.CheckAction },
-            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        };
-        const actionDoc = await this.actionModel.findOne(filterQuery, { _id: 1 }, { lean: true })
-            .exec();
-        if (actionDoc === null) {
-            throw new factory.errors.NotFound(this.actionModel.modelName);
-        }
-        const filterQuery4recipe = {
-            'recipeFor.id': { $eq: filter.id }
-        };
-        const projectStage = {
-            _id: 0,
-            knyknrNo: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.knyknrNo',
-            ykknshTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.ykknshTyp',
-            eishhshkTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.eishhshkTyp',
-            ykknKnshbtsmiNum: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.ykknKnshbtsmiNum',
-            knshknhmbiUnip: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.knshknhmbiUnip',
-            kijUnip: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo.kijUnip'
-        };
-        const aggregate = this.actionRecipeModel.aggregate([
-            { $unwind: '$step' },
-            { $unwind: '$step.itemListElement' },
-            { $unwind: '$step.itemListElement.itemListElement' },
-            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut' },
-            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo' },
-            { $match: filterQuery4recipe },
-            { $project: projectStage }
-        ]);
-        if (typeof filter.limit === 'number' && filter.limit > 0) {
-            const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
-            aggregate.limit(filter.limit * page)
-                .skip(filter.limit * (page - 1));
-        }
-        return aggregate
-            .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-    }
-    async searchMkknInfoByCheckRecipe(filter) {
-        const filterQuery = {
-            _id: { $eq: filter.id },
-            'project.id': { $eq: filter.project.id },
-            'purpose.id': { $exists: true, $eq: filter.purpose.id },
-            typeOf: { $eq: factory.actionType.CheckAction },
-            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        };
-        const actionDoc = this.actionModel.findOne(filterQuery, { _id: 1 }, { lean: true })
-            .exec();
-        if (actionDoc === null) {
-            throw new factory.errors.NotFound(this.actionModel.modelName);
-        }
-        const filterQuery4recipe = {
-            'recipeFor.id': { $eq: filter.id }
-        };
-        const projectStage = {
-            _id: 0,
-            knyknrNo: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.knyknrNo',
-            mkknshTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.mkknshTyp',
-            mkknKnshbtsmiNum: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.mkknKnshbtsmiNum',
-            mkjyTyp: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.mkjyTyp',
-            yykDt: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.yykDt',
-            shyJeiDt: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shyJeiDt',
-            shyStCd: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shyStCd',
-            shyScrnCd: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shyScrnCd',
-            shySkhnCd: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shySkhnCd',
-            shySkhnNm: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo.shySkhnNm'
-        };
-        const aggregate = this.actionRecipeModel.aggregate([
-            { $unwind: '$step' },
-            { $unwind: '$step.itemListElement' },
-            { $unwind: '$step.itemListElement.itemListElement' },
-            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut' },
-            { $unwind: '$step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo' },
-            { $match: filterQuery4recipe },
-            { $project: projectStage }
-        ]);
-        if (typeof filter.limit === 'number' && filter.limit > 0) {
-            const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
-            aggregate.limit(filter.limit * page)
-                .skip(filter.limit * (page - 1));
-        }
-        return aggregate
-            .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-    }
     /**
      * 開始日時を一定期間過ぎたアクションを削除する
      */
@@ -1157,23 +1046,6 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //     // }
     //     // return result;
     // }
-    async findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe(params) {
-        const recipe = await this.actionRecipeModel.findOne({
-            'project.id': { $eq: params.project.id },
-            'recipeFor.id': { $eq: params.recipeFor.id }
-        }, {
-            project: 0,
-            typeOf: 0,
-            recipeCategory: 0,
-            recipeFor: 0,
-            dateCreated: 0,
-            dateModified: 0,
-            'step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.ykknInfo': 0,
-            'step.itemListElement.itemListElement.afterMedia.knyknrNoInfoOut.mkknInfo': 0
-        }, { lean: true })
-            .exec();
-        return recipe?.step[0]?.itemListElement[0]?.itemListElement[0]?.afterMedia;
-    }
     getCursor(conditions, projection) {
         return this.actionModel.find(conditions, projection)
             .sort({ startDate: factory.sortType.Descending })

package/lib/chevre/repository.d.ts

@@ -9,7 +9,10 @@ import type { AccountTitleRepo } from './repo/accountTitle';
 import type { AccountTransactionRepo } from './repo/accountTransaction';
 import type { ActionRepo } from './repo/action';
 import type { AcceptCOAOfferActionRepo } from './repo/action/acceptCOAOffer';
+import type { AcceptPayActionRepo } from './repo/action/acceptPay';
 import type { AuthorizeOfferActionRepo } from './repo/action/authorizeOffer';
+import type { CheckMovieTicketActionRepo } from './repo/action/checkMovieTicket';
+import type { CheckThingActionRepo } from './repo/action/checkThing';
 import type { AdditionalPropertyRepo } from './repo/additionalProperty';
 import type { AdvanceBookingRequirementRepo } from './repo/advanceBookingRequirement';
 import type { AggregateActionRepo } from './repo/aggregateAction';
@@ -131,10 +134,22 @@ export declare namespace action {
     namespace AcceptCOAOffer {
         function createInstance(...params: ConstructorParameters<typeof AcceptCOAOfferActionRepo>): Promise<AcceptCOAOfferActionRepo>;
     }
+    type AcceptPay = AcceptPayActionRepo;
+    namespace AcceptPay {
+        function createInstance(...params: ConstructorParameters<typeof AcceptPayActionRepo>): Promise<AcceptPayActionRepo>;
+    }
     type AuthorizeOffer = AuthorizeOfferActionRepo;
     namespace AuthorizeOffer {
         function createInstance(...params: ConstructorParameters<typeof AuthorizeOfferActionRepo>): Promise<AuthorizeOfferActionRepo>;
     }
+    type CheckMovieTicket = CheckMovieTicketActionRepo;
+    namespace CheckMovieTicket {
+        function createInstance(...params: ConstructorParameters<typeof CheckMovieTicketActionRepo>): Promise<CheckMovieTicketActionRepo>;
+    }
+    type CheckThing = CheckThingActionRepo;
+    namespace CheckThing {
+        function createInstance(...params: ConstructorParameters<typeof CheckThingActionRepo>): Promise<CheckThingActionRepo>;
+    }
 }
 export type AdditionalProperty = AdditionalPropertyRepo;
 export declare namespace AdditionalProperty {

package/lib/chevre/repository.js

@@ -115,6 +115,17 @@ var action;
         }
         AcceptCOAOffer.createInstance = createInstance;
     })(AcceptCOAOffer = action.AcceptCOAOffer || (action.AcceptCOAOffer = {}));
+    let AcceptPay;
+    (function (AcceptPay) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/action/acceptPay')))).AcceptPayActionRepo;
+            }
+            return new repo(...params);
+        }
+        AcceptPay.createInstance = createInstance;
+    })(AcceptPay = action.AcceptPay || (action.AcceptPay = {}));
     let AuthorizeOffer;
     (function (AuthorizeOffer) {
         let repo;
@@ -126,6 +137,28 @@ var action;
         }
         AuthorizeOffer.createInstance = createInstance;
     })(AuthorizeOffer = action.AuthorizeOffer || (action.AuthorizeOffer = {}));
+    let CheckMovieTicket;
+    (function (CheckMovieTicket) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/action/checkMovieTicket')))).CheckMovieTicketActionRepo;
+            }
+            return new repo(...params);
+        }
+        CheckMovieTicket.createInstance = createInstance;
+    })(CheckMovieTicket = action.CheckMovieTicket || (action.CheckMovieTicket = {}));
+    let CheckThing;
+    (function (CheckThing) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/action/checkThing')))).CheckThingActionRepo;
+            }
+            return new repo(...params);
+        }
+        CheckThing.createInstance = createInstance;
+    })(CheckThing = action.CheckThing || (action.CheckThing = {}));
 })(action || (exports.action = action = {}));
 var AdditionalProperty;
 (function (AdditionalProperty) {

package/lib/chevre/service/assetTransaction/pay/check.d.ts

@@ -1,20 +1,21 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import * as MovieTicketPayment from '../../payment/movieTicket';
-export type ICheckOperation<T> = (repos: {
-    action: ActionRepo;
+export interface ICheckRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<T>;
+}
+export type ICheckOperation<T> = (repos: ICheckRepos, settings: Settings) => Promise<T>;
 /**
  * 決済方法認証
  */

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.d.ts

@@ -2,21 +2,24 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 import type { ActionRepo } from '../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import * as CreditCardPayment from '../../payment/creditCard';
-export type IPublishPaymentUrlOperation<T> = (repos: {
+export interface IPublishPaymentUrlRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
+    acceptPayAction: AcceptPayActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<T>;
+}
+export type IPublishPaymentUrlOperation<T> = (repos: IPublishPaymentUrlRepos, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransaction & {
     paymentMethodId: string;
     paymentUrl: string;

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js

@@ -102,7 +102,7 @@ function publishPaymentUrl(params, options) {
                 : undefined,
             ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.acceptPayAction.start(actionAttributes);
         let result;
         let recipe;
         try {
@@ -147,7 +147,7 @@ function publishPaymentUrl(params, options) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                await repos.acceptPayAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -158,7 +158,7 @@ function publishPaymentUrl(params, options) {
             paymentMethodId: result.paymentMethodId,
             paymentUrl: result.paymentUrl
         };
-        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.acceptPayAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return result;
     };
 }

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

@@ -1,12 +1,23 @@
 import type * as COA from '@motionpicture/coa-service';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { EventRepo } from '../../../repo/event';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 interface IAcceptRepos {
-    action: ActionRepo;
+    action: AcceptCOAOfferActionRepo;
+    event: EventRepo;
+    orderNumber: OrderNumberRepo;
+    project: ProjectRepo;
+    placeOrder: PlaceOrderRepo;
+    reserveService: COA.service.Reserve;
+    masterService: COA.service.Master;
+}
+interface IReAcceptRepos {
+    action: AcceptCOAOfferActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     event: EventRepo;
     orderNumber: OrderNumberRepo;
     project: ProjectRepo;
@@ -34,5 +45,5 @@ declare function reAcceptOffer(params: IAccepteOfferParams & {
          */
         id: string;
     };
-}): (repos: IAcceptRepos) => Promise<void>;
+}): (repos: IReAcceptRepos) => Promise<void>;
 export { acceptOffer, reAcceptOffer };

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

@@ -155,7 +155,7 @@ function reAcceptOffer(params) {
         }
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         // 承認アクション存在検証
-        await repos.action.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['id'], []);
+        await repos.authorizeOfferAction.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['id'], []);
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,

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

@@ -75,7 +75,7 @@ function authorizeByAcceptAction(params) {
         }
         else {
             // recipe依存へ変更(2024-06-11~)
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: params.object.id }
             });

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

@@ -135,7 +135,7 @@ function changeOffers(params) {
         // authorizeAction.object.acceptedOffer = acceptedOffers; // discontinue acceptedOffers(2024-06-21~)
         // recipe依存へ変更(2024-06-11~)
         // const updTmpReserveSeatResult = authorizeAction.result?.responseBody;
-        const recipe = await repos.action.findRecipeByAction({
+        const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
             project: { id: transaction.project.id },
             recipeFor: { id: originalAcceptActionId }
         });

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

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

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

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

package/lib/chevre/service/payment/any/findAcceptAction.js

@@ -55,7 +55,7 @@ function findAcceptAction(params) {
                 break;
             default:
                 // タスクがReadyでなければアクション検索
-                const acceptAction = (await repos.action.searchBySameAs({
+                const acceptAction = (await repos.acceptPayAction.searchBySameAs({
                     sameAs: { id: { $eq: task.id } },
                     typeOf: { $eq: factory.actionType.AcceptAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
@@ -65,7 +65,7 @@ function findAcceptAction(params) {
                     if (acceptAction.purpose?.id !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    const acceptActionWithResult = await repos.action.findById({ id: acceptAction.id, typeOf: factory.actionType.AcceptAction }, ['result', 'object'], []);
+                    const acceptActionWithResult = await repos.acceptPayAction.findById({ id: acceptAction.id, typeOf: factory.actionType.AcceptAction }, ['result', 'object'], []);
                     action = {
                         id: acceptAction.id,
                         actionStatus: acceptAction.actionStatus,

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

@@ -1,6 +1,10 @@
 import * as factory from '../../../factory';
-import type { ActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../../repo/action/checkMovieTicket';
 import type { TaskRepo } from '../../../repo/task';
+interface IFindCheckActionRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    task: TaskRepo;
+}
 interface IFindCheckActionResult {
     /**
      * アクションID
@@ -37,8 +41,5 @@ declare function findCheckAction(params: {
          */
         id: string;
     };
-}): (repos: {
-    action: ActionRepo;
-    task: TaskRepo;
-}) => Promise<IFindCheckActionResult>;
-export { findCheckAction, };
+}): (repos: IFindCheckActionRepos) => Promise<IFindCheckActionResult>;
+export { IFindCheckActionRepos, findCheckAction, };

package/lib/chevre/service/payment/any/findCheckAction.js

@@ -55,7 +55,7 @@ function findCheckAction(params) {
                 break;
             default:
                 // タスクがReadyでなければアクション検索
-                const authorizeAction = (await repos.action.searchBySameAs({
+                const authorizeAction = (await repos.checkMovieTicketAction.searchBySameAs({
                     sameAs: { id: { $eq: task.id } },
                     typeOf: { $eq: factory.actionType.CheckAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
@@ -66,7 +66,7 @@ function findCheckAction(params) {
                         throw new factory.errors.NotFound('Action');
                     }
                     // result from recipe(2024-06-10~)
-                    const purchaseNumberAuthResult = await repos.action.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
+                    const purchaseNumberAuthResult = await repos.checkMovieTicketAction.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
                         project: { id: params.project.id },
                         recipeFor: { id: authorizeAction.id }
                     });

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

@@ -2,6 +2,7 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 import type { ActionRepo } from '../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
@@ -18,6 +19,7 @@ import * as PayTransactionService from '../../assetTransaction/pay';
 interface IPublishPaymentUrlRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
+    acceptPayAction: AcceptPayActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.d.ts

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -8,7 +8,7 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import { ICheckResult } from './processPurchaseNumberAuth';
 interface ICheckOperationRepos {
-    action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
@@ -22,4 +22,4 @@ type ICheckOperation<T> = (repos: ICheckOperationRepos, settings: Settings) => P
 declare function checkMovieTicket(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<{
     result: ICheckResult;
 }>;
-export { checkMovieTicket };
+export { ICheckOperationRepos, checkMovieTicket };

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -65,7 +65,7 @@ function checkMovieTicket(params) {
                 ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } // タスク関連付け(2024-05-21~)
                 : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.checkMovieTicketAction.start(actionAttributes);
         let processPurchaseNumberAuthResult;
         let recipe;
         try {
@@ -99,7 +99,7 @@ function checkMovieTicket(params) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
             const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
             try {
-                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
+                await repos.checkMovieTicketAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -107,7 +107,7 @@ function checkMovieTicket(params) {
             throw errors[0];
         }
         const result = {};
-        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
+        await repos.checkMovieTicketAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
         return { result: processPurchaseNumberAuthResult };
     };
 }

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

@@ -26,7 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const COA = __importStar(require("@motionpicture/coa-service"));
 const factory = __importStar(require("../../factory"));
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
+const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const orderNumber_1 = require("../../repo/orderNumber");
@@ -76,7 +78,7 @@ function call(params) {
                 ...(credentialsRepo !== undefined) ? { credentialsRepo } : undefined
             });
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const reserveService = new COA.service.Reserve({
@@ -103,6 +105,7 @@ function call(params) {
                     isMember
                 })({
                     action: actionRepo,
+                    authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),

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

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
-const action_1 = require("../../repo/action");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
@@ -45,7 +45,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
@@ -56,7 +56,7 @@ function call(params) {
                 ...params.data,
                 sameAs: { id: params.id, typeOf: 'Task' }
             })({
-                action: actionRepo,
+                checkMovieTicketAction: actionRepo,
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
                     scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0

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

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const action_1 = require("../../repo/action");
+const checkThing_1 = require("../../repo/action/checkThing");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -43,7 +43,7 @@ function call(params) {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new checkThing_1.CheckThingActionRepo(connection);
         const { data } = params;
         const actionAttributes = {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },

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

@@ -27,6 +27,7 @@ exports.call = call;
 const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const action_1 = require("../../repo/action");
+const acceptPay_1 = require("../../repo/action/acceptPay");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
@@ -54,7 +55,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, any_1.publishPaymentUrl)({
@@ -63,7 +64,8 @@ function call(params) {
                 sameAs: { id: params.id }
             })({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
-                action: actionRepo,
+                action: new action_1.ActionRepo(connection),
+                acceptPayAction: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 event: new event_1.EventRepo(connection),

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.17"
+  "version": "24.0.0-alpha.19"
 }