Merge remote-tracking branch 'upstream/main' into serializer-security-346

Author: fyliu

.github/ISSUE_TEMPLATE/update-table.md

@@ -10,6 +10,7 @@ assignees: ''
 
 ### Overview
 We need to update the [Replace with TABLE NAME] table model to [Replace with REASON]
+[possibly "to include new fields and have the correct names for fields."]
 
 #### Details
 - The initial model issue: #[Replace with ISSUE NUMBER]
@@ -18,15 +19,18 @@ We need to update the [Replace with TABLE NAME] table model to [Replace with REA
 ### Action Items
 Update existing Django model
   - [ ] In the files indicated by Resource 1.01, Change the following items in the code
-Current name in code | Updated Name
--- | --
+Current name in code | Updated Name | Updated Type (may already be this type)
+-- | -- | --
 [Replace with UPDATE TABLE DATA]
 
 - [ ] Add the following items in the code
+Name | Type
+-- | --
 [Replace with ADD TABLE]
 - [ ] Write a test for the new relationships this model will have with other models (e.g., creating a user and assigning them a set of permissions on a project) if any.
 - [ ] Update API end point
 - [ ] Update API unit tests
+- [ ] [generate a schema table definition](https://github.com/hackforla/peopledepot/issues/378#issuecomment-2493062821) and post it in a comment below and add a link to it in the Update Schema dependency issue.
 - [ ] Document the endpoint in ReDocs
 
 ### After PR has been approved
@@ -37,8 +41,10 @@ Current name in code | Updated Name
    - 1.01.01 [/app/core/models.py](https://github.com/hackforla/peopledepot/blob/main/app/core/models.py)
    - 1.01.02 [/app/core/admin.py](https://github.com/hackforla/peopledepot/blob/main/app/core/admin.py)
    - 1.01.03 [/app/core/api/serializers.py](https://github.com/hackforla/peopledepot/blob/main/app/core/api/serializers.py)
-   - 1.01.04 [/app/core/migrations/0002_user_current_job_title_user_current_skills_and_more.py](https://github.com/hackforla/peopledepot/blob/main/app/core/migrations/0002_user_current_job_title_user_current_skills_and_more.py)
+   - 1.01.04
 - 1.02 [People Depot Resources wiki page](https://github.com/hackforla/peopledepot/wiki/Resources-and-Links) for links
   - ERD
   - Table and Field Definitions
   - API Endpoint
+- 1.03 Spreadsheet: [PD: Table and field explanations, Field Permission tab](https://docs.google.com/spreadsheets/d/1x_zZ8JLS2hO-zG0jUocOJmX16jh-DF5dccrd_OEGNZ0/edit?gid=371053454#gid=371053454)
+   -1.03.01 [ADD A LINK TO A SPECIFIC FILTER FOR THE TABLE]

.github/pull_request_template.md

@@ -12,7 +12,7 @@ Fixes #replace_this_text_with_the_issue_number
 -
 -
 
-### Screenshots of Proposed Changes Of The Website  (if any, please do not screen shot code changes)
+### Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)
 
 <!-- Note, if your images are too big, use the <img src="" width="" length="" />  syntax instead of ![image](link) to format the images -->
 

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 default_install_hook_types: [pre-commit, pre-push]
-default_stages: [commit, push]
+default_stages: [pre-commit, pre-push]
 minimum_pre_commit_version: "2.18"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       # identify invalid files
       - id: check-ast
@@ -46,32 +46,32 @@ repos:
       - id: hadolint
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.19.0
     hooks:
       - id: pyupgrade
         args: [--py310-plus]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.19.0
+    rev: 1.22.2
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.0"]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.4.2
+    rev: 24.10.0
     hooks:
       - id: black
         exclude: ^app/core/migrations/
 
   - repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.18.0
+    rev: 1.19.1
     hooks:
       - id: blacken-docs
         additional_dependencies:
-          - black==24.2.0
+          - black==24.10.0
 
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         exclude: "^app/core/migrations/|^app/data/migrations/|^app/core/scripts"
@@ -100,7 +100,7 @@ repos:
         args: ["--filter-files", "--force-single-line-imports"]
 
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.9
+    rev: 1.8.0
     hooks:
       - id: bandit
         exclude: ^app/core/tests/
@@ -124,7 +124,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.5.0
+    rev: v0.8.1
     hooks:
       # Run the linter.
       - id: ruff
@@ -135,7 +135,7 @@ repos:
         exclude: ^app/core/migrations/
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
+    rev: 0.7.19
     hooks:
       - id: mdformat
         exclude: |
@@ -156,7 +156,7 @@ repos:
         language: system
         pass_filenames: false
         always_run: true
-        stages: [push]
+        stages: [pre-push]
       - id: test
         name: test
         entry: ./scripts/test.sh
@@ -165,7 +165,7 @@ repos:
         always_run: true
         # verbose: true
         # require_serial: true
-        stages: [push]
+        stages: [pre-push]
 
 ci:
   autoupdate_schedule: quarterly

docs/contributing/howto/run-local.md

@@ -1,13 +1,13 @@
 # Run backend in venv
 
 If you have a requirement to run on your local machine or you are unable to get it to work on
-Docker, do the following steps.  WARNING: If you run into issues you will get limited support.
+Docker, do the following steps. WARNING: If you run into issues you will get limited support.
 
 Run these commands from the `app` directory:
 
 1. Copy `.env.docker-example` to `.env.local`
-1. Inspect `.env.local` and change values as appropriate.  The file includes instructions on how to use local `postgres` and  `sqlite` for the database. `sqlite` has no set up.  It uses a file `db.sqlite3`.  If it is not there, it automatically creates it.
-1. **Mac only**: If you have a Mac, the python command may not be found and scripts will fail.  Try to run python using the "python" command from the terminal.  If you get an error that the python command is
+1. Inspect `.env.local` and change values as appropriate. The file includes instructions on how to use local `postgres` and `sqlite` for the database. `sqlite` has no set up. It uses a file `db.sqlite3`. If it is not there, it automatically creates it.
+1. **Mac only**: If you have a Mac, the python command may not be found and scripts will fail. Try to run python using the "python" command from the terminal. If you get an error that the python command is
     not found, type: `alias python="python3"`
 1. Run these commands from the terminal in the project root.
 

docs/contributing/tools/docker.md

@@ -50,7 +50,7 @@ RUN \
   pip install -r requirements.txt
 ```
 
-For pip, the files are by default stored in `/root/.cache/pip`.  [Pip caching docs](https://pip.pypa.io/en/stable/topics/caching/)
+For pip, the files are by default stored in `/root/.cache/pip`. [Pip caching docs](https://pip.pypa.io/en/stable/topics/caching/)
 
 For apk, the cache directory is `/var/cache/apk/`. [APK wiki on local cache](https://wiki.alpinelinux.org/wiki/Local_APK_cache)
 

docs/howto/authenticate_cognito.md

@@ -10,11 +10,11 @@ Prerequisites:
 
 Steps:
 
-1. Login (or register first then login) to a cognito account [here](https://hackforla-vrms-dev.auth.us-west-2.amazoncognito.com/login?client_id=3e3bi1ct2ks9rcktrde8v60v3u&response_type=token&scope=openid&redirect_uri=http://localhost:8000/admin).  Do not worry if you see error messages - you will be using the url.
+1. Login (or register first then login) to a cognito account [here](https://hackforla-vrms-dev.auth.us-west-2.amazoncognito.com/login?client_id=3e3bi1ct2ks9rcktrde8v60v3u&response_type=token&scope=openid&redirect_uri=http://localhost:8000/admin). Do not worry if you see error messages - you will be using the url.
 
     [<img src="https://user-images.githubusercontent.com/1160105/184449364-e3bba6e9-ced5-498f-a0e6-0c93c8a036fb.png" width="500" />](https://user-images.githubusercontent.com/1160105/184449364-e3bba6e9-ced5-498f-a0e6-0c93c8a036fb.png)
 
-1. Copy the URL when it redirects. **Note:** Instead of the screen below, the screen may display an error message.  You can ignore any error messages.
+1. Copy the URL when it redirects. **Note:** Instead of the screen below, the screen may display an error message. You can ignore any error messages.
 
     [<img src="https://user-images.githubusercontent.com/1160105/184449368-f16b19de-9372-436c-b65d-c5afadbcbc1a.png" width="500" />](https://user-images.githubusercontent.com/1160105/184449368-f16b19de-9372-436c-b65d-c5afadbcbc1a.png).
 
@@ -25,7 +25,7 @@ Steps:
 
     [<img src="https://user-images.githubusercontent.com/1160105/184449537-2a9570a5-6361-48ae-b348-506244d592ac.png" width="500" />](https://user-images.githubusercontent.com/1160105/184449537-2a9570a5-6361-48ae-b348-506244d592ac.png)
 
-1. Open [ModHeader](https://modheader.com/modheader/download).  If the icon is hidden, click on the Puzzle icon in the upper right of the browser to see it.
+1. Open [ModHeader](https://modheader.com/modheader/download). If the icon is hidden, click on the Puzzle icon in the upper right of the browser to see it.
 
 1. Type the word Bearer and paste the token into [ModHeader](https://docs.modheader.com/using-modheader/introduction) Authorization: Bearer \<access_token>