turf-common 1.4.2-beta.13 → 1.4.2-beta.14

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

@@ -45,7 +45,7 @@ export declare class BookingCode {
     static getWeekday(dateCode: number): number;
     static convertToDate(str: string): Date;
     static previousDateChecker(fromDate: number, index: number, errorKey?: string): void;
-    static previousTimeChecker(fromTime: string, fromDate: number, index: number, bookingDelayInMinutes?: number): void;
+    static previousTimeChecker(fromTime: string, fromDate: number, index: number, bookingDelayInMinutes?: number, date?: Date): void;
     static getDateCodesByWeek(fromDate: number, toDate: number, selectedWeekday: number): string[];
     static getDatesByWeek(fromDate: number, toDate: number, selectedWeekday: number): Date[];
     static isValidTimeRange(timeSlot: string): boolean;

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

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BookingCode = void 0;
 var time_slot_model_1 = require("./time-slot-model");
@@ -233,27 +222,18 @@ var BookingCode = /** @class */ (function () {
         }
     };
     //---------------------
-    BookingCode.previousTimeChecker = function (fromTime, fromDate, index, bookingDelayInMinutes) {
+    BookingCode.previousTimeChecker = function (fromTime, fromDate, index, bookingDelayInMinutes, date) {
         if (bookingDelayInMinutes === void 0) { bookingDelayInMinutes = _utils_1.DEFAULT_BOOKING_DELAY_IN_MINUTES; }
-        var now = new Date();
-        this.convertToDate(fromDate.toString());
-        // const delayInBooking = 15;
-        if (this.convertToDate(fromDate.toString()) > now) {
-            return; //do nothing if fromDate is in future
-        }
-        else if (this.convertToDate(fromDate.toString()) <= now) {
-            now.setMinutes(now.getMinutes() - bookingDelayInMinutes); // 15minutes buffer for late bookings
-            var options = {
-                timeZone: "Asia/Kolkata",
-            };
-            var timeFormat = new Intl.DateTimeFormat("en-US", __assign(__assign({}, options), { hour: "2-digit", minute: "2-digit", hour12: false }));
-            var currentTimeObj = timeFormat.format(now).replace(/:/g, "");
-            if (fromTime < currentTimeObj) {
-                throw new app_badrequest_exception_1.AppBadRequestException({
-                    key: "slot.".concat(index),
-                    message: ["Booking time should be in future"],
-                });
-            }
+        if (date === void 0) { date = date_util_1.dateUtilService.getIndianDate(); }
+        var now = date;
+        console.log("previousTimeChecker now", now);
+        var bookingDate = date_util_1.dateUtilService.convertStringToDate(fromDate.toString() + fromTime, "yyMMddHHmm");
+        var difference = bookingDate.getTime() - now.getTime() + bookingDelayInMinutes * 60 * 1000;
+        if (difference < 0) {
+            throw new app_badrequest_exception_1.AppBadRequestException({
+                key: "slot.".concat(index),
+                message: ["Booking time should be in future"],
+            });
         }
     };
     //---------------------

package/build/src/utils/date-util.d.ts

@@ -5,7 +5,8 @@ export declare class DateUtilService {
     getNDaysCode(n: number): string;
     getDateCode(date: Date): string;
     addNDaysToDate(date: Date, n: number): Date;
-    convertStringToDate(dateString: string, format: string): Date;
+    convertStringToDate(dateString: string, format: string, offset?: number): Date;
+    getIndianDate(date?: Date): Date;
     isInPast(date: Date): boolean;
     getDateFromDatabaseDate: (date: string) => Date;
     noOfDaysBetweenDates: (date1: Date, date2: Date) => number;

package/build/src/utils/date-util.js

@@ -31,12 +31,17 @@ var DateUtilService = /** @class */ (function () {
     DateUtilService.prototype.addNDaysToDate = function (date, n) {
         return (0, date_fns_1.add)(date, { days: n });
     };
-    DateUtilService.prototype.convertStringToDate = function (dateString, format) {
+    DateUtilService.prototype.convertStringToDate = function (dateString, format, offset) {
+        if (offset === void 0) { offset = 330 * 60 * 1000; }
         var parsedDate = (0, date_fns_1.parse)(dateString, format, new Date());
         // IST has a fixed offset of UTC+5:30
-        var indianDate = new Date(parsedDate.getTime() + 330 * 60 * 1000);
+        var indianDate = new Date(parsedDate.getTime() + offset);
         return indianDate;
     };
+    DateUtilService.prototype.getIndianDate = function (date) {
+        if (date === void 0) { date = new Date(); }
+        return new Date(date.getTime() + 330 * 60 * 1000);
+    };
     DateUtilService.prototype.isInPast = function (date) {
         return date < new Date();
     };

package/build/tests/booking-code/method.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/tests/booking-code/method.spec.js

@@ -0,0 +1,12 @@
+"use strict";
+// 001005_0P_1,006010_2P_1,011999_5P_1
+// 000001_0P_Monthly,000003_5P_Quarterly,000006_7P_Half-Yearly,000012_10P_Yearly
+Object.defineProperty(exports, "__esModule", { value: true });
+var _model_1 = require("../../@model");
+// 1_5#1#1#0P,1_5#3#0.95#5P,1_5#6#0.93#7P,1_5#12#0.9#10P,6_10#1#0.98#2P,6_10#3#0.931#6.9P,6_10#6#0.9114#8.86P,6_10#12#0.882#11.8P,11_99#1#0.95#5P,11_99#3#0.9025#9.75P,11_99#6#0.8835#11.65P,11_99#12#0.855#14.5P
+describe("AppController (e2e)", function () {
+    it("Method Testing ", function () {
+        _model_1.BookingCode.previousTimeChecker("2115", 240428, 0, 45);
+        _model_1.BookingCode.previousTimeChecker("2109", 240428, 0, 51);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turf-common",
-  "version": "1.4.2-beta.13",
+  "version": "1.4.2-beta.14",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -14,7 +14,7 @@
     "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 TURF-533",
+    "test:pattern": "jest -i method",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" 2>&1| tee eslint.log",
     "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
   },