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

package/example/src/chevre/{migrateOfferAdditionalProperties.ts → migrateMovieAdditionalProperties.ts}

@@ -12,9 +12,9 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const additionalPropertyRepo = new chevre.repository.AdditionalProperty(mongoose.connection);
-    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
 
-    const cursor = offerRepo.getCursor(
+    const cursor = creativeWorkRepo.getCursor(
         {
             // 'project.id': { $eq: project.id },
             'project.id': { $ne: EXCLUDED_PROJECT_ID }
@@ -23,7 +23,7 @@ async function main() {
             // _id: 1,
         }
     );
-    console.log('events found');
+    console.log('movies found');
 
     const additionalPropertyNames: string[] = [];
     const projectIds: string[] = [];
@@ -33,64 +33,64 @@ async function main() {
     let updateCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const unitPriceOffer: chevre.factory.unitPriceOffer.IUnitPriceOffer = doc.toObject();
+        const movie: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
 
-        const additionalPropertyNamesOnEvent = unitPriceOffer.additionalProperty?.map((p) => p.name);
+        const additionalPropertyNamesOnEvent = movie.additionalProperty?.map((p) => p.name);
         if (Array.isArray(additionalPropertyNamesOnEvent) && additionalPropertyNamesOnEvent.length > 0) {
             console.log(
                 additionalPropertyNamesOnEvent.length,
                 'additionalPropertyNamesOnEvent found',
-                unitPriceOffer.project.id,
-                unitPriceOffer.id
+                movie.project.id,
+                movie.id
             );
             additionalPropertyNames.push(...additionalPropertyNamesOnEvent);
-            projectIds.push(unitPriceOffer.project.id);
+            projectIds.push(movie.project.id);
             additionalPropertyNamesOnEvent.forEach((name) => {
                 if (!name.match(/^[a-zA-Z]*$/)) {
                     // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                    unexpextedprojectIds.push(unitPriceOffer.project.id);
+                    unexpextedprojectIds.push(movie.project.id);
                 }
                 // tslint:disable-next-line:no-magic-numbers
                 if (name.length < 5) {
                     // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                    unexpextedprojectIds.push(unitPriceOffer.project.id);
+                    unexpextedprojectIds.push(movie.project.id);
                 }
             });
 
             for (const additionalPropertyNameOnEvent of additionalPropertyNamesOnEvent) {
                 const existings = await additionalPropertyRepo.search({
-                    project: { id: { $eq: unitPriceOffer.project.id } },
+                    project: { id: { $eq: movie.project.id } },
                     limit: 1,
                     page: 1,
                     name: { $regex: `^${additionalPropertyNameOnEvent}$` }
                 });
                 if (existings.length > 0) {
-                    console.log('already existed', additionalPropertyNameOnEvent, unitPriceOffer.id, unitPriceOffer.project.id);
+                    console.log('already existed', additionalPropertyNameOnEvent, movie.id, movie.project.id);
                 } else {
                     updateCount += 1;
                     const newAdditionalProperty: chevre.factory.additionalProperty.IAdditionalProperty = {
-                        project: unitPriceOffer.project,
+                        project: movie.project,
                         typeOf: 'CategoryCode',
                         codeValue: additionalPropertyNameOnEvent,
                         inCodeSet: {
                             typeOf: 'CategoryCodeSet',
-                            identifier: <any>unitPriceOffer.typeOf
+                            identifier: <chevre.factory.creativeWorkType.Movie>movie.typeOf
                         },
                         name: { ja: additionalPropertyNameOnEvent }
                     };
                     await additionalPropertyRepo.save({
                         attributes: newAdditionalProperty
                     });
-                    console.log('created', additionalPropertyNameOnEvent, unitPriceOffer.id, unitPriceOffer.project.id);
+                    console.log('created', additionalPropertyNameOnEvent, movie.id, movie.project.id);
                 }
             }
         }
     });
     console.log(i, 'events checked');
     console.log(updateCount, 'properties updated');
-    console.log([...new Set(additionalPropertyNames)]);
-    console.log([...new Set(projectIds)]);
-    console.log([...new Set(unexpextedprojectIds)]);
+    console.log('additionalPropertyNames:', [...new Set(additionalPropertyNames)]);
+    console.log('projectIds:', [...new Set(projectIds)]);
+    console.log('unexpextedprojectIds:', [...new Set(unexpextedprojectIds)]);
 }
 
 main()

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

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
+export declare type IAcceptedOffer4COA = factory.action.authorize.offer.seatReservation.IAcceptedOffer<factory.service.webAPI.Identifier.COA>;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
     event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
@@ -9,9 +10,8 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
 /**
  * 供給情報から承認アクションの価格を導き出す
  */
-export declare function offers2resultPrice(offers: factory.action.authorize.offer.seatReservation.IAcceptedOffer<WebAPIIdentifier.COA>[]): {
+export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
-    requiredPoint: number;
     eligibleMonetaryAmount: factory.offer.IEligibleMonetaryAmount[];
 };
 declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;

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

