@chevre/domain 25.0.0-alpha.1 → 25.0.0-alpha.11

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-async function createReturnInvoicePotentialActions(params, 
-// settings: Settings
-setting) {
+async function createReturnInvoicePotentialActions(params, setting) {
     const order = params.order;
     const emailMessagesOnReturnEachPaymentMethodId = [];
     const sendEmailMessageOnRefund = [];
@@ -32,21 +30,10 @@ setting) {
         }, setting);
         emailMessagesOnReturnEachPaymentMethodId.push(emailMessage);
         sendEmailMessageOnRefund.push({
-            // project: order.project, // discontinue(2024-06-26~)
-            // typeOf: factory.actionType.SendAction, // discontinue(2024-06-26~)
-            // standardize object(2024-06-27~)
-            // object: emailMessage
             object: {
                 identifier: emailMessage.identifier,
                 typeOf: factory_1.factory.creativeWorkType.EmailMessage
             }
-            // agent: order.project, // discontinue(2024-06-26~)
-            // recipient: { // discontinue(2024-06-26~)
-            //     typeOf: order.customer.typeOf,
-            //     id: order.customer.id
-            // },
-            // potentialActions: {}, // discontinue(2024-06-25~)
-            // purpose: sendActionPurpose // discontinue(2024-06-26~)
         });
     }
     return {
@@ -56,18 +43,9 @@ setting) {
         }
     };
 }
-async function createReturnPaymentMethodActions(params, 
-// settings: Settings
-setting) {
+async function createReturnPaymentMethodActions(params, setting) {
     const emailMessagesOnReturnInvoice = [];
     const potentialReturnInvoiceActions = [];
-    // const returnPaymentMethodPurpose: factory.order.ISimpleOrder = {
-    //     typeOf: order.typeOf,
-    //     orderNumber: order.orderNumber,
-    //     price: order.price,
-    //     priceCurrency: order.priceCurrency,
-    //     orderDate: order.orderDate
-    // };
     // MovieTicket決済以外について返品ポリシーのreturnFeesを適用する(2022-08-10~)
     const returnFees = params.transaction.object.returnPolicy.returnFees;
     // ReturnFeesCustomerResponsibilityであれば返金はなし、それ以外は返金する
@@ -95,19 +73,6 @@ setting) {
                 };
                 // optimize(2024-06-19~)
                 return { object, potentialActions: potentialActionsOnRefund };
-                // return {
-                //     project: order.project,
-                //     typeOf: factory.actionType.ReturnAction,
-                //     object,
-                //     agent: order.project,
-                //     recipient: {
-                //         typeOf: order.customer.typeOf,
-                //         id: order.customer.id,
-                //         name: String(order.customer.name)
-                //     },
-                //     purpose: returnPaymentMethodPurpose,
-                //     potentialActions: potentialActionsOnRefund
-                // };
             })));
     }
     // 決済カード決済について

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

@@ -1,10 +1,10 @@
+import { IOrderAsCreateEmailParams } from '../../../../emailMessageBuilder';
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
-    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
+    order: IOrderAsCreateEmailParams;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
-    emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];

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

