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

Fix conflicting migrations #1237

Merged
merged 1 commit into from
Apr 6, 2023
Merged

Conversation

Ashesh3
Copy link
Member

@Ashesh3 Ashesh3 commented Apr 6, 2023

Proposed Changes

  • Fixes conflicting migrations
CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0336_patientconsultation_op_no, 0338_auto_20230323_1249 in facility).

Server deploys fine now:

image

@coronasafe/code-reviewers

@Ashesh3 Ashesh3 requested a review from a team as a code owner April 6, 2023 08:43
@codecov-commenter
Copy link

Codecov Report

Patch coverage: 43.47% and project coverage change: -0.02 ⚠️

Comparison is base (9a69f12) 56.22% compared to head (212237b) 56.20%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1237      +/-   ##
==========================================
- Coverage   56.22%   56.20%   -0.02%     
==========================================
  Files         193      193              
  Lines        9491     9512      +21     
  Branches     1600     1607       +7     
==========================================
+ Hits         5336     5346      +10     
- Misses       4100     4111      +11     
  Partials       55       55              
Impacted Files Coverage Δ
...e/facility/api/serializers/patient_consultation.py 32.62% <12.50%> (-0.53%) ⬇️
care/facility/api/viewsets/patient.py 45.91% <53.84%> (+0.33%) ⬆️
care/facility/models/patient_consultation.py 95.71% <100.00%> (+0.12%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@sonarcloud
Copy link

sonarcloud bot commented Apr 6, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.1% 0.1% Duplication

@gigincg gigincg merged commit 7f85c11 into ohcnetwork:master Apr 6, 2023
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.

3 participants