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 #2316

Closed
wants to merge 28 commits into from
Closed

Delegate to MarriageAbroadDataQuery from MarriageAbroadCalculator #2316

wants to merge 28 commits into from
+422 −97

Conversation

chrisroos
Copy link
Contributor

This has been superseded by PR #2346.

This was initially opened as WIP PR #2298.

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.

@chrisroos
Use multiple lines for long conditionals in marriage-abroad
8e0a4f0 
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
2b59646
@chrisroos
Add #ceremony_country_is_french_overseas_territory?
494b8d6 
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?
fed99d2 
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?
0894e7c 
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…
93c77dd 
…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?
e5155a0 
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?
93fe870 
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?
84bdc8f 
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?
a07799b 
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?
eed271a 
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?
5f764b7 
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?
db5cf6e 
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?
8e48c41 
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?
c6a3ee8 
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?
d55fe8b 
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?
32eced2 
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?
a678a13 
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?
f9522c7 
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?
647bbee 
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?
df419ff 
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?
f1040c5 
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?
c5a81cf 
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?
e7f03be 
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?
68f5a74 
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
6680446 
The _what_you_need_to_do partial doesn't use `data_query`.
@chrisroos
Remove data_query from marriage-abroad flow
87b620a 
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
116ea33 
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
@floehopper floehopper self-assigned this Mar 1, 2016
@floehopper
Copy link
Contributor

Given that I originally reviewed #2298, I haven't reviewed this in as much detail - in fact I wasn't sure whether you wanted it to be reviewed. However, as far as I can see this looks good to me.

@floehopper floehopper added the LGTM label Mar 1, 2016
@chrisroos
Copy link
Contributor Author

Apologies for leaving this open for so long. I'm getting back to it now with the aim of getting it rebased and merged to master.

@chrisroos
Copy link
Contributor Author

Given that I originally reviewed #2298, I haven't reviewed this in as much detail - in fact I wasn't sure whether you wanted it to be reviewed. However, as far as I can see this looks good to me.

@floehopper: Thanks for reviewing this PR, and apologies for not being clearer that I wanted it reviewed again.

@chrisroos
Copy link
Contributor Author

I'm going to close this PR and then open a new PR now that I've rebased this branch on master.

@chrisroos chrisroos closed this Mar 9, 2016
@chrisroos chrisroos deleted the delegate-to-marriage-abroad-data-query-from-marriage-abroad-calculator branch March 9, 2016 00:23
@chrisroos chrisroos mentioned this pull request Mar 9, 2016
Merged
@chrisroos
Copy link
Contributor Author

This has been superseded by PR #2346.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@floehopper floehopper

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@chrisroos @floehopper