turf-common 1.4.2-beta.46 → 1.4.2-beta.48

package/README.md

@@ -1,20 +1,20 @@
-## 1 npm init -y
-
-## 2 npm login
-
-## 3 npm version patch
-
-# //it increase version
-
-## 3 npm publish --access public
-
-# //npm publish by default --access public
-
-## 4 npm run version:deploy
-
-### deploy version
-
-## Client side
-
-update package command <br />
-npm update turf-comman
+## 1 npm init -y
+
+## 2 npm login
+
+## 3 npm version patch
+
+# //it increase version
+
+## 3 npm publish --access public
+
+# //npm publish by default --access public
+
+## 4 npm run version:deploy
+
+### deploy version
+
+## Client side
+
+update package command <br />
+npm update turf-comman

package/build/src/models/booking-code-model.d.ts

@@ -55,6 +55,7 @@ export declare class BookingCode {
     static isValidTimeRange(timeSlot: string): boolean;
     static dateFormat(dates: Array<Date>): Array<string>;
     static getDateCode(date: Date): string;
+    static getMonthCode(date: Date): number;
     /**
      * Returns list of month codes (YYMM) in the Date range inclusive
      * @param {Date} from - Start Date

package/build/src/models/booking-code-model.js

@@ -111,7 +111,12 @@ var BookingCode = /** @class */ (function () {
     };
     BookingCode.prototype.isModificationAllowed = function (delayInMinutes) {
         if (delayInMinutes === void 0) { delayInMinutes = _utils_1.DEFAULT_BOOKING_MODIFICATION_DELAY_IN_MINUTES; }
-        var bookingToDateTimeWithDelay = date_util_1.dateUtilService.addMinutesTo(date_util_1.dateUtilService.convertStringToDate(this.getDateWithToTimeCode(), "yyMMddHHmm"), delayInMinutes);
+        var dateWithToTimeCode = this.getDateWithToTimeCode();
+        // If last four digits of dateWithToTimeCode is 2400, then replace it with 2359
+        if (dateWithToTimeCode.slice(-4) === _utils_1.END_OF_DAY_TIME_CODE) {
+            dateWithToTimeCode = dateWithToTimeCode.slice(0, -4) + "2359";
+        }
+        var bookingToDateTimeWithDelay = date_util_1.dateUtilService.addMinutesTo(date_util_1.dateUtilService.convertStringToDate(dateWithToTimeCode, "yyMMddHHmm"), delayInMinutes);
         var currentTime = date_util_1.dateUtilService.getIndianDate();
         return bookingToDateTimeWithDelay > currentTime;
     };
@@ -316,6 +321,11 @@ var BookingCode = /** @class */ (function () {
             .toString()
             .padStart(2, "0")).concat(date.getDate().toString().padStart(2, "0"));
     };
+    BookingCode.getMonthCode = function (date) {
+        return parseInt("".concat(date.getFullYear() % 2000).concat((date.getMonth() + 1)
+            .toString()
+            .padStart(2, "0")));
+    };
     /**
      * Returns list of month codes (YYMM) in the Date range inclusive
      * @param {Date} from - Start Date
@@ -326,14 +336,18 @@ var BookingCode = /** @class */ (function () {
         from = new Date(from.getTime());
         to = new Date(to.getTime());
         var monthCodes = [];
-        while (from < to) {
-            var fromDateCode = BookingCode.getDateCode(from);
-            monthCodes.push(parseInt("".concat(fromDateCode.slice(0, 4))));
-            from.setMonth(from.getMonth() + 1);
-        }
-        var toDateCode = BookingCode.getDateCode(to);
-        if (!monthCodes.includes(parseInt("".concat(toDateCode.slice(0, 4))))) {
-            monthCodes.push(parseInt("".concat(toDateCode.slice(0, 4))));
+        var fromMonthCode = BookingCode.getMonthCode(from);
+        var toMonthCode = BookingCode.getMonthCode(to);
+        var currentMonthCode = fromMonthCode;
+        while (currentMonthCode <= toMonthCode) {
+            monthCodes.push(currentMonthCode);
+            // Change of year handling
+            if (currentMonthCode % 100 === 12) {
+                currentMonthCode = currentMonthCode + 100 - 11;
+            }
+            else {
+                currentMonthCode = currentMonthCode + 1;
+            }
         }
         return monthCodes;
     };

package/package.json

@@ -1,43 +1,43 @@
-{
-  "name": "turf-common",
-  "version": "1.4.2-beta.46",
-  "description": "",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
-  "files": [
-    "build/**/*"
-  ],
-  "scripts": {
-    "clean": "rm -rf build",
-    "build": "npm run clean && tsc",
-    "version:deploy:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
-    "version:deploy:patch": "npm version patch && git push && npm run build && npm publish",
-    "version:deploy:minor": "npm version minor && git push && npm run build && npm publish",
-    "test": "jest",
-    "test:pattern": "jest -i unit/charges/discount-relative",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" 2>&1| tee eslint.log",
-    "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
-  },
-  "repository": {
-    "type": "git",
-    "url": "github__bellex-dev__turf-common:bellex-dev/turf-common.git"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
-    "del-cli": "^5.1.0",
-    "eslint": "^8.50.0",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.2.2"
-  },
-  "dependencies": {
-    "date-fns": "^2.30.0"
-  }
-}
+{
+  "name": "turf-common",
+  "version": "1.4.2-beta.48",
+  "description": "",
+  "main": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "files": [
+    "build/**/*"
+  ],
+  "scripts": {
+    "clean": "rm -rf build",
+    "build": "npm run clean && tsc",
+    "version:deploy:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
+    "version:deploy:patch": "npm version patch && git push && npm run build && npm publish",
+    "version:deploy:minor": "npm version minor && git push && npm run build && npm publish",
+    "test": "jest",
+    "test:pattern": "jest -i unit/charges/discount-relative",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" 2>&1| tee eslint.log",
+    "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
+  },
+  "repository": {
+    "type": "git",
+    "url": "github__bellex-dev__turf-common:bellex-dev/turf-common.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.8.9",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
+    "del-cli": "^5.1.0",
+    "eslint": "^8.50.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "date-fns": "^2.30.0"
+  }
+}