@chevre/domain 21.17.0-alpha.0 → 21.17.0-alpha.2

package/lib/chevre/factory/transaction.d.ts

@@ -11,7 +11,6 @@ export declare namespace placeOrder {
     type IStartParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
         passportValidator?: IPassportValidator;
         broker?: factory.order.IBroker;
-        validateSeller?: boolean;
     };
     type IOrderURLGenerator = (order: factory.order.IOrder) => string;
     type IResultOrderParams = factory.transaction.placeOrder.IResultOrderParams & {

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

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;
+export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail & {}, expiresInSeconds: number, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = void 0;
 const factory = require("../../../factory");
-function createStartParams(params, passport, seller, broker) {
+function createStartParams(params, expiresInSeconds, passport, seller, broker) {
     var _a, _b, _c, _d;
     const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ passportToken: (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? params.object.passport.token : undefined }, (passport !== undefined) ? { passport } : undefined), (params.object.clientUser !== undefined && params.object.clientUser !== null)
         ? { clientUser: params.object.clientUser }
@@ -10,7 +10,7 @@ function createStartParams(params, passport, seller, broker) {
     if (typeof seller.id !== 'string') {
         throw new factory.errors.NotFound('seller.id');
     }
-    if (typeof params.expiresInSeconds !== 'number') {
+    if (typeof expiresInSeconds !== 'number') {
         throw new factory.errors.ArgumentNull('expiresInSeconds');
     }
     return {
@@ -25,7 +25,7 @@ function createStartParams(params, passport, seller, broker) {
             additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
         },
         object: transactionObject,
-        expiresInSeconds: params.expiresInSeconds
+        expiresInSeconds: expiresInSeconds
     };
 }
 exports.createStartParams = createStartParams;

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

@@ -256,9 +256,13 @@ exports.validatePaymentMethods = validatePaymentMethods;
 /**
  * 興行オファー適用条件確認
  */
+// tslint:disable-next-line:max-func-body-length
 function validateEventOffers(params) {
     var _a, _b;
-    const firstOrderPaymentMethodIdentifier = (_b = (_a = params.order.paymentMethods[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = params.order.paymentMethods.find((referenceInvoice) => {
+        return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+            || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
+    })) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
     const numCreditCardOrFaceToFacePaymentMethod = params.order.paymentMethods.filter((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
@@ -316,8 +320,8 @@ function validateEventOffers(params) {
                 if (Array.isArray(acceptedOffer.acceptedPaymentMethod)) {
                     const acceptedPaymentMethodTypes = acceptedOffer.acceptedPaymentMethod.map((paymentMethod) => paymentMethod.identifier);
                     const satisfyAcceptedPaymentMethod = numCreditCardOrFaceToFacePaymentMethod === 1
-                        && typeof firstOrderPaymentMethodIdentifier === 'string'
-                        && acceptedPaymentMethodTypes.includes(firstOrderPaymentMethodIdentifier);
+                        && typeof firstCreditCardPaymentMethodIdentifier === 'string'
+                        && acceptedPaymentMethodTypes.includes(firstCreditCardPaymentMethodIdentifier);
                     if (!satisfyAcceptedPaymentMethod) {
                         throw new factory.errors.Argument('Transaction', `acceptedPaymentMethod requirement not satisfied`);
                     }

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

@@ -40,25 +40,15 @@ function start(params) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
         let makesOfferFromClient;
-        // 販売者オファー検証(2022-10-14~)
-        if (params.validateSeller === true) {
-            const validateSellerResult = (0, validateSeller_1.validateSeller)({ seller, clientUser: params.object.clientUser });
-            makesOfferFromClient = validateSellerResult.makesOfferFromClient;
-        }
+        const validateSellerResult = (0, validateSeller_1.validateSeller)({ seller, clientUser: params.object.clientUser }); // 販売者オファー検証(2022-10-14~)
+        makesOfferFromClient = validateSellerResult.makesOfferFromClient;
         const passport = yield (0, validation_2.validateWaiterPassport)(params);
-        // fix expiresInSeconds(2022-11-29~)
-        let expiresInSeconds;
-        if (typeof ((_a = makesOfferFromClient === null || makesOfferFromClient === void 0 ? void 0 : makesOfferFromClient.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue) === 'number') {
-            expiresInSeconds = makesOfferFromClient.eligibleTransactionDuration.maxValue;
-        }
-        else if (typeof params.expiresInSeconds === 'number') {
-            expiresInSeconds = params.expiresInSeconds;
-        }
-        else {
-            throw new factory.errors.ArgumentNull('expiresInSeconds');
+        const expiresInSeconds = (_a = makesOfferFromClient === null || makesOfferFromClient === void 0 ? void 0 : makesOfferFromClient.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
+        if (typeof expiresInSeconds !== 'number') {
+            throw new factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { expiresInSeconds }), passport, seller, params.broker);
+        const startParams = (0, factory_1.createStartParams)(params, expiresInSeconds, passport, seller, params.broker);
         let transaction;
         try {
             transaction = yield repos.transaction.start(startParams);

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.343.0-alpha.0",
+    "@chevre/factory": "4.343.0-alpha.1",
     "@cinerino/sdk": "5.0.0",
     "@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.17.0-alpha.0"
+  "version": "21.17.0-alpha.2"
 }