turf-common 1.1.1-beta.22 → 1.1.1-beta.24

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/interface/date-formatter.interface.d.ts

@@ -0,0 +1,4 @@
+export interface IDateFormatter {
+    dateFormat: string;
+    dateCode: string;
+}

package/build/interface/date-formatter.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/interface/formate-date-and-time.interface.d.ts

@@ -0,0 +1,6 @@
+export interface IFormateDateAndTime {
+    dateFormat: string;
+    timeFormat: string;
+    separator: string;
+    timeSeparator: string;
+}

package/build/interface/formate-date-and-time.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/interface/time-formatter.interface.d.ts

@@ -0,0 +1,4 @@
+export interface ITimeFormatter {
+    timeFormat: string;
+    timeCode: string;
+}

package/build/interface/time-formatter.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,14 +1,18 @@
 import { TimeSlot } from "./time-slot-model";
 import { IGetBookingCodesPerThirtyMinutes } from "../interface/get-booking-codes-per-thirty-min.interface";
+import { IFormateDateAndTime } from "../interface/formate-date-and-time.interface";
+import { IDateFormatter } from "../interface/date-formatter.interface";
+import { ITimeFormatter } from "../interface/time-formatter.interface";
 export declare class BookingCode {
     code: string;
-    turfid: string;
+    turfId: string;
     pitchCode: string;
     slot: string;
-    fromTime: string;
-    toTime: string;
-    date: string;
+    fromTimeCode: string;
+    toTimeCode: string;
+    dateCode: string;
     cost: string;
+    pitchNumber: number;
     constructor(code: string, cost?: string);
     parse(): BookingCode;
     getBookingTimeInMinutes(): number;
@@ -69,4 +73,17 @@ export declare class BookingCode {
     getCost(): number;
     getTimeslot(): TimeSlot;
     static getIndianTimeZoneDate(bookingBufferOffsetHour?: number): Date;
+    getInstanceByPitchNo(newPitchNo: number): BookingCode;
+    getDateFromTimeCode(): number;
+    getPreviousBookingSlotCode(): string;
+    getPreviousBookingCode(): BookingCode;
+    getPreviousTimeSlotCode(isHour?: boolean): string;
+    getNextBookingSlotCode(): string;
+    getNextTimeSlotCode(isHour?: boolean): string;
+    getNextBookingCode(): BookingCode;
+    getOffsetTimeSlotCode(timeCode: string, isHour?: boolean, isNext?: boolean): string;
+    isInPast(): boolean;
+    formatDateAndTime(formateDateAndTime: IFormateDateAndTime): string;
+    static timeFormatter(timeFormatter: ITimeFormatter): string;
+    static dateFormatter(dateFormatter: IDateFormatter): string;
 }

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

@@ -15,6 +15,8 @@ exports.BookingCode = void 0;
 var time_slot_model_1 = require("./time-slot-model");
 var charge_model_1 = require("./charge-model");
 var app_badrequest_exception_1 = require("../exceptions/app-badrequest.exception");
+var date_util_1 = require("../utils/date-util");
+var date_fns_1 = require("date-fns");
 var BookingCode = /** @class */ (function () {
     function BookingCode(code, cost) {
         if (cost === void 0) { cost = "-1"; }
@@ -32,27 +34,28 @@ var BookingCode = /** @class */ (function () {
         if (!matches) {
             throw new Error("Booking slot ".concat(this.code, " is invalid"));
         }
-        this.turfid = matches[1];
-        this.date = matches[2];
+        this.turfId = matches[1];
+        this.dateCode = matches[2];
         this.slot = matches[3];
-        this.fromTime = matches[3].slice(0, 4);
-        this.toTime = matches[3].slice(4, 8);
+        this.fromTimeCode = matches[3].slice(0, 4);
+        this.toTimeCode = matches[3].slice(4, 8);
         this.pitchCode = matches[4];
+        this.pitchNumber = Number(matches[4]);
         return this;
     };
     BookingCode.prototype.getBookingTimeInMinutes = function () {
         //from HHMM to HHMM
-        var fromHours = parseInt(this.fromTime.slice(0, 2));
-        var fromMinutes = parseInt(this.fromTime.slice(2, 4));
-        var toHours = parseInt(this.toTime.slice(0, 2));
-        var toMinutes = parseInt(this.toTime.slice(2, 4));
+        var fromHours = parseInt(this.fromTimeCode.slice(0, 2));
+        var fromMinutes = parseInt(this.fromTimeCode.slice(2, 4));
+        var toHours = parseInt(this.toTimeCode.slice(0, 2));
+        var toMinutes = parseInt(this.toTimeCode.slice(2, 4));
         return toHours * 60 + toMinutes - (fromHours * 60 + fromMinutes);
     };
     BookingCode.prototype.getPitchNo = function () {
         return parseInt(this.pitchCode);
     };
     BookingCode.prototype.getHalfHourTimeCodes = function () {
-        return new time_slot_model_1.TimeSlot(this.fromTime, this.toTime).getHalfHourTimeCodes();
+        return new time_slot_model_1.TimeSlot(this.fromTimeCode, this.toTimeCode).getHalfHourTimeCodes();
     };
     /**
      *
@@ -76,7 +79,7 @@ var BookingCode = /** @class */ (function () {
             var intBits = stringBits.map(function (bit) { return parseInt(bit); });
             return new Date(intBits[0], intBits[1] - 1, intBits[2]);
         }
-        return getDate("20".concat(this.date.slice(0, 2), ".").concat(this.date.slice(2, 4), ".").concat(this.date.slice(4, 6)));
+        return getDate("20".concat(this.dateCode.slice(0, 2), ".").concat(this.dateCode.slice(2, 4), ".").concat(this.dateCode.slice(4, 6)));
     };
     BookingCode.prototype.getDateCode = function () {
         var date = this.getValidDate();
@@ -85,21 +88,21 @@ var BookingCode = /** @class */ (function () {
             .padStart(2, "0")).concat(date.getDate().toString().padStart(2, "0"));
     };
     BookingCode.prototype.getWeekday = function () {
-        var dateObj = new Date(2000 + parseInt(this.date.slice(0, 2)), // Year
-        parseInt(this.date.toString().slice(2, 4)) - 1, // Month (0-indexed)
-        parseInt(this.date.toString().slice(4, 6)) // Day
+        var dateObj = new Date(2000 + parseInt(this.dateCode.slice(0, 2)), // Year
+        parseInt(this.dateCode.toString().slice(2, 4)) - 1, // Month (0-indexed)
+        parseInt(this.dateCode.toString().slice(4, 6)) // Day
         );
         return dateObj.getDay() === 0 ? 7 : dateObj.getDay();
         // return weekday;
     };
     BookingCode.prototype.getMonthCode = function () {
-        return this.date.slice(0, 4);
+        return this.dateCode.slice(0, 4);
     };
     BookingCode.prototype.getDateWithFromTimeCode = function () {
-        return "".concat(this.date).concat(this.fromTime);
+        return "".concat(this.dateCode).concat(this.fromTimeCode);
     };
     BookingCode.prototype.getCodeWithoutTurfCode = function () {
-        return "".concat(this.date).concat(this.slot).concat(this.pitchCode);
+        return "".concat(this.dateCode).concat(this.slot).concat(this.pitchCode);
     };
     BookingCode.sortByCode = function (bookingCodes) {
         bookingCodes.sort(function (_a, _b) {
@@ -399,7 +402,7 @@ var BookingCode = /** @class */ (function () {
             .reduce(function (a, b) { return a + b; }, 0);
     };
     BookingCode.prototype.getTimeslot = function () {
-        return new time_slot_model_1.TimeSlot(this.fromTime, this.toTime);
+        return new time_slot_model_1.TimeSlot(this.fromTimeCode, this.toTimeCode);
     };
     BookingCode.getIndianTimeZoneDate = function (bookingBufferOffsetHour) {
         var now = new Date();
@@ -409,6 +412,98 @@ var BookingCode = /** @class */ (function () {
             (bookingBufferOffsetHour || 0) * 60 * 60 * 1000;
         return new Date(indianTimeMillis);
     };
+    //--------------------------------------------------------------
+    BookingCode.prototype.getInstanceByPitchNo = function (newPitchNo) {
+        return new BookingCode("".concat(this.code.slice(0, -2)).concat(newPitchNo.toString().padStart(2, "0")), this.cost);
+    };
+    BookingCode.prototype.getDateFromTimeCode = function () {
+        return parseInt("".concat(this.dateCode).concat(this.fromTimeCode));
+    };
+    BookingCode.prototype.getPreviousBookingSlotCode = function () {
+        var prevousBookingCode = this.getPreviousBookingCode();
+        return "".concat(prevousBookingCode.dateCode).concat(prevousBookingCode
+            .getTimeslot()
+            .getCode());
+    };
+    BookingCode.prototype.getPreviousBookingCode = function () {
+        if (this.fromTimeCode === "0000") {
+            // Add previous day
+            var previousDateCode = date_util_1.dateUtilService.addNDaysToDateCode(this.dateCode, -1);
+            // return `${previousDateCode}23302400`;
+            return new BookingCode("".concat(this.code.slice(0, 4)).concat(previousDateCode, "23302400").concat(this.code.slice(-2)));
+        }
+        else {
+            var previousTimeSlotCode = this.getPreviousTimeSlotCode();
+            return new BookingCode("".concat(this.code.slice(0, 4)).concat(this.dateCode).concat(previousTimeSlotCode).concat(this.fromTimeCode).concat(this.code.slice(-2)));
+        }
+    };
+    BookingCode.prototype.getPreviousTimeSlotCode = function (isHour) {
+        if (isHour === void 0) { isHour = false; }
+        return this.getOffsetTimeSlotCode(this.fromTimeCode, isHour, false);
+    };
+    BookingCode.prototype.getNextBookingSlotCode = function () {
+        var nextBookingCode = this.getNextBookingCode();
+        return "".concat(nextBookingCode.dateCode).concat(nextBookingCode
+            .getTimeslot()
+            .getCode());
+    };
+    BookingCode.prototype.getNextTimeSlotCode = function (isHour) {
+        if (isHour === void 0) { isHour = false; }
+        return this.getOffsetTimeSlotCode(this.toTimeCode, isHour, true);
+    };
+    BookingCode.prototype.getNextBookingCode = function () {
+        var toTimeSlotCode = this.toTimeCode;
+        if (this.toTimeCode === "2400") {
+            // Add next day
+            var nextDateCode = date_util_1.dateUtilService.addNDaysToDateCode(this.dateCode, 1);
+            // return `${nextDateCode}00000030`;
+            return new BookingCode("".concat(this.code.slice(0, 4)).concat(nextDateCode, "00000030").concat(this.code.slice(-2)));
+        }
+        else {
+            var nextTimeSlotCode = this.getNextTimeSlotCode();
+            return new BookingCode("".concat(this.code.slice(0, 4)).concat(this.dateCode).concat(toTimeSlotCode).concat(nextTimeSlotCode).concat(this.code.slice(-2)));
+        }
+    };
+    BookingCode.prototype.getOffsetTimeSlotCode = function (timeCode, isHour, isNext) {
+        if (isHour === void 0) { isHour = false; }
+        if (isNext === void 0) { isNext = true; }
+        var minutes = parseInt(timeCode.slice(0, 2)) * 60 +
+            parseInt(timeCode.slice(2, 4)) +
+            (isNext ? 1 : -1) * (isHour ? 60 : 30);
+        return "".concat(Math.floor(minutes / 60)
+            .toString()
+            .padStart(2, "0")).concat((minutes % 60).toString().padStart(2, "0"));
+    };
+    BookingCode.prototype.isInPast = function () {
+        var pastBookingCode = "".concat(this.dateCode).concat(this.getTimeslot().getCode());
+        var currentTime = new Date().getTime();
+        return (new Date(parseInt("20".concat(pastBookingCode.slice(0, 2))), parseInt(pastBookingCode.slice(2, 4)) - 1, parseInt(pastBookingCode.slice(4, 6)), parseInt(pastBookingCode.slice(6, 8)), parseInt(pastBookingCode.slice(8, 10))).getTime() < currentTime);
+    };
+    BookingCode.prototype.formatDateAndTime = function (formateDateAndTime) {
+        var dateFormat = formateDateAndTime.dateFormat, timeFormat = formateDateAndTime.timeFormat, separator = formateDateAndTime.separator, timeSeparator = formateDateAndTime.timeSeparator;
+        var formattedDate = BookingCode.dateFormatter({
+            dateFormat: dateFormat,
+            dateCode: this.dateCode,
+        });
+        var formattedFromTime = BookingCode.timeFormatter({
+            timeFormat: timeFormat,
+            timeCode: this.fromTimeCode,
+        });
+        var formattedToTime = BookingCode.timeFormatter({
+            timeFormat: timeFormat,
+            timeCode: this.toTimeCode,
+        });
+        return "".concat(formattedDate).concat(separator).concat(formattedFromTime).concat(timeSeparator).concat(formattedToTime);
+    };
+    BookingCode.timeFormatter = function (timeFormatter) {
+        var timeCode = timeFormatter.timeCode, timeFormat = timeFormatter.timeFormat;
+        var parsedFromTime = (0, date_fns_1.parse)(timeCode, "HHmm", new Date());
+        return (0, date_fns_1.format)(parsedFromTime, timeFormat);
+    };
+    BookingCode.dateFormatter = function (dateFormatter) {
+        var dateFormat = dateFormatter.dateFormat, dateCode = dateFormatter.dateCode;
+        return (0, date_fns_1.format)(BookingCode.convertToDate(dateCode), dateFormat);
+    };
     return BookingCode;
 }());
 exports.BookingCode = BookingCode;

package/build/models/time-slot-model.d.ts

@@ -3,6 +3,7 @@ export declare class TimeSlot {
     toTime: string;
     constructor(fromTime: string, toTime: string);
     isOverLap(timeSlot: TimeSlot): boolean;
+    getCode(): string;
     getOverlapTime(timeSlot: TimeSlot): TimeSlot | null;
     getNonOverlapTimeSlots(existingPriceSlot: TimeSlot): string[];
     getStartMinutes(): number;

package/build/models/time-slot-model.js

@@ -9,6 +9,9 @@ var TimeSlot = /** @class */ (function () {
     TimeSlot.prototype.isOverLap = function (timeSlot) {
         return this.fromTime < timeSlot.toTime && this.toTime > timeSlot.fromTime;
     };
+    TimeSlot.prototype.getCode = function () {
+        return "".concat(this.fromTime).concat(this.toTime);
+    };
     TimeSlot.prototype.getOverlapTime = function (timeSlot) {
         if (!this.isOverLap(timeSlot)) {
             return null;

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

@@ -0,0 +1,15 @@
+export declare class DateUtilService {
+    constructor();
+    getTodayCode(): string;
+    getNDaysCode(n: number): string;
+    getDateCode(date: Date): string;
+    addNDaysToDate(date: Date, n: number): Date;
+    convertStringToDate(dateString: string, format: string): Date;
+    isInPast(date: Date): boolean;
+    getDateFromDatabaseDate: (date: string) => Date;
+    noOfDaysBetweenDates: (date1: Date, date2: Date) => number;
+    addNDaysToDateCode(dateCode: string, n: number): string;
+    formatTimeSlotCode(timeSlot: string, both?: boolean, date?: Date | null): string;
+    formatDateCode(dateCode: string): string;
+}
+export declare const dateUtilService: DateUtilService;

package/build/utils/date-util.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dateUtilService = exports.DateUtilService = void 0;
+var date_fns_1 = require("date-fns");
+var DateUtilService = /** @class */ (function () {
+    function DateUtilService() {
+        this.getDateFromDatabaseDate = function (date) { return (0, date_fns_1.parseISO)(date); };
+        this.noOfDaysBetweenDates = function (date1, date2) {
+            var oneDay = 24 * 60 * 60 * 1000;
+            var dayDifference = Math.ceil((date2.getTime() - date1.getTime()) / oneDay);
+            return dayDifference - 1; //minus 1 day
+        };
+    }
+    DateUtilService.prototype.getTodayCode = function () {
+        return (0, date_fns_1.format)(new Date(), "yyMMdd");
+    };
+    DateUtilService.prototype.getNDaysCode = function (n) {
+        return (0, date_fns_1.format)(this.addNDaysToDate(new Date(), n), "yyMMdd");
+    };
+    DateUtilService.prototype.getDateCode = function (date) {
+        return (0, date_fns_1.format)(date, "yyMMdd");
+    };
+    DateUtilService.prototype.addNDaysToDate = function (date, n) {
+        return (0, date_fns_1.add)(date, { days: n });
+    };
+    DateUtilService.prototype.convertStringToDate = function (dateString, format) {
+        return (0, date_fns_1.parse)(dateString, format, new Date());
+    };
+    DateUtilService.prototype.isInPast = function (date) {
+        return date < new Date();
+    };
+    DateUtilService.prototype.addNDaysToDateCode = function (dateCode, n) {
+        return this.getDateCode(this.addNDaysToDate(this.convertStringToDate(dateCode, "yyMMdd"), n));
+    };
+    DateUtilService.prototype.formatTimeSlotCode = function (timeSlot, both, date) {
+        if (both === void 0) { both = true; }
+        if (date === void 0) { date = null; }
+        if (!date)
+            date = new Date();
+        var fromTime = (0, date_fns_1.parse)(timeSlot.slice(0, 4), "HHmm", date);
+        if (both) {
+            var toTime = void 0;
+            if (timeSlot.slice(4) === "2400")
+                toTime = (0, date_fns_1.parse)("0000", "HHmm", new Date());
+            else
+                toTime = (0, date_fns_1.parse)(timeSlot.slice(4), "HHmm", new Date());
+            timeSlot =
+                timeSlot.slice(0, 4) +
+                    (timeSlot.slice(4) === "2400" ? "0000" : timeSlot.slice(4));
+            return "".concat((0, date_fns_1.format)(fromTime, "hh:mm a"), " - ").concat((0, date_fns_1.format)(toTime, "hh:mm a"));
+        }
+        else
+            return "".concat((0, date_fns_1.format)(fromTime, "hh:mm a"));
+    };
+    DateUtilService.prototype.formatDateCode = function (dateCode) {
+        var date = (0, date_fns_1.parse)(dateCode, "yyMMdd", new Date());
+        var d = (0, date_fns_1.format)(date, "dd-MMM (EE)");
+        return d.slice(0, d.length - 2) + d.slice(d.length - 1);
+    };
+    return DateUtilService;
+}());
+exports.DateUtilService = DateUtilService;
+exports.dateUtilService = new DateUtilService();

package/package.json

@@ -1,35 +1,38 @@
-{
-  "name": "turf-common",
-  "version": "1.1.1-beta.22",
-  "description": "",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
-  "files": [
-    "build/**/*"
-  ],
-  "scripts": {
-    "clean": "del build",
-    "build": "npm run clean && tsc",
-    "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",
-    "version:deploy:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "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/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",
-    "typescript": "^5.2.2"
-  }
-}
+{
+  "name": "turf-common",
+  "version": "1.1.1-beta.24",
+  "description": "",
+  "main": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "files": [
+    "build/**/*"
+  ],
+  "scripts": {
+    "clean": "del build",
+    "build": "npm run clean && tsc",
+    "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",
+    "version:deploy:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "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/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",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "date-fns": "^2.30.0"
+  }
+}