Skip to content

Commit

Permalink
refactoring created function
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas Silva committed Aug 2, 2021
1 parent 1b3a13a commit ee202e1
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 39 deletions.
4 changes: 2 additions & 2 deletions src/differenceInHours/index.ts
@@ -1,6 +1,6 @@
import differenceInMilliseconds from '../differenceInMilliseconds/index'
import requiredArgs from '../_lib/requiredArgs/index'
import removesNegativeZeroIfPresent from '../utils/removesNegativeZeroIfPresent'
import getRoundedValue from '../utils/getRoundedValue'

const MILLISECONDS_IN_HOUR = 3600000

Expand Down Expand Up @@ -35,5 +35,5 @@ export default function differenceInHours(dirtyDateLeft: Date | number, dirtyDat
const diff =
differenceInMilliseconds(dirtyDateLeft, dirtyDateRight) /
MILLISECONDS_IN_HOUR
return removesNegativeZeroIfPresent(diff > 0 ? Math.floor(diff) : Math.ceil(diff))
return getRoundedValue(diff)
}
6 changes: 2 additions & 4 deletions src/differenceInMinutes/index.js
@@ -1,6 +1,6 @@
import differenceInMilliseconds from '../differenceInMilliseconds/index'
import requiredArgs from '../_lib/requiredArgs/index'
import removesNegativeZeroIfPresent from '../utils/removesNegativeZeroIfPresent'
import getRoundedValue from '../utils/getRoundedValue'

var MILLISECONDS_IN_MINUTE = 60000

Expand Down Expand Up @@ -43,7 +43,5 @@ export default function differenceInMinutes(dirtyDateLeft, dirtyDateRight) {
var diff =
differenceInMilliseconds(dirtyDateLeft, dirtyDateRight) /
MILLISECONDS_IN_MINUTE
return removesNegativeZeroIfPresent(
diff > 0 ? Math.floor(diff) : Math.ceil(diff)
)
return getRoundedValue(diff)
}
4 changes: 2 additions & 2 deletions src/differenceInQuarters/index.ts
@@ -1,6 +1,6 @@
import differenceInMonths from '../differenceInMonths/index'
import requiredArgs from '../_lib/requiredArgs/index'
import removesNegativeZeroIfPresent from '../utils/removesNegativeZeroIfPresent'
import getRoundedValue from '../utils/getRoundedValue'

/**
* @name differenceInQuarters
Expand Down Expand Up @@ -31,5 +31,5 @@ export default function differenceInQuarters(
requiredArgs(2, arguments)

const diff = differenceInMonths(dirtyDateLeft, dirtyDateRight) / 3
return removesNegativeZeroIfPresent(diff > 0 ? Math.floor(diff) : Math.ceil(diff))
return getRoundedValue(diff)
}
6 changes: 3 additions & 3 deletions src/differenceInSeconds/index.ts
@@ -1,6 +1,6 @@
import differenceInMilliseconds from '../differenceInMilliseconds/index'
import requiredArgs from '../_lib/requiredArgs/index'
import removesNegativeZeroIfPresent from '../utils/removesNegativeZeroIfPresent'
import getRoundedValue from '../utils/getRoundedValue'

/**
* @name differenceInSeconds
Expand Down Expand Up @@ -35,5 +35,5 @@ export default function differenceInSeconds(
requiredArgs(2, arguments)

const diff = differenceInMilliseconds(dirtyDateLeft, dirtyDateRight) / 1000
return removesNegativeZeroIfPresent(diff > 0 ? Math.floor(diff) : Math.ceil(diff))
}
return getRoundedValue(diff)
}
4 changes: 2 additions & 2 deletions src/differenceInWeeks/index.ts
@@ -1,6 +1,6 @@
import differenceInDays from '../differenceInDays/index'
import requiredArgs from '../_lib/requiredArgs/index'
import removesNegativeZeroIfPresent from '../utils/removesNegativeZeroIfPresent'
import getRoundedValue from '../utils/getRoundedValue'

/**
* @name differenceInWeeks
Expand Down Expand Up @@ -52,5 +52,5 @@ export default function differenceInWeeks(
requiredArgs(2, arguments)

const diff = differenceInDays(dirtyDateLeft, dirtyDateRight) / 7
return removesNegativeZeroIfPresent(diff > 0 ? Math.floor(diff) : Math.ceil(diff))
return getRoundedValue(diff)
}
8 changes: 8 additions & 0 deletions src/utils/getRoundedValue/index.ts
@@ -0,0 +1,8 @@
export default function getRoundedValue(number: number): number {
if(number > 0){
return Math.floor(number)
} else {
const result = Math.ceil(number)
return Object.is(result, -0) ? 0 : result
}
}
23 changes: 23 additions & 0 deletions src/utils/getRoundedValue/test.ts
@@ -0,0 +1,23 @@
// @flow
/* eslint-env mocha */

import assert from 'power-assert'
import getRoundedValue from '.'

describe('getRoundedValue', () => {

it("floor rounds if argument is greater than 0", () => {
const result = getRoundedValue(1.95)
assert(result === 1)
})

it("ceil rounds if argument is less than 0", () => {
const result = getRoundedValue(-0.99)
assert(result === 0)
})

it("returns 0 if the argument is rounded to -0 #2555", () => {
const result = getRoundedValue(-0.003)
assert(Object.is(result, 0))
})
})
3 changes: 0 additions & 3 deletions src/utils/removesNegativeZeroIfPresent/index.ts

This file was deleted.

23 changes: 0 additions & 23 deletions src/utils/removesNegativeZeroIfPresent/test.ts

This file was deleted.

0 comments on commit ee202e1

Please sign in to comment.