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

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.2"
+  "version": "21.32.0-alpha.3"
 }