@chevre/domain 21.8.0-alpha.21 → 21.8.0-alpha.22

package/lib/chevre/repo/mongoose/schemas/offer.d.ts

@@ -52,6 +52,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     additionalProperty: any[];
+    offers: any[];
     addOn: any[];
     availability: string;
     availableAtOrFrom: any[];
@@ -83,6 +84,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validRateLimit?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     additionalProperty: any[];
+    offers: any[];
     addOn: any[];
     availability: string;
     availableAtOrFrom: any[];
@@ -114,6 +116,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validRateLimit?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     additionalProperty: any[];
+    offers: any[];
     addOn: any[];
     availability: string;
     availableAtOrFrom: any[];

package/lib/chevre/repo/mongoose/schemas/offer.js

@@ -29,6 +29,7 @@ const schema = new mongoose_1.Schema({
     availableAtOrFrom: [mongoose_1.SchemaTypes.Mixed],
     hasMerchantReturnPolicy: mongoose_1.SchemaTypes.Mixed,
     itemOffered: mongoose_1.SchemaTypes.Mixed,
+    offers: [mongoose_1.SchemaTypes.Mixed],
     priceCurrency: String,
     priceSpecification: mongoose_1.SchemaTypes.Mixed,
     eligibleCustomerType: mongoose_1.SchemaTypes.Mixed,

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

@@ -299,6 +299,7 @@ function createReservation(params) {
     }
     return reservationItem;
 }
+// tslint:disable-next-line:max-func-body-length
 function coaTicket2offer(params) {
     var _a, _b;
     // 適用通貨区分
@@ -322,7 +323,6 @@ function coaTicket2offer(params) {
             }]
         : undefined;
     const unitPriceSpec = {
-        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.priceSpecificationType.UnitPriceSpecification,
         price: 0,
         priceCurrency: factory.priceCurrency.JPY,
@@ -332,15 +332,25 @@ function coaTicket2offer(params) {
             unitCode: factory.unitCode.C62,
             value: 1
         }
-        // appliesToMovieTicket?: {};
     };
     const identifier = (0, util_1.format)('%s-%s-%s', factory.service.webAPI.Identifier.COA, params.theaterCode, params.ticketResult.ticketCode);
-    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: {
-            ja: params.ticketResult.ticketName,
-            en: (typeof params.ticketResult.ticketNameEng === 'string')
-                ? params.ticketResult.ticketNameEng
-                : ''
-        }, description: {
+    const offerName = {
+        ja: params.ticketResult.ticketName,
+        en: (typeof params.ticketResult.ticketNameEng === 'string')
+            ? params.ticketResult.ticketNameEng
+            : ''
+    };
+    const subOfferPriceSpec = {
+        price: unitPriceSpec.price,
+        typeOf: unitPriceSpec.typeOf
+    };
+    const subOffers = [{
+            typeOf: factory.offerType.Offer,
+            identifier: identifier,
+            name: offerName,
+            priceSpecification: subOfferPriceSpec
+        }];
+    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: offerName, description: {
             ja: '',
             en: ''
         }, alternateName: {
@@ -350,7 +360,7 @@ function coaTicket2offer(params) {
                 : ''
         }, availability: factory.itemAvailability.InStock, itemOffered: {
             typeOf: factory.product.ProductType.EventService
-        }, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
+        }, offers: subOffers, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
             { name: 'theaterCode', value: params.theaterCode },
             ...Object.keys(params.ticketResult)
                 .map((key) => {

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

@@ -186,9 +186,14 @@ function processVoidPayTransaction(params) {
                         project: { id: { $eq: action.project.id } },
                         typeOf: factory.assetTransactionType.Pay,
                         transactionNumber: { $eq: transactionNumber }
-                    });
-                    if (payTransactions.length > 0) {
-                        yield PayTransactionService.cancel({ transactionNumber })(repos);
+                    }, ['_id', 'status']);
+                    const payTransaction = payTransactions.shift();
+                    if (payTransaction !== undefined) {
+                        // ステータス検証(Expiredから実行される可能性がある)
+                        if (payTransaction.status !== factory.transactionStatusType.Canceled
+                            && payTransaction.status !== factory.transactionStatusType.Expired) {
+                            yield PayTransactionService.cancel({ transactionNumber })(repos);
+                        }
                     }
                 }
                 yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -149,10 +149,10 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                         appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
                             return a.serviceOutput.typeOf === paymentMethodType;
                         });
-                    }
-                    else if (typeof (appliesToMovieTickets4reservation === null || appliesToMovieTickets4reservation === void 0 ? void 0 : appliesToMovieTickets4reservation.identifier) === 'string') {
-                        // Arrayでない場合を廃止(2022-08-01~)
-                        throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
+                        // Array以外への考慮自体を廃止(2023-09-01~)
+                        // } else if (typeof appliesToMovieTickets4reservation?.identifier === 'string') {
+                        //     // Arrayでない場合を廃止(2022-08-01~)
+                        //     throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
                     }
                     if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
                         appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.328.0",
-    "@cinerino/sdk": "3.165.0",
+    "@chevre/factory": "4.329.0-alpha.0",
+    "@cinerino/sdk": "3.166.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.21"
+  "version": "21.8.0-alpha.22"
 }