@chevre/domain 23.2.0-alpha.26 → 23.2.0-alpha.28

package/example/src/chevre/place/upsertMovieTheatersByBranchCode.ts

@@ -22,9 +22,7 @@ async function main() {
                         typeOf: chevre.factory.offerType.Offer,
                         eligibleQuantity: { maxValue: 6, unitCode: chevre.factory.unitCode.C62, typeOf: 'QuantitativeValue' },
                         availabilityEndsGraceTime: { value: 6, unitCode: chevre.factory.unitCode.Sec, typeOf: 'QuantitativeValue' },
-                        availabilityStartsGraceTime: { value: 6, unitCode: chevre.factory.unitCode.Day, typeOf: 'QuantitativeValue' },
-                        availabilityEndsGraceTimeOnPOS: { value: 6, unitCode: chevre.factory.unitCode.Sec, typeOf: 'QuantitativeValue' },
-                        availabilityStartsGraceTimeOnPOS: { value: 6, unitCode: chevre.factory.unitCode.Day, typeOf: 'QuantitativeValue' }
+                        availabilityStartsGraceTime: { value: 6, unitCode: chevre.factory.unitCode.Day, typeOf: 'QuantitativeValue' }
                     }
 
                 }

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -9,16 +9,20 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const noteRepo = await chevre.repository.NoteAboutOrder.createInstance(mongoose.connection);
+    const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
 
     let updateResult: any;
 
-    updateResult = await noteRepo.unsetUnnecessaryFields({
+    updateResult = await movieTheaterRepo.unsetUnnecessaryFields({
         filter: {
-            'about.identifier': { $exists: true }
+            $or: [
+                { 'offers.availabilityStartsGraceTimeOnPOS': { $exists: true } },
+                { 'offers.availabilityEndsGraceTimeOnPOS': { $exists: true } }
+            ]
         },
         $unset: {
-            'about.identifier': 1
+            'offers.availabilityStartsGraceTimeOnPOS': 1,
+            'offers.availabilityEndsGraceTimeOnPOS': 1
         }
     });
     console.log(updateResult);

package/lib/chevre/factory/event.js

@@ -23,10 +23,7 @@ function minimizeSuperEvent(params) {
     //     ? { kanaName: params.superEventFromDB.location.kanaName }
     //     : undefined
     );
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.eventType.ScreeningEventSeries, 
-        // 不要なので廃止(2023-06-09~)
-        // project: { typeOf: chevre.factory.organizationType.Project, id: params.project.id },
-        id: params.superEventFromDB.id, videoFormat: params.superEventFromDB.videoFormat, soundFormat: params.superEventFromDB.soundFormat, workPerformed,
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.eventType.ScreeningEventSeries, id: params.superEventFromDB.id, soundFormat: params.superEventFromDB.soundFormat, workPerformed,
         location, kanaName: params.superEventFromDB.kanaName, name: Object.assign(Object.assign({}, (typeof params.superEventFromDB.name.en === 'string') ? { en: params.superEventFromDB.name.en } : undefined), (typeof params.superEventFromDB.name.ja === 'string') ? { ja: params.superEventFromDB.name.ja } : undefined) }, (Array.isArray(params.superEventFromDB.additionalProperty))
         ? { additionalProperty: params.superEventFromDB.additionalProperty }
         : undefined), (params.superEventFromDB.startDate instanceof Date)
@@ -41,5 +38,8 @@ function minimizeSuperEvent(params) {
         ? { dubLanguage: params.superEventFromDB.dubLanguage }
         : undefined), (params.superEventFromDB.subtitleLanguage !== undefined)
         ? { subtitleLanguage: params.superEventFromDB.subtitleLanguage }
-        : undefined);
+        : undefined), {
+        // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+        videoFormat: params.superEventFromDB.videoFormat
+    });
 }

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

