@chevre/domain 21.32.0-alpha.12 → 21.32.0-alpha.13

package/example/src/chevre/findCheckAction.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) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const action = await (await chevre.service.payment.any.createService()).findCheckAction({
+        project: {
+            id: project.id
+        },
+        sameAs: {
+            id: '664db85f9801179aabb046e5'
+        },
+        purpose: {
+            id: '664db8219801179aabb04624'
+        },
+        options: {
+            minimize: true
+        }
+    })({
+        action: actionRepo,
+        task: taskRepo
+    });
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(action.result?.purchaseNumberAuthResult, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchCheckMovieTicketResultYkknInfo.ts

@@ -0,0 +1,36 @@
+// tslint:disable:no-console
+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);
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    const mkknInfos = await actionRepo.searchMkknInfoByCheckMovieTicketResult({
+        limit: 10,
+        page: 1,
+        id: '664db85f9801179aabb046e8',
+        project: { id: project.id },
+        purpose: { id: '664db8219801179aabb04624' }
+    });
+    console.log('mkknInfos found', mkknInfos);
+    console.log(mkknInfos.length, 'infos found');
+
+    const ykknInfos = await actionRepo.searchYkknInfoByCheckMovieTicketResult({
+        limit: 10,
+        page: 1,
+        id: '664db85f9801179aabb046e8',
+        project: { id: project.id },
+        purpose: { id: '664db8219801179aabb04624' }
+    });
+    console.log('ykknInfos found', ykknInfos);
+    console.log(ykknInfos.length, 'infos found');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -22,7 +22,8 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection, FilterQuery } from 'mongoose';
+import { factory as surfrockFactory } from '@surfrock/sdk';
+import { Connection, FilterQuery } 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;
@@ -120,7 +121,7 @@ export declare class MongoRepository {
     findById<T extends factory.actionType>(params: {
         typeOf: T;
         id: string;
-    }): Promise<IAction<T>>;
+    }, inclusion?: KeyOfAction[], exclusion?: KeyOfAction[]): Promise<IAction<T>>;
     findPayAction(params: {
         project: {
             id: string;
@@ -202,6 +203,38 @@ export declare class MongoRepository {
         };
         entranceGateIdentifier: string;
     }): Promise<IUseActionCountByOffer[]>;
+    searchYkknInfoByCheckMovieTicketResult(filter: {
+        limit: number;
+        page: number;
+        /**
+         * 認証アクションID
+         */
+        id: string;
+        project: {
+            id: string;
+        };
+        purpose: {
+            id: string;
+        };
+    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.IValidTicket & {
+        knyknrNo: string;
+    })[]>;
+    searchMkknInfoByCheckMovieTicketResult(filter: {
+        limit: number;
+        page: number;
+        /**
+         * 認証アクションID
+         */
+        id: string;
+        project: {
+            id: string;
+        };
+        purpose: {
+            id: string;
+        };
+    }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.INvalidTicket & {
+        knyknrNo: string;
+    })[]>;
     /**
      * 開始日時を一定期間過ぎたアクションを削除する
      */

package/lib/chevre/repo/action.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const factory = require("../factory");
 const action_1 = require("./mongoose/schemas/action");
 const settings_1 = require("../settings");
@@ -608,13 +609,30 @@ class MongoRepository {
                 .exec();
         });
     }
-    findById(params) {
+    findById(params, inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const doc = yield this.actionModel.findOne({
-                typeOf: params.typeOf,
-                _id: params.id
-            })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+                typeOf: { $eq: params.typeOf },
+                _id: { $eq: params.id }
+            }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
@@ -799,6 +817,78 @@ class MongoRepository {
                 .exec();
         });
     }
