@chevre/domain 24.0.0-alpha.3 → 24.0.0-alpha.30

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

@@ -13,7 +13,7 @@ import type { SellerRepo } from '../../repo/seller';
 import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
+import type { IStartedTransaction, ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 import { preStart } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
@@ -26,18 +26,27 @@ interface IStartOperationRepos {
     reservation: ReservationRepo;
     seller: SellerRepo;
     sellerReturnPolicy: SellerReturnPolicyRepo;
-    transaction: TransactionRepo;
+    returnOrder: ReturnOrderRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-type ITaskAndTransactionOperation<T> = (repos: {
+interface IExportTasksByIdRepos {
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
-}) => Promise<T>;
+    returnOrder: ReturnOrderRepo;
+}
+type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise<T>;
 /**
  * 返品取引開始
  */
 declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
+interface IConfirmRepos {
+    acceptedOffer: AcceptedOfferRepo;
+    emailMessage?: EmailMessageRepo;
+    message: MessageRepo;
+    order: OrderRepo;
+    setting: SettingRepo;
+    returnOrder: ReturnOrderRepo;
+}
 /**
  * 取引確定
  */
@@ -47,14 +56,7 @@ declare function confirm(params: factory.transaction.returnOrder.IConfirmParams
             dateReturned: Date;
         };
     };
-}): (repos: {
-    acceptedOffer: AcceptedOfferRepo;
-    emailMessage?: EmailMessageRepo;
-    message: MessageRepo;
-    order: OrderRepo;
-    setting: SettingRepo;
-    transaction: TransactionRepo;
-}) => Promise<import("@chevre/factory/lib/transaction/returnOrder").IResult | undefined>;
+}): (repos: IConfirmRepos) => Promise<import("@chevre/factory/lib/transaction/returnOrder").IResult | undefined>;
 /**
  * 取引のタスクを出力します
  * 複数タスクが生成されます
@@ -67,4 +69,4 @@ declare function exportTasksById(params: {
      */
     runsTasksAfterInSeconds?: number;
 }): ITaskAndTransactionOperation<void>;
-export { preStart, start, confirm, exportTasksById };
+export { IStartOperationRepos, IConfirmRepos, IExportTasksByIdRepos, preStart, start, confirm, exportTasksById };

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

