@chevre/domain 20.1.0-alpha.16 → 20.1.0-alpha.17

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

@@ -12,9 +12,7 @@ export declare class MongoRepository {
     /**
      * 取引を開始する
      */
-    start<T extends factory.transactionType>(params: factory.transaction.IStartParams<T> & {
-        expiresInSeconds?: number;
-    }): Promise<factory.transaction.ITransaction<T>>;
+    start<T extends factory.transactionType>(params: factory.transaction.IStartParams<T>): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 特定取引検索
      */

package/lib/chevre/repo/transaction.js

@@ -248,12 +248,20 @@ class MongoRepository {
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const startDate = new Date();
-            let expires = params.expires;
-            // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
-            if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
-                expires = moment(startDate)
-                    .add(params.expiresInSeconds, 'seconds')
-                    .toDate();
+            let expires;
+            if (params.typeOf === factory.transactionType.PlaceOrder) {
+                // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
+                if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
+                    expires = moment(startDate)
+                        .add(params.expiresInSeconds, 'seconds')
+                        .toDate();
+                }
+                else {
+                    throw new factory.errors.ArgumentNull('expiresInSeconds');
+                }
+            }
+            else {
+                expires = params.expires;
             }
             return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());

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

@@ -15,7 +15,6 @@ exports.orderProgramMembership = exports.ISS_PREFIX = void 0;
  */
 const GMO = require("@motionpicture/gmo-service");
 const createDebug = require("debug");
-const moment = require("moment-timezone");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 const OfferService = require("../offer");
 const AnyPaymentService = require("../payment/any");
@@ -123,10 +122,12 @@ function createStartPlaceOrderInProgressParams(params) {
     };
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
-        expires: moment()
-            // tslint:disable-next-line:no-magic-numbers
-            .add(5, 'minutes')
-            .toDate(),
+        // expiresInSeconds指定に変更(2022-11-29~)
+        // expires: moment()
+        //     // tslint:disable-next-line:no-magic-numbers
+        //     .add(5, 'minutes')
+        //     .toDate(),
+        expiresInSeconds: 300,
         agent,
         seller: { id: params.seller.id },
         object: {

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

@@ -1,4 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: factory.seller.ISeller, broker?: factory.order.IBroker, makesOfferFromClient?: factory.seller.IMakesOffer): factory.transaction.placeOrder.IStartParams & {
-    expiresInSeconds?: number;
-};
+export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: factory.seller.ISeller, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;

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

@@ -2,20 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = void 0;
 const factory = require("../../../factory");
-function createStartParams(params, passport, seller, broker, makesOfferFromClient) {
-    var _a, _b, _c, _d, _e;
+function createStartParams(params, 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, authorizeActions: [] }, (passport !== undefined) ? { passport } : undefined), (params.object.clientUser !== undefined && params.object.clientUser !== null)
         ? { clientUser: params.object.clientUser }
         : undefined), (typeof ((_b = params.object) === null || _b === void 0 ? void 0 : _b.name) === 'string') ? { name: (_c = params.object) === null || _c === void 0 ? void 0 : _c.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_d = params.object.customer) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { customer: params.object.customer } : undefined);
     if (typeof seller.id !== 'string') {
         throw new factory.errors.NotFound('seller.id');
     }
-    return Object.assign({ project: { typeOf: seller.project.typeOf, id: seller.project.id }, typeOf: factory.transactionType.PlaceOrder, agent: params.agent, seller: {
+    if (typeof params.expiresInSeconds !== 'number') {
+        throw new factory.errors.ArgumentNull('expiresInSeconds');
+    }
+    return {
+        project: { typeOf: seller.project.typeOf, id: seller.project.id },
+        typeOf: factory.transactionType.PlaceOrder,
+        agent: params.agent,
+        seller: {
             id: seller.id,
             name: seller.name,
             typeOf: seller.typeOf
-        }, object: transactionObject, expires: params.expires }, (typeof ((_e = makesOfferFromClient === null || makesOfferFromClient === void 0 ? void 0 : makesOfferFromClient.eligibleTransactionDuration) === null || _e === void 0 ? void 0 : _e.maxValue) === 'number')
-        ? { expiresInSeconds: makesOfferFromClient.eligibleTransactionDuration.maxValue }
-        : undefined);
+        },
+        object: transactionObject,
+        // expires: params.expires,
+        expiresInSeconds: params.expiresInSeconds
+        // 販売者にexpires設定があれば適用
+        // ...(typeof makesOfferFromClient?.eligibleTransactionDuration?.maxValue === 'number')
+        //     ? { expiresInSeconds: makesOfferFromClient.eligibleTransactionDuration.maxValue }
+        //     : undefined
+    };
 }
 exports.createStartParams = createStartParams;

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

@@ -27,6 +27,7 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const seller = yield repos.seller.findById({ id: params.seller.id });
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
@@ -35,8 +36,19 @@ function start(params) {
             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 startParams = (0, factory_1.createStartParams)(params, passport, seller, params.broker, makesOfferFromClient);
+        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { expiresInSeconds }), passport, seller, params.broker);
         let transaction;
         try {
             transaction = yield repos.transaction.start(startParams);

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.278.0-alpha.4",
-    "@cinerino/sdk": "3.133.0-alpha.2",
+    "@chevre/factory": "4.279.0-alpha.0",
+    "@cinerino/sdk": "3.133.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.16"
+  "version": "20.1.0-alpha.17"
 }