@chevre/domain 21.27.0-alpha.2 → 21.27.0-alpha.4

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

@@ -37,8 +37,7 @@ async function main() {
         object: {
             clientUser: <any>{ client_id: CLIENT_ID }
         },
-        seller: { id: '59d20831e53ebc2b4e774466' },
-        validateEligibleCustomerType: false
+        seller: { id: '59d20831e53ebc2b4e774466' }
     })({
         member: await chevre.repository.Member.createInstance(mongoose.connection),
         projectMakesOffer: await chevre.repository.ProjectMakesOffer.createInstance(mongoose.connection),
@@ -117,8 +116,7 @@ async function main() {
                                 options: {
                                     useCancelPayTransactionOnFailed: false,
                                     useCheckMovieTicketBeforePay: false,
-                                    useCheckByIdentifierIfNotYet: false,
-                                    useSearchTrade4accountId: false
+                                    useCheckByIdentifierIfNotYet: false
                                 }
                             })({
                                 accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),

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

@@ -94,7 +94,6 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
     useCheckMovieTicketBeforePay: boolean;
     useCheckByIdentifierIfNotYet: boolean;
-    searchTrade4accountId: boolean;
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**

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

@@ -41,7 +41,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false, processPublishPaymentUrl: true })(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { processPublishPaymentUrl: true })(repos);
                 let paymentUrl;
                 // 3DS拡張(2024-01-02~)
                 const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
@@ -147,7 +147,7 @@ function start(params, options) {
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 transaction =
-                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({}, (options.pendingPaymentAgencyTransaction !== undefined)
                         ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
                         : undefined))(repos);
                 break;
