@chevre/domain 21.2.0-alpha.92 → 21.2.0-alpha.94

package/example/src/chevre/processPay.ts

@@ -63,7 +63,8 @@ async function main() {
                 name: 'xx'
             }
         },
-        true
+        true,
+        false
     )({
         accountingReport: accountingReportRepo,
         action: actionRepo,

package/example/src/chevre/searchActions.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  mongoose from 'mongoose';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = new chevre.repository.Action(mongoose.connection);
+    const actions = await actionRepo.search(
+        {
+            object: { reservationNumber: { $eq: 'xxx' } }
+        },
+        ['_id'],
+        []
+    );
+    console.log('actions:', actions);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -96,7 +96,7 @@ export declare function check(params: factory.action.check.paymentMethod.movieTi
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, useCheckMovieTicketBeforePay: boolean): IStartOperation<factory.assetTransaction.pay.ITransaction>;
+export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, useCheckMovieTicketBeforePay: boolean, searchTrade4accountId: boolean): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定
  */

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

@@ -42,7 +42,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId)(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, false)(repos);
                 const acsUrl = authorizeResult.execTranResult.acsUrl;
                 if (typeof acsUrl !== 'string' || acsUrl.length === 0) {
                     throw new factory.errors.ServiceUnavailable('Payment URL unable to publish');
@@ -106,7 +106,7 @@ exports.check = check;
 /**
  * 取引開始
  */
-function start(params, useCheckMovieTicketBeforePay) {
+function start(params, useCheckMovieTicketBeforePay, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // 金額をfix
@@ -137,7 +137,8 @@ function start(params, useCheckMovieTicketBeforePay) {
                 transaction = yield processAuthorizeAccount(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                transaction = yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
+                transaction =
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), searchTrade4accountId)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
@@ -253,9 +254,9 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
         })(repos);
     });
 }
