npm - @chevre/domain - Versions diffs - 23.0.0-alpha.2 → 23.0.0-alpha.4 - Mend

@chevre/domain 23.0.0-alpha.2 → 23.0.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/lib/chevre/repo/mongoose/schemas/eventSeries.d.ts CHANGED Viewed

@@ -3,11 +3,11 @@ import * as factory from '../../../factory';
 type IDocTypeAsEventSeries = factory.eventSeries.IAttributes & {
     _id: string;
 };
-export type IDocType = IDocTypeAsEventSeries;
+type IDocType = IDocTypeAsEventSeries;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "EventSeries";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/eventSeries.js CHANGED Viewed

@@ -9,30 +9,21 @@ const settings_1 = require("../../../settings");
 const modelName = 'EventSeries';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: {
-        type: mongoose_1.SchemaTypes.Mixed,
-        required: true
-    },
-    organizer: {
-        type: mongoose_1.SchemaTypes.Mixed,
-        required: true
-    },
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    organizer: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     _id: String,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
     identifier: String,
     name: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
     alternativeHeadline: mongoose_1.SchemaTypes.Mixed,
     description: mongoose_1.SchemaTypes.Mixed,
     duration: String,
-    endDate: Date,
+    endDate: { type: Date, required: true }, // required(2025-10-08~)
     eventStatus: String,
     headline: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
-    startDate: Date,
+    startDate: { type: Date, required: true }, // required(2025-10-08~)
     workPerformed: mongoose_1.SchemaTypes.Mixed,
     videoFormat: mongoose_1.SchemaTypes.Mixed,
     soundFormat: mongoose_1.SchemaTypes.Mixed,

package/lib/chevre/service/offer/onEventChanged.js CHANGED Viewed

