@chevre/domain 21.27.0-alpha.24 → 21.27.0-alpha.25

package/example/src/chevre/aggregation/aggregateEventReservation.ts

@@ -21,7 +21,6 @@ async function main() {
     await (await chevre.service.aggregation.createService()).event.aggregateScreeningEvent({
         id: String(process.env.EVENT_ID)
     })({
-        aggregateReservation: await chevre.repository.AggregateReservation.createInstance(mongoose.connection),
         event: await chevre.repository.Event.createInstance(mongoose.connection),
         stockHolder: await chevre.repository.StockHolder.createInstance(client, mongoose.connection),
         offer: await chevre.repository.Offer.createInstance(mongoose.connection),

package/example/src/chevre/aggregation/aggregateOffersOnEvent.ts

@@ -30,7 +30,7 @@ async function main() {
                 typeOf: chevre.factory.eventType.ScreeningEvent
             }
         },
-        ['aggregateEntranceGate', 'aggregateReservation', 'aggregateOffer']
+        ['aggregateEntranceGate', 'aggregateOffer']
     );
     console.log('aggregateReservations:', aggregateReservations);
 

package/example/src/chevre/aggregation/searchAggregateReservations.ts

@@ -21,7 +21,7 @@ async function main() {
                 typeOf: chevre.factory.eventType.ScreeningEvent
             }
         },
-        ['aggregateEntranceGate', 'aggregateReservation', 'aggregateOffer']
+        ['aggregateEntranceGate', 'aggregateOffer']
     );
     console.log('aggregateReservations:', aggregateReservations);
 }

package/lib/chevre/repo/aggregateReservation.d.ts

@@ -13,17 +13,15 @@ export interface IAggregateReservation {
         startDate: Date;
     };
     aggregateEntranceGate?: factory.event.event.IAggregateEntranceGate;
-    aggregateReservation?: factory.event.event.IAggregateReservation;
     aggregateOffer?: factory.event.event.IAggregateOffer;
 }
 export interface IUpdateAggregateReservationParams {
     $set: {
-        aggregateReservation?: factory.event.event.IAggregateReservation;
         aggregateOffer?: factory.event.event.IAggregateOffer;
         aggregateEntranceGate?: factory.event.event.IAggregateEntranceGate;
     };
 }
