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.

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

Make period_type mandatory for MembershipType #18395

Merged
merged 1 commit into from
Sep 10, 2020

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Sep 7, 2020

Overview

We have a test ensuring period_type is mandatory at the api level. However, it isn't for api
v4 - the error is a different issue (handling of pseudoconstants when mapping v3 to v4). This
fixes that separate issue & declares required to re-fix for v4

Before

period_type not declared as mandatory (but has a db default of rolling). In apiv3 & form layer it is mandatory, but not apiv4

After

period_type declared as mandatory (but has a db default of rolling), required in apiv3, v4, form layer

Technical Details

Test came from https://issues.civicrm.org/jira/browse/CRM-20010 - I think re-reading this it is probably right to make it mandatory & use the default less

Comments

Came from test issues in #18388

@civibot
Copy link

civibot bot commented Sep 7, 2020

(Standard links)

@seamuslee001
Copy link
Contributor

style issue

@eileenmcnaughton
Copy link
Contributor Author

Hmm - the failure changes with #18365 merged as the test no longer uses the same setup - I will see if I can get that merged first

@mattwire
Copy link
Contributor

mattwire commented Sep 7, 2020

@eileenmcnaughton Test failures relate

@eileenmcnaughton
Copy link
Contributor Author

I'm going to close this for now because it's blocked until I can resolve the test failures - but it needs #18365

I don't want to clog up the review queue with PRs that are not reviewable so I'll re-open this when the blocking-issues are solved

@colemanw colemanw reopened this Sep 8, 2020
@colemanw
Copy link
Member

colemanw commented Sep 8, 2020

@eileenmcnaughton needs rebase

@eileenmcnaughton
Copy link
Contributor Author

@colemanw rebased now - let's see how it goes....

eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Sep 9, 2020
This converts the test set up to use the api and also does some mild date clean up on the form.

Supports civicrm#18395
@eileenmcnaughton
Copy link
Contributor Author

OK - this cleanup should address #18413

eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Sep 9, 2020
This converts the test set up to use the api and also does some mild date clean up on the form.

Supports civicrm#18395
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Sep 9, 2020
This converts the test set up to use the api and also does some mild date clean up on the form.

Supports civicrm#18395
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Sep 9, 2020
This converts the test set up to use the api and also does some mild date clean up on the form.

Supports civicrm#18395
We have a test ensuring period_type is mandatory at the api level. However, it isn't for api
v4 - the error is a different issue (handling of pseudoconstants when mapping v3 to v4). This
fixes that separate issue & declares required to re-fix for v4
@eileenmcnaughton
Copy link
Contributor Author

This is passing now

@seamuslee001
Copy link
Contributor

Looks fine to me merging

@seamuslee001 seamuslee001 merged commit 280245d into civicrm:master Sep 10, 2020
@seamuslee001 seamuslee001 deleted the memtype branch September 10, 2020 01:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants