@chevre/domain 21.34.0-alpha.1 → 21.34.0-alpha.2

package/example/src/chevre/{deleteOwnershipInfosByWebApplication.ts → deleteOwnershipInfosByOwnedThrough.ts}

@@ -1,4 +1,5 @@
 // tslint:disable:no-console
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
@@ -11,9 +12,15 @@ async function main() {
 
     const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
 
+    const ownedThroughLt = moment()
+        .add(-1, 'year')
+        .toDate();
     const cursor = ownershipInfoRepo.getCursor(
         {
-            'ownedBy.typeOf': { $eq: chevre.factory.creativeWorkType.WebApplication }
+            ownedThrough: {
+                $exists: true,
+                $lt: ownedThroughLt
+            }
         },
         {
         }
@@ -31,42 +38,34 @@ async function main() {
 
         let noNeedToDelete = true;
         let ownedById: string | undefined;
-        let ownedByTypeOf: string;
-        if (Array.isArray(ownershipInfo.ownedBy)) {
-            ownedByTypeOf = ownershipInfo.ownedBy[0].typeOf;
-            if (ownershipInfo.ownedBy.every(({ typeOf }) => typeOf === chevre.factory.creativeWorkType.WebApplication)) {
-                noNeedToDelete = false;
-                ownedById = ownershipInfo.ownedBy[0].id;
-            }
-        } else {
-            ownedByTypeOf = ownershipInfo.ownedBy.typeOf;
-            if (ownershipInfo.ownedBy.typeOf === chevre.factory.creativeWorkType.WebApplication) {
-                noNeedToDelete = false;
-                ownedById = ownershipInfo.ownedBy.id;
-            }
+        if (ownershipInfo.ownedThrough instanceof Date
+            && moment(ownedThroughLt)
+                .isAfter(moment(ownershipInfo.ownedThrough))) {
+            noNeedToDelete = false;
+            ownedById = (Array.isArray(ownershipInfo.ownedBy)) ? ownershipInfo.ownedBy[0].id : ownershipInfo.ownedBy.id;
         }
 
         if (noNeedToDelete) {
             console.log(
                 'noNeedToDelete.',
-                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownershipInfo.ownedFrom, ownershipInfo.ownedThrough,
                 i, updateCount);
         } else {
             console.log(
                 'deleting...',
-                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownershipInfo.ownedFrom, ownershipInfo.ownedThrough,
                 i, updateCount);
             if (typeof ownedById === 'string') {
-                await ownershipInfoRepo.deleteByIdAndOwnedById({
-                    project: { id: ownershipInfo.project.id },
-                    id: ownershipInfo.id,
-                    ownedBy: { id: ownedById }
-                });
+                // await ownershipInfoRepo.deleteByIdAndOwnedById({
+                //     project: { id: ownershipInfo.project.id },
+                //     id: ownershipInfo.id,
+                //     ownedBy: { id: ownedById }
+                // });
             }
             updateCount += 1;
             console.log(
                 'deleted.',
-                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownershipInfo.ownedFrom, ownershipInfo.ownedThrough,
                 i, updateCount);
         }
     });

package/example/src/chevre/migratePayCreditCardRecipes.ts

@@ -15,7 +15,7 @@ async function main() {
             startDate: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-180, 'days')
+                    .add(-30, 'days')
             },
             'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
         },
@@ -53,7 +53,11 @@ async function main() {
                 throw new Error('alterTranResultByPayAction undefined');
             }
 
-            const recipe: chevre.factory.action.trade.pay.IPayCreditCardRecipe & { dateCreated: Date } = {
+            const recipe: chevre.factory.action.trade.pay.IPayCreditCardRecipe & {
+                recipeFor: { id: string; typeOf: chevre.factory.actionType };
+                dateCreated: Date;
+                dateModified: Date;
+            } = {
                 project: { id: payAction.project.id, typeOf: chevre.factory.organizationType.Project },
                 typeOf: 'Recipe',
                 recipeCategory: chevre.factory.recipe.RecipeCategory.payCreditCard,
@@ -82,6 +86,8 @@ async function main() {
                     ]
                 }],
                 dateCreated: moment(payAction.endDate)
