Merge pull request #39 from k-capehart/improve-coverage

Improve code coverage for codecov
k-capehart · Jun 18, 2024 · a137735 · a137735
2 parents 816df42 + 16947bb
commit a137735
Show file tree

Hide file tree

Showing 12 changed files with 1,929 additions and 244 deletions.
diff --git a/README.md b/README.md
diff --git a/auth.go b/auth.go
@@ -45,13 +45,11 @@ func validateSession(auth authentication) error {
 	if err := validateAuth(Salesforce{auth: &auth}); err != nil {
 		return err
 	}
-	resp, err := doRequest(http.MethodGet, "/limits", jsonType, auth, "")
+	_, err := doRequest(http.MethodGet, "/limits", jsonType, auth, "", http.StatusOK)
 	if err != nil {
 		return err
 	}
-	if resp.StatusCode != http.StatusOK {
-		return processSalesforceError(*resp)
-	}
+
 	return nil
 }
 

diff --git a/bulk.go b/bulk.go
@@ -64,24 +64,19 @@ var appFs = afero.NewOsFs() // afero.Fs type is a wrapper around os functions, a
 func updateJobState(job bulkJob, state string, auth authentication) error {
 	job.State = state
 	body, _ := json.Marshal(job)
-	resp, err := doRequest(http.MethodPatch, "/jobs/ingest/"+job.Id, jsonType, auth, string(body))
+	_, err := doRequest(http.MethodPatch, "/jobs/ingest/"+job.Id, jsonType, auth, string(body), http.StatusOK)
 	if err != nil {
 		return err
 	}
-	if resp.StatusCode != http.StatusOK {
-		return processSalesforceError(*resp)
-	}
+
 	return nil
 }
 
 func createBulkJob(auth authentication, jobType string, body []byte) (bulkJob, error) {
-	resp, err := doRequest(http.MethodPost, "/jobs/"+jobType, jsonType, auth, string(body))
+	resp, err := doRequest(http.MethodPost, "/jobs/"+jobType, jsonType, auth, string(body), http.StatusOK)
 	if err != nil {
 		return bulkJob{}, err
 	}
-	if resp.StatusCode != http.StatusOK {
-		return bulkJob{}, processSalesforceError(*resp)
-	}
 
 	respBody, readErr := io.ReadAll(resp.Body)
 	if readErr != nil {
@@ -98,17 +93,12 @@ func createBulkJob(auth authentication, jobType string, body []byte) (bulkJob, e
 }
 
 func uploadJobData(auth authentication, data string, bulkJob bulkJob) error {
-	resp, uploadDataErr := doRequest("PUT", "/jobs/ingest/"+bulkJob.Id+"/batches", csvType, auth, data)
+	_, uploadDataErr := doRequest("PUT", "/jobs/ingest/"+bulkJob.Id+"/batches", csvType, auth, data, http.StatusCreated)
 	if uploadDataErr != nil {
 		if err := updateJobState(bulkJob, jobStateAborted, auth); err != nil {
-			return uploadDataErr
-		}
-	}
-	if resp.StatusCode != http.StatusCreated {
-		if err := updateJobState(bulkJob, jobStateAborted, auth); err != nil {
-			return uploadDataErr
+			return err
 		}
-		return processSalesforceError(*resp)
+		return uploadDataErr
 	}
 	stateErr := updateJobState(bulkJob, jobStateUploadComplete, auth)
 	if stateErr != nil {
@@ -119,13 +109,10 @@ func uploadJobData(auth authentication, data string, bulkJob bulkJob) error {
 }
 
 func getJobResults(auth authentication, jobType string, bulkJobId string) (BulkJobResults, error) {
-	resp, err := doRequest(http.MethodGet, "/jobs/"+jobType+"/"+bulkJobId, jsonType, auth, "")
+	resp, err := doRequest(http.MethodGet, "/jobs/"+jobType+"/"+bulkJobId, jsonType, auth, "", http.StatusOK)
 	if err != nil {
 		return BulkJobResults{}, err
 	}
-	if resp.StatusCode != http.StatusOK {
-		return BulkJobResults{}, processSalesforceError(*resp)
-	}
 
 	respBody, readErr := io.ReadAll(resp.Body)
 	if readErr != nil {
@@ -188,13 +175,10 @@ func getQueryJobResults(auth authentication, bulkJobId string, locator string) (
 	if locator != "" {
 		uri = uri + "/?locator=" + locator
 	}
-	resp, err := doRequest(http.MethodGet, uri, jsonType, auth, "")
+	resp, err := doRequest(http.MethodGet, uri, jsonType, auth, "", http.StatusOK)
 	if err != nil {
 		return bulkJobQueryResults{}, err
 	}
-	if resp.StatusCode != http.StatusOK {
-		return bulkJobQueryResults{}, processSalesforceError(*resp)
-	}
 
 	reader := csv.NewReader(resp.Body)
 	records, readErr := reader.ReadAll()
@@ -233,13 +217,10 @@ func collectQueryResults(auth authentication, bulkJobId string) ([][]string, err
 }
 
 func getFailedRecords(auth authentication, bulkJobId string) (string, error) {
-	resp, err := doRequest(http.MethodGet, "/jobs/ingest/"+bulkJobId+"/failedResults", jsonType, auth, "")
+	resp, err := doRequest(http.MethodGet, "/jobs/ingest/"+bulkJobId+"/failedResults", jsonType, auth, "", http.StatusOK)
 	if err != nil {
 		return "", err
 	}
-	if resp.StatusCode != http.StatusOK {
-		return "", processSalesforceError(*resp)
-	}
 
 	respBody, readErr := io.ReadAll(resp.Body)
 	if readErr != nil {
@@ -288,30 +269,6 @@ func mapsToCSV(maps []map[string]any) (string, error) {
 	return buf.String(), nil
 }
 
-func mapsToCSVSlices(maps []map[string]string) ([][]string, error) {
-	var data [][]string
-	var headers []string
-
-	if len(maps) > 0 {
-		headers = make([]string, 0, len(maps[0]))
-		for header := range maps[0] {
-			headers = append(headers, header)
-		}
-		data = append(data, headers)
-	}
-
-	for _, m := range maps {
-		row := make([]string, 0, len(headers))
-		for _, header := range headers {
-			val := m[header]
-			row = append(row, val)
-		}
-		data = append(data, row)
-	}
-
-	return data, nil
-}
-
 func readCSVFile(filePath string) ([][]string, error) {
 	file, fileErr := appFs.Open(filePath)
 	if fileErr != nil {
@@ -353,10 +310,7 @@ func constructBulkJobRequest(auth authentication, sObjectName string, operation
 		Operation:           operation,
 		ExternalIdFieldName: fieldName,
 	}
-	body, jsonError := json.Marshal(jobReq)
-	if jsonError != nil {
-		return bulkJob{}, jsonError
-	}
+	body, _ := json.Marshal(jobReq)
 
 	job, jobCreationErr := createBulkJob(auth, ingestJobType, body)
 	if jobCreationErr != nil {