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

Production Release Dec Week 2 #1765

Merged
merged 30 commits into from
Dec 11, 2023
Merged

Production Release Dec Week 2 #1765

merged 30 commits into from
Dec 11, 2023

Conversation

gigincg
Copy link
Member

@gigincg gigincg commented Dec 11, 2023

Proposed Changes

  • Brief of changes made.

Associated Issue

  • Link to issue here, explain how the proposed solution will solve the reported issue/ feature request.

Architecture changes

  • Remove this section if not used

Merge Checklist

  • Tests added/fixed
  • Update docs in /docs
  • Linting Complete
  • Any other necessary step

Only PR's with test cases included and passing lint and test pipelines will be reviewed

@coronasafe/care-backend-maintainers @coronasafe/care-backend-admins

Ashesh3 and others added 28 commits December 5, 2023 13:42
@Ashesh3
Ensure Deterministic Ordering of Local Self Government and Ward Data (#…
033d085 
…1665)

* Make ordering of lsg and ward deterministic

* fix dump data

* Fix lsg and ward
@Ashesh3
Refactor asset status check logic (#1750)
1489801
@sainak
offload migrations to beat service (#1710)
df576b0 
* offload migrations to beat service

* log connection error
@Ashesh3
Allow district admin to delete users (#1738)
26d5a6d
@Pranshu1902
show icu admission date in discharge summary pdf (#1736)
83b6495
@sainak
add management command to load skills (#1707)
8720fe4 
* add management command to load skills

* fix typos
@sainak
pin dependencies in pipenv (#1705)
d481c90
@sainak
add DenominationValidator to validate dosage fields in Prescription m…
46341e1 
…odel (#1716)

* Add DosageValidator to Prescription model

* make the validator more generic

* fix migrations

* update migrations
@sainak
add env vars to configure cors headers (#1703)
261d024
@GokulramGHV
Field to classify location as an ICU or Ward or Other (#1708)
84ead2a 
* Add WARD as a new room type choice in
AssetLocation model

* update tests
@Pranshu1902 @sainak
Check if user uploading External results is from same district (#1747)
5563b48 
* check if user is from same district

* fix logic order

* refactor

* refactor

Co-authored-by: Aakash Singh <mail@singhaakash.dev>

---------

Co-authored-by: Aakash Singh <mail@singhaakash.dev>
@Ashesh3
Resolved Display Issues for Oxygen Cylinder Capacity in Facility Expo…
19d414f 
…rts (#1732)

Export oxygen capacity only for  FacilityCapacity
@Ashesh3
Add More Facilities and patients to dummy data (#1748)
e5409f7 
* Add facilities and patients to dummy data

* exclude models

* format file
@rithviknishad
Add resolved_middleware JSON field to Asset Serializer. (#1741)
79c734a 
* Add `resolved_middleware` JSON field to Asset Serializer.
fixes #1740;

* update schema to be nullable field

* move resolving as a utility method in model

* Adds `ResolvedMiddlewareField`
@sainak @Bhavik-ag
made patient notes consultation specific (#1727)
1ce8fdc 
* made patient notes consultation specific

* link existing patient notes to consultations

* update migrations

---------

Co-authored-by: Bhavik Agarwal <bhavikiitian@gmail.com>
@dependabot
bump pillow from 10.0.0 to 10.1.0 (#1677)
940e0e7 
---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Pranshu1902 @sainak
Restrict Admin from unlinking users from other district (#1157)
7663481 
* prevent unlink for other district

* use id for comparision

* Update care/users/api/viewsets/users.py

Co-authored-by: Aakash Singh <mail@singhaakash.dev>

* add tests

* fix lint

* fix tests and restrict in clear_home_Facility function

* add unlink facility tests

* assert error message in tests

* Update care/users/api/viewsets/users.py

Co-authored-by: Aakash Singh <mail@singhaakash.dev>

* check if user is district admin and above

---------

Co-authored-by: Aakash Singh <mail@singhaakash.dev>
@Pranshu1902 @rithviknishad
@sainak @vigneshhari
Don't allow negative values for Doctor Count for facility (#1505)
c30e5c6 
* added validations

* refactor

* make migrations

* Update migrations

Signed-off-by: Aakash Singh <mail@singhaakash.dev>

* switched to positiveintegerfield

* recreate migrations

---------

Signed-off-by: Aakash Singh <mail@singhaakash.dev>
Co-authored-by: Rithvik Nishad <rithvik.nishad@egovernments.org>
Co-authored-by: Aakash Singh <mail@singhaakash.dev>
Co-authored-by: Vignesh Hari <vichuhari100@gmail.com>
@sainak @vigneshhari
merge migrations (#1751)
2407f67 
Co-authored-by: Vignesh Hari <vichuhari100@gmail.com>
@sainak
merge migrations (#1752)
6ea03f9 
* merge migrations

* fix bad migration from #1505

* fix tests
@dependabot
Bump werkzeug from 2.3.7 to 2.3.8 (#1753)
0869c46 
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 2.3.7 to 2.3.8.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@2.3.7...2.3.8)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sainak
cleanup dummy data
68c2487
@sainak
fix
560b3bd
@Pranshu1902
fix data type error
3e635e9
@Pranshu1902
add tests
026949a
@Pranshu1902
refactor tests
8b529d2
@gigincg
Merge pull request #1758 from coronasafe/sainak/fix/dummy-data
09edf05 
cleanup dummy data
@gigincg
Merge pull request #1762 from Pranshu1902/issue#1761
48e5468 
fix: Import External Result is failing for valid data
@codecov Codecov
Copy link

codecov bot commented Dec 11, 2023 •
edited
Loading

Codecov Report

Attention: 39 lines in your changes are missing coverage. Please review.

Comparison is base (8bdbb42) 60.76% compared to head (e09e4c1) 61.36%.
Report is 182 commits behind head on production.

Files Patch % Lines
care/facility/tasks/asset_monitor.py 0.00% 12 Missing ⚠️
care/users/management/commands/load_skill_data.py 0.00% 9 Missing ⚠️
care/facility/models/asset.py 44.44% 3 Missing and 2 partials ⚠️
care/utils/models/validators.py 87.87% 3 Missing and 1 partial ⚠️
...re/facility/management/commands/load_dummy_data.py 0.00% 3 Missing ⚠️
care/users/api/viewsets/users.py 50.00% 1 Missing and 1 partial ⚠️
care/users/management/commands/load_lsg_data.py 0.00% 2 Missing ⚠️
care/users/management/commands/load_ward_data.py 0.00% 2 Missing ⚠️
Additional details and impacted files 
@@              Coverage Diff               @@
##           production    #1765      +/-   ##
==============================================
+ Coverage       60.76%   61.36%   +0.59%     
==============================================
  Files             210      211       +1     
  Lines           11531    11587      +56     
  Branches         1642     1659      +17     
==============================================
+ Hits             7007     7110     +103     
+ Misses           4283     4205      -78     
- Partials          241      272      +31

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@gigincg gigincg merged commit ced0618 into production Dec 11, 2023
16 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dauntlessnomad dauntlessnomad Awaiting requested review from dauntlessnomad

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

Successfully merging this pull request may close these issues.
6 participants
@gigincg @Ashesh3 @sainak @Pranshu1902 @GokulramGHV @rithviknishad