@chevre/factory 4.281.0-alpha.3 → 4.281.0-alpha.5

package/lib/event/anyEvent.d.ts

@@ -12,7 +12,7 @@ import * as ReservationFactory from '../reservation';
 import { ReservationType } from '../reservationType';
 import * as WebAPIFactory from '../service/webAPI';
 import { IThing } from '../thing';
-import { ITrip as IBusTrip } from '../trip/busTrip';
+import { ITripWithDetails as IBusTrip } from '../trip/busTrip';
 import { UnitCode } from '../unitCode';
 /**
  * 予約集計

package/lib/index.d.ts

@@ -82,6 +82,7 @@ import { PaymentStatusType } from './paymentStatusType';
 import * as PermitFactory from './permit';
 import * as PersonFactory from './person';
 import { PersonType } from './personType';
+import * as BusStopFactory from './place/busStop';
 import * as MovieTheaterPlaceFactory from './place/movieTheater';
 import * as ScreeningRoomPlaceFactory from './place/screeningRoom';
 import * as ScreeningRoomSectionPlaceFactory from './place/screeningRoomSection';
@@ -113,7 +114,6 @@ import * as WebAPIServiceFactory from './service/webAPI';
 import { SortType } from './sortType';
 import * as ThingFactory from './thing';
 import * as BusTripFactory from './trip/busTrip';
-import * as BusTripSeriesFactory from './trip/busTripSeries';
 import { TripType } from './tripType';
 import { UnitCode } from './unitCode';
 import * as UnitPriceOfferFactory from './unitPriceOffer';
@@ -341,6 +341,7 @@ export import person = PersonFactory;
 export import personType = PersonType;
 export import priceCurrency = PriceCurrency;
 export declare namespace place {
+    export import busStop = BusStopFactory;
     export import movieTheater = MovieTheaterPlaceFactory;
     export import screeningRoom = ScreeningRoomPlaceFactory;
     export import screeningRoomSection = ScreeningRoomSectionPlaceFactory;
@@ -429,10 +430,9 @@ export import taskName = TaskName;
 export import taskStatus = TaskStatus;
 export import thing = ThingFactory;
 export declare namespace trip {
-    type ISearchConditions<T extends TripType> = T extends TripType.BusTrip ? BusTripFactory.ISearchConditions : T extends TripType.BusTripSeries ? BusTripSeriesFactory.ISearchConditions : never;
-    type ITrip<T extends TripType> = T extends TripType.BusTrip ? BusTripFactory.ITrip : T extends TripType.BusTripSeries ? BusTripSeriesFactory.ITrip : never;
+    type ISearchConditions<T extends TripType> = T extends TripType.BusTrip ? BusTripFactory.ISearchConditions : never;
+    type ITrip<T extends TripType> = T extends TripType.BusTrip ? BusTripFactory.ITrip : never;
     export import busTrip = BusTripFactory;
-    export import busTripSeries = BusTripSeriesFactory;
 }
 export import tripType = TripType;
 export declare namespace assetTransaction {

package/lib/index.js

@@ -78,6 +78,7 @@ var paymentStatusType_1 = require("./paymentStatusType");
 var PermitFactory = require("./permit");
 var PersonFactory = require("./person");
 var personType_1 = require("./personType");
+var BusStopFactory = require("./place/busStop");
 var MovieTheaterPlaceFactory = require("./place/movieTheater");
 var ScreeningRoomPlaceFactory = require("./place/screeningRoom");
 var ScreeningRoomSectionPlaceFactory = require("./place/screeningRoomSection");
@@ -103,7 +104,6 @@ var WebAPIServiceFactory = require("./service/webAPI");
 var sortType_1 = require("./sortType");
 var ThingFactory = require("./thing");
 var BusTripFactory = require("./trip/busTrip");
-var BusTripSeriesFactory = require("./trip/busTripSeries");
 var tripType_1 = require("./tripType");
 var unitCode_1 = require("./unitCode");
 var UnitPriceOfferFactory = require("./unitPriceOffer");
@@ -319,6 +319,7 @@ exports.personType = personType_1.PersonType;
 exports.priceCurrency = priceCurrency_1.PriceCurrency;
 var place;
 (function (place) {
+    place.busStop = BusStopFactory;
     place.movieTheater = MovieTheaterPlaceFactory;
     place.screeningRoom = ScreeningRoomPlaceFactory;
     place.screeningRoomSection = ScreeningRoomSectionPlaceFactory;
@@ -383,7 +384,6 @@ exports.thing = ThingFactory;
 var trip;
 (function (trip) {
     trip.busTrip = BusTripFactory;
-    trip.busTripSeries = BusTripSeriesFactory;
 })(trip = exports.trip || (exports.trip = {}));
 exports.tripType = tripType_1.TripType;
 var assetTransaction;

package/lib/place/busStop.d.ts

@@ -0,0 +1,41 @@
+import { IMultilingualString } from '../multilingualString';
+import * as PlaceFactory from '../place';
+import { PlaceType } from '../placeType';
+import { SortType } from '../sortType';
+export interface IPlace extends Pick<PlaceFactory.IPlace, 'project' | 'typeOf' | 'id' | 'name' | 'branchCode'> {
+    typeOf: PlaceType.BusStop;
+    id: string;
+    branchCode: string;
+    name: IMultilingualString;
+}
+/**
+ * ソート条件
+ */
+export interface ISortOrder {
+    branchCode?: SortType;
+}
+export interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: ISortOrder;
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    id?: {
+        $eq?: string;
+        $in?: string[];
+    };
+    branchCode?: {
+        $eq?: string;
+        $regex?: string;
+        $in?: string[];
+    };
+    /**
+     * 名称
+     */
+    name?: {
+        $regex?: string;
+    };
+}

