@chevre/domain 20.2.0-alpha.0 → 20.2.0-alpha.2

package/example/src/chevre/migrateEventOffersItemOfferedTypeOf.ts

@@ -0,0 +1,80 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+const POS_CLIENT_ID = process.env.POS_CLIENT_ID;
+if (typeof POS_CLIENT_ID !== 'string') {
+    throw new Error('set POS_CLIENT_ID');
+}
+const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+
+    const cursor = eventRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
+            startDate: {
+                $gte: moment()
+                    .add(-1, 'month')
+                    .toDate()
+            }
+            // _id: { $eq: 'al6aff83w' }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('events found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
+
+        // IAMメンバー検索
+        const eventOffers = <chevre.factory.event.screeningEvent.IOffer | undefined>event.offers;
+        if (eventOffers === undefined) {
+            throw new Error('event.offers undefined');
+        }
+
+        const itemOfferedTypeOf = eventOffers.itemOffered.typeOf;
+
+        const alreadyMigrated = itemOfferedTypeOf === chevre.factory.product.ProductType.EventService;
+
+        if (alreadyMigrated) {
+            console.log(
+                'already exist...', event.project.id, event.id, event.startDate, itemOfferedTypeOf, i);
+        } else {
+            console.log(
+                'updating seller...', event.project.id, event.id, event.startDate, i);
+            await eventRepo.updatePartiallyById({
+                id: event.id,
+                attributes: <any>{
+                    typeOf: event.typeOf,
+                    'offers.itemOffered.typeOf': chevre.factory.product.ProductType.EventService
+                }
+            });
+            updateCount += 1;
+            console.log(
+                'updated...', event.project.id, event.id, event.startDate, i);
+        }
+    });
+
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/event.js