@@ -60,7 +60,7 @@ function start(params) {
         };
         let returnOrderTransaction;
         try {
-            returnOrderTransaction = await repos.transaction.start(returnOrderAttributes);
+            returnOrderTransaction = await repos.returnOrder.startReturnOrder(returnOrderAttributes);
         }
         catch (error) {
             if (await (0, errorHandler_1.isMongoError)(error)) {
@@ -108,7 +108,7 @@ function confirm(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
+        const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
             return transaction.result;
@@ -169,7 +169,7 @@ function confirm(params) {
             order: { orderNumber: returningOrders[0].orderNumber }, seller: { id: returningOrders[0].seller.id }, emailMessages
         })(repos);
         // ステータス変更
-        await repos.transaction.confirm({
+        await repos.returnOrder.confirmReturnOrder({
             typeOf: transaction.typeOf,
             id: transaction.id,
             result, potentialActions
@@ -186,7 +186,7 @@ function exportTasksById(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
+        const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {

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

@@ -1,10 +1,13 @@
+/**
+ * 取引サービス
+ */
 import * as factory from '../factory';
-import type { OrderInTransactionRepo } from '../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../repo/orderNumber';
-import type { ProjectRepo } from '../repo/project';
 import type { SettingRepo } from '../repo/setting';
 import type { TaskRepo } from '../repo/task';
 import type { TransactionRepo } from '../repo/transaction';
+import type { PlaceOrderRepo } from '../repo/transaction/placeOrder';
+import type { ReturnOrderRepo } from '../repo/transaction/returnOrder';
+import type { MoneyTransferRepo } from '../repo/transaction/moneyTransfer';
 import { deleteTransaction } from './transaction/deleteTransaction';
 import * as MoneyTransferTransactionService from './transaction/moneyTransfer';
 import * as PlaceOrderTransactionService from './transaction/placeOrder';
@@ -16,27 +19,12 @@ export import moneyTransfer = MoneyTransferTransactionService;
 export import placeOrder = PlaceOrderTransactionService;
 export import returnOrder = ReturnOrderTransactionService;
 export { deleteTransaction };
-/**
- * 取引人プロフィール更新
- */
-export declare function updateAgent(params: {
-    typeOf: factory.transactionType;
-    /**
-     * 取引ID
-     */
-    id: string;
-    agent: factory.order.ICustomer & {
-        telephoneRegion?: string;
-    };
-}): (repos: {
-    orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
-    transaction: TransactionRepo;
-}) => Promise<void>;
 export type IExportTasksOperation<T> = (repos: {
     setting: SettingRepo;
     task: TaskRepo;
+    placeOrder: PlaceOrderRepo;
+    returnOrder: ReturnOrderRepo;
+    moneyTransfer: MoneyTransferRepo;
     transaction: TransactionRepo;
 }) => Promise<T>;
 export declare function exportOneTransactionTasksIfExists(params: {

package/lib/chevre/service/transaction.js

@@ -1,4 +1,8 @@
 "use strict";
+/**
+ * 取引サービス
+ */
+// import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -24,127 +28,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteTransaction = exports.returnOrder = exports.placeOrder = exports.moneyTransfer = void 0;
-exports.updateAgent = updateAgent;
 exports.exportOneTransactionTasksIfExists = exportOneTransactionTasksIfExists;
-/**
- * 取引サービス
- */
-const google_libphonenumber_1 = require("google-libphonenumber");
 const factory = __importStar(require("../factory"));
 const deleteTransaction_1 = require("./transaction/deleteTransaction");
 Object.defineProperty(exports, "deleteTransaction", { enumerable: true, get: function () { return deleteTransaction_1.deleteTransaction; } });
 const MoneyTransferTransactionService = __importStar(require("./transaction/moneyTransfer"));
 const PlaceOrderTransactionService = __importStar(require("./transaction/placeOrder"));
-const publishOrderNumberIfNotExist_1 = require("./transaction/placeOrder/publishOrderNumberIfNotExist");
+// import { issueOrderNumberIfNotExist } from './transaction/placeOrder/issueOrderNumberIfNotExist';
 const ReturnOrderTransactionService = __importStar(require("./transaction/returnOrder"));
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
 exports.returnOrder = ReturnOrderTransactionService;
-function fixCustomer(params) {
-    return async (repos) => {
-        let formattedTelephone;
-        try {
-            const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-            const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
-            if (!phoneUtil.isValidNumber(phoneNumber)) {
-                throw new factory.errors.Argument('telephone', 'Invalid phone number');
-            }
-            formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
-        }
-        catch (error) {
-            throw new factory.errors.Argument('telephone', error.message);
-        }
-        const transaction = await repos.transaction.projectFieldsInProgressById({
-            typeOf: params.typeOf,
-            id: params.id
-        }, ['agent', 'object', 'typeOf', 'project']);
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        // 注文取引の場合、object.customerにも適用
-        let customer;
-        if (transaction.typeOf === factory.transactionType.PlaceOrder) {
-            // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
-            const trasactionObject = transaction.object;
-            if (typeof trasactionObject.customer?.typeOf === 'string') {
-                customer = {
-                    typeOf: trasactionObject.customer.typeOf,
-                    id: trasactionObject.customer.id,
-                    ...(Array.isArray(trasactionObject.customer.identifier))
-                        ? { identifier: trasactionObject.customer.identifier }
-                        : /* istanbul ignore next */ undefined,
-                    // discontinue(2024-05-16~)
-                    // ...(transaction.object.customer.typeOf === factory.personType.Person
-                    //     && typeof transaction.object.customer.memberOf?.typeOf === 'string')
-                    //     ? { memberOf: transaction.object.customer.memberOf }
-                    //     : undefined,
-                    ...(Array.isArray(params.agent.additionalProperty))
-                        ? { additionalProperty: params.agent.additionalProperty }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.age === 'string') ? { age: params.agent.age }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.address === 'string') ? { address: params.agent.address }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.email === 'string') ? { email: params.agent.email }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.gender === 'string') ? { gender: params.agent.gender }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.name === 'string') ? { name: params.agent.name } : /* istanbul ignore next */ undefined,
-                    ...(typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.url === 'string') ? { url: params.agent.url } : /* istanbul ignore next */ undefined
-                };
-            }
-        }
-        return { customer, transaction };
-    };
-}
-/**
- * 取引人プロフィール更新
- */
-function updateAgent(params) {
-    return async (repos) => {
-        const { customer, transaction } = await fixCustomer(params)(repos);
-        // const newAgent: Pick<factory.transaction.placeOrder.IAgent, 'id'> = {
-        //     id: transaction.agent.id
-        // };
-        // discontinue saving in transaction(2024-06-24~)
-        // await repos.transaction.updateAgent({
-        //     typeOf: params.typeOf,
-        //     id: params.id,
-        //     agent: newAgent,
-        //     ...(customer !== undefined) ? { object: { customer } } : undefined
-        // });
-        // also save in orderInTransaction(2024-06-20~)
-        if (customer !== undefined) {
-            const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
-                project: { id: transaction.project.id },
-                id: params.id,
-                object: { orderDate: new Date() }
-            })(repos);
-            const customerName = (typeof customer.name === 'string' && customer.name !== '')
-                ? customer.name
-                : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'
-                    && customer.givenName !== '' && customer.familyName !== '')
-                    ? `${customer.givenName} ${customer.familyName}`
-                    : undefined;
-            const customerInOrder = {
-                ...customer,
-                identifier: (Array.isArray(customer.identifier)) ? customer.identifier : [],
-                ...(typeof customerName === 'string') ? { name: customerName } : undefined
-            };
-            await repos.orderInTransaction.setCustomer({
-                orderNumber,
-                project: transaction.project,
-                customer: customerInOrder
-            });
-        }
-        // return newAgent;
-    };
-}
 function exportOneTransactionTasksIfExists(params) {
     return async (repos) => {
         const transaction = await repos.transaction.startExportTasks({

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.31",
-    "@cinerino/sdk": "13.0.0",
+    "@chevre/factory": "5.4.0-alpha.32",
+    "@cinerino/sdk": "13.1.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -41,12 +41,9 @@
     "@types/json2csv": "^4.5.1",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.difference": "^4.5.6",
-    "@types/mocha": "10.0.7",
     "@types/moment-timezone": "^0.5.30",
     "@types/node": "22.19.7",
     "@types/pug": "2.0.10",
-    "@types/sinon": "^4.3.3",
-    "@types/sinon-mongoose": "^1.3.11",
     "@types/uniqid": "^4.1.3",
     "@types/uuid": "^3.4.10",
     "@vitest/coverage-v8": "4.0.18",
@@ -57,18 +54,16 @@
     "googleapis": "^85.0.0",
     "jose": "6.0.12",
     "json2csv": "4.5.4",
-    "mongoose": "8.0.4",
+    "mongoose": "8.23.0",
     "redis": "4.6.5",
     "rimraf": "^2.7.1",
-    "sinon": "4.5.0",
-    "sinon-mongoose": "^2.3.0",
     "size-limit": "12.0.0",
     "typescript": "5.6.3",
     "typescript-eslint": "8.55.0",
     "vitest": "4.0.18"
   },
   "peerDependencies": {
-    "mongoose": "^8.0.0",
+    "mongoose": "^8.23.0",
     "redis": "^4.6.5"
   },
   "engines": {
@@ -104,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.3"
+  "version": "24.0.0-alpha.30"
 }