@cinerino/sdk 10.5.0 → 10.6.0-alpha.1

package/example/playground/public/lib/bundle.js

@@ -13042,15 +13042,38 @@ var PaymentService = /** @class */ (function (_super) {
     };
     PaymentService.prototype.issueTicketThroughFaceToFace = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var purpose;
             var _this = this;
             return __generator(this, function (_a) {
+                purpose = params.purpose;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.FaceToFace + "/tickets",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.CREATED],
-                        body: params,
+                        body: { purpose: purpose },
                         qs: {
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: params.purpose.id }
+                        }
+                    })
+                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, response.json()];
+                    }); }); })];
+            });
+        });
+    };
+    PaymentService.prototype.issueTicketThroughCreditCard = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var purpose, ticketedPermit;
+            var _this = this;
+            return __generator(this, function (_a) {
+                purpose = params.purpose, ticketedPermit = params.ticketedPermit;
+                return [2 /*return*/, this.fetch({
+                        uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/tickets",
+                        method: 'POST',
+                        expectedStatusCodes: [http_status_1.CREATED],
+                        body: { purpose: purpose, ticketedPermit: ticketedPermit },
+                        qs: {
+                            purpose: { id: params.purpose.id }
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -20703,6 +20726,9 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * 対面決済によるチケット発行
+     */
     PaymentService.prototype.issueTicketThroughFaceToFace = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
@@ -20728,6 +20754,34 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * CreditCardIF決済によるチケット発行
+     */
+    PaymentService.prototype.issueTicketThroughCreditCard = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
+                        return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
+                    case 1:
+                        chevrePay = _b.sent();
+                        return [4 /*yield*/, chevrePay.createPaymentInstance({
+                                project: project,
+                                seller: { id: (typeof (seller === null || seller === void 0 ? void 0 : seller.id) === 'string') ? seller.id : '' },
+                                retryableStatusCodes: __spreadArray(__spreadArray([], (Array.isArray(retryableStatusCodes)) ? retryableStatusCodes : []), [
+                                    http_status_1.CONFLICT,
+                                    http_status_1.TOO_MANY_REQUESTS
+                                ])
+                            })];
+                    case 2:
+                        paymentService = _b.sent();
+                        return [2 /*return*/, paymentService.issueTicketThroughCreditCard(params)];
+                }
+            });
+        });
+    };
     return PaymentService;
 }(service_1.Service));
 exports.PaymentService = PaymentService;