@@ -130,6 +130,10 @@ class MongoRepository {
         }
         let params;
         switch (conditions.typeOf) {
+            case factory.eventType.Event:
+                // no op
+                // params = conditions;
+                break;
             case factory.eventType.ScreeningEvent:
                 params = conditions;
                 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/reservation.js

@@ -232,6 +232,9 @@ class MongoRepository {
             });
         }
         switch (params.typeOf) {
+            case factory.reservationType.BusReservation:
+                // no op
+                break;
             case factory.reservationType.EventReservation:
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */

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

@@ -20,7 +20,7 @@ function createStartParams(params) {
             typeOf: params.transaction.typeOf,
             object: {
                 reservationFor: {
-                    id: reservationFor.id,
+                    id: String(reservationFor.id),
                     typeOf: reservationFor.typeOf
                 }
             }
@@ -60,7 +60,7 @@ function createPotentialActions(params) {
         const cancelObject = {
             reservationFor: {
                 typeOf: reservationForByReserveTransaction.typeOf,
-                id: reservationForByReserveTransaction.id
+                id: String(reservationForByReserveTransaction.id)
             },
             reservationNumber,
             // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
@@ -82,22 +82,44 @@ function createPotentialActions(params) {
     else if (Array.isArray(transaction.object.reservations)) {
         // 予約取消アクション属性作成
         cancelReservationActionAttributes = transaction.object.reservations.map((reservation) => {
-            var _a;
+            var _a, _b;
             // 最適化(2022-06-06~)
-            const cancelObject = {
-                typeOf: reservation.typeOf,
-                id: reservation.id,
-                issuedThrough: {
-                    typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
-                },
-                reservationFor: {
-                    typeOf: reservation.reservationFor.typeOf,
-                    id: reservation.reservationFor.id
-                },
-                reservationNumber: reservation.reservationNumber,
-                // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
-                reservationStatus: factory.reservationStatusType.ReservationConfirmed
-            };
+            let cancelObject;
+            if (reservation.typeOf === factory.reservationType.BusReservation) {
+                cancelObject = {
+                    typeOf: reservation.typeOf,
+                    id: reservation.id,
+                    issuedThrough: {
+                        typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
+                    },
+                    reservationFor: {
+                        typeOf: reservation.reservationFor.typeOf,
+                        id: String(reservation.reservationFor.id)
+                    },
+                    reservationNumber: reservation.reservationNumber,
+                    // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
+                    reservationStatus: factory.reservationStatusType.ReservationConfirmed
+                };
+            }
+            else if (reservation.typeOf === factory.reservationType.EventReservation) {
+                cancelObject = {
+                    typeOf: reservation.typeOf,
+                    id: reservation.id,
+                    issuedThrough: {
+                        typeOf: (_b = reservation.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf
+                    },
+                    reservationFor: {
+                        typeOf: reservation.reservationFor.typeOf,
+                        id: String(reservation.reservationFor.id)
+                    },
+                    reservationNumber: reservation.reservationNumber,
+                    // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
+                    reservationStatus: factory.reservationStatusType.ReservationConfirmed
+                };
+            }
+            else {
+                throw new factory.errors.NotImplemented(`reservation.typeOf ${reservation.typeOf} not imeplemented`);
+            }
             return {
                 project: transaction.project,
                 typeOf: factory.actionType.CancelAction,

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

@@ -18,7 +18,6 @@ export declare function createReservedTicket(params: {
     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
     dateIssued: Date;
-    event: factory.event.screeningEvent.IEvent;
     reservedSeatsOnly: boolean;
     screeningRoomSections?: factory.place.screeningRoomSection.IPlace[];
     availableSeatOffers: factory.place.seat.IPlaceWithOffer[];
@@ -43,7 +42,7 @@ export declare function createAdditionalTicketText(params: {
     reservedTicket: factory.reservation.ITicket;
 }): string | undefined;
 export declare type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
-export declare function createReservationFor(params: factory.event.screeningEvent.IEvent): factory.assetTransaction.reserve.IReservationFor;
+export declare function createReservationFor(params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent): factory.assetTransaction.reserve.IReservationFor;
 export declare function createReservation(params: {
     project: {
         id: string;
@@ -54,7 +53,7 @@ export declare function createReservation(params: {
     agent: factory.assetTransaction.reserve.IAgent;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
     reservationNumber: string;
-    reservationFor: factory.event.screeningEvent.IEvent;
+    reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
     reservedTicket: factory.reservation.ITicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;

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

@@ -329,15 +329,19 @@ function createAdditionalTicketText(params) {
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
 function createReservationFor(params) {
-    return Object.assign({ endDate: params.endDate, 
-        // 不要なので廃止(2022-12-19~)
-        // eventStatus: params.eventStatus,
-        id: params.id, location: params.location, name: params.name, 
-        // 不要なので廃止(2022-12-19~)
-        // project: params.project,
-        startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
-        ? { doorTime: params.doorTime }
-        : undefined);
+    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)
+            ? { doorTime: params.doorTime }
+            : undefined);
+    }
+    else {
+        const tripByEvent = (_b = (_a = params.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservationFor;
+        if (typeof (tripByEvent === null || tripByEvent === void 0 ? void 0 : tripByEvent.typeOf) !== 'string') {
+            throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput?.reservationFor');
+        }
+        return Object.assign(Object.assign({}, tripByEvent), { arrivalTime: params.endDate, id: params.id, name: params.name, departureTime: params.startDate });
+    }
 }
 exports.createReservationFor = createReservationFor;
 function optimizeReservationSuperEvent(params) {
@@ -353,8 +357,9 @@ function optimizeReservationSuperEvent(params) {
         ? { headline: superEvent.headline }
         : undefined);
 }
+// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createReservation(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     // 適用メンバーシップ確認
     validateEligibleMembershipType({
         availableOffer: params.availableOffer,
@@ -381,31 +386,56 @@ function createReservation(params) {
                 typeOf: 'CategoryCodeSet',
                 identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
             },
-            // project: params.project,
             typeOf: 'CategoryCode'
         }
         : undefined;
-    const issuedThrough = Object.assign(Object.assign({ typeOf: factory.product.ProductType.EventService }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined), (typeof eventOffers.itemOffered.id === 'string') ? { id: eventOffers.itemOffered.id } : undefined);
-    return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, 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, 
-        // 最適化(2022-12-19~)
-        // underName: params.agent,
-        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))
-        ? {
-            subReservation: params.subReservation.map((r) => {
-                return {
-                    reservedTicket: {
-                        ticketedSeat: r.reservedTicket.ticketedSeat,
-                        typeOf: 'Ticket'
-                    }
-                };
-            })
-        }
-        : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
-        ? { programMembershipUsed: params.programMembershipUsed }
-        : undefined);
+    const availableChannel = eventOffers.itemOffered.availableChannel;
+    if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
+        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.EventService, 
+            // 興行IDを追加(2022-09-08~)
+            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
+        return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, 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, 
+            // 最適化(2022-12-19~)
+            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))
+            ? {
+                subReservation: params.subReservation.map((r) => {
+                    return {
+                        reservedTicket: {
+                            ticketedSeat: r.reservedTicket.ticketedSeat,
+                            typeOf: 'Ticket'
+                        }
+                    };
+                })
+            }
+            : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
+            ? { programMembershipUsed: params.programMembershipUsed }
+            : undefined);
+    }
+    else {
+        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.Transportation, 
+            // 興行IDを追加(2022-09-08~)
+            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
+        return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, 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: {
+                typeOf: params.agent.typeOf,
+                name: params.agent.name
+            }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
+            ? {
+                subReservation: params.subReservation.map((r) => {
+                    return {
+                        reservedTicket: {
+                            ticketedSeat: r.reservedTicket.ticketedSeat,
+                            typeOf: 'Ticket'
+                        }
+                    };
+                })
+            }
+            : undefined), (typeof ((_d = params.broker) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_e = params.programMembershipUsed) === null || _e === void 0 ? void 0 : _e.identifier) === 'string')
+            ? { programMembershipUsed: params.programMembershipUsed }
+            : undefined);
+    }
 }
 exports.createReservation = createReservation;
 // tslint:disable-next-line:max-func-body-length

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

@@ -76,7 +76,12 @@ function addReservations(params) {
             aggregateReservation: 0, aggregateOffer: 0, attendeeCount: 0,
             checkInCount: 0, maximumAttendeeCapacity: 0, remainingAttendeeCapacity: 0
         });
-        validateEvent({ now, event });
+        if (event.typeOf !== factory.eventType.ScreeningEvent && event.typeOf !== factory.eventType.Event) {
+            throw new factory.errors.Argument('object.reservationFor.id', `invalid event type ${event.typeOf}`);
+        }
+        if (event.typeOf === factory.eventType.ScreeningEvent || event.typeOf === factory.eventType.Event) {
+            validateEvent({ now, event });
+        }
         // イベントオファー検索
         const ticketOffers = yield OfferService.event.searchEventTicketOffers({ event: { id: event.id } })(repos);
         let availableOffers = [];
@@ -91,11 +96,7 @@ function addReservations(params) {
             }
         }
         else {
-            // hasOfferCatalog参照廃止(2022-09-02~)
             throw new factory.errors.NotFound('event.offers.itemOffered.id');
-            // if (typeof event.hasOfferCatalog?.id === 'string') {
-            //     availableOffers = await repos.offer.findOffersByOfferCatalogId({ offerCatalog: { id: event.hasOfferCatalog.id } });
-            // }
         }
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event: { id: event.id } })(repos);
         // 仮予約作成
@@ -247,7 +248,7 @@ function createReservations4transactionObject(params) {
                 acceptedOffer: acceptedOffer,
                 availableOffer: ticketType,
                 dateIssued: params.now,
-                event: params.event,
+                // event: params.event,
                 reservedSeatsOnly,
                 availableSeatOffers: params.availableSeatOffers,
                 ticketOffer: ticketOffer,
@@ -446,8 +447,11 @@ function processLockOfferRateLimit(params) {
                         }
                     },
                     reservationFor: {
-                        startDate: moment(params.reservationFor.startDate)
-                            .toDate()
+                        startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
+                            ? moment(params.reservationFor.startDate)
+                                .toDate()
+                            : moment(params.reservationFor.departureTime)
+                                .toDate()
                     },
                     reservationNumber: reservation.reservationNumber
                 };
@@ -622,7 +626,7 @@ function cancel(params) {
                 const reservationPackage = {
                     typeOf: factory.reservationType.ReservationPackage,
                     reservationNumber: transaction.transactionNumber,
-                    reservationFor: { typeOf: reservationFor.typeOf, id: reservationFor.id },
+                    reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
                     reservationStatus: pendingReservations[0].reservationStatus
                 };
                 cancelActionAttributes = [{
@@ -712,7 +716,7 @@ function exportTasksById(params) {
                     const reservationPackage = {
                         typeOf: factory.reservationType.ReservationPackage,
                         reservationNumber: transaction.transactionNumber,
-                        reservationFor: { typeOf: reservationFor.typeOf, id: reservationFor.id },
+                        reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
                         reservationStatus: pendingReservations[0].reservationStatus
                     };
                     cancelActionAttributes = [{

package/lib/chevre/service/delivery/reservation/factory.js

@@ -4,14 +4,24 @@ exports.createReservationOwnershipInfo = void 0;
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
 function createReservationOwnershipInfo(params) {
-    var _a;
+    var _a, _b;
     const itemOffered = params.acceptedOffer.itemOffered;
     let ownershipInfo;
     // イベント予約に対する所有権の有効期限はイベント終了日時までで十分だろう
     // 現時点では所有権対象がイベント予約のみなので、これで問題ないが、
     // 対象が他に広がれば、有効期間のコントロールは別でしっかり行う必要があるだろう
-    const ownedThrough = moment(itemOffered.reservationFor.endDate)
-        .toDate();
+    let ownedThrough;
+    if (itemOffered.typeOf === factory.reservationType.EventReservation) {
+        ownedThrough = moment(itemOffered.reservationFor.endDate)
+            .toDate();
+    }
+    else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
+        ownedThrough = moment(itemOffered.reservationFor.arrivalTime)
+            .toDate();
+    }
+    else {
+        throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);
+    }
     let bookingService = params.acceptedOffer.offeredThrough;
     if (bookingService === undefined) {
         // デフォルトブッキングサービスはChevre
@@ -35,6 +45,16 @@ function createReservationOwnershipInfo(params) {
         };
     }
     else {
+        let typeOfGood;
+        if (itemOffered.typeOf === factory.reservationType.EventReservation) {
+            typeOfGood = Object.assign({ typeOf: itemOffered.typeOf, id: itemOffered.id, reservationNumber: itemOffered.reservationNumber, bookingService: bookingService }, (typeof ((_a = itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined);
+        }
+        else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
+            typeOfGood = Object.assign({ typeOf: itemOffered.typeOf, id: itemOffered.id, reservationNumber: itemOffered.reservationNumber, bookingService: bookingService }, (typeof ((_b = itemOffered.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined);
+        }
+        else {
+            throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);
+        }
         ownershipInfo = {
             project: params.project,
             typeOf: 'OwnershipInfo',
@@ -44,9 +64,7 @@ function createReservationOwnershipInfo(params) {
             acquiredFrom: params.acquiredFrom,
             ownedFrom: params.ownedFrom,
             ownedThrough: ownedThrough,
-            typeOfGood: Object.assign({ typeOf: itemOffered.typeOf, id: itemOffered.id, reservationNumber: itemOffered.reservationNumber, bookingService: bookingService }, (typeof ((_a = itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                ? { issuedThrough: itemOffered.issuedThrough }
-                : undefined)
+            typeOfGood
         };
     }
     return ownershipInfo;

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

@@ -209,58 +209,55 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 /**
  * 注文データの予約を生成する
  */
+// tslint:disable-next-line:max-func-body-length
 function createReservation(params) {
     var _a;
     const itemOffered = params.itemOffered;
     const event = params.event;
-    const workPerformed = Object.assign({ 
-        // 不要なので廃止(2022-12-19~)
-        // project: event.superEvent.workPerformed.project,
-        typeOf: event.superEvent.workPerformed.typeOf, id: event.superEvent.workPerformed.id, identifier: event.superEvent.workPerformed.identifier, name: event.superEvent.workPerformed.name }, (typeof event.superEvent.workPerformed.duration === 'string')
-        ? { duration: event.superEvent.workPerformed.duration }
-        : undefined);
-    const reservationFor = {
-        // 不要なので廃止(2022-12-19~)
-        // project: event.project,
-        typeOf: event.typeOf,
-        // 予約のreservationForは最適化されているので、additionalPropertyは存在しない
-        // additionalProperty: itemOffered.reservationFor.additionalProperty,
-        // 不要なので廃止(2022-12-19~)
-        // eventStatus: event.eventStatus,
-        id: event.id,
-        location: event.location,
-        name: event.name,
-        doorTime: moment(event.doorTime)
-            .toDate(),
-        endDate: moment(event.endDate)
-            .toDate(),
-        startDate: moment(event.startDate)
-            .toDate(),
-        // 最適化(2022-05-31~)
-        superEvent: Object.assign(Object.assign({ 
-            // 不要なので廃止(2022-12-19~)
-            // project: event.superEvent.project,
-            typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
-        // 廃止(superEvent.workPerformedへ完全移行)
-        // workPerformed: {},
-    };
+    let reservationItem;
     const reservedTicket = Object.assign({ typeOf: itemOffered.reservedTicket.typeOf, ticketType: {
-            // 不要なので廃止(2022-12-17~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
             typeOf: itemOffered.reservedTicket.ticketType.typeOf,
             id: itemOffered.reservedTicket.ticketType.id,
             identifier: itemOffered.reservedTicket.ticketType.identifier,
             name: itemOffered.reservedTicket.ticketType.name,
             description: itemOffered.reservedTicket.ticketType.description,
             additionalProperty: itemOffered.reservedTicket.ticketType.additionalProperty
-            // 不要なので廃止(2022-12-17~)
-            // priceCurrency: itemOffered.reservedTicket.ticketType.priceCurrency
         } }, (itemOffered.reservedTicket.ticketedSeat !== undefined)
         ? { ticketedSeat: itemOffered.reservedTicket.ticketedSeat }
         : undefined);
-    return Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor: reservationFor, reservedTicket: reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? { programMembershipUsed: itemOffered.programMembershipUsed }
-        : undefined);
+    if (itemOffered.typeOf === factory.reservationType.EventReservation
+        && event.typeOf === factory.eventType.ScreeningEvent) {
+        const workPerformed = Object.assign({ typeOf: event.superEvent.workPerformed.typeOf, id: event.superEvent.workPerformed.id, identifier: event.superEvent.workPerformed.identifier, name: event.superEvent.workPerformed.name }, (typeof event.superEvent.workPerformed.duration === 'string')
+            ? { duration: event.superEvent.workPerformed.duration }
+            : undefined);
+        const reservationFor = {
+            typeOf: event.typeOf,
+            id: event.id,
+            location: event.location,
+            name: event.name,
+            doorTime: moment(event.doorTime)
+                .toDate(),
+            endDate: moment(event.endDate)
+                .toDate(),
+            startDate: moment(event.startDate)
+                .toDate(),
+            // 最適化(2022-05-31~)
+            superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
+            // 廃止(superEvent.workPerformedへ完全移行)
+            // workPerformed: {},
+        };
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor: reservationFor, reservedTicket: reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+            ? { programMembershipUsed: itemOffered.programMembershipUsed }
+            : undefined);
+    }
+    else if (itemOffered.typeOf === factory.reservationType.BusReservation
+        && event.typeOf === factory.eventType.Event) {
+        throw new factory.errors.NotImplemented(`${itemOffered.typeOf} not impelemented`);
+    }
+    else {
+        throw new factory.errors.Argument('itemOffered');
+    }
+    return reservationItem;
 }
 function coaTicket2offer(params) {
     var _a, _b;

package/lib/chevre/service/offer/eventServiceByCOA/factory.js

@@ -172,7 +172,25 @@ function responseBody2acceptedOffers4result(params) {
         };
         const additionalProperty = (_c = (_b = requestedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.additionalProperty;
         const additionalTicketText = (_e = (_d = requestedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.additionalTicketText;
-        const reservation = Object.assign(Object.assign(Object.assign({ project: { typeOf: event.project.typeOf, id: event.project.id }, typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough: { typeOf: factory.product.ProductType.EventService }, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
+        const issuedThrough = {
+            typeOf: factory.product.ProductType.EventService,
+            id: '',
+            availableChannel: {
+                typeOf: 'ServiceChannel',
+                serviceLocation: {
+                    typeOf: reservationFor.location.typeOf,
+                    branchCode: reservationFor.location.branchCode,
+                    name: reservationFor.location.name,
+                    containedInPlace: {
+                        typeOf: reservationFor.superEvent.location.typeOf,
+                        id: reservationFor.superEvent.location.id,
+                        branchCode: reservationFor.superEvent.location.branchCode,
+                        name: reservationFor.superEvent.location.name
+                    }
+                }
+            }
+        };
+        const reservation = Object.assign(Object.assign(Object.assign({ project: { typeOf: event.project.typeOf, id: event.project.id }, typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
             // numSeats: 1, // 廃止(2022-08-18~)
             reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
         if (requestedOffer.priceSpecification === undefined) {

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

@@ -62,7 +62,7 @@ function cancelPendingReservation(actionAttributesList) {
                                             id: cancelingSubReservation.id,
                                             reservedTicket: cancelingSubReservation.reservedTicket,
                                             subReservation: cancelingSubReservation.subReservation,
-                                            reservationFor: { id: reservationFor.id }
+                                            reservationFor: { id: String(reservationFor.id) }
                                         },
                                         expectedHolder: reserveTransactionId
                                     })(repos);
@@ -197,7 +197,7 @@ function cancelReservation(actionAttributesList) {
                                         id: cancelingSubReservation.id,
                                         reservedTicket: cancelingSubReservation.reservedTicket,
                                         subReservation: cancelingSubReservation.subReservation,
-                                        reservationFor: { id: reservationFor.id }
+                                        reservationFor: { id: String(reservationFor.id) }
                                     },
                                     expectedHolder: reserveTransaction.id
                                 })(repos);
@@ -384,8 +384,11 @@ function processUnlockOfferRateLimit(params) {
                     }
                 },
                 reservationFor: {
-                    startDate: moment(params.reservationFor.startDate)
-                        .toDate()
+                    startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
+                        ? moment(params.reservationFor.startDate)
+                            .toDate()
+                        : moment(params.reservationFor.departureTime)
+                            .toDate()
                 },
                 reservationNumber: reservation.reservationNumber
             };

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -20,8 +20,8 @@ function createReservationAcceptedOffers(params) {
             const reservationFor = resultAcceptedOffers[0].itemOffered.reservationFor;
             const issuedThrough = resultAcceptedOffers[0].itemOffered.issuedThrough;
             if (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') {
-                if (!eventIds.includes(reservationFor.id)) {
-                    eventIds.push(reservationFor.id);
+                if (!eventIds.includes(String(reservationFor.id))) {
+                    eventIds.push(String(reservationFor.id));
                     const orderedItem = reservationOffers2orderedItem({ reservationFor, issuedThrough });
                     orderedItems.push({
                         typeOf: 'OrderItem',
@@ -38,6 +38,9 @@ function reservationOffers2orderedItem(params) {
     var _a, _b, _c, _d;
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
+    if (reservationFor.typeOf !== factory.eventType.ScreeningEvent) {
+        throw new factory.errors.NotImplemented(`reservationFor.typeOf '${reservationFor.typeOf}' not implemented`);
+    }
     const reservationFor4orderedItem = {
         location: {
             branchCode: (_a = reservationFor.location) === null || _a === void 0 ? void 0 : _a.branchCode,
@@ -54,10 +57,10 @@ function reservationOffers2orderedItem(params) {
         startDate: reservationFor.startDate,
         endDate: reservationFor.endDate
     };
-    return Object.assign(Object.assign({ 
-        // 不要なので廃止(2022-12-19~)
-        // project: reservationFor.project,
-        typeOf: issuedThrough.typeOf }, (typeof ((_d = issuedThrough.serviceType) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+    if (issuedThrough.typeOf !== factory.product.ProductType.EventService) {
+        throw new factory.errors.NotImplemented(`issuedThrough.typeOf '${issuedThrough.typeOf}' not implemented`);
+    }
+    return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((_d = issuedThrough.serviceType) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
         ? { serviceType: issuedThrough.serviceType }
         : undefined), { serviceOutput: {
             typeOf: factory.reservationType.EventReservation,

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.0",
+    "@chevre/factory": "4.281.0-alpha.2",
     "@cinerino/sdk": "3.135.0-alpha.6",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.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.0"
+  "version": "20.2.0-alpha.2"
 }

package/example/src/chevre/migrateEventOffersSellerMakesOffer.ts

@@ -1,139 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-const AVAILABLE_ROLE_NAMES = ['customer', 'pos'];
-const POS_CLIENT_ID = process.env.POS_CLIENT_ID;
-if (typeof POS_CLIENT_ID !== 'string') {
-    throw new Error('set POS_CLIENT_ID');
-}
-const MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = 93;
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const memberRepo = new chevre.repository.Member(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'month')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        // IAMメンバー検索
-        const eventOffers = <chevre.factory.event.screeningEvent.IOffer | undefined>event.offers;
-        if (eventOffers === undefined) {
-            throw new Error('event.offers undefined');
-        }
-
-        const makesOfferFromEvent = eventOffers.seller.makesOffer;
-
-        const alreadyMigrated = Array.isArray(makesOfferFromEvent)
-            && makesOfferFromEvent.length > 0
-            && makesOfferFromEvent.every((offer) => {
-                return offer.availabilityEnds instanceof Date
-                    && offer.availabilityStarts instanceof Date
-                    && offer.validFrom instanceof Date
-                    && offer.validThrough instanceof Date
-                    && Array.isArray(offer.availableAtOrFrom)
-                    && offer.availableAtOrFrom.length === 1;
-            });
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, makesOfferFromEvent.length, i);
-        } else {
-            let existingApplicationMembers = await memberRepo.search({
-                limit: 100,
-                page: 1,
-                project: { id: { $eq: event.project.id } },
-                member: { typeOf: { $eq: chevre.factory.creativeWorkType.WebApplication } }
-            });
-            // ロールで絞る(customer or pos)
-            existingApplicationMembers = existingApplicationMembers
-                .filter((m) => {
-                    return Array.isArray(m.member.hasRole) && m.member.hasRole.some((r) => AVAILABLE_ROLE_NAMES.includes(r.roleName));
-                });
-            console.log(
-                existingApplicationMembers.length,
-                'existingApplicationMembers found.',
-                event.project.id,
-                existingApplicationMembers.map((m) => m.member.name)
-                    .join(',')
-            );
-            const newMakesOffer: chevre.factory.event.screeningEvent.ISellerMakesOffer[] = existingApplicationMembers.map((a) => {
-                // posについては有効期間調整
-                if (a.member.id === POS_CLIENT_ID) {
-                    const validFrom4pos: Date = moment(event.startDate)
-                        .add(-MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS, 'days')
-                        .toDate();
-                    const validThrough4pos: Date = moment(event.endDate)
-                        .add(1, 'month')
-                        .toDate();
-
-                    return {
-                        typeOf: chevre.factory.offerType.Offer,
-                        availableAtOrFrom: [{ id: a.member.id }],
-                        availabilityEnds: validThrough4pos, // 1 month later from endDate
-                        availabilityStarts: validFrom4pos, // startのMAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS前
-                        validFrom: validFrom4pos, // startのMAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS前
-                        validThrough: validThrough4pos // 1 month later from endDate
-                    };
-                } else {
-                    return {
-                        typeOf: chevre.factory.offerType.Offer,
-                        availableAtOrFrom: [{ id: a.member.id }],
-                        availabilityEnds: eventOffers.availabilityEnds,
-                        availabilityStarts: eventOffers.availabilityStarts,
-                        validFrom: eventOffers.validFrom,
-                        validThrough: eventOffers.validThrough
-                    };
-                }
-            });
-            console.log(
-                'updating seller...', event.project.id, event.id, event.startDate, newMakesOffer.length, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    'offers.seller.makesOffer': newMakesOffer
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated...', event.project.id, event.id, event.startDate, newMakesOffer.length, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);