@chevre/domain 21.2.0-alpha.99 → 21.3.0-alpha.0

package/lib/chevre/service/event.js

@@ -22,7 +22,6 @@ const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
 const offer_1 = require("./offer");
-// const customsearch = google.customsearch('v1');
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
@@ -94,23 +93,34 @@ function importFromCOA(params) {
                 limit: 1,
                 page: 1,
                 branchCode: { $eq: params.locationBranchCode }
-            });
+            }, ['_id'], []);
             const seller = sellersWithSameBranchCode.shift();
             if (typeof (seller === null || seller === void 0 ? void 0 : seller.id) !== 'string') {
                 throw new factory.errors.NotFound('Seller', `Seller with branchCod '${params.locationBranchCode}' not found`);
             }
-            // 施設取得
-            let movieTheater = createMovieTheaterFromCOA(project, { id: seller.id }, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
             // saveMovieTheater:trueの場合のみ、施設保管(2022-10-10~)
             if (params.saveMovieTheater === true) {
-                movieTheater = yield repos.place.saveMovieTheaterByBranchCode4coa(movieTheater);
+                const savingMovieTheater = createMovieTheaterFromCOA(project, { id: seller.id }, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
+                yield repos.place.saveMovieTheaterByBranchCode4coa(savingMovieTheater);
+                // } else {
+                //     movieTheater = await repos.place.findMovieTheaterByBranchCode({
+                //         project: { id: project.id },
+                //         branchCode: creatingMovieTheater.branchCode
+                //     });
             }
-            else {
-                movieTheater = yield repos.place.findMovieTheaterByBranchCode({
-                    project: { id: movieTheater.project.id },
-                    branchCode: movieTheater.branchCode
-                });
+            const movieTheaters = yield repos.place.searchMovieTheaters({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: project.id } },
+                branchCode: { $eq: params.locationBranchCode }
+            }, ['_id', 'typeOf', 'branchCode', 'name', 'kanaName'], []);
+            const movieTheater = movieTheaters.shift();
+            if (movieTheater === undefined) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
+            const screeningRooms = yield repos.place.searchScreeningRooms({
+                containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
+            });
             const targetImportFrom = moment(`${moment(params.importFrom)
                 .tz('Asia/Tokyo')
                 .format('YYYY-MM-DD')}T00:00:00+09:00`);
@@ -121,7 +131,7 @@ function importFromCOA(params) {
             debug('importing screening events...', targetImportFrom, targetImportThrough);
             const { screeningEventSerieses, savedEventsCount } = yield saveScreeningEventSeries({
                 locationBranchCode: params.locationBranchCode,
-                movieTheater: movieTheater,
+                movieTheater,
                 project: project,
                 saveScreeningEventSeries: params.saveScreeningEventSeries
             })(repos);
@@ -130,7 +140,8 @@ function importFromCOA(params) {
                 // イベント永続化
                 const screeningEvents = yield saveScreeningEvents({
                     locationBranchCode: params.locationBranchCode,
-                    movieTheater: movieTheater,
+                    // movieTheater: movieTheater,
+                    screeningRooms,
                     screeningEventSerieses: screeningEventSerieses,
                     project: project,
                     targetImportFrom: targetImportFrom.toDate(),
@@ -183,7 +194,6 @@ function importFromCOA(params) {
 exports.importFromCOA = importFromCOA;
 function saveScreeningEventSeries(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const movieTheater = params.movieTheater;
         const project = params.project;
         const masterService = new COA.service.Master({
             endpoint: credentials_1.credentials.coa.endpoint,
@@ -214,12 +224,12 @@ function saveScreeningEventSeries(params) {
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        });
+        }, [], []);
         const screeningEventSerieses = filmsFromCOA.map((filmFromCOA) => {
             return createScreeningEventSeriesFromCOA({
                 project: project,
                 filmFromCOA: filmFromCOA,
-                movieTheater: movieTheater,
+                movieTheater: params.movieTheater,
                 eirinKubuns: eirinKubuns,
                 eizouKubuns: eizouKubuns,
                 joueihousikiKubuns: joueihousikiKubuns,
@@ -293,7 +303,7 @@ function saveScreeningEvents(params) {
 }
 function createScreeningEvents(params) {
     return () => __awaiter(this, void 0, void 0, function* () {
-        const movieTheater = params.movieTheater;
+        // const movieTheater = params.movieTheater;
         const screeningEventSerieses = params.screeningEventSerieses;
         const project = params.project;
         const masterService = new COA.service.Master({
@@ -329,8 +339,11 @@ function createScreeningEvents(params) {
                 titleCode: scheduleFromCOA.titleCode,
                 titleBranchNum: scheduleFromCOA.titleBranchNum
             });
-            // スクリーン存在チェック
-            const screenRoom = movieTheater.containsPlace.find((place) => place.branchCode === scheduleFromCOA.screenCode);
+            // ルーム存在チェック
+            const screenRoom = params.screeningRooms.find((place) => place.branchCode === scheduleFromCOA.screenCode);
+            // const screenRoom = <factory.place.screeningRoom.IPlace | undefined>movieTheater.containsPlace.find(
+            //     (place) => place.branchCode === scheduleFromCOA.screenCode
+            // );
             if (screenRoom === undefined) {
                 // tslint:disable-next-line:no-console
                 console.error('screenRoom not found.', scheduleFromCOA.screenCode);
@@ -448,7 +461,15 @@ function createScreeningEventFromCOA(params) {
             typeOf: 'WebAPI',
             identifier: factory.service.webAPI.Identifier.COA
         },
-        priceCurrency: factory.priceCurrency.JPY
+        priceCurrency: factory.priceCurrency.JPY,
+        itemOffered: {
+            serviceOutput: {
+                reservedTicket: {
+                    typeOf: 'Ticket',
+                    ticketedSeat: { typeOf: factory.placeType.Seat }
+                }
+            }
+        }
     };
     const { additionalProperty, coaInfo } = createScreeningEventAdditionalPropertyFromCOA(params);
     return {
@@ -586,7 +607,10 @@ function createScreeningEventSeriesFromCOA(params) {
         endDate: endDate,
         startDate: startDate,
         coaInfo,
-        offers: Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
+        offers: Object.assign({ 
+            // 不要なので廃止(2023-06-09~)
+            // project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
         additionalProperty
     };
 }
@@ -767,8 +791,14 @@ function updateEvent4ttts(params) {
             throw error;
         }
         // アクション完了
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, offer_1.onEventChanged)({ event, isNew: false })({
+        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
+        yield (0, offer_1.onEventChanged)({
+            id: [event.id],
+            project: { id: event.project.id },
+            typeOf: event.typeOf,
+            isNew: false,
+            useInform: true
+        })({
             event: repos.event,
             project: repos.project,
             task: repos.task

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

@@ -18,6 +18,10 @@ export declare function searchPermissions(params: {
     member: MemberRepo;
     role: RoleRepo;
 }) => Promise<{
-    roleNames: string[];
-    permissions: IPermission[];
+    hasRole: {
+        roleName: string;
+    }[];
+    permissions: {
+        _id: string;
+    }[];
 }>;

package/lib/chevre/service/iam.js

@@ -16,18 +16,32 @@ exports.searchPermissions = void 0;
 function searchPermissions(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let permissions = [];
-        // プロジェクトメンバーを検索
-        const projectMembers = yield repos.member.search({
+        const hasRole = yield repos.member.aggregateRoleNames({
             project: { id: { $eq: params.project.id } },
             member: { id: { $eq: params.member.id } }
         });
-        // 持っているロールを検索
-        const roleNames = projectMembers.reduce((a, b) => [...a, ...(Array.isArray(b.member.hasRole)) ? b.member.hasRole.map((r) => r.roleName) : []], []);
-        const roles = yield repos.role.search({ roleName: { $in: roleNames } });
-        // 権限をまとめる
-        permissions = roles.reduce((a, b) => [...a, ...b.permissions], []);
-        permissions = [...new Set(permissions)];
-        return { roleNames, permissions };
+        if (hasRole.length > 0) {
+            permissions = yield repos.role.aggregatePermissions({ roleName: { $in: hasRole.map((r) => r.roleName) } });
+        }
+        return { hasRole, permissions };
+        // let permissions: IPermission[] = [];
+        // const projectMembers = await repos.member.search({
+        //     project: { id: { $eq: params.project.id } },
+        //     member: { id: { $eq: params.member.id } }
+        // });
+        // // 持っているロールを検索
+        // const roleNames = projectMembers.reduce<string[]>(
+        //     (a, b) => [...a, ...(Array.isArray(b.member.hasRole)) ? b.member.hasRole.map((r) => r.roleName) : []],
+        //     []
+        // );
+        // const roles = await repos.role.search({ roleName: { $in: roleNames } });
+        // // 権限をまとめる
+        // permissions = roles.reduce<string[]>(
+        //     (a, b) => [...a, ...b.permissions],
+        //     []
+        // );
+        // permissions = [...new Set(permissions)];
+        // return { roleNames, permissions };
     });
 }
 exports.searchPermissions = searchPermissions;

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

@@ -156,7 +156,6 @@ function responseBody2acceptedOffers4result(params) {
     // 予約取引からacceptedOffers4resultを生成する
     if (Array.isArray(params.objectSubReservations)) {
         acceptedOffers4result = params.objectSubReservations.map((itemOffered) => {
-            var _a;
             const reservation = createReservation({
                 project: params.project,
                 itemOffered,
@@ -184,7 +183,8 @@ function responseBody2acceptedOffers4result(params) {
                     }
                     : undefined);
             });
-            return {
+            // tslint:disable-next-line:no-unnecessary-local-variable
+            const resultAcceptedOffer = {
                 typeOf: factory.offerType.Offer,
                 id: itemOffered.reservedTicket.ticketType.id,
                 name: itemOffered.reservedTicket.ticketType.name,
@@ -195,17 +195,20 @@ function responseBody2acceptedOffers4result(params) {
                     priceCurrency: priceSpecification.priceCurrency,
                     typeOf: priceSpecification.typeOf,
                     valueAddedTaxIncluded: priceSpecification.valueAddedTaxIncluded
-                },
-                priceCurrency: (typeof itemOffered.priceCurrency === 'string')
-                    ? itemOffered.priceCurrency
-                    : factory.priceCurrency.JPY,
-                seller: {
-                    typeOf: params.seller.typeOf,
-                    name: (typeof params.seller.name === 'string')
-                        ? params.seller.name
-                        : String((_a = params.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
                 }
+                // 不要なので廃止(2023-07-01~)
+                // priceCurrency: (typeof itemOffered.priceCurrency === 'string')
+                //     ? itemOffered.priceCurrency
+                //     : factory.priceCurrency.JPY,
+                // 不要なので廃止(2023-07-01~)
+                // seller: {
+                //     typeOf: params.seller.typeOf,
+                //     name: (typeof params.seller.name === 'string')
+                //         ? params.seller.name
+                //         : String(params.seller.name?.ja)
+                // }
             };
+            return resultAcceptedOffer;
         });
     }
     return acceptedOffers4result;
@@ -252,7 +255,10 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
         }
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        reservationItem = Object.assign({ 
+            // 不要なので廃止(2023-07-01~)
+            // project: itemOffered.project,
+            typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
@@ -280,7 +286,10 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
         }
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        reservationItem = Object.assign({ 
+            // 不要なので廃止(2023-07-01~)
+            // project: itemOffered.project,
+            typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -20,7 +20,7 @@ function importFromCOA(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.CurrencyType } }
-        });
+        }, [], []);
         const defaultCurrencyType = currencyTypes.shift();
         // メンバーシップ区分検索
         const membershipTypes = yield repos.categoryCode.search({
@@ -28,7 +28,7 @@ function importFromCOA(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.MembershipType } }
-        });
+        }, [], []);
         const defaultMembershipType = membershipTypes.shift();
         try {
             const ticketResults = yield repos.masterService.ticket({ theaterCode: params.theaterCode });

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

@@ -171,7 +171,10 @@ function responseBody2acceptedOffers4result(params) {
                 }
             }
         };
-        const reservation = Object.assign(Object.assign(Object.assign({ project: { typeOf: event.project.typeOf, id: event.project.id }, typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
+        const reservation = Object.assign(Object.assign(Object.assign({ 
+            // 不要なので廃止(2023-07-01~)
+            // project: { typeOf: event.project.typeOf, id: event.project.id },
+            typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
             // numSeats: 1, // 廃止(2022-08-18~)
             reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
         if (requestedOffer.priceSpecification === undefined) {
@@ -183,19 +186,23 @@ function responseBody2acceptedOffers4result(params) {
             valueAddedTaxIncluded: requestedOffer.priceSpecification.valueAddedTaxIncluded,
             priceComponent: requestedOffer.priceSpecification.priceComponent
         };
-        return {
+        // tslint:disable-next-line:no-unnecessary-local-variable
+        const resultAcceptedOffer = {
             typeOf: factory.offerType.Offer,
             id: requestedOffer.id,
             name: requestedOffer.name,
             itemOffered: reservation,
             offeredThrough: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
-            priceSpecification,
-            priceCurrency: factory.priceCurrency.JPY,
-            seller: {
-                typeOf: params.seller.typeOf,
-                name: params.seller.name
-            }
+            priceSpecification
+            // 不要なので廃止(2023-07-01~)
+            // priceCurrency: factory.priceCurrency.JPY,
+            // 不要なので廃止(2023-07-01~)
+            // seller: {
+            //     typeOf: params.seller.typeOf,
+            //     name: params.seller.name
+            // }
         };
+        return resultAcceptedOffer;
     }));
     return acceptedOffers4result;
 }

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

@@ -29,21 +29,19 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
-            id: params.object.event.id
-        });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id });
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        });
+        }, [], []);
         const seatingTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-        });
+        }, [], []);
         const videoFormatTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
-        });
+        }, [], []);
         // COA仮予約後にリクエストが来る前提
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,
@@ -183,15 +181,15 @@ function changeOffers(params) {
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        });
+        }, [], []);
         const seatingTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-        });