@@ -54,7 +54,6 @@ exports.createAuthorizeSeatReservationActionAttributes = createAuthorizeSeatRese
  */
 function offers2resultPrice(offers) {
     const price = offers.reduce((a, b) => a + b.price, 0);
-    const requiredPoint = offers.reduce((a, b) => a + b.ticketInfo.usePoint, 0);
     const eligibleMonetaryAmount = offers.reduce((a, b) => {
         if (Array.isArray(b.eligibleMonetaryAmount)) {
             return [...a, ...b.eligibleMonetaryAmount];
@@ -63,7 +62,7 @@ function offers2resultPrice(offers) {
             return a;
         }
     }, []);
-    return { price, requiredPoint, eligibleMonetaryAmount };
+    return { price, eligibleMonetaryAmount };
 }
 exports.offers2resultPrice = offers2resultPrice;
 /**

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.d.ts

@@ -0,0 +1,21 @@
+import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { IAcceptedOffer4COA } from './factory';
+/**
+ * 受け入れらたオファーの内容を検証
+ */
+declare function validateAcceptedOffers(params: {
+    object: {
+        acceptedOffer: IAcceptedOffer4COA[];
+        event: {
+            id: string;
+        };
+    };
+    project: {
+        id: string;
+    };
+}): (repos: {
+    offer: OfferRepo;
+}) => Promise<{
+    acceptedOffers: IAcceptedOffer4COA[];
+}>;
+export { validateAcceptedOffers };

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

@@ -0,0 +1,59 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateAcceptedOffers = void 0;
+const factory = require("../../../factory");
+/**
+ * 受け入れらたオファーの内容を検証
+ */
+function validateAcceptedOffers(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const offerIds = (Array.isArray(params.object.acceptedOffer))
+            ? [...new Set(params.object.acceptedOffer.map((o) => o.id))]
+            : [];
+        let availableUnitPriceOffers = [];
+        // 指定された単価オファーを検索
+        if (offerIds.length > 0) {
+            availableUnitPriceOffers = yield repos.offer.search({
+                id: { $in: offerIds },
+                project: { id: { $eq: params.project.id } }
+            });
+        }
+        // 利用可能なチケットオファーであれば受け入れる
+        const acceptedOffers = params.object.acceptedOffer.map((acceptedOffer) => {
+            var _a, _b, _c, _d, _e, _f;
+            const availableUnitPriceOffer = availableUnitPriceOffers.find((unitPriceOffer) => unitPriceOffer.id === acceptedOffer.id);
+            if (availableUnitPriceOffer === undefined) {
+                throw new factory.errors.NotFound(factory.offerType.Offer, `${acceptedOffer.identifier} not found`);
+            }
+            const { additionalProperty, itemOffered, name, price, priceSpecification, ticketInfo } = acceptedOffer;
+            return Object.assign(Object.assign({ additionalProperty,
+                itemOffered,
+                name,
+                price,
+                priceSpecification,
+                ticketInfo, 
+                // 以下属性については単価オファーから読む(2023-03-09~)
+                priceCurrency: availableUnitPriceOffer.priceCurrency, id: String(availableUnitPriceOffer.id), identifier: String(availableUnitPriceOffer.identifier), typeOf: availableUnitPriceOffer.typeOf }, (Array.isArray(availableUnitPriceOffer.eligibleMonetaryAmount))
+                ? { eligibleMonetaryAmount: availableUnitPriceOffer.eligibleMonetaryAmount }
+                : undefined), {
+                // tslint:disable-next-line:no-suspicious-comment
+                // TODO itemOfferedに完全置き換え
+                seatNumber: (_c = (_b = (_a = itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatNumber,
+                // tslint:disable-next-line:no-suspicious-comment
+                // TODO itemOfferedに完全置き換え
+                seatSection: (_f = (_e = (_d = itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservedTicket) === null || _e === void 0 ? void 0 : _e.ticketedSeat) === null || _f === void 0 ? void 0 : _f.seatSection
+            });
+        });
+        return { acceptedOffers };
+    });
+}
+exports.validateAcceptedOffers = validateAcceptedOffers;

package/lib/chevre/service/offer/eventServiceByCOA.d.ts

@@ -1,11 +1,14 @@
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as EventRepo } from '../../repo/event';
+import { MongoRepository as OfferRepo } from '../../repo/offer';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import { IAcceptedOffer4COA } from './eventServiceByCOA/factory';
 import * as factory from '../../factory';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export declare type IAuthorizeOperation<T> = (repos: {
     action: ActionRepo;
     event: EventRepo;
+    offer: OfferRepo;
     transaction: TransactionRepo;
 }) => Promise<T>;
 export declare type IAuthorizeOfferAction = factory.action.authorize.offer.seatReservation.IAction<WebAPIIdentifier.COA>;
@@ -14,7 +17,7 @@ export declare type IAuthorizeOfferAction = factory.action.authorize.offer.seatR
  */
 export declare function authorize(params: {
     object: {
-        acceptedOffer: factory.action.authorize.offer.seatReservation.IAcceptedOffer<WebAPIIdentifier.COA>[];
+        acceptedOffer: IAcceptedOffer4COA[];
         event: {
             id: string;
         };
@@ -68,7 +71,7 @@ export declare function cancel(params: {
 export declare function changeOffers(params: {
     id: string;
     object: {
-        acceptedOffer: factory.action.authorize.offer.seatReservation.IAcceptedOffer<WebAPIIdentifier.COA>[];
+        acceptedOffer: IAcceptedOffer4COA[];
         event: {
             id: string;
         };

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeOffers = exports.cancel = exports.authorize = exports.WebAPIIdentifier = void 0;
 const moment = require("moment");
 const factory_1 = require("./eventServiceByCOA/factory");
+const validateAcceptedOffers_1 = require("./eventServiceByCOA/validateAcceptedOffers");
 const factory = require("../../factory");
 exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
@@ -33,12 +34,17 @@ function authorize(params) {
             id: params.object.event.id
         });
         // COA仮予約後にリクエストが来る前提
-        const acceptedOffer = params.object.acceptedOffer;
+        // validate acceptedOffer(2023-03-09~)
+        // const acceptedOffer = params.object.acceptedOffer;
+        const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
+            object: params.object,
+            project: { id: transaction.project.id }
+        })(repos);
         const updTmpReserveSeatArgs = params.result.requestBody;
         const updTmpReserveSeatResult = params.result.responseBody;
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
-            acceptedOffers: acceptedOffer,
+            acceptedOffers,
             event: screeningEvent,
             transaction: transaction
         });
@@ -57,7 +63,7 @@ function authorize(params) {
             throw error;
         }
         // 座席仮予約からオファー情報を生成する
-        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffer);
+        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
         const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             responseBody: updTmpReserveSeatResult,
             object: action.object,
@@ -113,15 +119,6 @@ function cancel(params) {
                 timeBegin: actionResult.requestBody.timeBegin,
                 tmpReserveNum: actionResult.responseBody.tmpReserveNum
             };
-            // 座席仮予約削除
-            // await repos.reserveService.delTmpReserve({
-            //     theaterCode: actionResult.requestBody.theaterCode,
-            //     dateJouei: actionResult.requestBody.dateJouei,
-            //     titleCode: actionResult.requestBody.titleCode,
-            //     titleBranchNum: actionResult.requestBody.titleBranchNum,
-            //     timeBegin: actionResult.requestBody.timeBegin,
-            //     tmpReserveNum: actionResult.responseBody.tmpReserveNum
-            // });
         }
         return cancelResult;
     });
@@ -153,14 +150,19 @@ function changeOffers(params) {
             id: params.object.event.id
         });
         // COA仮予約後にリクエストが来る前提