+                    .toDate(),
+                dateModified: moment(payAction.endDate)
                     .toDate()
             };
             console.log(

package/example/src/chevre/migratePayMovieTicketRecipes.ts

@@ -15,7 +15,7 @@ async function main() {
             startDate: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-180, 'days')
+                    .add(-30, 'days')
             },
             'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
         },
@@ -58,7 +58,11 @@ async function main() {
                 throw new Error('seatInfoSyncResultByPayAction undefined');
             }
 
-            const recipe: chevre.factory.action.trade.pay.IPayMovieTicketRecipe & { dateCreated: Date } = {
+            const recipe: chevre.factory.action.trade.pay.IPayMovieTicketRecipe & {
+                recipeFor: { id: string; typeOf: chevre.factory.actionType };
+                dateCreated: Date;
+                dateModified: Date;
+            } = {
                 project: { id: payAction.project.id, typeOf: chevre.factory.organizationType.Project },
                 typeOf: 'Recipe',
                 recipeCategory: chevre.factory.recipe.RecipeCategory.payMovieTicket,
@@ -78,6 +82,8 @@ async function main() {
                     ]
                 }],
                 dateCreated: moment(payAction.endDate)
+                    .toDate(),
+                dateModified: moment(payAction.endDate)
                     .toDate()
             };
             console.log(

package/example/src/chevre/migrateTransactionObjectPaymentMethods.ts

@@ -38,6 +38,7 @@ async function main() {
     let i = 0;
     let updateCount = 0;
     let saveRecipeCount = 0;
+    // tslint:disable-next-line:max-func-body-length
     await cursor.eachAsync(async (doc) => {
         i += 1;
         const placeOrder: Pick<
@@ -92,7 +93,11 @@ async function main() {
                         updateCount += 1;
                     }
                 } else {
-                    const recipe: chevre.factory.action.accept.pay.IRecipe & { dateCreated: Date } = {
+                    const recipe: chevre.factory.action.accept.pay.IRecipe & {
+                        recipeFor: { id: string; typeOf: chevre.factory.actionType };
+                        dateCreated: Date;
+                        dateModified: Date;
+                    } = {
                         project: { id: placeOrder.project.id, typeOf: chevre.factory.organizationType.Project },
                         typeOf: 'Recipe',
                         recipeCategory: chevre.factory.recipe.RecipeCategory.publishPaymentUrl,
@@ -121,6 +126,8 @@ async function main() {
                             ]
                         }],
                         dateCreated: moment(acceptPayAction.endDate)
+                            .toDate(),
+                        dateModified: moment(acceptPayAction.endDate)
                             .toDate()
                     };
                     console.log(

package/example/src/chevre/saveRecipe.ts

@@ -0,0 +1,54 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now = new Date();
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const recipe: chevre.factory.action.trade.pay.IPayCreditCardRecipe & {
+        recipeFor: { id: string; typeOf: chevre.factory.actionType };
+        dateCreated: Date;
+        dateModified: Date;
+    } = {
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        typeOf: 'Recipe',
+        recipeCategory: chevre.factory.recipe.RecipeCategory.payCreditCard,
+        recipeFor: { id: 'xxxx', typeOf: chevre.factory.actionType.PayAction },
+        step: [{
+            typeOf: 'HowToSection',
+            itemListElement: [
+                {
+                    typeOf: 'HowToStep',
+                    identifier: chevre.factory.recipe.StepIdentifier.searchTrade,
+                    itemListElement: [{
+                        typeOf: 'HowToDirection'
+                        // beforeMedia: (<any>paymentMethodsByTransaction).entryTranArgs,
+                        // afterMedia: (<any>paymentMethodsByTransaction).entryTranResult
+                    }]
+                },
+                {
+                    typeOf: 'HowToStep',
+                    identifier: chevre.factory.recipe.StepIdentifier.alterTran,
+                    itemListElement: [{
+                        typeOf: 'HowToDirection'
+                        // beforeMedia: (<any>paymentMethodsByTransaction).execTranArgs,
+                    }]
+                }
+            ]
+        }],
+        dateCreated: now,
+        dateModified: now
+    };
+    const result = await actionRepo.saveRecipeWithDateCreated(recipe);
+    console.log(result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -4,28 +4,40 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
+const DAYS = 180;
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
+    const now = new Date();
     let updateResult: any;
 
     const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
 
-    updateResult = await assetTransactionRepo.unsetUnnecessaryFields({
-        filter: {
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'days')
-                    .toDate()
+    // tslint:disable-next-line:no-magic-numbers
+    const hours = DAYS * 24;
+    // tslint:disable-next-line:no-increment-decrement no-magic-numbers
+    for (let index = 0; index < hours; index++) {
+        updateResult = await assetTransactionRepo.unsetUnnecessaryFields({
+            filter: {
+                startDate: {
+                    $gte: moment(now)
+                        .add(-(index + 1), 'hours')
+                        .toDate(),
+                    $lt: moment(now)
+                        .add(-index, 'hours')
+                        .toDate()
+                }
+            },
+            $unset: {
+                __v: 1,
+                createdAt: 1,
+                updatedAt: 1
             }
-        },
-        $unset: {
-            __v: 1,
-            createdAt: 1,
-            updatedAt: 1
-        }
-    });
-    console.log('unset processed.', updateResult);
+        });
+        console.log('unset processed.', updateResult, -(index + 1), 'hours', -index, 'hours');
+    }
+
+    console.log(DAYS, 'days processed');
 }
 
 main()

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

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import { factory as surfrockFactory } from '@surfrock/sdk';
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection, FilterQuery, QueryOptions } from 'mongoose';
 import * as factory from '../factory';
 export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 export type IPayAction = factory.action.trade.pay.IAction;
@@ -60,6 +60,15 @@ export interface ICancelActionAction {
     };
 }
 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'>;
 /**
  * アクションリポジトリ
  */
@@ -75,7 +84,9 @@ export declare class MongoRepository {
     /**
      * アクション開始
      */
-    start<T extends factory.actionType>(attributes: factory.action.IAttributes<T, any, any>): Promise<IAction<T>>;
+    start<T extends factory.actionType>(attributes: factory.action.IAttributes<T, any, any>, options?: {
+        recipe?: IRecipeAsActionAttributes;
+    }): Promise<IAction<T>>;
     /**
      * アクション完了
      */
@@ -83,13 +94,13 @@ export declare class MongoRepository {
         typeOf: T;
         id: string;
         result: any;
-        recipe?: factory.recipe.IRecipe;
+        recipe?: IRecipeAsActionAttributes;
     }): Promise<IAction<T>>;
     completeWithVoid(params: {
         typeOf: factory.actionType;
         id: string;
         result: any;
-        recipe?: factory.recipe.IRecipe;
+        recipe?: IRecipeAsActionAttributes;
     }): Promise<void>;
     /**
      * アクション取消
@@ -119,7 +130,9 @@ export declare class MongoRepository {
      * アクション再開
      */
     reStart(params: {
+        typeOf: factory.actionType;
         id: string;
+        recipe?: IRecipeAsActionAttributes;
     }): Promise<void>;
     /**
      * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
@@ -316,9 +329,9 @@ export declare class MongoRepository {
     }): Promise<{
         deletedCount?: number;
     } | null>;
-    saveRecipeWithDateCreated(savingRecipe: factory.recipe.IRecipe & {
-        dateCreated: Date;
-    }): Promise<import("mongodb").InsertManyResult<any>>;
+    saveRecipeWithDateCreated(savingRecipe: IRecipeAsDocument & {
+        dateModified: Date;
+    }): Promise<import("mongodb").UpdateResult>;
     findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
         project: {
             id: string;
@@ -397,7 +410,7 @@ export declare class MongoRepository {
         startFrom: Date;
         startThrough: Date;
     }): Promise<IAggregateAction>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>>;
         $unset: any;
@@ -417,6 +430,6 @@ export declare class MongoRepository {
         };
     }): Promise<void>;
     private agggregateByStatus;
-    private saveRecipe;
+    private upsertRecipe;
 }
 export {};

package/lib/chevre/repo/action.js

@@ -459,10 +459,16 @@ class MongoRepository {
     /**
      * アクション開始
      */
-    start(attributes) {
+    start(attributes, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.actionModel.create(Object.assign(Object.assign({}, attributes), { actionStatus: factory.actionStatusType.ActiveActionStatus, startDate: new Date() }))
+            const startedAction = yield this.actionModel.create(Object.assign(Object.assign({}, attributes), { actionStatus: factory.actionStatusType.ActiveActionStatus, startDate: new Date() }))
                 .then((doc) => doc.toObject());
+            // add recipe(2024-06-09~)
+            const savingRecipe = options === null || options === void 0 ? void 0 : options.recipe;
+            if ((savingRecipe === null || savingRecipe === void 0 ? void 0 : savingRecipe.typeOf) === 'Recipe') {
+                yield this.upsertRecipe(Object.assign(Object.assign({}, savingRecipe), { recipeFor: { id: startedAction.id, typeOf: startedAction.typeOf } }));
+            }
+            return startedAction;
         });
     }
     /**
@@ -472,15 +478,17 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (((_a = params.recipe) === null || _a === void 0 ? void 0 : _a.typeOf) === 'Recipe') {
-                yield this.saveRecipe(params.recipe);
+                yield this.upsertRecipe(Object.assign(Object.assign({}, params.recipe), { recipeFor: { id: params.id, typeOf: params.typeOf } }));
             }
             const doc = yield this.actionModel.findOneAndUpdate({
-                typeOf: params.typeOf,
-                _id: params.id
+                typeOf: { $eq: params.typeOf },
+                _id: { $eq: params.id }
             }, {
-                actionStatus: factory.actionStatusType.CompletedActionStatus,
-                result: params.result,
-                endDate: new Date()
+                $set: {
+                    actionStatus: factory.actionStatusType.CompletedActionStatus,
+                    result: params.result,
+                    endDate: new Date()
+                }
             }, { new: true })
                 .select({ __v: 0, createdAt: 0, updatedAt: 0 })
                 .exec();
@@ -494,15 +502,17 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (((_a = params.recipe) === null || _a === void 0 ? void 0 : _a.typeOf) === 'Recipe') {
-                yield this.saveRecipe(params.recipe);
+                yield this.upsertRecipe(Object.assign(Object.assign({}, params.recipe), { recipeFor: { id: params.id, typeOf: params.typeOf } }));
             }
             const doc = yield this.actionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf }
             }, {
-                actionStatus: factory.actionStatusType.CompletedActionStatus,
-                result: params.result,
-                endDate: new Date()
+                $set: {
+                    actionStatus: factory.actionStatusType.CompletedActionStatus,
+                    result: params.result,
+                    endDate: new Date()
+                }
             }, { new: false, projection: { _id: 1 } })
                 .exec();
             if (doc === null) {
@@ -597,9 +607,11 @@ class MongoRepository {
      * アクション再開
      */
     reStart(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.actionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
                 actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
             }, {
                 $set: {
@@ -612,6 +624,10 @@ class MongoRepository {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
             }
+            // add recipe(2024-06-09~)
+            if (((_a = params.recipe) === null || _a === void 0 ? void 0 : _a.typeOf) === 'Recipe') {
+                yield this.upsertRecipe(Object.assign(Object.assign({}, params.recipe), { recipeFor: { id: params.id, typeOf: params.typeOf } }));
+            }
         });
     }
     /**
@@ -1056,7 +1072,22 @@ class MongoRepository {
     }
     saveRecipeWithDateCreated(savingRecipe) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.actionRecipeModel.insertMany(Object.assign(Object.assign({}, savingRecipe), { dateCreated: (savingRecipe.dateCreated instanceof Date) ? savingRecipe.dateCreated : new Date() }), { rawResult: true });
+            const { typeOf, project, recipeCategory, recipeFor, step, dateCreated, dateModified } = savingRecipe;
+            const filter = {
+                'recipeFor.id': { $eq: recipeFor.id }
+            };
+            const setOnInsert = { project, typeOf, recipeCategory, recipeFor, dateCreated };
+            const setKeys = { step, dateModified };
+            const update = {
+                $setOnInsert: setOnInsert,
+                $set: setKeys
+            };
+            const options = {
+                upsert: true,
+                rawResult: true
+            };
+            return this.actionRecipeModel.updateOne(filter, update, options)
+                .exec();
         });
     }
     findRecipeByAction(params) {
@@ -1366,9 +1397,35 @@ class MongoRepository {
             };
         });
     }
-    saveRecipe(savingRecipe) {
+    upsertRecipe(savingRecipe) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.actionRecipeModel.insertMany(Object.assign(Object.assign({}, savingRecipe), { dateCreated: new Date() }), { rawResult: true });
+            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
+            };
+            const options = {
+                upsert: true,
+                rawResult: true
+            };
+            return this.actionRecipeModel.updateOne(filter, update, options)
+                .exec();
+            // return this.actionRecipeModel.insertMany<factory.recipe.IRecipe & { dateCreated: Date }>(
+            //     {
+            //         ...savingRecipe,
+            //         dateCreated: new Date()
+            //     },
+            //     { rawResult: true }
+            // );
             // const result = await this.actionRecipeModel.insertMany<IRecipe>(savingRecipe, { rawResult: true });
             // const id = result.insertedIds?.[0]?.toHexString();
             // if (typeof id !== 'string') {

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

@@ -30,7 +30,8 @@ const schemaDefinition = {
     dateCreated: {
         type: Date,
         required: true
-    }
+    },
+    dateModified: Date
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -20,12 +20,11 @@ const validation_1 = require("./pay/account/validation");
 const factory_1 = require("./pay/factory");
 const debug = createDebug('chevre-domain:service:assetTransaction');
 function publishPaymentUrlResult2recipe(params) {
-    const { project, action, result } = params;
+    const { project, result } = params;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
         recipeCategory: factory.recipe.RecipeCategory.publishPaymentUrl,
-        recipeFor: { id: action.id, typeOf: action.typeOf },
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
@@ -116,7 +115,6 @@ function publishPaymentUrl(params, options) {
                     // create recipe(2024-06-02~)
                     recipe = publishPaymentUrlResult2recipe({
                         project: { id: params.project.id },
-                        action: { id: action.id, typeOf: action.typeOf },
                         result
                     });
                     break;

package/lib/chevre/service/assetTransaction/reserveCOA/factory.d.ts

@@ -11,9 +11,5 @@ declare function processConfirmCOAReserveResult2recipe(params: {
     project: {
         id: string;
     };
-    action: {
-        id: string;
-        typeOf: factory.actionType;
-    };
 }): factory.action.interact.confirm.reservation.IConfirmCOAReserveRecipe;
 export { IProcessConfirmCOAReserveResult, processConfirmCOAReserveResult2recipe };

package/lib/chevre/service/assetTransaction/reserveCOA/factory.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processConfirmCOAReserveResult2recipe = void 0;
 const factory = require("../../../factory");
 function processConfirmCOAReserveResult2recipe(params) {
-    const { processConfirmCOAReserveResult, project, action } = params;
+    const { processConfirmCOAReserveResult, project } = params;
     const { stateReserveArgs, stateReserveResult, updReserveArgs, updReserveResult } = processConfirmCOAReserveResult;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
         recipeCategory: factory.recipe.RecipeCategory.confirmCOAReserve,
-        recipeFor: { id: action.id, typeOf: action.typeOf },
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [

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

@@ -19,9 +19,5 @@ declare function processUpdTmpReserveSeatResult2recipe(params: {
     project: {
         id: string;
     };
-    action: {
-        id: string;
-        typeOf: factory.actionType;
-    };
 }): factory.action.accept.coaOffer.IRecipe;
 export { IAcceptedOfferWithoutDetail, createUpdTmpReserveSeatArgs, processUpdTmpReserveSeatResult2recipe };

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

@@ -20,13 +20,12 @@ function createUpdTmpReserveSeatArgs(params) {
 }
 exports.createUpdTmpReserveSeatArgs = createUpdTmpReserveSeatArgs;
 function processUpdTmpReserveSeatResult2recipe(params) {
-    const { processUpdTmpReserveSeatResult, project, action } = params;
+    const { processUpdTmpReserveSeatResult, project } = params;
     const { updTmpReserveSeatArgs, updTmpReserveSeatResult } = processUpdTmpReserveSeatResult;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
         recipeCategory: factory.recipe.RecipeCategory.acceptCOAOffer,
-        recipeFor: { id: action.id, typeOf: action.typeOf },
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [

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

@@ -101,8 +101,7 @@ function acceptOffer(params) {
                 updTmpReserveSeatArgs: requestBody,
                 updTmpReserveSeatResult: responseBody
             },
-            project: { id: transaction.project.id },
-            action: { id: action.id, typeOf: action.typeOf }
+            project: { id: transaction.project.id }
         });
         const result = {
             object: {

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

@@ -99,7 +99,7 @@ function changeOffers(params) {
         });
         const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, amount: eligibleMonetaryAmount, acceptedOffers: [] });
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
-        yield repos.action.reStart({ id: authorizeAction.id });
+        yield repos.action.reStart({ id: authorizeAction.id, typeOf: authorizeAction.typeOf });
         try {
             // まずvoidAcceptedOffer
             // const orderNumberByTransaction = transaction.object.orderNumber;

package/lib/chevre/service/payment/creditCard/factory.d.ts

@@ -17,19 +17,11 @@ declare function processAlterTranResult2payRecipe(params: {
     project: {
         id: string;
     };
-    action: {
-        id: string;
-        typeOf: factory.actionType;
-    };
 }): factory.action.trade.pay.IPayCreditCardRecipe;
 declare function processAlterTranResult2refundRecipe(params: {
     processAlterTranResult: IProcessAlterTranResult4refund;
     project: {
         id: string;
     };
-    action: {
-        id: string;
-        typeOf: factory.actionType;
-    };
 }): factory.action.trade.refund.IRefundCreditCardRecipe;
 export { IProcessAlterTranResult, IProcessAlterTranResult4refund, processAlterTranResult2payRecipe, processAlterTranResult2refundRecipe };

package/lib/chevre/service/payment/creditCard/factory.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAlterTranResult2refundRecipe = exports.processAlterTranResult2payRecipe = void 0;
 const factory = require("../../../factory");
 function processAlterTranResult2payRecipe(params) {
-    const { processAlterTranResults, project, action } = params;
+    const { processAlterTranResults, project } = params;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
         recipeCategory: factory.recipe.RecipeCategory.payCreditCard,
-        recipeFor: { id: action.id, typeOf: action.typeOf },
         step: processAlterTranResults.map(({ searchTradeArgs, searchTradeResult, alterTranArgs, alterTranResult }) => {
             return {
                 typeOf: 'HowToSection',
@@ -30,13 +29,12 @@ function processAlterTranResult2payRecipe(params) {
 }
 exports.processAlterTranResult2payRecipe = processAlterTranResult2payRecipe;
 function processAlterTranResult2refundRecipe(params) {
-    const { processAlterTranResult, project, action } = params;
+    const { processAlterTranResult, project } = params;
     const { searchTradeArgs, searchTradeResult, alterTranResult, alterTranArgs } = processAlterTranResult;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
         recipeCategory: factory.recipe.RecipeCategory.refundCreditCard,
-        recipeFor: { id: action.id, typeOf: action.typeOf },
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [

package/lib/chevre/service/payment/creditCard/payCreditCard.js

@@ -67,8 +67,7 @@ function payCreditCard(params) {
             // add recipe(2024-06-03~)
             recipe = (0, factory_1.processAlterTranResult2payRecipe)({
                 processAlterTranResults,
-                project: { id: params.project.id },
-                action: { id: action.id, typeOf: action.typeOf }
+                project: { id: params.project.id }
             });
         }
         catch (error) {

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -93,8 +93,7 @@ function refundCreditCard(params, options) {
             // add recipe(2024-06-04~)
             recipe = (0, factory_1.processAlterTranResult2refundRecipe)({
                 processAlterTranResult,
-                project: { id: params.project.id },
-                action: { id: action.id, typeOf: action.typeOf }
+                project: { id: params.project.id }
             });
         }
         catch (error) {

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

@@ -82,8 +82,7 @@ function checkMovieTicket(params) {
             // add recipe(2024-06-07~)
             recipe = (0, factory_1.processPurchaseNumberAuthResult2checkRecipe)({
                 processPurchaseNumberAuthResult,
-                project: { id: params.project.id },
-                action: { id: action.id, typeOf: action.typeOf }
+                project: { id: params.project.id }
             });
         }
         catch (error) {

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

@@ -30,20 +30,12 @@ declare function processPurchaseNumberAuthResult2checkRecipe(params: {
     project: {
         id: string;
     };
-    action: {
-        id: string;
-        typeOf: factory.actionType;
-    };
 }): factory.action.check.paymentMethod.movieTicket.IRecipe;
 declare function processSeatInfoSyncResult2payRecipe(params: {
     processSeatInfoSyncResult: IProcessSeatInfoSyncResult;
     project: {
         id: string;
     };
-    action: {
-        id: string;
-        typeOf: factory.actionType;
-    };
 }): factory.action.trade.pay.IPayMovieTicketRecipe;
 declare function processSeatInfoSyncResult2refundRecipe(params: {
     processSeatInfoSyncResult?: IProcessSeatInfoSyncResult;
@@ -51,10 +43,6 @@ declare function processSeatInfoSyncResult2refundRecipe(params: {
     project: {
         id: string;
     };
-    action: {
-        id: string;
-        typeOf: factory.actionType;
-    };
 }): factory.action.trade.refund.IRefundMovieTicketRecipe;
 declare enum MovieticketReserveRequestErrorMessage {
     AlreadyPaid = "\u65E2\u306B\u5B58\u5728\u3059\u308B\u8208\u884C\u30B7\u30B9\u30C6\u30E0\u5EA7\u5E2D\u4E88\u7D04\u756A\u53F7\u304C\u5165\u529B\u3055\u308C\u307E\u3057\u305F\u3002",

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

@@ -92,13 +92,12 @@ function createStartingPayAction(params, seatInfoSyncIn) {
 }
 exports.createStartingPayAction = createStartingPayAction;
 function processPurchaseNumberAuthResult2checkRecipe(params) {
-    const { processPurchaseNumberAuthResult, project, action } = params;
+    const { processPurchaseNumberAuthResult, project } = params;
     const { purchaseNumberAuthIn, purchaseNumberAuthResult } = processPurchaseNumberAuthResult;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
         recipeCategory: factory.recipe.RecipeCategory.checkMovieTicket,
-        recipeFor: { id: action.id, typeOf: action.typeOf },
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
@@ -113,13 +112,12 @@ function processPurchaseNumberAuthResult2checkRecipe(params) {
 }
 exports.processPurchaseNumberAuthResult2checkRecipe = processPurchaseNumberAuthResult2checkRecipe;
 function processSeatInfoSyncResult2payRecipe(params) {
-    const { processSeatInfoSyncResult, project, action } = params;
+    const { processSeatInfoSyncResult, project } = params;
     const { seatInfoSyncIn, seatInfoSyncResult } = processSeatInfoSyncResult;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
         recipeCategory: factory.recipe.RecipeCategory.payMovieTicket,
-        recipeFor: { id: action.id, typeOf: action.typeOf },
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
@@ -134,14 +132,13 @@ function processSeatInfoSyncResult2payRecipe(params) {
 }
 exports.processSeatInfoSyncResult2payRecipe = processSeatInfoSyncResult2payRecipe;
 function processSeatInfoSyncResult2refundRecipe(params) {
-    const { processSeatInfoSyncResult, processSeatInfoSyncCancelResult, project, action } = params;
+    const { processSeatInfoSyncResult, processSeatInfoSyncCancelResult, project } = params;
     if (processSeatInfoSyncResult !== undefined) {
         const { seatInfoSyncIn, seatInfoSyncResult } = processSeatInfoSyncResult;
         return {
             project: { id: project.id, typeOf: factory.organizationType.Project },
             typeOf: 'Recipe',
             recipeCategory: factory.recipe.RecipeCategory.refundMovieTicket,
-            recipeFor: { id: action.id, typeOf: action.typeOf },
             step: [{
                     typeOf: 'HowToSection',
                     itemListElement: [
@@ -160,7 +157,6 @@ function processSeatInfoSyncResult2refundRecipe(params) {
             project: { id: project.id, typeOf: factory.organizationType.Project },
             typeOf: 'Recipe',
             recipeCategory: factory.recipe.RecipeCategory.refundMovieTicket,
-            recipeFor: { id: action.id, typeOf: action.typeOf },
             step: [{
                     typeOf: 'HowToSection',
                     itemListElement: [

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

@@ -28,9 +28,12 @@ function payMovieTicket(params) {
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
         const seatInfoSyncIn = yield payActionParams2seatInfoSyncIn(params)(repos);
         const startingAction = (0, factory_1.createStartingPayAction)(params, seatInfoSyncIn);
-        let action = yield repos.action.start(startingAction);
+        let recipe = (0, factory_1.processSeatInfoSyncResult2payRecipe)({
+            processSeatInfoSyncResult: { seatInfoSyncIn },
+            project: { id: params.project.id }
+        });
+        let action = yield repos.action.start(startingAction, { recipe });
         let processSeatInfoSyncResult;
-        let recipe;
         try {
             // 着券済に対する冪等性を確保する必要はあるが、
             // その他のアクションとしての振る舞いは実行される必要もある
@@ -67,8 +70,7 @@ function payMovieTicket(params) {
             // add recipe(2024-06-03~)
             recipe = (0, factory_1.processSeatInfoSyncResult2payRecipe)({
                 processSeatInfoSyncResult,
-                project: { id: params.project.id },
-                action: { id: action.id, typeOf: action.typeOf }
+                project: { id: params.project.id }
             });
         }
         catch (error) {

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

@@ -55,8 +55,9 @@ function refundMovieTicket(params) {
             })({ action: repos.action });
         }
         const instrument = Object.assign(Object.assign({ typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket }, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncCancelIn !== undefined) ? { seatInfoSyncCancelIn } : undefined);
+        let recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id } }, (seatInfoSyncIn !== undefined) ? { processSeatInfoSyncResult: { seatInfoSyncIn } } : undefined), (seatInfoSyncCancelIn !== undefined) ? { processSeatInfoSyncCancelResult: { seatInfoSyncCancelIn } } : undefined));
         let action = yield repos.action.start(Object.assign(Object.assign(Object.assign({}, params), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined), { instrument // instrumentをセット(2024-04-30~)
-         }));
+         }), { recipe });
         let processSeatInfoSyncCancelResult;
         let processSeatInfoSyncResult;
         try {
@@ -95,7 +96,7 @@ function refundMovieTicket(params) {
         }
         else {
             // add recipe(2024-06-04~)
-            const recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id }, action: { id: action.id, typeOf: action.typeOf } }, (processSeatInfoSyncResult !== undefined) ? { processSeatInfoSyncResult } : undefined), (processSeatInfoSyncCancelResult !== undefined) ? { processSeatInfoSyncCancelResult } : undefined));
+            recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id } }, (processSeatInfoSyncResult !== undefined) ? { processSeatInfoSyncResult } : undefined), (processSeatInfoSyncCancelResult !== undefined) ? { processSeatInfoSyncCancelResult } : undefined));
             const actionResult = Object.assign(Object.assign({}, ((processSeatInfoSyncResult === null || processSeatInfoSyncResult === void 0 ? void 0 : processSeatInfoSyncResult.seatInfoSyncResult) !== undefined)
                 ? { seatInfoSyncResult: processSeatInfoSyncResult.seatInfoSyncResult }
                 : undefined), ((processSeatInfoSyncCancelResult === null || processSeatInfoSyncCancelResult === void 0 ? void 0 : processSeatInfoSyncCancelResult.seatInfoSyncCancelResult) !== undefined)

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

@@ -166,8 +166,7 @@ function confirmReserveTransaction(params, options) {
                     updReserveResult = processConfirmCOAReserveResult.updReserveResult;
                     recipe = (0, factory_1.processConfirmCOAReserveResult2recipe)({
                         processConfirmCOAReserveResult,
-                        project: { id: confirmActionAttributes.project.id },
-                        action: { id: action.id, typeOf: action.typeOf }
+                        project: { id: confirmActionAttributes.project.id }
                     });
                     break;
                 default:

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.9",
+    "@chevre/factory": "4.374.0-alpha.10",
     "@cinerino/sdk": "7.1.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.34.0-alpha.1"
+  "version": "21.34.0-alpha.2"
 }