@chevre/domain 21.4.0-alpha.21 → 21.4.0-alpha.23

package/example/src/chevre/migrateReservationProvider.ts

@@ -85,9 +85,9 @@ async function main() {
                     'movieTheaterBranchCode:', movieTheaterBranchCode,
                     i
                 );
-                // throw new Error('movieTheater not found');
+                throw new Error('movieTheater not found');
 
-                return;
+                // return;
             }
             if (typeof sellerId === 'string') {
                 const newProvider: chevre.factory.reservation.IProvider = {

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

@@ -53,12 +53,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
@@ -67,7 +68,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     underName?: any;
     issuedThrough?: any;
     subReservation?: any;
-    provider?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
@@ -82,12 +82,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     previousReservationStatus?: string | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
@@ -96,7 +97,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     underName?: any;
     issuedThrough?: any;
     subReservation?: any;
-    provider?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
@@ -111,12 +111,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     previousReservationStatus?: string | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
@@ -125,7 +126,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     underName?: any;
     issuedThrough?: any;
     subReservation?: any;
-    provider?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;

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

@@ -9,8 +9,14 @@ exports.modelName = modelName;
  * 予約スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
-    provider: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    provider: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     _id: String,
     typeOf: {
         type: String,
@@ -76,10 +82,7 @@ schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ bookingTime: -1 }, { name: 'searchByBookingTime-v3' });
 schema.index({ 'project.id': 1, bookingTime: -1 }, { name: 'searchByProjectId-v20220721' });
-// schema.index(
-//     { 'provider.id': 1, bookingTime: -1 },
-//     { name: 'searchByProviderId' }
-// );
+schema.index({ 'provider.id': 1, bookingTime: -1 }, { name: 'searchByProviderId' });
 schema.index({ typeOf: 1, bookingTime: -1 }, { name: 'searchByTypeOf-v3' });
 schema.index({ reservationNumber: 1, bookingTime: -1 }, { name: 'searchByReservationNumber-v3' });
 schema.index({ reservationStatus: 1, bookingTime: -1 }, { name: 'searchByReservationStatus-v3' });

package/lib/chevre/service/event/createEvent.d.ts

@@ -1,9 +1,11 @@
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as EventRepo } from '../../repo/event';
+import { MongoRepository as PlaceRepo } from '../../repo/place';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 export declare function createEvent(params: factory.task.createEvent.IData): (repos: {
     action: ActionRepo;
     event: EventRepo;
+    place: PlaceRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/event/createEvent.js

@@ -11,33 +11,59 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEvent = void 0;
 const factory = require("../../factory");
-// tslint:disable-next-line:max-func-body-length
 function createEvent(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const actionAttributes = params;
         const action = yield repos.action.start(actionAttributes);
         let eventIds = [];
         let eventType;
         try {
-            if (((_a = actionAttributes.instrument) === null || _a === void 0 ? void 0 : _a.createScreeningEventSeriesIfNotExistByWorkPerformed) === true) {
-                const bulkWriteResult = yield repos.event.createScreeningEventSeriesIfNotExistByWorkPerformed(actionAttributes.object.map((p) => {
-                    if (p.typeOf !== factory.eventType.ScreeningEventSeries) {
-                        throw new factory.errors.Argument('typeOf', `must be ${factory.eventType.ScreeningEventSeries}`);
+            if (actionAttributes.object.length > 0) {
+                if (((_a = actionAttributes.instrument) === null || _a === void 0 ? void 0 : _a.createScreeningEventSeriesIfNotExistByWorkPerformed) === true) {
+                    const createScreeningEventSeriesOnAllLocation = ((_b = actionAttributes.instrument) === null || _b === void 0 ? void 0 : _b.createScreeningEventSeriesOnAllLocation) === true;
+                    let creatingEventParams = actionAttributes.object.map((p) => {
+                        if (p.typeOf !== factory.eventType.ScreeningEventSeries) {
+                            throw new factory.errors.Argument('typeOf', `must be ${factory.eventType.ScreeningEventSeries}`);
+                        }
+                        return { attributes: p };
+                    });
+                    // 全施設対応(2023-07-21~)
+                    if (createScreeningEventSeriesOnAllLocation) {
+                        if (creatingEventParams.length !== 1) {
+                            throw new factory.errors.NotImplemented('creatingEventAttributes.length must be 1');
+                        }
+                        const firstCreatingEventParams = creatingEventParams[0];
+                        const movieTheaters = yield repos.place.searchMovieTheaters({
+                            project: { id: { $eq: actionAttributes.project.id } }
+                        }, ['_id', 'branchCode', 'kanaName', 'name'], []);
+                        creatingEventParams = movieTheaters.map((movieTheater) => {
+                            const location = {
+                                branchCode: movieTheater.branchCode,
+                                id: movieTheater.id,
+                                kanaName: movieTheater.kanaName,
+                                name: movieTheater.name,
+                                typeOf: factory.placeType.MovieTheater
+                            };
+                            return {
+                                attributes: Object.assign(Object.assign({}, firstCreatingEventParams.attributes), { location })
+                            };
+                        });
                     }
-                    return { attributes: p };
-                }));
-                let upsertedIds;
-                if (bulkWriteResult !== undefined) {
-                    upsertedIds = bulkWriteResult.getUpsertedIds()
-                        .map((doc) => doc._id.toString());
+                    const bulkWriteResult = yield repos.event.createScreeningEventSeriesIfNotExistByWorkPerformed(creatingEventParams);
+                    let upsertedIds;
+                    if (bulkWriteResult !== undefined) {
+                        upsertedIds = bulkWriteResult.getUpsertedIds()
+                            .map((doc) => doc._id.toString());
+                    }
+                    eventIds = (Array.isArray(upsertedIds)) ? upsertedIds : [];
+                    eventType = factory.eventType.ScreeningEventSeries;
+                }
+                else {
+                    // no op
+                    throw new factory.errors.NotImplemented('only createScreeningEventSeriesIfNotExistByWorkPerformed implemented');
                 }
-                eventIds = (Array.isArray(upsertedIds)) ? upsertedIds : [];
-                eventType = factory.eventType.ScreeningEventSeries;
-            }
-            else {
-                // no op
-                throw new factory.errors.NotImplemented('only createScreeningEventSeriesIfNotExistByWorkPerformed implemented');
             }
         }
         catch (error) {
@@ -61,7 +87,7 @@ function createEvent(params) {
                 })
                 : undefined
         });
-        if (Array.isArray(eventIds) && eventIds.length > 0) {
+        if (Array.isArray(eventIds) && eventIds.length > 0 && typeof eventType === 'string') {
             // 非同期に変更(2023-06-08~)
             const onEventChangedTask = {
                 project: actionAttributes.project,

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
 const event_1 = require("../../repo/event");
+const place_1 = require("../../repo/place");
 const task_1 = require("../../repo/task");
 const EventService = require("../event");
 /**
@@ -22,6 +23,7 @@ function call(data) {
         yield EventService.createEvent(data)({
             action: new action_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
+            place: new place_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection)
         });
     });

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.316.0-alpha.3",
+    "@chevre/factory": "4.316.0-alpha.4",
     "@cinerino/sdk": "3.161.0-alpha.0",
     "@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.21"
+  "version": "21.4.0-alpha.23"
 }