@chevre/domain 21.30.0-alpha.0 → 21.30.0-alpha.2

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

@@ -26,7 +26,8 @@ const schemaDefinition = {
     instrument: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
     replacer: mongoose_1.SchemaTypes.Mixed,
-    targetCollection: mongoose_1.SchemaTypes.Mixed // add targetCollection(2024-03-19~)
+    targetCollection: mongoose_1.SchemaTypes.Mixed,
+    sameAs: mongoose_1.SchemaTypes.Mixed // タスク関連付けのために追加(2024-04-20~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -35,7 +36,6 @@ const schemaOptions = {
     id: true,
     read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
-    // true化(2022-11-12~)
     strict: true,
     strictQuery: false,
     timestamps: {

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

@@ -56,7 +56,11 @@ declare function payCreditCard(params: factory.task.pay.IPayActionData): (repos:
 /**
  * クレジットカード返金
  */
-declare function refundCreditCard(params: factory.task.refund.IData, options: {
+declare function refundCreditCard(params: factory.task.refund.IData & {
+    sameAs?: {
+        id: string;
+    };
+}, options: {
     requirePayAction: boolean;
 }): (repos: {
     action: ActionRepo;

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

@@ -421,7 +421,7 @@ function processAlterTran(params) {
  */
 function refundCreditCard(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const paymentMethodType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.typeOf;
         const paymentMethodId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.paymentMethodId;
         const paymentServiceId = (_c = params.object[0]) === null || _c === void 0 ? void 0 : _c.id;
@@ -443,7 +443,14 @@ function refundCreditCard(params, options) {
             typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        let action = yield repos.action.start(params);
+        let action = yield repos.action.start(Object.assign(Object.assign({}, params), (typeof ((_e = params.sameAs) === null || _e === void 0 ? void 0 : _e.id) === 'string')
+            ? {
+                sameAs: {
+                    id: params.sameAs.id,
+                    typeOf: 'Task'
+                }
+            }
+            : undefined));
         let alterTranResult = [];
         try {
             alterTranResult = yield processChangeTransaction({
@@ -452,7 +459,7 @@ function refundCreditCard(params, options) {
                 paymentMethodId: paymentMethodId,
                 shopId: shopId,
                 shopPass: shopPass,
-                refundFee: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.refundFee
+                refundFee: (_f = params.object[0]) === null || _f === void 0 ? void 0 : _f.refundFee
             });
         }
         catch (error) {

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

@@ -70,5 +70,9 @@ declare function payMovieTicket(params: factory.task.pay.IPayActionData): IPayOp
 /**
  * MovieTicket着券取消
  */
-declare function refundMovieTicket(params: factory.task.refund.IData): IRefundOperation<void>;
+declare function refundMovieTicket(params: factory.task.refund.IData & {
+    sameAs?: {
+        id: string;
+    };
+}): IRefundOperation<void>;
 export { ICheckResult, authorize, checkMovieTicket, payMovieTicket, refundMovieTicket, voidTransaction };

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

@@ -352,7 +352,7 @@ function payActionParams2seatInfoSyncIn(params) {
 function refundMovieTicket(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;
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
         const availableChannel = yield repos.paymentService.findAvailableChannel({
@@ -369,7 +369,14 @@ function refundMovieTicket(params) {
         });
         const movieTicketSeatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
         // アクション開始
-        let action = yield repos.action.start(params);
+        let action = yield repos.action.start(Object.assign(Object.assign({}, params), (typeof ((_f = params.sameAs) === null || _f === void 0 ? void 0 : _f.id) === 'string')
+            ? {
+                sameAs: {
+                    id: params.sameAs.id,
+                    typeOf: 'Task'
+                }
+            }
+            : undefined));
         let seatInfoSyncIn;
         let seatInfoSyncResult;
         let seatInfoSyncResultAsError;

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

@@ -45,7 +45,11 @@ export declare function voidPayment(params: factory.task.voidPayment.IData): (re
 /**
  * 返金
  */
-export declare function refund(params: factory.task.refund.IData): (repos: {
+export declare function refund(params: factory.task.refund.IData & {
+    sameAs?: {
+        id: string;
+    };
+}): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;

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

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

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

@@ -0,0 +1,51 @@
+"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 accountingReport_1 = require("../../repo/accountingReport");
+const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
+const paymentService_1 = require("../../repo/paymentService");
+const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
+const product_1 = require("../../repo/product");
+const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
+const transactionNumber_1 = require("../../repo/transactionNumber");
+const transactionProcess_1 = require("../../repo/transactionProcess");
+const any_1 = require("../payment/any");
+/**
+ * タスク実行関数
+ */
+function call(params) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, any_1.authorize)(params.data)({
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            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),
+            product: new product_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection),
+            transactionNumber: new transactionNumber_1.RedisRepository(settings.redisClient),
+            transactionProcess: new transactionProcess_1.TransactionProcessRepository(settings.redisClient, { lockExpiresInSeconds: 120 })
+        });
+    });
+}
+exports.call = call;

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

@@ -3,4 +3,4 @@ import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.refund.IData): IOperation<void>;
+export declare function call(params: factory.task.refund.IData | factory.task.refund.ITask): IOperation<void>;

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

@@ -25,11 +25,19 @@ const PaymentService = require("../payment");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
+        let data;
+        if (params.name === factory.taskName.Refund) {
+            data = Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+             });
+        }
+        else {
+            data = params;
+        }
         yield PaymentService.refund(data)({
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),

package/lib/chevre/service/task.js

@@ -87,7 +87,14 @@ function execute(task) {
         try {
             // タスク名の関数が定義されていなければ、TypeErrorとなる
             const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
-            yield call(task.data)(settings);
+            switch (task.name) {
+                case factory.taskName.AuthorizePayment:
+                case factory.taskName.Refund:
+                    yield call(task)(settings);
+                    break;
+                default:
+                    yield call(task.data)(settings);
+            }
             const result = {
                 executedAt: now,
                 endDate: new Date(),

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.367.0",
+    "@chevre/factory": "4.368.0-alpha.1",
     "@cinerino/sdk": "5.17.1",
     "@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.30.0-alpha.0"
+  "version": "21.30.0-alpha.2"
 }