+        }, [], []);
         const videoFormatTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
-        });
+        }, [], []);
         // COA仮予約後にリクエストが来る前提
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,

package/lib/chevre/service/offer/product/factory.js

@@ -78,6 +78,7 @@ function acceptedOffers2amount(params) {
         return a + priceSpecification.priceComponent.reduce((a2, b2) => a2 + Number(b2.price), 0);
     }, 0);
 }
+// tslint:disable-next-line:max-func-body-length
 function responseBody2resultAcceptedOffer(params) {
     let acceptedOffers = [];
     if (Array.isArray(params.responseBody.object)) {
@@ -90,7 +91,10 @@ function responseBody2resultAcceptedOffer(params) {
             }
             // itemOfferedを最小限に最適化
             const permitByResponse = responseBodyObject.itemOffered.serviceOutput;
-            const itemOffered = Object.assign(Object.assign({ project: permitByResponse.project, typeOf: permitByResponse.typeOf, identifier: permitByResponse.identifier, issuedThrough: permitByResponse.issuedThrough, name: permitByResponse.name }, (typeof permitByResponse.validFor === 'string') ? { validFor: permitByResponse.validFor } : undefined), (typeof ((_c = permitByResponse.amount) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? { amount: permitByResponse.amount } : undefined);
+            const itemOffered = Object.assign(Object.assign({ 
+                // 不要なので廃止(2023-07-01~)
+                // project: permitByResponse.project,
+                typeOf: permitByResponse.typeOf, identifier: permitByResponse.identifier, issuedThrough: permitByResponse.issuedThrough, name: permitByResponse.name }, (typeof permitByResponse.validFor === 'string') ? { validFor: permitByResponse.validFor } : undefined), (typeof ((_c = permitByResponse.amount) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? { amount: permitByResponse.amount } : undefined);
             const offer = params.acceptedOffer.find((o) => o.id === responseBodyObject.id);
             if (offer === undefined) {
                 throw new factory.errors.ServiceUnavailable(`Offer ${responseBodyObject.id} from registerService not found`);
@@ -132,16 +136,19 @@ function responseBody2resultAcceptedOffer(params) {
                     }
                 })
             };
-            return {
-                // project: { typeOf: params.project.typeOf, id: params.project.id },
+            // tslint:disable-next-line:no-unnecessary-local-variable
+            const permitAcceptedOffer = {
                 typeOf: responseBodyObject.typeOf,
                 id: offer.id,
                 name: offer.name,
                 itemOffered,
-                priceSpecification,
-                priceCurrency: offer.priceCurrency,
-                seller: { name: offer.seller.name, typeOf: offer.seller.typeOf }
+                priceSpecification
+                // 不要なので廃止(2023-07-01~)
+                // priceCurrency: offer.priceCurrency,
+                // 不要なので廃止(2023-07-01~)
+                // seller: { name: offer.seller.name, typeOf: offer.seller.typeOf }
             };
+            return permitAcceptedOffer;
         });
     }
     return acceptedOffers;

package/lib/chevre/service/offer/product.js

@@ -32,7 +32,7 @@ function search(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: params.itemOffered.id }
-        });
+        }, [], []);
         const product = searchProductsResult.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
