Simplify and refactor SiteData, removing unused code
#1989
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
pellaea
reviewed
Mar 2, 2024
app/classes/site_data.rb
Outdated
| # !(obs.specimen && obs.notes.to_s.length >= 10 && | ||
| # obs.thumb_image_id.to_i.positive?) | ||
| # end | ||
| # }.freeze | ||
|
|
There was a problem hiding this comment.
Feel free to erase these completely, they'd be easy to reconstruct anyway.
app/classes/site_data.rb
Outdated
| case mode | ||
| when :del | ||
| -weight | ||
| when :chg | ||
| get_weight_change(obj, field) | ||
| 0 # get_weight_change(obj, field) |
There was a problem hiding this comment.
What is this case for? Do we ever actually use it?
app/classes/site_data.rb
Outdated
| # def self.get_weight_change(obj, new_field) | ||
| # old_field = new_field | ||
| # FIELD_WEIGHTS[new_field] - FIELD_WEIGHTS[old_field] | ||
| # end |
app/classes/site_data.rb
Outdated
| # end | ||
|
|
||
| @user_id = id.to_i | ||
| user = User.find(id) | ||
|
|
||
| # Prime @user_data structure. | ||
| @user_data = {} |
There was a problem hiding this comment.
This is fishy. Either this is never called on multiple users, in which case @user_data doesn't need to be a hash, or it is called on multiple users, in which case shouldn't this is @user_data ||= {}? As it is, it clobbers the hash each time and sticks a single user in it.
nimmolo
commented
Mar 4, 2024
| # Add some extra stats. | ||
| @site_data[:observed_taxa] = Observation.distinct.count(:name_id) | ||
| @site_data[:listed_taxa] = Name.count | ||
|
|
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.
Trying to get a handle on the confusing logic of this class, prior to writing a table to store the data.
observations_with_voucherandobservations_without_voucher. These cases required SiteData to account for much more complex logic. The logic somehow was implemented, but is always bypassed in code execution. I'm getting rid of it; it makes the code harder to read and refactor. Those fields can be rebuilt when the code here is simpler, if desired.