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

CM-113: add group to django orm #3

Merged
merged 7 commits into from
Jun 12, 2023
Merged

CM-113: add group to django orm #3

merged 7 commits into from
Jun 12, 2023

Conversation

jdolkowski
Copy link
Contributor

@jdolkowski jdolkowski commented Jun 2, 2023

https://openimis.atlassian.net/browse/CM-113

It changes variable name used in social_protection module so it is required to also merge this: openimis/openimis-be-social_protection_py#8

Copy link
Contributor

@dborowiecki dborowiecki left a comment

Choose a reason for hiding this comment

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

Code looks fine but I think we should add new mutation that will take Individuals uuid's as an input and then based on that it'll create groups (I believe that current solution requires us to at first create group and then call create_group_individual for all members, which requires multiple calls, "transactions" on frontend and is not very intuitive).

individual/apps.py Show resolved Hide resolved
individual/schema.py Outdated Show resolved Hide resolved
@jdolkowski jdolkowski requested a review from dborowiecki June 5, 2023 10:07
@jdolkowski
Copy link
Contributor Author

The mutation has been added.

individual/services.py Outdated Show resolved Hide resolved
individual/services.py Outdated Show resolved Hide resolved
individual/services.py Outdated Show resolved Hide resolved
@jdolkowski jdolkowski requested a review from dborowiecki June 12, 2023 14:17
@jdolkowski jdolkowski merged commit b4e7329 into develop Jun 12, 2023
@dborowiecki dborowiecki deleted the feature/CM-113 branch June 12, 2023 14:33
dborowiecki added a commit that referenced this pull request Jul 31, 2023
* CM-17 Added module, Individual + gql

* CM-17 Added missing filters for Individual gql

* CM-17 Added service tests

* CM-17 Updated Readme

* CM-17 Added service signals

* CM-17 routed gql mutations through service

* CM-17 Update github workflow

* CM-17 Added IndividualDataSource

