Skip to content

Commit

Permalink
Merge branch 'main' of github.com:unicef-drp/GeoSight-OS into feature…
Browse files Browse the repository at this point in the history
…/1496-raster-styler-layout
  • Loading branch information
zamuzakki committed Jan 22, 2025
2 parents bcbbf95 + 5079fbd commit 7df1cfe
Show file tree
Hide file tree
Showing 195 changed files with 3,645 additions and 1,417 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ jobs:
matrix:
test_suite: [
{ name: "Backend Tests", script: "make devweb-test" },
{ name: "E2E Tests: Project Creation", path: "tests/project_creation", workers: 2 },
{ name: "E2E Tests: Project View", path: "tests/project_view", workers: 3 },
{ name: "E2E Tests: Admin List", path: "tests/admin_list", workers: 3 },
{ name: "E2E Tests: Admin Edit", path: "tests/admin_edit", workers: 3 }
{ name: "E2E Tests: Project Creation", path: "tests/project_creation", workers: 2, script_load: "make load-test-data" },
{ name: "E2E Tests: Project View", path: "tests/project_view", workers: 3, script_load: "make load-test-data" },
{ name: "E2E Tests: Admin List", path: "tests/admin_list", workers: 3, script_load: "make load-test-data" },
{ name: "E2E Tests: Admin Edit", path: "tests/admin_edit", workers: 3, script_load: "make load-test-data" },
{ name: "E2E Tests: Admin List Filter", path: "tests/admin_filter", workers: 3, script_load: "make load-test-data-for-filter" }
]
env:
APP_IMAGE: kartoza/geosight
Expand Down Expand Up @@ -133,6 +134,15 @@ jobs:
make devweb
make wait-db
docker cp ./django_project geosight_dev:/home/web
- name: Install requirements
run: |
docker cp ./deployment/docker/requirements.txt geosight_dev:/home/web/requirements.txt
docker cp ./deployment/docker/requirements-dev.txt geosight_dev:/home/web/requirements-dev.txt
docker exec -i geosight_dev bash -c "pip install -r /home/web/requirements.txt && pip install -r /home/web/requirements-dev.txt"
- name: Initialize devweb database
run: |
make devweb-initialize
- name: Execute Test Backend
Expand All @@ -144,7 +154,7 @@ jobs:
run: |
make devweb-entrypoint
make devweb-runserver
make load-test-data
${{ matrix.test_suite.script_load }}
make sleep
- name: Test production config ready
Expand Down
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,14 @@ load-test-data:
@docker compose $(ARGS) exec -T dev bash -c "python manage.py loaddata core/fixtures/test/4.geosight_data.json"
@docker compose $(ARGS) exec -T dev bash -c "python manage.py loaddata geosight/reference_dataset/fixtures/test/4.reference_dataset_levels.json"

load-test-data-for-filter:
@echo
@echo "------------------------------------------------------------------"
@echo "Load test data for testing filter functionality"
@echo "------------------------------------------------------------------"
@docker compose $(ARGS) exec -T dev bash -c "python manage.py loaddata core/fixtures/admin_filter/1.user_group.json"
@docker compose $(ARGS) exec -T dev bash -c "python manage.py loaddata core/fixtures/admin_filter/2.geosight_data.json"

devweb-test:
@echo
@echo "------------------------------------------------------------------"
Expand Down
3 changes: 2 additions & 1 deletion deployment/docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@ django-tenants-celery-beat==0.2.1
uwsgi-tools==1.1.1

# Raster Analysis
rasterio==1.3.11
rasterio==1.3.11
jenkspy==0.4.1
138 changes: 138 additions & 0 deletions django_project/core/fixtures/admin_filter/1.user_group.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
[
{
"model": "auth.user",
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$260000$coHJzICjeaIGxrNKcdLHF2$DsEFHohOsRIuo42vad3WSDtk3l5CC2qtPlDAeBE4Gzo=",
"last_login": "2024-10-14T03:44:58.770Z",
"is_superuser": true,
"username": "admin",
"first_name": "",
"last_name": "",
"email": "[email protected]",
"is_staff": true,
"is_active": true,
"date_joined": "2024-10-14T02:18:46.219Z",
"groups": [],
"user_permissions": []
}
},
{
"model": "auth.user",
"pk": 2,
"fields": {
"password": "pbkdf2_sha256$260000$ukC9d9HEKHnZiVpwuXPglm$UKFQYF+3GtJYP2oMhk/NDi95w8BSpBaTHv4Na0YN92k=",
"last_login": null,
"is_superuser": false,
"username": "viewer",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2024-10-14T03:57:07.921Z",
"groups": [],
"user_permissions": []
}
},
{
"model": "auth.user",
"pk": 3,
"fields": {
"password": "pbkdf2_sha256$260000$Chy0AN4aYMNknd0SMZUoa7$b+UsRgbyExfRQUN3xlNSCwwswp7OBKbKLxwjNr9Hlqs=",
"last_login": null,
"is_superuser": false,
"username": "contributor",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2024-10-14T03:57:23.695Z",
"groups": [],
"user_permissions": []
}
},
{
"model": "auth.user",
"pk": 4,
"fields": {
"password": "pbkdf2_sha256$260000$ZhLzP3hbtEf1jJjWMUSfx7$c5Oyt7epi5w09nVIlSTef+3rkGakF1Vtecn8s1rBY1M=",
"last_login": null,
"is_superuser": false,
"username": "creator",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2024-10-14T03:57:33.334Z",
"groups": [],
"user_permissions": []
}
},
{
"model": "core.profile",
"pk": 1,
"fields": {
"user": 1,
"role": "Creator",
"georepo_api_key": null,
"receive_notification": false
}
},
{
"model": "core.profile",
"pk": 2,
"fields": {
"user": 2,
"role": "Viewer",
"georepo_api_key": "",
"receive_notification": false
}
},
{
"model": "core.profile",
"pk": 3,
"fields": {
"user": 3,
"role": "Contributor",
"georepo_api_key": "",
"receive_notification": false
}
},
{
"model": "core.profile",
"pk": 4,
"fields": {
"user": 4,
"role": "Creator",
"georepo_api_key": null,
"receive_notification": false
}
},
{
"model": "auth.group",
"pk": 1,
"fields": {
"name": "unicef",
"permissions": []
}
},
{
"model": "auth.group",
"pk": 2,
"fields": {
"name": "Group 1",
"permissions": []
}
},
{
"model": "auth.group",
"pk": 3,
"fields": {
"name": "Group 2",
"permissions": []
}
}
]
Loading

0 comments on commit 7df1cfe

Please sign in to comment.