@chevre/domain 21.36.0-alpha.6 → 21.36.0

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

@@ -59,8 +59,8 @@ function createNextSendOrderTasks(params) {
         // mask
         // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
         orderNumber: params.order.orderNumber,
-        price: params.order.price,
-        priceCurrency: params.order.priceCurrency,
+        // price: params.order.price,
+        // priceCurrency: params.order.priceCurrency,
         orderDate: params.order.orderDate
     };
     const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {

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

@@ -50,8 +50,8 @@ function createSendOrderTaskIfNotExist(params) {
             // mask
             // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {

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

@@ -31,8 +31,8 @@ function onOrderPaymentDue(params) {
             // }, // 廃止(2024-03-06~)
             // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         switch (params.order.orderStatus) {

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

@@ -22,8 +22,8 @@ function createSendEmailMessageTaskIfNotExist(params) {
                 const simpleOrder = {
                     typeOf: params.order.typeOf,
                     orderNumber: params.order.orderNumber,
-                    price: params.order.price,
-                    priceCurrency: params.order.priceCurrency,
+                    // price: params.order.price,
+                    // priceCurrency: params.order.priceCurrency,
                     orderDate: params.order.orderDate
                 };
                 const actionAttributes = {

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

@@ -37,8 +37,8 @@ function onOrderProcessing(params) {
             // }, // 廃止(2024-03-06~)
             // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         switch (params.order.orderStatus) {

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

@@ -95,8 +95,8 @@ function createOnOrderReturnedTasksByTransaction(params) {
         const simpleOrder = {
             typeOf: params.order.typeOf,
             orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         sendEmailMessageAttributes.forEach((s) => {

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

@@ -34,8 +34,8 @@ function onOrderReturned(params) {
             // }, // 廃止(2024-03-06~)
             // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         switch (params.order.orderStatus) {

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

@@ -44,8 +44,8 @@ function placeOrder(params) {
             // }, // 廃止(2024-03-06~)
             // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
+            // price: order.price,
+            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
         const orderActionPurpose = {

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

@@ -27,8 +27,8 @@ function placeOrderWithoutTransaction(params) {
             // }, // 廃止(2024-03-06~)
             // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
+            // price: order.price,
+            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
         const orderActionAttributes = {

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

@@ -66,8 +66,8 @@ function returnOrder(params) {
             // }, // 廃止(2024-03-06~)
             // customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
+            // price: order.price,
+            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate,
             dateReturned
         };

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

@@ -72,8 +72,8 @@ function sendOrder(params) {
                 // }, // 廃止(2024-03-06~)
                 // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
                 orderNumber: order.orderNumber,
-                price: order.price,
-                priceCurrency: order.priceCurrency,
+                // price: order.price,
+                // priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
             const { limit, page } = params.object.acceptedOffers;

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

@@ -46,8 +46,8 @@ function createAccountingReport(params) {
             // }, // 廃止(2024-03-06~)
             // customer: { typeOf: order.customer.typeOf, id: order.customer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
+            // price: order.price,
+            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
         const actionAttributes = {

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

@@ -54,8 +54,8 @@ function task2actionAttributes(params) {
     const purpose = {
         typeOf: order.typeOf,
         orderNumber: order.orderNumber,
-        price: order.price,
-        priceCurrency: order.priceCurrency,
+        // price: order.price,
+        // priceCurrency: order.priceCurrency,
         orderDate: order.orderDate
     };
     return Object.assign(Object.assign(Object.assign({ project: order.project, typeOf: factory.actionType.ReturnAction, agent, object, recipient, purpose }, (potentialActions !== undefined) ? { potentialActions } : undefined), (typeof transactionNumber === 'string')
@@ -241,8 +241,8 @@ function onRefund(params) {
             const simpleOrder = {
                 typeOf: order.typeOf,
                 orderNumber: order.orderNumber,
-                price: order.price,
-                priceCurrency: order.priceCurrency,
+                // price: order.price,
+                // priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
             sendEmailMessageByPotentialActions.forEach((s) => {

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

@@ -33,11 +33,6 @@ type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
          * 同期的にに注文コードを発行する場合に指定
          */
         publishCodeExpiresInSeconds?: number;
-        /**
-         * 取引検証時にorderInTransactionからオファーを検索するかどうか
-         */
-        useSaveMessages: boolean;
-        useOptimizedSendEmailAction: boolean;
     };
 };
 interface IConfirmResult {

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

@@ -127,13 +127,9 @@ function confirm(params) {
         const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
-            paymentMethods, 
-            // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
-            // transaction: transaction,
-            useOptimizedSendEmailAction: params.options.useOptimizedSendEmailAction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined));
+            paymentMethods }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined));
         // メッセージ保管(2024-04-28~)
         yield saveMessagesIfNeeded({
-            options: params.options,
             project: { id: transaction.project.id },
             order: { orderNumber, typeOf: factory.order.OrderType.Order }, seller: { id: seller.id }, emailMessages
         })(repos);
@@ -164,20 +160,18 @@ function confirm(params) {
 exports.confirm = confirm;
 function saveMessagesIfNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { options, project, order, emailMessages, seller } = params;
-        if (options.useSaveMessages) {
-            if (emailMessages.length > 0) {
-                const { orderNumber, typeOf } = order;
-                const saveMessageResult = yield repos.message.upsertByIdentifier(emailMessages.map(({ identifier, name, about, text, toRecipient, sender }) => {
-                    return {
-                        identifier, name, about, text, toRecipient, sender,
-                        project: { id: project.id, typeOf: factory.organizationType.Project },
-                        provider: { id: seller.id, typeOf: factory.organizationType.Corporation },
-                        mainEntity: { orderNumber, typeOf }
-                    };
-                }));
-                debug(emailMessages.length, 'messages saved.', saveMessageResult);
-            }
+        const { project, order, emailMessages, seller } = params;
+        if (emailMessages.length > 0) {
+            const { orderNumber, typeOf } = order;
+            const saveMessageResult = yield repos.message.upsertByIdentifier(emailMessages.map(({ identifier, name, about, text, toRecipient, sender }) => {
+                return {
+                    identifier, name, about, text, toRecipient, sender,
+                    project: { id: project.id, typeOf: factory.organizationType.Project },
+                    provider: { id: seller.id, typeOf: factory.organizationType.Corporation },
+                    mainEntity: { orderNumber, typeOf }
+                };
+            }));
+            debug(emailMessages.length, 'messages saved.', saveMessageResult);
         }
     });
 }

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.d.ts

@@ -6,7 +6,6 @@ export declare function createSendEmailMessageActions(params: {
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-    useOptimizedSendEmailAction: boolean;
 }): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];

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

@@ -32,14 +32,11 @@ function createSendEmailMessageActions(params) {
             yield Promise.all(sendEmailMessageOnOrderSentParams.map((s, index) => __awaiter(this, void 0, void 0, function* () {
                 const emailMessage = yield emailMessageBuilder.createSendOrderMessage(Object.assign(Object.assign({ order: orderAsCreateEmailParams, index }, (s.object !== undefined) ? { email: s.object } : undefined), (params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined));
                 emailMessages.push(emailMessage);
-                let sendEmailMessageActionObject = emailMessage;
                 // 送信アクション最適化に対応(2024-04-29~)
-                if (params.useOptimizedSendEmailAction) {
-                    sendEmailMessageActionObject = {
-                        identifier: emailMessage.identifier,
-                        typeOf: factory.creativeWorkType.EmailMessage
-                    };
-                }
+                const sendEmailMessageActionObject = {
+                    identifier: emailMessage.identifier,
+                    typeOf: factory.creativeWorkType.EmailMessage
+                };
                 // optimize(2024-05-07~)
                 sendEmailMessageActions.push({
                     // project: params.order.project,

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

@@ -9,7 +9,6 @@ export declare function createPotentialActions(params: {
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-    useOptimizedSendEmailAction: boolean;
 }): Promise<{
     potentialActions: factory.transaction.placeOrder.IPotentialActions;
     emailMessages: factory.creativeWork.message.email.ICreativeWork[];

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

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-const settings_1 = require("../../../settings");
 /**
  * 取引のポストアクションを作成する
  */
@@ -19,16 +18,16 @@ function createPotentialActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         // 注文処理開始メール送信設定
         const { emailMessages, sendEmailMessageActions } = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
-        const sendOrderActionAttributes = {
-            potentialActions: { sendEmailMessage: sendEmailMessageActions }
-        };
+        // const sendOrderActionAttributes: factory.transaction.placeOrder.IPotentialSendOrderAction = {
+        //     potentialActions: { sendEmailMessage: sendEmailMessageActions }
+        // };
         return {
             emailMessages,
             potentialActions: {
-                order: Object.assign({}, (settings_1.USE_EXPERIMENTAL_FEATURE)
-                    ? { onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } }
-                    : { potentialActions: { sendOrder: sendOrderActionAttributes } } // optimize(2024-01-16~)
-                )
+                order: {
+                    onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } // optimize(2024-06-29~)
+                    // potentialActions: { sendOrder: sendOrderActionAttributes }
+                }
             }
         };
     });

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

@@ -58,8 +58,8 @@ function createReturnPointAwardActions(params) {
             // mask
             // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
+            // price: order.price,
+            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
         const agent = order.project;

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

@@ -61,8 +61,8 @@ function createPotentialActions(params) {
                 // mask
                 // customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
                 orderNumber: order.orderNumber,
-                price: order.price,
-                priceCurrency: order.priceCurrency,
+                // price: order.price,
+                // priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate,
                 dateReturned: params.dateReturned
             };

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

@@ -91,8 +91,12 @@ function preStart(params) {
         validateAppliedReturnPolicy({ merchantReturnPolicy: appliedReturnPolicy });
         // アイテム検証
         yield validateItems({ orders, reason: params.object.reason })({ order: repos.order, reservation: repos.reservation });
-        const transactionObject = Object.assign({ order: orders.map(({ confirmationNumber, orderNumber }) => ({ confirmationNumber, orderNumber })), returnPolicy: appliedReturnPolicy, reason: params.object.reason }, { usedReservationExists } // for debug(2024-06-26~)
-        );
+        const transactionObject = {
+            order: orders.map(({ confirmationNumber, orderNumber }) => ({ confirmationNumber, orderNumber })),
+            returnPolicy: appliedReturnPolicy,
+            reason: params.object.reason,
+            usedReservationExists // for debug(2024-06-26~)
+        };
         // fix expiresInSeconds(2022-11-30~)
         let expiresInSeconds;
         if (typeof params.expiresInSeconds === 'number') {
@@ -402,10 +406,11 @@ function findApplicableReturnPolicy(params) {
         let appliedItemCondition;
         const appliedItemConditionId = (_c = appliedReturnPolicy.itemCondition) === null || _c === void 0 ? void 0 : _c.id;
         if (typeof appliedItemConditionId === 'string') {
-            appliedItemCondition = params.offerItemConditions.find((o) => o.id === appliedItemConditionId);
-            if (appliedItemCondition === undefined) {
+            const appliedItemConditionFromDB = params.offerItemConditions.find((o) => o.id === appliedItemConditionId);
+            if (appliedItemConditionFromDB === undefined) {
                 throw new factory.errors.NotFound('OfferItemCondition');
             }
+            appliedItemCondition = Object.assign({ identifier: appliedItemConditionFromDB.identifier, itemOffered: appliedItemConditionFromDB.itemOffered, typeOf: appliedItemConditionFromDB.typeOf }, (typeof appliedItemConditionFromDB.id === 'string') ? { id: appliedItemConditionFromDB.id } : undefined);
         }
         const { restockingFee, typeOf, identifier, merchantReturnDays } = appliedReturnPolicy;
         return Object.assign(Object.assign(Object.assign({ restockingFee,

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.376.0-alpha.2",
-    "@cinerino/sdk": "8.0.0-alpha.3",
+    "@chevre/factory": "4.376.0",
+    "@cinerino/sdk": "8.0.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.36.0-alpha.6"
+  "version": "21.36.0"
 }