* hotfix: fixed gql schema - fk reference (#2)

* Added automatic deployment

* Rename workflow

* CM-113: add group to django orm (#3)

* CM-113: add group to django orm

* CM-113: fix tests

* CM-113: add missing imports

* CM-113: add CreateGroupFromMultipleIndividualsMutation

* CM-113: add group perms to admin migration

* CM-113: add update group individuals

* CM-113: add locale

* Fixed CD

* CM-108: update schema gor group detail view (#4)

* CM-105: add export groups (#6)

* CM-29: add individual export (#7)

* CM-108: fix filtering individuals by groupId (#8)

* CM-108: return only distinct results of query (#10)

* CM-108: update schema gor group detail view

* CM-108: fix fitlering individuals by groupId

* CM-108: return only distinct query results

* CM-162: added custom filters for individual (#9)

* CM-105: add default value for json_ext in individual module (#11)

* CM-105: add export groups

* CM-105: add default value for json_ext

* CM-105: remove json_ext from input type

* CM-19: Create an endpoint for "Beneficiary" import using unstructured CSV/XLSX files (#12)

* CM-19 Added IndividualDataSourceUpload, moved source_name and source_type

* CM-19 Updated gql query models

* CM-19 Added status and error fields to IndividualDataSourceUpload

* Fixed migration issues

* CM-48: add roles management to group_individuals (#13)

* C-235: Added postgres tests execution (#14)

* CM-134: add jsonExt to create/update individual mutation (#15)

* CM-134: add jsonExt to create/update individual mutation

* CM-134: removal of redundant declaration

* CM-250: remove individual field from beneficiar upload model (#16)

* Update README.md (#17)

* CM-256: Add sonar-project.properties (#18)

* CM-256: Added report (#19)

* CM-256: Added report

* CM-256: Updated CI workflow

* CM-256: Restored psql db engine

* CM-256: Changed coverage execution command (#20)

* Changes sources for coverage and flake8

* Changed command for coverage run

* Removed dir from sonar cloud scan

* Changed paths for sonar

* Changed module report paths to match requiremenst

* Test Commit

---------

Co-authored-by: Kamil Malinowski <kmalinowski@soldevelo.com>
Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Kamil Malinowski <malinowskikam96@gmail.com>
Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com>
delcroip added a commit that referenced this pull request Dec 6, 2023
* Develop (#21)

* CM-17 Added module, Individual + gql

* CM-17 Added missing filters for Individual gql

* CM-17 Added service tests

* CM-17 Updated Readme

* CM-17 Added service signals

* CM-17 routed gql mutations through service

* CM-17 Update github workflow

* CM-17 Added IndividualDataSource

* hotfix: fixed gql schema - fk reference (#2)

* Added automatic deployment

* Rename workflow

* CM-113: add group to django orm (#3)

* CM-113: add group to django orm

* CM-113: fix tests

* CM-113: add missing imports

* CM-113: add CreateGroupFromMultipleIndividualsMutation

* CM-113: add group perms to admin migration

* CM-113: add update group individuals

* CM-113: add locale

* Fixed CD

* CM-108: update schema gor group detail view (#4)

* CM-105: add export groups (#6)

* CM-29: add individual export (#7)

* CM-108: fix filtering individuals by groupId (#8)

* CM-108: return only distinct results of query (#10)

* CM-108: update schema gor group detail view

* CM-108: fix fitlering individuals by groupId

* CM-108: return only distinct query results

* CM-162: added custom filters for individual (#9)

* CM-105: add default value for json_ext in individual module (#11)

* CM-105: add export groups

* CM-105: add default value for json_ext

* CM-105: remove json_ext from input type

* CM-19: Create an endpoint for "Beneficiary" import using unstructured CSV/XLSX files (#12)

* CM-19 Added IndividualDataSourceUpload, moved source_name and source_type

* CM-19 Updated gql query models

* CM-19 Added status and error fields to IndividualDataSourceUpload

* Fixed migration issues

* CM-48: add roles management to group_individuals (#13)

* C-235: Added postgres tests execution (#14)

* CM-134: add jsonExt to create/update individual mutation (#15)

* CM-134: add jsonExt to create/update individual mutation

* CM-134: removal of redundant declaration

* CM-250: remove individual field from beneficiar upload model (#16)

* Update README.md (#17)

* CM-256: Add sonar-project.properties (#18)

* CM-256: Added report (#19)

* CM-256: Added report

* CM-256: Updated CI workflow

* CM-256: Restored psql db engine

* CM-256: Changed coverage execution command (#20)

* Changes sources for coverage and flake8

* Changed command for coverage run

* Removed dir from sonar cloud scan

* Changed paths for sonar

* Changed module report paths to match requiremenst

* Test Commit

---------

Co-authored-by: Kamil Malinowski <kmalinowski@soldevelo.com>
Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Kamil Malinowski <malinowskikam96@gmail.com>
Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com>

* Sonar Added (#23)

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Kamil Malinowski <kmalinowski@soldevelo.com>
Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Kamil Malinowski <malinowskikam96@gmail.com>
Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com>
Co-authored-by: Patrick Delcroix <delcroip@gmail.com>
delcroip added a commit that referenced this pull request Dec 16, 2023
* CM-17 Added module, Individual + gql

* CM-17 Added missing filters for Individual gql

* CM-17 Added service tests

* CM-17 Updated Readme

* CM-17 Added service signals

* CM-17 routed gql mutations through service

* CM-17 Update github workflow

* CM-17 Added IndividualDataSource

* hotfix: fixed gql schema - fk reference (#2)

* Added automatic deployment

* Rename workflow

* CM-113: add group to django orm (#3)

* CM-113: add group to django orm

* CM-113: fix tests

* CM-113: add missing imports

* CM-113: add CreateGroupFromMultipleIndividualsMutation

* CM-113: add group perms to admin migration

* CM-113: add update group individuals

* CM-113: add locale

* Fixed CD

* CM-108: update schema gor group detail view (#4)

* CM-105: add export groups (#6)

* CM-29: add individual export (#7)

* CM-108: fix filtering individuals by groupId (#8)

* CM-108: return only distinct results of query (#10)

* CM-108: update schema gor group detail view

* CM-108: fix fitlering individuals by groupId

* CM-108: return only distinct query results

* CM-162: added custom filters for individual (#9)

* CM-105: add default value for json_ext in individual module (#11)

* CM-105: add export groups

* CM-105: add default value for json_ext

* CM-105: remove json_ext from input type

* CM-19: Create an endpoint for "Beneficiary" import using unstructured CSV/XLSX files (#12)

* CM-19 Added IndividualDataSourceUpload, moved source_name and source_type

* CM-19 Updated gql query models

* CM-19 Added status and error fields to IndividualDataSourceUpload

* Fixed migration issues

* CM-48: add roles management to group_individuals (#13)

* C-235: Added postgres tests execution (#14)

* CM-134: add jsonExt to create/update individual mutation (#15)

* CM-134: add jsonExt to create/update individual mutation

* CM-134: removal of redundant declaration

* CM-250: remove individual field from beneficiar upload model (#16)

* Update README.md (#17)

* CM-256: Add sonar-project.properties (#18)

* CM-256: Added report (#19)

* CM-256: Added report

* CM-256: Updated CI workflow

* CM-256: Restored psql db engine

* CM-256: Changed coverage execution command (#20)

* Changes sources for coverage and flake8

* Changed command for coverage run

* Removed dir from sonar cloud scan

* Changed paths for sonar

* Changed module report paths to match requiremenst

* Test Commit

* Persist coverage and flake report

* Used sed to replace site-package paths

* Used sed to replace site-package paths

* Used sed to replace site-package paths

* Changed pattern in coverage.xml report

* Fixed cat path

* Fixed cat path

* Fixed cat path

* Fixed cat path

* Fixed cat path

* Fixed cat path

* Fixed cat path

* MERGING RELEASE branches (#26)

* CI Update for openimis-be-individual_py (#22)

* CI update

* CI update 2

* CI Update 2

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* MERGING RELEASE branches (#27)

* CI Update for openimis-be-individual_py (#22)

* CI update

* CI update 2

* CI Update 2

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* MERGING RELEASE branches (#29)

* Develop (#21)

* CM-17 Added module, Individual + gql

* CM-17 Added missing filters for Individual gql

* CM-17 Added service tests

* CM-17 Updated Readme

* CM-17 Added service signals

* CM-17 routed gql mutations through service

* CM-17 Update github workflow

* CM-17 Added IndividualDataSource

* hotfix: fixed gql schema - fk reference (#2)

* Added automatic deployment

* Rename workflow

* CM-113: add group to django orm (#3)

* CM-113: add group to django orm

* CM-113: fix tests

* CM-113: add missing imports

* CM-113: add CreateGroupFromMultipleIndividualsMutation

* CM-113: add group perms to admin migration

* CM-113: add update group individuals

* CM-113: add locale

* Fixed CD

* CM-108: update schema gor group detail view (#4)

* CM-105: add export groups (#6)

* CM-29: add individual export (#7)

* CM-108: fix filtering individuals by groupId (#8)

* CM-108: return only distinct results of query (#10)

* CM-108: update schema gor group detail view

* CM-108: fix fitlering individuals by groupId

* CM-108: return only distinct query results

* CM-162: added custom filters for individual (#9)

* CM-105: add default value for json_ext in individual module (#11)

* CM-105: add export groups

* CM-105: add default value for json_ext

* CM-105: remove json_ext from input type

* CM-19: Create an endpoint for "Beneficiary" import using unstructured CSV/XLSX files (#12)

* CM-19 Added IndividualDataSourceUpload, moved source_name and source_type

* CM-19 Updated gql query models

* CM-19 Added status and error fields to IndividualDataSourceUpload

* Fixed migration issues

* CM-48: add roles management to group_individuals (#13)

* C-235: Added postgres tests execution (#14)

* CM-134: add jsonExt to create/update individual mutation (#15)

* CM-134: add jsonExt to create/update individual mutation

* CM-134: removal of redundant declaration

* CM-250: remove individual field from beneficiar upload model (#16)

* Update README.md (#17)

* CM-256: Add sonar-project.properties (#18)

* CM-256: Added report (#19)

* CM-256: Added report

* CM-256: Updated CI workflow

* CM-256: Restored psql db engine

* CM-256: Changed coverage execution command (#20)

* Changes sources for coverage and flake8

* Changed command for coverage run

* Removed dir from sonar cloud scan

* Changed paths for sonar

* Changed module report paths to match requiremenst

* Test Commit

---------

Co-authored-by: Kamil Malinowski <kmalinowski@soldevelo.com>
Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Kamil Malinowski <malinowskikam96@gmail.com>
Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com>

* Sonar Added (#23)

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Kamil Malinowski <kmalinowski@soldevelo.com>
Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Kamil Malinowski <malinowskikam96@gmail.com>
Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com>
Co-authored-by: Patrick Delcroix <delcroip@gmail.com>

* MERGING develop into release/23.10 (#30)

* CI Update for openimis-be-individual_py (#22)

* CI update

* CI update 2

* CI Update 2

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* MERGING RELEASE branches (#28)

* MERGING RELEASE branches (#26)

* CI Update for openimis-be-individual_py (#22)

* CI update

* CI update 2

* CI Update 2

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* MERGING RELEASE branches (#27)

* CI Update for openimis-be-individual_py (#22)

* CI update

* CI update 2

* CI Update 2

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>
Co-authored-by: Patrick Delcroix <delcroip@gmail.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>
Co-authored-by: Dragos DOBRE <dragos.dobre@swisstph.ch>

* MERGING develop into release/23.10 (#31)

* CI Update for openimis-be-individual_py (#22)

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* MERGING RELEASE branches (#28)

* MERGING RELEASE branches (#26)

* CI Update for openimis-be-individual_py (#22)

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* MERGING RELEASE branches (#27)

* CI Update for openimis-be-individual_py (#22)

* CI update

* CI update 2

* CI Update 2

* CM-295: get head of the group (#24)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-296: add cusotm filters for individuals and groups (#25)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>
Co-authored-by: Patrick Delcroix <delcroip@gmail.com>

---------

Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>
Co-authored-by: Dragos DOBRE <dragos.dobre@swisstph.ch>

---------

Co-authored-by: Kamil Malinowski <kmalinowski@soldevelo.com>
Co-authored-by: Damian Borowiecki <dborowiecki7@gmail.com>
Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com>
Co-authored-by: Damian Borowiecki <dborowiecki@soldevelo.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Kamil Malinowski <malinowskikam96@gmail.com>
Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com>
Co-authored-by: Dragos DOBRE <dragos.dobre@swisstph.ch>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants