@chevre/domain 22.8.0-alpha.7 → 22.8.0-alpha.8

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

@@ -227,6 +227,7 @@ export declare class ActionRepo {
     }): Promise<any>;
     /**
      * 終了日時を一定期間過ぎたアクションを削除する
+     * 作成日時を一定期間過ぎたアクションレシピも削除する
      */
     deleteEndDatePassedCertainPeriod(params: {
         $lt: Date;
@@ -248,9 +249,6 @@ export declare class ActionRepo {
     }): Promise<{
         deletedCount?: number;
     } | null>;
-    saveRecipeWithDateCreated(savingRecipe: IRecipeAsDocument & {
-        dateModified: Date;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
     saveActionWithEndDate(savingAction: Omit<factory.action.authorize.invoice.IAction, 'id'>): Promise<import("mongoose").UpdateWriteOpResult>;
     findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
         project: {

package/lib/chevre/repo/action.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionRepo = void 0;
+const moment = require("moment");
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const action_1 = require("./mongoose/schemas/action");
@@ -1021,17 +1022,26 @@ class ActionRepo {
     }
     /**
      * 終了日時を一定期間過ぎたアクションを削除する
+     * 作成日時を一定期間過ぎたアクションレシピも削除する
      */
     deleteEndDatePassedCertainPeriod(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.actionModel.deleteMany({
-                // 終了日時を一定期間過ぎたもの
-                endDate: {
-                    $exists: true,
-                    $lt: params.$lt
-                }
-            })
-                .exec();
+            const { $lt } = params;
+            if ($lt instanceof Date) {
+                yield this.actionModel.deleteMany({
+                    // 終了日時を一定期間過ぎたもの
+                    endDate: { $exists: true, $lt }
+                })
+                    .exec();
+                // clean actionRecipes(2025-01-10~)
+                const dateCreatedLt = moment($lt)
+                    .add(-1, 'day') // レシピ作成とアクション終了の時間差を考慮
+                    .toDate();
+                yield this.actionRecipeModel.deleteMany({
+                    dateCreated: { $lt: dateCreatedLt }
+                })
+                    .exec();
+            }
         });
     }
     /**
@@ -1057,25 +1067,29 @@ class ActionRepo {
             });
         });
     }
-    saveRecipeWithDateCreated(savingRecipe) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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
-            };
-            return this.actionRecipeModel.updateOne(filter, update, {
-                upsert: true,
-                includeResultMetadata: true
-            })
-                .exec();
-        });
-    }
+    // public async saveRecipeWithDateCreated(savingRecipe: IRecipeAsDocument & {
+    //     dateModified: Date;
+    // }) {
+    //     const { typeOf, project, recipeCategory, recipeFor, step, dateCreated, dateModified } = savingRecipe;
+    //     const filter: FilterQuery<factory.recipe.IRecipe> = {
+    //         'recipeFor.id': { $eq: recipeFor.id }
+    //     };
+    //     const setOnInsert: AnyKeys<IRecipeAsDocument> = { project, typeOf, recipeCategory, recipeFor, dateCreated };
+    //     const setKeys: AnyKeys<IRecipeAsDocument> = { step, dateModified };
+    //     const update: UpdateQuery<IRecipeAsDocument> = {
+    //         $setOnInsert: setOnInsert,
+    //         $set: setKeys
+    //     };
+    //     return this.actionRecipeModel.updateOne<HydratedDocument<IRecipeAsDocument>>(
+    //         filter,
+    //         update,
+    //         {
+    //             upsert: true,
+    //             includeResultMetadata: true
+    //         }
+    //     )
+    //         .exec();
+    // }
     saveActionWithEndDate(savingAction) {
         return __awaiter(this, void 0, void 0, function* () {
             const { sameAs, typeOf, project, agent, object } = savingAction, updateFields = __rest(savingAction, ["sameAs", "typeOf", "project", "agent", "object"]);

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.8.0-alpha.7"
+  "version": "22.8.0-alpha.8"
 }

package/example/src/chevre/migrateCheckMovieTicketRecipes.ts

@@ -1,127 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const cursor = actionRepo.getCursor(
-        {
-            // _id: { $eq: '665c886886e0ee8ff5f7b3c5' },
-            typeOf: { $eq: chevre.factory.actionType.CheckAction },
-            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            startDate: {
-                // $lte: moment()
-                //     // tslint:disable-next-line:no-magic-numbers
-                //     .add(-178, 'days'),
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-365, 'days')
-            },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
-        },
-        {
-            __id: 1, startDate: 1, endDate: 1, result: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    let updateCount = 0;
-    let saveRecipeCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const checkAction = <Pick<
-            chevre.factory.action.check.paymentMethod.movieTicket.IAction,
-            'id' | 'startDate' | 'endDate' | 'result' | 'project' | 'typeOf' | 'actionStatus' | 'instrument'
-        >>doc.toObject();
-        const actionRecipe = await actionRepo.findRecipeByAction<chevre.factory.recipe.RecipeCategory.checkMovieTicket>({
-            project: { id: checkAction.project.id },
-            recipeFor: { id: checkAction.id }
-        });
-
-        const purchaseNumberAuthInByCheckAction = (<any>checkAction.result)?.purchaseNumberAuthIn;
-        const purchaseNumberAuthResultByCheckAction = (<any>checkAction.result)?.purchaseNumberAuthResult;
-
-        if (actionRecipe !== null) {
-            console.log(
-                'actionRecipe already exists. step:',
-                actionRecipe.step.length, checkAction.project.id, checkAction.id, checkAction.startDate, i, updateCount, saveRecipeCount);
-
-            // optimize action.result
-            if (purchaseNumberAuthInByCheckAction !== undefined || purchaseNumberAuthResultByCheckAction !== undefined) {
-                const unsetResult = await actionRepo.unsetUnnecessaryFields({
-                    filter: { _id: { $eq: checkAction.id } },
-                    $unset: {
-                        'result.purchaseNumberAuthIn': 1,
-                        'result.purchaseNumberAuthResult': 1
-                    }
-                });
-                updateCount += 1;
-                console.log(
-                    'result unset. unsetResult:', unsetResult,
-                    actionRecipe.step.length, checkAction.project.id, checkAction.id, checkAction.startDate, i);
-            }
-        } else {
-            console.log(
-                'creating recipe by alterTranResultByPayAction',
-                purchaseNumberAuthInByCheckAction?.stCd,
-                purchaseNumberAuthResultByCheckAction?.resultInfo.status,
-                checkAction.project.id, checkAction.id, checkAction.startDate, i);
-            if (purchaseNumberAuthInByCheckAction === undefined) {
-                throw new Error('purchaseNumberAuthInByCheckAction undefined');
-            }
-            if (purchaseNumberAuthResultByCheckAction === undefined) {
-                throw new Error('purchaseNumberAuthResultByCheckAction undefined');
-            }
-
-            const recipe: chevre.factory.action.check.paymentMethod.movieTicket.IRecipe & {
-                recipeFor: { id: string; typeOf: chevre.factory.actionType };
-                dateCreated: Date;
-                dateModified: Date;
-            } = {
-                project: { id: checkAction.project.id, typeOf: chevre.factory.organizationType.Project },
-                typeOf: 'Recipe',
-                recipeCategory: chevre.factory.recipe.RecipeCategory.checkMovieTicket,
-                recipeFor: { id: checkAction.id, typeOf: checkAction.typeOf },
-                step: [{
-                    typeOf: 'HowToSection',
-                    itemListElement: [
-                        {
-                            typeOf: 'HowToStep',
-                            identifier: chevre.factory.recipe.StepIdentifier.purchaseNumberAuth,
-                            itemListElement: [{
-                                typeOf: 'HowToDirection',
-                                beforeMedia: purchaseNumberAuthInByCheckAction,
-                                afterMedia: purchaseNumberAuthResultByCheckAction
-                            }]
-                        }
-                    ]
-                }],
-                dateCreated: moment(checkAction.endDate)
-                    .toDate(),
-                dateModified: moment(checkAction.endDate)
-                    .toDate()
-            };
-            console.log(
-                'saving recipe...',
-                checkAction.project.id, checkAction.id, checkAction.startDate, i);
-            // console.dir(recipe, { depth: null });
-            await actionRepo.saveRecipeWithDateCreated(recipe);
-            saveRecipeCount += 1;
-            console.log('recipe saved.', checkAction.project.id, checkAction.id, checkAction.startDate, i);
-        }
-    });
-
-    console.log(i, 'actions checked');
-    console.log(updateCount, 'actions updated');
-    console.log(saveRecipeCount, 'recipe saved');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migratePayCreditCardRecipes.ts

@@ -1,110 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const cursor = actionRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.actionType.PayAction },
-            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-30, 'days')
-            },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
-        },
-        {
-            __id: 1, startDate: 1, endDate: 1, result: 1, project: 1, typeOf: 1, actionStatus: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    const updateCount = 0;
-    let saveRecipeCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const payAction = <Pick<
-            chevre.factory.action.trade.pay.IAction,
-            'id' | 'startDate' | 'endDate' | 'result' | 'project' | 'typeOf' | 'actionStatus'
-        >>doc.toObject();
-        const actionRecipe = await actionRepo.findRecipeByAction<chevre.factory.recipe.RecipeCategory.payCreditCard>({
-            project: { id: payAction.project.id },
-            recipeFor: { id: payAction.id }
-        });
-
-        if (actionRecipe !== null) {
-            console.log(
-                'actionRecipe already exists. step:',
-                actionRecipe.step.length, payAction.project.id, payAction.id, payAction.startDate, i);
-        } else {
-            const alterTranResultByPayAction = (<any>payAction.result)?.creditCardSales?.[0];
-            console.log(
-                'creating recipe by alterTranResultByPayAction',
-                alterTranResultByPayAction?.tranId,
-                payAction.project.id, payAction.id, payAction.startDate, i);
-            if (alterTranResultByPayAction === undefined) {
-                throw new Error('alterTranResultByPayAction undefined');
-            }
-
-            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,
-                recipeFor: { id: payAction.id, typeOf: payAction.typeOf },
-                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,
-                                ...(alterTranResultByPayAction !== undefined) ? { afterMedia: alterTranResultByPayAction } : undefined
-                            }]
-                        }
-                    ]
-                }],
-                dateCreated: moment(payAction.endDate)
-                    .toDate(),
-                dateModified: moment(payAction.endDate)
-                    .toDate()
-            };
-            console.log(
-                'saving recipe...',
-                payAction.project.id, payAction.id, payAction.startDate, i);
-            // console.dir(recipe, { depth: null });
-            await actionRepo.saveRecipeWithDateCreated(recipe);
-            saveRecipeCount += 1;
-            console.log('recipe saved.', payAction.project.id, payAction.id, payAction.startDate, i);
-        }
-    });
-
-    console.log(i, 'transactions checked');
-    console.log(updateCount, 'transactions updated');
-    console.log(saveRecipeCount, 'recipe saved');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migratePayMovieTicketRecipes.ts

@@ -1,110 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const cursor = actionRepo.getCursor(
-        {
-            // _id: { $eq: '665c886886e0ee8ff5f7b3c5' },
-            typeOf: { $eq: chevre.factory.actionType.PayAction },
-            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            startDate: {
-                $lte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-29, 'days'),
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-180, 'days')
-            },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
-        },
-        {
-            __id: 1, startDate: 1, endDate: 1, result: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    const updateCount = 0;
-    let saveRecipeCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const payAction = <Pick<
-            chevre.factory.action.trade.pay.IAction,
-            'id' | 'startDate' | 'endDate' | 'result' | 'project' | 'typeOf' | 'actionStatus' | 'instrument'
-        >>doc.toObject();
-        const actionRecipe = await actionRepo.findRecipeByAction<chevre.factory.recipe.RecipeCategory.payMovieTicket>({
-            project: { id: payAction.project.id },
-            recipeFor: { id: payAction.id }
-        });
-
-        if (actionRecipe !== null) {
-            console.log(
-                'actionRecipe already exists. step:',
-                actionRecipe.step.length, payAction.project.id, payAction.id, payAction.startDate, i);
-        } else {
-            const seatInfoSyncInByPayAction = (<any>payAction.instrument)?.seatInfoSyncIn;
-            const seatInfoSyncResultByPayAction = (<any>payAction.result)?.seatInfoSyncResult;
-            console.log(
-                'creating recipe by alterTranResultByPayAction',
-                seatInfoSyncInByPayAction?.stCd,
-                seatInfoSyncResultByPayAction?.resultInfo.status,
-                payAction.project.id, payAction.id, payAction.startDate, i);
-            if (seatInfoSyncInByPayAction === undefined) {
-                throw new Error('seatInfoSyncInByPayAction undefined');
-            }
-            if (seatInfoSyncResultByPayAction === undefined) {
-                throw new Error('seatInfoSyncResultByPayAction undefined');
-            }
-
-            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,
-                recipeFor: { id: payAction.id, typeOf: payAction.typeOf },
-                step: [{
-                    typeOf: 'HowToSection',
-                    itemListElement: [
-                        {
-                            typeOf: 'HowToStep',
-                            identifier: chevre.factory.recipe.StepIdentifier.seatInfoSync,
-                            itemListElement: [{
-                                typeOf: 'HowToDirection',
-                                beforeMedia: seatInfoSyncInByPayAction,
-                                afterMedia: seatInfoSyncResultByPayAction
-                            }]
-                        }
-                    ]
-                }],
-                dateCreated: moment(payAction.endDate)
-                    .toDate(),
-                dateModified: moment(payAction.endDate)
-                    .toDate()
-            };
-            console.log(
-                'saving recipe...',
-                payAction.project.id, payAction.id, payAction.startDate, i);
-            // console.dir(recipe, { depth: null });
-            await actionRepo.saveRecipeWithDateCreated(recipe);
-            saveRecipeCount += 1;
-            console.log('recipe saved.', payAction.project.id, payAction.id, payAction.startDate, i);
-        }
-    });
-
-    console.log(i, 'transactions checked');
-    console.log(updateCount, 'transactions updated');
-    console.log(saveRecipeCount, 'recipe saved');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/saveRecipe.ts

@@ -1,54 +0,0 @@
-// 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);