@chevre/domain 21.33.0-alpha.9 → 21.33.0

package/example/src/chevre/findTransactionById.ts

@@ -8,11 +8,14 @@ async function main() {
 
     const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
 
-    const transaction = await transactionRepo.findById({
-        typeOf: chevre.factory.transactionType.PlaceOrder,
-        id: '6656d35dd1f13f8c658be102',
-        inclusion: ['typeOf']
-    });
+    const transaction = await transactionRepo.findById(
+        {
+            typeOf: chevre.factory.transactionType.PlaceOrder,
+            id: '6656d35dd1f13f8c658be102'
+        },
+        ['status'],
+        ['typeOf', 'object', 'seller', 'agent', 'tasksExportAction']
+    );
     console.log('transaction:', transaction);
 }
 

package/example/src/chevre/migratePayCreditCardRecipes.ts

@@ -0,0 +1,104 @@
+// 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(-180, '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 = 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 & { dateCreated: 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()
+            };
+            console.log(
+                'saving recipe...',
+                payAction.project.id, payAction.id, payAction.startDate, i);
+            // console.dir(recipe, { depth: null });
+            await actionRepo.saveOneRecipe(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

@@ -0,0 +1,100 @@
+// 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(-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 = payAction.instrument?.seatInfoSyncIn;
+            const seatInfoSyncResultByPayAction = 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 & { dateCreated: 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()
+            };
+            console.log(
+                'saving recipe...',
+                payAction.project.id, payAction.id, payAction.startDate, i);
+            // console.dir(recipe, { depth: null });
+            await actionRepo.saveOneRecipe(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/migrateTransactionObjectPaymentMethods.ts

@@ -0,0 +1,147 @@
+// 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) };
+
+type IAcceptPayAction = chevre.factory.action.accept.pay.IAction;
+
+// 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 transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+
+    const cursor = transactionRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
+            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
+            startDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-30, 'days')
+                    .toDate()
+            }
+        },
+        {
+            startDate: 1,
+            project: 1,
+            object: 1
+        }
+    );
+    console.log('transactions found');
+
+    let i = 0;
+    let updateCount = 0;
+    let saveRecipeCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const placeOrder: Pick<
+            chevre.factory.transaction.placeOrder.ITransaction,
+            'startDate' | 'project' | 'object' | 'id'
+        > = doc.toObject();
+
+        const paymentMethodsByTransaction = placeOrder.object.paymentMethods;
+        const paymentMethodId4paymentUrl = paymentMethodsByTransaction?.paymentMethodId;
+        const alreadyMigrated =
+            typeof paymentMethodId4paymentUrl !== 'string'
+            || (typeof paymentMethodId4paymentUrl === 'string' && (<any>paymentMethodsByTransaction).entryTranArgs === undefined);
+
+        if (alreadyMigrated) {
+            console.log('already migrated.', placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
+        } else {
+            const acceptPayAction = (<Pick<IAcceptPayAction, 'object' | 'result' | 'id' | 'typeOf' | 'endDate'>[]>await actionRepo.search(
+                {
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: placeOrder.project.id } },
+                    typeOf: { $eq: chevre.factory.actionType.AcceptAction },
+                    actionStatus: { $in: [chevre.factory.actionStatusType.CompletedActionStatus] },
+                    purpose: { id: { $in: [placeOrder.id] } },
+                    object: {
+                        transactionNumber: { $eq: paymentMethodId4paymentUrl },
+                        typeOf: { $eq: chevre.factory.assetTransactionType.Pay }
+                    }
+                },
+                ['object', 'result', 'typeOf', 'endDate'],
+                []
+            )).shift();
+
+            if (acceptPayAction !== undefined) {
+                const actionRecipe = await actionRepo.findRecipeByAction({
+                    project: { id: placeOrder.project.id },
+                    recipeFor: { id: acceptPayAction.id }
+                });
+                if (actionRecipe !== null) {
+                    console.log(
+                        'actionRecipe already exists. step:',
+                        actionRecipe.step.length, placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
+
+                    // 取引から冗長な属性を削除
+                    if ((<any>paymentMethodsByTransaction).entryTranArgs !== undefined) {
+                        await transactionRepo.findByIdAndUpdate4migrate({
+                            id: placeOrder.id,
+                            update: {
+                                $set: { 'object.paymentMethods': { paymentMethodId: paymentMethodId4paymentUrl } }
+                            }
+                        });
+                        updateCount += 1;
+                    }
+                } else {
+                    const recipe: chevre.factory.action.accept.pay.IRecipe & { dateCreated: Date } = {
+                        project: { id: placeOrder.project.id, typeOf: chevre.factory.organizationType.Project },
+                        typeOf: 'Recipe',
+                        recipeCategory: chevre.factory.recipe.RecipeCategory.publishPaymentUrl,
+                        recipeFor: { id: acceptPayAction.id, typeOf: acceptPayAction.typeOf },
+                        step: [{
+                            typeOf: 'HowToSection',
+                            itemListElement: [
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.entryTran,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        beforeMedia: (<any>paymentMethodsByTransaction).entryTranArgs,
+                                        afterMedia: (<any>paymentMethodsByTransaction).entryTranResult
+                                    }]
+                                },
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.execTran,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        beforeMedia: (<any>paymentMethodsByTransaction).execTranArgs,
+                                        afterMedia: (<any>paymentMethodsByTransaction).execTranResult
+                                    }]
+                                }
+                            ]
+                        }],
+                        dateCreated: moment(acceptPayAction.endDate)
+                            .toDate()
+                    };
+                    console.log(
+                        'saving recipe...',
+                        placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
+                    // console.dir(recipe, { depth: null });
+                    await actionRepo.saveOneRecipe(recipe);
+                    saveRecipeCount += 1;
+                    console.log('recipe saved.', placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
+                }
+            } else {
+                console.log('acceptPayAction does not exist.', placeOrder.project.id, placeOrder.id, placeOrder.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/reexportTasksByExportAction.ts

@@ -0,0 +1,37 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+function onTransactionStatusChangedListener() {
+    return async (params: {
+        /**
+         * 取引ID
+         */
+        id: string;
+        typeOf: chevre.factory.assetTransactionType;
+        status: chevre.factory.transactionStatusType;
+    }) => {
+        const { id, typeOf, status } = params;
+        console.log('transactionStatusChanged.', id, typeOf, status);
+    };
+}
+
+chevre.eventEmitter.assetTransaction.onAssetTransactionStatusChanged(onTransactionStatusChangedListener());
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const transactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
+
+    const result = await transactionRepo.reexportTasksByExportAction({
+        intervalInMinutes: 10
+    });
+    console.log('reexported', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchActionsBySameAs.ts

@@ -14,7 +14,8 @@ async function main() {
 
     const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
     const actions = await actionRepo.searchBySameAs({
-        sameAs: { id: { $eq: '662456a40e9f9ad3b50f1481' } }
+        sameAs: { id: { $eq: '662456a40e9f9ad3b50f1481' } },
+        typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
     });
     console.log('actions:', actions);
 }

package/example/src/chevre/searchCheckMovieTicketResultYkknInfo.ts

@@ -10,22 +10,42 @@ async function main() {
 
     const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
 
-    const mkknInfos = await actionRepo.searchMkknInfoByCheckMovieTicketResult({
+    let mkknInfos = await actionRepo.searchMkknInfoByCheckMovieTicketResult({
         limit: 10,
         page: 1,
-        id: '664db85f9801179aabb046e8',
+        id: '666171386c7acb70fd9a44ec',
         project: { id: project.id },
-        purpose: { id: '664db8219801179aabb04624' }
+        purpose: { id: '6661712a6c7acb70fd9a44a8' }
     });
     console.log('mkknInfos found', mkknInfos);
     console.log(mkknInfos.length, 'infos found');
 
-    const ykknInfos = await actionRepo.searchYkknInfoByCheckMovieTicketResult({
+    mkknInfos = await actionRepo.searchMkknInfoByCheckRecipe({
         limit: 10,
         page: 1,
-        id: '664db85f9801179aabb046e8',
+        id: '666171386c7acb70fd9a44ec',
         project: { id: project.id },
-        purpose: { id: '664db8219801179aabb04624' }
+        purpose: { id: '6661712a6c7acb70fd9a44a8' }
+    });
+    console.log('mkknInfos found', mkknInfos);
+    console.log(mkknInfos.length, 'infos found');
+
+    let ykknInfos = await actionRepo.searchYkknInfoByCheckMovieTicketResult({
+        limit: 10,
+        page: 1,
+        id: '666171386c7acb70fd9a44ec',
+        project: { id: project.id },
+        purpose: { id: '6661712a6c7acb70fd9a44a8' }
+    });
+    console.log('ykknInfos found', ykknInfos);
+    console.log(ykknInfos.length, 'infos found');
+
+    ykknInfos = await actionRepo.searchYkknInfoByCheckRecipe({
+        limit: 10,
+        page: 1,
+        id: '666171386c7acb70fd9a44ec',
+        project: { id: project.id },
+        purpose: { id: '6661712a6c7acb70fd9a44a8' }
     });
     console.log('ykknInfos found', ykknInfos);
     console.log(ykknInfos.length, 'infos found');

package/example/src/chevre/searchTransactions.ts

@@ -26,7 +26,7 @@ async function main() {
         //         orderNumbers: ['CIN3-0760465-8981560']
         //     }
         // },
-        tasksExportAction: { actionStatus: { $eq: chevre.factory.actionStatusType.PotentialActionStatus } },
+        // tasksExportAction: { actionStatus: { $eq: chevre.factory.actionStatusType.PotentialActionStatus } },
         inclusion: ['_id'],
         exclusion: []
     });

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -9,26 +9,11 @@ async function main() {
 
     let updateResult: any;
 
-    const aggregationRepo = await chevre.repository.Aggregation.createInstance(mongoose.connection);
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
 
-    updateResult = await aggregationRepo.unsetUnnecessaryFields({
+    updateResult = await assetTransactionRepo.unsetUnnecessaryFields({
         filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            __v: 1,
-            createdAt: 1,
-            updatedAt: 1
-        }
-    });
-    console.log('unset processed.', updateResult);
-
-    updateResult = await taskRepo.unsetUnnecessaryFields({
-        filter: {
-            // _id: { $exists: true },
-            name: { $nin: ['deleteTransaction'] },
-            runsAt: {
+            startDate: {
                 $gte: moment()
                     .add(-1, 'days')
                     .toDate()

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

@@ -59,11 +59,13 @@ 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 : never;
 /**
  * アクションリポジトリ
  */
 export declare class MongoRepository {
     private readonly actionModel;
+    private readonly actionRecipeModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): any[];
     /**
@@ -185,6 +187,12 @@ export declare class MongoRepository {
                 $eq: string;
             };
         };
+        /**
+         * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
+         */
+        typeOf: {
+            $eq: factory.actionType;
+        };
     }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
     deleteByProject(params: {
         project: {
@@ -245,6 +253,38 @@ export declare class MongoRepository {
     }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.INvalidTicket & {
         knyknrNo: string;
     })[]>;
+    searchYkknInfoByCheckRecipe(filter: {
+        limit: number;
+        page: number;
+        /**
+         * 認証アクションID
+         */
+        id: string;
+        project: {
+            id: string;
+        };
+        purpose: {
+            id: string;
+        };
+    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.IValidTicket & {
+        knyknrNo: string;
+    })[]>;
+    searchMkknInfoByCheckRecipe(filter: {
+        limit: number;
+        page: number;
+        /**
+         * 認証アクションID
+         */
+        id: string;
+        project: {
+            id: string;
+        };
+        purpose: {
+            id: string;
+        };
+    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.INvalidTicket & {
+        knyknrNo: string;
+    })[]>;
     /**
      * 開始日時を一定期間過ぎたアクションを削除する
      */
@@ -274,6 +314,17 @@ export declare class MongoRepository {
     }): Promise<{
         deletedCount?: number;
     } | null>;
+    saveOneRecipe(savingRecipe: factory.recipe.IRecipe & {
+        dateCreated?: Date;
+    }): Promise<import("mongodb").InsertManyResult<any>>;
+    findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
+        project: {
+            id: string;
+        };
+        recipeFor: {
+            id: string;
+        };
+    }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null>;
     aggregateAuthorizeEventServiceOfferAction(params: {
         project?: {
             id?: {