From 27223da048e6e7811370d12ce6732b945628f5ad Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 20 Sep 2023 12:54:25 -0500 Subject: [PATCH 1/2] fix wrong response data --- cmd/server/files.go | 21 ++++++++++++++++++--- cmd/server/files_test.go | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/cmd/server/files.go b/cmd/server/files.go index ba2dc936..163f567a 100644 --- a/cmd/server/files.go +++ b/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}) } } diff --git a/cmd/server/files_test.go b/cmd/server/files_test.go index 0266d3c3..cfc7d45f 100644 --- a/cmd/server/files_test.go +++ b/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) { From a5e46c4aa301b5d4bb83a6f33a001cde78163890 Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 20 Sep 2023 13:34:58 -0500 Subject: [PATCH 2/2] removed debug message --- reader.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/reader.go b/reader.go index 2bd97d1c..5ddc8b17 100644 --- a/reader.go +++ b/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 }