@@ -305,7 +305,7 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 }
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         return saveAuthorizeResult({

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

@@ -110,7 +110,6 @@ declare function authorize(params: {
         useCancelPayTransactionOnFailed: boolean;
         useCheckMovieTicketBeforePay: boolean;
         useCheckByIdentifierIfNotYet: boolean;
-        useSearchTrade4accountId: boolean;
     };
 }): IAuthorizeOperation<{
     /**

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

@@ -358,7 +358,7 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, searchTrade4accountId: params.options.useSearchTrade4accountId }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }
         catch (error) {
             try {

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

@@ -24,7 +24,6 @@ type IAuthorizeResult = IPaymentAgencyTransaction & {
  * クレジットカード決済承認
  */
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, options: {
-    searchTrade4accountId: boolean;
     pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
     /**
      * 決済URL発行処理かどうか

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

@@ -25,9 +25,8 @@ const debug = createDebug('chevre-domain:service:payment');
  * クレジットカード決済承認
  */
 function authorize(params, paymentServiceId, options) {
-    // 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;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
@@ -50,7 +49,7 @@ function authorize(params, paymentServiceId, options) {
         }
         // GMOオーソリ取得
         let authorizeResult;
-        let searchTradeResult;
+        // let searchTradeResult: GMO.factory.credit.ISearchTradeResult | undefined;
         try {
             const pendingPaymentAgencyTransaction = options.pendingPaymentAgencyTransaction;
             const redirectUrl = (_c = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _c === void 0 ? void 0 : _c.redirectUrl;
@@ -78,31 +77,13 @@ function authorize(params, paymentServiceId, options) {
         catch (error) {
             throw handleAuthorizeError(error);
         }
-        const searchTrade4accountId = (options === null || options === void 0 ? void 0 : options.searchTrade4accountId) === true;
-        if (searchTrade4accountId) {
-            try {
-                const creditCardService = new GMO.service.Credit({
-                    endpoint: String(availableChannel.serviceUrl),
-                    useFetch: credentials_1.credentials.gmo.useFetch
-                }, { 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: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                    sitePass: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.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 Object.assign({ accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
+        // クレジットカード詳細情報取得廃止(2024-03-19~)
+        // const searchTrade4accountId = options?.searchTrade4accountId === true;
+        // if (searchTrade4accountId) {
+        // }
+        return Object.assign({ 
+            // accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '',
+            accountId: '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
     });
 }
 exports.authorize = authorize;

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

@@ -1,6 +1,10 @@
 import * as factory from '../../factory';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
-export declare function maskUnderName(reservation: IEventReservation): IEventReservation;
+type IMaskedUnderName = Pick<factory.reservation.IUnderName<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
+type IEventReservationUnderNameMasked = Omit<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'underName'> & {
+    underName?: IMaskedUnderName;
+};
+export declare function maskUnderName(reservation: IEventReservation): IEventReservationUnderNameMasked;
 export interface IProject {
     id: string;
     typeOf: factory.organizationType.Project;
@@ -15,12 +19,9 @@ export interface IReservationPackage4informConfirmed {
     reservationNumber: string;
     reservationStatus: factory.reservationStatusType;
     subReservation: ISubReservation[];
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName?: IMaskedUnderName;
     typeOf: factory.reservationType.ReservationPackage;
 }
-/**
- * 確定予約通知
- */
 /**
  * 予約取消通知
  */

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

@@ -1,13 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = void 0;
-const MASKED_PROFILE = '****';
 function maskUnderName(reservation) {
     var _a;
     const underName = (typeof ((_a = reservation.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? Object.assign(Object.assign({}, reservation.underName), { email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE, 
-            // identifierも隠蔽(2022-12-27~)
-            identifier: [] }) : undefined;
+        // ReservationPackage通知アクションのobject.underNameを最小化(2024-03-19~)
+        // ? {
+        //     ...reservation.underName,
+        //     email: MASKED_PROFILE,
+        //     telephone: MASKED_PROFILE,
+        //     name: MASKED_PROFILE,
+        //     familyName: MASKED_PROFILE,
+        //     givenName: MASKED_PROFILE,
+        //     // identifierも隠蔽(2022-12-27~)
+        //     identifier: []
+        // }
+        ? { id: reservation.underName.id, typeOf: reservation.underName.typeOf }
+        : undefined;
     return Object.assign(Object.assign({}, reservation), (underName !== undefined) ? { underName } : undefined);
 }
 exports.maskUnderName = maskUnderName;

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -32,9 +32,7 @@ const informReservations = settings_1.settings.onReservationStatusChanged.inform
 /**
  * 予約確定後のアクション
  */
-function onReservationConfirmedByAction(actionAttributes
-// confirmedReservation: IEventReservation
-) {
+function onReservationConfirmedByAction(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const potentialActions = actionAttributes.potentialActions;
         const now = new Date();
@@ -81,7 +79,6 @@ function onReservationConfirmed(confirmedReservations) {
                     var _a, _b;
                     const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
                     // ReservationPackage通知に変更(2022-12-24~)
-                    // const informObject: IInformObject = confirmedReservations.map(maskUnderName);
                     const informObject = [Object.assign({ project: confirmedReservations[0].project, reservationFor: confirmedReservations[0].reservationFor, reservationNumber: confirmedReservations[0].reservationNumber, reservationStatus: confirmedReservations[0].reservationStatus, subReservation: confirmedReservations.map((r) => {
                                 const { broker, project, reservationFor, reservationNumber, reservationStatus, underName } = r, subReservation = __rest(r, ["broker", "project", "reservationFor", "reservationNumber", "reservationStatus", "underName"]);
                                 return subReservation;

package/lib/chevre/service/transaction/placeOrderInProgress/start.d.ts

@@ -11,9 +11,7 @@ interface IStartOperationRepos {
     transaction: TransactionRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-type IStartParams = PlaceOrderFactory.IStartParams & {
-    validateEligibleCustomerType: boolean;
-};
+type IStartParams = PlaceOrderFactory.IStartParams;
 /**
  * 取引開始
  */

package/lib/chevre/service/transaction/placeOrderInProgress/start.js

@@ -22,8 +22,7 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { passport, customerType } = yield (0, validation_1.validateWaiterPassport)(params);
-        const { memeberOfPayload, sellerMakesOffer, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id }, clientUser: params.object.clientUser, memberOfToken: params.agent.memberOfToken }, (params.validateEligibleCustomerType === true
-            && typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined))(repos);
+        const { memeberOfPayload, sellerMakesOffer, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id }, clientUser: params.object.clientUser, memberOfToken: params.agent.memberOfToken }, (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined))(repos);
         const expiresInSeconds = (_a = sellerMakesOffer.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
         if (typeof expiresInSeconds !== 'number') {
             throw new factory.errors.NotFound('eligibleTransactionDuration.maxValue');

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateStartRequest.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = void 0;
 const jwt = require("jsonwebtoken");
 const factory = require("../../../../factory");
-const settings_1 = require("../../../../settings");
 function verifyMembershipToken(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
@@ -58,16 +57,14 @@ function validateStartRequest(params) {
             throw new factory.errors.ArgumentNull('client_id');
         }
         let projectMakesOffer;
-        if (settings_1.USE_VALIDATE_PROJECT_MAKES_OFFER) {
-            projectMakesOffer = (yield repos.projectMakesOffer.search({
-                limit: 1,
-                page: 1,
-                offeredBy: { id: { $eq: params.project.id } },
-                availableAtOrFrom: { id: { $eq: clientId } }
-            })).shift();
-            if (projectMakesOffer === undefined) {
-                throw new factory.errors.Argument('project', 'project makes no offers');
-            }
+        projectMakesOffer = (yield repos.projectMakesOffer.search({
+            limit: 1,
+            page: 1,
+            offeredBy: { id: { $eq: params.project.id } },
+            availableAtOrFrom: { id: { $eq: clientId } }
+        })).shift();
+        if (projectMakesOffer === undefined) {
+            throw new factory.errors.Argument('project', 'project makes no offers');
         }
         const seller = (yield repos.seller.search({
             limit: 1,

package/lib/chevre/settings.d.ts

@@ -39,7 +39,6 @@ export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const USE_OPTIMIZE_TICKET_OFFER: boolean;
 export declare const USE_FETCH_API: boolean;
 export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
-export declare const USE_VALIDATE_PROJECT_MAKES_OFFER: boolean;
 export declare const USE_OWNERSHIP_INFO_BY_WEB_APPLICATION: boolean;
 export declare const USE_CHECK_RESOURCE_TASK: boolean;
 export declare const USE_OPTIMIZE_RESERVATION_EXCEPTIONS: string[];

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -63,7 +63,6 @@ exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1
 exports.USE_OPTIMIZE_TICKET_OFFER = process.env.USE_OPTIMIZE_TICKET_OFFER === '1';
 exports.USE_FETCH_API = process.env.USE_FETCH_API === '1';
 exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = process.env.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING === '1';
-exports.USE_VALIDATE_PROJECT_MAKES_OFFER = process.env.USE_VALIDATE_PROJECT_MAKES_OFFER === '1';
 exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = process.env.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION === '1';
 exports.USE_CHECK_RESOURCE_TASK = process.env.USE_CHECK_RESOURCE_TASK === '1';
 exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = (typeof process.env.USE_OPTIMIZE_RESERVATION_EXCEPTIONS === 'string')

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.27.0-alpha.2"
+  "version": "21.27.0-alpha.4"
 }