Merge branch 'integrationTesting' into INT-B-20463-update-previous-mo…

…ves-to-consider-multi-move-data
transcom · Jul 19, 2024 · 006a124 · 006a124
2 parents fb17b4b + b048057
commit 006a124
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 22 deletions.
diff --git a/pkg/handlers/ghcapi/tranportation_offices.go b/pkg/handlers/ghcapi/tranportation_offices.go
@@ -20,7 +20,7 @@ func (h GetTransportationOfficesHandler) Handle(params transportationofficeop.Ge
 	return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest,
 		func(appCtx appcontext.AppContext) (middleware.Responder, error) {
 
-			transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search)
+			transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search, true)
 			if err != nil {
 				appCtx.Logger().Error("Error searching for Transportation Offices: ", zap.Error(err))
 				return transportationofficeop.NewGetTransportationOfficesInternalServerError(), err
@@ -40,7 +40,7 @@ func (h GetTransportationOfficesOpenHandler) Handle(params transportationofficeo
 	return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest,
 		func(appCtx appcontext.AppContext) (middleware.Responder, error) {
 
-			transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search)
+			transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search, true)
 			if err != nil {
 				appCtx.Logger().Error("Error searching for Transportation Offices: ", zap.Error(err))
 				return transportationofficeop.NewGetTransportationOfficesOpenInternalServerError(), err

diff --git a/pkg/handlers/internalapi/transportation_offices.go b/pkg/handlers/internalapi/transportation_offices.go
@@ -51,7 +51,7 @@ func (h GetTransportationOfficesHandler) Handle(params transportationofficeop.Ge
 				return transportationofficeop.NewGetTransportationOfficesForbidden(), noServiceMemberIDErr
 			}
 
-			transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search)
+			transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search, false)
 			if err != nil {
 				appCtx.Logger().Error("Error searching for Transportation Offices: ", zap.Error(err))
 				return transportationofficeop.NewGetTransportationOfficesInternalServerError(), err

diff --git a/pkg/services/mocks/TransportationOfficesFetcher.go b/pkg/services/mocks/TransportationOfficesFetcher.go
diff --git a/pkg/services/transportation_office.go b/pkg/services/transportation_office.go
@@ -9,7 +9,7 @@ import (
 
 //go:generate mockery --name TransportationOfficesFetcher
 type TransportationOfficesFetcher interface {
-	GetTransportationOffices(appCtx appcontext.AppContext, search string) (*models.TransportationOffices, error)
+	GetTransportationOffices(appCtx appcontext.AppContext, search string, forPpm bool) (*models.TransportationOffices, error)
 	GetTransportationOffice(appCtx appcontext.AppContext, transportationOfficeID uuid.UUID, includeOnlyPPMCloseoutOffices bool) (*models.TransportationOffice, error)
 	GetAllGBLOCs(appCtx appcontext.AppContext) (*models.GBLOCs, error)
 }
diff --git a/pkg/services/transportation_office/transportation_office_fetcher.go b/pkg/services/transportation_office/transportation_office_fetcher.go
@@ -37,8 +37,8 @@ func (o transportationOfficesFetcher) GetTransportationOffice(appCtx appcontext.
 	return &transportationOffice, nil
 }
 
-func (o transportationOfficesFetcher) GetTransportationOffices(appCtx appcontext.AppContext, search string) (*models.TransportationOffices, error) {
-	officeList, err := FindTransportationOffice(appCtx, search)
+func (o transportationOfficesFetcher) GetTransportationOffices(appCtx appcontext.AppContext, search string, forPpm bool) (*models.TransportationOffices, error) {
+	officeList, err := FindTransportationOffice(appCtx, search, forPpm)
 
 	if err != nil {
 		switch err {
@@ -52,22 +52,27 @@ func (o transportationOfficesFetcher) GetTransportationOffices(appCtx appcontext
 	return &officeList, nil
 }
 
-func FindTransportationOffice(appCtx appcontext.AppContext, search string) (models.TransportationOffices, error) {
+func FindTransportationOffice(appCtx appcontext.AppContext, search string, forPpm bool) (models.TransportationOffices, error) {
 	var officeList []models.TransportationOffice
 
 	// The % operator filters out strings that are below this similarity threshold
 	err := appCtx.DB().Q().RawQuery("SET pg_trgm.similarity_threshold = 0.03").Exec()
 	if err != nil {
 		return officeList, err
 	}
+	providesPPMCloseout := `and provides_ppm_closeout is true`
 
 	sqlQuery := `
-	with names as (select office.id as transportation_office_id, office.name, similarity(office.name, $1) as sim
+		with names as (select office.id as transportation_office_id, office.name, similarity(office.name, $1) as sim
         from transportation_offices as office
-        where name % $1 and provides_ppm_closeout is true
+        where name % $1 `
+	if forPpm {
+		sqlQuery += providesPPMCloseout
+	}
+	sqlQuery += `
 		order by sim desc
         limit 5)
-select office.*
+		select office.*
         from names n inner join transportation_offices office on n.transportation_office_id = office.id
         group by office.id
         order by max(n.sim) desc, office.name

diff --git a/pkg/services/transportation_office/transportation_office_fetcher_test.go b/pkg/services/transportation_office/transportation_office_fetcher_test.go
@@ -36,7 +36,7 @@ func (suite *TransportationOfficeServiceSuite) Test_SearchTransportationOffice()
 			},
 		},
 	}, nil)
-	office, err := FindTransportationOffice(suite.AppContextForTest(), "LRC Fort Knox")
+	office, err := FindTransportationOffice(suite.AppContextForTest(), "LRC Fort Knox", true)
 
 	suite.NoError(err)
 	suite.Equal(transportationOffice.Name, office[0].Name)
@@ -47,7 +47,7 @@ func (suite *TransportationOfficeServiceSuite) Test_SearchTransportationOffice()
 
 func (suite *TransportationOfficeServiceSuite) Test_SearchWithNoTransportationOffices() {
 
-	office, err := FindTransportationOffice(suite.AppContextForTest(), "LRC Fort Knox")
+	office, err := FindTransportationOffice(suite.AppContextForTest(), "LRC Fort Knox", true)
 	suite.NoError(err)
 	suite.Len(office, 0)
 }
@@ -81,7 +81,7 @@ func (suite *TransportationOfficeServiceSuite) Test_SortedTransportationOffices(
 		},
 	}, nil)
 
-	office, err := FindTransportationOffice(suite.AppContextForTest(), "JPPSO")
+	office, err := FindTransportationOffice(suite.AppContextForTest(), "JPPSO", true)
 
 	suite.NoError(err)
 	suite.Equal(transportationOffice1.Name, office[0].Name)