B 20493 int

[deandreJones]

B-20493

Summary

Verification Steps for the Author

These are to be checked by the author.

• Tested in the Experimental environment (for changes to containers, app startup, or connection to data stores)
• Have the Agility acceptance criteria been met for this change?

Verification Steps for Reviewers

These are to be checked by a reviewer.

• Has the branch been pulled in and checked out?
• Have the BL acceptance criteria been met for this change?
• Was the CircleCI build successful?
• Has the code been reviewed from a standards and best practices point of view?

Setup to Run the Code

• Instructions for starting storybook
• Instructions for starting the MilMove application
• Instructions for running tests

How to test

1. Access the Office app
2. Click Request Account
3. For this test- we want to be able to select all available transportation offiices- even those that don't office ppm_closeout- , JPPSO Southeast (CNNQ) is one example, where before this change- it was not able to be selected, after this change it is able to be selected

Backend

• Code follows the guidelines for Logging.
• The requirements listed in Querying the Database Safely have been satisfied.

Screenshots

[danieljordan-caci]

Need you to clarify some things with Dan before signing off or doing additional work.

[danieljordan-caci]

So I know this works, but I have some reservations.

This is also used for customers when searching for transpo offices in /pkg/handlers/internalapi/transportation_offices.go:54:

transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search)
			if err != nil {
				appCtx.Logger().Error("Error searching for Transportation Offices: ", zap.Error(err))
				return transportationofficeop.NewGetTransportationOfficesInternalServerError(), err
			}

and...

This is also used for customers when searching for transpo offices in /pkg/handlers/ghcapi/transportation_offices.go:23:

transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search)
			if err != nil {
				appCtx.Logger().Error("Error searching for Transportation Offices: ", zap.Error(err))
				return transportationofficeop.NewGetTransportationOfficesInternalServerError(), err
			}

So I think that if that is fine for customers and office users inside of the app to see all transpo offices, then we can leave this.

If not, then we should probably create a new service object that only this open handler uses. Should prob ask Dan.

[deandreJones]

good call

[deandreJones]

after some research- this endpoint can't be used, will have to create anew one or- use the admin api

[danieljordan-caci]

Can just create a new service object that the handler calls. Just copy over what's in pkg/services/transportation_office/transportation_office_fetcher.go:

func (o transportationOfficesFetcher) GetTransportationOfficesForRequestedOfficeUsers(appCtx appcontext.AppContext, search string) (*models.TransportationOffices, error) {
	officeList, err := FindTransportationOfficeForRequestedOfficeUsers(appCtx, search)

	if err != nil {
		switch err {
		case sql.ErrNoRows:
			return &officeList, apperror.NewNotFoundError(uuid.Nil, "Search string: "+search)
		default:
			return &officeList, err
		}
	}

	return &officeList, nil
}

func FindTransportationOfficeForRequestedOfficeUsers(appCtx appcontext.AppContext, search string) (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
	}

	sqlQuery := `
	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
		order by sim desc
        limit 5)
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
        limit 5`
	query := appCtx.DB().Q().RawQuery(sqlQuery, search)
	if err := query.All(&officeList); err != nil {
		if errors.Cause(err).Error() != models.RecordNotFoundErrorString {
			return officeList, err
		}
	}
	for i := range officeList {
		err := appCtx.DB().Load(&officeList[i], "Address")
		if err != nil {
			return officeList, err
		}
	}
	return officeList, nil
}

Bing bang boom.

[deandreJones]

I don't like copied code- I prefer to make the code more flexible for multiple use

[danieljordan-caci]

Fine by me! Your solution looks good!

[danieljordan-caci]

You just not putting labels on your PRs now, boss? :)

[traskowskycaci]

Query results look good!

May need a make mocks_generate on your branch

[deandreJones]

You just not putting labels on your PRs now, boss? :)

I never claimed to be perfect...

[deandreJones]

Query results look good!

May need a make mocks_generate on your branch

already did

[danieljordan-caci]

Nailed it!