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

Refactor business rules #2965

Merged
merged 58 commits into from
May 19, 2023
Merged

Refactor business rules #2965

merged 58 commits into from
May 19, 2023

Conversation

melton-jason
Copy link
Contributor

@melton-jason melton-jason commented Feb 10, 2023 •
edited
Loading

Addresses #2924

Priorites

  • Refactored all non-interaction business rules
  • Implement a uniqueness rule system that is respected by the front/back end
  • Refactor interaction business rules
  • Create type for Uniqueness Rules
  • Allow dismissing BussinessRule errors
  • Add code comments
  • Create/modify business rule tests
  • Fix typescript errors

@melton-jason
Add missing UniquenessRules
047b17a 
Fixes #2260

Adds the following Uniqueness Rules:

Of the form:
Table.field -> uniqueIn

CollectingEvent.uniqueidentifier -> discipline
CollectionObject.uniqueidentifier -> collection
DisposalAgent.role/agent -> disposal
Extractor.agent -> dnasequence
Fundingagent.agentt -> collectingtrip
Locality.uniqueidentifier -> discipline
LocalityCitation.referencework -> locality
PcrPerson.agent -> dnasequence
Specifyuser.name -> (DATABASE)
@melton-jason
Remove _ dependency from businessRule files
c810ea8
@melton-jason
Remove unnecessary _this statements
1d09705 
Also, fix a bug where uniqueness rules containing more than one field
were not registering the `otherField`
melton-jason
melton-jason commented Feb 27, 2023
View reviewed changes
Copy link
Contributor Author

@melton-jason melton-jason left a comment •
edited by maxpatiiuk
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maxpatiiuk
If you have a moment, could you take a look at this error? I can not seem to resolve it.
The intended behavior makes sense to me conceptually, but there could easily be some Typescript syntax I am overlooking. Thank you in advance!

specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts Outdated Show resolved Hide resolved
maxpatiiuk
maxpatiiuk requested changes Mar 1, 2023
View reviewed changes
specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts Outdated Show resolved Hide resolved
specifyweb/frontend/js_src/lib/components/DataModel/specifyModel.ts Outdated Show resolved Hide resolved
@maxpatiiuk
Copy link
Member

I really like the changes you are doing! Keep it going

@specifysoftware
Copy link

This pull request has been mentioned on Specify Community Forum. There might be relevant details there:

https://discourse.specifysoftware.org/t/workbench-data-set-validation-error-more-than-one-picklist-in-specify-7/1080/4

@maxpatiiuk maxpatiiuk mentioned this pull request Apr 28, 2023
Merged
melton-jason and others added 22 commits May 17, 2023 08:30
@melton-jason
Fix remaining Typescript errors
25997e2
@melton-jason
Add static division for tests
4fdd0e1
@melton-jason
Add overrideAjax calls to fix failing unit tests
a056fec 
This is primarily to test the scope of the failing tests.
The calls will most likely ned to be added in
lib/tests/ajax/static if declaring the overrides in this way does not work
@melton-jason
Modify getUniqueFields to follow new UniquenessRules format
243ee0b
@melton-jason
Add static files to address failing tests
2245448
@melton-jason
Change resource tests to accomadate new uniqueness rules
e846ab1
@melton-jason
Add unique fields in fields to not clone test
2498fca
@melton-jason
Fix CollectionObject not being defined for schema.models in business …
e23a148 
…rule test
@melton-jason
Add overrideAjax to all resources in business rule tests
d130369
@maxpatiiuk @melton-jason
Remove redundant text-left classNames
fb3389f 
They became redundant because of fc00e2b
@melton-jason
Cleanup manual overrdieAjax resources in business rule tests
86de81a
@melton-jason
Move resource creation into test block from describe block
11c329e
@melton-jason
Move determination resource creation into test() blocks
313914e
@melton-jason
Move all overrideAjax calls to describe() scope
b5ddfe4
@melton-jason
Add missing getResourceApiUrl in overrideAjax call
8c71c70
@melton-jason
Save original permit before checking for duplicate in businessRule tests
05bd279
@melton-jason
Add fields to resources for uniqueness rule tests
f7ecb0e
@melton-jason
Move overrideAjax calls outside if describe() blocks
a5a3c2e
@melton-jason
Rename toOneField to scope
672f283
@melton-jason
Manually specify resource api url
73c0b84
@melton-jason
Add static file ajax tests
60da04b
@melton-jason
Address code comments
b9eeea0
@maxpatiiuk maxpatiiuk changed the base branch from production to agent-merging May 19, 2023 14:42
@maxpatiiuk maxpatiiuk merged commit 4ad9b94 into agent-merging May 19, 2023
@maxpatiiuk maxpatiiuk deleted the refactor-busrules branch May 19, 2023 15:08
@grantfitzsimmons grantfitzsimmons mentioned this pull request Aug 6, 2023
Closed
@melton-jason melton-jason mentioned this pull request Aug 16, 2023
Closed
@melton-jason melton-jason mentioned this pull request Jan 10, 2024
Closed
@melton-jason melton-jason mentioned this pull request Jan 21, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxpatiiuk maxpatiiuk maxpatiiuk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Django error on duplicate CO.uniqueIdentifier
3 participants
@melton-jason @maxpatiiuk @specifysoftware