Chore/ruby 3409 mongoid reference one #1574
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
brujeo
reviewed
Oct 10, 2024
Comment on lines
26
to
48
| %w[contact postal registered].each do |address_type| | ||
|
|
||
| define_method(:"#{address_type}_address") do | ||
| # handle synonyms | ||
| address_type = "postal" if address_type == "contact" | ||
|
|
||
| addresses.where(address_type: address_type.upcase).first | ||
| end | ||
|
|
||
| define_method(:"#{address_type}_address=") do |address| | ||
| # handle synonyms | ||
| address_type = "postal" if address_type == "contact" | ||
|
|
||
| unless address.blank? || address.address_type == address_type.upcase | ||
| raise ArgumentError, "Attempted to set #{address_type} address with address of type #{address.address_type}" | ||
| end | ||
|
|
||
| # clear any existing address of this type | ||
| addresses.where(address_type: address_type.upcase).first&.destroy! | ||
|
|
||
| addresses << address | ||
| end | ||
| end |
There was a problem hiding this comment.
I don't think this matches what was there before.
Previously, we had
contact_address -> address_type: POSTAL
company_address -> address_type: REGISTERED
registered_address -> address_type: REGISTERED
Now we have
contact_address -> address_type: POSTAL
postal_address -> address_type: POSTAL
registered_address -> address_type: REGISTERED
Please double check if code is correct
There was a problem hiding this comment.
I agree postal_address is redundant. The rest looks correct - company_address is no more.
PaulDoyle-EA
force-pushed
the
chore/RUBY-3409_mongoid_reference_one
branch
from
bf5807f to
1454317
Compare
brujeo
approved these changes
Oct 17, 2024
jjromeo
added a commit
that referenced
this pull request
Oct 17, 2024
…ute copying - Removed unused parameters `embedded_documents` and `attributes_to_exclude` from the `SafeCopyAttributesService`. - Simplified the logic for copying attributes, focusing on filtering and processing embedded documents directly within the `copy_attributes` method. - Updated related specs to reflect changes in the service, ensuring correct attributes are copied and non-existent attributes are excluded. [RUBY-3387] Implement exclusion of attributes in SafeCopyAttributesService - Updated `SafeCopyAttributesService` to allow exclusion of specified attributes during the copy process. - Modified `can_copy_data_from_registration` to pass `attributes_to_exclude` option. - Enhanced `filter_attributes` method to exclude specified attributes. - Adjusted tests in `safe_copy_attributes_service_spec` to cover new exclusion functionality. - Removed redundant embedded document copying logic from `past_registration` and `registration_completion_service`. [RUBY-3387] Fix duplicate storage of govpay status in `SafeCopyAttributesService` - Updated the service to correctly handle source relation data with both camelCase and snake_case keys. - Adjusted the logic to prevent storing attributes not present on the model, specifically `govpayStatus`. - Enhanced tests to verify that `govpayStatus` is not included in the result while valid attributes like `currency` are correctly processed. [RUBY-3387] Rubocop changes - Corrected the logic to prevent `govpayStatus` from being stored twice by refining the attribute matching process. - Improved code readability by adding parentheses for variable assignments within conditional statements. - Removed redundant code and fixed indentation issues. - Updated tests to reflect changes in attribute presence checks, ensuring `govpayStatus` is not included if not present in the order model. [RUBY-3387] Refactor attribute copying in `SafeCopyAttributesService` - Simplified the `copy_attributes` method to improve readability and maintainability. - Introduced `extract_attributes`, `filter_attributes`, and `process_embedded_relations` helper methods for better structure. - Enhanced handling of embedded relations by adding `find_relation_data` to support different naming conventions. - Improved error handling for unsupported source types. [RUBY-3387] Fix duplicate storage of `govpayStatus` in SafeCopyAttributesService - Updated `SafeCopyAttributesService` to exclude relations specified in `attributes_to_exclude` when copying attributes. - Refactored method to find matching attribute keys based on naming conventions. - Added tests to ensure excluded relations are not copied and that copyable attributes are correctly included. [RUBY-3387] Fix attribute comparison in specs to ignore `_id` field Updated tests in `past_registration_spec.rb` and `registration_completion_service_spec.rb` to compare attributes excluding the `_id` field as new implementation of SafeCopyAttributes does not copy the id field of the embedded documents like the old one did Chore/ruby 3409 mongoid reference one (#1574) https://eaflood.atlassian.net/browse/RUBY-3409 [RUBY-3387] Update spec to reference registered address as company address was removed [RUBY-3387] Add documentation to `SafeCopyAttributesService` in `safe_copy_attributes_service.rb` Enhanced the `SafeCopyAttributesService` with detailed comments explaining its functionality, including how it safely copies attributes between instances and handles embedded relations.
jjromeo
added a commit
that referenced
this pull request
Oct 17, 2024
…feCopyAttributesService` - Implement `safe_copy_attributes` method to handle attribute copying more efficiently. - Introduce private helper methods `get_attributes`, `filter_attributes`, and `find_embedded_relation` to modularize logic. - Update specs to cover new functionality, including handling of Hash and BSON::Document sources. - Ensure only valid attributes are copied, and embedded documents are processed correctly. [RUBY-3387] Refactor `SafeCopyAttributesService` to streamline attribute copying - Removed unused parameters `embedded_documents` and `attributes_to_exclude` from the `SafeCopyAttributesService`. - Simplified the logic for copying attributes, focusing on filtering and processing embedded documents directly within the `copy_attributes` method. - Updated related specs to reflect changes in the service, ensuring correct attributes are copied and non-existent attributes are excluded. [RUBY-3387] Implement exclusion of attributes in SafeCopyAttributesService - Updated `SafeCopyAttributesService` to allow exclusion of specified attributes during the copy process. - Modified `can_copy_data_from_registration` to pass `attributes_to_exclude` option. - Enhanced `filter_attributes` method to exclude specified attributes. - Adjusted tests in `safe_copy_attributes_service_spec` to cover new exclusion functionality. - Removed redundant embedded document copying logic from `past_registration` and `registration_completion_service`. [RUBY-3387] Fix duplicate storage of govpay status in `SafeCopyAttributesService` - Updated the service to correctly handle source relation data with both camelCase and snake_case keys. - Adjusted the logic to prevent storing attributes not present on the model, specifically `govpayStatus`. - Enhanced tests to verify that `govpayStatus` is not included in the result while valid attributes like `currency` are correctly processed. [RUBY-3387] Rubocop changes - Corrected the logic to prevent `govpayStatus` from being stored twice by refining the attribute matching process. - Improved code readability by adding parentheses for variable assignments within conditional statements. - Removed redundant code and fixed indentation issues. - Updated tests to reflect changes in attribute presence checks, ensuring `govpayStatus` is not included if not present in the order model. [RUBY-3387] Refactor attribute copying in `SafeCopyAttributesService` - Simplified the `copy_attributes` method to improve readability and maintainability. - Introduced `extract_attributes`, `filter_attributes`, and `process_embedded_relations` helper methods for better structure. - Enhanced handling of embedded relations by adding `find_relation_data` to support different naming conventions. - Improved error handling for unsupported source types. [RUBY-3387] Fix duplicate storage of `govpayStatus` in SafeCopyAttributesService - Updated `SafeCopyAttributesService` to exclude relations specified in `attributes_to_exclude` when copying attributes. - Refactored method to find matching attribute keys based on naming conventions. - Added tests to ensure excluded relations are not copied and that copyable attributes are correctly included. [RUBY-3387] Fix attribute comparison in specs to ignore `_id` field Updated tests in `past_registration_spec.rb` and `registration_completion_service_spec.rb` to compare attributes excluding the `_id` field as new implementation of SafeCopyAttributes does not copy the id field of the embedded documents like the old one did Chore/ruby 3409 mongoid reference one (#1574) https://eaflood.atlassian.net/browse/RUBY-3409 [RUBY-3387] Update spec to reference registered address as company address was removed [RUBY-3387] Add documentation to `SafeCopyAttributesService` in `safe_copy_attributes_service.rb` Enhanced the `SafeCopyAttributesService` with detailed comments explaining its functionality, including how it safely copies attributes between instances and handles embedded relations.
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.
This removes an obsolete custom
can_reference_single_document_in_collectionassociation workaround in favour of more conventional Rails/mongoid structures.It also retires the use of
company_addresson the Address model, in favour of the existing and preferredregistered_address. Note that no data changes are required as part of this change.https://eaflood.atlassian.net/browse/RUBY-3409