@chevre/domain 21.15.0 → 21.16.0-alpha.1

package/example/src/chevre/migrateOrderPaymentMethodIdentifier.ts

@@ -14,6 +14,8 @@ async function main() {
 
     const cursor = orderRepo.getCursor(
         {
+            'paymentMethods.paymentMethodId': { $exists: true },
+            'paymentMethods.paymentMethod.identifier': { $exists: false },
             // 'project.id': { $eq: project.id },
             // orderNumber: { $eq: 'KNR1-3961294-9087043' },
             orderDate: {
@@ -48,7 +50,8 @@ async function main() {
         const noPayment = order.paymentMethods.length === 0;
         const alreadyMigrated = order.paymentMethods.every((invoice) => {
             return typeof invoice.paymentMethod?.identifier === 'string'
-                && invoice.paymentMethod.identifier === (<any>invoice).typeOf;
+                && invoice.paymentMethod?.identifier.length > 0;
+            // && invoice.paymentMethod.identifier === (<any>invoice).typeOf;
         });
 
         if (noPayment) {

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -10,34 +10,12 @@ async function main() {
 
     let updateResult: any;
 
-    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
-    updateResult = await sellerRepo.unsetUnnecessaryFields({
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+    updateResult = await orderRepo.unsetUnnecessaryFields({
         filter: {
-            // 'project.id': { $eq: PROJECT_ID },
-            typeOf: { $eq: chevre.factory.organizationType.Corporation },
-            areaServed: { $exists: true }
+            'paymentMethods.typeOf': { $exists: true }
         },
-        $unset: { areaServed: 1 }
-    });
-    console.log('unset processed.', updateResult);
-
-    const placeRepo = await chevre.repository.Place.createInstance(mongoose.connection);
-    updateResult = await placeRepo.unsetUnnecessaryFieldsFromMovieTheater({
-        filter: {
-            $and: [
-                { typeOf: { $eq: chevre.factory.placeType.MovieTheater } },
-                {
-                    $or: [
-                        { 'offers.project': { $exists: true } },
-                        { 'offers.priceCurrency': { $exists: true } }
-                    ]
-                }
-            ]
-        },
-        $unset: {
-            'offers.project': 1,
-            'offers.priceCurrency': 1
-        }
+        $unset: { 'paymentMethods.$[].typeOf': 1 }
     });
     console.log('unset processed.', updateResult);
 }

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

@@ -22,8 +22,15 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection = keyof factory.order.IOrder | '_id';
+type IProjection4searchWithUnwoundAcceptedOffer = {
+    [key in keyof Omit<factory.order.IOrder, 'acceptedOffers'>]?: 1;
+} & {
+    _id?: 0 | 1;
+    acceptedOffers?: ['$acceptedOffers'];
+};
 /**
  * 注文リポジトリ
  */
@@ -87,8 +94,8 @@ export declare class MongoRepository {
     }): Promise<void>;
     findById(params: {
         id: string;
-        inclusion: string[];
-        exclusion: string[];
+        inclusion: IKeyOfProjection[];
+        exclusion: IKeyOfProjection[];
     }): Promise<factory.order.IOrder>;
     /**
      * 注文番号から注文を取得する
@@ -101,8 +108,8 @@ export declare class MongoRepository {
         seller?: {
             id?: string;
         };
-        inclusion: string[];
-        exclusion: string[];
+        inclusion: IKeyOfProjection[];
+        exclusion: IKeyOfProjection[];
     }): Promise<factory.order.IOrder>;
     findByOrderNumberAndReservationId(params: {
         project: {
@@ -125,7 +132,7 @@ export declare class MongoRepository {
      * 注文を検索する
      */
     search(params: factory.order.ISearchConditions, projection?: {
-        [key: string]: 0 | 1;
+        [key in IKeyOfProjection]?: 0 | 1;
     }): Promise<factory.order.IOrder[]>;
     /**
      * 注文の受入オファーIDリストを検索する
@@ -134,9 +141,7 @@ export declare class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: {
-        [key: string]: any;
-    }): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
+    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffer): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
         acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered> | factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     }>;
     /**
@@ -167,4 +172,9 @@ export declare class MongoRepository {
         priceSpecification: factory.order.ITicketPriceSpecification;
     }[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<any>;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
+export {};

package/lib/chevre/repo/order.js

@@ -565,7 +565,9 @@ class MongoRepository {
         }
         const paymentMethodsTypeOfIn = (_20 = params.paymentMethods) === null || _20 === void 0 ? void 0 : _20.typeOfs;
         if (Array.isArray(paymentMethodsTypeOfIn)) {
-            andConditions.push({ 'paymentMethods.typeOf': { $exists: true, $in: paymentMethodsTypeOfIn } });
+            // paymentMethod.identifierで検索(2023-11-15~)
+            // andConditions.push({ 'paymentMethods.typeOf': { $exists: true, $in: paymentMethodsTypeOfIn } });
+            andConditions.push({ 'paymentMethods.paymentMethod.identifier': { $exists: true, $in: paymentMethodsTypeOfIn } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -1097,5 +1099,11 @@ class MongoRepository {
             .sort({ orderDate: factory.sortType.Descending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.orderModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.15.0"
+  "version": "21.16.0-alpha.1"
 }