package/lib/reservation/busReservation.d.ts

@@ -3,7 +3,8 @@ import { ProductType } from '../product';
 import * as ReservationFactory from '../reservation';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
-import { ITrip as IBusTrip } from '../trip/busTrip';
+import { ITripWithDetails as IBusTrip } from '../trip/busTrip';
+import { TripType } from '../tripType';
 export declare type IReservationFor = Pick<IBusTrip, 'arrivalBusStop' | 'arrivalTime' | 'busName' | 'busNumber' | 'departureBusStop' | 'departureTime' | 'id' | 'identifier' | 'name' | 'typeOf'>;
 export declare type IPriceComponentSpecification = ITicketPriceComponent;
 export declare type IPriceSpecification = ITicketPriceSpecification;
@@ -32,8 +33,21 @@ export interface IReservation extends ReservationFactory.IReservation<IPriceSpec
     subReservation?: ISubReservation[];
     typeOf: ReservationType.BusReservation;
 }
+export interface IReservationForSearchConditions {
+    typeOf?: {
+        $eq?: TripType;
+    };
+    id?: {
+        $eq?: string;
+        $in?: string[];
+    };
+}
 /**
  * 検索条件
  */
 export interface ISearchConditions extends ReservationFactory.ISearchConditions<ReservationType.BusReservation> {
+    /**
+     * 予約対象
+     */
+    reservationFor?: IReservationForSearchConditions;
 }

package/lib/reservation/event.d.ts

@@ -60,7 +60,9 @@ export interface IReservation extends ReservationFactory.IReservation<IPriceSpec
 }
 export interface IReservationForSearchConditions {
     typeOf?: EventType;
-    id?: string;
+    id?: string | {
+        $eq?: string;
+    };
     ids?: string[];
     location?: {
         ids?: string[];

package/lib/trip/busTrip.d.ts

@@ -1,11 +1,51 @@
 import { IMultilingualString } from '../multilingualString';
+import { IPlace as IBusStop } from '../place/busStop';
+import { IProject } from '../project';
+import { ITrip as IBaseTrip } from '../trip';
 import { TripType } from '../tripType';
-import { ITrip as IBusTripSeries } from './busTripSeries';
-export interface ITrip extends Pick<IBusTripSeries, 'id' | 'name' | 'offers' | 'project' | 'arrivalBusStop' | 'departureBusStop' | 'identifier'> {
+export declare type IArrivalBusStop = Pick<IBusStop, 'typeOf' | 'branchCode' | 'name'>;
+export declare type IDepartureBusStop = Pick<IBusStop, 'typeOf' | 'branchCode' | 'name'>;
+export interface ITrip extends Pick<IBaseTrip, 'id' | 'name' | 'offers'> {
+    arrivalBusStop: IArrivalBusStop;
+    departureBusStop: IDepartureBusStop;
+    identifier: string;
+    project: Pick<IProject, 'id' | 'typeOf'>;
+    typeOf: TripType.BusTrip;
+}
+export interface ITripWithDetails extends Pick<ITrip, 'id' | 'name' | 'arrivalBusStop' | 'departureBusStop' | 'identifier' | 'typeOf'> {
     arrivalTime: Date;
     busName: IMultilingualString;
     busNumber: string;
     departureTime: Date;
-    typeOf: TripType.BusTrip;
 }
-export declare type ISearchConditions = any;
+export declare type ISortOrder = any;
+export interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: ISortOrder;
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    id?: {
+        $in?: string[];
+    };
+    identifier?: {
+        $eq?: string;
+    };
+    name?: {
+        $regex?: string;
+    };
+    typeOf: TripType;
+    additionalProperty?: {
+        $elemMatch?: {
+            name?: {
+                /**
+                 * 一致する名称の追加特性がひとつでも存在する
+                 */
+                $eq?: string;
+            };
+        };
+    };
+}

package/lib/tripType.d.ts

@@ -3,6 +3,5 @@
  */
 export declare enum TripType {
     BusTrip = "BusTrip",
-    BusTripSeries = "BusTripSeries",
     Trip = "Trip"
 }

package/lib/tripType.js

@@ -7,6 +7,5 @@ exports.TripType = void 0;
 var TripType;
 (function (TripType) {
     TripType["BusTrip"] = "BusTrip";
-    TripType["BusTripSeries"] = "BusTripSeries";
     TripType["Trip"] = "Trip";
 })(TripType = exports.TripType || (exports.TripType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.281.0-alpha.3",
+  "version": "4.281.0-alpha.5",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",