@@ -206,7 +206,7 @@ function fixProductAndOffers(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: productId }
-        });
+        }, [], []);
         const product = searchProductsResult.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');

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

@@ -47,19 +47,17 @@ export declare function searchEventSeatOffersWithPaging(params: {
     stockHolder: StockHolderRepo;
     place: PlaceRepo;
 }) => Promise<factory.place.seat.IPlaceWithOffer[]>;
-interface IChangedEvent {
-    id: string;
-    typeOf: factory.eventType;
-    project: {
-        id: string;
-    };
-}
 /**
  * イベント変更時処理
  */
 export declare function onEventChanged(params: {
-    event: IChangedEvent | IChangedEvent[];
+    id: string[];
+    typeOf: factory.eventType;
+    project: {
+        id: string;
+    };
     isNew: boolean;
+    useInform?: boolean;
 }): (repos: {
     event: EventRepo;
     project: ProjectRepo;
@@ -76,3 +74,13 @@ export declare function createAggregateScreeningEventIfNotExist(params: {
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
+export declare function createInformTasks(params: {
+    project: {
+        id: string;
+    };
+    ids: string[];
+    typeOf: factory.eventType;
+}): (repos: {
+    event: EventRepo;
+    task: TaskRepo;
+}) => Promise<void>;

package/lib/chevre/service/offer.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAggregateScreeningEventIfNotExist = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+exports.createInformTasks = exports.createAggregateScreeningEventIfNotExist = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -20,6 +20,8 @@ const MoneyTransferOfferService = require("./offer/moneyTransfer");
 exports.moneyTransfer = MoneyTransferOfferService;
 const ProductOfferService = require("./offer/product");
 exports.product = ProductOfferService;
+const settings_1 = require("../settings");
+const informEvents = settings_1.settings.onEventChanged.informEvent;
 /**
  * 座席にオファー情報を付加する
  */
@@ -89,9 +91,11 @@ function searchEventSeatOffersWithPaging(params) {
                 } }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
+                    project: { id: event.project.id },
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),
+                    hasTicketedSeat: true,
                     offers: seats.map((s) => {
                         var _a;
                         return {
@@ -117,24 +121,33 @@ function searchEventSeatOffersWithPaging(params) {
     });
 }
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
+// type IChangedEvent = factory.task.onEventChanged.IChangedEvent;
 /**
  * イベント変更時処理
  */
 function onEventChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
-        if (changedEvents.length > 0) {
+        // const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
+        if (params.id.length > 0) {
             // ScreeningEventであれば集計タスク
-            if (changedEvents[0].typeOf === factory.eventType.ScreeningEvent) {
+            if (params.typeOf === factory.eventType.ScreeningEvent) {
                 yield createAggregateScreeningEventIfNotExist({
-                    project: { id: changedEvents[0].project.id },
-                    reservationFor: changedEvents.map((changedEvent) => {
-                        return { id: changedEvent.id };
+                    project: { id: params.project.id },
+                    reservationFor: params.id.map((id) => {
+                        return { id };
                     }),
                     // 新規作成の場合は強制的に集計
                     force: params.isNew
                 })(repos);
             }
+            // 通知タスク作成(2023-06-08~)
+            if (params.useInform === true) {
+                yield createInformTasks({
+                    project: { id: params.project.id },
+                    ids: params.id,
+                    typeOf: params.typeOf
+                })(repos);
+            }
         }
     });
 }
@@ -191,3 +204,53 @@ function createAggregateScreeningEventIfNotExist(params) {
     });
 }
 exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;
+function createInformTasks(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const events4inform = yield repos.event.search({
+            id: { $in: params.ids },
+            typeOf: params.typeOf
+        }, {
+            aggregateEntranceGate: 0, aggregateOffer: 0, aggregateReservation: 0,
+            remainingAttendeeCapacity: 0, checkInCount: 0, attendeeCount: 0
+        });
+        if (events4inform.length > 0) {
+            const taskRunsAt = new Date();
+            const informTasks = [];
+            informEvents === null || informEvents === void 0 ? void 0 : informEvents.forEach((informEvent) => {
+                var _a;
+                const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                events4inform.forEach((event4inform) => {
+                    var _a;
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete event4inform._id;
+                    const informActionAttributes = {
+                        agent: event4inform.project,
+                        object: event4inform,
+                        project: event4inform.project,
+                        recipient: {
+                            id: '',
+                            name: String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        },
+                        typeOf: factory.actionType.InformAction
+                    };
+                    informTasks.push({
+                        project: event4inform.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 });
+            }
+        }
+    });
+}
+exports.createInformTasks = createInformTasks;