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

package/lib/chevre/service/transaction/placeOrder/start.js

@@ -34,7 +34,7 @@ function start(params, options) {
                 // in case already locked
                 const alreadyStartedTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
                     limit: 1, page: 1,
-                    typeOf: factory_1.factory.transactionType.PlaceOrder,
+                    // typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },
                     status: { $in: [factory_1.factory.transactionStatusType.InProgress] },
                     agent: { identifiers: [{ name: factory_2.AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] },

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -8,10 +8,7 @@ const fixCustomer_1 = require("./updateAgent/fixCustomer");
  */
 function updateAgent(params) {
     return async (repos) => {
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            id: params.id
-        }, ['agent', 'object', 'typeOf', 'project']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.id }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }

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

@@ -4,9 +4,7 @@ exports.createPotentialActions = createPotentialActions;
 const factory_1 = require("../../../factory");
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-async function createPotentialActions(params, 
-// settings: Settings
-setting) {
+async function createPotentialActions(params, setting) {
     const emailMessages = [];
     const returnOrderActions = await Promise.all(params.orders.map(async (order) => {
         let returnOrderParams = params.potentialActions?.returnOrder;

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

@@ -23,10 +23,22 @@ interface IPreStartOperationRepos {
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
 type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+/**
+ * 注文返品開始パラメータ
+ */
+export interface IStartParamsWithoutDetail {
+    project: Pick<factory.project.IProject, 'id' | 'typeOf'>;
+    expiresInSeconds: number;
+    agent: factory.transaction.returnOrder.IAgent;
+    object: {
+        order: [factory.transaction.returnOrder.IReturnableOrder];
+        reason: factory.transaction.returnOrder.Reason;
+    };
+}
 /**
  * 返品取引開始前処理
  */
-declare function preStart(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IPreStartOperation<{
+declare function preStart(params: IStartParamsWithoutDetail): IPreStartOperation<{
     transactionObject: factory.transaction.returnOrder.IObject;
     seller: IFixedSeller;
     expiresInSeconds: number;

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

@@ -13,7 +13,7 @@ import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, ReturnOrderInProgressRepo } from '../../repo/transaction/returnOrderInProgress';
-import { preStart } from './returnOrder/preStart';
+import { preStart, IStartParamsWithoutDetail } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -31,7 +31,7 @@ type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 /**
  * 返品取引開始
  */
-declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
+declare function start(params: IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
 interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
     message: MessageRepo;
@@ -43,7 +43,18 @@ interface IConfirmRepos {
 /**
  * 取引確定
  */
-declare function confirm(params: factory.transaction.returnOrder.IConfirmParams & {
+declare function confirm(params: {
+    /**
+     * 取引ID
+     */
+    id: string;
+    agent: {
+        id: string;
+    };
+    /**
+     * 取引確定後アクション
+     */
+    potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     object: {
         order: {
             dateReturned: Date;

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

@@ -16,16 +16,11 @@ Object.defineProperty(exports, "preStart", { enumerable: true, get: function ()
  */
 function start(params) {
     return async (repos) => {
-        const { transactionObject, expiresInSeconds, seller } = await (0, preStart_1.preStart)(params)(repos);
+        const { transactionObject, expiresInSeconds, seller: _seller } = await (0, preStart_1.preStart)(params)(repos);
         const returnOrderAttributes = {
             project: params.project,
             typeOf: factory_1.factory.transactionType.ReturnOrder,
             agent: params.agent,
-            seller: {
-                id: String(seller.id),
-                typeOf: seller.typeOf,
-                name: seller.name
-            },
             object: transactionObject,
             expiresInSeconds
         };

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

@@ -44,4 +44,4 @@ export declare function exportOneTransactionTasksIfExists(params: {
         endDate?: factory.sortType;
         startDate?: factory.sortType;
     };
-}): IExportTasksOperation<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
+}): IExportTasksOperation<Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'> | undefined>;

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.8",
+    "@chevre/factory": "11.0.0-alpha.1",
     "@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.2"
+  "version": "28.0.0-alpha.4"
 }