@chevre/domain 21.4.0-alpha.3 → 21.4.0-alpha.30

package/lib/chevre/repo/seller.js

@@ -34,7 +34,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -45,6 +45,11 @@ class MongoRepository {
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
+        // メンバー条件追加(2023-07-24~)
+        const memberMemberOfIdIn = (_f = (_e = (_d = params.member) === null || _d === void 0 ? void 0 : _d.memberOf) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+        if (Array.isArray(memberMemberOfIdIn)) {
+            andConditions.push({ _id: { $in: memberMemberOfIdIn } });
+        }
         const nameRegex = params.name;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
@@ -64,7 +69,7 @@ class MongoRepository {
                 ]
             });
         }
-        const branchCodeEq = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$eq;
+        const branchCodeEq = (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof branchCodeEq === 'string') {
             andConditions.push({
                 branchCode: {
@@ -72,7 +77,7 @@ class MongoRepository {
                 }
             });
         }
-        const branchCodeRegex = (_e = params.branchCode) === null || _e === void 0 ? void 0 : _e.$regex;
+        const branchCodeRegex = (_h = params.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             andConditions.push({
                 branchCode: {
@@ -80,7 +85,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$all;
+        const additionalPropertyAll = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({
                 additionalProperty: {
@@ -89,7 +94,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyIn = (_g = params.additionalProperty) === null || _g === void 0 ? void 0 : _g.$in;
+        const additionalPropertyIn = (_k = params.additionalProperty) === null || _k === void 0 ? void 0 : _k.$in;
         if (Array.isArray(additionalPropertyIn)) {
             andConditions.push({
                 additionalProperty: {
@@ -98,7 +103,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyNin = (_h = params.additionalProperty) === null || _h === void 0 ? void 0 : _h.$nin;
+        const additionalPropertyNin = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$nin;
         if (Array.isArray(additionalPropertyNin)) {
             andConditions.push({
                 additionalProperty: {
@@ -106,7 +111,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        const additionalPropertyElemMatch = (_m = params.additionalProperty) === null || _m === void 0 ? void 0 : _m.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -115,7 +120,7 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyItemConditionIdEq = (_m = (_l = (_k = params.hasMerchantReturnPolicy) === null || _k === void 0 ? void 0 : _k.itemCondition) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
+        const hasMerchantReturnPolicyItemConditionIdEq = (_q = (_p = (_o = params.hasMerchantReturnPolicy) === null || _o === void 0 ? void 0 : _o.itemCondition) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.itemCondition.id': {
@@ -128,37 +133,39 @@ class MongoRepository {
     }
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions, 
-    // projection?: any
-    inclusion, exclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
-            }
-            else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
-            }
-            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, projection)
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.organizationModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
+    // public async findById(
+    //     conditions: {
+    //         id: string;
+    //     },
+    //     inclusion: string[],
+    //     exclusion: string[]
+    // ): Promise<ISeller> {
+    //     let projection: { [key: string]: number } = {};
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         inclusion.forEach((field) => {
+    //             projection[field] = 1;
+    //         });
+    //     } else {
+    //         projection = {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         };
+    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
+    //             exclusion.forEach((field) => {
+    //                 projection[field] = 0;
+    //             });
+    //         }
+    //     }
+    //     const doc = await this.organizationModel.findOne({ _id: conditions.id }, projection)
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.organizationModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     /**
      * 販売者を保管する
      */
@@ -172,7 +179,10 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
-                const doc = yield this.organizationModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const doc = yield this.organizationModel.findOneAndUpdate({
+                    _id: params.id,
+                    'project.id': { $eq: project.id }
+                }, updateFields, { upsert: false, new: true })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.organizationModel.modelName);
@@ -182,12 +192,6 @@ class MongoRepository {
             return organization;
         });
     }
-    // public async count(params: factory.seller.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.organizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * 販売者検索
      */
@@ -270,7 +274,10 @@ class MongoRepository {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.organizationModel.findOneAndRemove({ _id: params.id })
+            yield this.organizationModel.findOneAndRemove({
+                _id: params.id,
+                'project.id': { $eq: params.project.id }
+            })
                 .exec();
         });
     }

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

@@ -63,7 +63,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

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

@@ -1,4 +1,4 @@
-import { MongoRepository as EventRepo } from '../../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
@@ -28,5 +28,5 @@ export declare function aggregateScreeningEvent(params: {
     id: string;
 }): IAggregateScreeningEventOperation<void>;
 export declare function aggregateByEvent(params: {
-    event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): IAggregateScreeningEventOperation<void>;

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

@@ -80,6 +80,7 @@ function aggregateByEvent(params) {
             movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
         }
         const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
+            project: { id: event.project.id },
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });
@@ -174,7 +175,7 @@ function findOffers(params) {
             // 興行設定があれば興行のカタログを参照する(2022-08-31~)
             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 });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
@@ -208,7 +209,7 @@ function calculateOfferCount(params) {
         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 });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const catalogs = yield repos.offerCatalog.search({
                         limit: 1,

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

@@ -100,7 +100,7 @@ function findOffers(params) {
             // 興行設定があれば興行のカタログを参照する(2022-08-31~)
             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 });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },

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

@@ -28,7 +28,15 @@ function validateAccount(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted`);

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

@@ -210,7 +210,15 @@ function validateSeller(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');

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

@@ -40,7 +40,7 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        const product = yield repos.product.findById({ id: productId });
+        const product = yield repos.product.findById({ id: productId }, [], []);
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
@@ -124,7 +124,7 @@ function createTransactionObject(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id });
+        const product = yield repos.product.findById({ id: params.issuedThrough.id }, [], []);
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -1,10 +1,16 @@
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 import { IAcceptedAddOn } from './factory/price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export { IAcceptedAddOn };
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
+    provider: {
+        /**
+         * 販売者ID
+         */
+        id: string;
+    };
     reservationNumber: string;
-    disablePendingReservations: boolean;
     useHoldStockByTransactionNumber: boolean;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
 /**
@@ -46,9 +52,9 @@ export declare function createAdditionalTicketText(params: {
     reservedTicket: factory.reservation.ITicket;
 }): string | undefined;
 export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
-export declare function createReservationFor(params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent): factory.assetTransaction.reserve.IReservationFor;
+export declare function createReservationFor(params: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>): factory.assetTransaction.reserve.IReservationFor;
 export declare function createIssuedThrough(params: {
-    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
@@ -61,7 +67,7 @@ export declare function createReservation(params: {
     reserveDate: Date;
     agent: factory.assetTransaction.reserve.IAgent;
     reservationNumber: string;
-    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
     reservedTicket: factory.reservation.ITicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -11,9 +11,13 @@ const price_1 = require("./factory/price");
 function createStartParams(params) {
     var _a;
     const reservationNumber = params.reservationNumber;
-    const reservationPackage = Object.assign({ 
-        // project: params.project,
-        reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+    const provider = {
+        id: params.provider.id,
+        typeOf: factory.organizationType.Corporation
+    };
+    const reservationPackage = Object.assign({ provider, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, 
+        // trueで固定(2023-07-19~)
+        disablePendingReservations: true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
@@ -327,7 +331,9 @@ function createAdditionalTicketText(params) {
     return (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalTicketText;
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
-function createReservationFor(params) {
+function createReservationFor(
+// params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent
+params) {
     var _a, _b;
     if (params.typeOf === factory.eventType.ScreeningEvent) {
         return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
@@ -343,7 +349,9 @@ function createReservationFor(params) {
     }
 }
 exports.createReservationFor = createReservationFor;
-function optimizeReservationSuperEvent(params) {
+function optimizeReservationSuperEvent(
+// params: factory.event.screeningEvent.IEvent
+params) {
     const superEvent = params.superEvent;
     return Object.assign(Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
             ? superEvent.additionalProperty
@@ -409,36 +417,14 @@ function createReservation(params) {
     }
     // priceを最適化
     const price4reservation = (0, price_1.createPrice)(params);
-    // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>params.reservationFor.offers;
-    // // offersは必ず存在するはず
-    // if (eventOffers === undefined) {
-    //     throw new factory.errors.NotFound('reservationFor.offers');
-    // }
-    // const serviceTypeOfIssuedThrough: factory.reservation.eventReservation.IServiceTypeOfIssuedThrough | undefined
-    //     = (typeof eventOffers.itemOffered.serviceType?.codeValue === 'string')
-    //         ? {
-    //             codeValue: eventOffers.itemOffered.serviceType.codeValue,
-    //             inCodeSet: {
-    //                 typeOf: 'CategoryCodeSet',
-    //                 identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
-    //             },
-    //             typeOf: 'CategoryCode'
-    //         }
-    //         : undefined;
-    // const availableChannel: factory.reservation.IServiceChannel = eventOffers.itemOffered.availableChannel;
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        // const issuedThrough: factory.reservation.eventReservation.IIssuedThrough = {
-        //     typeOf: factory.product.ProductType.EventService,
-        //     // 興行IDを追加(2022-09-08~)
-        //     id: eventOffers.itemOffered.id,
-        //     availableChannel,
-        //     // issuedThrough.serviceTypeを連携
-        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
-        // };
         return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, 
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, 
+            // statusは不要なので削除(2023-07-19~)
+            // reservationStatus: factory.reservationStatusType.ReservationPending,
+            reservedTicket: params.reservedTicket, 
             // 最適化(2022-12-19~)
             underName: {
                 typeOf: params.agent.typeOf,
@@ -459,18 +445,13 @@ function createReservation(params) {
             : undefined);
     }
     else {
-        // const issuedThrough: factory.reservation.busReservation.IIssuedThrough = {
-        //     typeOf: factory.product.ProductType.Transportation,
-        //     // 興行IDを追加(2022-09-08~)
-        //     id: eventOffers.itemOffered.id,
-        //     availableChannel,
-        //     // issuedThrough.serviceTypeを連携
-        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
-        // };
         return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: {
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, 
+            // statusは不要なので削除(2023-07-19~)
+            // reservationStatus: factory.reservationStatusType.ReservationPending,
+            reservedTicket: params.reservedTicket, underName: {
                 typeOf: params.agent.typeOf,
                 name: params.agent.name
             }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))

package/lib/chevre/service/assetTransaction/reserve.d.ts

@@ -96,7 +96,6 @@ type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail &
  * 取引開始
  */
 export declare function start(params: IStartParams & {
-    disablePendingReservations: boolean;
     useHoldStockByTransactionNumber: boolean;
     stockHoldUntilDaysAfterEventEnd: number;
 }): IStartOperation<{

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

@@ -55,7 +55,7 @@ function start(params) {
             now,
             store: { id: (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id }
         });
-        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { reservationNumber: reservationNumber }));
+        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber: reservationNumber }));
         // 取引作成
         let transaction;
         try {
@@ -139,20 +139,6 @@ function addReservations(params) {
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
         const { issuedThrough } = (0, factory_1.createIssuedThrough)({ reservationFor: event });
-        // const minimizedObjectSubReservations: factory.assetTransaction.reserve.IMinimizedObjectSubReservation[] =
-        //     objectSubReservations.map((r) => {
-        //         return {
-        //             id: r.id,
-        //             typeOf: r.typeOf,
-        //             reservedTicket: {
-        //                 ticketType: r.reservedTicket.ticketType,
-        //                 ...(typeof r.reservedTicket.ticketedSeat?.typeOf === 'string')
-        //                     ? { ticketedSeat: r.reservedTicket.ticketedSeat }
-        //                     : undefined
-        //             },
-        //             ...(Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined
-        //         };
-        //     });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -165,9 +151,7 @@ function addReservations(params) {
                     // issuedThroughを追加(2023-06-05~)
                     issuedThrough,
                     reservationFor,
-                    // subReservationにreservationForを保管しない(2021-10-19～)
                     subReservation: objectSubReservations
-                    // subReservation: minimizedObjectSubReservations
                 }
             });
         }
@@ -191,10 +175,11 @@ function addReservations(params) {
             },
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         })(repos);
-        if (transaction.object.disablePendingReservations !== true) {
-            // 予約作成(insertManyで実装)
-            yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
-        }
+        // 完全廃止(2023-07-19~)
+        // if (transaction.object.disablePendingReservations !== true) {
+        //     // 予約作成(insertManyで実装)
+        //     await repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
+        // }
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event })(repos);
         return { transaction, objectSubReservations, issuedThrough };
@@ -546,7 +531,7 @@ function validateProgramMembershipUsed(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id });
+        const product = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -0,0 +1,11 @@
+import * as factory from '../../factory';
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as EventRepo } from '../../repo/event';
+import { MongoRepository as PlaceRepo } from '../../repo/place';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+export declare function createEvent(params: factory.task.createEvent.IData): (repos: {
+    action: ActionRepo;
+    event: EventRepo;
+    place: PlaceRepo;
+    task: TaskRepo;
+}) => Promise<void>;