@chevre/domain 20.1.0-alpha.5 → 20.1.0-alpha.50

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

@@ -8,6 +8,17 @@ 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.onReservationConfirmed = exports.onReservationConfirmedByAction = void 0;
 /**
@@ -21,7 +32,9 @@ const informReservations = settings_1.settings.onReservationStatusChanged.inform
 /**
  * 予約確定後のアクション
  */
-function onReservationConfirmedByAction(actionAttributes, confirmedReservation) {
+function onReservationConfirmedByAction(actionAttributes
+// confirmedReservation: IEventReservation
+) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const potentialActions = actionAttributes.potentialActions;
         const now = new Date();
@@ -45,35 +58,34 @@ function onReservationConfirmedByAction(actionAttributes, confirmedReservation)
             }
         }
         // inform galobally
-        if (Array.isArray(informReservations)) {
-            const reservation4inform = (0, factory_1.maskUnderName)(confirmedReservation);
-            taskAttributes.push(...informReservations.map((informReservation) => {
-                var _a;
-                const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
-                const informReservationAttributes = {
-                    agent: confirmedReservation.project,
-                    object: [reservation4inform],
-                    project: confirmedReservation.project,
-                    recipient: {
-                        id: '',
-                        name: informUrl,
-                        typeOf: factory.creativeWorkType.WebApplication,
-                        url: informUrl
-                    },
-                    typeOf: factory.actionType.InformAction
-                };
-                return {
-                    project: actionAttributes.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: informReservationAttributes
-                };
-            }));
-        }
+        // if (Array.isArray(informReservations)) {
+        //     const reservation4inform: IReservation4informConfirmed = maskUnderName(confirmedReservation);
+        //     taskAttributes.push(...informReservations.map<ITriggerWebhookTaskAttributes>((informReservation) => {
+        //         const informUrl: string = String(informReservation.recipient?.url);
+        //         const informReservationAttributes: InformReservationActionattributes = {
+        //             agent: confirmedReservation.project,
+        //             object: [reservation4inform],
+        //             project: confirmedReservation.project,
+        //             recipient: {
+        //                 id: '',
+        //                 name: informUrl,
+        //                 typeOf: factory.creativeWorkType.WebApplication,
+        //                 url: informUrl
+        //             },
+        //             typeOf: factory.actionType.InformAction
+        //         };
+        //         return {
+        //             project: actionAttributes.project,
+        //             name: factory.taskName.TriggerWebhook,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now,
+        //             remainingNumberOfTries: NUM_TRY_INFORM_RESERVATION,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: informReservationAttributes
+        //         };
+        //     }));
+        // }
         // タスク保管
         if (taskAttributes.length > 0) {
             yield repos.task.saveMany(taskAttributes);
@@ -88,6 +100,49 @@ function onReservationConfirmed(confirmedReservations) {
                 project: confirmedReservations[0].project,
                 reservationFor: { id: confirmedReservations[0].reservationFor.id }
             })({ task: repos.task });
+            const now = new Date();
+            const taskAttributes = [];
+            // inform galobally
+            if (Array.isArray(informReservations)) {
+                taskAttributes.push(...informReservations.map((informReservation) => {
+                    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;
+                            }), typeOf: factory.reservationType.ReservationPackage }, (typeof ((_b = confirmedReservations[0].underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+                            ? { underName: (0, factory_1.maskUnderName)(confirmedReservations[0]).underName }
+                            : undefined)];
+                    const informReservationAttributes = {
+                        agent: confirmedReservations[0].project,
+                        object: informObject,
+                        project: confirmedReservations[0].project,
+                        recipient: {
+                            id: '',
+                            name: informUrl,
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        },
+                        typeOf: factory.actionType.InformAction
+                    };
+                    return {
+                        project: confirmedReservations[0].project,
+                        name: factory.taskName.TriggerWebhook,
+                        status: factory.taskStatus.Ready,
+                        runsAt: now,
+                        remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: informReservationAttributes
+                    };
+                }));
+            }
+            // タスク保管
+            if (taskAttributes.length > 0) {
+                yield repos.task.saveMany(taskAttributes);
+            }
         }
     });
 }

package/lib/chevre/service/task/confirmReserveTransaction.js

@@ -72,7 +72,7 @@ function confirmReserveTransaction(params) {
                     object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
-                        object: object.object,
+                        // object: object.object,
                         potentialActions: object.potentialActions
                     })(repos);
             }

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");
@@ -32,34 +31,20 @@ exports.ISS_PREFIX = 'https://cognito-idp.ap-northeast-1.amazonaws.com/';
  */
 function orderProgramMembership(params, paymentMethodType) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // let iss = '';
-        // if (Array.isArray(params.agent.identifier)) {
-        //     const issByAgent = params.agent.identifier?.find((p) => p.name === 'iss')?.value;
-        //     if (typeof issByAgent === 'string' && issByAgent.length > 0) {
-        //         iss = issByAgent.replace(ISS_PREFIX, '');
-        //     }
-        // }
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         // ユーザー存在確認(管理者がマニュアルでユーザーを削除する可能性があるので)
         const customer = yield repos.person.findById({ userId: String(params.agent.id) });
-        // issは必ずissからセットし直す
-        let issByCustomer;
-        if (Array.isArray(customer.identifier)) {
-            issByCustomer = (_b = (_a = customer.identifier) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'iss')) === null || _b === void 0 ? void 0 : _b.value;
-        }
-        if (typeof issByCustomer === 'string' && issByCustomer.length > 0) {
-            // iss = issByCustomer.replace(ISS_PREFIX, '');
-        }
-        else {
+        // issに依存するので存在確認
+        const issByCustomer = (_b = (_a = customer.identifier) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'iss')) === null || _b === void 0 ? void 0 : _b.value;
+        if (typeof issByCustomer !== 'string' || issByCustomer.length === 0) {
             throw new factory.errors.NotFound(`iss of customer ${customer.id}`);
         }
         const acceptedOffer = params.object;