@@ -25211,7 +25265,7 @@ var CategorySetIdentifier;
      */
     CategorySetIdentifier["DistributorType"] = "DistributorType";
     /**
-     * メンバーシップタイプ
+     * メンバーシップ区分
      */
     CategorySetIdentifier["MembershipType"] = "MembershipType";
     /**

package/example/src/chevre/assetTransaction/processPayMovieTicket.ts

@@ -30,7 +30,7 @@ async function main() {
     });
 
     const searchSellersResult = await sellerService.search({ limit: 1, $projection: {} });
-    const seller = searchSellersResult.data[0];
+    const seller = searchSellersResult[0];
 
     const transactionNumber = `CIN${(new Date()).valueOf()}`;
     const paymentMethodType = 'MovieTicket';

package/example/src/chevre/assetTransaction/processPublishPaymentUrl.ts

@@ -30,7 +30,7 @@ async function main() {
     });
 
     const searchSellersResult = await sellerService.search({ limit: 1, $projection: {} });
-    const seller = searchSellersResult.data[0];
+    const seller = searchSellersResult[0];
 
     const transactionNumber = `CIN${(new Date()).valueOf()}`;
     const paymentMethodType = 'PayPay';

package/example/src/chevre/assetTransaction/processRefundCreditCard.ts

@@ -30,7 +30,7 @@ async function main() {
     });
 
     const searchSellersResult = await sellerService.search({ limit: 1, $projection: {} });
-    const seller = searchSellersResult.data[0];
+    const seller = searchSellersResult[0];
 
     const transactionNumber = `CIN${(new Date()).valueOf()}`;
     const paymentMethodType = 'CreditCard';

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

@@ -30,13 +30,6 @@ async function main() {
     })).createSellerInstance({
         project
     });
-    const placeOrderService = await (await client.loadChevreTxn({
-        endpoint: `${<string>process.env.CHEVRE_ENDPOINT}/txn`,
-        auth: authClient
-    })).createPlaceOrderTransactionInstance({
-        project,
-        seller: { id: '' }
-    });
 
     console.log('finding profile...');
     // const profile = await personService.getProfile({ personId: 'me' });
@@ -47,12 +40,34 @@ async function main() {
         branchCode: { $eq: '001' },
         $projection: {}
     });
-    // tslint:disable-next-line:insecure-random
-    const seller = searchSellersResult.data[Math.floor(searchSellersResult.data.length * Math.random())];
+    const seller = searchSellersResult.shift();
     if (seller === undefined) {
         throw new Error('No seller');
     }
     console.log('ordering from seller...', (<client.factory.multilingualString>seller.name).ja);
+    const sellerId = String(seller.id);
+
+    const placeOrderService = await (await client.loadChevreTxn({
+        endpoint: <string>process.env.CHEVRE_ENDPOINT_TXN,
+        auth: authClient
+    })).createPlaceOrderTransactionInstance({
+        project,
+        seller: { id: sellerId }
+    });
+    const offerService = await (await client.loadChevreTxn({
+        endpoint: <string>process.env.CHEVRE_ENDPOINT_TXN,
+        auth: authClient
+    })).createOfferInstance({
+        project,
+        seller: { id: sellerId }
+    });
+    const paymentService = await (await client.loadChevrePay({
+        endpoint: <string>process.env.CHEVRE_ENDPOINT_PAY,
+        auth: authClient
+    })).createPaymentInstance({
+        project,
+        seller: { id: sellerId }
+    });
 
     console.log('starting transaction...');
     const transaction = await placeOrderService.start({
@@ -61,24 +76,7 @@ async function main() {
                 {
                     name: 'SampleName',
                     value: 'SampleValue'
-                },
-                ...(typeof process.env.LINE_NOTIFY_URL === 'string' && process.env.LINE_NOTIFY_URL.length > 0)
-                    ? [
-                        {
-                            name: 'onOrderPlaced.recipient.url',
-                            value: process.env.LINE_NOTIFY_URL
-                        },
-                        {
-                            name: 'onOrderPlaced.object.customer.identifier',
-                            value: 'onOrderPlaced.object.customer.identifier.value1'
-                        },
-                        {
-                            name: 'onOrderPlaced.object.customer.identifier',
-                            value: 'onOrderPlaced.object.customer.identifier.value2'
-                        }
-
-                    ]
-                    : []
+                }
             ]
         },
         seller: {
@@ -90,9 +88,55 @@ async function main() {
     });
     console.log('transaction started', transaction.id);
 
-    // 購入者情報入力時間
-    // tslint:disable-next-line:no-magic-numbers
-    await wait(5000);
+    await wait(3000);
+
+    // オファー承認
+    await offerService.authorizeEventService({
+        object: {
+            reservationFor: {
+                id: 'blxd1gryb'
+            },
+            acceptedOffer: [{
+                id: '3001', // 0yen offer
+                itemOffered: {
+                    serviceOutput: {
+                        typeOf: client.factory.reservationType.EventReservation,
+                        reservedTicket: {
+                            typeOf: 'Ticket',
+                            ticketedSeat: {
+                                typeOf: client.factory.placeType.Seat,
+                                seatNumber: 'B-3',
+                                seatSection: 'Default',
+                                seatRow: ''
+                            }
+                        }
+                        // programMembershipUsed: {
+                        //     ticketToken: 'a1b8a25c-188c-4ba4-8d12-639d3a20dc7d',
+                        //     typeOf: 'Ticket'
+                        // }
+                    }
+                }
+            }]
+        },
+        purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
+    });
+    console.log('offer authorized');
+
+    await wait(3000);
+
+    // 決済承認
+    await paymentService.authorizeAnyPayment({
+        object: {
+            amount: 0,
+            issuedThrough: { id: '' },
+            paymentMethod: 'Cash'
+            // ticketToken
+        },
+        purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
+    });
+    console.log('payment authorized');
+
+    await wait(3000);
 
     const settingProfile: client.factory.person.IProfile = {
         givenName: 'Taro',
@@ -104,28 +148,7 @@ async function main() {
     await placeOrderService.setProfile({ id: transaction.id, agent: settingProfile });
     console.log('customer profile set');
 
-    // let i = 0;
-    // setInterval(
-    //     async () => {
-    //         i += 1;
-    //         try {
-    //             console.log('setting customer profile...');
-    //             await placeOrderService.setProfile({ id: transaction.id, agent: settingProfile });
-    //             console.log('customer profile set');
-
-    //         } catch (error) {
-    //             console.error('setting profile failed.', error.message);
-    //         }
-    //     },
-    //     // tslint:disable-next-line:no-magic-numbers
-    //     500
-    // );
-
-    // return;
-
-    // 購入情報確認時間
-    // tslint:disable-next-line:no-magic-numbers
-    await wait(5000);
+    await wait(3000);
 
     await placeOrderService.updateObject({
         id: transaction.id,

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

@@ -53,7 +53,7 @@ async function main() {
         $projection: {}
     });
     // tslint:disable-next-line:insecure-random
-    const seller = searchSellersResult.data[Math.floor(searchSellersResult.data.length * Math.random())];
+    const seller = searchSellersResult[Math.floor(searchSellersResult.length * Math.random())];
     if (seller === undefined) {
         throw new Error('No seller');
     }

package/example/src/chevre/transaction/{processPlaceOrderUsingMembership.ts → processPlaceOrderUsingTicketIssuedThroughFaceToFace.ts}

@@ -36,8 +36,7 @@ async function main() {
         branchCode: { $eq: '001' },
         $projection: {}
     });
-    // tslint:disable-next-line:insecure-random
-    const seller = searchSellersResult.data[Math.floor(searchSellersResult.data.length * Math.random())];
+    const seller = searchSellersResult.shift();
     if (seller === undefined) {
         throw new Error('No seller');
     }
@@ -100,7 +99,7 @@ async function main() {
                 id: 'blxd1gryb'
             },
             acceptedOffer: [{
-                id: 'bkpnwjw1w', // メンバーシップ適用オファーを指定
+                id: 'bkpnwjw1w', // メンバーシップ対象オファーを指定
                 itemOffered: {
                     serviceOutput: {
                         typeOf: client.factory.reservationType.EventReservation,
@@ -108,7 +107,7 @@ async function main() {
                             typeOf: 'Ticket',
                             ticketedSeat: {
                                 typeOf: client.factory.placeType.Seat,
-                                seatNumber: 'B-4',
+                                seatNumber: 'B-3',
                                 seatSection: 'Default',
                                 seatRow: ''
                             }
@@ -129,10 +128,11 @@ async function main() {
 
     await wait(3000);
 
-    // 決済承認
+    // YEN決済承認
     await paymentService.authorizeAnyPayment({
         object: {
-            amount: 999,
+            // amount: 999,
+            amount: 0,
             issuedThrough: { id: '' },
             paymentMethod: 'Cash',
             ticketToken // チケット指定
@@ -143,6 +143,19 @@ async function main() {
 
     await wait(3000);
 
+    // ポイント決済承認
+    await paymentService.authorizeAnyPayment({
+        object: {
+            amount: 999,
+            issuedThrough: { id: '' },
+            paymentMethod: 'PointCard'
+        },
+        purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
+    });
+    console.log('payment authorized');
+
+    await wait(3000);
+
     const settingProfile: client.factory.person.IProfile = {
         givenName: profile.givenName,
         familyName: profile.familyName,
@@ -155,14 +168,22 @@ async function main() {
 
     await wait(3000);
 
-    console.log('confirming transaction...');
-    const confirmResult = await placeOrderService.confirm({
-        id: transaction.id,
-        sendEmailMessage: true,
-        expectsMinimalResponse: true
-        // expectsReservationIds: true
-    });
-    console.log('transaction confirmed', confirmResult);
+    try {
+        console.log('confirming transaction...');
+        const confirmResult = await placeOrderService.confirm({
+            id: transaction.id,
+            sendEmailMessage: true,
+            expectsMinimalResponse: true
+            // expectsReservationIds: true
+        });
+        console.log('transaction confirmed', confirmResult);
+    } catch (error) {
+        console.error(error);
+        console.log('canceling transaction...');
+        await wait(3000);
+        await placeOrderService.cancel({ id: transaction.id });
+        console.log('transaction canceled');
+    }
 }
 
 async function wait(waitInMilliseconds: number) {

package/example/src/cloud/transaction/authorizeCreditCardAsyncForcibly.ts

@@ -0,0 +1,74 @@
+// tslint:disable:no-console no-implicit-dependencies no-magic-numbers
+import * as moment from 'moment';
+import * as client from '../../../../lib/index';
+
+async function wait(waitInMilliseconds: number) {
+    return new Promise((resolve) => setTimeout(resolve, waitInMilliseconds));
+}
+
+const USE_FORCE_AUTHORIZE_PAYMENT_ASYNC_GIVE_UP_SECONDS = 10;
+const USE_FORCE_AUTHORIZE_PAYMENT_ASYNC_CHECK_INTERVAL_MS = 1000;
+export function authorizeCreditCardAsyncForcibly(params: {
+    object: Pick<
+        client.factory.action.authorize.paymentMethod.any.IObjectWithoutDetail,
+        'amount' | 'issuedThrough' | 'paymentMethod' | 'creditCard' | 'method' | 'paymentMethodId' | 'name' | 'additionalProperty' | 'ticketToken'
+    >;
+    purpose: {
+        typeOf: client.factory.transactionType.PlaceOrder;
+        id: string;
+    };
+}) {
+    return async (repos: {
+        paymentService: client.cloudPay.service.Payment;
+    }): Promise<{ id: string }> => {
+        // 決済承認タスク作成
+        const authorizeTask = await repos.paymentService.authorizeCreditCardAsync(params);
+        const giveUpPayment = moment()
+            .add(USE_FORCE_AUTHORIZE_PAYMENT_ASYNC_GIVE_UP_SECONDS, 'seconds');
+        let result: { id: string } | undefined;
+        let error: { name?: string; message?: string } | undefined;
+
+        // n秒おきに状態確認
+        while (result === undefined && error === undefined) {
+            await wait(USE_FORCE_AUTHORIZE_PAYMENT_ASYNC_CHECK_INTERVAL_MS); // n秒待機
+
+            // タスク作成から一定時間経過すればあきらめる
+            if (moment()
+                .isAfter(giveUpPayment)) {
+                error = new client.factory.errors.GatewayTimeout('action given up');
+                break;
+            }
+
+            const authorizeAction = await repos.paymentService.findAuthorizeAction({
+                sameAs: { id: authorizeTask.id },
+                object: {
+                    typeOf: client.factory.service.paymentService.PaymentServiceType.CreditCard
+                },
+                purpose: params.purpose
+            });
+
+            // アクションIDが存在し、CompletedActionStatusであればタスク完了とみなす
+            if (typeof authorizeAction.id === 'string') {
+                if (authorizeAction.actionStatus === client.factory.actionStatusType.CompletedActionStatus) {
+                    // ステータス完了であれば決済承認アクションIDを保管
+                    result = { id: authorizeAction.id };
+                    break;
+                } else {
+                    // 待機続行
+                }
+            }
+
+            // エラーが存在すれば、これ以上待機する価値はなし
+            if (authorizeAction.error !== undefined) {
+                error = authorizeAction.error;
+                break;
+            }
+        }
+
+        if (typeof result?.id === 'string') {
+            return result;
+        }
+
+        throw error;
+    };
+}