@chevre/domain 20.5.0 → 20.7.0-alpha.0

package/lib/chevre/repo/comment.js

@@ -78,7 +78,7 @@ class MongoRepository {
     }
     create(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const creatingDoc = Object.assign({ about: params.about, author: params.author, dateCreated: new Date(), project: params.project, text: params.text, typeOf: factory.creativeWorkType.Comment }, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined);
+            const creatingDoc = Object.assign(Object.assign({ about: params.about, author: params.author, dateCreated: new Date(), project: params.project, text: params.text, typeOf: factory.creativeWorkType.Comment }, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (Array.isArray(params.mentions)) ? { mentions: params.mentions } : undefined);
             const doc = yield this.commentModel.create(creatingDoc);
             return doc.toObject();
         });

package/lib/chevre/repo/mongoose/model/comments.js

@@ -21,6 +21,7 @@ const schema = new mongoose.Schema({
     commentCount: { type: Number, default: 0 },
     dateCreated: Date,
     dateModified: Date,
+    mentions: [mongoose.SchemaTypes.Mixed],
     text: {
         type: String,
         required: true

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

@@ -12,6 +12,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
 export declare function offers2resultPrice(offers: factory.action.authorize.offer.seatReservation.IAcceptedOffer<WebAPIIdentifier.COA>[]): {
     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

@@ -55,7 +55,15 @@ 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);
-    return { price, requiredPoint };
+    const eligibleMonetaryAmount = offers.reduce((a, b) => {
+        if (Array.isArray(b.eligibleMonetaryAmount)) {
+            return [...a, ...b.eligibleMonetaryAmount];
+        }
+        else {
+            return a;
+        }
+    }, []);
+    return { price, requiredPoint, eligibleMonetaryAmount };
 }
 exports.offers2resultPrice = offers2resultPrice;
 /**
@@ -100,8 +108,6 @@ function responseBody2acceptedOffers4result(params) {
         const reservationNumber = String(updTmpReserveSeatResult.tmpReserveNum);
         const reservationId = `${reservationNumber}-${index.toString()}`;
         const workPerformed = {
-            // 不要なので廃止(2022-12-19~)
-            // project: event.superEvent.workPerformed.project,
             id: event.superEvent.workPerformed.id,
             identifier: event.superEvent.workPerformed.identifier,
             name: event.superEvent.workPerformed.name,
@@ -114,24 +120,12 @@ function responseBody2acceptedOffers4result(params) {
                     .toDate()
             }
             : undefined), { endDate: moment(event.endDate)
-                .toDate(), 
-            // 不要なので廃止(2022-12-19~)
-            // eventStatus: event.eventStatus,
-            identifier: event.identifier, location: {
-                // 不要なので廃止(2022-12-19~)
-                // project: event.location.project,
+                .toDate(), identifier: event.identifier, location: {
                 typeOf: event.location.typeOf,
                 branchCode: event.location.branchCode,
                 name: event.location.name
-            }, name: event.name, 
-            // 不要なので廃止(2022-12-19~)
-            // project: event.project,
-            startDate: moment(event.startDate)
-                .toDate(), 
-            // 最適化(2022-05-31~)
-            superEvent: {
-                // 不要なので廃止(2022-12-19~)
-                // project: event.superEvent.project,
+            }, name: event.name, startDate: moment(event.startDate)
+                .toDate(), superEvent: {
                 typeOf: event.superEvent.typeOf,
                 id: event.superEvent.id,
                 identifier: event.superEvent.identifier,
@@ -160,14 +154,10 @@ function responseBody2acceptedOffers4result(params) {
             ticketNumber: ticketToken,
             ticketToken: ticketToken,
             ticketType: {
-                // 不要なので廃止(2022-12-17~)
-                // project: { typeOf: event.project.typeOf, id: event.project.id },
                 typeOf: factory.offerType.Offer,
                 id: requestedOffer.id,
                 identifier: String(requestedOffer.identifier),
                 name: requestedOffer.name
-                // 不要なので廃止(2022-12-17~)
-                // priceCurrency: factory.priceCurrency.JPY
             }
         };
         const additionalProperty = (_c = (_b = requestedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.additionalProperty;
@@ -203,7 +193,6 @@ function responseBody2acceptedOffers4result(params) {
             priceComponent: requestedOffer.priceSpecification.priceComponent
         };
         return {
-            // project: { typeOf: event.project.typeOf, id: event.project.id },
             typeOf: factory.offerType.Offer,
             id: requestedOffer.id,
             name: requestedOffer.name,
@@ -212,7 +201,6 @@ function responseBody2acceptedOffers4result(params) {
             priceSpecification,
             priceCurrency: factory.priceCurrency.JPY,
             seller: {
-                // project: { typeOf: event.project.typeOf, id: event.project.id },
                 typeOf: params.seller.typeOf,
                 name: params.seller.name
             }

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

@@ -32,24 +32,6 @@ function authorize(params) {
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
             id: params.object.event.id
         });
-        // 必ず定義されている前提
-        // const coaInfo = <factory.event.screeningEvent.ICOAInfo>screeningEvent.coaInfo;
-        // const acceptedOffersWithoutDetails = await createAcceptedOffersWithoutDetails({
-        //     object: params.object,
-        //     coaInfo
-        // })({ reserveService: repos.reserveService });
-        // const acceptedOffer = await validateOffers(
-        //     { id: transaction.project.id },
-        //     (transaction.agent.typeOf === factory.personType.Person),
-        //     // 必ず定義されている前提
-        //     coaInfo,
-        //     acceptedOffersWithoutDetails
-        // )({
-        //     categoryCode: repos.categoryCode,
-        //     offer: repos.offer,
-        //     reserveService: repos.reserveService,
-        //     masterService: repos.masterService
-        // });
         // COA仮予約後にリクエストが来る前提
         const acceptedOffer = params.object.acceptedOffer;
         const updTmpReserveSeatArgs = params.result.requestBody;
@@ -75,7 +57,7 @@ function authorize(params) {
             throw error;
         }
         // 座席仮予約からオファー情報を生成する
-        const { price, requiredPoint } = (0, factory_1.offers2resultPrice)(acceptedOffer);
+        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffer);
         const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             responseBody: updTmpReserveSeatResult,
             object: action.object,
@@ -85,13 +67,16 @@ function authorize(params) {
                 .toDate(),
             totalPrice: price
         });
-        const result = Object.assign({ price: price, priceCurrency: factory.priceCurrency.JPY, amount: (requiredPoint > 0)
-                ? [{
-                        typeOf: 'MonetaryAmount',
-                        currency: 'Point',
-                        value: requiredPoint
-                    }]
-                : [], requestBody: updTmpReserveSeatArgs, responseBody: updTmpReserveSeatResult, acceptedOffers: acceptedOffers4result }, { updTmpReserveSeatArgs, updTmpReserveSeatResult } // 互換性維持のため
+        const result = Object.assign({ price: price, priceCurrency: factory.priceCurrency.JPY, 
+            // eligibleMonetaryAmountを使用(2023-03-08~)
+            // amount: (requiredPoint > 0)
+            //     ? [{
+            //         typeOf: 'MonetaryAmount',
+            //         currency: 'Point',
+            //         value: requiredPoint
+            //     }]
+            //     : [],
+            amount: eligibleMonetaryAmount, requestBody: updTmpReserveSeatArgs, responseBody: updTmpReserveSeatResult, acceptedOffers: acceptedOffers4result }, { updTmpReserveSeatArgs, updTmpReserveSeatResult } // 互換性維持のため
         );
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
@@ -169,44 +154,13 @@ function changeOffers(params) {
         });
         // COA仮予約後にリクエストが来る前提
         const acceptedOffer = params.object.acceptedOffer;
-        // 座席区分加算料金などを補完
-        // acceptedOffer = acceptedOffer.map((offer) => {
-        //     const originalOffer = authorizeAction.object.acceptedOffer.find((o) => {
-        //         return o.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection === offer.seatSection
-        //             && o.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber === offer.seatNumber;
-        //     });
-        //     if (originalOffer === undefined) {
-        //         throw new factory.errors.Argument('offers', 'seatSection or seatNumber not matched.');
-        //     }
-        //     return {
-        //         ...offer,
-        //         ticketInfo: {
-        //             ...offer.ticketInfo,
-        //             spseatAdd1: originalOffer.ticketInfo.spseatAdd1,
-        //             spseatAdd2: originalOffer.ticketInfo.spseatAdd2,
-        //             spseatKbn: originalOffer.ticketInfo.spseatKbn
-        //         }
-        //     };
-        // });
-        // const acceptedOffer = await validateOffers(
-        //     { id: transaction.project.id },
-        //     (transaction.agent.typeOf === factory.personType.Person),
-        //     // 必ず定義されている前提
-        //     <factory.event.screeningEvent.ICOAInfo>screeningEvent.coaInfo,
-        //     acceptedOffersWithoutDetails
-        // )({
-        //     categoryCode: repos.categoryCode,
-        //     offer: repos.offer,
-        //     reserveService: repos.reserveService,
-        //     masterService: repos.masterService
-        // });
         // 供給情報と価格を変更してからDB更新
         authorizeAction.object.acceptedOffer = acceptedOffer;
         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, requiredPoint } = (0, factory_1.offers2resultPrice)(acceptedOffer);
+        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffer);
         const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             responseBody: updTmpReserveSeatResult,
             object: authorizeAction.object,
@@ -216,13 +170,16 @@ function changeOffers(params) {
                 .toDate(),
             totalPrice: price
         });
-        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, amount: (requiredPoint > 0)
-                ? [{
-                        typeOf: 'MonetaryAmount',
-                        currency: 'Point',
-                        value: requiredPoint
-                    }]
-                : [], acceptedOffers: acceptedOffers4result });
+        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, 
+            // eligibleMonetaryAmountを使用(2023-03-08~)
+            // amount: (requiredPoint > 0)
+            //     ? [{
+            //         typeOf: 'MonetaryAmount',
+            //         currency: 'Point',
+            //         value: requiredPoint
+            //     }]
+            //     : [],
+            amount: eligibleMonetaryAmount, acceptedOffers: acceptedOffers4result });
         // 座席予約承認アクションの供給情報を変更する
         return repos.action.updateAuthorizeEventOfferAction({
             id: params.id,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.297.0",
-    "@cinerino/sdk": "3.145.0",
+    "@chevre/factory": "4.298.0",
+    "@cinerino/sdk": "3.146.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.5.0"
+  "version": "20.7.0-alpha.0"
 }