Fix wrong format in possible transposition errors in CSV

mrclmr · Jan 3, 2024 · 9dc0c93 · 9dc0c93
1 parent f362858
commit 9dc0c93
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/cmd/icm/validate.go b/cmd/icm/validate.go
@@ -557,12 +557,12 @@ func newCheckDigitInput(config *configs.Config) func() input.Input {
 							digitFmt = fmt.Sprintf("%d", tcn.CheckDigit)
 						}
 
-						contNumFmt := fmt.Sprintf("  %s%s%s%s%s%s%s",
+						contNumFmt := fmt.Sprintf("%s%s%s%s%s%s%s",
 							tcn.OwnerCode, config.SepOE(),
 							string(tcn.EquipCatID), config.SepES(),
 							serialNumberFmt, config.SepSC(),
 							digitFmt)
-						infos = append(infos, input.Info{Text: contNumFmt})
+						infos = append(infos, input.Info{Text: fmt.Sprintf("  %s", contNumFmt)})
 						builder.WriteString(contNumFmt)
 						if idx < len(transposedContNums)-1 {
 							builder.WriteString(", ")

diff --git a/cmd/icm/validate_test.go b/cmd/icm/validate_test.go
@@ -303,6 +303,35 @@ func Test_validateCmd(t *testing.T) {
       some-city
       some-country
 
+`,
+		},
+		{
+			"Validate ABC U 681304 0 with fancy output",
+			[]string{"ABC U 681304 0"},
+			[]configOverride{{configs.FlagNames.Pattern, containerNumber}},
+			false,
+			`
+  ABC U 681304 0  ✔
+   ↑  ↑        ↑
+   │  │        └─ Possible transposition errors:
+   │  │             ABC U 681034 0
+   │  │             ABC U 681340 0
+   │  │
+   │  └─ some-equip-cat-ID
+   │
+   └─ some-company
+      some-city
+      some-country
+
+`,
+		},
+		{
+			"Validate ABC U 681304 0 with csv output",
+			[]string{"ABC U 681304 0"},
+			[]configOverride{{configs.FlagNames.Output, "csv"}},
+			false,
+			`owner-code;company;city;country;equipment-category-id;equipment-category;serial-number;check-digit;calculated-check-digit;valid-check-digit;possible-transposition-error
+ABC;some-company;some-city;some-country;U;some-equip-cat-ID;681304;0;0;true;ABC U 681034 0, ABC U 681340 0
 `,
 		},
 	}

diff --git a/input/csv_printer.go b/input/csv_printer.go
@@ -58,5 +58,10 @@ func (cp *CSVPrinter) Print(inputs []Input) error {
 		}
 		cp.headerPrinted = true
 	}
-	return cp.csvWriter.Write(cp.record)
+	err := cp.csvWriter.Write(cp.record)
+	if err != nil {
+		return err
+	}
+	cp.csvWriter.Flush()
+	return nil
 }