@@ -7,13 +7,6 @@ async function createSendEmailMessaegActionsOnReturn(params,
 // settings: Settings
 setting) {
     const order = params.order;
-    // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
-    //     typeOf: order.typeOf,
-    //     orderNumber: order.orderNumber,
-    //     price: order.price,
-    //     priceCurrency: order.priceCurrency,
-    //     orderDate: order.orderDate
-    // };
     // 返品後のEメール送信アクション
     const emailMessagesOnReturn = [];
     const sendEmailMessaegActionsOnReturn = [];
@@ -24,24 +17,16 @@ setting) {
                 order,
                 index,
                 ...(sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined,
-                ...(params.emailMessageOnOrderReturned !== undefined)
-                    ? { emailMessage: params.emailMessageOnOrderReturned }
-                    : undefined
+                // ...(params.emailMessageOnOrderReturned !== undefined)
+                //     ? { emailMessage: params.emailMessageOnOrderReturned }
+                //     : undefined
             }, setting);
             emailMessagesOnReturn.push(emailMessage);
             return {
-                // project: order.project, // optimize(2024-06-25~)
-                // typeOf: factory.actionType.SendAction, // optimize(2024-06-25~)
-                // standardize object(2024-06-27~)
-                // object: emailMessage
                 object: {
                     identifier: emailMessage.identifier,
                     typeOf: factory_1.factory.creativeWorkType.EmailMessage
                 }
-                // agent: order.project, // optimize(2024-06-25~)
-                // recipient: { typeOf: order.customer.typeOf, id: order.customer.id }, // optimize(2024-06-25~)
-                // potentialActions: {} // optimize(2024-06-25~)
-                // purpose: sendActionPurpose // optimize(2024-06-25~)
             };
         })));
     }

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

@@ -6,7 +6,6 @@ declare function createPotentialActions(params: {
     orders: IReturningOrder4potentialActions[];
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
-    emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     potentialActions: factory.transaction.returnOrder.IPotentialActions;

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

@@ -22,9 +22,6 @@ setting) {
             ...(returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined
         }, setting);
         emailMessages.push(...emailMessagesOnReturnInvoice);
-        // discontinue(2026-04-18~)
-        // // ポイント特典の数だけ、返却アクションを作成
-        // const returnPointAwardActions = await createReturnPointAwardActions({ ...params, order });
         // 返品後のEメール送信アクション
         const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = await (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)({
             ...params,
@@ -34,7 +31,6 @@ setting) {
         emailMessages.push(...emailMessagesOnReturn);
         const potentialActionsOnReturnOrder = {
             returnPaymentMethod: returnPaymentMethodActions,
-            // returnPointAward: returnPointAwardActions, // discontinue(2026-04-18~)
             sendEmailMessage: sendEmailMessaegActionsOnReturn
         };
         const returnOrderObject = {

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

@@ -144,7 +144,7 @@ function fixOrders(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         return { acceptedOffers, eventIds, offerIds, orders };
     };
 }

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -1,6 +1,5 @@
 import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { EmailMessageRepo } from '../../repo/emailMessage';
 import type { EventRepo } from '../../repo/event';
 import type { MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
 import type { MessageRepo } from '../../repo/message';
@@ -41,7 +40,6 @@ type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise
 declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
 interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
-    emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;

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

@@ -112,17 +112,18 @@ function confirm(params) {
                 'orderedItem', 'paymentMethods', 'price', 'priceCurrency', 'project', 'seller', 'typeOf'
             ]
         });
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderReturned;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = await repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
-            });
-            emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
-        }
+        // discontinue emailMessageRepo
+        // // デフォルトEメールメッセージを検索
+        // let emailMessageOnOrderReturned: factory.creativeWork.message.email.ICreativeWork | undefined;
+        // if (repos.emailMessage !== undefined) {
+        //     const searchEmailMessagesResult = await repos.emailMessage.search({
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: transaction.project.id } },
+        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
+        //     });
+        //     emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
+        // }
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
@@ -133,7 +134,7 @@ function confirm(params) {
             orders: returningOrders,
             transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
+            // ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
         }, 
         // settings
         setting);

package/lib/chevre/service/validation/validateOrder.js

