@chevre/domain 25.0.0-alpha.10 → 25.0.0-alpha.12

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

@@ -1,7 +1,7 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 import { AcceptedOfferInReserveRepo } from './acceptedOfferInReserve';
-type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
+type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project' | 'broker'> & {
     typeOf: factory.transactionType.PlaceOrder;
     orderDate: Date;
     /**
@@ -10,6 +10,7 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'>
     identifier: string;
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
+    seller?: factory.order.ISeller;
 };
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
@@ -57,6 +58,7 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
 export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
     constructor(connection: Connection);
+    createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する

package/lib/chevre/repo/orderInTransaction.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderInTransactionRepo = void 0;
 // import { isDeepStrictEqual } from 'util';
+const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
@@ -15,6 +16,35 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
     }
+    async createPlaceOrderIfNotExists(params) {
+        const { orderNumber, project, identifier, broker, seller, customer } = params;
+        const setOnInsert = {
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
+            orderDate: new Date(), // orderDate required(2024-12-09~)
+            orderNumber,
+            project,
+            identifier, // 取引ID(2026-06-22~)
+            ...((seller !== undefined) && { seller }),
+            ...((customer !== undefined) && { customer }),
+            ...((broker !== undefined) && { broker })
+        };
+        try {
+            return this.orderModel.updateOne({
+                identifier: { $eq: identifier }, // 取引IDに対してユニークネスを保証する
+            }, { $setOnInsert: setOnInsert }, { upsert: true })
+                .exec();
+        }
+        catch (error) {
+            let throwsError = true;
+            if (await (0, errorHandler_1.isMongoDuplicateError)(error)) {
+                // すでにidentifierが存在する場合ok
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+    }
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する
@@ -59,26 +89,6 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             };
         });
     }
-    // /**
-    //  * 取引進行中の注文からacceptedOffersを検索する
-    //  */
-    // public async findAcceptedOffersByOrderNumber(
-    //     params: { orderNumber: { $eq: string } }
-    // ): Promise<Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>[]> {
-    //     const doc = await this.orderModel.findOne<HydratedDocument<Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>>>(
-    //         {
-    //             orderNumber: { $eq: params.orderNumber.$eq },
-    //             typeOf: { $eq: factory.transactionType.PlaceOrder }
-    //         },
-    //         { acceptedOffers: 1 }
-    //     )
-    //         .lean<Pick<IOrderInTransaction, 'acceptedOffers'>>()
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound('orderInTransaction');
-    //     }
-    //     return doc.acceptedOffers;
-    // }
     /**
      * 注文を受注する
      * typeOf: PlaceOrder -> typeOf: Order

package/lib/chevre/service/transaction/placeOrder/start/factory.d.ts

@@ -13,6 +13,10 @@ type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithout
          */
         clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
     };
+    /**
+     * 注文ドキュメントに保管する代理人
+     */
+    broker?: factory.order.IBroker;
 };
 declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
 export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

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

@@ -1,7 +1,10 @@
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PassportRepo } from '../../../repo/passport';
+import type { ProjectRepo } from '../../../repo/project';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -14,10 +17,13 @@ interface IStartOperationRepos {
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
     placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    project: ProjectRepo;
+    orderNumber: OrderNumberRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 interface IStartOptions {
-    lockPassport: boolean;
+    createOrderDocument: boolean;
 }
 /**
  * 取引開始

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

@@ -4,6 +4,7 @@ exports.start = start;
 const factory_1 = require("../../../factory");
 const factory_2 = require("./start/factory");
 const validateStartRequest_1 = require("./start/validateStartRequest");
+const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 /**
  * 取引開始
  */
@@ -25,7 +26,7 @@ function start(params, options) {
         const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
-        if (options.lockPassport && passport !== undefined) {
+        if (passport !== undefined) {
             try {
                 await repos.passport.lock(passport);
             }
@@ -51,6 +52,28 @@ function start(params, options) {
         if (transaction === undefined) {
             transaction = await repos.placeOrder.startPlaceOrder(startParams);
         }
+        // support createOrderDocument(2026-06-23~)
+        if (options.createOrderDocument) {
+            const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+                project: { id: params.project.id },
+                id: transaction.id,
+                object: { orderDate: new Date() }
+            })(repos);
+            await repos.orderInTransaction.createPlaceOrderIfNotExists({
+                orderNumber,
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                identifier: transaction.id,
+                seller: {
+                    id: seller.id,
+                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
+                    typeOf: seller.typeOf,
+                    additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+                },
+                ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
+                ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
+            });
+            // console.log('createPlaceOrderResult:', createPlaceOrderResult);
+        }
         return transaction;
     };
 }

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

@@ -1,9 +1,8 @@
 /**
  * 注文取引サービス
  */
-import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
 import { confirm } from './placeOrder/confirm';
 import { exportTasksById } from './placeOrder/exportTasksById';
 import { start, IStartPlaceOrderParams } from './placeOrder/start';
 import { updateAgent } from './placeOrder/updateAgent';
-export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, IStartPlaceOrderParams, exportTasksById, updateAgent };
+export { confirm, start, IStartPlaceOrderParams, exportTasksById, updateAgent };

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

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAgent = exports.exportTasksById = exports.start = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = void 0;
+exports.updateAgent = exports.exportTasksById = exports.start = exports.confirm = void 0;
 /**
  * 注文取引サービス
  */
-const order_1 = require("../../factory/order");
-Object.defineProperty(exports, "POINT_AWARD_IDENTIFIER_NAME", { enumerable: true, get: function () { return order_1.POINT_AWARD_IDENTIFIER_NAME; } });
 const confirm_1 = require("./placeOrder/confirm");
 Object.defineProperty(exports, "confirm", { enumerable: true, get: function () { return confirm_1.confirm; } });
 const exportTasksById_1 = require("./placeOrder/exportTasksById");

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

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.10"
+  "version": "25.0.0-alpha.12"
 }

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';