-        const acceptedOffer = params.object.acceptedOffer;
+        // validate acceptedOffer(2023-03-09~)
+        // const acceptedOffer = params.object.acceptedOffer;
+        const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
+            object: params.object,
+            project: { id: transaction.project.id }
+        })(repos);
         // 供給情報と価格を変更してからDB更新
-        authorizeAction.object.acceptedOffer = acceptedOffer;
+        authorizeAction.object.acceptedOffer = acceptedOffers;
         const updTmpReserveSeatResult = (_a = authorizeAction.result) === null || _a === void 0 ? void 0 : _a.responseBody;
         if (updTmpReserveSeatResult === undefined) {
             throw new factory.errors.NotFound('action.result.responseBody');
         }
-        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffer);
+        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
         const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             responseBody: updTmpReserveSeatResult,
             object: authorizeAction.object,

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -78,7 +78,9 @@ function validateMovieTicket(params, paymentServiceId) {
                 throw new factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
             }
         });
-        return checkResult;
+        // checkはするが保管は保留(2023-03-09~)
+        return;
+        // return checkResult;
     });
 }
 exports.validateMovieTicket = validateMovieTicket;

package/lib/chevre/service/payment/movieTicket.js

@@ -69,9 +69,8 @@ function checkMovieTicket(params) {
                 paymentServiceId
             })(repos);
             // 一度認証されたMovieTicketをDBに記録する(後で検索しやすいように)→一旦保留
-            yield Promise.all(checkResult.movieTickets.map((__) => __awaiter(this, void 0, void 0, function* () {
-                // no op
-            })));
+            // await Promise.all(checkResult.movieTickets.map(async (__) => {
+            // }));
         }
         catch (error) {
             // actionにエラー結果を追加

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.298.0",
-    "@cinerino/sdk": "3.146.0",
+    "@chevre/factory": "4.299.0",
+    "@cinerino/sdk": "3.148.0",
     "@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.7.0-alpha.0"
+  "version": "20.7.0-alpha.2"
 }