@chevre/domain 23.2.0-alpha.3 → 23.2.0-alpha.30

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -1,14 +1,11 @@
 import * as factory from '../../../factory';
-import type { AccountTitleRepo } from '../../../repo/accountTitle';
 import type { ActionRepo } from '../../../repo/action';
 import type { AggregateOfferRepo } from '../../../repo/aggregateOffer';
 import type { CategoryCodeRepo } from '../../../repo/categoryCode';
-import type { CreativeWorkRepo } from '../../../repo/creativeWork';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { MemberRepo } from '../../../repo/member';
 import type { NoteRepo } from '../../../repo/note';
-import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -20,12 +17,10 @@ import type { ProductModelRepo } from '../../../repo/productModel';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export declare function onResourceDeleted(params: factory.task.onResourceUpdated.IData): (repos: {
-    accountTitle: AccountTitleRepo;
+export declare function onResourceDeleted(params: factory.task.onResourceDeleted.IData): (repos: {
     action: ActionRepo;
     aggregateOffer: AggregateOfferRepo;
     categoryCode: CategoryCodeRepo;
-    creativeWork: CreativeWorkRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     hasPOS: HasPOSRepo;
@@ -33,7 +28,6 @@ export declare function onResourceDeleted(params: factory.task.onResourceUpdated
     movieTheater: MovieTheaterRepo;
     note: NoteRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     offerCatalogItem: OfferCatalogItemRepo;
     screeningRoom: ScreeningRoomRepo;

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -22,9 +22,10 @@ function onResourceDeleted(params) {
         const useInform = params.useInform === true
             && Array.isArray(useInformResourceTypes) && useInformResourceTypes.includes(params.typeOf);
         const isDeleted = params.isDeleted === true;
+        const resourceType = params.typeOf;
         if (isDeleted) {
             if (useInform) {
-                switch (params.typeOf) {
+                switch (resourceType) {
                     case 'POS':
                         yield (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
                             project: { id: params.project.id },
@@ -36,7 +37,7 @@ function onResourceDeleted(params) {
                     // no op
                 }
             }
-            switch (params.typeOf) {
+            switch (resourceType) {
                 case 'POS':
                     break;
                 case factory.eventType.ScreeningEventSeries:
@@ -78,7 +79,7 @@ function onResourceDeleted(params) {
                     yield (0, syncOfferCatalog_1.syncOfferCatalog)({
                         project: { id: params.project.id },
                         ids: params.id,
-                        typeOf: params.typeOf,
+                        typeOf: resourceType,
                         isDeleted: true,
                         isOfferCatalogItem: params.isOfferCatalogItem === true
                     })(repos);
@@ -91,7 +92,7 @@ function onResourceDeleted(params) {
                     yield deleteResourcesByProduct({
                         project: { id: params.project.id },
                         ids: params.id,
-                        typeOf: params.typeOf
+                        typeOf: resourceType
                     })(repos);
                     break;
                 // 区分削除に対応(2024-04-18~)
@@ -104,7 +105,7 @@ function onResourceDeleted(params) {
                     break;
                 default:
                     // no op
-                    throw new factory.errors.NotImplemented(`${params.typeOf} onDeleted not implemented`);
+                    throw new factory.errors.NotImplemented(`${resourceType} onDeleted not implemented`);
             }
         }
     });
@@ -146,9 +147,14 @@ function deleteResourcesByScreeningEventSeries(params) {
 }
 function deleteResourcesByScreeningRoom(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 現時点で、複数ルーム削除タスクは作成されない
+        const firstBranchCode = params.branchCode.at(0);
+        if (typeof firstBranchCode !== 'string') {
+            throw new factory.errors.ArgumentNull('branchCode');
+        }
         const deleteActionAttributes = {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            object: { branchCode: params.branchCode, containedInPlace: params.containedInPlace, typeOf: factory.placeType.ScreeningRoom },
+            object: { branchCode: firstBranchCode, containedInPlace: params.containedInPlace, typeOf: factory.placeType.ScreeningRoom },
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             typeOf: factory.actionType.DeleteAction
         };
@@ -159,7 +165,7 @@ function deleteResourcesByScreeningRoom(params) {
             const deleteScreeningEventResult = yield repos.event.deleteManyEventsByScreeningRoom({
                 project: { id: params.project.id },
                 location: {
-                    branchCode: params.branchCode,
+                    branchCode: firstBranchCode,
                     containedInPlace: { id: params.containedInPlace.id }
                 }
             });

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

@@ -36,7 +36,7 @@ const onAggregateOfferUpdated_1 = require("./onResourceUpdated/onAggregateOfferU
 const onCategoryCodeUpdated_1 = require("./onResourceUpdated/onCategoryCodeUpdated");
 const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
 const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdated");
-const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
+// import { onResourceDeleted } from './onResourceUpdated/onResourceDeleted';
 /**
  * タスク実行関数
  */
@@ -73,7 +73,9 @@ function onResourceUpdated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const isDeleted = params.isDeleted === true;
         if (isDeleted) {
-            yield (0, onResourceDeleted_1.onResourceDeleted)(params)(repos);
+            // migrate to onResourceDeleted task(2026-01-16~)
+            throw new factory.errors.Argument('isDeleted', 'isDeleted must be false');
+            // await onResourceDeleted(params)(repos);
         }
         else {
             const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'useInformResourceTypes']);
@@ -118,6 +120,10 @@ function onResourceUpdated(params) {
                             typeOf: params.typeOf
                         }, setting)(repos);
                         break;
+                    // ルーム通知に対応(2026-01-16~)
+                    case factory.placeType.ScreeningRoom:
+                        yield createInformRoomTasks(params, setting)(repos);
+                        break;
                     case 'AccountTitle':
                         yield createInformAccountTitleTasks({
                             project: { id: params.project.id },
@@ -433,14 +439,14 @@ function createInformMovieTheaterTasks(params, setting) {
             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
         // ルームを検索
-        const screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
+        const screeningRooms = yield repos.screeningRoom.findRooms({
             containedInPlace: { id: { $eq: movieTheater.id } }
         });
         const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
                     return {
                         branchCode: room.branchCode,
                         name: room.name,
-                        typeOf: room.typeOf,
+                        typeOf: factory.placeType.ScreeningRoom,
                         additionalProperty: room.additionalProperty,
                         address: room.address
                     };
@@ -488,6 +494,72 @@ function createInformMovieTheaterTasks(params, setting) {
         }
     });
 }
+// tslint:disable-next-line:max-func-body-length
+function createInformRoomTasks(params, setting) {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // const informResources = settings.onResourceUpdated.informResource;
+        const informResources = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
+        if (Array.isArray(params.branchCode) && params.branchCode.length > 0) {
+            // ルームを検索
+            const rooms = (yield repos.screeningRoom.findRooms({
+                project: { id: { $eq: params.project.id } },
+                branchCode: { $in: params.branchCode },
+                containedInPlace: { id: { $eq: params.containedInPlace.id } }
+            }));
+            const rooms4inform = rooms.map((room) => {
+                return {
+                    branchCode: room.branchCode,
+                    name: room.name,
+                    typeOf: factory.placeType.ScreeningRoom,
+                    additionalProperty: room.additionalProperty,
+                    address: room.address,
+                    containedInPlace: { id: params.containedInPlace.id }
+                };
+            });
+            if (rooms4inform.length > 0) {
+                const taskRunsAt = new Date();
+                const informTasks = [];
+                informResources === null || informResources === void 0 ? void 0 : informResources.forEach((informResource) => {
+                    var _a;
+                    const informUrl = String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                    rooms4inform.forEach((room4inform) => {
+                        var _a;
+                        const informActionAttributes = {
+                            object: room4inform,
+                            recipient: {
+                                id: '',
+                                name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                                typeOf: factory.creativeWorkType.WebApplication
+                            },
+                            target: {
+                                httpMethod: 'POST',
+                                encodingType: factory.encodingFormat.Application.json,
+                                typeOf: 'EntryPoint',
+                                urlTemplate: informUrl
+                            }
+                        };
+                        informTasks.push({
+                            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                            name: factory.taskName.TriggerWebhook,
+                            status: factory.taskStatus.Ready,
+                            runsAt: taskRunsAt,
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: informActionAttributes
+                        });
+                    });
+                });
+                if (informTasks.length > 0) {
+                    yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                }
+            }
+        }
+    });
+}
 function createInformAccountTitleTasks(params, setting) {
     return (repos
     // settings: Settings

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

@@ -216,7 +216,7 @@ function syncEvents(params) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
             // console.log('movieTheater:', movieTheater);
-            const screeningRoom = (yield repos.screeningRoom.searchScreeningRooms({
+            const screeningRoom = (yield repos.screeningRoom.findRooms({
                 project: { id: { $eq: params.project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } },
                 branchCode: { $eq: roomCode }

package/lib/chevre/service/taskHandler.js

@@ -59,6 +59,7 @@ function executeTask(task, next) {
                 case factory.taskName.ImportOffersFromCOA:
                 case factory.taskName.InvalidatePaymentUrl:
                 case factory.taskName.OnAuthorizationCreated:
+                case factory.taskName.OnResourceDeleted:
                 case factory.taskName.Pay:
                 case factory.taskName.PublishPaymentUrl:
                 case factory.taskName.Refund:

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.7",
-    "@cinerino/sdk": "12.12.1",
+    "@chevre/factory": "5.4.0-alpha.19",
+    "@cinerino/sdk": "12.13.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -33,6 +33,7 @@
   "description": "Chevre Domain Library for Node.js",
   "devDependencies": {
     "@eslint/js": "9.16.0",
+    "@json2csv/plainjs": "7.0.6",
     "@sendgrid/helpers": "8.0.0",
     "@types/debug": "0.0.30",
     "@types/google-libphonenumber": "^7.4.19",
@@ -115,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.3"
+  "version": "23.2.0-alpha.30"
 }

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);

package/lib/chevre/service/eventOld.d.ts

@@ -1,60 +0,0 @@
-/**
- * マスターデータ同期サービス
- */
-import type * as COA from '@motionpicture/coa-service';
-import type { ActionRepo } from '../repo/action';
-import type { CategoryCodeRepo } from '../repo/categoryCode';
-import type { CreativeWorkRepo } from '../repo/creativeWork';
-import type { EventRepo } from '../repo/event';
-import type { EventSeriesRepo } from '../repo/eventSeries';
-import type { MovieTheaterRepo } from '../repo/place/movieTheater';
-import type { ScreeningRoomRepo } from '../repo/place/screeningRoom';
-import type { SellerRepo } from '../repo/seller';
-import * as factory from '../factory';
-interface IImportFromCOAParams {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    /**
-     * 施設コード
-     */
-    locationBranchCode: string;
-    importFrom: Date;
-    importThrough: Date;
-    /**
-     * 施設を保管するかどうか
-     */
-    saveMovieTheater: boolean;
-    /**
-     * 施設コンテンツを保管するかどうか
-     */
-    saveScreeningEventSeries: boolean;
-    saveScreeningEventSeriesPeriodInMonth: number;
-}
-/**
- * イベントをインポートする
- */
-declare function importFromCOA(params: IImportFromCOAParams): (repos: {
-    action: ActionRepo;
-    categoryCode: CategoryCodeRepo;
-    creativeWork: CreativeWorkRepo;
-    event: EventRepo;
-    eventSeries: EventSeriesRepo;
-    movieTheater: MovieTheaterRepo;
-    screeningRoom: ScreeningRoomRepo;
-    seller: SellerRepo;
-    masterService: COA.service.Master;
-}) => Promise<void>;
-/**
- * COA情報からイベントIDを作成する
- */
-declare function createScreeningEventIdFromCOA(params: {
-    theaterCode: string;
-    titleCode: string;
-    titleBranchNum: string;
-    dateJouei: string;
-    screenCode: string;
-    timeBegin: string;
-}): string;
-export { importFromCOA, createScreeningEventIdFromCOA };