@chevre/domain 20.1.0-alpha.2 → 20.1.0-alpha.20

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -33,7 +33,7 @@ function getOrderWithToken(params) {
             ? {
                 id: params.order.customer.id,
                 name: '****',
-                project: params.order.customer.project,
+                // project: params.order.customer.project,
                 typeOf: params.order.customer.typeOf
             }
             : {
@@ -42,7 +42,8 @@ function getOrderWithToken(params) {
             };
         const seller4orderToken = {
             id: params.order.seller.id,
-            project: params.order.seller.project,
+            // 最適化(2022-11-15~)
+            // project: params.order.seller.project,
             typeOf: params.order.seller.typeOf
         };
         const order4token = {
@@ -50,7 +51,8 @@ function getOrderWithToken(params) {
             typeOf: params.order.typeOf,
             seller: seller4orderToken,
             customer: customer4orderToken,
-            confirmationNumber: params.order.confirmationNumber,
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -24,12 +24,13 @@ const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let tasks = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
-            customer: (0, order_1.createMaskedCustomer)(params.order),
-            confirmationNumber: params.order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,
@@ -118,7 +119,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     typeOf: factory.actionType.ConfirmAction,
                     object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: paymentMethod.paymentMethodId }],
                     agent: order.project,
-                    purpose: simpleOrder,
+                    purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
                     instrument: {
                         typeOf: 'WebAPI',
                         identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre

package/lib/chevre/service/order/placeOrder.js

@@ -89,12 +89,14 @@ function placeOrderWithoutTransaction(params) {
         //     orderNumber: params.object.orderNumber
         // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -131,7 +133,10 @@ function placeOrderWithoutTransaction(params) {
             task: repos.task
         });
         // 潜在アクション
-        yield onPlaceOrder(params)(repos);
+        yield onPlaceOrder({
+            object: order,
+            potentialActions: params.potentialActions
+        })(repos);
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
@@ -148,12 +153,14 @@ function placeOrder(params) {
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -190,7 +197,10 @@ function placeOrder(params) {
             task: repos.task
         });
         // 潜在アクション
-        yield onPlaceOrder(params)(repos);
+        yield onPlaceOrder({
+            object: order,
+            potentialActions: params.potentialActions
+        })(repos);
     });
 }
 exports.placeOrder = placeOrder;
@@ -218,7 +228,7 @@ function onPlaceOrder(params) {
                     numberOfTried: 0,
                     executionResults: [],
                     // data: potentialActions.sendOrder
-                    data: Object.assign({ project: potentialActions.sendOrder.project, object: potentialActions.sendOrder.object }, (potentialActions.sendOrder.potentialActions !== undefined)
+                    data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
                         ? { potentialActions: potentialActions.sendOrder.potentialActions }
                         : undefined)
                 };

package/lib/chevre/service/order/returnOrder.js

