Merge Develop to Staging v24.40.0 #2497

nihal467 · 2024-09-25T06:57:38Z

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

@ohcnetwork/care-backend-maintainers @ohcnetwork/care-backend-admins

* Added Facility Flag Implementation * added caching and user flags * Fix class name * update migrations * fixes * format * add tests * fix tests * Fix variable naming * abstract feature flag model * cleanup * fix migrations * fix failing tests * Add merge migration * Clean migrations * Fix linting * fix lint --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

* added timeout to middleware requests * updated the reference for timeout value in function --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

update unique_bed_name_per_location to ignore deleted beds (#2432) --------- Co-authored-by: vigneshhari <vichuhari100@gmail.com>

fix string representation of prescription and mar (#2412)

Convert enum choices to integer choices in Daily Rounds (#2462)

Major dependencies update (#2449) --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com> Co-authored-by: vigneshhari <vichuhari100@gmail.com>

corrected the spelling

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

…ted `prescriptions` (#2410)

use random uuid suffix in cover image key with size validation (#2472) Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

…nstances of Decimal (#2476)

Fixes default admin url (#2474) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

added a request time logging middleware (#2361) --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

* add ruff * fix ruff command * use ruff action * update lint action * update rules

Added Facility Hubs (#2135) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

) * Bump the all-dependencies group across 1 directory with 4 updates --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Bumps [pydantic](https://github.com/pydantic/pydantic) from 1.10.15 to 1.10.18. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](pydantic/pydantic@v1.10.15...v1.10.18) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…encounters (#2133) Prescriptions and MAR: Disallow users to perform edits on discharged encounters (#2133) --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Reply feature for Doctor notes (#2160) --------- Co-authored-by: Rithvik Nishad <rithvik.nishad@egovernments.org> Co-authored-by: Khavin Shankar <khavinshankar@Khavins-MacBook-Air.local> Co-authored-by: rithviknishad <mail@rithviknishad.dev> Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com> Co-authored-by: vigneshhari <vichuhari100@gmail.com>

Bumps [cryptography](https://github.com/pyca/cryptography) from 43.0.0 to 43.0.1. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](pyca/cryptography@43.0.0...43.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

* disable default jwks for production deployments * add default jwks for prebuilts * Revert "add default jwks for prebuilts" This reverts commit 68c6820.

Removed redundant room types in FacilityCapacity (#2417) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Soft delete assets from deleted facilities/hospitals (#1996) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Add user profile pictures (#2253) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

archived spo2 field to archived_spo2 (#2397) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

…discharge patient filters (#2204) Adds functionality for `last_consultation_admitted_bed_type_list` in discharge patient filters (#2204) --------- Co-authored-by: Shivank Kacker <shivank@Shivanks-MacBook-Air.local> Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

* seperated hcx into a plug * added HCX_CERT_URL env for hcx plug * updated hcx plug package name * updated hcx plug repo url * enabled loading static data from plugs * removed env declaration in plug config * fixed linting errors * added hcx staging config for local and testing * fixed tests --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

fix facility capacity uploads

* disable aspect ratio validation for images * fix --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

…es (#2268) Set default permission class to IsAuthenticated & made required changes (#2268) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

Allow installing plugs from env (#2473)

Bumps the boto group with 2 updates: [boto3](https://github.com/boto/boto3) and [boto3-stubs](https://github.com/youtype/mypy_boto3_builder). Updates `boto3` from 1.35.24 to 1.35.25 - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.35.24...1.35.25) Updates `boto3-stubs` from 1.35.24 to 1.35.25 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: boto3-stubs dependency-type: direct:development update-type: version-update:semver-patch dependency-group: boto ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Fix all linting issues in care (#2483) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

vigneshhari and others added 30 commits September 19, 2024 19:56

added timeout to middleware requests (#2434)

d36b5d9

* added timeout to middleware requests * updated the reference for timeout value in function --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

update unique_bed_name_per_location to ignore deleted beds (#2432)

0683faa

update unique_bed_name_per_location to ignore deleted beds (#2432) --------- Co-authored-by: vigneshhari <vichuhari100@gmail.com>

fix string representation of prescription and mar (#2412)

28e2ac0

fix string representation of prescription and mar (#2412)

Convert enum choices to integer choices in Daily Rounds (#2462)

d5a2278

Convert enum choices to integer choices in Daily Rounds (#2462)

lint all files (#2468)

30395b6

Major dependencies update (#2449)

9699206

Major dependencies update (#2449) --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com> Co-authored-by: vigneshhari <vichuhari100@gmail.com>

fixing rhytmic_detail missing issue in event logs (#2467)

857fe7e

corrected the spelling

Update JSON schema validations of Daily Round fields (#2386)

2788679

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

Switch investigation default from dict to list and remove depreca…

8513421

…ted `prescriptions` (#2410)

use random uuid suffix in cover image key with size validation (#2472)

664739e

use random uuid suffix in cover image key with size validation (#2472) Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

convert image validator aspect ratio to list (#2475)

51b5c00

Fix UnorderedObjectListWarning in patient search api (#2478)

cedd28c

Avoid printing typst version in tests (#2477)

09ee8a3

Fix warnings from drf where min/max values of DecimalField were not i…

22a91f9

…nstances of Decimal (#2476)

Fixes default admin url (#2474)

0ee6d8a

Fixes default admin url (#2474) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

added a request time logging middleware (#2361)

d3a0162

added a request time logging middleware (#2361) --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Switch to ruff for lint and format (#1559)

d4f9208

* add ruff * fix ruff command * use ruff action * update lint action * update rules

Added Facility Hubs (#2135)

d9f0287

Added Facility Hubs (#2135) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

fix:Hide asset users from users list page (#2107) (#2113)

4261fa5

Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Fix linting

ab99a1b

Prescriptions and MAR: Disallow users to perform edits on discharged …

15debe1

…encounters (#2133) Prescriptions and MAR: Disallow users to perform edits on discharged encounters (#2133) --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

disable default jwks for production deployments (#2414)

12afd7a

* disable default jwks for production deployments * add default jwks for prebuilts * Revert "add default jwks for prebuilts" This reverts commit 68c6820.

update docker actions (#2485)

c94ff6f

Removed redundant room types in FacilityCapacity (#2417)

ad354af

Removed redundant room types in FacilityCapacity (#2417) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Soft delete assets from deleted facilities/hospitals (#1996)

d6f9b51

Soft delete assets from deleted facilities/hospitals (#1996) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

UdaySagar-Git and others added 13 commits September 23, 2024 10:28

Add user profile pictures (#2253)

e6a55d7

Add user profile pictures (#2253) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev> Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

archived spo2 field to archived_spo2 (#2397)

b3ad350

archived spo2 field to archived_spo2 (#2397) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

merge migrations (#2486)

e029196

fix aws deploys (#2488)

084033a

fix facility capacity exports (#2489)

9038b93

fix facility capacity uploads

disable aspect ratio validation for images (#2487)

9816822

* disable aspect ratio validation for images * fix --------- Co-authored-by: Vignesh Hari <14056798+vigneshhari@users.noreply.github.com>

Set default permission class to IsAuthenticated & made required chang…

58ad8ab

…es (#2268) Set default permission class to IsAuthenticated & made required changes (#2268) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

Allow installing plugs from env (#2473)

1bc9f89

Allow installing plugs from env (#2473)

CORS allow cloudflare pages preview deployments (#2490)

d3ad91d

Fix all linting issues in care (#2483)

663bf30

Fix all linting issues in care (#2483) --------- Co-authored-by: Aakash Singh <mail@singhaakash.dev>

nihal467 requested a review from a team as a code owner September 25, 2024 06:57

nihal467 changed the title ~~Merge Develop to Staging v24.39.0~~ Merge Develop to Staging v24.40.0 Sep 25, 2024

rithviknishad approved these changes Sep 25, 2024

View reviewed changes

khavinshankar approved these changes Sep 25, 2024

View reviewed changes

sainak merged commit 31f7b77 into staging Sep 25, 2024
19 of 20 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Develop to Staging v24.40.0 #2497

Merge Develop to Staging v24.40.0 #2497

nihal467 commented Sep 25, 2024

Merge Develop to Staging v24.40.0 #2497

Merge Develop to Staging v24.40.0 #2497

Conversation

nihal467 commented Sep 25, 2024

Proposed Changes

Associated Issue

Architecture changes

Merge Checklist