@chevre/domain 21.13.0-alpha.13 → 21.13.0-alpha.14

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

@@ -77,11 +77,28 @@ interface IStatus {
 export interface IAggregateEvent {
     statuses: IStatus[];
 }
-interface IProjection {
-    [key: string]: number;
-}
+type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> & '_id';
+type IProjection<T extends factory.eventType> = {
+    [key in IKeyOfProjection<T>]?: 0 | 1;
+};
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-export declare const PROJECTION_MINIMIZED_EVENT: IProjection;
+export declare const PROJECTION_MINIMIZED_EVENT: {
+    project: number;
+    organizer: number;
+    _id: number;
+    typeOf: number;
+    additionalProperty: number;
+    name: number;
+    doorTime: number;
+    endDate: number;
+    eventStatus: number;
+    location: number;
+    startDate: number;
+    superEvent: number;
+    offers: number;
+    coaInfo: number;
+    identifier: number;
+};
 /**
  * イベントリポジトリ
  */
@@ -133,13 +150,13 @@ export declare class MongoRepository {
     save<T extends factory.eventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection;
+        $unset?: IProjection<T>;
         upsert?: boolean;
     }): Promise<factory.event.IEvent<T>>;
     saveMany<T extends factory.eventType>(params: {
         id: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection;
+        $unset?: IProjection<T>;
         upsert: boolean;
     }[]): Promise<void>;
     save4ttts(params: {
@@ -149,7 +166,7 @@ export declare class MongoRepository {
     /**
      * イベントを検索する
      */
-    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection): Promise<factory.event.IEvent<T>[]>;
+    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection<T>): Promise<factory.event.IEvent<T>[]>;
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
     findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;

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

@@ -26,7 +26,9 @@ import type { AnyExpression, Connection } 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 IKeyOfSearchSeatsProjection = 'typeOf' | 'branchCode' | 'name' | 'seatingType' | 'additionalProperty' | 'containedInPlace.containedInPlace';
+export type IMovieTheaterIncludingScreeningRooms = factory.place.movieTheater.IPlace & {
+    containsPlace: factory.place.screeningRoom.IPlace[];
+};
 /**
  * 施設リポジトリ
  */
@@ -35,20 +37,18 @@ export declare class MongoRepository {
     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_SEARCH_SEATS_PROJECTION(params: {
-        [key in IKeyOfSearchSeatsProjection]?: 0;
-    }): {
+    static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): {
         [field: string]: AnyExpression;
     };
     /**
      * 施設を保管する
      */
-    saveMovieTheater(params: factory.place.movieTheater.IPlaceWithoutScreeningRoom): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom>;
-    saveMovieTheaterByBranchCode4coa(params: factory.place.movieTheater.IPlace): Promise<void>;
+    saveMovieTheater(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
+    saveMovieTheaterByBranchCode4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
     /**
      * 施設検索
      */
-    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions & {}, inclusion: (keyof factory.place.movieTheater.IPlaceWithoutScreeningRoom | '_id' | 'url')[], exclusion: string[]): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom[]>;
+    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions, inclusion: (keyof factory.place.movieTheater.IPlace | '_id' | 'url')[], exclusion: string[]): Promise<factory.place.movieTheater.IPlace[]>;
     deleteMovieTheaterById(params: {
         project: {
             id: string;
@@ -162,11 +162,7 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions & {
-        $projection?: {
-            [key: string]: number;
-        };
-    }): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
+    searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
     deleteScreeningRoomSection(screeningRoomSection: {
         project: {
             id: string;
@@ -248,11 +244,7 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    searchSeats(params: Omit<factory.place.seat.ISearchConditions, '$projection'> & {
-        $projection: {
-            [key in IKeyOfSearchSeatsProjection]?: 0;
-        };
-    }): Promise<factory.place.seat.IPlace[]>;
+    searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;
     deleteSeat(seat: {
         project: {
             id: string;

package/lib/chevre/service/offer.d.ts

@@ -1,5 +1,5 @@
 import type { MongoRepository as EventRepo } from '../repo/event';
-import type { IKeyOfSearchSeatsProjection, MongoRepository as PlaceRepo } from '../repo/place';
+import type { MongoRepository as PlaceRepo } from '../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../repo/priceSpecification';
 import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { StockHolderRepository as StockHolderRepo } from '../repo/stockHolder';
@@ -38,9 +38,7 @@ export declare function searchEventSeatOffersWithPaging(params: {
     event: {
         id: string;
     };
-    $projection?: {
-        [key in IKeyOfSearchSeatsProjection]?: 0;
-    };
+    $projection?: factory.place.seat.IProjection;
 }): (repos: {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;

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

@@ -32,6 +32,8 @@ function onResourceDeleted(params) {
                 }
             }
             switch (params.typeOf) {
+                case 'POS':
+                    break;
                 case factory.eventType.ScreeningEventSeries:
                     yield deleteResourcesByScreeningEventSeries({
                         project: { id: params.project.id },

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -87,19 +87,12 @@ function createPaymentMethods(params) {
         const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
             { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
             : undefined);
-        paymentMethods.push({
-            accountId: resultAsInvoice.accountId,
-            additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [],
-            issuedThrough: resultAsInvoice.issuedThrough,
-            name: resultAsInvoice.name,
-            paymentMethodId: resultAsInvoice.paymentMethodId,
-            paymentStatus: resultAsInvoice.paymentStatus,
-            totalPaymentDue: resultAsInvoice.totalPaymentDue,
-            typeOf: paymentMethodType,
+        paymentMethods.push(Object.assign({ accountId: resultAsInvoice.accountId, additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [], issuedThrough: resultAsInvoice.issuedThrough, name: resultAsInvoice.name, paymentMethodId: resultAsInvoice.paymentMethodId, paymentStatus: resultAsInvoice.paymentStatus, totalPaymentDue: resultAsInvoice.totalPaymentDue, 
             // CreditCardIFのカード通貨区分を追加(2023-08-15~)
             // 決済方法区分を保証(2023-08-28~)
-            paymentMethod: paymentMethodOfInvoice
-        });
+            paymentMethod: paymentMethodOfInvoice }, {
+            typeOf: paymentMethodType // IFとして廃止だが、互換性維持対応として(2023-10-30~)
+        }));
     });
     // 決済方法から注文金額の計算
     price += authorizePaymentActions

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.336.0",
-    "@cinerino/sdk": "4.0.0-alpha.1",
+    "@chevre/factory": "4.337.0",
+    "@cinerino/sdk": "5.0.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -82,6 +82,7 @@
     "npm": ">=6.0.0"
   },
   "keywords": [],
+  "license": "UNLICENSED",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
@@ -116,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.13.0-alpha.13"
+  "version": "21.13.0-alpha.14"
 }