@chevre/domain 20.4.0-alpha.35 → 20.4.0-alpha.37

package/example/src/chevre/aggregateEventReservation.ts

@@ -16,11 +16,12 @@ async function main() {
 
     // const now = new Date();
     await chevre.service.aggregation.event.aggregateScreeningEvent({
-        id: 'blaqxj0ak'
+        id: String(process.env.EVENT_ID)
     })({
         event: new chevre.repository.Event(mongoose.connection),
         eventAvailability: new chevre.repository.itemAvailability.ScreeningEvent(client),
         offer: new chevre.repository.Offer(mongoose.connection),
+        offerCatalog: new chevre.repository.OfferCatalog(mongoose.connection),
         offerRateLimit: new chevre.repository.rateLimit.Offer(client),
         place: new chevre.repository.Place(mongoose.connection),
         product: new chevre.repository.Product(mongoose.connection),

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -1,6 +1,7 @@
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { RedisRepository as EventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
@@ -12,6 +13,7 @@ export declare type IAggregateScreeningEventOperation<T> = (repos: {
     event: EventRepo;
     eventAvailability: EventAvailabilityRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;
     place: PlaceRepo;
     product: ProductRepo;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -89,18 +89,15 @@ function aggregateByEvent(params) {
             event: event,
             screeningRoom: screeningRoom
         })(repos);
-        // プロジェクト限定(2023-02-22~)
         // オファーごとの集計
         let aggregateOffer;
-        if (settings_1.settings.useAggregateOfferProjects.includes(event.project.id)) {
-            aggregateOffer = yield aggregateOfferByEvent({
-                aggregateDate: now,
-                event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
-                    remainingAttendeeCapacity }),
-                screeningRoom: screeningRoom
-            })(repos);
-            debug('offers aggregated', aggregateOffer);
-        }
+        aggregateOffer = yield aggregateOfferByEvent({
+            aggregateDate: now,
+            event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
+                remainingAttendeeCapacity }),
+            screeningRoom: screeningRoom
+        })(repos);
+        debug('offers aggregated', aggregateOffer);
         // 値がundefinedの場合に更新しないように注意
         const update = {
             $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
@@ -133,26 +130,36 @@ function reservedSeatsAvailable(params) {
 function aggregateOfferByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const availableOffers = yield findOffers(params)(repos);
-        // オファーごとの予約集計
-        const offersWithAggregateReservation = [];
-        for (const o of availableOffers) {
-            const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
-                aggregateDate: params.aggregateDate,
-                event: params.event,
-                screeningRoom: params.screeningRoom,
-                offer: o
-            })(repos);
-            offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation, name: {
-                    en: (_a = o.name) === null || _a === void 0 ? void 0 : _a.en,
-                    ja: (_b = o.name) === null || _b === void 0 ? void 0 : _b.ja
-                } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_c = o.category) === null || _c === void 0 ? void 0 : _c.codeValue) === 'string') ? { category: o.category } : undefined));
+        // プロジェクト限定(2023-02-22~)
+        if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
+            const availableOffers = yield findOffers(params)(repos);
+            // オファーごとの予約集計
+            const offersWithAggregateReservation = [];
+            for (const o of availableOffers) {
+                const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
+                    aggregateDate: params.aggregateDate,
+                    event: params.event,
+                    screeningRoom: params.screeningRoom,
+                    offer: o
+                })(repos);
+                offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation, name: {
+                        en: (_a = o.name) === null || _a === void 0 ? void 0 : _a.en,
+                        ja: (_b = o.name) === null || _b === void 0 ? void 0 : _b.ja
+                    } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_c = o.category) === null || _c === void 0 ? void 0 : _c.codeValue) === 'string') ? { category: o.category } : undefined));
+            }
+            return {
+                typeOf: factory.offerType.AggregateOffer,
+                offerCount: availableOffers.length,
+                offers: offersWithAggregateReservation
+            };
+        }
+        else {
+            const { offerCount } = yield calculateOfferCount({ event: params.event })(repos);
+            return {
+                typeOf: factory.offerType.AggregateOffer,
+                offerCount
+            };
         }
