@chevre/domain 22.6.0-alpha.21 → 22.6.0-alpha.23

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -1,33 +1,51 @@
 // tslint:disable:no-console
-import * as moment from 'moment';
+// import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
-const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
+// const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const aggregateOfferRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
+    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+    const offerCatalogItemRepo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await eventRepo.unsetUnnecessaryFields({
+    updateResult = await aggregateOfferRepo.unsetUnnecessaryFields({
         filter: {
-            'project.id': { $ne: excludedProject.id },
-            'offers.validFrom': { $exists: true },
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'days')
-                    .toDate()
-            }
-            // _id: { $eq: 'blxd1grz3' }
+            _id: { $exists: true }
         },
         $unset: <any>{
-            'offers.availabilityEnds': 1,
-            'offers.availabilityStarts': 1,
-            'offers.validFrom': 1,
-            'offers.validThrough': 1
+            createdAt: 1,
+            updatedAt: 1,
+            __v: 1
+        }
+    });
+    console.log(updateResult);
+
+    updateResult = await offerCatalogRepo.unsetUnnecessaryFields({
+        filter: {
+            _id: { $exists: true }
+        },
+        $unset: <any>{
+            createdAt: 1,
+            updatedAt: 1,
+            __v: 1
+        }
+    });
+    console.log(updateResult);
+
+    updateResult = await offerCatalogItemRepo.unsetUnnecessaryFields({
+        filter: {
+            _id: { $exists: true }
+        },
+        $unset: <any>{
+            createdAt: 1,
+            updatedAt: 1,
+            __v: 1
         }
     });
     console.log(updateResult);

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

@@ -294,11 +294,6 @@ export declare class EventRepo {
             };
         };
     }): Promise<import("mongodb").DeleteResult>;
