@chevre/domain 21.19.0 → 21.20.0-alpha.0

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -0,0 +1,80 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import * as redis from 'redis';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const CLIENT_ID = '51qbjcfr72h62m06vtv5kkhgje';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+        socket: {
+            port: Number(<string>process.env.REDIS_PORT),
+            host: <string>process.env.REDIS_HOST
+        },
+        password: <string>process.env.REDIS_KEY
+    });
+    await client.connect();
+
+    const transaction = await (await chevre.service.transaction.createService()).placeOrderInProgress.start({
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        agent: { id: CLIENT_ID, typeOf: chevre.factory.creativeWorkType.WebApplication },
+        object: {
+            clientUser: <any>{ client_id: CLIENT_ID }
+        },
+        seller: { id: '59d20831e53ebc2b4e774466' },
+        validateEligibleCustomerType: false
+    })({
+        seller: await chevre.repository.Seller.createInstance(mongoose.connection),
+        transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+    });
+    console.log('transaction started', transaction);
+
+    const publishPaymentUrlResult = await (await chevre.service.payment.any.createService()).publishPaymentUrl({
+        project: { id: project.id },
+        agent: { id: CLIENT_ID },
+        object: {
+            // accountId?: string;
+            // additionalProperty?: IPropertyValue<string>[];
+            amount: 1,
+            // description?: string;
+            // name?: string;
+            paymentMethod: 'PayPay',
+            // paymentMethodId?: string;
+            typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
+            issuedThrough: { id: '60e9560176a391000b23e20b' },
+            method: '1',
+            creditCard: {
+                cardNo: '4100000000000100',
+                expire: '2812',
+                cardPass: '123',
+                holderName: 'AA AA'
+            }
+        },
+        purpose: { id: transaction.id, typeOf: transaction.typeOf },
+        paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
+        location: {
+            typeOf: chevre.factory.creativeWorkType.WebApplication,
+            id: CLIENT_ID
+        }
+        // options: {
+        //     use3DS: true
+        // }
+    })({
+        assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
+        paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
+        paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
+        paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
+        person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
+        project: await chevre.repository.Project.createInstance(mongoose.connection),
+        transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
+        transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+    });
+    console.log(publishPaymentUrlResult);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -16,6 +16,7 @@ import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
+import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
@@ -79,10 +80,10 @@ export type IInvalidatePaymentUrlOperation<T> = (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;
-export interface IPublishPaymentUrlResult {
+export type IPublishPaymentUrlResult = CreditCardPayment.IAuthorizeResult & {
     paymentMethodId: string;
     paymentUrl: string;
-}
+};
 /**
  * 外部決済ロケーション発行
  */

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

@@ -47,7 +47,11 @@ function publishPaymentUrl(params) {
                 }
                 result = {
                     paymentMethodId: transactionNumber,
-                    paymentUrl: acsUrl
+                    paymentUrl: acsUrl,
+                    entryTranArgs: authorizeResult.entryTranArgs,
+                    entryTranResult: authorizeResult.entryTranResult,
+                    execTranArgs: authorizeResult.execTranArgs,
+                    execTranResult: authorizeResult.execTranResult
                 };
                 break;
             default:

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

@@ -98,7 +98,7 @@ declare function publishPaymentUrl(params: {
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;
-}): IPublishPaymentUrlOperation<PayTransactionService.IPublishPaymentUrlResult>;
+}): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 /**
  * 決済承認
  */

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

@@ -232,13 +232,21 @@ function publishPaymentUrl(params) {
             typeOf: params.object.paymentMethod,
             paymentMethodId: result.paymentMethodId,
             paymentUrl: result.paymentUrl,
-            issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' }
+            issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' },
+            // GMO IFを保管(2024-01-01~)
+            entryTranArgs: result.entryTranArgs,
+            entryTranResult: result.entryTranResult,
+            execTranArgs: result.execTranArgs,
+            execTranResult: result.execTranResult
         };
         yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });
-        return result;
+        return {
+            paymentMethodId: result.paymentMethodId,
+            paymentUrl: result.paymentUrl
+        };
     });
 }
 exports.publishPaymentUrl = publishPaymentUrl;

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

@@ -28,6 +28,12 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     execTranArgs: GMO.factory.credit.IExecTranArgs;
     execTranResult: GMO.factory.credit.IExecTranResult;
 }>;
+interface IAuthorizeResult {
+    entryTranArgs: GMO.factory.credit.IEntryTranArgs;
+    entryTranResult: GMO.factory.credit.IEntryTranResult;
+    execTranArgs: GMO.factory.credit.IExecTranArgs;
+    execTranResult: GMO.factory.credit.IExecTranResult;
+}
 /**
  * クレジットカード決済中止
  */
@@ -81,4 +87,4 @@ declare function searchGMOTrade(params: {
     shopId: string;
     shopPass: string;
 }): Promise<GMO.factory.credit.ISearchTradeResult>;
-export { getGMOInfoFromSeller, authorize, payCreditCard, refundCreditCard, searchGMOTrade, voidTransaction };
+export { IAuthorizeResult, getGMOInfoFromSeller, authorize, payCreditCard, refundCreditCard, searchGMOTrade, voidTransaction };

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.350.0",
+    "@chevre/factory": "4.351.0-alpha.0",
     "@cinerino/sdk": "5.6.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.19.0"
+  "version": "21.20.0-alpha.0"
 }