fixes based on PR comments

Author: RIT3shSapata

base/error.go

@@ -404,7 +404,7 @@ func (e *ImportFilterDryRunError) Error() string {
 	if e.Err == nil {
 		return importFilterErrorPrefix
 	}
-	return e.Err.Error()
+	return importFilterErrorPrefix+ ": " + e.Err.Error()
 }
 
 func (e *ImportFilterDryRunError) Unwrap() error {

rest/diagnostic_doc_api.go

@@ -184,10 +184,8 @@ func (h *handler) handleImportFilterDryRun() error {
 
 	var importFilterPayload ImportFilterDryRunPayload
 	err := h.readJSONInto(&importFilterPayload)
-	// Only require a valid JSON payload if docid is not provided.
-	// If docid is provided, the sync function will use the document from the bucket, and the payload is optional.
-	if err != nil && docid == "" {
-		return base.HTTPErrorf(http.StatusBadRequest, "Error reading sync function payload: %v", err)
+	if err != nil {
+		return base.HTTPErrorf(http.StatusBadRequest, "Error reading import filter payload: %v", err)
 	}
 
 	// Cannot pass both doc_id and body in the request body
@@ -213,9 +211,6 @@ func (h *handler) handleImportFilterDryRun() error {
 			return err
 		}
 		errorMsg = err.Error()
-		if importFilterDryRunErr.Unwrap() != nil {
-			errorMsg = importFilterDryRunErr.Err.Error()
-		}
 	}
 	resp := ImportFilterDryRun{
 		shouldImport,

rest/diagnostic_doc_api_test.go

@@ -1239,7 +1239,7 @@ func TestImportFilterDryRun(t *testing.T) {
 			document:       map[string]any{"accessUser": "user"},
 			existingDoc:    false,
 			expectedOutput: ImportFilterDryRun{
-				Error: "TypeError: Cannot access member 'num' of undefined",
+				Error: "Error returned from Import Filter: TypeError: Cannot access member 'num' of undefined",
 			},
 			expectedStatus: http.StatusOK,
 		},
@@ -1249,7 +1249,7 @@ func TestImportFilterDryRun(t *testing.T) {
 			document:     map[string]any{"accessUser": "user"},
 			existingDoc:  false,
 			expectedOutput: ImportFilterDryRun{
-				Error: "TypeError: Cannot access member 'num' of undefined",
+				Error: "Error returned from Import Filter: TypeError: Cannot access member 'num' of undefined",
 			},
 			expectedStatus: http.StatusOK,
 		},
@@ -1260,7 +1260,7 @@ func TestImportFilterDryRun(t *testing.T) {
 			document:       map[string]any{"accessUser": "user"},
 			existingDoc:    false,
 			expectedOutput: ImportFilterDryRun{
-				Error: "TypeError: Cannot access member 'num' of undefined",
+				Error: "Error returned from Import Filter: TypeError: Cannot access member 'num' of undefined",
 			},
 			expectedStatus: http.StatusOK,
 		},