Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/cto 104 reservoir project #672

Merged

Conversation

rma-rripken
Copy link
Collaborator

No description provided.

@rma-rripken rma-rripken marked this pull request as ready for review June 10, 2024 18:15
Copy link
Contributor

@MikeNeilson MikeNeilson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do have a comment on the pumpback/etc location office.

private final Calendar UTC_CALENDAR = Calendar.getInstance(TimeZone.getTimeZone("UTC"));

public static final String SELECT_PART = "select project.office_id,\n"
+ " project.location_id as project_id,\n"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For want of Java 17 that allows the python style """ strings.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be cleaner when I move the query into a resource file

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

builder.withPumpBackLocation(new Location.Builder(r.getOFFICE_ID(), r.getPUMP_BACK_LOCATION_ID())
.withActive(null)
.build()
); // Can we assume same office?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, that's a good question. And one for the districts, but I suspect it's cleaner here later if we just don't.
The query above does include the given office_id for each and should probably be used.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just removed the method that used the view with the missing office-ids. We'll use the table join for now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A reasonable substitute.

@rma-rripken rma-rripken merged commit f85c39d into USACE:develop Jun 10, 2024
5 checks passed
@rma-rripken rma-rripken deleted the feature/cto-104-reservoir-project branch June 10, 2024 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants