Skip to content

Commit

Permalink
Merge pull request #2154 from transcom/165891824-change-popwhere-spri…
Browse files Browse the repository at this point in the history
…ntf-calls

Remove Sprintf Where queries
  • Loading branch information
mikena-truss committed May 17, 2019
2 parents 27fd2f9 + 9b16db9 commit 3de1da1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions pkg/handlers/internalapi/service_members_test.go
Expand Up @@ -95,7 +95,7 @@ func (suite *HandlerSuite) TestSubmitServiceMemberHandlerNoValues() {
suite.Assertions.IsType(&servicememberop.CreateServiceMemberCreated{}, unwrappedResponse)

// Then: we expect a servicemember to have been created for the user
query := suite.DB().Where(fmt.Sprintf("user_id='%v'", user.ID))
query := suite.DB().Where("user_id = ?", user.ID)
var serviceMembers models.ServiceMembers
query.All(&serviceMembers)

Expand Down Expand Up @@ -160,7 +160,7 @@ func (suite *HandlerSuite) TestSubmitServiceMemberHandlerAllValues() {
suite.Assertions.IsType(&servicememberop.CreateServiceMemberCreated{}, unwrappedResponse)

// Then: we expect a servicemember to have been created for the user
query := suite.DB().Where(fmt.Sprintf("user_id='%v'", user.ID))
query := suite.DB().Where("user_id = ?", user.ID)
var serviceMembers models.ServiceMembers
query.All(&serviceMembers)

Expand Down Expand Up @@ -202,7 +202,7 @@ func (suite *HandlerSuite) TestSubmitServiceMemberSSN() {
suite.Assertions.True(*okResponse.Payload.HasSocialSecurityNumber)

// Then: we expect a ServiceMember to have been created for the user
query := suite.DB().Where(fmt.Sprintf("user_id='%v'", user.ID))
query := suite.DB().Where("user_id = ?", user.ID)
var serviceMembers models.ServiceMembers
query.All(&serviceMembers)

Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/internalapi/signed_certifications_test.go
@@ -1,7 +1,6 @@
package internalapi

import (
"fmt"
"net/http/httptest"
"time"

Expand Down Expand Up @@ -44,7 +43,8 @@ func (suite *HandlerSuite) TestCreateSignedCertificationHandler() {
t.Fatalf("Request failed: %#v", response)
}

query := suite.DB().Where(fmt.Sprintf("submitting_user_id='%v'", move.Orders.ServiceMember.User.ID)).Where(fmt.Sprintf("move_id='%v'", move.ID))
query := suite.DB().Where("submitting_user_id = ?", move.Orders.ServiceMember.User.ID).
Where("move_id = ?", move.ID)
certs := []models.SignedCertification{}
query.All(&certs)

Expand Down
4 changes: 3 additions & 1 deletion pkg/testdatagen/make_tdl_records.go
Expand Up @@ -26,7 +26,9 @@ func MakeTDL(db *pop.Connection, assertions Assertions) models.TrafficDistributi
}

tdls := []models.TrafficDistributionList{}
query := db.Where(fmt.Sprintf("source_rate_area = '%s' AND destination_region = '%s' AND code_of_service = '%s'", source, dest, cos))
query := db.Where("source_rate_area = ?", source).
Where("destination_region = ?", dest).
Where("code_of_service = ?", cos)
err := query.All(&tdls)
if err != nil {
log.Panic(err)
Expand Down

0 comments on commit 3de1da1

Please sign in to comment.