Improve datemasking (#5741)

* Added option to set dates for past and future Fixed bugs for wrong method in dates * Added support for random date * Removed types that are not possibl to create * Removed types that are redundant * Fixed test to comply with removed types
dataplat · Jun 17, 2019 · 4bebe05 · 4bebe05
1 parent 63fe7bf
commit 4bebe05
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 63 deletions.
diff --git a/bin/randomizer/en.randomizertypes.csv b/bin/randomizer/en.randomizertypes.csv
@@ -67,7 +67,6 @@ Hacker,IngVerb
 Hacker,Noun
 Hacker,Phrase
 Hacker,Verb
-Hacker,Random
 Hashids,Decode
 Hashids,DecodeHex
 Hashids,DecodeLong
@@ -93,58 +92,6 @@ Image,People
 Image,Sports
 Image,Technics
 Image,Transport
-Image,Random
-IndexFaker,CompareTo
-IndexFaker,GetTypeCode
-IndexFaker,ToBoolean
-IndexFaker,ToByte
-IndexFaker,ToChar
-IndexFaker,ToDateTime
-IndexFaker,ToDecimal
-IndexFaker,ToDouble
-IndexFaker,ToInt16
-IndexFaker,ToInt32
-IndexFaker,ToInt64
-IndexFaker,ToSByte
-IndexFaker,ToSingle
-IndexFaker,ToType
-IndexFaker,ToUInt16
-IndexFaker,ToUInt32
-IndexFaker,ToUInt64
-IndexGlobal,CompareTo
-IndexGlobal,GetTypeCode
-IndexGlobal,ToBoolean
-IndexGlobal,ToByte
-IndexGlobal,ToChar
-IndexGlobal,ToDateTime
-IndexGlobal,ToDecimal
-IndexGlobal,ToDouble
-IndexGlobal,ToInt16
-IndexGlobal,ToInt32
-IndexGlobal,ToInt64
-IndexGlobal,ToSByte
-IndexGlobal,ToSingle
-IndexGlobal,ToType
-IndexGlobal,ToUInt16
-IndexGlobal,ToUInt32
-IndexGlobal,ToUInt64
-IndexVariable,CompareTo
-IndexVariable,GetTypeCode
-IndexVariable,ToBoolean
-IndexVariable,ToByte
-IndexVariable,ToChar
-IndexVariable,ToDateTime
-IndexVariable,ToDecimal
-IndexVariable,ToDouble
-IndexVariable,ToInt16
-IndexVariable,ToInt32
-IndexVariable,ToInt64
-IndexVariable,ToSByte
-IndexVariable,ToSingle
-IndexVariable,ToType
-IndexVariable,ToUInt16
-IndexVariable,ToUInt32
-IndexVariable,ToUInt64
 Internet,Avatar
 Internet,Color
 Internet,DomainName
@@ -171,7 +118,6 @@ Lorem,Slug
 Lorem,Text
 Lorem,Word
 Lorem,Words
-Lorem,Random
 Name,FindName
 Name,FirstName
 Name,FullName
@@ -183,7 +129,6 @@ Name,LastName
 Name,Prefix
 Name,Suffix
 Name,HasFirstNameList
-Name,Random
 Name,SupportsGenderFirstNames
 Name,SupportsGenderLastNames
 Name,SupportsGenderPrefixes
@@ -198,12 +143,10 @@ Person,FullName
 Person,Gender
 Person,LastName
 Person,Phone
-Person,Random
 Person,UserName
 Person,Website
 Phone,PhoneNumber
 Phone,PhoneNumberFormat
-Phone,Random
 Random,AlphaNumeric
 Random,Bool
 Random,Byte
@@ -246,7 +189,6 @@ Random,Words
 Random,WordsArray
 Rant,Review
 Rant,Reviews
-Rant,Random
 System,AndroidId
 System,ApplePushToken
 System,BlackBerryPin

diff --git a/functions/Get-DbaRandomizedValue.ps1 b/functions/Get-DbaRandomizedValue.ps1
@@ -356,11 +356,46 @@ function Get-DbaRandomizedValue {
                             ($faker.Date.Between($Min, $Max)).ToString("yyyy-MM-dd HH:mm:ss.fffffff")
                         }
                     } elseif ($randSubType -eq 'past') {
-                        $faker.Date.Past().ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        if ($Max) {
+                            if ($Min) {
+                                $yearsToGoBack = [math]::round((([datetime]$Max - [datetime]$Min).Days / 365), 0)
+                            } else {
+                                $yearsToGoBack = 1
+                            }
+
+                            $faker.Date.Past($yearsToGoBack, $Max).ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        } else {
+                            $faker.Date.Past().ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        }
                     } elseif ($randSubType -eq 'future') {
-                        $faker.Future.Past().ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        if ($Min) {
+                            if ($Max) {
+                                $yearsToGoForward = [math]::round((([datetime]$Max - [datetime]$Min).Days / 365), 0)
+                            } else {
+                                $yearsToGoForward = 1
+                            }
+
+                            $faker.Date.Future($yearsToGoForward, $Min).ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        } else {
+                            $faker.Date.Future().ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        }
+
                     } elseif ($randSubType -eq 'recent') {
-                        $faker.Recent.Past().ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        $faker.Date.Recent().ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                    } elseif ($randSubType -eq 'random') {
+                        if ($Min -or $Max) {
+                            if (-not $Min) {
+                                $Min = Get-Date
+                            }
+
+                            if (-not $Max) {
+                                $Max = (Get-Date).AddYears(1)
+                            }
+
+                            ($faker.Date.Between($Min, $Max)).ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        } else {
+                            ($faker.Date.Past()).ToString("yyyy-MM-dd HH:mm:ss.fffffff")
+                        }
                     } else {
                         $faker.Date.$RandomizerSubType()
                     }

diff --git a/tests/Get-DbaRandomizedType.Tests.ps1 b/tests/Get-DbaRandomizedType.Tests.ps1
@@ -19,7 +19,7 @@ Describe "$commandname Integration Tests" -Tags "IntegrationTests" {
         It "Should have at least 263 rows" {
             $types = Get-DbaRandomizedType
 
-            $types.count | Should BeGreaterOrEqual 263
+            $types.count | Should BeGreaterOrEqual 205
         }
 
         It "Should return correct type based on subtype" {
@@ -31,7 +31,7 @@ Describe "$commandname Integration Tests" -Tags "IntegrationTests" {
         It "Should return values based on pattern" {
             $types = Get-DbaRandomizedType -Pattern Name
 
-            $types.Count | Should BeGreaterOrEqual 27
+            $types.Count | Should BeGreaterOrEqual 26
         }
     }
 }