+    searchYkknInfoByCheckMovieTicketResult(filter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filterQuery = {
+                _id: { $eq: new mongoose_1.Types.ObjectId(filter.id) },
+                'project.id': { $eq: filter.project.id },
+                'purpose.id': { $exists: true, $eq: filter.purpose.id },
+                typeOf: { $eq: factory.actionType.CheckAction },
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            };
+            const projectStage = {
+                _id: 0,
+                knyknrNo: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.knyknrNo',
+                ykknshTyp: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.ykknInfo.ykknshTyp',
+                eishhshkTyp: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.ykknInfo.eishhshkTyp',
+                ykknKnshbtsmiNum: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.ykknInfo.ykknKnshbtsmiNum',
+                knshknhmbiUnip: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.ykknInfo.knshknhmbiUnip',
+                kijUnip: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.ykknInfo.kijUnip'
+            };
+            const aggregate = this.actionModel.aggregate([
+                { $unwind: '$result.purchaseNumberAuthResult.knyknrNoInfoOut' },
+                { $unwind: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.ykknInfo' },
+                { $match: filterQuery },
+                { $project: projectStage }
+            ]);
+            if (typeof filter.limit === 'number' && filter.limit > 0) {
+                const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
+                aggregate.limit(filter.limit * page)
+                    .skip(filter.limit * (page - 1));
+            }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    searchMkknInfoByCheckMovieTicketResult(filter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filterQuery = {
+                _id: { $eq: new mongoose_1.Types.ObjectId(filter.id) },
+                'project.id': { $eq: filter.project.id },
+                'purpose.id': { $exists: true, $eq: filter.purpose.id },
+                typeOf: { $eq: factory.actionType.CheckAction },
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            };
+            const projectStage = {
+                _id: 0,
+                knyknrNo: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.knyknrNo',
+                mkknshTyp: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.mkknshTyp',
+                mkknKnshbtsmiNum: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.mkknKnshbtsmiNum',
+                mkjyTyp: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.mkjyTyp',
+                yykDt: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.yykDt',
+                shyJeiDt: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.shyJeiDt',
+                shyStCd: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.shyStCd',
+                shyScrnCd: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.shyScrnCd',
+                shySkhnCd: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.shySkhnCd',
+                shySkhnNm: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo.shySkhnNm'
+            };
+            const aggregate = this.actionModel.aggregate([
+                { $unwind: '$result.purchaseNumberAuthResult.knyknrNoInfoOut' },
+                { $unwind: '$result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo' },
+                { $match: filterQuery },
+                { $project: projectStage }
+            ]);
+            if (typeof filter.limit === 'number' && filter.limit > 0) {
+                const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
+                aggregate.limit(filter.limit * page)
+                    .skip(filter.limit * (page - 1));
+            }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     /**
      * 開始日時を一定期間過ぎたアクションを削除する
      */

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

@@ -229,6 +229,12 @@ declare function findCheckAction(params: {
          */
         id: string;
     };
+    options: {
+        /**
+         * 最小化すると、ykknInfo,mkknInfoを返さない
+         */
+        minimize: boolean;
+    };
 }): (repos: {
     action: ActionRepo;
     task: TaskRepo;

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

@@ -562,20 +562,35 @@ function findCheckAction(params) {
                     if (((_b = authorizeAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    const authorizeActionWithResult = (yield repos.action.search({ id: { $in: [authorizeAction.id] } }, ['result'], [])).shift();
+                    const authorizeActionWithResult = yield repos.action.findById({ id: authorizeAction.id, typeOf: factory.actionType.CheckAction }, [], [
+                        'agent',
+                        'purpose',
+                        'object',
+                        'startDate',
+                        'endDate',
+                        'actionStatus',
+                        'typeOf',
+                        'project',
+                        'sameAs',
+                        '_id',
+                        ...(params.options.minimize === true)
+                            ? [
+                                'result.purchaseNumberAuthResult.knyknrNoInfoOut.ykknInfo',
+                                'result.purchaseNumberAuthResult.knyknrNoInfoOut.mkknInfo'
+                            ]
+                            : []
+                    ]);
+                    let purchaseNumberAuthResult;
+                    if ((authorizeActionWithResult === null || authorizeActionWithResult === void 0 ? void 0 : authorizeActionWithResult.result) !== undefined) {
+                        purchaseNumberAuthResult = authorizeActionWithResult.result.purchaseNumberAuthResult;
+                    }
                     action = Object.assign(Object.assign({ id: authorizeAction.id, actionStatus: authorizeAction.actionStatus }, (authorizeAction.error !== undefined)
                         ? {
                             error: (Array.isArray(authorizeAction.error))
                                 ? authorizeAction.error[0]
                                 : authorizeAction.error
                         }
-                        : undefined), ((authorizeActionWithResult === null || authorizeActionWithResult === void 0 ? void 0 : authorizeActionWithResult.result) !== undefined)
-                        ? {
-                            result: {
-                                purchaseNumberAuthResult: authorizeActionWithResult.result.purchaseNumberAuthResult
-                            }
-                        }
-                        : undefined);
+                        : undefined), (purchaseNumberAuthResult !== undefined) ? { result: { purchaseNumberAuthResult } } : undefined);
                 }
         }
         return action;
@@ -622,7 +637,7 @@ function findAcceptAction(params) {
                     if (((_b = acceptAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    const acceptActionWithResult = (yield repos.action.search({ id: { $in: [acceptAction.id] } }, ['result'], [])).shift();
+                    const acceptActionWithResult = yield repos.action.findById({ id: acceptAction.id, typeOf: factory.actionType.AcceptAction }, ['result'], []);
                     action = Object.assign(Object.assign({ id: acceptAction.id, actionStatus: acceptAction.actionStatus }, (acceptAction.error !== undefined)
                         ? {
                             error: (Array.isArray(acceptAction.error))

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.32.0-alpha.12"
+  "version": "21.32.0-alpha.13"
 }