@chevre/domain 20.1.0-alpha.31 → 20.1.0-alpha.33

package/example/src/chevre/{migrateEventSeriesAdditionalProperties.ts → migrateEventAdditionalProperties.ts}

@@ -1,5 +1,5 @@
 // tslint:disable:no-console
-// import * as moment from 'moment';
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
@@ -18,13 +18,12 @@ async function main() {
         {
             // 'project.id': { $eq: project.id },
             'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries }
-            // typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            // startDate: {
-            //     $gte: moment()
-            //         .add(-1, 'month')
-            //         .toDate()
-            // }
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
+            startDate: {
+                $gte: moment()
+                    .add(-1, 'month')
+                    .toDate()
+            }
             // _id: { $eq: 'al6aff83w' }
         },
         {
@@ -40,11 +39,11 @@ async function main() {
     let updateCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const event: chevre.factory.event.screeningEventSeries.IEvent = doc.toObject();
+        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
 
         const additionalPropertyNamesOnEvent = event.additionalProperty?.map((p) => p.name);
         if (Array.isArray(additionalPropertyNamesOnEvent) && additionalPropertyNamesOnEvent.length > 0) {
-            console.log(additionalPropertyNamesOnEvent.length, 'additionalPropertyNamesOnEvent found', event.project.id);
+            console.log(additionalPropertyNamesOnEvent.length, 'additionalPropertyNamesOnEvent found', event.startDate, event.project.id);
             additionalPropertyNames.push(...additionalPropertyNamesOnEvent);
             projectIds.push(event.project.id);
             additionalPropertyNamesOnEvent.forEach((name) => {
@@ -62,10 +61,11 @@ async function main() {
                     project: { id: { $eq: event.project.id } },
                     limit: 1,
                     page: 1,
-                    name: { $regex: `^${additionalPropertyNameOnEvent}$` }
+                    name: { $regex: `^${additionalPropertyNameOnEvent}$` },
+                    inCodeSet: { identifier: { $eq: event.typeOf } }
                 });
                 if (existings.length > 0) {
-                    console.log('already existed', additionalPropertyNameOnEvent, event.id, event.project.id);
+                    console.log('already existed', additionalPropertyNameOnEvent, event.id, event.startDate, event.project.id);
                 } else {
                     updateCount += 1;
                     await additionalPropertyRepo.save({
@@ -80,7 +80,7 @@ async function main() {
                             name: { ja: additionalPropertyNameOnEvent }
                         }
                     });
-                    console.log('created', additionalPropertyNameOnEvent, event.id, event.project.id);
+                    console.log('created', additionalPropertyNameOnEvent, event.id, event.startDate, event.project.id);
                 }
             }
         }

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

@@ -408,41 +408,22 @@ function createPotentialActions(params) {
     const reserveActionAttributes = pendingReservations.map((reservation) => {
         var _a, _b;
         const eventReservation = Object.assign(Object.assign({}, reservation), { reservationFor });
-        if (params.object !== undefined) {
-            // 予約属性の指定があれば上書き
-            const confirmingReservation = params.object.reservations.find((r) => r.id === eventReservation.id);
-            if (confirmingReservation !== undefined) {
-                // additionalTicketText指定を廃止(2022-05-23~)
-                // if (typeof confirmingReservation.additionalTicketText === 'string') {
-                //     eventReservation.additionalTicketText = confirmingReservation.additionalTicketText;
-                // }
-                // additionalProperty指定を廃止(2022-05-23~)
-                // 追加特性の指定があれば、元の追加特性にマージ
-                // if (Array.isArray(confirmingReservation.additionalProperty)) {
-                //     eventReservation.additionalProperty = [
-                //         ...(Array.isArray(eventReservation.additionalProperty)) ? eventReservation.additionalProperty : [],
-                //         ...confirmingReservation.additionalProperty
-                //     ];
-                // }
-                if (confirmingReservation.underName !== undefined) {
-                    eventReservation.underName = confirmingReservation.underName;
-                    eventReservation.reservedTicket.underName = confirmingReservation.underName;
-                }
-                if (confirmingReservation.reservedTicket !== undefined) {
-                    // ticketToken指定を廃止(2022-05-23~)
-                    // if (typeof confirmingReservation.reservedTicket.ticketToken === 'string') {
-                    //     eventReservation.reservedTicket.ticketToken = confirmingReservation.reservedTicket.ticketToken;
-                    // }
-                    if (confirmingReservation.reservedTicket.issuedBy !== undefined) {
-                        eventReservation.reservedTicket.issuedBy = confirmingReservation.reservedTicket.issuedBy;
-                    }
-                    // reservedTicket.underName指定を廃止(2022-05-23~)
-                    // if (confirmingReservation.reservedTicket.underName !== undefined) {
-                    //     eventReservation.reservedTicket.underName = confirmingReservation.reservedTicket.underName;
-                    // }
-                }
-            }
-        }
+        // 不要なので廃止(2022-12-14~)
+        // if (params.object !== undefined) {
+        //     // 予約属性の指定があれば上書き
+        //     const confirmingReservation = params.object.reservations.find((r) => r.id === eventReservation.id);
+        //     if (confirmingReservation !== undefined) {
+        //         if (confirmingReservation.underName !== undefined) {
+        //             eventReservation.underName = confirmingReservation.underName;
+        //             eventReservation.reservedTicket.underName = confirmingReservation.underName;
+        //         }
+        //         if (confirmingReservation.reservedTicket !== undefined) {
+        //             if (confirmingReservation.reservedTicket.issuedBy !== undefined) {
+        //                 eventReservation.reservedTicket.issuedBy = confirmingReservation.reservedTicket.issuedBy;
+        //             }
+        //         }
+        //     }
+        // }
         // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
         if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
             const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
@@ -450,7 +431,6 @@ function createPotentialActions(params) {
             eventReservation.reservedTicket.underName = ordre2reservationUnderNameResult.underName;
             eventReservation.reservedTicket.issuedBy = ordre2reservationUnderNameResult.issuedBy;
         }
-        // const informReservationActions: factory.action.reserve.IInformReservation[] = [];
         const acceptedOffer4reservation = (_b = transaction.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.find((o) => { var _a, _b; return ((_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id) === reservation.id; });
         const moneyTransfer = createMoneyTransferActions({
             acceptedOffer: acceptedOffer4reservation,
@@ -466,7 +446,6 @@ function createPotentialActions(params) {
             agent: transaction.project,
             potentialActions: {
                 moneyTransfer: moneyTransfer
-                // informReservation: informReservationActions
             },
             purpose: {
                 typeOf: transaction.typeOf,

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

@@ -31,8 +31,8 @@ function authorize(params) {
             transaction,
             store: params.store
         })(repos);
-        let requestBody;
-        let responseBody;
+        // let requestBody: factory.assetTransaction.reserve.IStartParamsWithoutDetail;
+        // let responseBody: factory.assetTransaction.reserve.ITransaction;
         let acceptedOffers4result = [];
         let transactionNumber;
         switch (bookingServiceIdentifire) {
@@ -65,8 +65,8 @@ function authorize(params) {
                         transactionNumber,
                         transaction
                     })(repos);
-                    requestBody = processStartReserveResult.requestBody;
-                    responseBody = processStartReserveResult.responseBody;
+                    // requestBody = processStartReserveResult.requestBody;
+                    // responseBody = processStartReserveResult.responseBody;
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
                     break;
                 default:
@@ -95,7 +95,17 @@ function authorize(params) {
         // 金額計算
         const amount = (0, factory_1.acceptedOffers2amount)({ acceptedOffers: acceptedOffers4result });
         // アクションを完了
-        const result = Object.assign({ price: amount, priceCurrency: acceptedOffers[0].priceCurrency, amount: [], requestBody: requestBody, responseBody: responseBody }, (acceptedOffers4result !== undefined) ? { acceptedOffers: acceptedOffers4result } : undefined);
+        const result = {
+            price: amount,
+            priceCurrency: acceptedOffers[0].priceCurrency,
+            amount: [],
+            // 不要なので廃止(2022-12-14~)
+            // requestBody: requestBody,
+            // responseBody: responseBody,
+            requestBody: {},
+            responseBody: {},
+            acceptedOffers: acceptedOffers4result
+        };
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
@@ -137,7 +147,7 @@ function processStartReserve4chevre(params) {
         const event = params.event;
         const transactionNumber = params.transactionNumber;
         const transaction = params.transaction;
-        let requestBody;
+        // let requestBody: factory.assetTransaction.reserve.IStartParamsWithoutDetail;
         let responseBody;
         let acceptedOffers4result = [];
         if (typeof transactionNumber !== 'string') {
@@ -151,10 +161,9 @@ function processStartReserve4chevre(params) {
             transaction,
             transactionNumber
         });
-        requestBody = startParams;
+        // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
-        // 予約取引サービス開始
-        // responseBody = await repos.reserveTransaction.start(startParams);
+        // 予約取引開始
         responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, validateAppliesToMovieTicket: true }))(repos);
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
@@ -163,19 +172,12 @@ function processStartReserve4chevre(params) {
             project: transaction.project,
             seller: transaction.seller
         });
-        return { requestBody, responseBody, acceptedOffers4result };
+        return { acceptedOffers4result };
     });
 }
 function validateObjectWithoutDetail(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        // const objectWithoutDetail: factory.assetTransaction.reserve.IObjectWithoutDetail = {
-        //     ...params.object,
-        //     // 互換性維持対応として、event.idをreservationFor.idに置換
-        //     ...(typeof params.object?.event?.id === 'string')
-        //         ? { reservationFor: { id: <string>params.object.event.id } }
-        //         : undefined
-        // };
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
             for (let acceptedOffer of objectWithoutDetail.acceptedOffer) {

package/lib/chevre/service/offer/event/factory.d.ts

@@ -24,7 +24,7 @@ export declare function acceptedOffers2amount(params: {
 }): number;
 declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
-    responseBody: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.Chevre>;
+    responseBody: factory.assetTransaction.reserve.ITransaction;
     event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
     project: {
         id: string;

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

@@ -159,7 +159,6 @@ function responseBody2acceptedOffers4result(params) {
             var _a;
             const reservation = createReservation({ project: params.project, itemOffered, event: params.event });
             // appliesToMovieTicketがArrayでないケースは廃止(2022-09-12~)
-            // const priceSpecification = <IReservationPriceSpecification>itemOffered.price;
             const priceSpecification = itemOffered.price;
             const priceComponent = priceSpecification.priceComponent.map((c) => {
                 var _a;
@@ -181,7 +180,6 @@ function responseBody2acceptedOffers4result(params) {
                     : undefined);
             });
             return {
-                // project: { typeOf: params.project.typeOf, id: params.project.id },
                 typeOf: factory.offerType.Offer,
                 id: itemOffered.reservedTicket.ticketType.id,
                 name: itemOffered.reservedTicket.ticketType.name,
@@ -190,8 +188,6 @@ function responseBody2acceptedOffers4result(params) {
                 priceSpecification: {
                     priceComponent: priceComponent,
                     priceCurrency: priceSpecification.priceCurrency,
-                    // 不要な属性を除外(2022-11-02~)
-                    // project: priceSpecification.project,
                     typeOf: priceSpecification.typeOf,
                     valueAddedTaxIncluded: priceSpecification.valueAddedTaxIncluded
                 },
@@ -199,7 +195,6 @@ function responseBody2acceptedOffers4result(params) {
                     ? itemOffered.priceCurrency
                     : factory.priceCurrency.JPY,
                 seller: {
-                    // project: { typeOf: params.project.typeOf, id: params.project.id },
                     typeOf: params.seller.typeOf,
                     name: (typeof params.seller.name === 'string')
                         ? params.seller.name

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

@@ -72,7 +72,7 @@ function confirmReserveTransaction(params) {
                     object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
-                        object: object.object,
+                        // object: object.object,
                         potentialActions: object.potentialActions
                     })(repos);
             }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.280.0-alpha.2",
-    "@cinerino/sdk": "3.135.0-alpha.0",
+    "@chevre/factory": "4.280.0-alpha.5",
+    "@cinerino/sdk": "3.135.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.31"
+  "version": "20.1.0-alpha.33"
 }