@@ -50,6 +50,12 @@ export declare class MovieTheaterRepo {
         };
     }[], options: IUpsertOptions): Promise<{
         bulkWriteResult?: BulkWriteResult;
+        /**
+         * 追加あるいは編集された施設
+         */
+        modifiedMovieTheaters: {
+            id: string;
+        }[];
     }>;
     /**
      * 施設のpublic属性検索

package/lib/chevre/repo/place/movieTheater.js

@@ -146,6 +146,7 @@ class MovieTheaterRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const { project, sellerId } = options;
             const bulkWriteOps = [];
+            const queryFilters = [];
             if (Array.isArray(params)) {
                 params.forEach(({ $set, $unset }) => {
                     const { branchCode, hasEntranceGate, hasPOS } = $set, // 入場ゲート,POSを決して編集しないように
@@ -157,7 +158,9 @@ class MovieTheaterRepo {
                     const filter = {
                         typeOf: { $eq: factory.placeType.MovieTheater },
                         'project.id': { $eq: project.id },
-                        branchCode: { $eq: branchCode }
+                        branchCode: { $eq: branchCode },
+                        // プロジェクトとコードでユニークな仕様だが、販売者も指定する -> 異なる販売者でコードが重複すればDuplicateErrorとなる
+                        'parentOrganization.id': { $exists: true, $eq: sellerId }
                     };
                     const initialMovieTheater = {
                         typeOf: factory.placeType.MovieTheater,
@@ -173,13 +176,27 @@ class MovieTheaterRepo {
                         upsert: true
                     };
                     bulkWriteOps.push({ updateOne });
+                    queryFilters.push({
+                        typeOf: { $eq: factory.placeType.MovieTheater },
+                        'project.id': { $eq: project.id },
+                        branchCode: { $eq: branchCode },
+                        // プロジェクトとコードでユニークな仕様だが、販売者も指定する -> 異なる販売者でコードが重複すればDuplicateErrorとなる
+                        'parentOrganization.id': { $exists: true, $eq: sellerId }
+                    });
                 });
             }
             if (bulkWriteOps.length > 0) {
                 const bulkWriteResult = yield this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
-                return { bulkWriteResult };
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedMovieTheaters = yield this.civicStructureModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedMovieTheaters };
             }
-            return {};
+            return { modifiedMovieTheaters: [] };
         });
     }
     /**

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

@@ -36,9 +36,9 @@ function createReservationFor(params, useOptimizeReservation) {
 }
 function optimizeReservationSuperEvent(params, useOptimizeReservation) {
     const superEvent = params.superEvent;
-    return Object.assign(Object.assign({ id: superEvent.id, 
+    return Object.assign(Object.assign(Object.assign({ id: superEvent.id, 
         // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
-        location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
+        location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
         ? { headline: superEvent.headline }
         : undefined), (useOptimizeReservation)
         ? {}
@@ -46,7 +46,10 @@ function optimizeReservationSuperEvent(params, useOptimizeReservation) {
             additionalProperty: (Array.isArray(superEvent.additionalProperty))
                 ? superEvent.additionalProperty
                 : []
-        });
+        }), {
+        // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+        videoFormat: superEvent.videoFormat
+    });
 }
 function createIssuedThrough(params) {
     var _a;

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

@@ -124,17 +124,19 @@ function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromC
                 typeOf: 'QuantitativeValue',
                 value: 1200,
                 unitCode: factory.unitCode.Sec
-            },
-            availabilityStartsGraceTimeOnPOS: {
-                typeOf: 'QuantitativeValue',
-                value: -93,
-                unitCode: factory.unitCode.Day
-            },
-            availabilityEndsGraceTimeOnPOS: {
-                typeOf: 'QuantitativeValue',
-                value: 2678400,
-                unitCode: factory.unitCode.Sec
             }
+            // discontinue(2026-01-15~)
+            // availabilityStartsGraceTimeOnPOS: {
+            //     typeOf: 'QuantitativeValue',
+            //     value: -93,
+            //     unitCode: factory.unitCode.Day
+            // },
+            // discontinue(2026-01-15~)
+            // availabilityEndsGraceTimeOnPOS: {
+            //     typeOf: 'QuantitativeValue',
+            //     value: 2678400,
+            //     unitCode: factory.unitCode.Sec
+            // }
         },
         parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };

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

@@ -178,13 +178,14 @@ function minimizeSuperEvent(params) {
     // offers,
     // eventStatus
      } = params.superEvent;
-    return {
-        workPerformed, videoFormat, startDate, soundFormat,
+    return Object.assign({ workPerformed, startDate, soundFormat,
         name, location, kanaName, identifier,
         endDate, duration, coaInfo, alternativeHeadline,
         // additionalProperty,
-        typeOf, id
-    };
+        typeOf, id }, {
+        // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+        videoFormat
+    });
 }
 /**
  * コアデータからイベントを作成する

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -297,7 +297,10 @@ function createReservation(params) {
             startDate: moment(event.startDate)
                 .toDate(),
             // 最適化(2022-05-31~)
-            superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
+            superEvent: Object.assign(Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined), {
+                // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+                videoFormat: event.superEvent.videoFormat
+            })
         };
         if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js

@@ -122,19 +122,10 @@ function responseBody2acceptedOffers4result(params) {
                 branchCode: event.location.branchCode,
                 name: event.location.name
             }, name: event.name, startDate: moment(event.startDate)
-                .toDate(), superEvent: {
-                typeOf: event.superEvent.typeOf,
-                id: event.superEvent.id,
-                identifier: event.superEvent.identifier,
-                name: event.superEvent.name,
-                alternativeHeadline: event.superEvent.alternativeHeadline,
-                location: event.superEvent.location,
-                videoFormat: event.superEvent.videoFormat,
-                soundFormat: event.superEvent.soundFormat,
-                workPerformed: workPerformed,
-                duration: event.superEvent.duration,
-                coaInfo: event.superEvent.coaInfo
-            }, id: event.id });
+                .toDate(), superEvent: Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, identifier: event.superEvent.identifier, name: event.superEvent.name, alternativeHeadline: event.superEvent.alternativeHeadline, location: event.superEvent.location, soundFormat: event.superEvent.soundFormat, workPerformed: workPerformed, duration: event.superEvent.duration, coaInfo: event.superEvent.coaInfo }, {
+                // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+                videoFormat: event.superEvent.videoFormat
+            }), id: event.id });
         const ticketNumber = util.format('%s:%s:%s', reservationFor.id, tmpReserve.seatSection, tmpReserve.seatNum);
         const ticketedSeat = {
             typeOf: factory.placeType.Seat,

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

@@ -93,7 +93,9 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
             } }, { name: { ja: (typeof eventService.name === 'string') ? eventService.name : String((_a = eventService.name) === null || _a === void 0 ? void 0 : _a.ja) } }),
         seller: offersSeller
     };
-    const screeningEventSuperEvent = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: screeningEventSeries.typeOf, id: screeningEventSeries.id, videoFormat: screeningEventSeries.videoFormat, soundFormat: screeningEventSeries.soundFormat, workPerformed: screeningEventSeries.workPerformed, location: screeningEventSeries.location, kanaName: screeningEventSeries.kanaName, name: screeningEventSeries.name }, (Array.isArray(screeningEventSeries.additionalProperty))
+    const screeningEventSuperEvent = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: screeningEventSeries.typeOf, id: screeningEventSeries.id, 
+        // videoFormat: screeningEventSeries.videoFormat, // discontinue(2026-01-15~)
+        soundFormat: screeningEventSeries.soundFormat, workPerformed: screeningEventSeries.workPerformed, location: screeningEventSeries.location, kanaName: screeningEventSeries.kanaName, name: screeningEventSeries.name }, (Array.isArray(screeningEventSeries.additionalProperty))
         ? { additionalProperty: screeningEventSeries.additionalProperty }
         : undefined), (screeningEventSeries.startDate !== undefined)
         ? { startDate: screeningEventSeries.startDate }

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.14",
-    "@cinerino/sdk": "12.12.1",
+    "@chevre/factory": "5.4.0-alpha.16",
+    "@cinerino/sdk": "12.13.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.26"
+  "version": "23.2.0-alpha.28"
 }

package/example/src/chevre/event/upsertManyScreeningEventByIdentifier.ts

@@ -1,191 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-import * as moment from 'moment-timezone';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const ADDITIONAL_PROPERTY_NAME = 'sampleCreateId';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-
-    const today = moment()
-        .tz('Asia/Tokyo')
-        .format('YYYY-MM-DD');
-    const identifier = `fromSamples:${moment()
-        .format('YYYY-MM-DD HH:mm')}`;
-    const settingEvent: chevre.factory.event.screeningEvent.IAttributes = {
-        identifier,
-        additionalProperty: [
-            { name: ADDITIONAL_PROPERTY_NAME, value: identifier }
-        ],
-        project: {
-            id: project.id,
-            typeOf: chevre.factory.organizationType.Project
-        },
-        organizer: {
-            id: '59d20831e53ebc2b4e774466'
-        },
-        typeOf: chevre.factory.eventType.ScreeningEvent,
-        name: {
-            en: 'pet IMAX2D',
-            ja: 'ペット IMAX2D'
-        },
-        doorTime: moment(`${today}T13:00:00Z`)
-            .toDate(),
-        startDate: moment(`${today}T13:00:00Z`)
-            .toDate(),
-        endDate: moment(`${today}T14:00:00Z`)
-            .toDate(),
-        eventStatus: chevre.factory.eventStatusType.EventScheduled,
-        location: {
-            typeOf: chevre.factory.placeType.ScreeningRoom,
-            branchCode: '70',
-            name: {
-                ja: 'シネマ7',
-                en: 'CINEMA7'
-            },
-            address: {
-                ja: '',
-                en: ''
-            }
-        },
-        superEvent: {
-            typeOf: chevre.factory.eventType.ScreeningEventSeries,
-            id: 'al9s38bj6',
-            videoFormat: [
-                {
-                    typeOf: '2D',
-                    name: '2D'
-                },
-                {
-                    typeOf: 'IMAX',
-                    name: 'IMAX'
-                }
-            ],
-            soundFormat: [],
-            workPerformed: {
-                typeOf: chevre.factory.creativeWorkType.Movie,
-                identifier: '1622100',
-                id: '5bfb841d5a78d7948369980a',
-                name: {
-                    en: 'Pet',
-                    ja: 'ペット'
-                },
-                duration: 'PT2H3M'
-            },
-            location: {
-                typeOf: chevre.factory.placeType.MovieTheater,
-                id: '5bfb841d5a78d7948369979a',
-                branchCode: '118',
-                name: {
-                    ja: 'シネモーション赤坂 ',
-                    en: 'CineMotion Akasaka'
-                }
-            },
-            kanaName: 'ペット IMAX2D',
-            name: {
-                en: 'pet IMAX2D',
-                ja: 'ペット IMAX2D'
-            },
-            additionalProperty: [],
-            startDate: moment('2022-09-30T15:00:00.000Z')
-                .toDate(),
-            endDate: moment('2029-07-31T15:00:00.000Z')
-                .toDate(),
-            headline: {
-                ja: 'IMAX2D上映'
-            }
-        },
-        offers: {
-            typeOf: chevre.factory.offerType.Offer,
-            eligibleQuantity: {
-                typeOf: 'QuantitativeValue',
-                unitCode: chevre.factory.unitCode.C62,
-                maxValue: 6
-            },
-            itemOffered: {
-                id: '655dc6b02cbb99d946cb6081',
-                name: {
-                    ja: '通常興行カタログ（サブカタログ版）'
-                },
-                serviceOutput: {
-                    typeOf: chevre.factory.reservationType.EventReservation,
-                    reservedTicket: {
-                        typeOf: 'Ticket',
-                        ticketedSeat: {
-                            typeOf: chevre.factory.placeType.Seat
-                        }
-                    }
-                },
-                typeOf: chevre.factory.product.ProductType.EventService,
-                availableChannel: {
-                    typeOf: 'ServiceChannel',
-                    serviceLocation: {
-                        typeOf: chevre.factory.placeType.ScreeningRoom,
-                        branchCode: '70',
-                        name: {
-                            ja: 'シネマ7',
-                            en: 'CINEMA7'
-                        },
-                        containedInPlace: {
-                            typeOf: chevre.factory.placeType.MovieTheater,
-                            id: '5bfb841d5a78d7948369979a',
-                            branchCode: '118',
-                            name: {
-                                ja: 'シネモーション赤坂 ',
-                                en: 'CineMotion Akasaka'
-                            }
-                        }
-                    }
-                }
-            },
-            seller: {
-                typeOf: chevre.factory.organizationType.Corporation,
-                id: '59d20831e53ebc2b4e774466',
-                name: {
-                    ja: 'シネモーション赤坂',
-                    en: 'CineMotion Akasaka'
-                },
-                makesOffer: [
-                ]
-            }
-        }
-    };
-
-    const createResult = await eventRepo.upsertManyScreeningEventByIdentifier(
-        [
-            {
-                $set: settingEvent,
-                $unset: {}
-            }
-        ],
-        { update: false }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(createResult, { depth: null });
-
-    const updateResult = await eventRepo.upsertManyScreeningEventByIdentifier(
-        [
-            {
-                $set: {
-                    ...settingEvent,
-                    eventStatus: chevre.factory.eventStatusType.EventCancelled
-                },
-                $unset: {}
-            }
-        ],
-        { update: true }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(updateResult, { depth: null });
-
-}
-
-main()
-    .then()
-    .catch(console.error);