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

package/example/src/chevre/findSetting.ts

@@ -54,8 +54,13 @@ async function main() {
             { project: { id: { $eq: '*' } } },
             {
                 storage: {
-                    transactionCanceledInDays: 180,
-                    transactionConfirmedInDays: 365
+                    transactionCanceledInDays: 7,
+                    transactionConfirmedInDays: 7,
+                    authorizationInDays: 1,
+                    actionInDays: 31,
+                    assetTransactionInDays: 7,
+                    taskInDays: 180,
+                    eventInDays: 365
                 }
             }
         );

package/lib/chevre/repo/mongoose/schemas/order.js

@@ -21,7 +21,6 @@ const schemaDefinition = {
     priceCurrency: String,
     acceptedOffers: [mongoose_1.SchemaTypes.Mixed],
     paymentMethods: [mongoose_1.SchemaTypes.Mixed],
-    // discounts: SchemaTypes.Mixed, // 廃止(2024-04-17~)
     url: String,
     orderStatus: String,
     previousOrderStatus: String,
@@ -29,7 +28,6 @@ const schemaDefinition = {
     isGift: Boolean,
     dateReturned: Date,
     orderedItem: [mongoose_1.SchemaTypes.Mixed] // 追加(2022-04-15~)
-    // additionalProperty: SchemaTypes.Mixed // 廃止(2024-04-17~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -32,6 +32,11 @@ interface IStorageSettings {
      * default:7
      */
     transactionCanceledInDays?: number;
+    authorizationInDays?: number;
+    actionInDays?: number;
+    assetTransactionInDays?: number;
+    taskInDays?: number;
+    eventInDays?: number;
 }
 export interface ISetting {
     defaultSenderEmail?: string;

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

@@ -26,11 +26,13 @@ import type { Connection } from 'mongoose';
 import * as factory from '../factory';
 type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
     typeOf: factory.transactionType.PlaceOrder;
+    orderDate: Date;
     acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     customer?: factory.order.ICustomer;
 };
 export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'identifier' | 'isGift' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'url'> & {
-    customer?: factory.order.ICustomer;
+    acceptedOffers?: never;
+    customer?: never;
 };
 /**
  * 取引中注文リポジトリ

package/lib/chevre/repo/orderInTransaction.js

@@ -10,10 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderInTransactionRepo = void 0;
-const createDebug = require("debug");
 const factory = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
-const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
  * 取引中注文リポジトリ
  */
@@ -41,15 +39,15 @@ class OrderInTransactionRepo {
     /**
      * 注文を受注する
      */
-    placeOrder(
-    // order: Omit<factory.order.IOrder, 'id'>
-    order) {
+    placeOrder(order) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!(order.orderDate instanceof Date)) {
+                throw new factory.errors.Argument('orderDate', 'must be Date');
+            }
             let setFields;
             // acceptedOffersを上書きしない
             // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
             setFields = order;
-            debug('placing an order...', order.orderNumber, 'setFields:', setFields);
             // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
             yield this.orderModel.updateOne({
                 orderNumber: { $eq: order.orderNumber },
@@ -63,15 +61,17 @@ class OrderInTransactionRepo {
             if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
                 return;
             }
+            const setOnInsert = {
+                typeOf: factory.transactionType.PlaceOrder,
+                orderDate: new Date(),
+                orderNumber: params.orderNumber,
+                project: params.project
+            };
             return this.orderModel.updateOne({
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
                 orderNumber: { $eq: params.orderNumber }
             }, {
-                $setOnInsert: {
-                    typeOf: factory.transactionType.PlaceOrder,
-                    orderNumber: params.orderNumber,
-                    project: params.project
-                },
+                $setOnInsert: setOnInsert,
                 $push: {
                     acceptedOffers: {
                         $each: params.acceptedOffers
@@ -81,29 +81,6 @@ class OrderInTransactionRepo {
                 .exec();
         });
     }
-    // 廃止(voidAcceptedOfferBySerialNumberへ機能移行)(2024-01-31~)
-    // public async voidAcceptedOfferByReservationNumber(params: {
-    //     orderNumber: string;
-    //     acceptedOffers: { reservationNumber: { $in: string[] } };
-    // }) {
-    //     return this.orderModel.updateOne(
-    //         {
-    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
-    //             orderNumber: { $eq: params.orderNumber }
-    //         },
-    //         {
-    //             $pull: {
-    //                 acceptedOffers: {
-    //                     'itemOffered.reservationNumber': {
-    //                         $exists: true,
-    //                         $in: params.acceptedOffers.reservationNumber.$in
-    //                     }
-    //                 }
-    //             }
-    //         }
-    //     )
-    //         .exec();
-    // }
     /**
      * serialNumberからオファーを除外する
      * ホワイトリストとブラックリスト両方に対応
@@ -152,6 +129,7 @@ class OrderInTransactionRepo {
             };
             const setOnInsert = {
                 typeOf: factory.transactionType.PlaceOrder,
+                orderDate: new Date(),
                 orderNumber,
                 project
             };

package/lib/chevre/service/order/placeOrder/factory.js

@@ -67,9 +67,6 @@ function createPlacingOrder(params) {
     if (orderByTransaction === undefined) {
         throw new factory.errors.NotFound('transaction.result.order');
     }
-    // const orderedItems: factory.order.IOrderedItem[]
-    //     = (Array.isArray(orderByTransaction.orderedItem)) ? orderByTransaction.orderedItem : [];
-    // const customer = createCustomer({ transaction }); // no overwrite(2024-06-24~)
     const seller = createSeller({ transaction });
     const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
     const broker = (typeof ((_b = transaction.object.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? transaction.object.broker : undefined;
@@ -102,17 +99,7 @@ function createPlacingOrder(params) {
     return Object.assign(Object.assign(Object.assign(Object.assign({}, orderByTransaction), { seller,
         paymentMethods,
         price, orderDate: moment(orderByTransaction.orderDate)
-            .toDate(), 
-        // orderedItem: orderedItems,
-        orderedItem }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined // 2024-06-17~
-    // customer // no overwrite(2024-06-24~)
-    // discontinue(2024-06-17~)
-    // ...(params.dateReturned !== null && params.dateReturned !== undefined)
-    //     ? {
-    //         dateReturned: moment(params.dateReturned)
-    //             .toDate()
-    //     }
-    //     : undefined
+            .toDate(), orderedItem }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined // 2024-06-17~
     );
 }
 exports.createPlacingOrder = createPlacingOrder;

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.0"
+  "version": "22.7.0-alpha.2"
 }