-        return {
-            typeOf: factory.offerType.AggregateOffer,
-            offerCount: availableOffers.length,
-            offers: offersWithAggregateReservation
-        };
     });
 }
 /**
@@ -194,6 +201,33 @@ function findOffers(params) {
         return availableOffers;
     });
 }
+function calculateOfferCount(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        let offerCount = 0;
+        try {
+            const eventOffers = params.event.offers;
+            if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                    const catalogs = yield repos.offerCatalog.search({
+                        limit: 1,
+                        page: 1,
+                        id: { $in: [eventService.hasOfferCatalog.id] }
+                    });
+                    const numberOfItems = (_c = catalogs.shift()) === null || _c === void 0 ? void 0 : _c.numberOfItems;
+                    if (typeof numberOfItems === 'number') {
+                        offerCount = numberOfItems;
+                    }
+                }
+            }
+        }
+        catch (error) {
+            throw error;
+        }
+        return { offerCount };
+    });
+}
 function aggregateReservationByOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let reservationCount4offer;

package/lib/chevre/service/payment/movieTicket/factory.d.ts

@@ -3,7 +3,7 @@ import * as factory from '../../../factory';
 export declare function createSeatInfoSyncIn(params: {
     paymentMethodType: string;
     paymentMethodId: string;
-    movieTickets: factory.paymentMethod.paymentCard.movieTicket.IMovieTicket[];
+    movieTickets: factory.action.trade.pay.IMovieTicket[];
     event: factory.event.screeningEvent.IEvent;
     purpose: factory.action.trade.pay.IPurpose;
     seller: factory.seller.ISeller;

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -6,11 +6,10 @@ import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
-declare type IMovieTicket = factory.paymentMethod.paymentCard.movieTicket.IMovieTicket;
 interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
     purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
-    movieTickets: IMovieTicket[];
+    movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
 }
 interface ICheckOperationRepos {
     action: ActionRepo;
@@ -48,7 +47,7 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
  * MovieTicket認証
  */
 declare function checkByIdentifier(params: {
-    movieTickets: IMovieTicket[];
+    movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
     seller: factory.seller.ISeller;
     screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     paymentServiceId: string;

package/lib/chevre/service/payment/movieTicket.js

@@ -195,7 +195,7 @@ function purchaseNumberAuthResult2movieTickets(params) {
                         // tslint:disable-next-line:prefer-array-literal
                         [...Array(Number(ykknInfo.ykknKnshbtsmiNum))].forEach(() => {
                             movieTickets.push({
-                                project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
+                                // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
                                 typeOf: paymentMethodType,
                                 identifier: knyknrNoInfo.knyknrNo,
                                 accessCode: knyknrNoInfo.pinCd,
@@ -207,16 +207,16 @@ function purchaseNumberAuthResult2movieTickets(params) {
                                     reservationFor: {
                                         typeOf: params.screeningEvent.typeOf,
                                         id: params.screeningEvent.id
-                                    },
-                                    reservedTicket: {
-                                        ticketedSeat: {
-                                            typeOf: factory.placeType.Seat,
-                                            // seatingType: 'Default', // 情報空でよし
-                                            seatNumber: '',
-                                            seatRow: '',
-                                            seatSection: '' // 情報空でよし
-                                        }
                                     }
+                                    // reservedTicket: {
+                                    //     ticketedSeat: {
+                                    //         typeOf: factory.placeType.Seat,
+                                    //         // seatingType: 'Default', // 情報空でよし
+                                    //         seatNumber: '', // 情報空でよし
+                                    //         seatRow: '', // 情報空でよし
+                                    //         seatSection: '' // 情報空でよし
+                                    //     }
+                                    // }
                                 }
                             });
                         });
@@ -226,7 +226,9 @@ function purchaseNumberAuthResult2movieTickets(params) {
                     knyknrNoInfoOut.mkknInfo.forEach((mkknInfo) => {
                         // tslint:disable-next-line:prefer-array-literal
                         [...Array(Number(mkknInfo.mkknKnshbtsmiNum))].forEach(() => {
-                            movieTickets.push(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id }, typeOf: paymentMethodType, identifier: knyknrNoInfo.knyknrNo, accessCode: knyknrNoInfo.pinCd, category: {
+                            movieTickets.push(Object.assign({ 
+                                // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
+                                typeOf: paymentMethodType, identifier: knyknrNoInfo.knyknrNo, accessCode: knyknrNoInfo.pinCd, category: {
                                     codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
                                 }, amount: {
                                     typeOf: 'MonetaryAmount',
@@ -237,16 +239,16 @@ function purchaseNumberAuthResult2movieTickets(params) {
                                     reservationFor: {
                                         typeOf: params.screeningEvent.typeOf,
                                         id: params.screeningEvent.id
-                                    },
-                                    reservedTicket: {
-                                        ticketedSeat: {
-                                            typeOf: factory.placeType.Seat,
-                                            // seatingType: 'Default', // 情報空でよし
-                                            seatNumber: '',
-                                            seatRow: '',
-                                            seatSection: '' // 情報空でよし
-                                        }
                                     }
+                                    // reservedTicket: {
+                                    //     ticketedSeat: {
+                                    //         typeOf: factory.placeType.Seat,
+                                    //         // seatingType: 'Default', // 情報空でよし
+                                    //         seatNumber: '', // 情報空でよし
+                                    //         seatRow: '', // 情報空でよし
+                                    //         seatSection: '' // 情報空でよし
+                                    //     }
+                                    // }
                                 } }, {
                                 validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')
                                     .toDate()

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

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const event_1 = require("../../repo/event");
 const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
@@ -33,6 +34,7 @@ function call(data) {
             event: new event_1.MongoRepository(settings.connection),
             eventAvailability: new screeningEvent_1.RedisRepository(settings.redisClient),
             offer: new offer_1.MongoRepository(settings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),
             place: new place_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.293.0-alpha.0",
-    "@cinerino/sdk": "3.143.0",
+    "@chevre/factory": "4.293.0-alpha.1",
+    "@cinerino/sdk": "3.144.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.35"
+  "version": "20.4.0-alpha.37"
 }