From cc1063e190fafa515f207ff052e040c03409afd4 Mon Sep 17 00:00:00 2001 From: Mohammad Minaie Date: Wed, 17 May 2023 11:54:55 -0400 Subject: [PATCH 1/5] merge in main --- .github/ISSUE_TEMPLATE/issue-default.yml | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/issue-default.yml diff --git a/.github/ISSUE_TEMPLATE/issue-default.yml b/.github/ISSUE_TEMPLATE/issue-default.yml new file mode 100644 index 000000000..ecfa56140 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue-default.yml @@ -0,0 +1,37 @@ +name: Standard Issue Tempalte +description: Create an Issue +title: "[Issue]:" +labels: ["research"] +assignees: + - kitsushadow +body: + - type: markdown + attributes: + value: | + Please fill this out best you can + - type: textarea + id: why + attributes: + label: Why or Acceptance Criteria + description: What is the reason we determined we need an issue. + placeholder: This issue is a product of... + value: "While working on X or researching Y it was discovered that Z was an issue that need captured." + validations: + required: true + - type: dropdown + id: type + attributes: + label: Issue Type + description: What type of issue is this + options: + - research (Default) + - dev + - product + validations: + required: true + - type: textarea + id: Dependencies + attributes: + label: Link dependent issues + description: If this ticket is dependent on another issue or blocks a current issue, please link. + render: shell From 4434d060ff623db4df493796940420612a79aea5 Mon Sep 17 00:00:00 2001 From: Jon Roberts Date: Wed, 17 May 2023 13:27:27 -0400 Subject: [PATCH 2/5] added link for name/mailing address in sidebar --- src/registrar/templates/domain_sidebar.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html index 8114f1be6..c50cc59bd 100644 --- a/src/registrar/templates/domain_sidebar.html +++ b/src/registrar/templates/domain_sidebar.html @@ -21,6 +21,15 @@ +
  • + {% url 'todo' as url %} + + Organization name and mailing address + +
    • +
  • {% url 'todo' as url %} Date: Wed, 17 May 2023 18:41:52 -0400 Subject: [PATCH 3/5] Document local migrations, mention --wait for cf migrations --- docs/developer/database-access.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/developer/database-access.md b/docs/developer/database-access.md index 8fc5d4617..8c0fc612e 100644 --- a/docs/developer/database-access.md +++ b/docs/developer/database-access.md @@ -12,19 +12,32 @@ to get a `psql` shell on the sandbox environment's database. ## Running Migrations +### On Local + +```shell +docker-compose exec app bash +./manage.py makemigrations +``` + +The docker compose down then up to run the new migrations. + +### On Cloud.gov + When new code changes the database schema, we need to apply Django's migrations. We can run these using CloudFoundry's tasks to run the `manage.py migrate` command in the correct environment. For any developer environment, developers can manually run the task with ```shell -cf run-task getgov-ENVIRONMENT --command 'python manage.py migrate' --name migrate +cf run-task getgov-ENVIRONMENT --wait --command 'python manage.py migrate' --name migrate ``` +(The optional 'wait' argument will wait until the environment is stable) + Optionally, load data from fixtures as well ```shell -cf run-task getgov-ENVIRONMENT --command 'python manage.py load' --name loaddata +cf run-task getgov-ENVIRONMENT --wait --command 'python manage.py load' --name loaddata ``` For the `stable` environment, developers don't have credentials so we need to From c086d4c7b75cc1e97f92c817e5be68debcf71489 Mon Sep 17 00:00:00 2001 From: rachidatecs <107004823+rachidatecs@users.noreply.github.com> Date: Wed, 17 May 2023 20:45:21 -0400 Subject: [PATCH 4/5] Update docs/developer/database-access.md Co-authored-by: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com> --- docs/developer/database-access.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/database-access.md b/docs/developer/database-access.md index 8c0fc612e..2fc05013b 100644 --- a/docs/developer/database-access.md +++ b/docs/developer/database-access.md @@ -19,7 +19,7 @@ docker-compose exec app bash ./manage.py makemigrations ``` -The docker compose down then up to run the new migrations. +Then perform docker-compose down & docker-compose up to run with the new migrations. ### On Cloud.gov From 4f96fd65a7d995be281c478e10627f9645b79672 Mon Sep 17 00:00:00 2001 From: rachidatecs Date: Wed, 17 May 2023 20:49:58 -0400 Subject: [PATCH 5/5] Add context for migrations documentation --- docs/developer/database-access.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/developer/database-access.md b/docs/developer/database-access.md index 8c0fc612e..7c7d28881 100644 --- a/docs/developer/database-access.md +++ b/docs/developer/database-access.md @@ -12,6 +12,9 @@ to get a `psql` shell on the sandbox environment's database. ## Running Migrations +When new code changes the database schema (ie, you change a model or pull some +code that has), we need to apply Django's migrations. + ### On Local ```shell @@ -23,7 +26,6 @@ The docker compose down then up to run the new migrations. ### On Cloud.gov -When new code changes the database schema, we need to apply Django's migrations. We can run these using CloudFoundry's tasks to run the `manage.py migrate` command in the correct environment. For any developer environment, developers can manually run the task with