@chevre/domain 21.32.0-alpha.1 → 21.32.0-alpha.3

package/example/src/chevre/findAuthorizePaymentAction.ts

@@ -0,0 +1,34 @@
+// 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, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const result = await (await chevre.service.payment.any.createService()).findAuthorizeAction({
+        project: {
+            id: project.id
+        },
+        sameAs: {
+            id: '6649277cd22032e3e7b6d0fa'
+        },
+        purpose: {
+            id: '66492757d22032e3e7b6d013'
+            // id: '66492757d22032e3e7b63'
+        }
+    })({
+        action: actionRepo,
+        task: taskRepo
+    });
+    console.log('result:', result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -174,7 +174,7 @@ export declare class MongoRepository {
                 $eq: string;
             };
         };
-    }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus' | 'error'>[]>;
+    }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/action.js

@@ -684,7 +684,7 @@ class MongoRepository {
             const query = this.actionModel.find(Object.assign({ 'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq } }, (typeof ((_a = params.purpose) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
                 ? { 'purpose.id': { $exists: true, $eq: params.purpose.id.$eq } }
                 : undefined))
-                .select({ _id: 1, actionStatus: 1, error: 1 })
+                .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })
                 .limit(1);
             return query.exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));

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

@@ -38,10 +38,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -56,14 +54,6 @@ const schemaOptions = {
     }
 };
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { 'project.id': 1, startDate: -1 },
         {

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

@@ -49,7 +49,7 @@ export type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITas
 type IDelayedTask = Pick<factory.task.ITask<factory.taskName>, 'id' | 'name' | 'status'>;
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | '_id';
 type IProjection = {
-    [key in IKeyOfProjection]?: 0;
+    [key in IKeyOfProjection]?: 0 | 1;
 };
 /**
  * タスクリポジトリ

package/lib/chevre/repo/task.js

@@ -577,7 +577,13 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            const positiveProjectionExists = (projection !== undefined && projection !== null)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
+                : false;
+            const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, (positiveProjectionExists)
+                ? projection
+                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)

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

@@ -132,4 +132,41 @@ declare function authorize(params: {
      */
     id: string;
 }>;
-export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };
+interface IFindAuthorizeActionResult {
+    /**
+     * アクションID
+     */
+    id?: string;
+    /**
+     * アクションスタータス
+     */
+    actionStatus: factory.actionStatusType;
+    /**
+     * エラー
+     */
+    error?: {
+        name?: string;
+        message?: string;
+    };
+}
+declare function findAuthorizeAction(params: {
+    project: {
+        id: string;
+    };
+    sameAs: {
+        /**
+         * task ID
+         */
+        id: string;
+    };
+    purpose: {
+        /**
+         * transaction ID
+         */
+        id: string;
+    };
+}): (repos: {
+    action: ActionRepo;
+    task: TaskRepo;
+}) => Promise<IFindAuthorizeActionResult>;
+export { onPaymentStatusChanged, authorize, findAuthorizeAction, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.publishPaymentUrl = exports.processVoidPayTransaction = exports.person2username = exports.voidPayTransaction = exports.invalidatePaymentUrl = exports.authorize = exports.onPaymentStatusChanged = void 0;
+exports.publishPaymentUrl = exports.processVoidPayTransaction = exports.person2username = exports.voidPayTransaction = exports.invalidatePaymentUrl = exports.findAuthorizeAction = exports.authorize = exports.onPaymentStatusChanged = void 0;
 /**
  * 汎用決済サービス
  */
@@ -464,3 +464,56 @@ function fixAccountIdIfPossible(params) {
         return { accountId };
     });
 }
+function findAuthorizeAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        // タスク検索
+        const task = (yield repos.task.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory.taskName.AuthorizePayment
+        }, {
+            status: 1,
+            executionResults: 1
+        })).shift();
+        if (task === undefined) {
+            throw new factory.errors.NotFound(factory.taskName.AuthorizePayment);
+        }
+        const errorByTask = (_a = task.executionResults.shift()) === null || _a === void 0 ? void 0 : _a.error;
+        let defaultActionError;
+        if (typeof errorByTask === 'string') {
+            defaultActionError = { message: errorByTask };
+        }
+        else if (typeof (errorByTask === null || errorByTask === void 0 ? void 0 : errorByTask.message) === 'string') {
+            defaultActionError = { message: errorByTask.message, name: errorByTask.name };
+        }
+        let action = Object.assign({ actionStatus: factory.actionStatusType.PotentialActionStatus }, (defaultActionError !== undefined) ? { error: defaultActionError } : undefined);
+        switch (task.status) {
+            case factory.taskStatus.Ready:
+                break;
+            default:
+                // タスクがReadyでなければアクション検索
+                const authorizeAction = (yield repos.action.searchBySameAs({
+                    sameAs: { id: { $eq: task.id } }
+                    // purpose: { id: { $eq: String(params.purpose.id) } }
+                })).shift();
+                if (authorizeAction !== undefined) {
+                    // purpose検証
+                    if (((_b = authorizeAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
+                        throw new factory.errors.NotFound('Action');
+                    }
+                    action = Object.assign({ id: authorizeAction.id, actionStatus: authorizeAction.actionStatus }, (authorizeAction.error !== undefined)
+                        ? {
+                            error: (Array.isArray(authorizeAction.error))
+                                ? authorizeAction.error[0]
+                                : authorizeAction.error
+                        }
+                        : undefined);
+                }
+        }
+        return action;
+    });
+}
+exports.findAuthorizeAction = findAuthorizeAction;

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

