@chevre/domain 21.4.0-alpha.4 → 21.4.0-alpha.5

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -5,6 +5,10 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 const PROJECT_ID = String(process.env.PROJECT_ID);
+const ORGANIZER_ID = process.env.ORGANIZER_ID;
+if (typeof ORGANIZER_ID !== 'string' || ORGANIZER_ID.length === 0) {
+    throw new Error('ORGANIZER_ID undefined');
+}
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -15,6 +19,7 @@ async function main() {
     const result = await eventRepo.createManyIfNotExist<chevre.factory.eventType.ScreeningEvent>([
         {
             attributes: {
+                organizer: { id: String(ORGANIZER_ID) },
                 typeOf: chevre.factory.eventType.ScreeningEvent,
                 project: { id: PROJECT_ID, typeOf: chevre.factory.organizationType.Project },
                 name: {
@@ -184,6 +189,7 @@ async function main() {
         },
         {
             attributes: {
+                organizer: { id: String(ORGANIZER_ID) },
                 typeOf: chevre.factory.eventType.ScreeningEvent,
                 project: { id: PROJECT_ID, typeOf: chevre.factory.organizationType.Project },
                 name: {

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

@@ -77,6 +77,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     aggregateEntranceGate?: any;
     aggregateReservation?: any;
     aggregateOffer?: any;
+    organizer?: any;
     maximumAttendeeCapacity?: number | undefined;
     remainingAttendeeCapacity?: number | undefined;
     videoFormat?: any;
@@ -110,6 +111,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     aggregateEntranceGate?: any;
     aggregateReservation?: any;
     aggregateOffer?: any;
+    organizer?: any;
     maximumAttendeeCapacity?: number | undefined;
     remainingAttendeeCapacity?: number | undefined;
     videoFormat?: any;
@@ -143,6 +145,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     aggregateEntranceGate?: any;
     aggregateReservation?: any;
     aggregateOffer?: any;
+    organizer?: any;
     maximumAttendeeCapacity?: number | undefined;
     remainingAttendeeCapacity?: number | undefined;
     videoFormat?: any;

package/lib/chevre/repo/mongoose/schemas/event.js

@@ -46,6 +46,7 @@ const schema = new mongoose_1.Schema({
     aggregateEntranceGate: mongoose_1.SchemaTypes.Mixed,
     aggregateReservation: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed,
+    organizer: mongoose_1.SchemaTypes.Mixed,
     coaInfo: mongoose_1.SchemaTypes.Mixed
 }, {
     collection: 'events',

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -1,4 +1,4 @@
-import { MongoRepository as EventRepo } from '../../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
@@ -28,5 +28,5 @@ export declare function aggregateScreeningEvent(params: {
     id: string;
 }): IAggregateScreeningEventOperation<void>;
 export declare function aggregateByEvent(params: {
-    event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): IAggregateScreeningEventOperation<void>;

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 import { IAcceptedAddOn } from './factory/price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export { IAcceptedAddOn };
@@ -46,9 +47,9 @@ export declare function createAdditionalTicketText(params: {
     reservedTicket: factory.reservation.ITicket;
 }): string | undefined;
 export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
-export declare function createReservationFor(params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent): factory.assetTransaction.reserve.IReservationFor;
+export declare function createReservationFor(params: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>): factory.assetTransaction.reserve.IReservationFor;
 export declare function createIssuedThrough(params: {
-    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
@@ -61,7 +62,7 @@ export declare function createReservation(params: {
     reserveDate: Date;
     agent: factory.assetTransaction.reserve.IAgent;
     reservationNumber: string;
-    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
     reservedTicket: factory.reservation.ITicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;

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

@@ -327,7 +327,9 @@ function createAdditionalTicketText(params) {
     return (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalTicketText;
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
-function createReservationFor(params) {
+function createReservationFor(
+// params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent
+params) {
     var _a, _b;
     if (params.typeOf === factory.eventType.ScreeningEvent) {
         return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
@@ -343,7 +345,9 @@ function createReservationFor(params) {
     }
 }
 exports.createReservationFor = createReservationFor;
-function optimizeReservationSuperEvent(params) {
+function optimizeReservationSuperEvent(
+// params: factory.event.screeningEvent.IEvent
+params) {
     const superEvent = params.superEvent;
     return Object.assign(Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
             ? superEvent.additionalProperty

package/lib/chevre/service/event.js

@@ -92,6 +92,7 @@ function importFromCOA(params) {
             const sellersWithSameBranchCode = yield repos.seller.search({
                 limit: 1,
                 page: 1,
+                project: { id: { $eq: project.id } },
                 branchCode: { $eq: params.locationBranchCode }
             }, ['_id'], []);
             const seller = sellersWithSameBranchCode.shift();
@@ -119,6 +120,7 @@ function importFromCOA(params) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
             const screeningRooms = yield repos.place.searchScreeningRooms({
+                project: { id: { $eq: project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
             });
             const targetImportFrom = moment(`${moment(params.importFrom)
@@ -133,7 +135,8 @@ function importFromCOA(params) {
                 locationBranchCode: params.locationBranchCode,
                 movieTheater,
                 project: project,
-                saveScreeningEventSeries: params.saveScreeningEventSeries
+                saveScreeningEventSeries: params.saveScreeningEventSeries,
+                seller: { id: seller.id }
             })(repos);
             savedScreeningEventSeriesCount = savedEventsCount;
             try {
@@ -145,7 +148,8 @@ function importFromCOA(params) {
                     screeningEventSerieses: screeningEventSerieses,
                     project: project,
                     targetImportFrom: targetImportFrom.toDate(),
-                    targetImportThrough: targetImportThrough.toDate()
+                    targetImportThrough: targetImportThrough.toDate(),
+                    seller: { id: seller.id }
                 })(repos);
                 savedScreeningEventsCount = screeningEvents.length;
                 // COAから削除されたイベントをキャンセル済ステータスへ変更
@@ -234,7 +238,8 @@ function saveScreeningEventSeries(params) {
                 eizouKubuns: eizouKubuns,
                 joueihousikiKubuns: joueihousikiKubuns,
                 jimakufukikaeKubuns: jimakufukikaeKubuns,
-                availablePaymentMethodTypes
+                availablePaymentMethodTypes,
+                seller: params.seller
             });
         });
         let savedEventsCount = 0;
@@ -362,7 +367,8 @@ function createScreeningEvents(params) {
                 screenRoom: screenRoom,
                 superEvent: screeningEventSeries,
                 serviceKubuns: serviceKubuns,
-                acousticKubuns: acousticKubuns
+                acousticKubuns: acousticKubuns,
+                seller: params.seller
             });
             screeningEvents.push(screeningEvent);
         });
@@ -493,7 +499,8 @@ function createScreeningEventFromCOA(params) {
         attendeeCount: 0,
         maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
         remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
-        additionalProperty
+        additionalProperty,
+        organizer: { id: params.seller.id }
     };
 }
 function createScreeningEventAdditionalPropertyFromCOA(params) {
@@ -579,12 +586,8 @@ function createScreeningEventSeriesFromCOA(params) {
             kanaName: params.movieTheater.kanaName,
             typeOf: params.movieTheater.typeOf
         },
-        // 不要なので廃止(2023-01-12~)
-        // organizer: {
-        //     typeOf: factory.organizationType.Corporation,
-        //     identifier: params.movieTheater.id,
-        //     name: params.movieTheater.name
-        // },
+        // 必須化(2023-07-12~)
+        organizer: { id: params.seller.id },
         videoFormat: params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0],
         soundFormat: [],
         workPerformed: {

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

@@ -4,7 +4,7 @@ export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export type IAcceptedOffer4COA = factory.action.authorize.offer.seatReservation.IAcceptedOffer<factory.service.webAPI.Identifier.COA>;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
-    event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
 }): factory.action.authorize.offer.seatReservation.IAttributes<WebAPIIdentifier.COA>;
 /**

package/lib/chevre/service/payment/movieTicket/factory.d.ts

@@ -1,10 +1,11 @@
 import * as surfrock from '@surfrock/sdk';
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 export declare function createSeatInfoSyncIn(params: {
     paymentMethodType: string;
     paymentMethodId: string;
     movieTickets: factory.action.trade.pay.IMovieTicket[];
-    event: factory.event.screeningEvent.IEvent;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     purpose: factory.action.trade.pay.IPurpose;
     seller: Pick<factory.seller.ISeller, 'paymentAccepted'>;
     credentials: {

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.314.0",
+    "@chevre/factory": "4.315.0-alpha.0",
     "@cinerino/sdk": "3.160.0-alpha.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.4"
+  "version": "21.4.0-alpha.5"
 }