@chevre/domain 20.2.0-alpha.12 → 20.2.0-alpha.13

package/example/src/chevre/aggregateEventReservation.ts

@@ -0,0 +1,37 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import * as redis from 'redis';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: <string>process.env.PROJECT_ID };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    const client = redis.createClient({
+        host: process.env.REDIS_HOST,
+        port: Number(process.env.REDIS_PORT),
+        password: process.env.REDIS_KEY
+    });
+
+    // const now = new Date();
+    await chevre.service.aggregation.event.aggregateScreeningEvent({
+        id: 'alb35u7m4'
+    })({
+        event: new chevre.repository.Event(mongoose.connection),
+        eventAvailability: new chevre.repository.itemAvailability.ScreeningEvent(client),
+        offer: new chevre.repository.Offer(mongoose.connection),
+        offerRateLimit: new chevre.repository.rateLimit.Offer(client),
+        place: new chevre.repository.Place(mongoose.connection),
+        product: new chevre.repository.Product(mongoose.connection),
+        project: new chevre.repository.Project(mongoose.connection),
+        reservation: new chevre.repository.Reservation(mongoose.connection),
+        task: new chevre.repository.Task(mongoose.connection)
+    });
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/importEventsFromCOA.ts

@@ -14,6 +14,7 @@ async function main() {
     const categoryCodeRepo = new chevre.repository.CategoryCode(mongoose.connection);
     const eventRepo = new chevre.repository.Event(mongoose.connection);
     const placeRepo = new chevre.repository.Place(mongoose.connection);
+    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
 
     await chevre.service.event.importFromCOA({
         project: {
@@ -28,7 +29,13 @@ async function main() {
             .toDate(),
         saveMovieTheater: false,
         saveScreeningEventSeries: false
-    })({ action: actionRepo, categoryCode: categoryCodeRepo, event: eventRepo, place: placeRepo });
+    })({
+        action: actionRepo,
+        categoryCode: categoryCodeRepo,
+        event: eventRepo,
+        place: placeRepo,
+        seller: sellerRepo
+    });
     console.log('imported');
 }
 

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

@@ -3,6 +3,7 @@ import { MongoRepository as CategoryCodeRepo } from '../repo/categoryCode';
 import { MongoRepository as EventRepo } from '../repo/event';
 import { MongoRepository as PlaceRepo } from '../repo/place';
 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';
 /**
@@ -32,6 +33,7 @@ export declare function importFromCOA(params: {
     categoryCode: CategoryCodeRepo;
     event: EventRepo;
     place: PlaceRepo;
+    seller: SellerRepo;
 }) => Promise<void>;
 /**
  * COA情報からイベントIDを作成する

package/lib/chevre/service/event.js

@@ -89,8 +89,18 @@ function importFromCOA(params) {
                 endpoint: credentials_1.credentials.coa.endpoint,
                 auth: coaAuthClient
             }, { timeout: credentials_1.credentials.coa.timeout });
+            // 同ブランチコードの販売者を検索する
+            const sellersWithSameBranchCode = yield repos.seller.search({
+                limit: 1,
+                page: 1,
+                branchCode: { $eq: params.locationBranchCode }
+            });
+            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, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
+            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);
@@ -539,11 +549,12 @@ function createScreeningEventSeriesFromCOA(params) {
             kanaName: params.movieTheater.kanaName,
             typeOf: params.movieTheater.typeOf
         },
-        organizer: {
-            typeOf: factory.organizationType.Corporation,
-            identifier: params.movieTheater.id,
-            name: params.movieTheater.name
-        },
+        // 不要なので廃止(2023-01-12~)
+        // organizer: {
+        //     typeOf: factory.organizationType.Corporation,
+        //     identifier: params.movieTheater.id,
+        //     name: params.movieTheater.name
+        // },
         videoFormat: params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0],
         soundFormat: [],
         workPerformed: {
@@ -617,7 +628,7 @@ function createScreeningEventSeriesId(params) {
  */
 // tslint:disable-next-line:no-single-line-block-comment
 /* istanbul ignore next */
-function createMovieTheaterFromCOA(project, theaterFromCOA, screensFromCOA) {
+function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromCOA) {
     const id = `MovieTheater-${theaterFromCOA.theaterCode}`;
     return {
         project: { typeOf: project.typeOf, id: project.id },
@@ -663,7 +674,8 @@ function createMovieTheaterFromCOA(project, theaterFromCOA, screensFromCOA) {
                 value: 2678400,
                 unitCode: factory.unitCode.Sec
             }
-        }
+        },
+        parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };
 }
 /**

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

@@ -39,10 +39,6 @@ function searchTransportationEventTicketOffers(params) {
             throw new factory.errors.NotFound('event.offers.itemOffered.id');
         }
         const { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({ project: { id: screeningEvent.project.id }, soundFormatTypes, videoFormatTypes })(repos);
-        const screeningEventOfferSettings = screeningEvent.offers;
-        if (screeningEventOfferSettings === undefined) {
-            throw new factory.errors.NotFound('event.offers');
-        }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event: screeningEvent });
         // 不許可決済方法があれば、該当オファーを除外
         if (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0) {
@@ -94,7 +90,7 @@ function searchTransportationEventTicketOffers(params) {
         });
         let offers4event = availableOffers.map((availableOffer) => {
             return (0, factory_1.createCompoundPriceSpec4event)({
-                eligibleQuantity: screeningEventOfferSettings.eligibleQuantity,
+                eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
                 videoFormatChargeSpecifications,
                 soundFormatChargeSpecifications,

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

@@ -14,6 +14,7 @@ const action_1 = require("../../repo/action");
 const categoryCode_1 = require("../../repo/categoryCode");
 const event_1 = require("../../repo/event");
 const place_1 = require("../../repo/place");
+const seller_1 = require("../../repo/seller");
 const EventService = require("../event");
 /**
  * タスク実行関数
@@ -24,7 +25,8 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             categoryCode: new categoryCode_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
-            place: new place_1.MongoRepository(settings.connection)
+            place: new place_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection)
         });
     });
 }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.6",
-    "@cinerino/sdk": "3.135.0-alpha.7",
+    "@chevre/factory": "4.281.0",
+    "@cinerino/sdk": "3.135.0",
     "@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.2.0-alpha.12"
+  "version": "20.2.0-alpha.13"
 }