-function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
+function processAuthorizeCreditCard(params, transaction, paymentServiceId, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId)(repos);
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, searchTrade4accountId)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
             update: {

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -5,6 +5,7 @@ export { IAcceptedAddOn };
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     reservationNumber: string;
     disablePendingReservations: boolean;
+    useHoldStockByTransactionNumber: boolean;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
 /**
  * ポイント特典を作成する

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -13,7 +13,7 @@ function createStartParams(params) {
     const reservationNumber = params.reservationNumber;
     const reservationPackage = Object.assign({ 
         // project: params.project,
-        reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: params.disablePendingReservations, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+        reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,

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

@@ -97,6 +97,7 @@ type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail &
  */
 export declare function start(params: IStartParams & {
     disablePendingReservations: boolean;
+    useHoldStockByTransactionNumber: boolean;
 }): IStartOperation<{
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
     objectSubReservations: IObjectSubReservation[];

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

@@ -178,7 +178,11 @@ function addReservations(params) {
         yield processLockSeats({
             event: event,
             reservations: objectSubReservations,
-            transaction: transaction
+            transaction: {
+                id: transaction.id,
+                transactionNumber: transaction.transactionNumber,
+                object: { useHoldStockByTransactionNumber: transaction.object.useHoldStockByTransactionNumber === true }
+            }
         })(repos);
         if (transaction.object.disablePendingReservations !== true) {
             // 予約作成(insertManyで実装)
@@ -614,7 +618,7 @@ function processLockOfferRateLimit(params) {
  */
 function processLockSeats(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const offers = [];
         params.reservations.forEach((r) => {
             var _a, _b;
@@ -656,8 +660,12 @@ function processLockSeats(params) {
         const expires = moment(params.event.endDate)
             .add(1, 'month')
             .toDate();
-        const holder = params.transaction.id;
-        const maximumAttendeeCapacity4event = (_a = params.event.location) === null || _a === void 0 ? void 0 : _a.maximumAttendeeCapacity;
+        // holder:取引番号に対応(2023-06-05~)
+        let holder = params.transaction.id;
+        if (((_a = params.transaction.object) === null || _a === void 0 ? void 0 : _a.useHoldStockByTransactionNumber) === true) {
+            holder = params.transaction.transactionNumber;
+        }
+        const maximumAttendeeCapacity4event = (_b = params.event.location) === null || _b === void 0 ? void 0 : _b.maximumAttendeeCapacity;
         if (typeof maximumAttendeeCapacity4event === 'number') {
             yield repos.stockHolder.lockIfNotLimitExceeded({
                 eventId: params.event.id,

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -58,5 +58,6 @@ declare function authorize(params: {
         id: string;
     };
     disablePendingReservations: boolean;
+    useHoldStockByTransactionNumber: boolean;
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

package/lib/chevre/service/offer/event/authorize.js

@@ -67,7 +67,8 @@ function authorize(params) {
                         unitPriceOffers,
                         validateEvent: params.validateEvent === true,
                         validateEventOfferPeriod: params.validateEventOfferPeriod === true,
-                        disablePendingReservations: params.disablePendingReservations
+                        disablePendingReservations: params.disablePendingReservations,
+                        useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber
                     })(repos);
                     // requestBody = processStartReserveResult.requestBody;
                     // responseBody = processStartReserveResult.responseBody;
@@ -163,7 +164,7 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, disablePendingReservations: params.disablePendingReservations }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber }))(repos);
         responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({

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

@@ -113,5 +113,6 @@ declare function authorize(params: {
      */
     useCancelPayTransactionOnFailed: boolean;
     useCheckMovieTicketBeforePay: boolean;
+    useSearchTrade4accountId: boolean;
 }): IAuthorizeOperation<IAuthorizePaymentAction>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -314,7 +314,7 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, params.useCheckMovieTicketBeforePay)(repos);
+            payTransaction = yield PayTransactionService.start(startParams, params.useCheckMovieTicketBeforePay, params.useSearchTrade4accountId)(repos);
         }
         catch (error) {
             try {

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

@@ -13,7 +13,7 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * クレジットカード決済承認
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, searchTrade4accountId: boolean): (repos: {
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;

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

@@ -21,11 +21,11 @@ const factory = require("../../factory");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
 const person2username_1 = require("./any/person2username");
-const debug = createDebug('chevre-domain:service');
+const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
  */
-function authorize(params, paymentServiceId) {
+function authorize(params, paymentServiceId, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const project = yield repos.project.findById({ id: params.project.id });
@@ -65,19 +65,25 @@ function authorize(params, paymentServiceId) {
         catch (error) {
             throw handleAuthorizeError(error);
         }
-        try {
-            const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
-            // ベストエフォートでクレジットカード詳細情報を取得
-            searchTradeResult = yield creditCardService.searchTrade({
-                shopId: shopId,
-                shopPass: shopPass,
-                orderId: orderId,
-                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
-            });
-        }
-        catch (error) {
-            // no op
+        if (searchTrade4accountId) {
+            try {
+                const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+                // ベストエフォートでクレジットカード詳細情報を取得
+                const startSearchTradeDate = Date.now();
+                debug('searchTrade processing...orderId:', orderId, startSearchTradeDate);
+                searchTradeResult = yield creditCardService.searchTrade({
+                    shopId: shopId,
+                    shopPass: shopPass,
+                    orderId: orderId,
+                    siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                    sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                });
+                debug('searchTrade processed. orderId:', orderId, 'execution time:', (Date.now() - startSearchTradeDate), 'ms');
+            }
+            catch (error) {
+                // no op
+                debug('searchTrade throwed an error. orderId:', orderId, error);
+            }
         }
         return {
             accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '',

package/lib/chevre/service/reserve/cancelReservation.js

@@ -28,7 +28,6 @@ function cancelPendingReservation(actionAttributesList) {
         if (actionAttributesList.length > 0) {
             // tslint:disable-next-line:max-func-body-length
             yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                // let canceledReservation: factory.reservation.eventReservation.IReservation | undefined;
                 const reserveTransactionId = actionAttributes.purpose.id;
                 // アクション開始
                 const action = yield repos.action.start(actionAttributes);
@@ -53,10 +52,6 @@ function cancelPendingReservation(actionAttributesList) {
                             const subReservation = reserveTransaction.object.subReservation;
                             if (Array.isArray(subReservation) && subReservation.length > 0) {
                                 yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
-                                    // const cancelingReservation: factory.reservation.eventReservation.IReservation = {
-                                    //     ...cancelingSubReservation,
-                                    //     reservationFor
-                                    // };
                                     yield processUnlockSeat({
                                         reservation: {
                                             id: cancelingSubReservation.id,
@@ -69,7 +64,10 @@ function cancelPendingReservation(actionAttributesList) {
                                                     : reservationFor.departureTime
                                             }
                                         },
-                                        expectedHolder: reserveTransactionId
+                                        // holder:取引番号に対応(2023-06-05~)
+                                        expectedHolder: (reserveTransaction.object.useHoldStockByTransactionNumber === true)
+                                            ? reserveTransaction.transactionNumber
+                                            : reserveTransactionId
                                     })(repos);
                                     yield processUnlockOfferRateLimit({
                                         reservation: {
@@ -90,33 +88,6 @@ function cancelPendingReservation(actionAttributesList) {
                         else {
                             // 廃止(2022-12-27~)
                             throw new factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
-                            // const cancelingSubReservation = reserveTransaction.object.subReservation?.find((r) => {
-                            //     return r.id === actionObject.id;
-                            // });
-                            // // 取消対象予約が取引に存在すれば、適宜unlock
-                            // if (cancelingSubReservation !== undefined) {
-                            //     const cancelingReservation: factory.reservation.eventReservation.IReservation = {
-                            //         ...cancelingSubReservation,
-                            //         reservationFor
-                            //     };
-                            //     await processUnlockSeat({
-                            //         reservation: cancelingReservation,
-                            //         expectedHolder: reserveTransactionId
-                            //     })(repos);
-                            //     await processUnlockOfferRateLimit({ reservation: cancelingReservation, reservationFor })(repos);
-                            //     // 予約が存在すればキャンセル状態に変更する
-                            //     const reservationCount = await repos.reservation.count({
-                            //         typeOf: cancelingSubReservation.typeOf,
-                            //         ids: [cancelingSubReservation.id]
-                            //     });
-                            //     if (reservationCount > 0) {
-                            //         await repos.reservation.cancel<factory.reservationType.EventReservation>({
-                            //             id: cancelingSubReservation.id,
-                            //             previousReservationStatus: actionObject.reservationStatus,
-                            //             modifiedTime: now
-                            //         });
-                            //     }
-                            // }
                         }
                     }
                 }
@@ -194,10 +165,6 @@ function cancelReservation(actionAttributesList) {
                         const subReservation = reserveTransaction.object.subReservation;
                         if (Array.isArray(subReservation) && subReservation.length > 0) {
                             yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
-                                // const cancelingReservation: factory.reservation.eventReservation.IReservation = {
-                                //     ...cancelingSubReservation,
-                                //     reservationFor
-                                // };
                                 yield processUnlockSeat({
                                     reservation: {
                                         id: cancelingSubReservation.id,
@@ -210,7 +177,10 @@ function cancelReservation(actionAttributesList) {
                                                 : reservationFor.departureTime
                                         }
                                     },
-                                    expectedHolder: reserveTransaction.id
+                                    // holder:取引番号に対応(2023-06-05~)
+                                    expectedHolder: (reserveTransaction.object.useHoldStockByTransactionNumber === true)
+                                        ? reserveTransaction.transactionNumber
+                                        : reserveTransaction.id
                                 })(repos);
                                 yield processUnlockOfferRateLimit({
                                     reservation: {
@@ -240,10 +210,10 @@ function cancelReservation(actionAttributesList) {
                             object: { reservations: { id: { $in: [reservation.id] } } }
                         });
                         const reserveTransaction = reserveTransactions.shift();
-                        let expectedHolder;
-                        if (reserveTransaction !== undefined) {
-                            expectedHolder = reserveTransaction.id;
-                        }
+                        // holder:取引番号に対応(2023-06-05~)
+                        const expectedHolder = ((reserveTransaction === null || reserveTransaction === void 0 ? void 0 : reserveTransaction.object.useHoldStockByTransactionNumber) === true)
+                            ? reserveTransaction.transactionNumber
+                            : reserveTransaction === null || reserveTransaction === void 0 ? void 0 : reserveTransaction.id;
                         if (typeof expectedHolder === 'string') {
                             yield processUnlockSeat({
                                 reservation: {

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -339,7 +339,8 @@ function processAuthorizeCreditCard(params) {
             purpose: params.purpose,
             paymentServiceType: factory.service.paymentService.PaymentServiceType.CreditCard,
             useCancelPayTransactionOnFailed: false,
-            useCheckMovieTicketBeforePay: false
+            useCheckMovieTicketBeforePay: false,
+            useSearchTrade4accountId: false
         })(repos);
     });
 }

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.23",
+    "@chevre/factory": "4.313.0-alpha.24",
     "@cinerino/sdk": "3.157.0-alpha.6",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.92"
+  "version": "21.2.0-alpha.94"
 }

package/example/src/chevre/searchSellers.ts

@@ -1,33 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
-    const sellers = await sellerRepo.search({
-        hasMerchantReturnPolicy: { itemCondition: { id: { $eq: '646dc7848b3c1437d43dbfeb' } } }
-    });
-    console.log('sellers:', sellers);
-
-    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
-    const reserveTransactions = await assetTransactionRepo.search({
-        limit: 1,
-        typeOf: chevre.factory.assetTransactionType.Reserve,
-        object: {
-            reservationNumber: { $eq: 'xxx' }
-            // reservationFor: { id: { $eq: 'xxx' } }
-        }
-    });
-    console.log('reserveTransactions:', reserveTransactions);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);