Merge pull request #411 from Representable/database_diagram

jessiejofielding · web-flow · commit e73a4dfbc00b · 2020-09-28T21:31:20.000-04:00
Database diagram and protocols
diff --git a/docs/docs/doc1.md b/docs/docs/doc1.md
@@ -67,3 +67,11 @@ python3 -m venv venv
 ```
 pip install -r requirements.txt
 ```
+
+For Mac users, you may need to use
+
+```
+brew install graphviz
+```
+
+if you're having trouble with your `pygraphviz` installation.
diff --git a/docs/docs/doc2.md b/docs/docs/doc2.md
@@ -15,14 +15,17 @@ Now that you've got your local development environment set up, please read throu
 
 - When you're starting a new feature, open a branch off the main branch to start making your changes with the relevant issue in mind.
 - If the feature that you're working on takes a long time, you wanna make sure that your code is constantly being updated to the changes being pushed by teammates. In order to keep your feature branch updated to prevent conflicts later on, make sure to sync up your branch with main - by pulling changes in main and merging main with your branch. Syncing your branch daily is usually good practice.
+- If you have made any changes to the database schema (anything that requires a migration), run `python manage.py graph_models -a -o models.png` and push to your branch before you open a PR.
+- Write tests for _all_ your new code - try to make sure your tests call every function and test every case.
 - When you're ready to open a PR, open a PR to the main or to a chosen dev branch for features that aren't ready to be merged with the main branch yet. Try to make the PR as small as possible so that your reviewer can easily see what you've done. Be descriptive in your PR! Include screenshots if possible. Write "resolves #<issue_number>" at the end of your PR to automatically close the issue when the PR is merged.
+- Ensure you wrote enough tests for your new code! CodeCov will give you a coverage report on every pull request, and your PR may fail CodeCov's tests if coverage drops. _Even if all the tests pass_, don't merge a PR that has a negative `diff` in the coverage report. If coverage is down from the main branch, you can go to the CodeCov dashboard to see which lines are being missed, and then add new test cases to hit those lines. If there are lines you can't hit with any tests, double check that it's dead code by testing without it. Please remove all code that is actually dead, it's easier to review without it and much easier to maintain.
 - You need at least one review for any PR to the main branch.
 
 ### Reviewing
 
 You've been assigned to review a PR. Now what?
 
-- **Check tests:** Make sure the PR passes CI checks. If it does not, kindly ask the PR opener to review why their PR is failing checks and ask them to recommit if needed (they can recommit to the branch and it will be added to the same PR).
+- **Check tests:** Make sure the PR passes CI and CodeCov checks. Also check the CodeCov report comment, and ensure it does not reflect a drop in coverage. If it does not pass checks, or if coverage drops, kindly ask the PR opener to review why their PR is failing checks and ask them to recommit if needed (they can recommit to the branch and it will be added to the same PR).
 - **High-level review:** Read the PR description and screenshots. Does that match what's in the relevant spec doc? If there's a clear change that they can make, request changes by going to files->review changes-> request changes.
 - **Code review:** Check out the PR locally. You may do this in Github desktop, for example. Run the code and make sure the relevant features work. At the same time, go to the files tab in github and check each file off as you review them.
 
diff --git a/models.png b/models.png
diff --git a/representable/settings/base.py b/representable/settings/base.py
@@ -63,6 +63,7 @@
     "django.contrib.messages",
     "django.contrib.sites",
     "django.contrib.staticfiles",
+    "django_extensions",
     "import_export",
     "main",
     "leaflet",
diff --git a/requirements.txt b/requirements.txt
@@ -16,9 +16,11 @@ django-redis==4.10.0
 django-redis-cache==2.0.0
 django-select2==6.3.1
 django-widget-tweaks==1.4.3
+django-extensions==3.0.9
 Faker==1.0.5
 geojson==2.4.1
 geojson-rewind==0.2.0
+graphviz==0.14.1
 gunicorn==19.9.0
 idna==2.8
 isort==4.3.21
@@ -33,6 +35,8 @@ oauthlib==3.0.1
 psycopg2==2.7.6
 psycopg2-binary==2.7.7
 pycodestyle==2.5.0
+pydotplus==2.0.2
+pygraphviz==1.6
 pylibmc==1.6.0
 pylint==2.4.4
 python-binary-memcached==0.28.0