-    /**
-     * 旧施設コンテンツ廃止専用メソッド
-     * 2024-09-11~
-     */
-    deleteOldEventSeries(): Promise<import("mongodb").DeleteResult>;
     deleteManyEventsEndedByProject(params: {
         typeOf: {
             $in: AvailableEventType[];

package/lib/chevre/repo/event.js

@@ -934,32 +934,6 @@ class EventRepo {
                 .exec();
         });
     }
-    /**
-     * 旧施設コンテンツ廃止専用メソッド
-     * 2024-09-11~
-     */
-    deleteOldEventSeries() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.eventModel.deleteMany({
-                typeOf: { $eq: factory.eventType.ScreeningEventSeries }
-            })
-                .exec();
-        });
-    }
-    // public async deleteManyEndedByIds(params: {
-    //     typeOf: { $in: factory.eventType[] };
-    //     project: { id: string };
-    //     ids: string[];
-    //     endDate: { $lte: Date };
-    // }) {
-    //     return this.eventModel.deleteMany({
-    //         typeOf: { $in: params.typeOf.$in },
-    //         'project.id': { $eq: params.project.id },
-    //         _id: { $in: params.ids },
-    //         endDate: { $lte: params.endDate.$lte }
-    //     })
-    //         .exec();
-    // }
     deleteManyEventsEndedByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({

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

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, Document } from 'mongoose';
+import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import { IDocType } from './mongoose/schemas/offerCatalog';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
@@ -170,5 +170,9 @@ export declare class OfferCatalogRepo {
     } & Required<{
         _id: string;
     }>>>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.offerCatalog.IOfferCatalog>;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

package/lib/chevre/repo/offerCatalog.js

@@ -471,5 +471,11 @@ class OfferCatalogRepo {
             .sort({ identifier: factory.sortType.Descending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.offerCatalogModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.OfferCatalogRepo = OfferCatalogRepo;

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

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import { Connection } from 'mongoose';
+import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'relatedOffer'> & {
     numberOfItems?: number;
@@ -118,5 +118,9 @@ export declare class OfferCatalogItemRepo {
             };
         };
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.offerCatalog.IOfferCatalog>;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

package/lib/chevre/repo/offerCatalogItem.js

@@ -392,5 +392,11 @@ class OfferCatalogItemRepo {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.offerCatalogItemModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.OfferCatalogItemRepo = OfferCatalogItemRepo;

package/lib/chevre/repo/place/movieTheater.d.ts

@@ -35,7 +35,6 @@ type IKeyOfProjection = keyof factory.place.movieTheater.IPlace;
  */
 export declare class MovieTheaterRepo {
     private readonly civicStructureModel;
-    private readonly placeModel;
     constructor(connection: Connection);
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<import("@chevre/factory/lib/place/movieTheater").IPlace>[];
     /**
@@ -96,10 +95,5 @@ export declare class MovieTheaterRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
-    /**
-     * 旧施設廃止専用メソッド
-     * 2024-09-17~
-     */
-    deleteOldMovieTheaters(): Promise<import("mongodb").DeleteResult>;
 }
 export {};

package/lib/chevre/repo/place/movieTheater.js

@@ -24,7 +24,6 @@ exports.MovieTheaterRepo = void 0;
 const factory = require("../../factory");
 const settings_1 = require("../../settings");
 const civicStructure_1 = require("../mongoose/schemas/civicStructure");
-const place_1 = require("../mongoose/schemas/place");
 const AVAILABLE_PROJECT_FIELDS = [
     'additionalProperty', 'branchCode', 'hasEntranceGate', 'kanaName', 'name',
     'offers', 'parentOrganization', 'project', 'telephone', 'typeOf', 'url'
@@ -35,7 +34,6 @@ const AVAILABLE_PROJECT_FIELDS = [
 class MovieTheaterRepo {
     constructor(connection) {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
-        this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params) {
@@ -252,17 +250,5 @@ class MovieTheaterRepo {
                 .exec();
         });
     }
-    /**
-     * 旧施設廃止専用メソッド
-     * 2024-09-17~
-     */
-    deleteOldMovieTheaters() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.deleteMany({
-                typeOf: { $eq: factory.placeType.MovieTheater }
-            })
-                .exec();
-        });
-    }
 }
 exports.MovieTheaterRepo = MovieTheaterRepo;

package/lib/chevre/service/reserve/checkInReservation.js

@@ -45,12 +45,12 @@ function checkInReservation(params) {
             }
             yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
             // support useNotificationCheckedInAsPackage(2024-11-06~)
-            if (!settings.useNotificationCheckedInAsPackage) {
-                // 予約番号リストを予約IDリストに変換
-                checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
-                    reservationNumber: { $in: params.object.reservationNumbers }
-                });
-            }
+            // if (!settings.useNotificationCheckedInAsPackage) {
+            //     // 予約番号リストを予約IDリストに変換
+            //     checkedInReservationIds = await repos.reservation.searchIdsByReservationNumber({
+            //         reservationNumber: { $in: params.object.reservationNumbers }
+            //     });
+            // }
         }
         if (Array.isArray(checkedInReservationIds)) {
             yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({

package/lib/chevre/settings.d.ts

@@ -81,7 +81,6 @@ interface IOptions {
     };
     useAssetTransactionSyncProcessing: boolean;
     useExperimentalFeature: boolean;
-    useNotificationCheckedInAsPackage?: boolean;
     useNotificationUseAction?: boolean;
     notification: IWebhookSettings;
 }
@@ -141,7 +140,6 @@ declare class Settings {
     };
     readonly useAssetTransactionSyncProcessing: boolean;
     readonly useExperimentalFeature: boolean;
-    readonly useNotificationCheckedInAsPackage: boolean;
     readonly useNotificationUseAction: boolean;
     /**
      * 通知設定

package/lib/chevre/settings.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  */
 class Settings {
     constructor(options) {
-        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, useNotificationCheckedInAsPackage, useNotificationUseAction, notification } = options;
+        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, useNotificationUseAction, notification } = options;
         this.onEventChanged = onEventChanged;
         this.onOrderStatusChanged = onOrderStatusChanged;
         this.onResourceUpdated = onResourceUpdated;
@@ -25,7 +25,6 @@ class Settings {
         this.movieticketReserve = movieticketReserve;
         this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
         this.useExperimentalFeature = useExperimentalFeature;
-        this.useNotificationCheckedInAsPackage = useNotificationCheckedInAsPackage === true;
         this.useNotificationUseAction = useNotificationUseAction === true;
         this.notification = notification;
     }

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.6.0-alpha.21"
+  "version": "22.6.0-alpha.23"
 }