@@ -160,7 +160,8 @@ function createInformTasks(params, setting) {
             );
             // 最適化(2024-03-25~)
             events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline }) => {
-                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus }, (endDate !== undefined) ? { endDate } : undefined), (startDate !== undefined) ? { startDate } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
+                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus,
+                    endDate, startDate }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
             });
         }
         if (events4inform.length > 0) {

package/lib/chevre/service/task/createEvent/createEventBySchedule/factory.js CHANGED Viewed

@@ -4,105 +4,7 @@ exports.tour2creatingEvent = tour2creatingEvent;
 exports.schedule2tours = schedule2tours;
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
-// tslint:disable-next-line:max-func-body-length
-// function schedule2createEventParams(
-//     schedule: factory.schedule.IEventWithSchedule,
-//     createDate: Date
-// ): factory.event.screeningEvent.ICreateParams[] {
-//     const eventServiceId = schedule.offers?.itemOffered?.id;
-//     const makesOffer = schedule.offers?.seller?.makesOffer;
-//     const applicationIds: string[] = (Array.isArray(makesOffer))
-//         ? makesOffer.map(({ availableAtOrFrom }) => availableAtOrFrom.id)
-//         : [];
-//     const eventSeriesId = schedule.superEvent?.id;
-//     if (typeof eventServiceId !== 'string' || eventServiceId === '') {
-//         throw new factory.errors.NotFound('schedule.offers.itemOffered.id');
-//     }
-//     if (typeof eventSeriesId !== 'string' || eventSeriesId === '') {
-//         throw new factory.errors.NotFound('schedule.superEvent.id');
-//     }
-//     // 引数情報取得
-//     if (schedule.eventSchedule === undefined) {
-//         throw new factory.errors.NotFound('eventSchedule');
-//     }
-//     const targetInfo = getTargetInfoByEventWithSchedule(schedule, createDate);
-//     debug(targetInfo.length, 'targetInfos ->', targetInfo);
-//     const createParams: factory.event.screeningEvent.ICreateParams[] = [];
-//     for (const performanceInfo of targetInfo) {
-//         const oldEventId = [
-//             // tslint:disable-next-line:no-magic-numbers
-//             performanceInfo.day.slice(-6),
-//             workPerformedIdentifier,
-//             movieTheater.branchCode,
-//             screeningRoom.branchCode,
-//             performanceInfo.start_time
-//         ].join('');
-//         const maxValue = movieTheater.offers?.eligibleQuantity?.maxValue;
-//         const availabilityEnds: Date = moment(performanceInfo.end_date)
-//             .tz('Asia/Tokyo')
-//             .endOf('date')
-//             .toDate();
-//         const availabilityStarts: Date = moment(performanceInfo.start_date)
-//             .tz('Asia/Tokyo')
-//             .startOf('date')
-//             // tslint:disable-next-line:no-magic-numbers
-//             .add(-3, 'months')
-//             .toDate();
-//         const validThrough: Date = moment(performanceInfo.end_date)
-//             .tz('Asia/Tokyo')
-//             .endOf('date')
-//             .toDate();
-//         const validFrom: Date = moment(performanceInfo.start_date)
-//             .tz('Asia/Tokyo')
-//             .startOf('date')
-//             // tslint:disable-next-line:no-magic-numbers
-//             .add(-3, 'months')
-//             .toDate();
-//         // イベント作成
-//         createParams.push({
-//             eventStatus: factory.eventStatusType.EventScheduled,
-//             doorTime: performanceInfo.door_time,
-//             startDate: performanceInfo.start_date,
-//             endDate: performanceInfo.end_date,
-//             offers: {
-//                 eligibleQuantity: {
-//                     ...(typeof maxValue === 'number') ? { maxValue } : undefined // ひとまず全座席予約可能なように
-//                 },
-//                 itemOffered: {
-//                     // 興行ID追加(2022-09-01~)
-//                     id: eventServiceId,
-//                     serviceOutput: {
-//                         typeOf: factory.reservationType.EventReservation,
-//                         reservedTicket: {
-//                             typeOf: 'Ticket',
-//                             ticketedSeat: { typeOf: factory.placeType.Seat }
-//                         }
-//                     },
-//                 },
-//                 seller: {
-//                     // event.offersにseller.makesOfferを追加(2022-11-18~)
-//                     makesOffer: applicationIds.map((applicationId) => {
-//                         return {
-//                             typeOf: factory.offerType.Offer,
-//                             availableAtOrFrom: { id: applicationId }, // support no-array(2024-10-13~),
-//                             availabilityEnds,
-//                             availabilityStarts,
-//                             validFrom,
-//                             validThrough
-//                         };
-//                     })
-//                 }
-//             },
-//             // 旧フォーマットIDを追加特性に追加(2022-09-08~)
-//             additionalProperty: [
-//                 { name: 'tourNumber', value: String(performanceInfo.tour_number) },
-//                 { name: 'oldEventId', value: oldEventId }
-//             ],
-//             identifier: oldEventId
-//         });
-//     }
-//     return createParams;
-// }
+const TIMEZONE = 'Asia/Tokyo';
 // tslint:disable-next-line:max-func-body-length
 function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicationMembers, maxValue, eventService, screeningEventSeries, project) {
     var _a;
@@ -115,22 +17,34 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
         screeningRoom.branchCode,
         tour.start_time
     ].join('');
+    // 00:00:00で再実装(2025-10-09~)
+    // const availabilityEnds: Date = moment(tour.end_date)
+    //     .tz(TIMEZONE)
+    //     .endOf('date')
+    //     .toDate();
     const availabilityEnds = moment(tour.end_date)
-        .tz('Asia/Tokyo')
-        .endOf('date')
+        .tz(TIMEZONE)
+        .startOf('date')
+        .add(1, 'day')
         .toDate();
     const availabilityStarts = moment(tour.start_date)
-        .tz('Asia/Tokyo')
+        .tz(TIMEZONE)
         .startOf('date')
         // tslint:disable-next-line:no-magic-numbers
         .add(-3, 'months')
         .toDate();
+    // 00:00:00で再実装(2025-10-09~)
+    // const validThrough: Date = moment(tour.end_date)
+    //     .tz(TIMEZONE)
+    //     .endOf('date')
+    //     .toDate();
     const validThrough = moment(tour.end_date)
-        .tz('Asia/Tokyo')
-        .endOf('date')
+        .tz(TIMEZONE)
+        .startOf('date')
+        .add(1, 'day')
         .toDate();
     const validFrom = moment(tour.start_date)
-        .tz('Asia/Tokyo')
+        .tz(TIMEZONE)
         .startOf('date')
         // tslint:disable-next-line:no-magic-numbers
         .add(-3, 'months')

package/package.json CHANGED Viewed

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.0.0-alpha.2",
-    "@cinerino/sdk": "12.5.0-alpha.2",
+    "@chevre/factory": "5.0.0",
+    "@cinerino/sdk": "12.5.0-alpha.5",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.2"
+  "version": "23.0.0-alpha.4"
 }