PR for Database changes #632
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Array length test for groups not passing
Update branch
wadoodalam
changed the title
wadoodalam
changed the title
huss
requested changes
May 3, 2021
src/server/migrations/0.6.0-0.7.0/sql/group/add_displayable,gps,note,area_columns.sql
Outdated
Show resolved
Hide resolved
src/server/migrations/0.6.0-0.7.0/sql/group/add_displayable,gps,note,area_columns.sql
Outdated
Show resolved
Hide resolved
src/server/migrations/0.6.0-0.7.0/sql/group/add_displayable,gps,note,area_columns.sql
Outdated
Show resolved
Hide resolved
src/server/migrations/0.6.0-0.7.0/sql/map/add_column_north_angle and circe_fraction.sql
Outdated
Show resolved
Hide resolved
src/server/migrations/0.6.0-0.7.0/sql/map/add_column_north_angle and circe_fraction.sql
Outdated
Show resolved
Hide resolved
This is an arbitrary time so I think it best to best at midnight. Fixed date format.
Made group and meter names, notes different Fixed one space issue Made enter identifier names consistent
I messed up year in my edits and am putting back
Also made time tests use Meter object used to create meter to do tests.
- The route for maps needed to return the two new values. - A previous bug stopped test loop from executing. This likely is why broken tests were not noticed. - The modifiedDate test was wrong and fixed. - The new tests for the new properties was wrong. - Made new values unique to each map so test was stronger.
- The new DB items for meters were added to what the route returns. Only area is being returned for non-admin to see. - Refactored code to make testing of meters easier. - Added tests for all new DB values. - Make values in each meter more unique for stronger testing.
Takes into account removing previous day and renaming of meters/groups.
|
I have pushed a number of commits to the PR to address:
|
huss
approved these changes
May 5, 2021
|
I have completed local testing and it seems to run fun. I believe this is ready to merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR modifies the database by making changes to meters, maps, and groups. Additional attributes for meters are added which allows to check if the given reading is the cumulative sum or not and if and when the pipeline needs reset. Other changes include the timestamps, variation, and length of the reading associated with the meter. It also allows for checking if the reading overlaps to the previous day or not. This PR is also a step towards determining the start time of the reading if not provided. Additionally, The PR allows for the storage of some additional data with regards to groups. Another thing addressed in this PR is to allow for storing the circle size of the meter on the map and the angle with which the image has been rotated with respect to the north. Test code for these changes and changes to the script of test data has also been implemented.
Fixes #634. It begins to address issue #211.
(Check the ones that apply by placing an "x" instead of the space in the [ ] so it becomes [x])
Checklist
(Note what you have done by placing an "x" instead of the space in the [ ] so it becomes [x]. It is hoped you do all of them.)
Limitations
Test code associated with OED/src/server/test/web/meters.js and OED/src/server/test/web/groups.js still needs fixes. Additional attributes which are added in this PR are not returned by the relevant route from the server to the aforementioned files.
by @huss: The test code has been updated and no longer fails. I have the new values so they are returned by the route to allow testing but they have not been added to Redux state at this point. It is assumed that will happen as the code that will use these values are added. As such, this PR updates the DB to hold state OED is planning to use so future developers can add that code.