-        // hostingOrganizationへの依存排除 -> acceptedOffer.seller.idへ依存
-        let sellerId = (_c = acceptedOffer.seller) === null || _c === void 0 ? void 0 : _c.id;
-        if (typeof sellerId !== 'string') {
-            // 互換性維持対応として↓
-            sellerId = (_e = (_d = acceptedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.hostingOrganization) === null || _e === void 0 ? void 0 : _e.id;
-        }
+        const sellerId = (_c = acceptedOffer.seller) === null || _c === void 0 ? void 0 : _c.id;
+        // if (typeof sellerId !== 'string') {
+        //     // 互換性維持対応として↓
+        //     sellerId = (<any>acceptedOffer.itemOffered)?.hostingOrganization?.id;
+        // }
         if (typeof sellerId !== 'string') {
             throw new factory.errors.NotFound('acceptedOffer seller ID undefined');
         }
@@ -120,16 +105,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.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../../../factory';
+export declare type IPlaceOrderTransactionAsInformObject = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'id' | 'typeOf' | 'agent' | 'endDate' | 'expires' | 'project' | 'seller' | 'result' | 'startDate' | 'status'>;
 /**
  * 取引のタスクを作成する
  */

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -9,11 +9,24 @@ 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;
     const transactionWebhookUrls = (Array.isArray(settings_1.settings.transactionWebhookUrls)) ? settings_1.settings.transactionWebhookUrls : [];
     const triggerWebhookTaskAttributes = transactionWebhookUrls.map((webhookUrl) => {
+        const informObject = {
+            id: transaction.id,
+            typeOf: transaction.typeOf,
+            agent: transaction.agent,
+            endDate: transaction.endDate,
+            expires: transaction.expires,
+            project: transaction.project,
+            seller: transaction.seller,
+            result: transaction.result,
+            startDate: transaction.startDate,
+            status: transaction.status
+        };
         return {
             project: transaction.project,
             name: factory.taskName.TriggerWebhook,
@@ -24,8 +37,8 @@ function createTasks(params) {
             executionResults: [],
             data: {
                 agent: transaction.project,
-                // agent: transaction.seller,
-                object: transaction,
+                // 通知内容最適化(2022-12-28~)
+                object: informObject,
                 project: transaction.project,
                 purpose: { typeOf: transaction.typeOf, id: transaction.id },
                 recipient: {
@@ -72,6 +85,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 +98,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

@@ -25,7 +25,8 @@ function createSendEmailMessageActions(params) {
             seller: params.order.seller,
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            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.js

@@ -41,7 +41,8 @@ function createPotentialActions(params) {
             seller: params.order.seller,
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            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/result/acceptedOffers.js

@@ -35,25 +35,29 @@ function createReservationAcceptedOffers(params) {
 }
 exports.createReservationAcceptedOffers = createReservationAcceptedOffers;
 function reservationOffers2orderedItem(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
     const reservationFor4orderedItem = {
         location: {
             branchCode: (_a = reservationFor.location) === null || _a === void 0 ? void 0 : _a.branchCode,
             name: (_b = reservationFor.location) === null || _b === void 0 ? void 0 : _b.name,
-            project: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.project,
-            typeOf: (_d = reservationFor.location) === null || _d === void 0 ? void 0 : _d.typeOf
+            // 不要なので廃止(2022-12-19~)
+            // project: reservationFor.location?.project,
+            typeOf: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.typeOf
         },
-        project: reservationFor.project,
+        // 不要なので廃止(2022-12-19~)
+        // project: reservationFor.project,
         typeOf: reservationFor.typeOf,
         id: reservationFor.id,
         name: reservationFor.name,
         startDate: reservationFor.startDate,
         endDate: reservationFor.endDate
-        // eventStatus: reservationFor.eventStatus
     };
-    return Object.assign(Object.assign({ project: reservationFor.project, typeOf: issuedThrough.typeOf }, (typeof ((_e = issuedThrough.serviceType) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string')
+    return Object.assign(Object.assign({ 
+        // 不要なので廃止(2022-12-19~)
+        // project: reservationFor.project,
+        typeOf: issuedThrough.typeOf }, (typeof ((_d = issuedThrough.serviceType) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
         ? { serviceType: issuedThrough.serviceType }
         : undefined), { serviceOutput: {
             typeOf: factory.reservationType.EventReservation,

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

@@ -23,7 +23,8 @@ function createReturnMoneyTransferActions(params) {
             seller: order.seller,
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            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/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

@@ -54,7 +54,8 @@ function createReturnPointAwardActions(params) {
             seller: order.seller,
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            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/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/lib/chevre/service.d.ts

@@ -3,6 +3,7 @@
  */
 import * as AccountTransactionIdentifierFactory from './factory/accountTransactionIdentifier';
 import * as OrderFactory from './factory/order';
+import * as ReservedAgentIdentifireNamesFactory from './factory/reservedAgentIdentifireNames';
 import * as AccountService from './service/account';
 import * as AccountTransactionService from './service/accountTransaction';
 import * as AggregationService from './service/aggregation';
@@ -46,4 +47,5 @@ export import util = UtilService;
 export declare namespace factory {
     export import accountTransactionIdentifier = AccountTransactionIdentifierFactory;
     export import order = OrderFactory;
+    export import reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
 }