@@ -22,7 +22,7 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
             payTransactions = await repos.assetTransaction.search({

package/lib/chevre/service.d.ts

@@ -3,7 +3,6 @@
  */
 import * as AccountTransactionIdentifierFactory from './factory/accountTransactionIdentifier';
 import * as EventFactory from './factory/event';
-import * as OrderFactory from './factory/order';
 import * as ReservedAgentIdentifireNamesFactory from './factory/reservedAgentIdentifireNames';
 import * as TaskIdentifierFactory from './factory/taskIdentifier';
 import * as TransactionFactory from './factory/transaction';
@@ -60,7 +59,6 @@ export declare namespace transaction {
 export declare namespace factory {
     export import accountTransactionIdentifier = AccountTransactionIdentifierFactory;
     export import event = EventFactory;
-    export import order = OrderFactory;
     export import reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
     export import taskIdentifier = TaskIdentifierFactory;
     export import transaction = TransactionFactory;

package/lib/chevre/service.js

@@ -40,7 +40,6 @@ exports.factory = exports.transaction = exports.task = exports.reserve = exports
  */
 const AccountTransactionIdentifierFactory = __importStar(require("./factory/accountTransactionIdentifier"));
 const EventFactory = __importStar(require("./factory/event"));
-const OrderFactory = __importStar(require("./factory/order"));
 const ReservedAgentIdentifireNamesFactory = __importStar(require("./factory/reservedAgentIdentifireNames"));
 const TaskIdentifierFactory = __importStar(require("./factory/taskIdentifier"));
 const TransactionFactory = __importStar(require("./factory/transaction"));
@@ -183,7 +182,6 @@ var factory;
 (function (factory) {
     factory.accountTransactionIdentifier = AccountTransactionIdentifierFactory;
     factory.event = EventFactory;
-    factory.order = OrderFactory;
     factory.reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
     factory.taskIdentifier = TaskIdentifierFactory;
     factory.transaction = TransactionFactory;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.0.0-alpha.1",
+    "@chevre/factory": "9.0.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.1"
+  "version": "25.0.0-alpha.11"
 }

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

@@ -1,2 +0,0 @@
-export declare const POINT_AWARD_IDENTIFIER_NAME = "pointAwardIdentifiers";
-export declare const AWARD_ACCOUNTS_IDENTIFIER_NAME = "awardAccounts";

package/lib/chevre/factory/order.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = exports.POINT_AWARD_IDENTIFIER_NAME = void 0;
-exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
-exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = 'awardAccounts';

package/lib/chevre/service/order/placeOrderWithoutTransaction.d.ts

@@ -1,22 +0,0 @@
-import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { ActionRepo } from '../../repo/action';
-import type { OrderRepo } from '../../repo/order';
-import type { TaskRepo } from '../../repo/task';
-import { factory } from '../../factory';
-import { IExternalOrder } from './onOrderStatusChanged';
-/**
- * 注文取引なしに注文を作成する
- */
-declare function placeOrderWithoutTransaction(params: {
-    agent?: factory.action.trade.order.IAgent;
-    project: {
-        id: string;
-    };
-    object: IExternalOrder;
-}): (repos: {
-    accountingReport: AccountingReportRepo;
-    action: ActionRepo;
-    order: OrderRepo;
-    task: TaskRepo;
-}) => Promise<void>;
-export { placeOrderWithoutTransaction };

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

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
-const factory_1 = require("../../factory");
-/**
- * 注文取引なしに注文を作成する
- */
-function placeOrderWithoutTransaction(params) {
-    return async (repos) => {
-        const order = params.object;
-        const simpleOrder = {
-            typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
-            orderNumber: order.orderNumber,
-            // price: order.price,
-            // priceCurrency: order.priceCurrency,
-            orderDate: order.orderDate
-        };
-        const orderActionAttributes = {
-            agent: (typeof params.agent?.typeOf === 'string') ? params.agent : order.project,
-            object: simpleOrder,
-            // potentialActions: {}, // discontinue(2024-06-28~)
-            project: order.project,
-            // purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
-            typeOf: factory_1.factory.actionType.OrderAction
-        };
-        const action = await repos.action.start(orderActionAttributes);
-        try {
-            await repos.order.createIfNotExist({
-                ...order,
-                // discounts: [], // 廃止(2024-04-16~)
-                acceptedOffers: []
-            });
-        }
-        catch (error) {
-            try {
-                await repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        await repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
-    };
-}