Skip to content

added dateEquality #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chinmay1819 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added dateEquality #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9a2912
added dateEquality
chinmay1819 Jun 2, 2023
f20ec72
refactor
chinmay1819 Aug 1, 2023
80c0025
refactor
chinmay1819 Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

293 changes: 293 additions & 0 deletions src/modules/tasks/providers/executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,285 @@ export class Executor implements OnModuleInit {
return path;
}

checkEquality(lhsFinal: any, rhsFinal: any): boolean {
if (lhsFinal == rhsFinal) {
return true;
}

return false;
}


countObliqueIsTwo(str: string): boolean {
Copy link

@chaitanya-mahamuni chaitanya-mahamuni Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create common method for countObliqueIsTwo and countHyphenIsTwo which will be invoked from these 2 methods..

Copy link
Collaborator Author

@chinmay1819 chinmay1819 Aug 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in refactor commit

let oblique = '/';
let count = 0;
for (let i = 0; i < str.length; i++) {
Copy link

@chaitanya-mahamuni chaitanya-mahamuni Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove 'for' loop and convert to regEx matching..
(str.match(/\//g) || []).length

Copy link
Collaborator Author

@chinmay1819 chinmay1819 Aug 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in refactor commit

if (str[i] == oblique) {
count++;
}
}
if (count == 2) {
return true;
}

return false;
}

countHyphenIsTwo(str: string): boolean {
let hyphen = '-';
let count = 0;
for (let i = 0; i < str.length; i++) {
if (str[i] == hyphen) {
count++;
}
}
if (count == 2) {
return true;
}

return false;
}

convertDateObjectToString(dateObject: Date): string {
Copy link

@chaitanya-mahamuni chaitanya-mahamuni Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method should accept optional parameter for separator.. default value for separator will be "/" otherwise whatever is passed in parameter

let date: any = dateObject.getDate();
let month: any = dateObject.getMonth() + 1;
let year: any = dateObject.getFullYear();

date = date.toString();
if (date.length == 1) {
date = '0' + date;
}
month = month.toString();
if (month.length == 1) {
month = '0' + month;
}

year = year.toString();

let result = date + '/' + month + '/' + year;

return result;
}



isIsoDateString(str: string): boolean {
// The regular expression to match the ISO 8601 date string pattern
const isoDateRegex = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d+)?(Z|[+-]\d{2}:\d{2})$/;
// Test the string against the regular expression
return isoDateRegex.test(str);
}

formatDate(str: any): string {
Copy link

@chaitanya-mahamuni chaitanya-mahamuni Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

duplicate method... convertDateObjectToString can be invoked in this method.. remove duplicate code..

str = new Date(str).toString();
let day: any = str.getDate();
let month: any = str.getMonth() + 1;
let year: any = str.getFullYear();
if (day < 10) {
day = day.toString();
day = '0' + day;
}
if (month < 10) {
month = month.toString();
month = '0' + month;
}

let formattedDate = `${day}/${month}/${year}`;

return formattedDate;
}



checkDates(lhs: any, rhs: any): boolean {
let lhsFinal: string | undefined;
let rhsFinal: string | undefined;
let typeLhs = typeof lhs;
let typeRhs = typeof rhs;

if (typeLhs === "object") {
lhsFinal = this.convertDateObjectToString(lhs);
}
if (typeLhs === "string") {
if (this.isIsoDateString(lhs)) {
lhsFinal = this.convertDateObjectToString(new Date(lhs));
} else {
if (lhs.length <= 10) {
if (this.countObliqueIsTwo(lhs)) {
lhsFinal = lhs;
} else if (this.countHyphenIsTwo(lhs)) {
lhsFinal = lhs;
}
} else if (lhs.length > 10) {
lhsFinal = this.formatDate(lhs);
}
}
}
if (typeLhs === "number") {
lhsFinal = this.convertDateObjectToString(new Date(lhs));
}

if (typeRhs === "object") {
rhsFinal = this.convertDateObjectToString(rhs);
}
if (typeRhs === "string") {
if (this.isIsoDateString(rhs)) {
rhsFinal = this.convertDateObjectToString(new Date(rhs));
} else {
if (rhs.length <= 10) {
if (this.countObliqueIsTwo(rhs)) {
rhsFinal = rhs;
} else if (this.countHyphenIsTwo(rhs)) {
rhsFinal = rhs;
}
} else if (rhs.length > 10) {
rhsFinal = this.formatDate(rhs);
console.log("rhsFinal :: ", rhsFinal);
}
}
}

if (typeRhs === "number") {
rhsFinal = this.convertDateObjectToString(new Date(rhs));
}
console.log("lhsFinal---::", lhsFinal);
console.log("rhsFinal---::", rhsFinal);

return this.checkEquality(rhsFinal, lhsFinal);
}


lessThanCheck(lhs: any, rhs: any): boolean {
Copy link

@chaitanya-mahamuni chaitanya-mahamuni Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change method name... dateComparisonLessThan

const lhsDate = new Date(lhs);
const rhsDate = new Date(rhs);

return lhsDate.getTime() < rhsDate.getTime();
}

greaterThanCheck(lhs: any, rhs: any): boolean {
Copy link

@chaitanya-mahamuni chaitanya-mahamuni Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change method name... dateComparisonGreaterThan

const lhsDate = new Date(lhs);
const rhsDate = new Date(rhs);

return lhsDate.getTime() > rhsDate.getTime();
}

lessThanDate(lhs: any, rhs: any): boolean {
let lhsFinal: string | undefined;
let rhsFinal: string | undefined;
let typeLhs = typeof lhs;
let typeRhs = typeof rhs;

if (typeLhs === "object") {
lhsFinal = this.convertDateObjectToString(lhs);
}
if (typeLhs === "string") {
if (this.isIsoDateString(lhs)) {
lhsFinal = this.convertDateObjectToString(new Date(lhs));
} else {
if (lhs.length <= 10) {
if (this.countObliqueIsTwo(lhs)) {
lhsFinal = lhs;
} else if (this.countHyphenIsTwo(lhs)) {
lhsFinal = lhs;
}
} else if (lhs.length > 10) {
lhsFinal = this.formatDate(lhs);
}
}
}
if (typeLhs === "number") {
lhsFinal = this.convertDateObjectToString(new Date(lhs));
}

if (typeRhs === "object") {
rhsFinal = this.convertDateObjectToString(rhs);
}
if (typeRhs === "string") {
if (this.isIsoDateString(rhs)) {
rhsFinal = this.convertDateObjectToString(new Date(rhs));
} else {
if (rhs.length <= 10) {
if (this.countObliqueIsTwo(rhs)) {
rhsFinal = rhs;
} else if (this.countHyphenIsTwo(rhs)) {
rhsFinal = rhs;
}
} else if (rhs.length > 10) {
rhsFinal = this.formatDate(rhs);
console.log("rhsFinal :: ", rhsFinal);
}
}
}

if (typeRhs === "number") {
rhsFinal = this.convertDateObjectToString(new Date(rhs));
}
console.log("lhsFinal---::", lhsFinal);
console.log("rhsFinal---::", rhsFinal);

return this.lessThanCheck(lhsFinal, rhsFinal);

}

greaterThanDate(lhs: any, rhs: any): boolean {
Copy link

@chaitanya-mahamuni chaitanya-mahamuni Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove redundant code in lessThanDate and greaterThanDate.. convert common code to method and invoke that method

let lhsFinal: string | undefined;
let rhsFinal: string | undefined;
let typeLhs = typeof lhs;
let typeRhs = typeof rhs;

if (typeLhs === "object") {
lhsFinal = this.convertDateObjectToString(lhs);
}
if (typeLhs === "string") {
if (this.isIsoDateString(lhs)) {
lhsFinal = this.convertDateObjectToString(new Date(lhs));
} else {
if (lhs.length <= 10) {
if (this.countObliqueIsTwo(lhs)) {
lhsFinal = lhs;
} else if (this.countHyphenIsTwo(lhs)) {
lhsFinal = lhs;
}
} else if (lhs.length > 10) {
lhsFinal = this.formatDate(lhs);
}
}
}
if (typeLhs === "number") {
lhsFinal = this.convertDateObjectToString(new Date(lhs));
}

if (typeRhs === "object") {
rhsFinal = this.convertDateObjectToString(rhs);
}
if (typeRhs === "string") {
if (this.isIsoDateString(rhs)) {
rhsFinal = this.convertDateObjectToString(new Date(rhs));
} else {
if (rhs.length <= 10) {
if (this.countObliqueIsTwo(rhs)) {
rhsFinal = rhs;
} else if (this.countHyphenIsTwo(rhs)) {
rhsFinal = rhs;
}
} else if (rhs.length > 10) {
rhsFinal = this.formatDate(rhs);
console.log("rhsFinal :: ", rhsFinal);
}
}
}

if (typeRhs === "number") {
rhsFinal = this.convertDateObjectToString(new Date(rhs));
}
console.log("lhsFinal---::", lhsFinal);
console.log("rhsFinal---::", rhsFinal);

return this.greaterThanCheck(lhsFinal, rhsFinal);

}


// evaluate the conditions and return the same array
/**
*
Expand All @@ -151,6 +430,10 @@ export class Executor implements OnModuleInit {
expression._lhs = valA;
expression._rhs = valB;

let dateAreEqual = this.checkDates(expression._lhs, expression._rhs);
let lessThanDate = this.lessThanDate(expression._lhs, expression._rhs);
let greaterThanDate=this.greaterThanDate(expression._lhs,expression._rhs);

// both the values can not be undefined
if (valA === undefined && valB === undefined) {
throw new Error(`Condition [${condition.name}] expression [${JSON.stringify(expression)}] have [lhs] and [rhs] values as [undefined]!`);
Expand All @@ -160,6 +443,16 @@ export class Executor implements OnModuleInit {
throw new Error(`Condition [${condition.name}] expression [${JSON.stringify(expression)}] has no operator property set!`);
}

if (dateAreEqual === false) {
if(lessThanDate==true){
console.log('lhs<rhs')
}
else if(greaterThanDate==true){
console.log('lhs>rhs')
}

}

// //Check if value is Not a number, if so JSON.Stringify it to make a 'simple' object comparison
// //dangerous in code, but ok for JSON workflows in processus
// if (isNaN(valA)) { valA = JSON.stringify(valA); }
Expand Down