@@ -44,7 +44,8 @@ function returnOrder(params) {
             typeOf: order.typeOf,
             seller: order.seller,
             customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

package/lib/chevre/service/order/sendOrder.js

@@ -42,12 +42,14 @@ function sendOrder(params) {
             }
             // SendOrderアクションを作成する
             // minimizeする(2022-04-18~)
+            const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
             const simpleOrder = {
                 // project: order.project,
                 typeOf: order.typeOf,
                 seller: order.seller,
-                customer: (0, order_1.createMaskedCustomer)(order),
-                confirmationNumber: order.confirmationNumber,
+                customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+                // IOrderへ移行(2022-11-17~)
+                // confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,

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");
@@ -120,16 +119,15 @@ function createStartPlaceOrderInProgressParams(params) {
         id: customer.id,
         identifier: customer.identifier,
         memberOf: customer.memberOf
-        // ↓不要なので廃止(2022-05-26~)
-        // paramsにadditionalPropertyの指定があれば反映する
-        // ...(Array.isArray(params.agent.additionalProperty)) ? { additionalProperty: params.agent.additionalProperty } : []
     };
     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/placeOrder/exportTasks/factory.js

@@ -9,6 +9,7 @@ const settings_1 = require("../../../../settings");
  */
 // tslint:disable-next-line:max-func-body-length
 function createTasks(params) {
+    var _a;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
@@ -24,7 +25,6 @@ function createTasks(params) {
             executionResults: [],
             data: {
                 agent: transaction.project,
-                // agent: transaction.seller,
                 object: transaction,
                 project: transaction.project,
                 purpose: { typeOf: transaction.typeOf, id: transaction.id },
@@ -72,6 +72,10 @@ function createTasks(params) {
             if (potentialActions === undefined) {
                 throw new factory.errors.NotFound('Transaction PotentialActions');
             }
+            const orderFromTransaction = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
+            if (orderFromTransaction === undefined) {
+                throw new factory.errors.NotFound('Transaction Result');
+            }
             const orderActionAttributes = potentialActions.order;
             const placeOrderTaskAttributes = {
                 project: transaction.project,
@@ -81,9 +85,8 @@ function createTasks(params) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                // data: orderActionAttributes
                 data: Object.assign({ project: orderActionAttributes.project, object: {
-                        confirmationNumber: orderActionAttributes.object.confirmationNumber,
+                        confirmationNumber: orderFromTransaction.confirmationNumber,
                         orderNumber: orderActionAttributes.object.orderNumber
                     } }, (orderActionAttributes.potentialActions !== undefined)
                     ? { potentialActions: orderActionAttributes.potentialActions }

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

@@ -10,7 +10,9 @@ function createStartParams(params, passport, seller, broker) {
     if (typeof seller.id !== 'string') {
         throw new factory.errors.NotFound('seller.id');
     }
-    // 取引ファクトリーで新しい進行中取引オブジェクトを作成
+    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,
@@ -19,11 +21,14 @@ function createStartParams(params, passport, seller, broker) {
             id: seller.id,
             name: seller.name,
             typeOf: seller.typeOf
-            // ↓最適化(2022-05-24~)
-            // ...{ project: seller.project }
         },
         object: transactionObject,
-        expires: params.expires
+        // 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/potentialActions/givePointAward.js

@@ -48,7 +48,8 @@ function createGivePointAwardActions(params) {
                             seller: params.order.seller,
                             // mask
                             customer: (0, order_1.createMaskedCustomer)(params.order),
-                            confirmationNumber: params.order.confirmationNumber,
+                            // IOrderへ移行(2022-11-17~)
+                            // confirmationNumber: params.order.confirmationNumber,
                             orderNumber: params.order.orderNumber,
                             price: params.order.price,
                             priceCurrency: params.order.priceCurrency,

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

@@ -66,7 +66,8 @@ function createMoneyTransferActions(params) {
                         seller: params.order.seller,
                         // mask
                         customer: (0, order_1.createMaskedCustomer)(params.order),
-                        confirmationNumber: params.order.confirmationNumber,
+                        // IOrderへ移行(2022-11-17~)
+                        // confirmationNumber: params.order.confirmationNumber,
                         orderNumber: params.order.orderNumber,
                         price: params.order.price,
                         priceCurrency: params.order.priceCurrency,

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

@@ -51,7 +51,8 @@ function createRegisterServiceActions(params) {
                         seller: params.order.seller,
                         // mask
                         customer: (0, order_1.createMaskedCustomer)(params.order),
-                        confirmationNumber: params.order.confirmationNumber,
+                        // IOrderへ移行(2022-11-17~)
+                        // confirmationNumber: params.order.confirmationNumber,
                         orderNumber: params.order.orderNumber,
                         price: params.order.price,
                         priceCurrency: params.order.priceCurrency,

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

@@ -19,13 +19,14 @@ function createSendEmailMessageActions(params) {
         // 注文配送メール送信設定
         const sendEmailMessageActions = [];
         const project = params.transaction.project;
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const sendActionPurpose = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order),
-            confirmationNumber: params.order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,

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

@@ -34,13 +34,15 @@ function createPotentialActions(params) {
         const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
         // 注文配送メール送信設定
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
             // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order),
-            confirmationNumber: params.order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,

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

@@ -34,13 +34,11 @@ function createSeller(params) {
     var _a;
     const seller = params.transaction.seller;
     return {
-        project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
+        // 最適化(2022-11-15~)
+        // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
         id: seller.id,
         name: (typeof seller.name === 'string') ? seller.name : String((_a = seller.name) === null || _a === void 0 ? void 0 : _a.ja),
         typeOf: seller.typeOf
-        // ↓最適化(2022-05-20~)
-        // ...(typeof seller.telephone === 'string') ? { telephone: seller.telephone } : undefined,
-        // ...(typeof seller.url === 'string') ? { url: seller.url } : undefined
     };
 }
 function createCustomer(params) {

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

@@ -2,4 +2,6 @@ import * as factory from '../../../../factory';
 export declare function validateSeller(params: {
     seller: factory.seller.ISeller;
     clientUser?: factory.clientUser.IClientUser;
-}): void;
+}): {
+    makesOfferFromClient: factory.seller.IMakesOffer;
+};

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

@@ -8,12 +8,13 @@ function validateSeller(params) {
     if (typeof clientId !== 'string' || clientId.length === 0) {
         throw new factory.errors.ArgumentNull('client_id');
     }
-    const makesOfferFromClient = (_b = params.seller.makesOffer) === null || _b === void 0 ? void 0 : _b.some((offer) => {
+    const makesOfferFromClient = (_b = params.seller.makesOffer) === null || _b === void 0 ? void 0 : _b.find((offer) => {
         var _a;
         return (_a = offer.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.some((availableApplication) => availableApplication.id === clientId);
     });
-    if (makesOfferFromClient !== true) {
+    if (makesOfferFromClient === undefined) {
         throw new factory.errors.Argument('seller', 'makes no offers');
     }
+    return { makesOfferFromClient };
 }
 exports.validateSeller = validateSeller;

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

@@ -27,14 +27,28 @@ 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~)
         if (params.validateSeller === true) {
-            (0, validateSeller_1.validateSeller)({ seller, clientUser: params.object.clientUser });
+            const validateSellerResult = (0, validateSeller_1.validateSeller)({ seller, clientUser: params.object.clientUser });
+            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);
+        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/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.js

@@ -17,13 +17,14 @@ function createReturnMoneyTransferActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
         const returnMoneyTransferActions = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const purpose = {
-            // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -62,11 +63,9 @@ function createReturnMoneyTransferActions(params) {
                     },
                     agent: order.project,
                     recipient: {
-                        // project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
                         typeOf: order.seller.typeOf,
                         id: order.seller.id,
                         name: order.seller.name
-                        // url: order.seller.url
                     },
                     potentialActions: {},
                     purpose,

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -45,7 +45,8 @@ function createReturnPaymentMethodPotentialActions(params) {
                 seller: order.seller,
                 // mask
                 customer: (0, order_1.createMaskedCustomer)(order),
-                confirmationNumber: order.confirmationNumber,
+                // IOrderへ移行(2022-11-17~)
+                // confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,
@@ -109,7 +110,8 @@ function createReturnPaymentMethodActions(params) {
                             seller: order.seller,
                             // mask
                             customer: (0, order_1.createMaskedCustomer)(order),
-                            confirmationNumber: order.confirmationNumber,
+                            // IOrderへ移行(2022-11-17~)
+                            // confirmationNumber: order.confirmationNumber,
                             orderNumber: order.orderNumber,
                             price: order.price,
                             priceCurrency: order.priceCurrency,
@@ -179,7 +181,8 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
                     seller: order.seller,
                     // mask
                     customer: (0, order_1.createMaskedCustomer)(order),
-                    confirmationNumber: order.confirmationNumber,
+                    // IOrderへ移行(2022-11-17~)
+                    // confirmationNumber: order.confirmationNumber,
                     orderNumber: order.orderNumber,
                     price: order.price,
                     priceCurrency: order.priceCurrency,

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js

@@ -47,26 +47,24 @@ function createReturnPointAwardActions(params) {
                 console.error('JSON.parse(awardAccountsStr) throws', error);
             }
         }
-        // const transaction = params.transaction;
         const order = params.order;
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const purpose = {
-            // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
         const recipient = {
-            // project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
             typeOf: order.seller.typeOf,
             id: order.seller.id,
             name: order.seller.name
-            // url: order.seller.url
         };
         // ポイントインセンティブの数だけ、返却アクションを作成
         returnPointAwardActions.push(...pointAwardIdentifiers.map((pointAwardIdentifier) => {

package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js

@@ -23,7 +23,8 @@ function createSendEmailMessaegActionsOnReturn(params) {
             seller: order.seller,
             // mask
             customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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

@@ -55,6 +55,14 @@ function start(params) {
             returnPolicy: appliedReturnPolicy,
             reason: params.object.reason
         };
+        // fix expiresInSeconds(2022-11-30~)
+        let expiresInSeconds;
+        if (typeof params.expiresInSeconds === 'number') {
+            expiresInSeconds = params.expiresInSeconds;
+        }
+        else {
+            throw new factory.errors.ArgumentNull('expiresInSeconds');
+        }
         const returnOrderAttributes = {
             project: params.project,
             typeOf: factory.transactionType.ReturnOrder,
@@ -65,7 +73,8 @@ function start(params) {
                 name: seller.name
             },
             object: transactionObject,
-            expires: params.expires
+            // expires: params.expires,
+            expiresInSeconds
         };
         let returnOrderTransaction;
         try {

package/lib/chevre/service/transaction.js

@@ -53,26 +53,13 @@ function updateAgent(params) {
         const newAgent = {
             typeOf: transaction.agent.typeOf,
             id: transaction.agent.id
-            // 不要なので廃止(2022-05-26~)
-            // ...(Array.isArray(params.agent.additionalProperty)) ? { additionalProperty: params.agent.additionalProperty } : {},
-            // ...(typeof params.agent.age === 'string') ? { age: params.agent.age } : {},
-            // ...(typeof params.agent.address === 'string') ? { address: params.agent.address } : {},
-            // ...(typeof params.agent.email === 'string') ? { email: params.agent.email } : {},
-            // ...(typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName } : {},
-            // ...(typeof params.agent.gender === 'string') ? { gender: params.agent.gender } : {},
-            // ...(typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName } : {},
-            // ...(typeof params.agent.name === 'string') ? { name: params.agent.name } : {},
-            // ...(typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : {},
-            // ...(typeof params.agent.url === 'string') ? { url: params.agent.url } : {}
         };
         // 注文取引の場合、object.customerにも適用
         let customer;
         if (transaction.typeOf === factory.transactionType.PlaceOrder) {
             // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
             if (typeof ((_a = transaction.object.customer) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-                customer = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: transaction.object.customer.typeOf, id: transaction.object.customer.id }, (transaction.object.customer.typeOf === factory.organizationType.Organization)
-                    ? { project: transaction.object.customer.project }
-                    : undefined), (Array.isArray(transaction.object.customer.identifier))
+                customer = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: transaction.object.customer.typeOf, id: transaction.object.customer.id }, (Array.isArray(transaction.object.customer.identifier))
                     ? { identifier: transaction.object.customer.identifier }
                     : undefined), (transaction.object.customer.typeOf === factory.personType.Person
                     && typeof ((_b = transaction.object.customer.memberOf) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.276.0-alpha.2",
-    "@cinerino/sdk": "3.132.0-alpha.0",
+    "@chevre/factory": "4.279.0-alpha.1",
+    "@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.2"
+  "version": "20.1.0-alpha.20"
 }

package/example/src/chevre/accountBlanceTest.ts

@@ -1,24 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const accountRepo = new chevre.repository.Account(mongoose.connection);
-
-    // 不要な所有権を削除
-    const result = await accountRepo.authorizeAmount({
-        accountNumber: '139151625010963',
-        amount: 10,
-        transaction: <any>{ id: 'test' },
-        force: false
-    });
-    console.log('result:', result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);