@chevre/domain 20.2.0-alpha.1 → 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/service/assetTransaction/reserve/factory.js

@@ -389,8 +389,11 @@ function createReservation(params) {
             typeOf: 'CategoryCode'
         }
         : undefined;
+    const availableChannel = eventOffers.itemOffered.availableChannel;
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        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);
+        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: {
@@ -412,7 +415,9 @@ function createReservation(params) {
             : undefined);
     }
     else {
-        const issuedThrough = Object.assign(Object.assign({ typeOf: factory.product.ProductType.Transportation }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined), (typeof eventOffers.itemOffered.id === 'string') ? { id: eventOffers.itemOffered.id } : undefined);
+        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

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/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.1",
+    "@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.1"
+  "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);