-type ISearchWithReservationForIdResult = Pick<IAggregateReservation, 'aggregateEntranceGate' | 'aggregateOffer' | 'aggregateReservation'> & {
+type ISearchWithReservationForIdResult = Pick<IAggregateReservation, 'aggregateEntranceGate' | 'aggregateOffer'> & {
     /**
      * イベントID
      */
@@ -61,7 +59,7 @@ export declare class MongoRepository {
     /**
      * 予約集計を検索する
      */
-    searchWithReservationForId(params: ISearchConditions, inclusion: ('aggregateEntranceGate' | 'aggregateOffer' | 'aggregateReservation')[]): Promise<ISearchWithReservationForIdResult[]>;
+    searchWithReservationForId(params: ISearchConditions, inclusion: ('aggregateEntranceGate' | 'aggregateOffer')[]): Promise<ISearchWithReservationForIdResult[]>;
     /**
      * 予約集計を保管する
      */

package/lib/chevre/repo/aggregateReservation.js

@@ -82,8 +82,7 @@ class MongoRepository {
                     _id: 0,
                     id: '$reservationFor.id',
                     aggregateEntranceGate: 1,
-                    aggregateOffer: 1,
-                    aggregateReservation: 1
+                    aggregateOffer: 1
                 };
             }
             const sortByStartDate = (_a = params.sort) === null || _a === void 0 ? void 0 : _a['reservationFor.startDate'];

package/lib/chevre/repo/mongoose/schemas/aggregateReservation.js

@@ -11,7 +11,6 @@ const schemaDefinition = {
     typeOf: { type: String, required: true },
     reservationFor: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     aggregateEntranceGate: mongoose_1.SchemaTypes.Mixed,
-    aggregateReservation: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {

package/lib/chevre/repo/mongoose/schemas/event.js

@@ -46,7 +46,7 @@ const schemaDefinition = {
     remainingAttendeeCapacity: { type: Number },
     checkInCount: { type: Number },
     attendeeCount: { type: Number },
-    aggregateEntranceGate: mongoose_1.SchemaTypes.Mixed,
+    // aggregateEntranceGate: SchemaTypes.Mixed, // 廃止(2024-03-29~)
     aggregateReservation: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed,
     coaInfo: mongoose_1.SchemaTypes.Mixed

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

@@ -1,4 +1,3 @@
-import type { MongoRepository as AggregateReservationRepo } from '../../../repo/aggregateReservation';
 import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
@@ -9,8 +8,7 @@ import type { MongoRepository as ReservationRepo } from '../../../repo/reservati
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-export type IAggregateScreeningEventOperation<T> = (repos: {
-    aggregateReservation: AggregateReservationRepo;
+export interface IAggregateScreeningEventRepos {
     event: EventRepo;
     stockHolder: StockHolderRepo;
     offer: OfferRepo;
@@ -20,7 +18,8 @@ export type IAggregateScreeningEventOperation<T> = (repos: {
     product: ProductRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
-}) => Promise<T>;
+}
+export type IAggregateScreeningEventOperation<T> = (repos: IAggregateScreeningEventRepos) => Promise<T>;
 /**
  * イベントデータをID指定で集計する
  */

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregateByEvent = exports.aggregateScreeningEvent = void 0;
 /**
- * イベント集計サービス
+ * イベントの予約集計サービス
  */
 const createDebug = require("debug");
 const moment = require("moment-timezone");
@@ -122,18 +122,6 @@ function aggregateByEvent(params) {
         debug('update:', update);
         // 保管
         yield repos.event.updateAggregationById({ id: event.id }, update);
-        if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
-            // aggregateReservationsにも保管(2024-03-25~)
-            yield repos.aggregateReservation.save({
-                project: event.project,
-                reservationFor: {
-                    id: event.id,
-                    typeOf: event.typeOf,
-                    startDate: moment(event.startDate)
-                        .toDate()
-                }
-            }, { $set: { aggregateReservation } });
-        }
         yield onAggregated({ event })({
             task: repos.task
         });

package/lib/chevre/service/assetTransaction/pay.js

@@ -40,16 +40,12 @@ function publishPaymentUrl(params, purposeAsTransaction) {
         // 決済サービス確認
         const paymentServiceId = getPaymentServiceId(params);
         // 決済受入アクション生成(2024-03-28~)
-        const actionAttributes = Object.assign({ project: params.project, typeOf: 'AcceptAction', agent: params.agent, object: {
+        const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.AcceptAction, agent: params.agent, object: {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
             } }, (typeof (purposeAsTransaction === null || purposeAsTransaction === void 0 ? void 0 : purposeAsTransaction.id) === 'string')
-            ? {
-                purpose: Object.assign({ typeOf: factory.transactionType.PlaceOrder }, {
-                    id: purposeAsTransaction.id
-                })
-            }
+            ? { purpose: { typeOf: factory.transactionType.PlaceOrder, id: purposeAsTransaction.id } }
             : undefined);
         const action = yield repos.action.start(actionAttributes);
         let result;

package/lib/chevre/service/event.js

@@ -468,15 +468,24 @@ function createScreeningEventFromCOA(params) {
             typeOf: 'WebAPI',
             identifier: factory.service.webAPI.Identifier.COA
         },
-        // 廃止(2023-08-07~)
-        // priceCurrency: factory.priceCurrency.JPY,
+        eligibleQuantity: {
+            typeOf: 'QuantitativeValue',
+            unitCode: factory.unitCode.C62,
+            maxValue: Number(params.performanceFromCOA.availableNum)
+        },
         itemOffered: {
             serviceOutput: {
                 reservedTicket: {
                     typeOf: 'Ticket',
-                    ticketedSeat: { typeOf: factory.placeType.Seat }
+                    ticketedSeat: { typeOf: factory.placeType.Seat } // 必ず指定席
                 }
             }
+        },
+        seller: {
+            typeOf: factory.organizationType.Corporation,
+            id: params.seller.id,
+            // name: params.sellerFromDB.name,
+            makesOffer: []
         }
     };
     const { additionalProperty, coaInfo } = createScreeningEventAdditionalPropertyFromCOA(params);

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

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
-const aggregateReservation_1 = require("../../repo/aggregateReservation");
 const event_1 = require("../../repo/event");
 const offer_1 = require("../../repo/offer");
 const offerCatalog_1 = require("../../repo/offerCatalog");
@@ -31,7 +30,6 @@ function call(data) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
         yield AggregationService.event.aggregateScreeningEvent(data)({
-            aggregateReservation: new aggregateReservation_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
             offer: new offer_1.MongoRepository(settings.connection),

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.364.0-alpha.6",
-    "@cinerino/sdk": "5.15.0-alpha.1",
+    "@chevre/factory": "4.364.0",
+    "@cinerino/sdk": "5.15.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.27.0-alpha.24"
+  "version": "21.27.0-alpha.25"
 }