@chevre/domain 21.2.0-alpha.16 → 21.2.0-alpha.160

package/lib/chevre/repo/trip.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
 const trip_1 = require("./mongoose/schemas/trip");
+const settings_1 = require("../settings");
 /**
  * トリップリポジトリ
  */
@@ -193,7 +194,7 @@ class MongoRepository {
             // console.log(explainResult[0].queryPlanner?.winningPlan?.inputStage?.inputStage?.inputStage);
             // console.log(explainResult);
             // return [];
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repository.d.ts

@@ -20,8 +20,10 @@ import { MongoRepository as MemberRepo } from './repo/member';
 import { MongoRepository as MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import { MongoRepository as OfferRepo } from './repo/offer';
 import { MongoRepository as OfferCatalogRepo } from './repo/offerCatalog';
+import { MongoRepository as OfferItemConditionRepo } from './repo/offerItemCondition';
 import { MongoRepository as OrderRepo } from './repo/order';
 import { MongoRepository as OwnershipInfoRepo } from './repo/ownershipInfo';
+import { MongoRepository as PaymentServiceProviderRepo } from './repo/paymentServiceProvider';
 import { MongoRepository as PermitRepo } from './repo/permit';
 import { MongoRepository as PlaceRepo } from './repo/place';
 import { MongoRepository as PriceSpecificationRepo } from './repo/priceSpecification';
@@ -123,10 +125,12 @@ export declare class Member extends MemberRepo {
  */
 export declare class MerchantReturnPolicy extends MerchantReturnPolicyRepo {
 }
-export declare class Offer extends OfferRepo {
-}
 export declare class OfferCatalog extends OfferCatalogRepo {
 }
+export declare class OfferItemCondition extends OfferItemConditionRepo {
+}
+export declare class Offer extends OfferRepo {
+}
 /**
  * 注文リポジトリ
  */
@@ -142,6 +146,11 @@ export declare class OrderNumber extends OrderNumberRepo {
  */
 export declare class OwnershipInfo extends OwnershipInfoRepo {
 }
+/**
+ * 決済サービスプロバイダー
+ */
+export declare class PaymentServiceProvider extends PaymentServiceProviderRepo {
+}
 export declare namespace paymentMethod {
     /**
      * クレジットカードリポジトリ

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -24,8 +24,10 @@ const member_1 = require("./repo/member");
 const merchantReturnPolicy_1 = require("./repo/merchantReturnPolicy");
 const offer_1 = require("./repo/offer");
 const offerCatalog_1 = require("./repo/offerCatalog");
+const offerItemCondition_1 = require("./repo/offerItemCondition");
 const order_1 = require("./repo/order");
 const ownershipInfo_1 = require("./repo/ownershipInfo");
+const paymentServiceProvider_1 = require("./repo/paymentServiceProvider");
 const permit_1 = require("./repo/permit");
 const place_1 = require("./repo/place");
 const priceSpecification_1 = require("./repo/priceSpecification");
@@ -147,12 +149,15 @@ exports.Member = Member;
 class MerchantReturnPolicy extends merchantReturnPolicy_1.MongoRepository {
 }
 exports.MerchantReturnPolicy = MerchantReturnPolicy;
-class Offer extends offer_1.MongoRepository {
-}
-exports.Offer = Offer;
 class OfferCatalog extends offerCatalog_1.MongoRepository {
 }
 exports.OfferCatalog = OfferCatalog;
+class OfferItemCondition extends offerItemCondition_1.MongoRepository {
+}
+exports.OfferItemCondition = OfferItemCondition;
+class Offer extends offer_1.MongoRepository {
+}
+exports.Offer = Offer;
 /**
  * 注文リポジトリ
  */
@@ -171,6 +176,12 @@ exports.OrderNumber = OrderNumber;
 class OwnershipInfo extends ownershipInfo_1.MongoRepository {
 }
 exports.OwnershipInfo = OwnershipInfo;
+/**
+ * 決済サービスプロバイダー
+ */
+class PaymentServiceProvider extends paymentServiceProvider_1.MongoRepository {
+}
+exports.PaymentServiceProvider = PaymentServiceProvider;
 var paymentMethod;
 (function (paymentMethod) {
     /**

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

@@ -81,13 +81,14 @@ function aggregateByEvent(params) {
         }
         const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
             branchCode: { $eq: event.location.branchCode },
-            containedInPlace: { id: { $eq: movieTheaterId } }
+            containedInPlace: { id: { $eq: movieTheaterId } },
+            useScreeningRoomType: settings_1.USE_READ_SCREENING_ROOM_TYPE
         });
         // 予約集計
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({
             aggregateDate: now,
             event: event,
-            screeningRoom: screeningRoom
+            screeningRoom
         })(repos);
         // オファーごとの集計
         let aggregateOffer;
@@ -388,9 +389,11 @@ function filterByEligibleSeatingType(params) {
         let remainingAttendeeCapacity;
         if (maximumAttendeeCapacity > 0) {
             const availabilities = yield repos.stockHolder.searchHolders({
+                project: { id: params.event.project.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
+                hasTicketedSeat: true,
                 offers: eligibleSeatOffers
             });
             // remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
@@ -425,11 +428,17 @@ function aggregateReservationByEvent(params) {
         if (typeof eventLocationMaximumAttendeeCapacity === 'number') {
             maximumAttendeeCapacity = eventLocationMaximumAttendeeCapacity;
         }
-        if (reservedSeatsAvailable({ event: params.event })) {
-            const screeningRoomSeatCount = (Array.isArray(params.screeningRoom.containsPlace))
-                // b.containsPlaceがundefinedの場合があるので注意(座席未登録)
-                ? params.screeningRoom.containsPlace.reduce((a, b) => a + ((Array.isArray(b.containsPlace)) ? b.containsPlace.length : 0), 0)
-                : 0;
+        const hasTicketedSeat = reservedSeatsAvailable({ event: params.event });
+        if (hasTicketedSeat) {
+            // seatCountを利用する(2023-06-24~)
+            const screeningRoomSeatCount = (typeof params.screeningRoom.seatCount === 'number') ? params.screeningRoom.seatCount : 0;
+            // const screeningRoomSeatCount = (Array.isArray(params.screeningRoom.containsPlace))
+            //     // b.containsPlaceがundefinedの場合があるので注意(座席未登録)
+            //     ? params.screeningRoom.containsPlace.reduce(
+            //         (a, b) => a + ((Array.isArray(b.containsPlace)) ? b.containsPlace.length : 0),
+            //         0
+            //     )
+            //     : 0;
             maximumAttendeeCapacity = screeningRoomSeatCount;
             // イベントのキャパシティ設定がスクリーン座席数より小さければmaximumAttendeeCapacityを上書き
             if (typeof eventLocationMaximumAttendeeCapacity === 'number' && eventLocationMaximumAttendeeCapacity < screeningRoomSeatCount) {
@@ -443,7 +452,8 @@ function aggregateReservationByEvent(params) {
                 event: {
                     id: params.event.id,
                     startDate: moment(params.event.startDate)
-                        .toDate()
+                        .toDate(),
+                    hasTicketedSeat
                 }
             });
             remainingAttendeeCapacity = maximumAttendeeCapacity - unavailableOfferCount;

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

@@ -56,14 +56,25 @@ function findEntranceGates(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let movieTheater;
         try {
-            movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id }, 
-            // 不要な属性を取得しない
-            {
-                containsPlace: 0,
-                hasPOS: 0,
-                offers: 0,
-                parentOrganization: 0
-            });
+            const searchMovieTheatersResult = yield repos.place.searchMovieTheaters({
+                limit: 1,
+                page: 1,
+                id: { $eq: params.event.superEvent.location.id }
+                // $projection: {
+                //     containsPlace: 0,
+                //     hasPOS: 0,
+                //     offers: 0,
+                //     parentOrganization: 0,
+                //     name: 0
+                // }
+            }, ['hasEntranceGate'], []);
+            movieTheater = searchMovieTheatersResult.shift();
+            // movieTheater = await repos.place.findById(
+            //     { id: params.event.superEvent.location.id },
+            //     // 不要な属性を取得しない
+            //     ['hasEntranceGate'],
+            //     []
+            // );
         }
         catch (error) {
             let throwsError = true;

package/lib/chevre/service/aggregation/system.d.ts

@@ -4,97 +4,184 @@ import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransac
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as TasKRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+type AggregateDurationUnit = 'days' | 'hours';
 declare function aggregateEvent(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     event: EventRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 注文取引集計
  */
 declare function aggregatePlaceOrder(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
     clientIds?: string[];
 }): (repos: {
     agregation: AggregationRepo;
     transaction: TransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 興行オファー承認アクション集計
  */
 declare function aggregateAuthorizeEventServiceOfferAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 決済承認アクション集計
  */
 declare function aggregateAuthorizePaymentAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateAuthorizeOrderAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 使用アクション集計
  */
 declare function aggregateUseAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+/**
+ * 予約アクション集計
+ */
+declare function aggregateReserveAction(params: {
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+/**
+ * 注文アクション集計
+ */
+declare function aggregateOrderAction(params: {
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+/**
+ * 予約取消アクション集計
+ */
+declare function aggregateCancelReservationAction(params: {
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateCheckMovieTicketAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregatePayMovieTicketAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregatePayTransaction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 予約集計
  */
 declare function aggregateReserveTransaction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateTask(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     task: TasKRepo;
-}) => Promise<void>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateUseAction };