Merge a5e46c4 into ef2ee8a

cmd/server/files.go

@@ -282,7 +282,12 @@ func deleteFile(logger log.Logger, repo ICLFileRepository) http.HandlerFunc {
 
 		w.Header().Set("Content-Type", "application/json; charset=utf-8")
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(`{"error": null}`)
+
+		type response struct {
+			Error error `json:"error"`
+		}
+
+		json.NewEncoder(w).Encode(&response{Error: nil})
 	}
 }
 
@@ -369,7 +374,12 @@ func validateFile(logger log.Logger, repo ICLFileRepository) http.HandlerFunc {
 
 		w.Header().Set("Content-Type", "application/json; charset=utf-8")
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(`{"error": null}`)
+
+		type response struct {
+			Error error `json:"error"`
+		}
+
+		json.NewEncoder(w).Encode(&response{Error: nil})
 	}
 }
 
@@ -474,6 +484,11 @@ func removeCashLetterFromFile(logger log.Logger, repo ICLFileRepository) http.Ha
 
 		w.Header().Set("Content-Type", "application/json; charset=utf-8")
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(`{"error": null}`)
+
+		type response struct {
+			Error error `json:"error"`
+		}
+
+		json.NewEncoder(w).Encode(&response{Error: nil})
 	}
 }

cmd/server/files_test.go

@@ -309,7 +309,7 @@ func TestFiles_validateFile(t *testing.T) {
 		w.Flush()
 
 		require.Equal(t, http.StatusOK, w.Code, w.Body)
-		assert.Contains(t, w.Body.String(), `"{\"error\": null}"`)
+		assert.Contains(t, w.Body.String(), `{"error":null}`)
 	})
 
 	t.Run("invalid file", func(t *testing.T) {

reader.go

@@ -105,10 +105,7 @@ func Passthrough(lineIn string) (lineOut string) {
 
 // DecodeEBCDIC will decode a line from EBCDIC-0037 to UTF-8
 func DecodeEBCDIC(lineIn string) (lineOut string) {
-	lineOut, err := encoding.EBCDIC.NewDecoder().String(lineIn)
-	if err != nil {
-		fmt.Printf("Error decoding '%X' as EBCDIC: %v\n", lineIn, err)
-	}
+	lineOut, _ = encoding.EBCDIC.NewDecoder().String(lineIn)
 	return lineOut
 }