@chevre/domain 26.0.0-alpha.35 → 26.0.0-alpha.37

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

@@ -1,7 +1,7 @@
 import { Connection } from 'mongoose';
 import { factory } from '../../factory';
 import { IModel as IActionModel } from '../mongoose/schemas/action';
-import { IModel as IActionRecipeModel } from '../mongoose/schemas/actionRecipe';
+import { ActionRecipeRepo, IActionRecipe, IRecipeAsActionAttributes } from './actionRecipe';
 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.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 : T extends factory.actionType.CreateAction ? factory.action.create.IAction : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 export interface ICancelActionAction {
@@ -14,40 +14,29 @@ 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.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;
-        typeOf: factory.actionType;
-    };
-    dateCreated: Date;
-    dateModified?: Date;
-};
-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;
-};
+export { IActionRecipe };
 export type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.ReplaceAction> | 'identifier';
 export declare const AVAILABLE_PROJECT_FIELDS: IKeyOfProjection[];
 /**
  * アクション状態管理リポジトリ
  */
-export declare class ActionProcessRepo<TAction extends IAction<factory.actionType>, TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> {
+export declare class ActionProcessRepo<TAction extends IAction<factory.actionType>, TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> extends ActionRecipeRepo<TActionRecipe> {
     protected readonly actionModel: IActionModel;
-    protected readonly actionRecipeModel: IActionRecipeModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): any[];
     /**
      * アクション開始
      */
-    start<T extends TAction['typeOf']>(attributes: factory.action.IAttributes<T, any, any>, // eslint-disable-line @typescript-eslint/no-explicit-any
-    options?: {
+    start<T extends TAction['typeOf']>(attributes: factory.action.IAttributes<T, any, any> & {
+        expires?: Date;
+    }, options?: {
         recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
     completeWithVoid(params: {
         typeOf: TAction['typeOf'];
         id: string;
         result: any;
+        expires?: Date;
         recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<void>;
     /**
@@ -65,28 +54,9 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
         typeOf: TAction['typeOf'];
         id: string;
         error: Error | Error[] | unknown;
+        expires?: Date;
         recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<void>;
-    /**
-     * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
-     */
-    giveUpStartDatePassedCertainPeriod(params: {
-        id?: {
-            $eq?: string;
-        };
-        error: any;
-        startDate: {
-            $lt: Date;
-        };
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    findRecipeByAction<T extends TActionRecipe['recipeCategory']>(params: {
-        project: {
-            id: string;
-        };
-        recipeFor: {
-            id: string;
-        };
-    }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null>;
     findById(params: {
         typeOf: TAction['typeOf'];
         id: string;
@@ -140,5 +110,4 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
         };
         sort?: factory.action.ISortOrder;
     }): Promise<TAction[]>;
-    protected upsertRecipe(savingRecipe: Pick<IRecipeAsDocument, 'project' | 'recipeCategory' | 'recipeFor' | 'step' | 'typeOf'>): Promise<void>;
 }

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

@@ -4,8 +4,8 @@ exports.ActionProcessRepo = exports.AVAILABLE_PROJECT_FIELDS = void 0;
 const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
 const action_1 = require("../mongoose/schemas/action");
-const actionRecipe_1 = require("../mongoose/schemas/actionRecipe");
 const unknown2actionError_1 = require("./unknown2actionError");
+const actionRecipe_1 = require("./actionRecipe");
 exports.AVAILABLE_PROJECT_FIELDS = [
     'project',
     'actionStatus',
@@ -27,15 +27,16 @@ exports.AVAILABLE_PROJECT_FIELDS = [
     'about',
     'identifier',
 ];
+const DEFAULT_EXPIRE_AFTER_SECONDS = 17280000; // 200 days
+const RECIPE_DEFAULT_EXPIRE_AFTER_SECONDS = 17280000; // 200 days
 /**
  * アクション状態管理リポジトリ
  */
-class ActionProcessRepo {
+class ActionProcessRepo extends actionRecipe_1.ActionRecipeRepo {
     actionModel;
-    actionRecipeModel;
     constructor(connection) {
+        super(connection);
         this.actionModel = connection.model(action_1.modelName, (0, action_1.createSchema)());
-        this.actionRecipeModel = connection.model(actionRecipe_1.modelName, (0, actionRecipe_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
         const andConditions = []; // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -436,15 +437,16 @@ class ActionProcessRepo {
     /**
      * アクション開始
      */
-    async start(
-    // public async start<T extends Exclude<TAction['typeOf'], factory.actionType.AcceptAction>>(
-    attributes, // eslint-disable-line @typescript-eslint/no-explicit-any
-    options) {
+    async start(attributes, options) {
         const startDate = new Date();
+        const expires = (attributes.expires instanceof Date)
+            ? attributes.expires
+            : new Date(startDate.getTime() + DEFAULT_EXPIRE_AFTER_SECONDS * 1000);
         const creatingAction = {
             ...attributes,
             actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
-            startDate
+            startDate,
+            expires
         };
         // reimplemnt with insertMany(2024-08-29~)
         const result = await this.actionModel.insertMany(creatingAction, { rawResult: true });
@@ -455,13 +457,17 @@ class ActionProcessRepo {
         // add recipe(2024-06-09~)
         const savingRecipe = options?.recipe;
         if (savingRecipe?.typeOf === 'Recipe') {
-            await this.upsertRecipe({ ...savingRecipe, recipeFor: { id, typeOf: creatingAction.typeOf } });
+            await this.upsertRecipe({ ...savingRecipe, recipeFor: { id, typeOf: creatingAction.typeOf }, expires });
         }
         return { id, startDate, typeOf: creatingAction.typeOf };
     }
     async completeWithVoid(params) {
+        const endDate = new Date();
+        const recipeExpires = (params.expires instanceof Date)
+            ? params.expires
+            : new Date(endDate.getTime() + RECIPE_DEFAULT_EXPIRE_AFTER_SECONDS * 1000);
         if (params.recipe?.typeOf === 'Recipe') {
-            await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
+            await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf }, expires: recipeExpires });
         }
         const doc = await this.actionModel.findOneAndUpdate({
             _id: { $eq: params.id },
@@ -470,7 +476,7 @@ class ActionProcessRepo {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
                 result: params.result,
-                endDate: new Date()
+                endDate
             }
         }, { new: false, projection: { _id: 1 } })
             .lean()
@@ -521,14 +527,15 @@ class ActionProcessRepo {
      * アクション失敗
      */
     async giveUp(params) {
-        // const actionError: IActionError | IActionError[] = (Array.isArray(params.error))
-        //     ? params.error.map((e) => ({ ...e, message: e.message, name: e.name }))
-        //     : { ...params.error, message: params.error.message, name: params.error.name };
+        const endDate = new Date();
+        const recipeExpires = (params.expires instanceof Date)
+            ? params.expires
+            : new Date(endDate.getTime() + RECIPE_DEFAULT_EXPIRE_AFTER_SECONDS * 1000);
         const actionError = Array.isArray(params.error)
             ? params.error.map(unknown2actionError_1.unknown2actionError)
             : (0, unknown2actionError_1.unknown2actionError)(params.error);
         if (params.recipe?.typeOf === 'Recipe') {
-            await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
+            await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf }, expires: recipeExpires });
         }
         const doc = await this.actionModel.findOneAndUpdate({
             typeOf: { $eq: params.typeOf },
@@ -537,7 +544,7 @@ class ActionProcessRepo {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
                 error: actionError,
-                endDate: new Date()
+                endDate
             }
         }, { new: true, projection: { _id: 1 } })
             .lean()
@@ -546,36 +553,6 @@ class ActionProcessRepo {
             throw new factory_1.factory.errors.NotFound(this.actionModel.modelName);
         }
     }
-    /**
-     * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
-     */
-    async giveUpStartDatePassedCertainPeriod(params) {
-        return this.actionModel.updateMany({
-            actionStatus: { $eq: factory_1.factory.actionStatusType.ActiveActionStatus },
-            // 一定期間過ぎたもの
-            startDate: { $lt: params.startDate.$lt },
-            ...(typeof params.id?.$eq === 'string') ? { _id: { $eq: params.id.$eq } } : undefined
-        }, {
-            actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
-            error: params.error,
-            endDate: new Date()
-        })
-            .exec();
-    }
-    async findRecipeByAction(params) {
-        return this.actionRecipeModel.findOne({
-            'project.id': { $eq: params.project.id },
-            'recipeFor.id': { $eq: params.recipeFor.id }
-        }, { step: 1, recipeCategory: 1 }
-        // { lean: true }
-        )
-            .lean()
-            .exec();
-        // if (result === null) {
-        //     throw new factory.errors.NotFound(this.actionRecipeModel.modelName);
-        // }
-        // return result;
-    }
     async findById(params, inclusion, exclusion) {
         let positiveProjectionFields = exports.AVAILABLE_PROJECT_FIELDS;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
@@ -733,26 +710,5 @@ class ActionProcessRepo {
             .lean()
             .exec();
     }
-    async upsertRecipe(savingRecipe) {
-        const dateModified = new Date();
-        const { typeOf, project, recipeCategory, recipeFor, step } = savingRecipe;
-        const filter = {
-            'recipeFor.id': { $eq: recipeFor.id }
-        };
-        const setOnInsert = {
-            project, typeOf, recipeCategory, recipeFor,
-            dateCreated: dateModified
-        };
-        const setKeys = { step, dateModified };
-        const update = {
-            $setOnInsert: setOnInsert,
-            $set: setKeys
-        };
-        await this.actionRecipeModel.updateOne(filter, update, {
-            upsert: true
-            // includeResultMetadata: true
-        })
-            .exec();
-    }
 }
 exports.ActionProcessRepo = ActionProcessRepo;

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

@@ -0,0 +1,32 @@
+import { Connection } from 'mongoose';
+import { factory } from '../../factory';
+import { IModel as IActionRecipeModel } from '../mongoose/schemas/actionRecipe';
+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;
+        typeOf: factory.actionType;
+    };
+    dateCreated: Date;
+    dateModified?: Date;
+    expires: Date;
+};
+export type IRecipeAsActionAttributes<T extends factory.recipe.RecipeCategory> = Pick<IActionRecipe<T>, 'project' | 'recipeCategory' | 'step' | 'typeOf'>;
+/**
+ * アクションレシピリポジトリ
+ */
+export declare class ActionRecipeRepo<TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> {
+    protected readonly actionRecipeModel: IActionRecipeModel;
+    protected constructor(connection: Connection);
+    findRecipeByAction<T extends TActionRecipe['recipeCategory']>(params: {
+        project: {
+            id: string;
+        };
+        recipeFor: {
+            id: string;
+        };
+    }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null>;
+    upsertRecipe(savingRecipe: Pick<IRecipeAsDocument, 'project' | 'recipeCategory' | 'recipeFor' | 'step' | 'typeOf'> & {
+        expires: Date;
+    }): Promise<void>;
+}

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

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionRecipeRepo = void 0;
+const actionRecipe_1 = require("../mongoose/schemas/actionRecipe");
+/**
+ * アクションレシピリポジトリ
+ */
+class ActionRecipeRepo {
+    actionRecipeModel;
+    constructor(connection) {
+        this.actionRecipeModel = connection.model(actionRecipe_1.modelName, (0, actionRecipe_1.createSchema)());
+    }
+    async findRecipeByAction(params) {
+        return this.actionRecipeModel.findOne({
+            'project.id': { $eq: params.project.id },
+            'recipeFor.id': { $eq: params.recipeFor.id }
+        }, { step: 1, recipeCategory: 1 }
+        // { lean: true }
+        )
+            .lean()
+            .exec();
+        // if (result === null) {
+        //     throw new factory.errors.NotFound(this.actionRecipeModel.modelName);
+        // }
+        // return result;
+    }
+    async upsertRecipe(savingRecipe) {
+        const dateModified = new Date();
+        const { typeOf, project, recipeCategory, recipeFor, step, expires } = savingRecipe;
+        const filter = {
+            'recipeFor.id': { $eq: recipeFor.id }
+        };
+        const setOnInsert = {
+            project, typeOf, recipeCategory, recipeFor,
+            dateCreated: dateModified,
+            expires // 必須化(2026-08-16~)
+        };
+        const setKeys = { step, dateModified };
+        const update = {
+            $setOnInsert: setOnInsert,
+            $set: setKeys
+        };
+        await this.actionRecipeModel.updateOne(filter, update, {
+            upsert: true
+            // includeResultMetadata: true
+        })
+            .exec();
+    }
+}
+exports.ActionRecipeRepo = ActionRecipeRepo;

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

@@ -18,8 +18,10 @@ const AVAILABLE_PROJECT_FIELDS = [
     'about',
     'purpose',
     'recipient',
-    'target'
+    'target',
+    'expires'
 ];
+const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * 通知アクションリポジトリ
  */
@@ -65,10 +67,12 @@ class InformActionRepo {
      */
     async startInformAction(attributes) {
         const startDate = new Date();
+        const expires = new Date(startDate.getTime() + EXPIRE_AFTER_SECONDS * 1000);
         const creatingAction = {
             ...attributes,
             actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
-            startDate
+            startDate,
+            expires
         };
         const result = await this.informActionModel.insertMany(creatingAction, { rawResult: true });
         const id = result.insertedIds?.[0]?.toHexString();

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

@@ -3,6 +3,7 @@ import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/action/update';
 type StartableActionType = factory.actionType.AddAction | factory.actionType.UpdateAction | factory.actionType.ReplaceAction | factory.actionType.DeleteAction;
 type IAction<T extends StartableActionType> = 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.DeleteAction ? factory.action.update.deleteAction.IAction : never;
+type IActionAttributes<T extends StartableActionType> = T extends factory.actionType.AddAction ? factory.action.update.add.IAttributes : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAttributes : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAttributes : T extends factory.actionType.DeleteAction ? factory.action.update.deleteAction.IAttributes : never;
 type IKeyOfProjection = keyof IDocType;
 type IFindParams = factory.action.update.update.IFindParams;
 /**
@@ -15,7 +16,7 @@ export declare class UpdateActionRepo {
     /**
      * アクション開始
      */
-    startUpdateAction<T extends StartableActionType>(attributes: factory.action.IAttributes<T, any, any>): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
+    startUpdateAction<T extends StartableActionType>(attributes: IActionAttributes<T>): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
     completeUpdateAction(params: {
         typeOf: StartableActionType;
         id: string;

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

@@ -18,7 +18,9 @@ const AVAILABLE_PROJECT_FIELDS = [
     'instrument',
     'targetCollection',
     'sameAs',
+    'expires'
 ];
+const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * リソース編集アクションリポジトリ
  */
@@ -63,10 +65,12 @@ class UpdateActionRepo {
      */
     async startUpdateAction(attributes) {
         const startDate = new Date();
+        const expires = new Date(startDate.getTime() + EXPIRE_AFTER_SECONDS * 1000);
         const creatingAction = {
             ...attributes,
             actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
-            startDate
+            startDate,
+            expires
         };
         const result = await this.updateActionModel.insertMany(creatingAction, { rawResult: true });
         const id = result.insertedIds?.[0]?.toHexString();

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

@@ -15,8 +15,10 @@ const AVAILABLE_PROJECT_FIELDS = [
     'startDate',
     'endDate',
     'instrument',
-    'location'
+    'location',
+    'expires'
 ];
+const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * 予約使用アクションリポジトリ
  */
@@ -58,10 +60,12 @@ class UseActionRepo {
      */
     async startUseAction(attributes) {
         const startDate = new Date();
+        const expires = new Date(startDate.getTime() + EXPIRE_AFTER_SECONDS * 1000);
         const creatingAction = {
             ...attributes,
             actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
-            startDate
+            startDate,
+            expires
         };
         const result = await this.useActionModel.insertMany(creatingAction, { rawResult: true });
         const id = result.insertedIds?.[0]?.toHexString();

package/lib/chevre/repo/mongoose/schemas/action/inform.d.ts

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../../virtuals';
 import { factory } from '../../../../factory';
-type IDocType = Pick<factory.action.interact.inform.IAction, 'about' | 'actionStatus' | 'agent' | 'endDate' | 'object' | 'project' | 'recipient' | 'result' | 'startDate' | 'target' | 'typeOf' | 'purpose' | 'error'>;
+type IDocType = Pick<factory.action.interact.inform.IAction, 'about' | 'actionStatus' | 'agent' | 'endDate' | 'object' | 'project' | 'recipient' | 'result' | 'startDate' | 'target' | 'typeOf' | 'purpose' | 'error' | 'expires'>;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/action/inform.js

@@ -14,6 +14,7 @@ const schemaDefinition = {
     agent: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     object: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     startDate: { type: Date, required: true },
+    expires: { type: Date, required: true },
     target: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     recipient: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     result: mongoose_1.SchemaTypes.Mixed,
@@ -48,14 +49,18 @@ const schemaOptions = {
 };
 const indexes = [
     [
-        { startDate: 1 },
+        { expires: 1 },
         {
-            name: 'ttlByStartDate',
-            expireAfterSeconds: 2592000 // 30 days
+            name: 'expires',
+            expireAfterSeconds: 0
         }
     ],
     [
-        { 'project.id': 1, startDate: 1 },
+        { startDate: -1 },
+        { name: 'startDate' }
+    ],
+    [
+        { 'project.id': 1, startDate: -1 },
         { name: 'projectId' }
     ],
 ];

package/lib/chevre/repo/mongoose/schemas/action/update.d.ts

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../../virtuals';
 import { factory } from '../../../../factory';
-type Keys = 'actionStatus' | 'agent' | 'endDate' | 'error' | 'instrument' | 'object' | 'project' | 'result' | 'sameAs' | 'startDate' | 'targetCollection' | 'typeOf';
+type Keys = 'actionStatus' | 'agent' | 'endDate' | 'error' | 'instrument' | 'object' | 'project' | 'result' | 'sameAs' | 'startDate' | 'targetCollection' | 'typeOf' | 'expires';
 type IDocType = Pick<factory.action.update.add.IAction, Keys> | Pick<factory.action.update.replace.IAction, Keys> | Pick<factory.action.update.update.IAction, Keys> | Pick<factory.action.update.deleteAction.IAction, Keys>;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

package/lib/chevre/repo/mongoose/schemas/action/update.js

@@ -14,6 +14,7 @@ const schemaDefinition = {
     agent: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     object: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     startDate: { type: Date, required: true },
+    expires: { type: Date, required: true },
     result: mongoose_1.SchemaTypes.Mixed,
     error: mongoose_1.SchemaTypes.Mixed,
     endDate: Date,
@@ -47,22 +48,26 @@ const schemaOptions = {
 };
 const indexes = [
     [
-        { startDate: 1 },
+        { expires: 1 },
         {
-            name: 'ttlByStartDate',
-            expireAfterSeconds: 2592000 // 30 days
+            name: 'expires',
+            expireAfterSeconds: 0
         }
     ],
     [
-        { 'project.id': 1, startDate: 1 },
+        { startDate: -1 },
+        { name: 'startDate' }
+    ],
+    [
+        { 'project.id': 1, startDate: -1 },
         { name: 'projectId' }
     ],
     [
-        { typeOf: 1, startDate: 1 },
+        { typeOf: 1, startDate: -1 },
         { name: 'typeOf' }
     ],
     [
-        { 'object.id': 1, startDate: 1 },
+        { 'object.id': 1, startDate: -1 },
         {
             name: 'objectId',
             partialFilterExpression: {
@@ -71,7 +76,7 @@ const indexes = [
         }
     ],
     [
-        { 'result.id': 1, startDate: 1 },
+        { 'result.id': 1, startDate: -1 },
         {
             name: 'resultId',
             partialFilterExpression: {
@@ -80,7 +85,7 @@ const indexes = [
         }
     ],
     [
-        { 'sameAs.id': 1, startDate: 1 },
+        { 'sameAs.id': 1, startDate: -1 },
         {
             name: 'sameAsId',
             partialFilterExpression: {

package/lib/chevre/repo/mongoose/schemas/action/use.d.ts

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../../virtuals';
 import { factory } from '../../../../factory';
-type IDocType = Pick<factory.action.consume.use.reservation.IAction, 'actionStatus' | 'agent' | 'endDate' | 'error' | 'instrument' | 'location' | 'object' | 'project' | 'startDate' | 'typeOf'>;
+type IDocType = Pick<factory.action.consume.use.reservation.IAction, 'actionStatus' | 'agent' | 'endDate' | 'error' | 'instrument' | 'location' | 'object' | 'project' | 'startDate' | 'typeOf' | 'expires'>;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/action/use.js

@@ -14,6 +14,7 @@ const schemaDefinition = {
     agent: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     object: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     startDate: { type: Date, required: true },
+    expires: { type: Date, required: true },
     instrument: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
     error: mongoose_1.SchemaTypes.Mixed,
@@ -45,22 +46,26 @@ const schemaOptions = {
 };
 const indexes = [
     [
-        { startDate: 1 },
+        { expires: 1 },
         {
-            name: 'ttlByStartDate',
-            expireAfterSeconds: 2592000 // 30 days
+            name: 'expires',
+            expireAfterSeconds: 0
         }
     ],
     [
-        { 'project.id': 1, startDate: 1 },
+        { startDate: -1 },
+        { name: 'startDate' }
+    ],
+    [
+        { 'project.id': 1, startDate: -1 },
         { name: 'projectId' }
     ],
     [
-        { actionStatus: 1, startDate: 1 },
+        { actionStatus: 1, startDate: -1 },
         { name: 'actionStatus' }
     ],
     [
-        { 'object.id': 1, startDate: 1 },
+        { 'object.id': 1, startDate: -1 },
         {
             name: 'objectId',
             partialFilterExpression: {

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -27,6 +27,7 @@ const schemaDefinition = {
     cancelAction: mongoose_1.SchemaTypes.Mixed, // add(2024-05-26~)
     about: mongoose_1.SchemaTypes.Mixed, // add(2025-01-22~)
     identifier: mongoose_1.SchemaTypes.Mixed, // add(2025-02-06~)
+    expires: Date // support(2026-08-16~)
     // replacer: SchemaTypes.Mixed, // discontinue(2026-08-15~)
     // targetCollection: SchemaTypes.Mixed, // discontinue(2026-08-15~)
     // target: SchemaTypes.Mixed, // discontinue(2026-08-15~)

package/lib/chevre/repo/mongoose/schemas/actionRecipe.d.ts

@@ -7,6 +7,7 @@ type IDocType = factory.recipe.IRecipe & {
     };
     dateCreated?: Date;
     dateModified?: Date;
+    expires?: Date;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

package/lib/chevre/repo/mongoose/schemas/actionRecipe.js

@@ -29,7 +29,8 @@ const schemaDefinition = {
         type: Date,
         required: true
     },
-    dateModified: Date
+    dateModified: Date,
+    expires: Date // support(2026-08-16~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -1,13 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageTaskIfNotExist = createSendEmailMessageTaskIfNotExist;
-const debug_1 = __importDefault(require("debug"));
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
-const debug = (0, debug_1.default)('chevre-domain:service:order');
 function createSendEmailMessageTaskIfNotExist(params) {
     return async (repos) => {
         const sendEmailMessageActions = params.sendEmailMessage;
@@ -19,12 +14,10 @@ function createSendEmailMessageTaskIfNotExist(params) {
             about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } },
             mainEntity: { orderNumber: { $eq: params.order.orderNumber } }
         }, ['identifier'])).shift();
-        debug('createSendEmailMessageTaskIfNotExist: message4order:', JSON.stringify(message4order));
         if (typeof message4order?.identifier === 'string') {
             // 取引のpotentialActionsが存在する間は、メッセージ識別子が想定通りか確認する
             const messageIdentifierByTransaction = sendEmailMessageActions?.at(0)?.object.identifier;
             if (typeof messageIdentifierByTransaction === 'string') {
-                debug('createSendEmailMessageTaskIfNotExist: identifier matched?', message4order.identifier, messageIdentifierByTransaction);
                 if (message4order.identifier !== messageIdentifierByTransaction) {
                     throw new factory_1.factory.errors.Internal(`message identifier not matched. ${message4order.identifier} ${messageIdentifierByTransaction}`);
                 }
@@ -44,7 +37,6 @@ function createSendEmailMessageTaskIfNotExist(params) {
                     typeOf: factory_1.factory.creativeWorkType.EmailMessage
                 },
                 agent: params.order.project,
-                recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
                 purpose: simpleOrder
             };
             const sendEmailMessageTask = {

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

@@ -123,8 +123,6 @@ function createOnOrderReturnedTasksByTransaction(params) {
         const simpleOrder = {
             typeOf: params.order.typeOf,
             orderNumber: params.order.orderNumber,
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         sendEmailMessageAttributes.forEach((s) => {
@@ -133,8 +131,6 @@ function createOnOrderReturnedTasksByTransaction(params) {
                 typeOf: factory_1.factory.actionType.SendAction,
                 object: s.object,
                 agent: params.order.project,
-                recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
-                // potentialActions: {}, // discontinue(2024-06-25~)
                 purpose: simpleOrder
             };
             const sendEmailMessageTask = {

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

@@ -3,7 +3,6 @@ import type { ActionRepo } from '../../repo/action';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
 interface ISendOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
@@ -11,7 +10,6 @@ interface ISendOrderRepos {
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    placeOrder: PlaceOrderRepo;
 }
 type ISendOperation<T> = (repos: ISendOrderRepos) => Promise<T>;
 /**

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

@@ -1,14 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendOrder = sendOrder;
-const debug_1 = __importDefault(require("debug"));
 // import { createOwnershipInfosFromOrder } from '../delivery/factory';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory_1 = require("../../factory");
-const debug = (0, debug_1.default)('chevre-domain:service:order');
 /**
  * 注文を配送する
  */
@@ -32,11 +27,6 @@ function sendOrder(params) {
         try {
             const orderNumber = params.object.orderNumber;
             const confirmationNumber = params.object.confirmationNumber;
-            // const placeOrderTransaction = await findPlaceOrderTransaction({
-            //     project: { id: params.project.id },
-            //     confirmationNumber,
-            //     orderNumber
-            // })(repos);
             // 注文取得
             let order = await repos.order.projectFieldsByOrderNumber({
                 orderNumber,
@@ -66,12 +56,9 @@ function sendOrder(params) {
                 agent: (typeof params.agent?.typeOf === 'string') ? params.agent : order.project,
                 object: sendOrderObject,
                 project: order.project,
-                recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
                 typeOf: factory_1.factory.actionType.SendAction
             };
             const action = await repos.action.start(sendOrderActionAttributes);
-            // let creatingOwnershipInfos: IOwnershipInfo[] = [];
-            const createdOwnershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
             // 所有権管理はひとまず廃止(2026-08-10~)
@@ -91,22 +78,8 @@ function sendOrder(params) {
                     project: { id: { $eq: order.project.id } }
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
-                debug('delivering...', order.orderNumber, params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権管理はひとまず廃止(2026-08-10~)
                 // if (createOwnerships) {
-                //     creatingOwnershipInfos = createOwnershipInfosFromOrder({
-                //         order: { ...order, acceptedOffers },
-                //         offerIndexBase
-                //     });
-                //     createdOwnershipInfos = await Promise.all(creatingOwnershipInfos.map(async (creatingOwnershipInfo) => {
-                //         const { id } = await repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
-                //         return {
-                //             id,
-                //             ...(typeof creatingOwnershipInfo.identifier === 'string')
-                //                 ? { identifier: creatingOwnershipInfo.identifier }
-                //                 : undefined
-                //         };
-                //     }));
                 // }
                 if (acceptedOffers.length === 0) {
                     order = await repos.order.changeStatus({
@@ -127,9 +100,8 @@ function sendOrder(params) {
                 }
                 throw error;
             }
-            const result = createdOwnershipInfos;
+            const result = [];
             await repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
-            debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {
                 if (allOffersDelivered) {
                     await (0, onOrderStatusChanged_1.onOrderDelivered)({

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

@@ -293,8 +293,6 @@ function onRefund(params) {
             const simpleOrder = {
                 typeOf: order.typeOf,
                 orderNumber: order.orderNumber,
-                // price: order.price,
-                // priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
             sendEmailMessageByPotentialActions.forEach((s) => {
@@ -303,7 +301,6 @@ function onRefund(params) {
                     typeOf: factory_1.factory.actionType.SendAction,
                     object: s.object,
                     agent: refundActionAttributes.project,
-                    recipient: { typeOf: order.customer.typeOf, id: order.customer.id },
                     purpose: simpleOrder
                 };
                 const sendEmailMessageTask = {

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

@@ -5,10 +5,8 @@ const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
-// import { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const sendOrder_1 = require("../order/sendOrder");
 /**
  * タスク実行関数
@@ -32,10 +30,8 @@ function call(params) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             action: new action_1.ActionRepo(connection),
             order: new order_1.OrderRepo(connection),
-            // ownershipInfo: new OwnershipInfoRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         });
     };
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.3.0-alpha.9",
+    "@chevre/factory": "10.3.0-alpha.11",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.35"
+  "version": "26.0.0-alpha.37"
 }