@chevre/domain 21.2.0 → 21.3.0

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

@@ -49,7 +49,7 @@ export declare class MongoRepository {
     /**
      * 販売者検索
      */
-    search(conditions: factory.seller.ISearchConditions, projection?: any): Promise<ISeller[]>;
+    search(conditions: factory.seller.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<ISeller[]>;
     /**
      * 対応決済方法を検索する
      */

package/lib/chevre/repo/seller.js

@@ -189,11 +189,32 @@ class MongoRepository {
     /**
      * 販売者検索
      */
-    search(conditions, projection) {
+    search(conditions, 
+    // inclusion化(2023-07-07~)
+    // projection?: any
+    inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
-            const query = this.organizationModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const query = this.organizationModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
                 query.limit(conditions.limit)

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -81,8 +81,7 @@ function aggregateByEvent(params) {
         }
         const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
             branchCode: { $eq: event.location.branchCode },
-            containedInPlace: { id: { $eq: movieTheaterId } },
-            useScreeningRoomType: settings_1.USE_READ_SCREENING_ROOM_TYPE
+            containedInPlace: { id: { $eq: movieTheaterId } }
         });
         // 予約集計
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({

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

@@ -236,7 +236,7 @@ function searchEventSeatOffers(params) {
                     }
                 },
                 $projection: params.$projection
-            }, settings_1.USE_READ_SCREENING_ROOM_TYPE);
+            });
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
                     project: { id: params.event.project.id },

package/lib/chevre/service/event.js

@@ -21,7 +21,6 @@ const difference = require("lodash.difference");
 const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
-const settings_1 = require("../settings");
 const offer_1 = require("./offer");
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({
@@ -94,7 +93,7 @@ function importFromCOA(params) {
                 limit: 1,
                 page: 1,
                 branchCode: { $eq: params.locationBranchCode }
-            });
+            }, ['_id'], []);
             const seller = sellersWithSameBranchCode.shift();
             if (typeof (seller === null || seller === void 0 ? void 0 : seller.id) !== 'string') {
                 throw new factory.errors.NotFound('Seller', `Seller with branchCod '${params.locationBranchCode}' not found`);
@@ -121,7 +120,7 @@ function importFromCOA(params) {
             }
             const screeningRooms = yield repos.place.searchScreeningRooms({
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
-            }, settings_1.USE_READ_SCREENING_ROOM_TYPE);
+            });
             const targetImportFrom = moment(`${moment(params.importFrom)
                 .tz('Asia/Tokyo')
                 .format('YYYY-MM-DD')}T00:00:00+09:00`);

package/lib/chevre/service/offer.js

@@ -88,7 +88,7 @@ function searchEventSeatOffersWithPaging(params) {
                             branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
-                } }), settings_1.USE_READ_SCREENING_ROOM_TYPE);
+                } }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
                     project: { id: event.project.id },

package/lib/chevre/service/task/onResourceUpdated.js

@@ -261,7 +261,7 @@ function createInformMovieTheaterTasks(params) {
         // ルームを検索
         const screeningRooms = yield repos.place.searchScreeningRooms({
             containedInPlace: { id: { $eq: movieTheater.id } }
-        }, settings_1.USE_READ_SCREENING_ROOM_TYPE);
+        });
         const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
                     return {
                         branchCode: room.branchCode,

package/lib/chevre/service/task/syncScreeningRooms.js

@@ -11,14 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const place_1 = require("../../repo/place");
-const settings_1 = require("../../settings");
 /**
  * タスク実行関数
  */
 function call(data) {
     return (connectionSettings) => __awaiter(this, void 0, void 0, function* () {
         const placeRepo = new place_1.MongoRepository(connectionSettings.connection);
-        yield placeRepo.syncScreeningRooms({ id: data.id, useScreeningRoomType: settings_1.USE_WRITE_SCREENING_ROOM_TYPE });
+        yield placeRepo.syncScreeningRooms({ id: data.id });
     });
 }
 exports.call = call;

package/lib/chevre/settings.d.ts

@@ -41,8 +41,6 @@ export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_NEW_STOCK_HOLDER_REPO_FROM: moment.Moment;
 export declare const USE_NEW_STOCK_HOLDER_REPO_IDS: string[];
-export declare const USE_READ_SCREENING_ROOM_TYPE: boolean;
-export declare const USE_WRITE_SCREENING_ROOM_TYPE: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_WRITE_SCREENING_ROOM_TYPE = exports.USE_READ_SCREENING_ROOM_TYPE = exports.USE_NEW_STOCK_HOLDER_REPO_IDS = exports.USE_NEW_STOCK_HOLDER_REPO_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_STOCK_HOLDER_REPO_IDS = exports.USE_NEW_STOCK_HOLDER_REPO_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -71,8 +71,6 @@ exports.USE_NEW_STOCK_HOLDER_REPO_FROM = (typeof process.env.USE_NEW_STOCK_HOLDE
 exports.USE_NEW_STOCK_HOLDER_REPO_IDS = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_IDS === 'string')
     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
     : [];
-exports.USE_READ_SCREENING_ROOM_TYPE = process.env.USE_READ_SCREENING_ROOM_TYPE === '1';
-exports.USE_WRITE_SCREENING_ROOM_TYPE = process.env.USE_WRITE_SCREENING_ROOM_TYPE === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

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.2.0"
+  "version": "21.3.0"
 }