Simplify json datatype parsing

rexcfnghk · Jun 24, 2024 · 33cc622 · 33cc622
1 parent 79f4928
commit 33cc622
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/DataParser.Console/Core.fs b/DataParser.Console/Core.fs
@@ -8,6 +8,7 @@ type Error =
     | FileFormatNotFound of availableFormats: Set<FormatName> * givenFormat : FormatName
     | DataFileNameFormatError of fileName: FileNameWithoutExtension
     | UnexpectedFormatHeader of string
+    | UnexpectedJsonDataType of string
     | UnexpectedFormatLine of string
     | UnparsableValue of string
     | DataFileLineLengthShorterThanSpec of string

diff --git a/DataParser.Console/FormatFiles.fs b/DataParser.Console/FormatFiles.fs
@@ -11,18 +11,19 @@ type FormatLine = FormatLine of columnName: string * width: int * dataType : Jso
 
 let headerRegexLookup = dict [ ("\"column name\"", "(?<name>.+)"); ("width", "(?<width>\d+)"); ("datatype", "(?<type>.+)") ]
 
-let parseJsonDataType line = function
+let parseJsonDataType rawDataType =
+    match rawDataType with
     | "TEXT" -> Ok JString
     | "BOOLEAN" -> Ok JBool
     | "INTEGER" -> Ok JInt
-    | _ -> Error [ UnexpectedFormatLine line ]
+    | _ -> Error [ UnexpectedJsonDataType rawDataType ]
 
 let parseFormatLine (regex: Regex) line =
     let regexMatch = regex.Match line
     if regexMatch.Success
     then
         let regexGroups = regexMatch.Groups
-        let jsonDataType = parseJsonDataType line regexGroups["type"].Value
+        let jsonDataType = parseJsonDataType regexGroups["type"].Value
         match jsonDataType with
         | Ok jsonDataType ->
             Ok <| FormatLine (regexGroups["name"].Value, Int32.Parse(regexGroups["width"].Value), jsonDataType)

diff --git a/DataParser.Tests/Helpers.fs b/DataParser.Tests/Helpers.fs
@@ -2,7 +2,7 @@
 
 open DataParser.Console.FormatFiles
 
-let forceParseJsonType line s =
-    match parseJsonDataType line s with
+let forceParseJsonType s =
+    match parseJsonDataType s with
     | Ok x -> x
     | Error _ -> raise (invalidArg (nameof s) "Invalid json data type cannot be parsed")
diff --git a/DataParser.Tests/Tests.fs b/DataParser.Tests/Tests.fs
@@ -48,14 +48,20 @@ let ``parseFormatLine returns error when line does not conform to expected forma
     let regex = Regex("^\n$")
 
     parseFormatLine regex s =! expected
+
+[<Property>]
+let ``parseJsonDataType returns expected error when data type does not conform to expected format`` (s: string) =
+    let expected : Result<JsonDataType, Error list> = Error [ UnexpectedJsonDataType s ]
+
+    parseJsonDataType s =! expected
 
 [<Xunit.Theory>]
 [<Xunit.InlineData("name", 10, "TEXT")>]
 [<Xunit.InlineData("valid", 1, "BOOLEAN")>]
 [<Xunit.InlineData("count", 3, "INTEGER")>]
 let ``parseFormatLine returns expected FormatLine when line conforms to regex`` (columnName, width, dataType) =
     let line = $"{columnName},{width},{dataType}"
-    let jsonType = forceParseJsonType line dataType
+    let jsonType = forceParseJsonType dataType
     let expected = Ok <| FormatLine (columnName, width, jsonType)
     let regex = Regex("^(?<name>.+),(?<width>\d+),(?<type>.+)$")