@chevre/domain 22.9.0-alpha.18 → 22.9.0-alpha.19

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -81,7 +81,9 @@ export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransacti
 /**
  * 決済ロケーション発行
  */
-export declare function publishPaymentUrl(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
+export declare function publishPaymentUrl(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'agent' | 'location' | 'project' | 'recipient' | 'transactionNumber' | 'typeOf'> & {
+    object: factory.action.accept.pay.IPayObject;
+}, options: {
     purposeAsTransaction: {
         id: string;
     };

package/lib/chevre/service/assetTransaction/pay.js

@@ -65,7 +65,7 @@ function publishPaymentUrlResult2recipe(params) {
 function publishPaymentUrl(params, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
         // 金額をfix
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
@@ -81,12 +81,14 @@ function publishPaymentUrl(params, options) {
         const paymentServiceId = getPaymentServiceId(params);
         // 決済受入アクション生成(2024-03-28~)
         const taskId = (_c = options === null || options === void 0 ? void 0 : options.executor) === null || _c === void 0 ? void 0 : _c.id;
-        const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.AcceptAction, agent: params.agent, object: {
+        const actionAttributes = Object.assign(Object.assign({ project: params.project, typeOf: factory.actionType.AcceptAction, agent: params.agent, object: {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
             }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id } }, (typeof taskId === 'string')
             ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
+            : undefined), (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+            ? { location: params.location }
             : undefined);
         const action = yield repos.action.start(actionAttributes);
         let result;
@@ -97,11 +99,11 @@ function publishPaymentUrl(params, options) {
                     const authorizeResult = yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: '' // 決済URL発行プロセスにおいては決済取引IDは使用しないので空文字でok
                      }), paymentServiceId, {
                         processPublishPaymentUrl: true,
-                        executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {} // タスク関連付け(2024-05-22~)
+                        executor: (typeof ((_e = options.executor) === null || _e === void 0 ? void 0 : _e.id) === 'string') ? { id: options.executor.id } : {} // タスク関連付け(2024-05-22~)
                     })(repos, settings);
                     let paymentUrl;
                     // 3DS拡張(2024-01-02~)
-                    const retUrl = (_e = params.object.paymentMethod.creditCard) === null || _e === void 0 ? void 0 : _e.retUrl;
+                    const retUrl = (_f = params.object.paymentMethod.creditCard) === null || _f === void 0 ? void 0 : _f.retUrl;
                     if (typeof retUrl === 'string' && retUrl.length > 0) {
                         paymentUrl = authorizeResult.execTranResult.redirectUrl;
                     }
@@ -316,19 +318,6 @@ function validateSeller(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        // const sellers = <Pick<factory.seller.ISeller, 'paymentAccepted'>[]>await repos.seller.search(
-        //     {
-        //         limit: 1,
-        //         page: 1,
-        //         id: { $eq: sellerId }
-        //     },
-        //     ['paymentAccepted'],
-        //     []
-        // );
-        // const seller = sellers.shift();
-        // if (seller === undefined) {
-        //     throw new factory.errors.NotFound(factory.organizationType.Corporation);
-        // }
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');

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

@@ -10,6 +10,16 @@ export interface IOnPaymentStatusChangedRefundAction {
     object: factory.invoice.IInvoice[];
 }
 export type IOnPaymentStatusChangedParams = IOnPaymentStatusChangedPayAction | IOnPaymentStatusChangedRefundAction;
+export declare function creatPublishPaymentUrlParams(params: {
+    accountId?: string;
+    object: Pick<factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
+    transactionNumber: string;
+    location?: factory.action.trade.pay.ILocation;
+}): Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'agent' | 'location' | 'project' | 'recipient' | 'transactionNumber' | 'typeOf'> & {
+    object: factory.action.accept.pay.IPayObject;
+};
 export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.creatPublishPaymentUrlParams = creatPublishPaymentUrlParams;
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
 exports.createMovieTicket = createMovieTicket;
 exports.createAuthorizeResult = createAuthorizeResult;
@@ -7,6 +8,38 @@ exports.optimizeAction4inform = optimizeAction4inform;
 const moment = require("moment");
 const util = require("util");
 const factory = require("../../../factory");
+function creatPublishPaymentUrlParams(params) {
+    var _a, _b, _c, _d;
+    const issuedThroughId = (_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id;
+    // const accountId: string | undefined = (typeof params.accountId === 'string')
+    //     ? params.accountId
+    //     : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
+    // const movieTickets: factory.action.trade.pay.IMovieTicket[] | undefined
+    //     = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
+    const paymentMethod = Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined
+    // ...(Array.isArray(movieTickets)) ? { movieTickets } : undefined
+    );
+    const object = {
+        typeOf: params.paymentServiceType,
+        id: issuedThroughId,
+        paymentMethod
+    };
+    return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
+            typeOf: params.transaction.seller.typeOf,
+            id: params.transaction.seller.id,
+            name: (typeof params.transaction.seller.name === 'string')
+                ? params.transaction.seller.name
+                : String((_b = params.transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+        }, recipient: {
+            id: params.transaction.seller.id,
+            name: (typeof params.transaction.seller.name === 'string')
+                ? params.transaction.seller.name
+                : String((_c = params.transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
+            typeOf: params.transaction.seller.typeOf
+        }, object }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+        ? { location: params.location }
+        : undefined);
+}
 function creatPayTransactionStartParams(params) {
     var _a, _b, _c, _d;
     let expires = moment(params.transaction.expires)
@@ -26,7 +59,6 @@ function creatPayTransactionStartParams(params) {
     const accountId = (typeof params.accountId === 'string')
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
-    // movieTickets最適化(2023-02-24~)
     const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
     return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,
@@ -51,11 +83,8 @@ function creatPayTransactionStartParams(params) {
             typeOf: params.transaction.seller.typeOf
         }, object: {
             typeOf: params.paymentServiceType,
-            // 決済サービスIDを連携(2022-04-12~)
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, 
-                // typeOf: params.object.paymentMethod, // identifierへ移行(2023-08-30~)
-                amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
+            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
         }, expires: expires, purpose: {
             typeOf: factory.order.OrderType.Order,
             confirmationNumber

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

@@ -97,7 +97,6 @@ interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
-    confirmationNumber: ConfirmationNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -119,7 +118,7 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'ticketToken'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;

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

@@ -238,7 +238,6 @@ function publishPaymentUrl(params) {
         }
         try {
             const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
-            const { confirmationNumber } = yield (0, fixConfirmationNumberAsNeeded_1.fixConfirmationNumberAsNeeded)({ purpose, paymentServiceType })(repos);
             // 取引番号生成
             let transactionNumber;
             // support ticketToken(2024-08-21~)
@@ -256,13 +255,12 @@ function publishPaymentUrl(params) {
             let result;
             // URL発行
             const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
-            const startParams = (0, factory_1.creatPayTransactionStartParams)({
+            const startParams = (0, factory_1.creatPublishPaymentUrlParams)({
                 object: authorizeObject,
                 paymentServiceType,
                 transaction: transaction,
                 transactionNumber: transactionNumber,
-                location: params.location,
-                order: { confirmationNumber }
+                location: params.location
             });
             const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {

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

@@ -14,7 +14,6 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
-const confirmationNumber_1 = require("../../repo/confirmationNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
@@ -42,7 +41,6 @@ function call(params) {
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
-                confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo(redisClient),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.13",
+    "@chevre/factory": "4.393.0-alpha.14",
     "@cinerino/sdk": "10.21.0-alpha.12",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.18"
+  "version": "22.9.0-alpha.19"
 }