Skip to content

Commit

Permalink
Combine manfiest and handler apps (#776)
Browse files Browse the repository at this point in the history
* consolidate manifest and handler django apps

* reorg manifest app tests

* move development fixtures to individual apps
  • Loading branch information
dpgraham4401 authored Aug 22, 2024
1 parent 40f6a0a commit 3517505
Show file tree
Hide file tree
Showing 45 changed files with 793 additions and 812 deletions.
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
sh -c "
python manage.py makemigrations &&
python manage.py migrate &&
python manage.py loaddata dev_data.yaml org_permissions.yaml &&
python manage.py loaddata core_dev.yaml rcrasite_dev.yaml org_dev.yaml profile_dev.yaml &&
python manage.py runserver 0.0.0.0:8000"
healthcheck:
test:
Expand Down
2 changes: 1 addition & 1 deletion server/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**/tests
Dockerfile
.dockerignore
db.sqlite3
**/*.sqlite3
**/.git
**/.gitignore
**/.vscode
Expand Down
45 changes: 45 additions & 0 deletions server/core/fixtures/core_dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
- model: core.trakuser
pk: 8062d496-15f1-485d-961c-a8e5fa118dde
fields:
password: pbkdf2_sha256$390000$iVFyQyb6N3g06Wan8YLnTv$MgFhKBvwPSwctgxWSviA/OXClEKtDXg87iPU+g9+Zjs=
last_login: 2023-03-19 00:29:46.249589+00:00
is_superuser: false
username: orgadmin
first_name: "org"
last_name: "admin"
email: [email protected]
is_staff: true
is_active: true
date_joined: 2022-12-17 19:14:17.239000+00:00
groups: [1, 2]
user_permissions: []
- model: core.trakuser
pk: a0ba4966-aa53-44c8-be1a-0a0d2d6b6acd
fields:
password: pbkdf2_sha256$390000$iVFyQyb6N3g06Wan8YLnTv$MgFhKBvwPSwctgxWSviA/OXClEKtDXg87iPU+g9+Zjs=
last_login: 2023-03-19 00:29:46.249589+00:00
is_superuser: true
username: admin
first_name: ""
last_name: ""
email: [email protected]
is_staff: true
is_active: true
date_joined: 2022-12-17 19:14:17.239000+00:00
groups: []
user_permissions: []
- model: core.trakuser
pk: 4ac96f68-42cf-47ea-bffb-f24d423dbc35
fields:
password: pbkdf2_sha256$390000$SB7EHpYC88CjsX5tcbxa8E$yh1TWONkGI2z/bjblkPSTyjpd1UdhnivPW5nzA9NGOk=
last_login: null
is_superuser: false
username: testuser1
first_name: "David"
last_name: "Graham"
email: "[email protected]"
is_staff: false
is_active: true
date_joined: 2022-12-17 19:17:58.260000+00:00
groups: [2]
user_permissions: []
4 changes: 2 additions & 2 deletions server/core/tests/test_rcrainfo_service.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from datetime import UTC, datetime

import emanifest
from manifest.models import QuickerSign
from manifest.serializers import QuickerSignSerializer
from responses import matchers
from rest_framework import status

from core.services import RcraClient, get_rcra_client
from handler.models import QuickerSign
from handler.serializers import QuickerSignSerializer


class TestRcrainfoService:
Expand Down
210 changes: 0 additions & 210 deletions server/fixtures/dev_data.yaml

This file was deleted.

66 changes: 0 additions & 66 deletions server/handler/admin.py

This file was deleted.

6 changes: 0 additions & 6 deletions server/handler/apps.py

This file was deleted.

Loading

0 comments on commit 3517505

Please sign in to comment.