@chevre/domain 21.26.0-alpha.7 → 21.26.0

package/example/src/chevre/validateOrder.ts

@@ -22,12 +22,12 @@ async function main() {
             orderDate: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-280, 'days')
-                    .toDate(),
-                $lte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-275, 'days')
+                    .add(-1, 'days')
                     .toDate()
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-360, 'days')
+                //     .toDate()
             }
         },
         {

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

@@ -13,6 +13,9 @@ export declare function createActionAttributes(params: {
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     transactionNumber: string;
 }): factory.action.authorize.offer.product.IAttributes;
+export declare function acceptedOffers2amount(params: {
+    acceptedOffers: IResultAcceptedOffer;
+}): number;
 type IResultAcceptedOffer = factory.action.authorize.offer.product.IResultAcceptedOffer;
 export declare function responseBody2resultAcceptedOffer(params: {
     project: {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResult = exports.responseBody2resultAcceptedOffer = exports.createActionAttributes = exports.createRegisterServiceStartParams = void 0;
+exports.createResult = exports.responseBody2resultAcceptedOffer = exports.acceptedOffers2amount = exports.createActionAttributes = exports.createRegisterServiceStartParams = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
 function createRegisterServiceStartParams(params) {
@@ -78,6 +78,7 @@ function acceptedOffers2amount(params) {
         return a + priceSpecification.priceComponent.reduce((a2, b2) => a2 + Number(b2.price), 0);
     }, 0);
 }
+exports.acceptedOffers2amount = acceptedOffers2amount;
 // tslint:disable-next-line:max-func-body-length
 function responseBody2resultAcceptedOffer(params) {
     let acceptedOffers = [];

package/lib/chevre/service/validation/validateOrder.js

@@ -1,5 +1,4 @@
 "use strict";
-// import * as createDebug from 'debug';
 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) {
@@ -11,11 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOrder = void 0;
+// import * as createDebug from 'debug';
+const moment = require("moment");
 const factory = require("../../factory");
 const factory_1 = require("../offer/event/factory");
+const factory_2 = require("../offer/product/factory");
 const validateMovieTicket_1 = require("../transaction/placeOrderInProgress/validation/validateMovieTicket");
 // const debug = createDebug('chevre-domain:service:validation');
-// tslint:disable-next-line:max-func-body-length
 function validateOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -67,8 +68,13 @@ function validateOrder(params) {
                     throw new Error(`invalid acceptedOffer.priceSpecification.priceComponent [${typeof priceSpecification.priceComponent}]`);
                 }
             }
-            if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
-                throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
+            // 旧メンバーシップ&ペイメントカードを例外として除外(互換性維持対応をしていないため)
+            if (moment(order.orderDate)
+                .isAfter(moment('2023-09-30T15:00:00Z'))
+                || typeOf !== factory.permit.PermitType.Permit) {
+                if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
+                    throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
+                }
             }
         });
         let reservationForIds = [];
@@ -82,20 +88,27 @@ function validateOrder(params) {
         });
         reservationForIds = [...new Set(reservationForIds)];
         itemOfferedTypeOfs = [...new Set(itemOfferedTypeOfs)];
-        // orderedItem検証
-        if (order.orderedItem.length !== reservationForIds.length) {
-            throw new Error(`invalid orderedItem.length:${order.orderedItem.length} [expected:${reservationForIds.length}]`);
-        }
         // itemOffered.typeOf検証
-        if (itemOfferedTypeOfs.length !== 1) {
-            throw new Error(`itemOfferedTypeOfs.length must be 1 [${itemOfferedTypeOfs.length}]`);
+        if (moment(order.orderDate)
+            .isAfter(moment('2024-02-01T15:00:00Z'))) {
+            if (itemOfferedTypeOfs.length !== 1) {
+                throw new Error(`itemOfferedTypeOfs.length must be 1 [${itemOfferedTypeOfs.length}]`);
+            }
+        }
+        else {
+            // 0対応(~2024-02-02)
+            if (itemOfferedTypeOfs.length > 1) {
+                throw new Error(`itemOfferedTypeOfs.length must be 0 or 1 [${itemOfferedTypeOfs.length}]`);
+            }
         }
         // price検証
         let priceExpected = 0;
+        let numOrderedItemExpected = 0;
         const itemOfferedTypeOf = itemOfferedTypeOfs[0];
         switch (itemOfferedTypeOf) {
             case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
+                numOrderedItemExpected = reservationForIds.length;
                 const reservationAcceptedOffers = acceptedOffers;
                 const coaTicketInfoExists = reservationAcceptedOffers[0].itemOffered.reservedTicket.coaTicketInfo !== undefined;
                 if (coaTicketInfoExists) {
@@ -105,16 +118,17 @@ function validateOrder(params) {
                         if (coaTicketInfo === undefined) {
                             throw new Error(`itemOffered.reservedTicket.coaTicketInfo not found`);
                         }
-                        if (typeof coaTicketInfo.salesTicketSalePrice !== 'number'
+                        if (typeof coaTicketInfo.salePrice !== 'number'
                             || typeof coaTicketInfo.addGlasses !== 'number'
                             || typeof coaTicketInfo.spseatAdd1 !== 'number'
                             || typeof coaTicketInfo.spseatAdd2 !== 'number') {
                             throw new Error(`invalid itemOffered.reservedTicket.coaTicketInfo`);
                         }
                         return a + [
-                            coaTicketInfo.salesTicketSalePrice,
-                            coaTicketInfo.addGlasses,
-                            coaTicketInfo.spseatAdd1,
+                            // <number>(<any>coaTicketInfo).salesTicketSalePrice,
+                            // coaTicketInfo.addGlasses,
+                            // coaTicketInfo.spseatAdd1,
+                            coaTicketInfo.salePrice,
                             coaTicketInfo.spseatAdd2
                         ].reduce((a2, b2) => a2 + b2, 0);
                     }, 0);
@@ -126,11 +140,23 @@ function validateOrder(params) {
                 }
                 break;
             case factory.permit.PermitType.Permit:
+                numOrderedItemExpected = acceptedOffers.length;
+                const permitAcceptedOffers = acceptedOffers;
+                priceExpected = (0, factory_2.acceptedOffers2amount)({
+                    acceptedOffers: permitAcceptedOffers
+                });
                 break;
             case factory.actionType.MoneyTransfer:
                 break;
             default:
-                throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
+                if (moment(order.orderDate)
+                    .isAfter(moment('2024-02-01T15:00:00Z'))) {
+                    throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
+                }
+        }
+        // orderedItem検証
+        if (order.orderedItem.length !== numOrderedItemExpected) {
+            throw new Error(`invalid orderedItem.length:${order.orderedItem.length} [expected:${numOrderedItemExpected}]`);
         }
         if (order.price !== priceExpected) {
             throw new Error(`order.price should be ${priceExpected} [actual: ${order.price}]`);

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.362.0-alpha.4",
-    "@cinerino/sdk": "5.14.0-alpha.1",
+    "@chevre/factory": "4.362.0",
+    "@cinerino/sdk": "5.14.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.26.0-alpha.7"
+  "version": "21.26.0"
 }