@chevre/domain 21.35.0-alpha.22 → 21.35.0-alpha.24

package/example/src/chevre/migrateAuthorizeEventServiceOfferResult.ts

@@ -70,16 +70,16 @@ async function main() {
             // optimize action
             if (Array.isArray(authorizeAction.object.acceptedOffer)) {
                 let unsetResult: any;
-                // unsetResult = await actionRepo.unsetUnnecessaryFields({
-                //     filter: { _id: { $eq: authorizeAction.id } },
-                //     $unset: {
-                //         'object.acceptedOffer': 1
-                //     }
-                // });
-                // updateCount += 1;
-                // console.log(
-                //     'result unset. unsetResult:', unsetResult,
-                //     authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
+                unsetResult = await actionRepo.unsetUnnecessaryFields({
+                    filter: { _id: { $eq: authorizeAction.id } },
+                    $unset: {
+                        'object.acceptedOffer': 1
+                    }
+                });
+                updateCount += 1;
+                console.log(
+                    'result unset. unsetResult:', unsetResult,
+                    authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
             }
         } else {
             console.log(

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -97,7 +97,7 @@ function changeOffers(params) {
             videoFormatTypes
         })(repos);
         // 供給情報と価格を変更してからDB更新
-        authorizeAction.object.acceptedOffer = acceptedOffers;
+        // authorizeAction.object.acceptedOffer = acceptedOffers; // discontinue acceptedOffers(2024-06-21~)
         // recipe依存へ変更(2024-06-11~)
         // const updTmpReserveSeatResult = authorizeAction.result?.responseBody;
         const recipe = yield repos.action.findRecipeByAction({

package/lib/chevre/service/offer/eventServiceByCOA/factory.js

@@ -23,7 +23,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
     const authorizeObject = {
         typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
         id: params.acceptAction.id,
-        acceptedOffer: params.acceptedOffers,
+        // acceptedOffer: params.acceptedOffers, // discontinue acceptedOffers(2024-06-21~)
         event: authorizeObjectEvent,
         pendingTransaction: params.pendingTransaction,
         useResultAcceptedOffers: false

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

@@ -12,7 +12,7 @@ export interface IOnPaymentStatusChangedRefundAction {
 export type IOnPaymentStatusChangedParams = IOnPaymentStatusChangedPayAction | IOnPaymentStatusChangedRefundAction;
 export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;

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

@@ -8,12 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishPaymentUrl = exports.processVoidPayTransaction = exports.person2username = exports.voidPayTransaction = exports.invalidatePaymentUrl = exports.findCheckAction = exports.findAuthorizeAction = exports.findAcceptAction = exports.authorize = exports.onPaymentStatusChanged = void 0;
 /**
  * 汎用決済サービス
  */
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 const PayTransactionService = require("../assetTransaction/pay");
 const code_1 = require("../code");
 const publishConfirmationNumberIfNotExist_1 = require("../transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist");
@@ -289,6 +301,19 @@ function publishPaymentUrl(params) {
     });
 }
 exports.publishPaymentUrl = publishPaymentUrl;
+/**
+ * 承認アクションオブジェクトから冗長な属性を排除する
+ */
+function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails) {
+    if (settings_1.USE_EXPERIMENTAL_FEATURE) {
+        // experimental(2024-06-21~)
+        const { creditCard, method, movieTickets } = authorizeObjectIncludingPaymentMethodDetails, authorizeObject = __rest(authorizeObjectIncludingPaymentMethodDetails, ["creditCard", "method", "movieTickets"]);
+        return { authorizeObject };
+    }
+    else {
+        return { authorizeObject: authorizeObjectIncludingPaymentMethodDetails };
+    }
+}
 /**
  * 決済承認
  */
@@ -345,7 +370,8 @@ function authorize(params) {
         }
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
         const { accountId } = yield fixAccountIdIfPossible({ object: params.object, project: { id: transaction.project.id } })(repos);
-        const authorizeObject = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+        const { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
         const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
         const actionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.AuthorizeAction, object: authorizeObject, agent: {
@@ -368,7 +394,7 @@ function authorize(params) {
         try {
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
                 accountId,
-                object: authorizeObject,
+                object: authorizeObjectIncludingPaymentMethodDetails,
                 paymentServiceType,
                 transaction: transaction,
                 transactionNumber: transactionNumber,

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

@@ -228,24 +228,6 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
             serialNumbers.push(serialNumber);
         }
     });
-    // authorizeEventServiceOfferActions.forEach(({ result }) => {
-    //     const acceptedOffersByAuthorizeAction = result?.acceptedOffers; // discontinue(2024-06-17~)
-    //     if (Array.isArray(acceptedOffersByAuthorizeAction)) {
-    //         acceptedOffersFromAuthorizeAction.push(...acceptedOffersByAuthorizeAction);
-    //     }
-    // });
-    // authorizeProductOfferActions.forEach(({ result }) => {
-    //     const acceptedOffersByAuthorizeAction = result?.acceptedOffers; // discontinue(2024-06-17~)
-    //     if (Array.isArray(acceptedOffersByAuthorizeAction)) {
-    //         acceptedOffersFromAuthorizeAction.push(...acceptedOffersByAuthorizeAction);
-    //     }
-    // });
-    // authorizeMoneyTansferActions.forEach(({ result }) => {
-    //     const acceptedOffersByAuthorizeAction = result?.acceptedOffers; // discontinue(2024-06-17~)
-    //     if (Array.isArray(acceptedOffersByAuthorizeAction)) {
-    //         acceptedOffersFromAuthorizeAction.push(...acceptedOffersByAuthorizeAction);
-    //     }
-    // });
     debug('authorizeActions dissolved', serialNumbers, authorizeEventServiceOfferActions.length, 'authorizeEventServiceOfferActions', authorizePaymentActions.length, 'authorizePaymentActions');
     return {
         authorizePaymentActions,

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

@@ -3,7 +3,9 @@ import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
 export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'object' | 'result' | 'endDate' | 'instrument'>;
+export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate' | 'instrument'> & {
+    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf'>;
+};
 export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
 /**
  * 取引が確定可能な状態かどうかをチェックする

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

@@ -194,14 +194,16 @@ function validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOf
         const requiredMonetaryAmount = requiredMonetaryAmountByCurrencyType
             .filter((m) => m.currency === currencyType)
             .reduce((a, b) => a + b.value, 0);
-        const authorizedMonetaryAmount = authorizeMonetaryAmountActions.filter(({ result }) => {
+        let authorizedMonetaryAmount = 0;
+        authorizeMonetaryAmountActions.forEach(({ result }) => {
             var _a;
             const resultAsInvoice = (Array.isArray(result))
                 ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
                 : undefined;
-            return ((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === currencyType;
-        })
-            .reduce((a, b) => a + b.object.amount, 0);
+            if (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === currencyType) {
+                authorizedMonetaryAmount += resultAsInvoice.totalPaymentDue.value;
+            }
+        });
         return requiredMonetaryAmount === authorizedMonetaryAmount;
     });
     if (!requireMonetaryAmountSatisfied) {
@@ -385,65 +387,6 @@ function validateEventOffers(params) {
                 }
             });
         }
-        else {
-            if (a.instrument.identifier === factory.service.webAPI.Identifier.Chevre) {
-                if (!Array.isArray(a.object.acceptedOffer)) {
-                    throw new factory.errors.ServiceUnavailable('authorizeAction.object.acceptedOffer must be an array');
-                }
-                // オファーIDごとにオファー適用条件を確認
-                const offerIds = [...new Set(a.object.acceptedOffer.map((o) => o.id))];
-                offerIds.forEach((offerId) => {
-                    var _a, _b, _c, _d, _e;
-                    let unitPriceSpec;
-                    const acceptedOffer = (_a = a.object.acceptedOffer) === null || _a === void 0 ? void 0 : _a.find((o) => o.id === offerId);
-                    if (acceptedOffer === undefined) {
-                        throw new factory.errors.ServiceUnavailable(`authorizeEventServiceOfferAction.object.acceptedOffer not found. [id:${offerId}]`);
-                    }
-                    // Chevre予約の場合、priceSpecificationに複合価格仕様が含まれるので、そこから単価仕様を取り出す
-                    unitPriceSpec = acceptedOffer.priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-                        && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
-                    );
-                    // 適用金額要件を満たしていなければエラー
-                    const eligibleTransactionVolumePrice = (_b = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _b === void 0 ? void 0 : _b.price;
-                    const eligibleTransactionVolumePriceCurrency = (_c = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _c === void 0 ? void 0 : _c.priceCurrency;
-                    if (typeof eligibleTransactionVolumePrice === 'number') {
-                        if (params.order.price < eligibleTransactionVolumePrice) {
-                            throw new factory.errors.Argument('Transaction', (0, util_1.format)('Transaction volume must be more than or equal to %s %s for offer:%s', eligibleTransactionVolumePrice, eligibleTransactionVolumePriceCurrency, offerId));
-                        }
-                    }
-                    // 適用数量検証(全興行オファー承認アクションについて)(2023-11-15~)
-                    // 適用数量要件を満たしていなければエラー
-                    const numAcceptedOffersByOfferId = params.authorizeEventServiceOfferActions.reduce((previousNumOffer, currentAction) => {
-                        if (!Array.isArray(currentAction.object.acceptedOffer)) {
-                            throw new factory.errors.ServiceUnavailable('currentAuthorizeAction.object.acceptedOffer must be an array');
-                        }
-                        return previousNumOffer + currentAction.object.acceptedOffer.filter((o) => o.id === offerId).length;
-                    }, 0);
-                    const eligibleQuantityMaxValue = (_d = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) === null || _d === void 0 ? void 0 : _d.maxValue;
-                    if (typeof eligibleQuantityMaxValue === 'number') {
-                        if (numAcceptedOffersByOfferId > eligibleQuantityMaxValue) {
-                            throw new factory.errors.Argument('Transaction', `Number of offer:${offerId} must be less than or equal to ${eligibleQuantityMaxValue}`);
-                        }
-                    }
-                    const eligibleQuantityMinValue = (_e = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) === null || _e === void 0 ? void 0 : _e.minValue;
-                    if (typeof eligibleQuantityMinValue === 'number') {
-                        if (numAcceptedOffersByOfferId < eligibleQuantityMinValue) {
-                            throw new factory.errors.Argument('Transaction', `Number of offer:${offerId} must be more than or equal to ${eligibleQuantityMinValue}`);
-                        }
-                    }
-                    // 利用可能決済方法検証(2023-11-15~)
-                    if (Array.isArray(acceptedOffer.acceptedPaymentMethod)) {
-                        const acceptedPaymentMethodTypes = acceptedOffer.acceptedPaymentMethod.map(({ identifier }) => identifier);
-                        const satisfyAcceptedPaymentMethod = numCreditCardOrFaceToFacePaymentMethod === 1
-                            && typeof firstCreditCardPaymentMethodIdentifier === 'string'
-                            && acceptedPaymentMethodTypes.includes(firstCreditCardPaymentMethodIdentifier);
-                        if (!satisfyAcceptedPaymentMethod) {
-                            throw new factory.errors.Argument('Transaction', `acceptedPaymentMethod requirement not satisfied`);
-                        }
-                    }
-                });
-            }
-        }
     });
 }
 exports.validateEventOffers = validateEventOffers;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.375.0-alpha.14",
+    "@chevre/factory": "4.375.0-alpha.15",
     "@cinerino/sdk": "7.3.0-alpha.2",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.22"
+  "version": "21.35.0-alpha.24"
 }