@@ -37,7 +37,7 @@ var MovieticketReserveRequestErrorMessage;
 function checkMovieTicket(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         // 不要な属性がリクエストに含まれているのでmovieTicketsを最適化(2024-03-15~)
         let movieTickets = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.movieTickets;
         if (!Array.isArray(movieTickets)) {
@@ -62,7 +62,10 @@ function checkMovieTicket(params) {
         });
         const paymentMethodType = (_b = optimizedCheckObject[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.typeOf; // 決済方法区分
         const paymentServiceId = (_c = optimizedCheckObject[0]) === null || _c === void 0 ? void 0 : _c.id;
-        const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent, object: optimizedCheckObject }, (typeof ((_d = params.purpose) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { purpose: params.purpose } : undefined);
+        const taskId = (_d = params.sameAs) === null || _d === void 0 ? void 0 : _d.id;
+        const actionAttributes = Object.assign(Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent, object: optimizedCheckObject }, (typeof ((_e = params.purpose) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string') ? { purpose: params.purpose } : undefined), (typeof taskId === 'string')
+            ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-21~)
+            : undefined);
         const action = yield repos.action.start(actionAttributes);
         let checkResult;
         try {
@@ -77,7 +80,7 @@ function checkMovieTicket(params) {
             let screeningEvent;
             // イベント取得属性最適化(2023-01-23~)
             screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
-            const sellerId = (_e = optimizedCheckObject[0]) === null || _e === void 0 ? void 0 : _e.seller.id;
+            const sellerId = (_f = optimizedCheckObject[0]) === null || _f === void 0 ? void 0 : _f.seller.id;
             const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: sellerId },
                 codeValue: paymentMethodType

package/lib/chevre/service/task/checkMovieTicket.d.ts

@@ -0,0 +1,6 @@
+import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(params: Pick<factory.task.checkMovieTicket.ITask, IExecutableTaskKeys>): IOperationExecute<void>;

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

@@ -0,0 +1,61 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const factory = require("../../factory");
+const action_1 = require("../../repo/action");
+const event_1 = require("../../repo/event");
+const paymentService_1 = require("../../repo/paymentService");
+const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
+const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const pay_1 = require("../assetTransaction/pay");
+/**
+ * タスク実行関数
+ */
+function call(params) {
+    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        // 遅延実行(executeByName)には対応しない
+        if (!options.executeById) {
+            return;
+        }
+        const actionRepo = new action_1.MongoRepository(settings.connection);
+        try {
+            yield (0, pay_1.check)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } }))({
+                action: actionRepo,
+                event: new event_1.MongoRepository(settings.connection),
+                paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
+                paymentService: new paymentService_1.MongoRepository(settings.connection),
+                paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection)
+            });
+        }
+        catch (error) {
+            let throwsError = true;
+            // アクションが存在すればタスクを実行済扱いにする
+            const action = (yield actionRepo.searchBySameAs(Object.assign({ sameAs: { id: { $eq: params.id } } }, (typeof ((_a = params.data.purpose) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { purpose: { id: { $eq: params.data.purpose.id } } }
+                : undefined))).shift();
+            if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        finally {
+            // no op
+        }
+    });
+}
+exports.call = call;

package/lib/chevre/service/task.js

@@ -105,6 +105,7 @@ function execute(task) {
             const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
             switch (task.name) {
                 case factory.taskName.AuthorizePayment:
+                case factory.taskName.CheckMovieTicket:
                 case factory.taskName.Refund:
                     yield call(task)(settings, options);
                     break;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.370.0",
+    "@chevre/factory": "4.371.0-alpha.0",
     "@cinerino/sdk": "6.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.32.0-alpha.1"
+  "version": "21.32.0-alpha.3"
 }