test: minor adjustments

internal/data/disbursements.go

@@ -58,6 +58,15 @@ const (
 	VerificationFieldNationalID  VerificationField = "NATIONAL_ID_NUMBER"
 )
 
+// GetAllVerificationFields returns all verification fields
+func GetAllVerificationFields() []VerificationField {
+	return []VerificationField{
+		VerificationFieldDateOfBirth,
+		VerificationFieldPin,
+		VerificationFieldNationalID,
+	}
+}
+
 type DisbursementStatusHistoryEntry struct {
 	UserID    string             `json:"user_id"`
 	Status    DisbursementStatus `json:"status"`

internal/serve/httphandler/receiver_handler.go

@@ -135,10 +135,6 @@ func (rh ReceiverHandler) GetReceivers(w http.ResponseWriter, r *http.Request) {
 }
 
 // GetReceiverVerification returns a list of verification types
-func (rh ReceiverHandler) GetReceiverVerificatioTypes(w http.ResponseWriter, r *http.Request) {
-	httpjson.Render(w, []data.VerificationField{
-		data.VerificationFieldDateOfBirth,
-		data.VerificationFieldNationalID,
-		data.VerificationFieldPin,
-	}, httpjson.JSON)
+func (rh ReceiverHandler) GetReceiverVerificationTypes(w http.ResponseWriter, r *http.Request) {
+	httpjson.Render(w, data.GetAllVerificationFields(), httpjson.JSON)
 }

internal/serve/httphandler/receiver_handler_test.go

@@ -1633,25 +1633,20 @@ func Test_ReceiverHandler_GetReceiverVerificatioTypes(t *testing.T) {
 		DBConnectionPool: dbConnectionPool,
 	}
 
-	r := chi.NewRouter()
-	r.Get("/receivers/verification-types", handler.GetReceiverVerificatioTypes)
-
+	rr := httptest.NewRecorder()
 	req, err := http.NewRequest(http.MethodGet, "/receivers/verification-types", nil)
 	require.NoError(t, err)
+	http.HandlerFunc(handler.GetReceiverVerificationTypes).ServeHTTP(rr, req)
 
-	rr := httptest.NewRecorder()
-	r.ServeHTTP(rr, req)
-
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	respBody, err := io.ReadAll(rr.Body)
+	resp := rr.Result()
+	respBody, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
-
+	defer resp.Body.Close()
 	expectedBody := `[
-  "DATE_OF_BIRTH",
-  "NATIONAL_ID_NUMBER",
-  "PIN"
-]`
-
-	assert.Equal(t, expectedBody, string(respBody))
+		"DATE_OF_BIRTH",
+		"PIN",
+		"NATIONAL_ID_NUMBER"
+	]`
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	assert.JSONEq(t, expectedBody, string(respBody))
 }

internal/serve/serve.go

@@ -263,7 +263,7 @@ func handleHTTP(o ServeOptions) *chi.Mux {
 				Get("/{id}", receiversHandler.GetReceiver)
 
 			r.With(middleware.AnyRoleMiddleware(authManager, data.GetAllRoles()...)).
-				Get("/verification-types", receiversHandler.GetReceiverVerificatioTypes)
+				Get("/verification-types", receiversHandler.GetReceiverVerificationTypes)
 
 			updateReceiverHandler := httphandler.UpdateReceiverHandler{Models: o.Models, DBConnectionPool: o.dbConnectionPool}
 			r.With(middleware.AnyRoleMiddleware(authManager, data.OwnerUserRole, data.FinancialControllerUserRole)).