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.

Sign up for GitHub

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

Jump to bottom

Delegate to MarriageAbroadDataQuery from MarriageAbroadCalculator #2346

Merged
merged 28 commits into from
Mar 9, 2016
Merged

Delegate to MarriageAbroadDataQuery from MarriageAbroadCalculator #2346

merged 28 commits into from
Mar 9, 2016

Conversation

chrisroos
Copy link
Contributor

This supersedes PRs #2298 and #2316.

My main motivation in this branch is to have a single object that encapsulates all the logic required by the marriage-abroad flow and views. I've updated the flow and views so that we always access methods on MarriageAbroadDataQuery via their wrapper methods on MarriageAbroadCalculator.

In PR #2298 I'd started to rename some of the methods in an attempt to better reflect their purpose. This was proving quite difficult so I'm now using the original MarrageAbroadDataQuery method names in most cases.

This branch was reviewed in both #2298 and #2316 and has now been rebased on master. I'm going to merge once the tests pass.

chrisroos added 28 commits March 9, 2016 10:35
@chrisroos
Use multiple lines for long conditionals in marriage-abroad
eb26cbf 
I think this is going to make it easier to make changes as I move
methods move from the `MarriageAbroadDataQuery` to the
`MarriageAbroadCalculator`.
@chrisroos
Remove unnecessary parenthesis
5b316c5
@chrisroos
Add #ceremony_country_is_french_overseas_territory?
5fc2335 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.
@chrisroos
Add #opposite_sex_consular_cni_country?
10e53fb 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #opposite_sex_consular_cni_in_nearby_country?
ec6de12 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #opposite_sex_no_marriage_related_consular_services_in_ceremony_c…
48cbaec 
…ountry?

I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.
@chrisroos
Add #opposite_sex_affirmation_country?
ff31e86 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #ceremony_country_in_the_commonwealth?
5ce3c9b 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

Interestingly we have another, different, concept of Commonwealth
countries in `RegistrationsDataQuery`. I've made a separate note to
investigate that.
@chrisroos
Add #ceremony_country_is_british_overseas_territory?
6a8ecab 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.
@chrisroos
Add #opposite_sex_no_consular_cni_country?
fa0b2ff 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #opposite_sex_marriage_via_local_authorities?
7c3c6f5 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #opposite_sex_in_other_countries?
b2449b5 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #same_sex_ceremony_country_unknown_or_has_no_embassies?
b7fca43 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.

For reference, the `#ss_unknown_no_embassies?` method was introduced in
6a9a7b8.
@chrisroos
Add #same_sex_marriage_not_possible?
7ffce09 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.
@chrisroos
Add #same_sex_marriage_country?
68cda9c 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #same_sex_marriage_country_when_couple_british?
8d901a4 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #same_sex_marriage_and_civil_partnership?
a076dc5 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #civil_partnership_equivalent_country?
810ba28 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #civil_partnership_cni_not_required_country?
3b88207 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #civil_partnership_consular_country?
da23c04 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #country_without_consular_facilities?
ddac80a 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #opposite_sex_21_days_residency_required?
541a6a2 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #ceremony_country_is_dutch_caribbean_island?
1219b58 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.
@chrisroos
Add #requires_7_day_notice?
8f83849 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Add #same_sex_alt_fees_table_country?
0dbd941 
I want the `MarriageAbroadCalculator` to encapsulate all the logic
required by the flow and views. Delegating to the
`MarriageAbroadDataQuery` for this method is a step toward that goal.

I'm sure the name of this method can be improved but I'm not 100% sure
what it means at the moment, so the renaming will have to wait.
@chrisroos
Avoid passing data_query unnecessarily
cc35a83 
The _what_you_need_to_do partial doesn't use `data_query`.
@chrisroos
Remove data_query from marriage-abroad flow
7fc0dec 
All access of the `MarriageAbroadDataQuery` is now done via the
`MarriageAbroadCalculator` so we no longer need to instantiate this
`data_query` in the flow.
@chrisroos
Update checksum data for marriage-abroad
021d901 
All regression tests are passing so I'm happy to update the checksum
data.

Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
    marriage-abroad
@chrisroos chrisroos mentioned this pull request Mar 9, 2016
Closed
chrisroos added a commit that referenced this pull request Mar 9, 2016
@chrisroos
Merge pull request #2346 from alphagov/delegate-to-marriage-abroad-da…
baae500 
…ta-query-from-marriage-abroad-calculator

Delegate to MarriageAbroadDataQuery from MarriageAbroadCalculator
@chrisroos chrisroos merged commit baae500 into master Mar 9, 2016
@chrisroos chrisroos deleted the delegate-to-marriage-abroad-data-query-from-marriage-abroad-calculator branch March 9, 2016 00:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@chrisroos