@chevre/domain 28.0.0-alpha.0 → 28.0.0-alpha.2

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

@@ -77,7 +77,7 @@ export declare class AdminTransactionRepo {
         seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
         typeOf: factory.transactionType.ReturnOrder;
         expires: Date;
-        result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
+        result?: undefined;
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
@@ -115,7 +115,7 @@ export declare class AdminTransactionRepo {
         seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
         typeOf: factory.transactionType.ReturnOrder;
         expires: Date;
-        result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
+        result?: undefined;
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;

package/lib/chevre/repo/order.js

@@ -613,7 +613,9 @@ class OrderRepo {
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [
-                    'project', 'typeOf', 'orderNumber', 'dateReturned',
+                    'project', 'typeOf', 'orderNumber',
+                    'orderStatus', // すでに変更済かどうか検証するので必要
+                    'dateReturned',
                     'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
                 ]
             });

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

@@ -1,7 +1,10 @@
 import type { RedisClientType } from '@redis/client';
 import { factory } from '../../factory';
-type IStartedTransactionFields = 'expires' | 'id' | 'startDate' | 'status';
-export type IStartedTransaction = Pick<factory.transaction.ITransaction<factory.transactionType.ReturnOrder>, IStartedTransactionFields>;
+export type IStartedTransaction = Pick<factory.transaction.returnOrder.ITransaction, 'expires' | 'id' | 'startDate' | 'status'>;
+export type IReturnOrderAsValue = Pick<factory.transaction.returnOrder.IAttributes, 'agent' | 'object' | 'project' | 'startDate' | 'typeOf'>;
+export type IReturnOrderAsFindResult = IReturnOrderAsValue & {
+    id: string;
+};
 /**
  * 返品取引リポジトリ
  */
@@ -12,10 +15,8 @@ export declare class ReturnOrderInProgressRepo {
     /**
      * 取引を開始する
      */
-    startReturnOrder(params: factory.transaction.IStartParams<factory.transactionType.ReturnOrder>): Promise<IStartedTransaction>;
+    startReturnOrder(params: factory.transaction.returnOrder.IStartParams): Promise<IStartedTransaction>;
     findReturnOrderById(params: {
-        typeOf: factory.transactionType.ReturnOrder;
         id: string;
-    }): Promise<factory.transaction.ITransaction<factory.transactionType.ReturnOrder>>;
+    }): Promise<IReturnOrderAsFindResult>;
 }
-export {};

package/lib/chevre/repo/transaction/returnOrderInProgress.js

@@ -20,7 +20,6 @@ class ReturnOrderInProgressRepo {
      */
     async startReturnOrder(params) {
         const status = factory_1.factory.transactionStatusType.InProgress;
-        const tasksExportAction = { actionStatus: factory_1.factory.actionStatusType.PotentialActionStatus };
         const startDate = new Date();
         let expires;
         const { typeOf } = params;
@@ -33,10 +32,9 @@ class ReturnOrderInProgressRepo {
         else {
             throw new factory_1.factory.errors.ArgumentNull('expiresInSeconds');
         }
-        const { agent, project, object, seller } = params;
+        const { agent, project, object } = params;
         const creatingTransaction = {
-            status, startDate, expires, typeOf, tasksExportAction,
-            agent, project, seller, object
+            startDate, typeOf, agent, project, object
         };
         const id = `${ReturnOrderInProgressRepo.KEY_PREFIX}:${startDate.getTime()}`;
         const result = await this.redisClient.set(id, JSON.stringify(creatingTransaction), {
@@ -50,18 +48,16 @@ class ReturnOrderInProgressRepo {
         return { expires, id, startDate, status };
     }
     async findReturnOrderById(params) {
-        let transaction;
         const transactionJson = await this.redisClient.get(params.id);
         if (typeof transactionJson !== 'string') {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.ReturnOrder);
         }
+        let transactionAsFindResult;
         try {
-            transaction = JSON.parse(transactionJson);
-            transaction = {
-                ...transaction,
-                startDate: (0, moment_1.default)(transaction.startDate)
-                    .toDate(),
-                expires: (0, moment_1.default)(transaction.expires)
+            const transactionAsValue = JSON.parse(transactionJson);
+            transactionAsFindResult = {
+                ...transactionAsValue,
+                startDate: (0, moment_1.default)(transactionAsValue.startDate)
                     .toDate(),
                 id: params.id
             };
@@ -70,7 +66,7 @@ class ReturnOrderInProgressRepo {
             console.error('transaction parse error:', error);
             throw error;
         }
-        return transaction;
+        return transactionAsFindResult;
     }
 }
 exports.ReturnOrderInProgressRepo = ReturnOrderInProgressRepo;

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

@@ -10,7 +10,10 @@ function call(params) {
     return async ({ connection }) => {
         const { data } = params;
         await exportTasksById({
-            transaction: data
+            transaction: {
+                ...data,
+                project: params.project
+            }
         })({
             task: new task_1.TaskRepo(connection),
         });

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

@@ -49,5 +49,5 @@ declare function confirm(params: factory.transaction.returnOrder.IConfirmParams
             dateReturned: Date;
         };
     };
-}): (repos: IConfirmRepos) => Promise<import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult>;
+}): (repos: IConfirmRepos) => Promise<void>;
 export { IStartOperationRepos, IConfirmRepos, preStart, start, confirm, };

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

@@ -63,7 +63,7 @@ function saveMessagesIfNeeded(params) {
  */
 function confirm(params) {
     return async (repos) => {
-        const transaction = await repos.returnOrderInProgress.findReturnOrderById({ typeOf: factory_1.factory.transactionType.ReturnOrder, id: params.id });
+        const transaction = await repos.returnOrderInProgress.findReturnOrderById({ id: params.id });
         if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
@@ -95,16 +95,13 @@ function confirm(params) {
         if (typeof setting?.defaultSenderEmail !== 'string') {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
         }
-        const result = {};
         const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
             dateReturned: params.object.order.dateReturned,
             orders: returningOrders,
             transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
             // ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
-        }, 
-        // settings
-        setting);
+        }, setting);
         // save messages(2024-06-27~)
         await saveMessagesIfNeeded({
             project: { id: transaction.project.id },
@@ -128,12 +125,10 @@ function confirm(params) {
                 agent: transaction.agent,
                 startDate: transaction.startDate,
                 object: transaction.object,
-                project: transaction.project,
-                potentialActions,
-                endDate
+                potentialActions
             }
         };
         await repos.task.runTaskByIdentifier(confirmReturnOrderTask);
-        return result;
+        // return result;
     };
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.5.0-alpha.7",
+    "@chevre/factory": "10.5.0-alpha.8",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.0"
+  "version": "28.0.0-alpha.2"
 }