Fix performance for fetching analyses and force user email to lowercase #4213
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
haneslinger
reviewed
Sep 6, 2023
There was a problem hiding this comment.
When fetching the property view data, get_property_views appears to prefetch the state for the wrong property view (the view is cloned during the analysis)
sorry, could you explain why this is the wrong view?
that state doesn't seem to be used at all. The prefetching would probably help if it pulled the right state, but I've just removed it for now.
I can explain this! I recently made a PR excluding the state from this endpoint as is slowed it down. I missed this line, but it still way performant for me. 🤷 Thank you for catching this!
| @@ -401,7 +401,7 @@ def update(self, request, pk=None): | |||
| user.first_name = json_user.get('first_name') | |||
| user.last_name = json_user.get('last_name') | |||
| user.email = json_user.get('email') | |||
| user.username = json_user.get('email') | |||
| user.username = json_user.get('email', '').lower() | |||
There was a problem hiding this comment.
I'm a little worried that this is going to change people's username unexpectedly, but idk where/if that would create issues. @axelstudios thoughts?
There was a problem hiding this comment.
No worries, I've been trying to dig around carefully myself! The issue I'm solving is one where a user told me she had updated her information and then wasn't able to log in. I've noticed that in SEED, user email addresses are case-sensitive and usernames are always pulled from the email address and then lowercased. This way the input username can be lowercased for the case-sensitive authentication during login.
So with this user, because her email address is ExampleAddress@a.com, the above line in update had changed her username and email from exampleaddress@a.com and ExampleAddress@a.com to both being ExampleAddress@a.com. So because the email address she tries to log in with will get lowercased and compared case-sensitively to ExampleAddress@a.com, she'd never be able to log in.
A different issue is that, you're right, I'm not sure users should be able to change their email addresses (and by extension usernames) so easily. Especially since we in BEAM use email addresses for building lookups. I'd like to add something where some kind of verification email is sent out after updating an email address, but that's really only one piece to this.
There was a problem hiding this comment.
yes, we should always be using .lower() this has been an issue for quite some time and I think we have forced most emails to be .lower()
There was a problem hiding this comment.
so we are good to push? should we and a constraint and a migration?
Think I meant to say it looked like the wrong state, since the prefetched state doesn't seem to be used anywhere after its retrieved. But oh good! Whenever we do our SEED merge (hopefully within the month) I'll try to pick up your PR too - the one line change is an easy quick fix for us. |
nllong
approved these changes
Sep 19, 2023
nllong
changed the title
nllong
added a commit
that referenced
this pull request
Oct 1, 2023
* Remove Deprecated APIs (#4049) * Remove deprecated endpoints * Update tests * Remove additional code related to API v2 * Add ubid_threshold to expected org response * Lock `google-chrome` to v114 (#4165) Lock chrome version to webdriver version * Bump word-wrap from 1.2.3 to 1.2.4 (#4154) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix a few code-formatting issues (#4172) * run autopep to cleanup a few straggling issues * Run precommit against migrations * Cleanup unnecessary logging --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Add Open Street Map to CSP rules (#4169) * add error handling for sf edge case (#4159) add error handldling for sf edge case Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove ID from inventory document display name (#4125) remove id from inventory doc on inv det * Set the MEDIA_ROOT path back to original value during test (#4174) * set the mediaroot path back to where it started * naming * Optimize list analyses endpoint (#4206) * Optimize list analyses endpoint * Add outputfiles back in * Fix * Make it even faster * Move analyses endpoint (#4210) * Add new `create_property` and `update_with_espm` endpoint (#4012) * 179d create_property endpoint * precommit * adding property id, state id, and view id to create response * Partial fixes for handling bad data * Verify property exists and belongs to org * start of new serializer and controlling extra_data fields for 179d * fix property create endpoint * Formatting * fix org_id on column views * add report_format to PM download so spreadsheet can be downloaded * updating BAE and small tweak since assets are now typed * update BAE processing in reader * updating BAE to v0.1.14 * remove uneeded view * Add ESPM download for single property (via API) (#4158) * add single property download method * add viewset for downloading single espm report * fix BAE migration and update swagger schema * rename pm report single to download * update lokalise notes and pull from latest from website * initial commit with a new update with ESPM function. need to get the backend method finished * enable udpate_with_espm * add test and column mapping profile helper to load in the data * fix example file that was downloaded from espm * fix comment formats * file paths * style espm modal and fix both upload methods * put tmp files into the projects media dir * add column mapping profile param to update_with_espm * put tmp files into the projects media dir * add status to dresponse for pyseed * do not save in media_root * precommit * allow different urls for better and at during testing * return the mapping profile object when creating from file * add tests to ensure read_only fields are protected * Update models.py * Update models.py * - Removed broken `property_id` option - Fixed extra_data columns to only ones that actually apply - Changed `merge_state` from 0 to 1 - Added ValueError handling * Small fixes * Fix 179d ESPM update endpoint to run in foreground with Celery enabled (#4211) * Fixed bae object accessors * create two new methods for running save_raw and map to the foreground * fix type --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Fix display name (#4223) * Fix refresh_metadata (#4221) * Fix refresh_metadata * Rename * Bump uwsgi from 2.0.17.1 to 2.0.22 in /requirements (#4209) Bumps [uwsgi](https://github.com/unbit/uwsgi-docs) from 2.0.17.1 to 2.0.22. - [Commits](https://github.com/unbit/uwsgi-docs/commits) --- updated-dependencies: - dependency-name: uwsgi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove Beta label from text of analysis button (#4225) remove beta from analysis Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meters Without `source_id` (#4229) Fix showing meter readings for meters without `source_id` * Fix performance for fetching analyses and force user email to lowercase (#4213) * Set username to lowercase when updating user info * Removed unnecessary prefetch from analyses retrieval --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * EEEJ Analysis Functionality (#4208) * eeej analysis * precommit * precommit * add EJScreen * update eeej analysis to link to EJScreen report * adding analysis description for eeej * Fix display name * fix for analysis reruns * cleanup * fix eeej tests * cleanup * fix searching for string in a NoneType * set manual geocoding * fix geocode tests and add census to geocode summary * fix typos * geocode with lat/lng over address if available * add copyright text * small doc formatting cleanup * cleanup * oops, missed this formatting --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Show Analysis `debug_message` If Available (#4198) Show analysis debug_message if available Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Use display name in custom reports legend (#4060) * Use display name in custom reports legend * Fix docker compose * Fix Tests * Address comment * Clean --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Allow analysis property view related properties to be null (#4227) * update ondelete buildingfile > event > scenarios * update relationhsip to null when a property is deleted * add warning triangle * remove checkbox to delete analyses with properties * precommit * reorder migrations * reset * remove commit from outside branch * add warning to analyses page * styles * Update migrations --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> * Add more API documentation for meter and meter readings (#4237) * add more api doc info on meter and meter reading endpoints * Improved nested documentation, added swagger support for enums, sorted meter readings --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Update inventory selection to include current inventory type only (#3862) filter selection by current invetory type and return its length Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Update default meter range selection for BETTER analysis (#3819) * Show all navs in org * reverse the default better meter selection * Allow analysis to be by range or cycle * html updates to add cycle to BETTER * revert to allow merge * select cycle for better * update docker-dev better api endpoint * modify valid meter data to accept cycle start and end dates * precommit * formatting * remove console and updat better url * merge conflicts * order * default current cycle to eui and better on select_cycle * Simplified --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Delete BuildingFiles and Related Events on PropertyState delete (#4217) * update ondelete buildingfile > event > scenarios * precommit * delete scenario if event is deleted * cascade over nothing * Renumber migration --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fixed Issues with Scenario/Measure CRUD Operations (#4240) Fixed issues with scenario/measure CRUD operations, cherry-picked from a640926 * Add a cycle indicator to the analysis modal and filter analyses for current cycle (#3837) * expose current cycle on new analysis modal * display analysis associated with cycle * refactor help text * add cycle indicator to analysis_card * syntax * refactor for clarity * add cycle_name to analysis display tables * add cycle dropdown to inventory detail analyses page * find analyses relavent to current cycle * precommit * formatting * remove debug logs * clarifying note * consistency * Fixed ui-router navigation --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Disable ability to remove matching criteria fields once inventory is added (#4222) * update ondelete buildingfile > event > scenarios * base for locked matching criteria * refactor for clarity * remove matching preview from frontend * remove matching preview from backend * translations * precommit * remove unrelated migration * revert * update tests --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add smaller EEEJ data files for testing (#4243) add smaller EEEJ data files for testing * Add Uniformat Table (#4238) * Add uniformat * Minor fixes --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meter Overwrites (#4250) * add test to make sure meter readings do not overwrite * Fixed major bug where inserting a single meter reading would delete any existing readings for any meter with the same start time - Added the ability for inserting bulk meter readings to update existing data - Sanitized sql inputs in `copy_readings` * Simplification * EEEJ test fix * add test to test overwrite of bulk meter import --------- Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix filter group dropdown bugs (#4249) Fix for filter group dropdown issues Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add Import Export to Audit Template (#4215) * base for at get buildings * base batch at import functional from frontend button * frontend confirm before upating with at * frontend triggers backend batch update * functional but missing real time progress updates * functional with progress progress is moving, but cant get back to frontend properties updating, progress bar only 50% functional with progress * cleanup * precommit * summary and date formatting * bad credentials guards * test for full at import and property update * precommit * sample buildingsync xml file * swagger documentation * request validation * precommit * comment cleanup * comment cleanup * improve tests and disable update until selection * translate * lokalise translations * function description * update view permissions * clarify error message logic * precommit * add name to at building summary * add at_updated_at to pstate on at import, prevent duplicate uploads * create column on at import to display and compare * include translation * update tests * precommit * precommit * remove translation * build bsync xml from pstate * multiple iterations for xml export * base for batch export to at * add audit_template_report_type to org model * test cleanup * add audit_template_report_type to org model * add at report type to org settings * update batch test * toggle at password visibility * move batch export to celery * export properties to at from inv list actions * backfill org audit_template_report_type * mock tests for export to audit template * phrasing * refactor export results * build out export results table * precommit * revert * precommit * download current lokalise files * add default display field to failed exports * incorporate audit template report type in test * request body to be a dict not list * add translations * update ondelete buildingfile > event > scenarios * remove property name from inventory and expand modal * update states to reflect at_updated * add export to at from inv det actions * precommit * merge develop * migration conflict * Renumber migrations * Small fixes * Privilege enforcement --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix EEEJ analysis errors when there are no lat/long or address (#4247) * fix eeej analysis errors * add eeej to tasks and fix for non-eager celery * Fix for dict key types changing based on ALWAYS_EAGER * fixes! * Simplification --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add envvar to specify loading test EEEJ dataset (#4254) * add envvar to specify loading test EEEJ dataset * slight mod to support strings as boolean values --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Default to excluding Address Line 1 as a matching criteria (#4256) * Default to excluding Address Line 1 for matching * [WIP] Fix some tests * update tests for address_line_1 default matching criteria removal --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Bump version (#4259) * bump versions * current change log * add remaining two PRs before release * Refactor map page for functionality and performance (#4260) * Major map/eeej/layout improvements * Added tract shading, database indices * Fix test failure --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Ross Perry <perryr16@gmail.com> Co-authored-by: ebeers-png <53191386+ebeers-png@users.noreply.github.com> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com>
nllong
added a commit
that referenced
this pull request
Oct 6, 2023
* Remove Deprecated APIs (#4049) * Remove deprecated endpoints * Update tests * Remove additional code related to API v2 * Add ubid_threshold to expected org response * Lock `google-chrome` to v114 (#4165) Lock chrome version to webdriver version * Bump word-wrap from 1.2.3 to 1.2.4 (#4154) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix a few code-formatting issues (#4172) * run autopep to cleanup a few straggling issues * Run precommit against migrations * Cleanup unnecessary logging --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Add Open Street Map to CSP rules (#4169) * add error handling for sf edge case (#4159) add error handldling for sf edge case Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove ID from inventory document display name (#4125) remove id from inventory doc on inv det * Set the MEDIA_ROOT path back to original value during test (#4174) * set the mediaroot path back to where it started * naming * Optimize list analyses endpoint (#4206) * Optimize list analyses endpoint * Add outputfiles back in * Fix * Make it even faster * Move analyses endpoint (#4210) * Add new `create_property` and `update_with_espm` endpoint (#4012) * 179d create_property endpoint * precommit * adding property id, state id, and view id to create response * Partial fixes for handling bad data * Verify property exists and belongs to org * start of new serializer and controlling extra_data fields for 179d * fix property create endpoint * Formatting * fix org_id on column views * add report_format to PM download so spreadsheet can be downloaded * updating BAE and small tweak since assets are now typed * update BAE processing in reader * updating BAE to v0.1.14 * remove uneeded view * Add ESPM download for single property (via API) (#4158) * add single property download method * add viewset for downloading single espm report * fix BAE migration and update swagger schema * rename pm report single to download * update lokalise notes and pull from latest from website * initial commit with a new update with ESPM function. need to get the backend method finished * enable udpate_with_espm * add test and column mapping profile helper to load in the data * fix example file that was downloaded from espm * fix comment formats * file paths * style espm modal and fix both upload methods * put tmp files into the projects media dir * add column mapping profile param to update_with_espm * put tmp files into the projects media dir * add status to dresponse for pyseed * do not save in media_root * precommit * allow different urls for better and at during testing * return the mapping profile object when creating from file * add tests to ensure read_only fields are protected * Update models.py * Update models.py * - Removed broken `property_id` option - Fixed extra_data columns to only ones that actually apply - Changed `merge_state` from 0 to 1 - Added ValueError handling * Small fixes * Fix 179d ESPM update endpoint to run in foreground with Celery enabled (#4211) * Fixed bae object accessors * create two new methods for running save_raw and map to the foreground * fix type --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Fix display name (#4223) * Fix refresh_metadata (#4221) * Fix refresh_metadata * Rename * Bump uwsgi from 2.0.17.1 to 2.0.22 in /requirements (#4209) Bumps [uwsgi](https://github.com/unbit/uwsgi-docs) from 2.0.17.1 to 2.0.22. - [Commits](https://github.com/unbit/uwsgi-docs/commits) --- updated-dependencies: - dependency-name: uwsgi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove Beta label from text of analysis button (#4225) remove beta from analysis Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meters Without `source_id` (#4229) Fix showing meter readings for meters without `source_id` * Fix performance for fetching analyses and force user email to lowercase (#4213) * Set username to lowercase when updating user info * Removed unnecessary prefetch from analyses retrieval --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * EEEJ Analysis Functionality (#4208) * eeej analysis * precommit * precommit * add EJScreen * update eeej analysis to link to EJScreen report * adding analysis description for eeej * Fix display name * fix for analysis reruns * cleanup * fix eeej tests * cleanup * fix searching for string in a NoneType * set manual geocoding * fix geocode tests and add census to geocode summary * fix typos * geocode with lat/lng over address if available * add copyright text * small doc formatting cleanup * cleanup * oops, missed this formatting --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Show Analysis `debug_message` If Available (#4198) Show analysis debug_message if available Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Use display name in custom reports legend (#4060) * Use display name in custom reports legend * Fix docker compose * Fix Tests * Address comment * Clean --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Allow analysis property view related properties to be null (#4227) * update ondelete buildingfile > event > scenarios * update relationhsip to null when a property is deleted * add warning triangle * remove checkbox to delete analyses with properties * precommit * reorder migrations * reset * remove commit from outside branch * add warning to analyses page * styles * Update migrations --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> * Add more API documentation for meter and meter readings (#4237) * add more api doc info on meter and meter reading endpoints * Improved nested documentation, added swagger support for enums, sorted meter readings --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Update inventory selection to include current inventory type only (#3862) filter selection by current invetory type and return its length Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Update default meter range selection for BETTER analysis (#3819) * Show all navs in org * reverse the default better meter selection * Allow analysis to be by range or cycle * html updates to add cycle to BETTER * revert to allow merge * select cycle for better * update docker-dev better api endpoint * modify valid meter data to accept cycle start and end dates * precommit * formatting * remove console and updat better url * merge conflicts * order * default current cycle to eui and better on select_cycle * Simplified --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Delete BuildingFiles and Related Events on PropertyState delete (#4217) * update ondelete buildingfile > event > scenarios * precommit * delete scenario if event is deleted * cascade over nothing * Renumber migration --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fixed Issues with Scenario/Measure CRUD Operations (#4240) Fixed issues with scenario/measure CRUD operations, cherry-picked from a640926 * Add a cycle indicator to the analysis modal and filter analyses for current cycle (#3837) * expose current cycle on new analysis modal * display analysis associated with cycle * refactor help text * add cycle indicator to analysis_card * syntax * refactor for clarity * add cycle_name to analysis display tables * add cycle dropdown to inventory detail analyses page * find analyses relavent to current cycle * precommit * formatting * remove debug logs * clarifying note * consistency * Fixed ui-router navigation --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Disable ability to remove matching criteria fields once inventory is added (#4222) * update ondelete buildingfile > event > scenarios * base for locked matching criteria * refactor for clarity * remove matching preview from frontend * remove matching preview from backend * translations * precommit * remove unrelated migration * revert * update tests --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add smaller EEEJ data files for testing (#4243) add smaller EEEJ data files for testing * Add Uniformat Table (#4238) * Add uniformat * Minor fixes --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meter Overwrites (#4250) * add test to make sure meter readings do not overwrite * Fixed major bug where inserting a single meter reading would delete any existing readings for any meter with the same start time - Added the ability for inserting bulk meter readings to update existing data - Sanitized sql inputs in `copy_readings` * Simplification * EEEJ test fix * add test to test overwrite of bulk meter import --------- Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix filter group dropdown bugs (#4249) Fix for filter group dropdown issues Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add Import Export to Audit Template (#4215) * base for at get buildings * base batch at import functional from frontend button * frontend confirm before upating with at * frontend triggers backend batch update * functional but missing real time progress updates * functional with progress progress is moving, but cant get back to frontend properties updating, progress bar only 50% functional with progress * cleanup * precommit * summary and date formatting * bad credentials guards * test for full at import and property update * precommit * sample buildingsync xml file * swagger documentation * request validation * precommit * comment cleanup * comment cleanup * improve tests and disable update until selection * translate * lokalise translations * function description * update view permissions * clarify error message logic * precommit * add name to at building summary * add at_updated_at to pstate on at import, prevent duplicate uploads * create column on at import to display and compare * include translation * update tests * precommit * precommit * remove translation * build bsync xml from pstate * multiple iterations for xml export * base for batch export to at * add audit_template_report_type to org model * test cleanup * add audit_template_report_type to org model * add at report type to org settings * update batch test * toggle at password visibility * move batch export to celery * export properties to at from inv list actions * backfill org audit_template_report_type * mock tests for export to audit template * phrasing * refactor export results * build out export results table * precommit * revert * precommit * download current lokalise files * add default display field to failed exports * incorporate audit template report type in test * request body to be a dict not list * add translations * update ondelete buildingfile > event > scenarios * remove property name from inventory and expand modal * update states to reflect at_updated * add export to at from inv det actions * precommit * merge develop * migration conflict * Renumber migrations * Small fixes * Privilege enforcement --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix EEEJ analysis errors when there are no lat/long or address (#4247) * fix eeej analysis errors * add eeej to tasks and fix for non-eager celery * Fix for dict key types changing based on ALWAYS_EAGER * fixes! * Simplification --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add envvar to specify loading test EEEJ dataset (#4254) * add envvar to specify loading test EEEJ dataset * slight mod to support strings as boolean values --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Default to excluding Address Line 1 as a matching criteria (#4256) * Default to excluding Address Line 1 for matching * [WIP] Fix some tests * update tests for address_line_1 default matching criteria removal --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Bump version (#4259) * bump versions * current change log * add remaining two PRs before release * Refactor map page for functionality and performance (#4260) * Major map/eeej/layout improvements * Added tract shading, database indices * Fix test failure * Release 2.20.0 (#4262) Merge main release commit into develop. * Fix the items in the 2.20.0 changelog (#4263) put the latest PRs in the right place * ArcGIS CSP rule (#4265) Add ArcGIS CSP rule * Add documentation for cleaning up conflicting column names during migration (#4264) * add more documentation around cleaning up columns * Update docs/source/migrations.rst Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Update docs/source/migrations.rst Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Update changelog for 2.20.0 (#4268) add 2 remaining items for release * Fix edge case for map label filtering (#4270) Fix ids that are used for map filtering * Update changelog (#4272) one more entry --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Ross Perry <perryr16@gmail.com> Co-authored-by: ebeers-png <53191386+ebeers-png@users.noreply.github.com> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com>
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.
Any background context you want to provide?
Two one-line fixes from BEAM.
User info update: When a SEED user updates their information (name or email), the update method copies the email address to the username but doesn't lower the case, which (at least in BEAM) can prevent the user from successfully logging in. Fixed it by lowering the case (and adding a default empty string just in case).
Analysis fix: This is for the
/api/v3/analyses/{analysis_id}/views/?organization_id={org_id}endpoint, used when viewing the details for an analysis at the.../app/#/analyses/{analysis_id}page. When fetching the property view data,get_property_viewsappears to prefetch the state for the wrong property view (the view is cloned during the analysis), and that state doesn't seem to be used at all. The prefetching would probably help if it pulled the right state, but I've just removed it for now. See the screenshots below.Screenshots (if appropriate)
Tested the prefetching by looking up a successful CO2 analysis and a failed EUI analysis. With a successful analysis, prefetching doesn't save us much time, and it doesn't look like the prefetched state is even used. Note the different state IDs that are queried for.
With prefetch related (the larger turquoise bar is the state being prefetched):
Without prefetch related:
For some reason when looking at a failed analysis, the prefetch causes the whole inventory to get pulled. Removing the prefetch prevents this.
With prefetch:
Without prefetch:
