@chevre/domain 21.15.0-alpha.7 → 21.15.0-alpha.9

package/example/src/chevre/searchCategoryCodesByAggregate.ts

@@ -20,10 +20,10 @@ async function main() {
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
         },
-        [],
-        ['project', 'additionalProperty', 'typeOf']
+        ['_id'],
+        []
     );
-    console.log('categoryCodes found', categoryCodes);
+    console.log('categoryCodes found', categoryCodes[0]);
     console.log(categoryCodes.length, 'categoryCodes found');
 }
 

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

@@ -32,7 +32,7 @@ export declare class MongoRepository {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
-    static CREATE_AGGREGATE_PROJECTION(inclusion: string[], exclusion: IKeyOfProjection[]): {
+    static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): {
         [field: string]: AnyExpression;
     };
     /**

package/lib/chevre/repo/categoryCode.js

@@ -152,7 +152,7 @@ class MongoRepository {
         return andConditions;
     }
     static CREATE_AGGREGATE_PROJECTION(inclusion, exclusion) {
-        const projectStage = {
+        let projectStage = {
             _id: 0,
             id: { $toString: '$_id' },
             project: '$project',
@@ -166,7 +166,17 @@ class MongoRepository {
             paymentMethod: '$paymentMethod'
         };
         if (inclusion.length > 0) {
-            // no op
+            projectStage = { _id: 0 };
+            inclusion.forEach((field) => {
+                switch (field) {
+                    case '_id':
+                    case 'id':
+                        projectStage.id = { $toString: '$_id' };
+                        break;
+                    default:
+                        projectStage[field] = `$${field}`;
+                }
+            });
         }
         else if (exclusion.length > 0) {
             exclusion.forEach((field) => {

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

@@ -22,21 +22,22 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { AnyExpression, Connection } from 'mongoose';
+import type { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
 export type IMovieTheaterIncludingScreeningRooms = factory.place.movieTheater.IPlace & {
     containsPlace: factory.place.screeningRoom.IPlace[];
 };
+type IKeyOfProjectionMovieTheater = keyof factory.place.movieTheater.IPlace | '_id';
 /**
  * 施設リポジトリ
  */
 export declare class MongoRepository {
     private readonly placeModel;
     constructor(connection: Connection);
-    static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): any[];
-    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): any[];
+    static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): FilterQuery<import("@chevre/factory/lib/place/busStop").IPlace>[];
+    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<import("@chevre/factory/lib/place/movieTheater").IPlace>[];
     static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): {
         [field: string]: AnyExpression;
     };
@@ -48,7 +49,7 @@ export declare class MongoRepository {
     /**
      * 施設検索
      */
-    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions, inclusion: (keyof factory.place.movieTheater.IPlace | '_id' | 'url')[], exclusion: string[]): Promise<factory.place.movieTheater.IPlace[]>;
+    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions, inclusion: IKeyOfProjectionMovieTheater[], exclusion: IKeyOfProjectionMovieTheater[]): Promise<factory.place.movieTheater.IPlace[]>;
     deleteMovieTheaterById(params: {
         project: {
             id: string;
@@ -284,7 +285,7 @@ export declare class MongoRepository {
         typeOf: factory.placeType.ScreeningRoom;
     }>;
     unsetUnnecessaryFieldsFromMovieTheater(params: {
-        filter: any;
+        filter: FilterQuery<any>;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
     deleteManyByParentOrganizationId(params: {
@@ -320,6 +321,6 @@ export declare class MongoRepository {
         };
         id: string;
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }
 export {};

package/lib/chevre/repo/place.js

@@ -24,7 +24,6 @@ exports.MongoRepository = void 0;
 const place_1 = require("./mongoose/schemas/place");
 const factory = require("../factory");
 const settings_1 = require("../settings");
-// const debug = createDebug('chevre-domain:repo:place');
 /**
  * 施設リポジトリ
  */
@@ -210,17 +209,17 @@ class MongoRepository {
         return andConditions;
     }
     static CREATE_SEARCH_SEATS_PROJECTION(params) {
-        let includeScreeningRooms = true;
-        if (params['containedInPlace.containedInPlace'] === 0) {
-            includeScreeningRooms = false;
-        }
+        const includeSectionBranchCode = params['containedInPlace.branchCode'] !== 0;
+        const includeSectionName = params['containedInPlace.name'] !== 0;
+        const includeSectionTypeOf = params['containedInPlace.typeOf'] !== 0;
+        const includeScreeningRooms = params['containedInPlace.containedInPlace'] !== 0;
         const projectStage = {
             _id: 0,
             typeOf: '$containsPlace.containsPlace.typeOf',
             branchCode: '$containsPlace.containsPlace.branchCode',
             name: '$containsPlace.containsPlace.name',
             seatingType: '$containsPlace.containsPlace.seatingType',
-            containedInPlace: Object.assign({ typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name' }, (includeScreeningRooms)
+            containedInPlace: Object.assign(Object.assign(Object.assign(Object.assign({}, (includeSectionBranchCode) ? { branchCode: '$containsPlace.branchCode' } : undefined), (includeSectionName) ? { name: '$containsPlace.name' } : undefined), (includeSectionTypeOf) ? { typeOf: '$containsPlace.typeOf' } : undefined), (includeScreeningRooms)
                 ? {
                     containedInPlace: {
                         typeOf: '$typeOf',
@@ -333,9 +332,7 @@ class MongoRepository {
     /**
      * 施設検索
      */
-    searchMovieTheaters(params, 
-    // projection明示指定化(2023-06-22~)
-    inclusion, exclusion) {
+    searchMovieTheaters(params, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);

package/lib/chevre/service/offer.js

@@ -46,11 +46,11 @@ function addOffers2Seat(params) {
     if (typeof params.availability === 'string') {
         availability = params.availability;
     }
-    return Object.assign(Object.assign({}, params.seat), { offers: [{
-                typeOf: factory.offerType.Offer,
-                availability,
-                priceSpecification
-            }] });
+    return Object.assign(Object.assign({}, params.seat), { offers: [Object.assign({ 
+                // typeOf: factory.offerType.Offer, // optimize(2023-11-08~)
+                availability }, (priceSpecification.priceComponent.length > 0)
+                ? { priceSpecification } // priceComponentの存在する場合のみ追加(2023-11-08~)
+                : undefined)] });
 }
 exports.addOffers2Seat = addOffers2Seat;
 /**

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.338.0",
-    "@cinerino/sdk": "5.0.0-alpha.6",
+    "@chevre/factory": "4.339.0",
+    "@cinerino/sdk": "5.0.0-alpha.11",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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-alpha.7"
+  "version": "21.15.0-alpha.9"
 }