From eab3ce3052a474d83f41bacf7323f3e2a8e87876 Mon Sep 17 00:00:00 2001 From: pacnpal <183241239+pacnpal@users.noreply.github.com> Date: Wed, 12 Nov 2025 13:28:31 -0500 Subject: [PATCH] Delete django directory --- django/.env.example | 35 - django/ADMIN_GUIDE.md | 568 - django/API_GUIDE.md | 542 - django/COMPLETE_MIGRATION_AUDIT.md | 735 -- django/MIGRATION_PLAN.md | 566 - django/MIGRATION_STATUS_FINAL.md | 186 - django/PHASE_2C_COMPLETE.md | 501 - django/PHASE_2_SEARCH_GIN_INDEXES_COMPLETE.md | 210 - django/PHASE_3_COMPLETE.md | 500 - ...E_3_SEARCH_VECTOR_OPTIMIZATION_COMPLETE.md | 220 - django/PHASE_4_COMPLETE.md | 397 - .../PHASE_4_SEARCH_VECTOR_SIGNALS_COMPLETE.md | 401 - django/PHASE_5_AUTHENTICATION_COMPLETE.md | 578 - django/PHASE_6_MEDIA_COMPLETE.md | 463 - django/PHASE_7_CELERY_COMPLETE.md | 451 - django/PHASE_8_SEARCH_COMPLETE.md | 411 - django/POSTGIS_SETUP.md | 297 - django/README.md | 281 - django/README_MONITORING.md | 250 - django/api/__init__.py | 3 - .../api/__pycache__/__init__.cpython-313.pyc | Bin 233 -> 0 bytes django/api/v1/__init__.py | 3 - .../v1/__pycache__/__init__.cpython-313.pyc | Bin 204 -> 0 bytes django/api/v1/__pycache__/api.cpython-313.pyc | Bin 5239 -> 0 bytes .../v1/__pycache__/schemas.cpython-313.pyc | Bin 49575 -> 0 bytes django/api/v1/api.py | 158 - django/api/v1/endpoints/__init__.py | 3 - .../__pycache__/__init__.cpython-313.pyc | Bin 224 -> 0 bytes .../__pycache__/auth.cpython-313.pyc | Bin 22003 -> 0 bytes .../__pycache__/companies.cpython-313.pyc | Bin 7669 -> 0 bytes .../__pycache__/moderation.cpython-313.pyc | Bin 19099 -> 0 bytes .../__pycache__/parks.cpython-313.pyc | Bin 11828 -> 0 bytes .../__pycache__/photos.cpython-313.pyc | Bin 21210 -> 0 bytes .../__pycache__/ride_models.cpython-313.pyc | Bin 8192 -> 0 bytes .../__pycache__/rides.cpython-313.pyc | Bin 12311 -> 0 bytes .../__pycache__/search.cpython-313.pyc | Bin 15835 -> 0 bytes .../__pycache__/versioning.cpython-313.pyc | Bin 12175 -> 0 bytes django/api/v1/endpoints/auth.py | 596 - django/api/v1/endpoints/companies.py | 254 - django/api/v1/endpoints/moderation.py | 496 - django/api/v1/endpoints/parks.py | 362 - django/api/v1/endpoints/photos.py | 600 - django/api/v1/endpoints/ride_models.py | 247 - django/api/v1/endpoints/rides.py | 360 - django/api/v1/endpoints/search.py | 438 - django/api/v1/endpoints/versioning.py | 369 - django/api/v1/schemas.py | 969 -- django/apps/__init__.py | 0 .../apps/__pycache__/__init__.cpython-313.pyc | Bin 168 -> 0 bytes django/apps/core/__init__.py | 0 .../core/__pycache__/__init__.cpython-313.pyc | Bin 173 -> 0 bytes .../core/__pycache__/apps.cpython-313.pyc | Bin 614 -> 0 bytes .../core/__pycache__/models.cpython-313.pyc | Bin 11562 -> 0 bytes django/apps/core/apps.py | 11 - django/apps/core/migrations/0001_initial.py | 194 - django/apps/core/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-313.pyc | Bin 4748 -> 0 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 184 -> 0 bytes django/apps/core/models.py | 264 - django/apps/entities/__init__.py | 0 .../__pycache__/__init__.cpython-313.pyc | Bin 177 -> 0 bytes .../__pycache__/admin.cpython-313.pyc | Bin 23211 -> 0 bytes .../entities/__pycache__/apps.cpython-313.pyc | Bin 838 -> 0 bytes .../__pycache__/models.cpython-313.pyc | Bin 27443 -> 0 bytes .../__pycache__/search.cpython-313.pyc | Bin 14491 -> 0 bytes .../__pycache__/signals.cpython-313.pyc | Bin 8865 -> 0 bytes django/apps/entities/admin.py | 706 - django/apps/entities/apps.py | 15 - django/apps/entities/filters.py | 418 - .../apps/entities/migrations/0001_initial.py | 846 -- ...lter_park_latitude_alter_park_longitude.py | 35 - .../0003_add_search_vector_gin_indexes.py | 141 - django/apps/entities/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-313.pyc | Bin 16395 -> 0 bytes .../0002_add_postgis_location.cpython-313.pyc | Bin 1585 -> 0 bytes ...itude_alter_park_longitude.cpython-313.pyc | Bin 1185 -> 0 bytes ..._search_vector_gin_indexes.cpython-313.pyc | Bin 5462 -> 0 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 188 -> 0 bytes django/apps/entities/models.py | 930 -- django/apps/entities/search.py | 386 - django/apps/entities/signals.py | 252 - django/apps/entities/tasks.py | 354 - django/apps/media/__init__.py | 0 .../__pycache__/__init__.cpython-313.pyc | Bin 174 -> 0 bytes .../media/__pycache__/admin.cpython-313.pyc | Bin 8711 -> 0 bytes .../media/__pycache__/apps.cpython-313.pyc | Bin 619 -> 0 bytes .../media/__pycache__/models.cpython-313.pyc | Bin 8194 -> 0 bytes .../__pycache__/services.cpython-313.pyc | Bin 19180 -> 0 bytes .../__pycache__/validators.cpython-313.pyc | Bin 6137 -> 0 bytes django/apps/media/admin.py | 206 - django/apps/media/apps.py | 11 - django/apps/media/migrations/0001_initial.py | 253 - django/apps/media/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-313.pyc | Bin 6124 -> 0 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 185 -> 0 bytes django/apps/media/models.py | 266 - django/apps/media/services.py | 492 - django/apps/media/tasks.py | 219 - django/apps/media/validators.py | 195 - django/apps/moderation/__init__.py | 0 .../__pycache__/__init__.cpython-313.pyc | Bin 179 -> 0 bytes .../__pycache__/admin.cpython-313.pyc | Bin 11319 -> 0 bytes .../__pycache__/apps.cpython-313.pyc | Bin 644 -> 0 bytes .../__pycache__/models.cpython-313.pyc | Bin 16495 -> 0 bytes .../__pycache__/services.cpython-313.pyc | Bin 19623 -> 0 bytes django/apps/moderation/admin.py | 424 - django/apps/moderation/apps.py | 11 - .../moderation/migrations/0001_initial.py | 454 - django/apps/moderation/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-313.pyc | Bin 10444 -> 0 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 190 -> 0 bytes django/apps/moderation/models.py | 477 - django/apps/moderation/services.py | 587 - django/apps/moderation/tasks.py | 304 - django/apps/monitoring/__init__.py | 4 - django/apps/monitoring/apps.py | 10 - django/apps/monitoring/metrics_collector.py | 188 - django/apps/monitoring/middleware.py | 52 - django/apps/monitoring/tasks.py | 82 - django/apps/monitoring/tasks_retention.py | 168 - django/apps/notifications/__init__.py | 0 .../__pycache__/__init__.cpython-313.pyc | Bin 182 -> 0 bytes .../__pycache__/apps.cpython-313.pyc | Bin 659 -> 0 bytes .../__pycache__/models.cpython-313.pyc | Bin 180 -> 0 bytes django/apps/notifications/apps.py | 11 - django/apps/notifications/models.py | 0 django/apps/reviews/apps.py | 7 - django/apps/users/__init__.py | 0 .../__pycache__/__init__.cpython-313.pyc | Bin 174 -> 0 bytes .../users/__pycache__/admin.cpython-313.pyc | Bin 11850 -> 0 bytes .../users/__pycache__/apps.cpython-313.pyc | Bin 781 -> 0 bytes .../users/__pycache__/models.cpython-313.pyc | Bin 8781 -> 0 bytes .../__pycache__/permissions.cpython-313.pyc | Bin 12538 -> 0 bytes .../__pycache__/services.cpython-313.pyc | Bin 20018 -> 0 bytes django/apps/users/admin.py | 372 - django/apps/users/apps.py | 17 - django/apps/users/migrations/0001_initial.py | 370 - django/apps/users/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-313.pyc | Bin 8929 -> 0 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 185 -> 0 bytes django/apps/users/models.py | 257 - django/apps/users/permissions.py | 310 - django/apps/users/services.py | 592 - django/apps/users/tasks.py | 343 - django/apps/versioning/__init__.py | 0 .../__pycache__/__init__.cpython-313.pyc | Bin 179 -> 0 bytes .../__pycache__/admin.cpython-313.pyc | Bin 8150 -> 0 bytes .../__pycache__/apps.cpython-313.pyc | Bin 644 -> 0 bytes .../__pycache__/models.cpython-313.pyc | Bin 9800 -> 0 bytes .../__pycache__/services.cpython-313.pyc | Bin 15407 -> 0 bytes django/apps/versioning/admin.py | 236 - django/apps/versioning/apps.py | 11 - .../versioning/migrations/0001_initial.py | 165 - django/apps/versioning/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-313.pyc | Bin 4794 -> 0 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 190 -> 0 bytes django/apps/versioning/models.py | 287 - django/apps/versioning/services.py | 473 - django/config/__init__.py | 11 - .../__pycache__/__init__.cpython-313.pyc | Bin 417 -> 0 bytes .../config/__pycache__/celery.cpython-313.pyc | Bin 2523 -> 0 bytes .../config/__pycache__/urls.cpython-313.pyc | Bin 1483 -> 0 bytes .../config/__pycache__/wsgi.cpython-313.pyc | Bin 656 -> 0 bytes django/config/asgi.py | 16 - django/config/celery.py | 54 - django/config/celery_beat_schedule.py | 73 - django/config/settings/__init__.py | 17 - .../__pycache__/__init__.cpython-313.pyc | Bin 613 -> 0 bytes .../settings/__pycache__/base.cpython-313.pyc | Bin 11726 -> 0 bytes .../__pycache__/local.cpython-313.pyc | Bin 1273 -> 0 bytes django/config/settings/base.py | 501 - django/config/settings/local.py | 63 - django/config/settings/production.py | 80 - django/config/urls.py | 36 - django/config/wsgi.py | 16 - django/db.sqlite3 | Bin 978944 -> 0 bytes django/manage.py | 22 - django/requirements/base.txt | 69 - django/requirements/local.txt | 23 - django/requirements/production.txt | 11 - django/reviews/__init__.py | 0 django/reviews/admin.py | 3 - django/reviews/apps.py | 6 - django/reviews/migrations/__init__.py | 0 django/reviews/models.py | 3 - django/reviews/tests.py | 3 - django/reviews/views.py | 3 - django/staticfiles/admin/css/autocomplete.css | 275 - django/staticfiles/admin/css/base.css | 1145 -- django/staticfiles/admin/css/changelists.css | 328 - django/staticfiles/admin/css/dark_mode.css | 137 - django/staticfiles/admin/css/dashboard.css | 29 - django/staticfiles/admin/css/forms.css | 530 - django/staticfiles/admin/css/login.css | 61 - django/staticfiles/admin/css/nav_sidebar.css | 144 - django/staticfiles/admin/css/responsive.css | 999 -- .../staticfiles/admin/css/responsive_rtl.css | 84 - django/staticfiles/admin/css/rtl.css | 298 - .../css/vendor/select2/LICENSE-SELECT2.md | 21 - .../admin/css/vendor/select2/select2.css | 481 - .../admin/css/vendor/select2/select2.min.css | 1 - django/staticfiles/admin/css/widgets.css | 604 - django/staticfiles/admin/img/LICENSE | 20 - django/staticfiles/admin/img/README.txt | 7 - .../staticfiles/admin/img/calendar-icons.svg | 14 - .../admin/img/gis/move_vertex_off.svg | 1 - .../admin/img/gis/move_vertex_on.svg | 1 - django/staticfiles/admin/img/icon-addlink.svg | 3 - django/staticfiles/admin/img/icon-alert.svg | 3 - .../staticfiles/admin/img/icon-calendar.svg | 9 - .../staticfiles/admin/img/icon-changelink.svg | 3 - django/staticfiles/admin/img/icon-clock.svg | 9 - .../staticfiles/admin/img/icon-deletelink.svg | 3 - django/staticfiles/admin/img/icon-no.svg | 3 - .../admin/img/icon-unknown-alt.svg | 3 - django/staticfiles/admin/img/icon-unknown.svg | 3 - .../staticfiles/admin/img/icon-viewlink.svg | 3 - django/staticfiles/admin/img/icon-yes.svg | 3 - .../staticfiles/admin/img/inline-delete.svg | 3 - django/staticfiles/admin/img/search.svg | 3 - .../staticfiles/admin/img/selector-icons.svg | 34 - .../staticfiles/admin/img/sorting-icons.svg | 19 - django/staticfiles/admin/img/tooltag-add.svg | 3 - .../admin/img/tooltag-arrowright.svg | 3 - django/staticfiles/admin/js/SelectBox.js | 116 - django/staticfiles/admin/js/SelectFilter2.js | 283 - django/staticfiles/admin/js/actions.js | 201 - .../admin/js/admin/DateTimeShortcuts.js | 408 - .../admin/js/admin/RelatedObjectLookups.js | 295 - django/staticfiles/admin/js/autocomplete.js | 33 - django/staticfiles/admin/js/calendar.js | 221 - django/staticfiles/admin/js/cancel.js | 29 - django/staticfiles/admin/js/change_form.js | 16 - django/staticfiles/admin/js/collapse.js | 43 - django/staticfiles/admin/js/core.js | 170 - django/staticfiles/admin/js/filters.js | 30 - django/staticfiles/admin/js/inlines.js | 359 - django/staticfiles/admin/js/jquery.init.js | 8 - django/staticfiles/admin/js/nav_sidebar.js | 79 - django/staticfiles/admin/js/popup_response.js | 16 - django/staticfiles/admin/js/prepopulate.js | 43 - .../staticfiles/admin/js/prepopulate_init.js | 15 - django/staticfiles/admin/js/theme.js | 56 - django/staticfiles/admin/js/urlify.js | 169 - .../admin/js/vendor/jquery/LICENSE.txt | 20 - .../admin/js/vendor/jquery/jquery.js | 10965 ---------------- .../admin/js/vendor/jquery/jquery.min.js | 2 - .../admin/js/vendor/select2/LICENSE.md | 21 - .../admin/js/vendor/select2/i18n/af.js | 3 - .../admin/js/vendor/select2/i18n/ar.js | 3 - .../admin/js/vendor/select2/i18n/az.js | 3 - .../admin/js/vendor/select2/i18n/bg.js | 3 - .../admin/js/vendor/select2/i18n/bn.js | 3 - .../admin/js/vendor/select2/i18n/bs.js | 3 - .../admin/js/vendor/select2/i18n/ca.js | 3 - .../admin/js/vendor/select2/i18n/cs.js | 3 - .../admin/js/vendor/select2/i18n/da.js | 3 - .../admin/js/vendor/select2/i18n/de.js | 3 - .../admin/js/vendor/select2/i18n/dsb.js | 3 - .../admin/js/vendor/select2/i18n/el.js | 3 - .../admin/js/vendor/select2/i18n/en.js | 3 - .../admin/js/vendor/select2/i18n/es.js | 3 - .../admin/js/vendor/select2/i18n/et.js | 3 - .../admin/js/vendor/select2/i18n/eu.js | 3 - .../admin/js/vendor/select2/i18n/fa.js | 3 - .../admin/js/vendor/select2/i18n/fi.js | 3 - .../admin/js/vendor/select2/i18n/fr.js | 3 - .../admin/js/vendor/select2/i18n/gl.js | 3 - .../admin/js/vendor/select2/i18n/he.js | 3 - .../admin/js/vendor/select2/i18n/hi.js | 3 - .../admin/js/vendor/select2/i18n/hr.js | 3 - .../admin/js/vendor/select2/i18n/hsb.js | 3 - .../admin/js/vendor/select2/i18n/hu.js | 3 - .../admin/js/vendor/select2/i18n/hy.js | 3 - .../admin/js/vendor/select2/i18n/id.js | 3 - .../admin/js/vendor/select2/i18n/is.js | 3 - .../admin/js/vendor/select2/i18n/it.js | 3 - .../admin/js/vendor/select2/i18n/ja.js | 3 - .../admin/js/vendor/select2/i18n/ka.js | 3 - .../admin/js/vendor/select2/i18n/km.js | 3 - .../admin/js/vendor/select2/i18n/ko.js | 3 - .../admin/js/vendor/select2/i18n/lt.js | 3 - .../admin/js/vendor/select2/i18n/lv.js | 3 - .../admin/js/vendor/select2/i18n/mk.js | 3 - .../admin/js/vendor/select2/i18n/ms.js | 3 - .../admin/js/vendor/select2/i18n/nb.js | 3 - .../admin/js/vendor/select2/i18n/ne.js | 3 - .../admin/js/vendor/select2/i18n/nl.js | 3 - .../admin/js/vendor/select2/i18n/pl.js | 3 - .../admin/js/vendor/select2/i18n/ps.js | 3 - .../admin/js/vendor/select2/i18n/pt-BR.js | 3 - .../admin/js/vendor/select2/i18n/pt.js | 3 - .../admin/js/vendor/select2/i18n/ro.js | 3 - .../admin/js/vendor/select2/i18n/ru.js | 3 - .../admin/js/vendor/select2/i18n/sk.js | 3 - .../admin/js/vendor/select2/i18n/sl.js | 3 - .../admin/js/vendor/select2/i18n/sq.js | 3 - .../admin/js/vendor/select2/i18n/sr-Cyrl.js | 3 - .../admin/js/vendor/select2/i18n/sr.js | 3 - .../admin/js/vendor/select2/i18n/sv.js | 3 - .../admin/js/vendor/select2/i18n/th.js | 3 - .../admin/js/vendor/select2/i18n/tk.js | 3 - .../admin/js/vendor/select2/i18n/tr.js | 3 - .../admin/js/vendor/select2/i18n/uk.js | 3 - .../admin/js/vendor/select2/i18n/vi.js | 3 - .../admin/js/vendor/select2/i18n/zh-CN.js | 3 - .../admin/js/vendor/select2/i18n/zh-TW.js | 3 - .../admin/js/vendor/select2/select2.full.js | 6820 ---------- .../js/vendor/select2/select2.full.min.js | 2 - .../admin/js/vendor/xregexp/LICENSE.txt | 21 - .../admin/js/vendor/xregexp/xregexp.js | 4652 ------- .../admin/js/vendor/xregexp/xregexp.min.js | 160 - .../css/jquery.autocomplete.css | 38 - .../django_extensions/img/indicator.gif | Bin 1553 -> 0 bytes .../django_extensions/js/jquery.ajaxQueue.js | 116 - .../js/jquery.autocomplete.js | 1152 -- .../django_extensions/js/jquery.bgiframe.js | 39 - django/staticfiles/gis/css/ol3.css | 39 - django/staticfiles/gis/img/draw_line_off.svg | 1 - django/staticfiles/gis/img/draw_line_on.svg | 1 - django/staticfiles/gis/img/draw_point_off.svg | 1 - django/staticfiles/gis/img/draw_point_on.svg | 1 - .../staticfiles/gis/img/draw_polygon_off.svg | 1 - .../staticfiles/gis/img/draw_polygon_on.svg | 1 - django/staticfiles/gis/js/OLMapWidget.js | 238 - django/staticfiles/guardian/img/icon-no.svg | 3 - django/staticfiles/guardian/img/icon-yes.svg | 3 - django/staticfiles/import_export/export.css | 7 - .../import_export/export_selectable_fields.js | 45 - .../staticfiles/import_export/guess_format.js | 21 - django/staticfiles/import_export/import.css | 159 - django/staticfiles/ninja/favicon.png | Bin 6234 -> 0 bytes django/staticfiles/ninja/redoc.standalone.js | 1806 --- .../staticfiles/ninja/redoc.standalone.js.map | 1 - django/staticfiles/ninja/swagger-ui-bundle.js | 3 - .../ninja/swagger-ui-bundle.js.map | 1 - django/staticfiles/ninja/swagger-ui-init.js | 46 - django/staticfiles/ninja/swagger-ui.css | 3 - django/staticfiles/ninja/swagger-ui.css.map | 1 - .../css/bootstrap-theme.min.css | 6 - .../css/bootstrap-theme.min.css.map | 1 - .../rest_framework/css/bootstrap-tweaks.css | 237 - .../rest_framework/css/bootstrap.min.css | 6 - .../rest_framework/css/bootstrap.min.css.map | 1 - .../rest_framework/css/default.css | 82 - .../rest_framework/css/font-awesome-4.0.3.css | 1338 -- .../rest_framework/css/prettify.css | 30 - .../rest_framework/docs/css/base.css | 359 - .../rest_framework/docs/css/highlight.css | 125 - .../docs/css/jquery.json-view.min.css | 11 - .../rest_framework/docs/img/favicon.ico | Bin 5430 -> 0 bytes .../rest_framework/docs/img/grid.png | Bin 1458 -> 0 bytes .../staticfiles/rest_framework/docs/js/api.js | 315 - .../rest_framework/docs/js/highlight.pack.js | 2 - .../docs/js/jquery.json-view.min.js | 7 - .../fonts/fontawesome-webfont.eot | Bin 38205 -> 0 bytes .../fonts/fontawesome-webfont.svg | 414 - .../fonts/fontawesome-webfont.ttf | Bin 80652 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 44432 -> 0 bytes .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../img/glyphicons-halflings.png | Bin 12762 -> 0 bytes .../staticfiles/rest_framework/img/grid.png | Bin 1458 -> 0 bytes .../rest_framework/js/ajax-form.js | 133 - .../rest_framework/js/bootstrap.min.js | 6 - .../rest_framework/js/coreapi-0.1.1.js | 2043 --- django/staticfiles/rest_framework/js/csrf.js | 53 - .../staticfiles/rest_framework/js/default.js | 47 - .../rest_framework/js/jquery-3.7.1.min.js | 2 - .../rest_framework/js/load-ajax-form.js | 3 - .../rest_framework/js/prettify-min.js | 28 - django/staticfiles/unfold/css/simplebar.css | 230 - django/staticfiles/unfold/css/styles.css | 1 - .../unfold/filters/css/nouislider.min.css | 1 - .../unfold/filters/js/DateTimeShortcuts.js | 408 - .../unfold/filters/js/admin-numeric-filter.js | 35 - .../unfold/filters/js/nouislider.min.js | 1 - .../unfold/filters/js/wNumb.min.js | 1 - .../unfold/fonts/inter/Inter-Bold.woff2 | Bin 46552 -> 0 bytes .../unfold/fonts/inter/Inter-Medium.woff2 | Bin 46552 -> 0 bytes .../unfold/fonts/inter/Inter-Regular.woff2 | Bin 46552 -> 0 bytes .../unfold/fonts/inter/Inter-SemiBold.woff2 | Bin 46552 -> 0 bytes .../staticfiles/unfold/fonts/inter/styles.css | 31 - .../Material-Symbols-Outlined.woff2 | Bin 349864 -> 0 bytes .../unfold/fonts/material-symbols/styles.css | 23 - django/staticfiles/unfold/forms/css/trix.css | 412 - .../unfold/forms/js/trix.config.js | 39 - django/staticfiles/unfold/forms/js/trix.js | 5 - django/staticfiles/unfold/js/alpine.anchor.js | 1 - django/staticfiles/unfold/js/alpine.js | 5 - .../staticfiles/unfold/js/alpine.persist.js | 1 - django/staticfiles/unfold/js/app.js | 306 - django/staticfiles/unfold/js/chart.js | 1 - django/staticfiles/unfold/js/htmx.js | 1 - django/staticfiles/unfold/js/select2.init.js | 15 - django/staticfiles/unfold/js/simplebar.js | 10 - django/templates/emails/base.html | 102 - .../templates/emails/moderation_approved.html | 50 - .../templates/emails/moderation_rejected.html | 67 - django/templates/emails/password_reset.html | 47 - django/templates/emails/welcome.html | 45 - 405 files changed, 67688 deletions(-) delete mode 100644 django/.env.example delete mode 100644 django/ADMIN_GUIDE.md delete mode 100644 django/API_GUIDE.md delete mode 100644 django/COMPLETE_MIGRATION_AUDIT.md delete mode 100644 django/MIGRATION_PLAN.md delete mode 100644 django/MIGRATION_STATUS_FINAL.md delete mode 100644 django/PHASE_2C_COMPLETE.md delete mode 100644 django/PHASE_2_SEARCH_GIN_INDEXES_COMPLETE.md delete mode 100644 django/PHASE_3_COMPLETE.md delete mode 100644 django/PHASE_3_SEARCH_VECTOR_OPTIMIZATION_COMPLETE.md delete mode 100644 django/PHASE_4_COMPLETE.md delete mode 100644 django/PHASE_4_SEARCH_VECTOR_SIGNALS_COMPLETE.md delete mode 100644 django/PHASE_5_AUTHENTICATION_COMPLETE.md delete mode 100644 django/PHASE_6_MEDIA_COMPLETE.md delete mode 100644 django/PHASE_7_CELERY_COMPLETE.md delete mode 100644 django/PHASE_8_SEARCH_COMPLETE.md delete mode 100644 django/POSTGIS_SETUP.md delete mode 100644 django/README.md delete mode 100644 django/README_MONITORING.md delete mode 100644 django/api/__init__.py delete mode 100644 django/api/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/api/v1/__init__.py delete mode 100644 django/api/v1/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/api/v1/__pycache__/api.cpython-313.pyc delete mode 100644 django/api/v1/__pycache__/schemas.cpython-313.pyc delete mode 100644 django/api/v1/api.py delete mode 100644 django/api/v1/endpoints/__init__.py delete mode 100644 django/api/v1/endpoints/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/auth.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/companies.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/moderation.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/parks.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/photos.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/ride_models.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/rides.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/search.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/__pycache__/versioning.cpython-313.pyc delete mode 100644 django/api/v1/endpoints/auth.py delete mode 100644 django/api/v1/endpoints/companies.py delete mode 100644 django/api/v1/endpoints/moderation.py delete mode 100644 django/api/v1/endpoints/parks.py delete mode 100644 django/api/v1/endpoints/photos.py delete mode 100644 django/api/v1/endpoints/ride_models.py delete mode 100644 django/api/v1/endpoints/rides.py delete mode 100644 django/api/v1/endpoints/search.py delete mode 100644 django/api/v1/endpoints/versioning.py delete mode 100644 django/api/v1/schemas.py delete mode 100644 django/apps/__init__.py delete mode 100644 django/apps/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/core/__init__.py delete mode 100644 django/apps/core/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/core/__pycache__/apps.cpython-313.pyc delete mode 100644 django/apps/core/__pycache__/models.cpython-313.pyc delete mode 100644 django/apps/core/apps.py delete mode 100644 django/apps/core/migrations/0001_initial.py delete mode 100644 django/apps/core/migrations/__init__.py delete mode 100644 django/apps/core/migrations/__pycache__/0001_initial.cpython-313.pyc delete mode 100644 django/apps/core/migrations/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/core/models.py delete mode 100644 django/apps/entities/__init__.py delete mode 100644 django/apps/entities/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/entities/__pycache__/admin.cpython-313.pyc delete mode 100644 django/apps/entities/__pycache__/apps.cpython-313.pyc delete mode 100644 django/apps/entities/__pycache__/models.cpython-313.pyc delete mode 100644 django/apps/entities/__pycache__/search.cpython-313.pyc delete mode 100644 django/apps/entities/__pycache__/signals.cpython-313.pyc delete mode 100644 django/apps/entities/admin.py delete mode 100644 django/apps/entities/apps.py delete mode 100644 django/apps/entities/filters.py delete mode 100644 django/apps/entities/migrations/0001_initial.py delete mode 100644 django/apps/entities/migrations/0002_alter_park_latitude_alter_park_longitude.py delete mode 100644 django/apps/entities/migrations/0003_add_search_vector_gin_indexes.py delete mode 100644 django/apps/entities/migrations/__init__.py delete mode 100644 django/apps/entities/migrations/__pycache__/0001_initial.cpython-313.pyc delete mode 100644 django/apps/entities/migrations/__pycache__/0002_add_postgis_location.cpython-313.pyc delete mode 100644 django/apps/entities/migrations/__pycache__/0002_alter_park_latitude_alter_park_longitude.cpython-313.pyc delete mode 100644 django/apps/entities/migrations/__pycache__/0003_add_search_vector_gin_indexes.cpython-313.pyc delete mode 100644 django/apps/entities/migrations/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/entities/models.py delete mode 100644 django/apps/entities/search.py delete mode 100644 django/apps/entities/signals.py delete mode 100644 django/apps/entities/tasks.py delete mode 100644 django/apps/media/__init__.py delete mode 100644 django/apps/media/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/media/__pycache__/admin.cpython-313.pyc delete mode 100644 django/apps/media/__pycache__/apps.cpython-313.pyc delete mode 100644 django/apps/media/__pycache__/models.cpython-313.pyc delete mode 100644 django/apps/media/__pycache__/services.cpython-313.pyc delete mode 100644 django/apps/media/__pycache__/validators.cpython-313.pyc delete mode 100644 django/apps/media/admin.py delete mode 100644 django/apps/media/apps.py delete mode 100644 django/apps/media/migrations/0001_initial.py delete mode 100644 django/apps/media/migrations/__init__.py delete mode 100644 django/apps/media/migrations/__pycache__/0001_initial.cpython-313.pyc delete mode 100644 django/apps/media/migrations/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/media/models.py delete mode 100644 django/apps/media/services.py delete mode 100644 django/apps/media/tasks.py delete mode 100644 django/apps/media/validators.py delete mode 100644 django/apps/moderation/__init__.py delete mode 100644 django/apps/moderation/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/moderation/__pycache__/admin.cpython-313.pyc delete mode 100644 django/apps/moderation/__pycache__/apps.cpython-313.pyc delete mode 100644 django/apps/moderation/__pycache__/models.cpython-313.pyc delete mode 100644 django/apps/moderation/__pycache__/services.cpython-313.pyc delete mode 100644 django/apps/moderation/admin.py delete mode 100644 django/apps/moderation/apps.py delete mode 100644 django/apps/moderation/migrations/0001_initial.py delete mode 100644 django/apps/moderation/migrations/__init__.py delete mode 100644 django/apps/moderation/migrations/__pycache__/0001_initial.cpython-313.pyc delete mode 100644 django/apps/moderation/migrations/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/moderation/models.py delete mode 100644 django/apps/moderation/services.py delete mode 100644 django/apps/moderation/tasks.py delete mode 100644 django/apps/monitoring/__init__.py delete mode 100644 django/apps/monitoring/apps.py delete mode 100644 django/apps/monitoring/metrics_collector.py delete mode 100644 django/apps/monitoring/middleware.py delete mode 100644 django/apps/monitoring/tasks.py delete mode 100644 django/apps/monitoring/tasks_retention.py delete mode 100644 django/apps/notifications/__init__.py delete mode 100644 django/apps/notifications/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/notifications/__pycache__/apps.cpython-313.pyc delete mode 100644 django/apps/notifications/__pycache__/models.cpython-313.pyc delete mode 100644 django/apps/notifications/apps.py delete mode 100644 django/apps/notifications/models.py delete mode 100644 django/apps/reviews/apps.py delete mode 100644 django/apps/users/__init__.py delete mode 100644 django/apps/users/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/users/__pycache__/admin.cpython-313.pyc delete mode 100644 django/apps/users/__pycache__/apps.cpython-313.pyc delete mode 100644 django/apps/users/__pycache__/models.cpython-313.pyc delete mode 100644 django/apps/users/__pycache__/permissions.cpython-313.pyc delete mode 100644 django/apps/users/__pycache__/services.cpython-313.pyc delete mode 100644 django/apps/users/admin.py delete mode 100644 django/apps/users/apps.py delete mode 100644 django/apps/users/migrations/0001_initial.py delete mode 100644 django/apps/users/migrations/__init__.py delete mode 100644 django/apps/users/migrations/__pycache__/0001_initial.cpython-313.pyc delete mode 100644 django/apps/users/migrations/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/users/models.py delete mode 100644 django/apps/users/permissions.py delete mode 100644 django/apps/users/services.py delete mode 100644 django/apps/users/tasks.py delete mode 100644 django/apps/versioning/__init__.py delete mode 100644 django/apps/versioning/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/versioning/__pycache__/admin.cpython-313.pyc delete mode 100644 django/apps/versioning/__pycache__/apps.cpython-313.pyc delete mode 100644 django/apps/versioning/__pycache__/models.cpython-313.pyc delete mode 100644 django/apps/versioning/__pycache__/services.cpython-313.pyc delete mode 100644 django/apps/versioning/admin.py delete mode 100644 django/apps/versioning/apps.py delete mode 100644 django/apps/versioning/migrations/0001_initial.py delete mode 100644 django/apps/versioning/migrations/__init__.py delete mode 100644 django/apps/versioning/migrations/__pycache__/0001_initial.cpython-313.pyc delete mode 100644 django/apps/versioning/migrations/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/apps/versioning/models.py delete mode 100644 django/apps/versioning/services.py delete mode 100644 django/config/__init__.py delete mode 100644 django/config/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/config/__pycache__/celery.cpython-313.pyc delete mode 100644 django/config/__pycache__/urls.cpython-313.pyc delete mode 100644 django/config/__pycache__/wsgi.cpython-313.pyc delete mode 100644 django/config/asgi.py delete mode 100644 django/config/celery.py delete mode 100644 django/config/celery_beat_schedule.py delete mode 100644 django/config/settings/__init__.py delete mode 100644 django/config/settings/__pycache__/__init__.cpython-313.pyc delete mode 100644 django/config/settings/__pycache__/base.cpython-313.pyc delete mode 100644 django/config/settings/__pycache__/local.cpython-313.pyc delete mode 100644 django/config/settings/base.py delete mode 100644 django/config/settings/local.py delete mode 100644 django/config/settings/production.py delete mode 100644 django/config/urls.py delete mode 100644 django/config/wsgi.py delete mode 100644 django/db.sqlite3 delete mode 100755 django/manage.py delete mode 100644 django/requirements/base.txt delete mode 100644 django/requirements/local.txt delete mode 100644 django/requirements/production.txt delete mode 100644 django/reviews/__init__.py delete mode 100644 django/reviews/admin.py delete mode 100644 django/reviews/apps.py delete mode 100644 django/reviews/migrations/__init__.py delete mode 100644 django/reviews/models.py delete mode 100644 django/reviews/tests.py delete mode 100644 django/reviews/views.py delete mode 100644 django/staticfiles/admin/css/autocomplete.css delete mode 100644 django/staticfiles/admin/css/base.css delete mode 100644 django/staticfiles/admin/css/changelists.css delete mode 100644 django/staticfiles/admin/css/dark_mode.css delete mode 100644 django/staticfiles/admin/css/dashboard.css delete mode 100644 django/staticfiles/admin/css/forms.css delete mode 100644 django/staticfiles/admin/css/login.css delete mode 100644 django/staticfiles/admin/css/nav_sidebar.css delete mode 100644 django/staticfiles/admin/css/responsive.css delete mode 100644 django/staticfiles/admin/css/responsive_rtl.css delete mode 100644 django/staticfiles/admin/css/rtl.css delete mode 100644 django/staticfiles/admin/css/vendor/select2/LICENSE-SELECT2.md delete mode 100644 django/staticfiles/admin/css/vendor/select2/select2.css delete mode 100644 django/staticfiles/admin/css/vendor/select2/select2.min.css delete mode 100644 django/staticfiles/admin/css/widgets.css delete mode 100644 django/staticfiles/admin/img/LICENSE delete mode 100644 django/staticfiles/admin/img/README.txt delete mode 100644 django/staticfiles/admin/img/calendar-icons.svg delete mode 100644 django/staticfiles/admin/img/gis/move_vertex_off.svg delete mode 100644 django/staticfiles/admin/img/gis/move_vertex_on.svg delete mode 100644 django/staticfiles/admin/img/icon-addlink.svg delete mode 100644 django/staticfiles/admin/img/icon-alert.svg delete mode 100644 django/staticfiles/admin/img/icon-calendar.svg delete mode 100644 django/staticfiles/admin/img/icon-changelink.svg delete mode 100644 django/staticfiles/admin/img/icon-clock.svg delete mode 100644 django/staticfiles/admin/img/icon-deletelink.svg delete mode 100644 django/staticfiles/admin/img/icon-no.svg delete mode 100644 django/staticfiles/admin/img/icon-unknown-alt.svg delete mode 100644 django/staticfiles/admin/img/icon-unknown.svg delete mode 100644 django/staticfiles/admin/img/icon-viewlink.svg delete mode 100644 django/staticfiles/admin/img/icon-yes.svg delete mode 100644 django/staticfiles/admin/img/inline-delete.svg delete mode 100644 django/staticfiles/admin/img/search.svg delete mode 100644 django/staticfiles/admin/img/selector-icons.svg delete mode 100644 django/staticfiles/admin/img/sorting-icons.svg delete mode 100644 django/staticfiles/admin/img/tooltag-add.svg delete mode 100644 django/staticfiles/admin/img/tooltag-arrowright.svg delete mode 100644 django/staticfiles/admin/js/SelectBox.js delete mode 100644 django/staticfiles/admin/js/SelectFilter2.js delete mode 100644 django/staticfiles/admin/js/actions.js delete mode 100644 django/staticfiles/admin/js/admin/DateTimeShortcuts.js delete mode 100644 django/staticfiles/admin/js/admin/RelatedObjectLookups.js delete mode 100644 django/staticfiles/admin/js/autocomplete.js delete mode 100644 django/staticfiles/admin/js/calendar.js delete mode 100644 django/staticfiles/admin/js/cancel.js delete mode 100644 django/staticfiles/admin/js/change_form.js delete mode 100644 django/staticfiles/admin/js/collapse.js delete mode 100644 django/staticfiles/admin/js/core.js delete mode 100644 django/staticfiles/admin/js/filters.js delete mode 100644 django/staticfiles/admin/js/inlines.js delete mode 100644 django/staticfiles/admin/js/jquery.init.js delete mode 100644 django/staticfiles/admin/js/nav_sidebar.js delete mode 100644 django/staticfiles/admin/js/popup_response.js delete mode 100644 django/staticfiles/admin/js/prepopulate.js delete mode 100644 django/staticfiles/admin/js/prepopulate_init.js delete mode 100644 django/staticfiles/admin/js/theme.js delete mode 100644 django/staticfiles/admin/js/urlify.js delete mode 100644 django/staticfiles/admin/js/vendor/jquery/LICENSE.txt delete mode 100644 django/staticfiles/admin/js/vendor/jquery/jquery.js delete mode 100644 django/staticfiles/admin/js/vendor/jquery/jquery.min.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/LICENSE.md delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/af.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ar.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/az.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/bg.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/bn.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/bs.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ca.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/cs.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/da.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/de.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/dsb.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/el.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/en.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/es.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/et.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/eu.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/fa.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/fi.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/fr.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/gl.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/he.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/hi.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/hr.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/hsb.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/hu.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/hy.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/id.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/is.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/it.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ja.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ka.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/km.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ko.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/lt.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/lv.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/mk.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ms.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/nb.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ne.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/nl.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/pl.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ps.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/pt-BR.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/pt.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ro.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/ru.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/sk.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/sl.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/sq.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/sr-Cyrl.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/sr.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/sv.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/th.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/tk.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/tr.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/uk.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/vi.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/zh-CN.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/i18n/zh-TW.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/select2.full.js delete mode 100644 django/staticfiles/admin/js/vendor/select2/select2.full.min.js delete mode 100644 django/staticfiles/admin/js/vendor/xregexp/LICENSE.txt delete mode 100644 django/staticfiles/admin/js/vendor/xregexp/xregexp.js delete mode 100644 django/staticfiles/admin/js/vendor/xregexp/xregexp.min.js delete mode 100644 django/staticfiles/django_extensions/css/jquery.autocomplete.css delete mode 100644 django/staticfiles/django_extensions/img/indicator.gif delete mode 100644 django/staticfiles/django_extensions/js/jquery.ajaxQueue.js delete mode 100644 django/staticfiles/django_extensions/js/jquery.autocomplete.js delete mode 100644 django/staticfiles/django_extensions/js/jquery.bgiframe.js delete mode 100644 django/staticfiles/gis/css/ol3.css delete mode 100644 django/staticfiles/gis/img/draw_line_off.svg delete mode 100644 django/staticfiles/gis/img/draw_line_on.svg delete mode 100644 django/staticfiles/gis/img/draw_point_off.svg delete mode 100644 django/staticfiles/gis/img/draw_point_on.svg delete mode 100644 django/staticfiles/gis/img/draw_polygon_off.svg delete mode 100644 django/staticfiles/gis/img/draw_polygon_on.svg delete mode 100644 django/staticfiles/gis/js/OLMapWidget.js delete mode 100644 django/staticfiles/guardian/img/icon-no.svg delete mode 100644 django/staticfiles/guardian/img/icon-yes.svg delete mode 100644 django/staticfiles/import_export/export.css delete mode 100644 django/staticfiles/import_export/export_selectable_fields.js delete mode 100644 django/staticfiles/import_export/guess_format.js delete mode 100644 django/staticfiles/import_export/import.css delete mode 100644 django/staticfiles/ninja/favicon.png delete mode 100644 django/staticfiles/ninja/redoc.standalone.js delete mode 100644 django/staticfiles/ninja/redoc.standalone.js.map delete mode 100644 django/staticfiles/ninja/swagger-ui-bundle.js delete mode 100644 django/staticfiles/ninja/swagger-ui-bundle.js.map delete mode 100644 django/staticfiles/ninja/swagger-ui-init.js delete mode 100644 django/staticfiles/ninja/swagger-ui.css delete mode 100644 django/staticfiles/ninja/swagger-ui.css.map delete mode 100644 django/staticfiles/rest_framework/css/bootstrap-theme.min.css delete mode 100644 django/staticfiles/rest_framework/css/bootstrap-theme.min.css.map delete mode 100644 django/staticfiles/rest_framework/css/bootstrap-tweaks.css delete mode 100644 django/staticfiles/rest_framework/css/bootstrap.min.css delete mode 100644 django/staticfiles/rest_framework/css/bootstrap.min.css.map delete mode 100644 django/staticfiles/rest_framework/css/default.css delete mode 100644 django/staticfiles/rest_framework/css/font-awesome-4.0.3.css delete mode 100644 django/staticfiles/rest_framework/css/prettify.css delete mode 100644 django/staticfiles/rest_framework/docs/css/base.css delete mode 100644 django/staticfiles/rest_framework/docs/css/highlight.css delete mode 100644 django/staticfiles/rest_framework/docs/css/jquery.json-view.min.css delete mode 100644 django/staticfiles/rest_framework/docs/img/favicon.ico delete mode 100644 django/staticfiles/rest_framework/docs/img/grid.png delete mode 100644 django/staticfiles/rest_framework/docs/js/api.js delete mode 100644 django/staticfiles/rest_framework/docs/js/highlight.pack.js delete mode 100644 django/staticfiles/rest_framework/docs/js/jquery.json-view.min.js delete mode 100644 django/staticfiles/rest_framework/fonts/fontawesome-webfont.eot delete mode 100644 django/staticfiles/rest_framework/fonts/fontawesome-webfont.svg delete mode 100644 django/staticfiles/rest_framework/fonts/fontawesome-webfont.ttf delete mode 100644 django/staticfiles/rest_framework/fonts/fontawesome-webfont.woff delete mode 100644 django/staticfiles/rest_framework/fonts/glyphicons-halflings-regular.eot delete mode 100644 django/staticfiles/rest_framework/fonts/glyphicons-halflings-regular.svg delete mode 100644 django/staticfiles/rest_framework/fonts/glyphicons-halflings-regular.ttf delete mode 100644 django/staticfiles/rest_framework/fonts/glyphicons-halflings-regular.woff delete mode 100644 django/staticfiles/rest_framework/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 django/staticfiles/rest_framework/img/glyphicons-halflings-white.png delete mode 100644 django/staticfiles/rest_framework/img/glyphicons-halflings.png delete mode 100644 django/staticfiles/rest_framework/img/grid.png delete mode 100644 django/staticfiles/rest_framework/js/ajax-form.js delete mode 100644 django/staticfiles/rest_framework/js/bootstrap.min.js delete mode 100644 django/staticfiles/rest_framework/js/coreapi-0.1.1.js delete mode 100644 django/staticfiles/rest_framework/js/csrf.js delete mode 100644 django/staticfiles/rest_framework/js/default.js delete mode 100644 django/staticfiles/rest_framework/js/jquery-3.7.1.min.js delete mode 100644 django/staticfiles/rest_framework/js/load-ajax-form.js delete mode 100644 django/staticfiles/rest_framework/js/prettify-min.js delete mode 100644 django/staticfiles/unfold/css/simplebar.css delete mode 100644 django/staticfiles/unfold/css/styles.css delete mode 100644 django/staticfiles/unfold/filters/css/nouislider.min.css delete mode 100644 django/staticfiles/unfold/filters/js/DateTimeShortcuts.js delete mode 100644 django/staticfiles/unfold/filters/js/admin-numeric-filter.js delete mode 100644 django/staticfiles/unfold/filters/js/nouislider.min.js delete mode 100644 django/staticfiles/unfold/filters/js/wNumb.min.js delete mode 100644 django/staticfiles/unfold/fonts/inter/Inter-Bold.woff2 delete mode 100644 django/staticfiles/unfold/fonts/inter/Inter-Medium.woff2 delete mode 100644 django/staticfiles/unfold/fonts/inter/Inter-Regular.woff2 delete mode 100644 django/staticfiles/unfold/fonts/inter/Inter-SemiBold.woff2 delete mode 100644 django/staticfiles/unfold/fonts/inter/styles.css delete mode 100644 django/staticfiles/unfold/fonts/material-symbols/Material-Symbols-Outlined.woff2 delete mode 100644 django/staticfiles/unfold/fonts/material-symbols/styles.css delete mode 100644 django/staticfiles/unfold/forms/css/trix.css delete mode 100644 django/staticfiles/unfold/forms/js/trix.config.js delete mode 100644 django/staticfiles/unfold/forms/js/trix.js delete mode 100644 django/staticfiles/unfold/js/alpine.anchor.js delete mode 100644 django/staticfiles/unfold/js/alpine.js delete mode 100644 django/staticfiles/unfold/js/alpine.persist.js delete mode 100644 django/staticfiles/unfold/js/app.js delete mode 100644 django/staticfiles/unfold/js/chart.js delete mode 100644 django/staticfiles/unfold/js/htmx.js delete mode 100644 django/staticfiles/unfold/js/select2.init.js delete mode 100644 django/staticfiles/unfold/js/simplebar.js delete mode 100644 django/templates/emails/base.html delete mode 100644 django/templates/emails/moderation_approved.html delete mode 100644 django/templates/emails/moderation_rejected.html delete mode 100644 django/templates/emails/password_reset.html delete mode 100644 django/templates/emails/welcome.html diff --git a/django/.env.example b/django/.env.example deleted file mode 100644 index b86ae45a..00000000 --- a/django/.env.example +++ /dev/null @@ -1,35 +0,0 @@ -# Django Settings -DEBUG=True -SECRET_KEY=your-secret-key-here-change-in-production -ALLOWED_HOSTS=localhost,127.0.0.1 - -# Database -DATABASE_URL=postgresql://user:password@localhost:5432/thrillwiki - -# Redis -REDIS_URL=redis://localhost:6379/0 - -# Celery -CELERY_BROKER_URL=redis://localhost:6379/0 -CELERY_RESULT_BACKEND=redis://localhost:6379/1 - -# CloudFlare Images -CLOUDFLARE_ACCOUNT_ID=your-account-id -CLOUDFLARE_IMAGE_TOKEN=your-token -CLOUDFLARE_IMAGE_HASH=your-hash - -# Novu -NOVU_API_KEY=your-novu-api-key -NOVU_API_URL=https://api.novu.co - -# Sentry -SENTRY_DSN=your-sentry-dsn - -# CORS -CORS_ALLOWED_ORIGINS=http://localhost:5173,http://localhost:3000 - -# OAuth -GOOGLE_CLIENT_ID= -GOOGLE_CLIENT_SECRET= -DISCORD_CLIENT_ID= -DISCORD_CLIENT_SECRET= diff --git a/django/ADMIN_GUIDE.md b/django/ADMIN_GUIDE.md deleted file mode 100644 index adc041b7..00000000 --- a/django/ADMIN_GUIDE.md +++ /dev/null @@ -1,568 +0,0 @@ -# ThrillWiki Admin Interface Guide - -## Overview - -The ThrillWiki admin interface uses **Django Unfold**, a modern, Tailwind CSS-based admin theme that provides a beautiful and intuitive user experience. This guide covers all features of the enhanced admin interface implemented in Phase 2C. - -## Table of Contents - -1. [Features](#features) -2. [Accessing the Admin](#accessing-the-admin) -3. [Dashboard](#dashboard) -4. [Entity Management](#entity-management) -5. [Import/Export](#importexport) -6. [Advanced Filtering](#advanced-filtering) -7. [Bulk Actions](#bulk-actions) -8. [Geographic Features](#geographic-features) -9. [Customization](#customization) - ---- - -## Features - -### ✨ Modern UI/UX -- **Tailwind CSS-based design** - Clean, modern interface -- **Dark mode support** - Automatic theme switching -- **Responsive layout** - Works on desktop, tablet, and mobile -- **Material Design icons** - Intuitive visual elements -- **Custom green color scheme** - Branded appearance - -### 🎯 Enhanced Entity Management -- **Inline editing** - Edit related objects without leaving the page -- **Visual indicators** - Color-coded status badges and icons -- **Smart search** - Search across multiple fields -- **Advanced filters** - Dropdown filters for easy data navigation -- **Autocomplete fields** - Fast foreign key selection - -### 📊 Dashboard Statistics -- Total entity counts (Parks, Rides, Companies, Models) -- Operating vs. total counts -- Recent additions (last 30 days) -- Top manufacturers by ride count -- Parks by type distribution - -### 📥 Import/Export -- **Multiple formats** - CSV, Excel (XLS/XLSX), JSON, YAML -- **Bulk operations** - Import hundreds of records at once -- **Data validation** - Error checking during import -- **Export filtered data** - Export search results - -### 🗺️ Geographic Features -- **Dual-mode support** - Works with both SQLite (lat/lng) and PostGIS -- **Coordinate display** - Visual representation of park locations -- **Map widgets** - Interactive maps for location editing (PostGIS mode) - ---- - -## Accessing the Admin - -### URL -``` -http://localhost:8000/admin/ -``` - -### Creating a Superuser - -If you don't have an admin account yet: - -```bash -cd django -python manage.py createsuperuser -``` - -Follow the prompts to create your admin account. - -### Login - -Navigate to `/admin/` and log in with your superuser credentials. - ---- - -## Dashboard - -The admin dashboard provides an at-a-glance view of your ThrillWiki data: - -### Statistics Displayed - -1. **Entity Counts** - - Total Parks - - Total Rides - - Total Companies - - Total Ride Models - -2. **Operational Status** - - Operating Parks - - Operating Rides - - Total Roller Coasters - -3. **Recent Activity** - - Parks added in last 30 days - - Rides added in last 30 days - -4. **Top Manufacturers** - - List of manufacturers by ride count - -5. **Parks by Type** - - Distribution chart of park types - -### Navigating from Dashboard - -Use the sidebar navigation to access different sections: -- **Dashboard** - Overview and statistics -- **Entities** - Parks, Rides, Companies, Ride Models -- **User Management** - Users and Groups -- **Content** - Media and Moderation - ---- - -## Entity Management - -### Parks Admin - -#### List View Features -- **Visual indicators**: Icon and emoji for park type -- **Location display**: City/Country with coordinates -- **Status badges**: Color-coded operational status -- **Ride counts**: Total rides and coaster count -- **Operator links**: Quick access to operating company - -#### Detail View -- **Geographic Location section**: Latitude/longitude input with coordinate display -- **Operator selection**: Autocomplete field for company selection -- **Inline rides**: View and manage all rides in the park -- **Date precision**: Separate fields for dates and their precision levels -- **Custom data**: JSON field for additional attributes - -#### Bulk Actions -- `export_admin_action` - Export selected parks -- `activate_parks` - Mark parks as operating -- `close_parks` - Mark parks as temporarily closed - -#### Filters -- Park Type (dropdown) -- Status (dropdown) -- Operator (dropdown with search) -- Opening Date (range filter) -- Closing Date (range filter) - ---- - -### Rides Admin - -#### List View Features -- **Category icons**: Visual ride category identification -- **Status badges**: Color-coded operational status -- **Stats display**: Height, Speed, Inversions at a glance -- **Coaster badge**: Special indicator for roller coasters -- **Park link**: Quick navigation to parent park - -#### Detail View -- **Classification section**: Category, Type, Status -- **Manufacturer & Model**: Autocomplete fields with search -- **Ride Statistics**: Height, Speed, Length, Duration, Inversions, Capacity -- **Auto-coaster detection**: Automatically marks roller coasters -- **Custom data**: JSON field for additional attributes - -#### Bulk Actions -- `export_admin_action` - Export selected rides -- `activate_rides` - Mark rides as operating -- `close_rides` - Mark rides as temporarily closed - -#### Filters -- Ride Category (dropdown) -- Status (dropdown) -- Is Coaster (boolean) -- Park (dropdown with search) -- Manufacturer (dropdown with search) -- Opening Date (range) -- Height (numeric range) -- Speed (numeric range) - ---- - -### Companies Admin - -#### List View Features -- **Type icons**: Manufacturer 🏭, Operator 🎡, Designer ✏️ -- **Type badges**: Color-coded company type indicators -- **Entity counts**: Parks and rides associated -- **Status indicator**: Active (green) or Closed (red) -- **Location display**: Primary location - -#### Detail View -- **Company types**: Multi-select for manufacturer, operator, designer -- **History section**: Founded/Closed dates with precision -- **Inline parks**: View all operated parks -- **Statistics**: Cached counts for performance - -#### Bulk Actions -- `export_admin_action` - Export selected companies - -#### Filters -- Company Types (dropdown) -- Founded Date (range) -- Closed Date (range) - ---- - -### Ride Models Admin - -#### List View Features -- **Model type icons**: Visual identification (🎢, 🌊, 🎡, etc.) -- **Manufacturer link**: Quick access to manufacturer -- **Typical specs**: Height, Speed, Capacity summary -- **Installation count**: Number of installations worldwide - -#### Detail View -- **Manufacturer**: Autocomplete field -- **Typical Specifications**: Standard specifications for the model -- **Inline installations**: List of all rides using this model - -#### Bulk Actions -- `export_admin_action` - Export selected ride models - -#### Filters -- Model Type (dropdown) -- Manufacturer (dropdown with search) -- Typical Height (numeric range) -- Typical Speed (numeric range) - ---- - -## Import/Export - -### Exporting Data - -1. Navigate to the entity list view (e.g., Parks) -2. Optionally apply filters to narrow down data -3. Select records to export (or none for all) -4. Choose action: "Export" -5. Select format: CSV, Excel (XLS/XLSX), JSON, YAML, HTML -6. Click "Go" -7. Download the file - -### Importing Data - -1. Navigate to the entity list view -2. Click "Import" button in the top right -3. Choose file format -4. Select your import file -5. Click "Submit" -6. Review import preview -7. Confirm import - -### Import File Format - -#### CSV/Excel Requirements -- First row must be column headers -- Use field names from the model -- For foreign keys, use the related object's name -- Dates in ISO format (YYYY-MM-DD) - -#### Example Company CSV -```csv -name,slug,location,company_types,founded_date,website -Intamin,intamin,"Schaan, Liechtenstein","[""manufacturer""]",1967-01-01,https://intamin.com -Cedar Fair,cedar-fair,"Sandusky, Ohio, USA","[""operator""]",1983-03-01,https://cedarfair.com -``` - -#### Example Park CSV -```csv -name,slug,park_type,status,latitude,longitude,operator,opening_date -Cedar Point,cedar-point,amusement_park,operating,41.4779,-82.6838,Cedar Fair,1870-01-01 -``` - -### Import Error Handling - -If import fails: -1. Review error messages carefully -2. Check data formatting -3. Verify foreign key references exist -4. Ensure required fields are present -5. Fix issues and try again - ---- - -## Advanced Filtering - -### Filter Types - -#### 1. **Dropdown Filters** -- Single selection from predefined choices -- Examples: Park Type, Status, Ride Category - -#### 2. **Related Dropdown Filters** -- Dropdown with search for foreign keys -- Examples: Operator, Manufacturer, Park -- Supports autocomplete - -#### 3. **Range Date Filters** -- Filter by date range -- Includes "From" and "To" fields -- Examples: Opening Date, Closing Date - -#### 4. **Range Numeric Filters** -- Filter by numeric range -- Includes "Min" and "Max" fields -- Examples: Height, Speed, Capacity - -#### 5. **Boolean Filters** -- Yes/No/All options -- Example: Is Coaster - -### Combining Filters - -Filters can be combined for precise queries: - -**Example: Find all operating roller coasters at Cedar Fair parks over 50m tall** -1. Go to Rides admin -2. Set "Ride Category" = Roller Coaster -3. Set "Status" = Operating -4. Set "Park" = (search for Cedar Fair parks) -5. Set "Height Min" = 50 - -### Search vs. Filters - -- **Search**: Text-based search across multiple fields (name, description, etc.) -- **Filters**: Structured filtering by specific attributes -- **Best Practice**: Use filters to narrow down, then search within results - ---- - -## Bulk Actions - -### Available Actions - -#### All Entities -- **Export** - Export selected records to file - -#### Parks -- **Activate Parks** - Set status to "operating" -- **Close Parks** - Set status to "closed_temporarily" - -#### Rides -- **Activate Rides** - Set status to "operating" -- **Close Rides** - Set status to "closed_temporarily" - -### How to Use Bulk Actions - -1. Select records using checkboxes -2. Choose action from dropdown at bottom of list -3. Click "Go" -4. Confirm action if prompted -5. View success message - -### Tips -- Select all on page: Use checkbox in header row -- Select all in query: Click "Select all X items" link -- Bulk actions respect permissions -- Some actions cannot be undone - ---- - -## Geographic Features - -### SQLite Mode (Default for Local Development) - -**Fields Available:** -- `latitude` - Decimal field for latitude (-90 to 90) -- `longitude` - Decimal field for longitude (-180 to 180) -- `location` - Text field for location name - -**Coordinate Display:** -- Read-only field showing current coordinates -- Format: "Longitude: X.XXXXXX, Latitude: Y.YYYYYY" - -**Search:** -- `/api/v1/parks/nearby/` uses bounding box approximation - -### PostGIS Mode (Production) - -**Additional Features:** -- `location_point` - PointField for geographic data -- Interactive map widget in admin -- Accurate distance calculations -- Optimized geographic queries - -**Setting Up PostGIS:** -See `POSTGIS_SETUP.md` for detailed instructions. - -### Entering Coordinates - -1. Find coordinates using Google Maps or similar -2. Enter latitude in "Latitude" field -3. Enter longitude in "Longitude" field -4. Enter location name in "Location" field -5. Coordinates are automatically synced to `location_point` (PostGIS mode) - -**Coordinate Format:** -- Latitude: -90.000000 to 90.000000 -- Longitude: -180.000000 to 180.000000 -- Use negative for South/West - ---- - -## Customization - -### Settings Configuration - -The Unfold configuration is in `config/settings/base.py`: - -```python -UNFOLD = { - "SITE_TITLE": "ThrillWiki Admin", - "SITE_HEADER": "ThrillWiki Administration", - "SITE_SYMBOL": "🎢", - "SHOW_HISTORY": True, - "SHOW_VIEW_ON_SITE": True, - # ... more settings -} -``` - -### Customizable Options - -#### Branding -- `SITE_TITLE` - Browser title -- `SITE_HEADER` - Header text -- `SITE_SYMBOL` - Emoji or icon in header -- `SITE_ICON` - Logo image paths - -#### Colors -- `COLORS["primary"]` - Primary color palette (currently green) -- Supports full Tailwind CSS color specification - -#### Navigation -- `SIDEBAR["navigation"]` - Custom sidebar menu structure -- Can add custom links and sections - -### Adding Custom Dashboard Widgets - -The dashboard callback is in `apps/entities/admin.py`: - -```python -def dashboard_callback(request, context): - """Customize dashboard statistics.""" - # Add your custom statistics here - context.update({ - 'custom_stat': calculate_custom_stat(), - }) - return context -``` - -### Custom Admin Actions - -Add custom actions to admin classes: - -```python -@admin.register(Park) -class ParkAdmin(ModelAdmin): - actions = ['export_admin_action', 'custom_action'] - - def custom_action(self, request, queryset): - # Your custom logic here - updated = queryset.update(some_field='value') - self.message_user(request, f'{updated} records updated.') - custom_action.short_description = 'Perform custom action' -``` - ---- - -## Tips & Best Practices - -### Performance -1. **Use filters before searching** - Narrow down data set first -2. **Use autocomplete fields** - Faster than raw ID fields -3. **Limit inline records** - Use `show_change_link` for large datasets -4. **Export in batches** - For very large datasets - -### Data Quality -1. **Use import validation** - Preview before confirming -2. **Verify foreign keys** - Ensure related objects exist -3. **Check date precision** - Use appropriate precision levels -4. **Review before bulk actions** - Double-check selections - -### Navigation -1. **Use breadcrumbs** - Navigate back through hierarchy -2. **Bookmark frequently used filters** - Save time -3. **Use keyboard shortcuts** - Unfold supports many shortcuts -4. **Search then filter** - Or filter then search, depending on need - -### Security -1. **Use strong passwords** - For admin accounts -2. **Enable 2FA** - If available (django-otp configured) -3. **Regular backups** - Before major bulk operations -4. **Audit changes** - Review history in change log - ---- - -## Troubleshooting - -### Issue: Can't see Unfold theme - -**Solution:** -```bash -cd django -python manage.py collectstatic --noinput -``` - -### Issue: Import fails with validation errors - -**Solution:** -- Check CSV formatting -- Verify column headers match field names -- Ensure required fields are present -- Check foreign key references exist - -### Issue: Geographic features not working - -**Solution:** -- Verify latitude/longitude are valid decimals -- Check coordinate ranges (-90 to 90, -180 to 180) -- For PostGIS: Verify PostGIS is installed and configured - -### Issue: Filters not appearing - -**Solution:** -- Clear browser cache -- Check admin class has list_filter defined -- Verify filter classes are imported -- Restart development server - -### Issue: Inline records not saving - -**Solution:** -- Check form validation errors -- Verify required fields in inline -- Check permissions for related model -- Review browser console for JavaScript errors - ---- - -## Additional Resources - -### Documentation -- **Django Unfold**: https://unfoldadmin.com/ -- **django-import-export**: https://django-import-export.readthedocs.io/ -- **Django Admin**: https://docs.djangoproject.com/en/4.2/ref/contrib/admin/ - -### ThrillWiki Docs -- `API_GUIDE.md` - REST API documentation -- `POSTGIS_SETUP.md` - Geographic features setup -- `MIGRATION_PLAN.md` - Database migration guide -- `README.md` - Project overview - ---- - -## Support - -For issues or questions: -1. Check this guide first -2. Review Django Unfold documentation -3. Check project README.md -4. Review code comments in `apps/entities/admin.py` - ---- - -**Last Updated:** Phase 2C Implementation -**Version:** 1.0 -**Admin Theme:** Django Unfold 0.40.0 diff --git a/django/API_GUIDE.md b/django/API_GUIDE.md deleted file mode 100644 index 1413956a..00000000 --- a/django/API_GUIDE.md +++ /dev/null @@ -1,542 +0,0 @@ -# ThrillWiki REST API Guide - -## Phase 2B: REST API Development - Complete - -This guide provides comprehensive documentation for the ThrillWiki REST API v1. - -## Overview - -The ThrillWiki API provides programmatic access to amusement park, ride, and company data. It uses django-ninja for fast, modern REST API implementation with automatic OpenAPI documentation. - -## Base URL - -- **Local Development**: `http://localhost:8000/api/v1/` -- **Production**: `https://your-domain.com/api/v1/` - -## Documentation - -- **Interactive API Docs**: `/api/v1/docs` -- **OpenAPI Schema**: `/api/v1/openapi.json` - -## Features - -### Implemented in Phase 2B - -✅ **Full CRUD Operations** for all entities -✅ **Filtering & Search** on all list endpoints -✅ **Pagination** (50 items per page) -✅ **Geographic Search** for parks (dual-mode: SQLite + PostGIS) -✅ **Automatic OpenAPI/Swagger Documentation** -✅ **Pydantic Schema Validation** -✅ **Related Data** (automatic joins and annotations) -✅ **Error Handling** with detailed error responses - -### Coming in Phase 2C - -- JWT Token Authentication -- Role-based Permissions -- Rate Limiting -- Caching -- Webhooks - -## Authentication - -**Current Status**: Authentication placeholders are in place, but not yet enforced. - -- **Read Operations (GET)**: Public access -- **Write Operations (POST, PUT, PATCH, DELETE)**: Will require authentication (JWT tokens) - -## Endpoints - -### System Endpoints - -#### Health Check -``` -GET /api/v1/health -``` -Returns API health status. - -#### API Information -``` -GET /api/v1/info -``` -Returns API metadata and statistics. - ---- - -### Companies - -Companies represent manufacturers, operators, designers, and other entities in the amusement industry. - -#### List Companies -``` -GET /api/v1/companies/ -``` - -**Query Parameters:** -- `page` (int): Page number -- `search` (string): Search by name or description -- `company_type` (string): Filter by type (manufacturer, operator, designer, supplier, contractor) -- `location_id` (UUID): Filter by headquarters location -- `ordering` (string): Sort field (prefix with `-` for descending) - -**Example:** -```bash -curl "http://localhost:8000/api/v1/companies/?search=B%26M&ordering=-park_count" -``` - -#### Get Company -``` -GET /api/v1/companies/{company_id} -``` - -#### Create Company -``` -POST /api/v1/companies/ -``` - -**Request Body:** -```json -{ - "name": "Bolliger & Mabillard", - "description": "Swiss roller coaster manufacturer", - "company_types": ["manufacturer"], - "founded_date": "1988-01-01", - "website": "https://www.bolliger-mabillard.com" -} -``` - -#### Update Company -``` -PUT /api/v1/companies/{company_id} -PATCH /api/v1/companies/{company_id} -``` - -#### Delete Company -``` -DELETE /api/v1/companies/{company_id} -``` - -#### Get Company Parks -``` -GET /api/v1/companies/{company_id}/parks -``` -Returns all parks operated by the company. - -#### Get Company Rides -``` -GET /api/v1/companies/{company_id}/rides -``` -Returns all rides manufactured by the company. - ---- - -### Ride Models - -Ride models represent specific ride types from manufacturers. - -#### List Ride Models -``` -GET /api/v1/ride-models/ -``` - -**Query Parameters:** -- `page` (int): Page number -- `search` (string): Search by model name -- `manufacturer_id` (UUID): Filter by manufacturer -- `model_type` (string): Filter by model type -- `ordering` (string): Sort field - -**Example:** -```bash -curl "http://localhost:8000/api/v1/ride-models/?manufacturer_id=&model_type=coaster_model" -``` - -#### Get Ride Model -``` -GET /api/v1/ride-models/{model_id} -``` - -#### Create Ride Model -``` -POST /api/v1/ride-models/ -``` - -**Request Body:** -```json -{ - "name": "Wing Coaster", - "manufacturer_id": "uuid-here", - "model_type": "coaster_model", - "description": "Winged seating roller coaster", - "typical_height": 164.0, - "typical_speed": 55.0 -} -``` - -#### Update Ride Model -``` -PUT /api/v1/ride-models/{model_id} -PATCH /api/v1/ride-models/{model_id} -``` - -#### Delete Ride Model -``` -DELETE /api/v1/ride-models/{model_id} -``` - -#### Get Model Installations -``` -GET /api/v1/ride-models/{model_id}/installations -``` -Returns all rides using this model. - ---- - -### Parks - -Parks represent theme parks, amusement parks, water parks, and FECs. - -#### List Parks -``` -GET /api/v1/parks/ -``` - -**Query Parameters:** -- `page` (int): Page number -- `search` (string): Search by park name -- `park_type` (string): Filter by type (theme_park, amusement_park, water_park, family_entertainment_center, traveling_park, zoo, aquarium) -- `status` (string): Filter by status (operating, closed, sbno, under_construction, planned) -- `operator_id` (UUID): Filter by operator -- `ordering` (string): Sort field - -**Example:** -```bash -curl "http://localhost:8000/api/v1/parks/?status=operating&park_type=theme_park" -``` - -#### Get Park -``` -GET /api/v1/parks/{park_id} -``` - -#### Find Nearby Parks (Geographic Search) -``` -GET /api/v1/parks/nearby/ -``` - -**Query Parameters:** -- `latitude` (float, required): Center point latitude -- `longitude` (float, required): Center point longitude -- `radius` (float): Search radius in kilometers (default: 50) -- `limit` (int): Maximum results (default: 50) - -**Geographic Modes:** -- **PostGIS (Production)**: Accurate distance-based search using `location_point` -- **SQLite (Local Dev)**: Bounding box approximation using `latitude`/`longitude` - -**Example:** -```bash -curl "http://localhost:8000/api/v1/parks/nearby/?latitude=28.385233&longitude=-81.563874&radius=100" -``` - -#### Create Park -``` -POST /api/v1/parks/ -``` - -**Request Body:** -```json -{ - "name": "Six Flags Magic Mountain", - "park_type": "theme_park", - "status": "operating", - "latitude": 34.4239, - "longitude": -118.5971, - "opening_date": "1971-05-29", - "website": "https://www.sixflags.com/magicmountain" -} -``` - -#### Update Park -``` -PUT /api/v1/parks/{park_id} -PATCH /api/v1/parks/{park_id} -``` - -#### Delete Park -``` -DELETE /api/v1/parks/{park_id} -``` - -#### Get Park Rides -``` -GET /api/v1/parks/{park_id}/rides -``` -Returns all rides at the park. - ---- - -### Rides - -Rides represent individual rides and roller coasters. - -#### List Rides -``` -GET /api/v1/rides/ -``` - -**Query Parameters:** -- `page` (int): Page number -- `search` (string): Search by ride name -- `park_id` (UUID): Filter by park -- `ride_category` (string): Filter by category (roller_coaster, flat_ride, water_ride, dark_ride, transport_ride, other) -- `status` (string): Filter by status -- `is_coaster` (bool): Filter for roller coasters only -- `manufacturer_id` (UUID): Filter by manufacturer -- `ordering` (string): Sort field - -**Example:** -```bash -curl "http://localhost:8000/api/v1/rides/?is_coaster=true&status=operating" -``` - -#### List Roller Coasters Only -``` -GET /api/v1/rides/coasters/ -``` - -**Additional Query Parameters:** -- `min_height` (float): Minimum height in feet -- `min_speed` (float): Minimum speed in mph - -**Example:** -```bash -curl "http://localhost:8000/api/v1/rides/coasters/?min_height=200&min_speed=70" -``` - -#### Get Ride -``` -GET /api/v1/rides/{ride_id} -``` - -#### Create Ride -``` -POST /api/v1/rides/ -``` - -**Request Body:** -```json -{ - "name": "Steel Vengeance", - "park_id": "uuid-here", - "ride_category": "roller_coaster", - "is_coaster": true, - "status": "operating", - "manufacturer_id": "uuid-here", - "height": 205.0, - "speed": 74.0, - "length": 5740.0, - "inversions": 4, - "opening_date": "2018-05-05" -} -``` - -#### Update Ride -``` -PUT /api/v1/rides/{ride_id} -PATCH /api/v1/rides/{ride_id} -``` - -#### Delete Ride -``` -DELETE /api/v1/rides/{ride_id} -``` - ---- - -## Response Formats - -### Success Responses - -#### Single Entity -```json -{ - "id": "uuid", - "name": "Entity Name", - "created": "2025-01-01T00:00:00Z", - "modified": "2025-01-01T00:00:00Z", - ... -} -``` - -#### Paginated List -```json -{ - "items": [...], - "count": 100, - "next": "http://api/endpoint/?page=2", - "previous": null -} -``` - -### Error Responses - -#### 400 Bad Request -```json -{ - "detail": "Invalid input", - "errors": [ - { - "field": "name", - "message": "This field is required" - } - ] -} -``` - -#### 404 Not Found -```json -{ - "detail": "Entity not found" -} -``` - -#### 500 Internal Server Error -```json -{ - "detail": "Internal server error", - "code": "server_error" -} -``` - ---- - -## Data Types - -### UUID -All entity IDs use UUID format: -``` -"550e8400-e29b-41d4-a716-446655440000" -``` - -### Dates -ISO 8601 format (YYYY-MM-DD): -``` -"2025-01-01" -``` - -### Timestamps -ISO 8601 format with timezone: -``` -"2025-01-01T12:00:00Z" -``` - -### Coordinates -Latitude/Longitude as decimal degrees: -```json -{ - "latitude": 28.385233, - "longitude": -81.563874 -} -``` - ---- - -## Testing the API - -### Using curl - -```bash -# Get API info -curl http://localhost:8000/api/v1/info - -# List companies -curl http://localhost:8000/api/v1/companies/ - -# Search parks -curl "http://localhost:8000/api/v1/parks/?search=Six+Flags" - -# Find nearby parks -curl "http://localhost:8000/api/v1/parks/nearby/?latitude=28.385&longitude=-81.563&radius=50" -``` - -### Using the Interactive Docs - -1. Start the development server: - ```bash - cd django - python manage.py runserver - ``` - -2. Open your browser to: - ``` - http://localhost:8000/api/v1/docs - ``` - -3. Explore and test all endpoints interactively! - ---- - -## Geographic Features - -### SQLite Mode (Local Development) - -Uses simple latitude/longitude fields with bounding box approximation: -- Stores coordinates as `DecimalField` -- Geographic search uses bounding box calculation -- Less accurate but works without PostGIS - -### PostGIS Mode (Production) - -Uses advanced geographic features: -- Stores coordinates as `PointField` (geography type) -- Accurate distance-based queries -- Supports spatial indexing -- Full GIS capabilities - -### Switching Between Modes - -The API automatically detects the database backend and uses the appropriate method. No code changes needed! - ---- - -## Next Steps - -### Phase 2C: Admin Interface Enhancements -- Enhanced Django admin for all entities -- Bulk operations -- Advanced filtering -- Custom actions - -### Phase 3: Frontend Integration -- React/Next.js frontend -- Real-time updates -- Interactive maps -- Rich search interface - -### Phase 4: Advanced Features -- JWT authentication -- API rate limiting -- Caching strategies -- Webhooks -- WebSocket support - ---- - -## Support - -For issues or questions about the API: -1. Check the interactive documentation at `/api/v1/docs` -2. Review this guide -3. Check the POSTGIS_SETUP.md for geographic features -4. Refer to the main README.md for project setup - -## Version History - -- **v1.0.0** (Phase 2B): Initial REST API implementation - - Full CRUD for all entities - - Filtering and search - - Geographic queries - - Pagination - - OpenAPI documentation diff --git a/django/COMPLETE_MIGRATION_AUDIT.md b/django/COMPLETE_MIGRATION_AUDIT.md deleted file mode 100644 index e62dde8e..00000000 --- a/django/COMPLETE_MIGRATION_AUDIT.md +++ /dev/null @@ -1,735 +0,0 @@ -# Complete Django Migration Audit Report - -**Audit Date:** November 8, 2025 -**Project:** ThrillWiki Django Backend Migration -**Auditor:** AI Code Analysis -**Status:** Comprehensive audit complete - ---- - -## 🎯 Executive Summary - -The Django backend migration is **65% complete overall** with an **excellent 85% backend implementation**. The project has outstanding core systems (moderation, versioning, authentication, search) but is missing 3 user-interaction models and has not started frontend integration or data migration. - -### Key Findings - -✅ **Strengths:** -- Production-ready moderation system with FSM state machine -- Comprehensive authentication with JWT and MFA -- Automatic versioning for all entities -- Advanced search with PostgreSQL full-text and PostGIS -- 90+ REST API endpoints fully functional -- Background task processing with Celery -- Excellent code quality and documentation - -⚠️ **Gaps:** -- 3 missing models: Reviews, User Ride Credits, User Top Lists -- No frontend integration started (0%) -- No data migration from Supabase executed (0%) -- No automated test suite (0%) -- No deployment configuration - -🔴 **Risks:** -- Frontend integration is 4-6 weeks of work -- Data migration strategy undefined -- No testing creates deployment risk - ---- - -## 📊 Detailed Analysis - -### 1. Backend Implementation: 85% Complete - -#### ✅ **Fully Implemented Systems** - -**Core Entity Models (100%)** -``` -✅ Company - 585 lines - - Manufacturer, operator, designer types - - Location relationships - - Cached statistics (park_count, ride_count) - - CloudFlare logo integration - - Full-text search support - - Admin interface with inline editing - -✅ RideModel - 360 lines - - Manufacturer relationships - - Model categories and types - - Technical specifications (JSONB) - - Installation count tracking - - Full-text search support - - Admin interface - -✅ Park - 720 lines - - PostGIS PointField for production - - SQLite lat/lng fallback for dev - - Status tracking (operating, closed, SBNO, etc.) - - Operator and owner relationships - - Cached ride counts - - Banner/logo images - - Full-text search support - - Location-based queries - -✅ Ride - 650 lines - - Park relationships - - Manufacturer and model relationships - - Extensive statistics (height, speed, length, inversions) - - Auto-set is_coaster flag - - Status tracking - - Full-text search support - - Automatic parent park count updates -``` - -**Location Models (100%)** -``` -✅ Country - ISO 3166-1 with 2 and 3-letter codes -✅ Subdivision - ISO 3166-2 state/province/region data -✅ Locality - City/town with lat/lng coordinates -``` - -**Advanced Systems (100%)** -``` -✅ Moderation System (Phase 3) - - FSM state machine (draft → pending → reviewing → approved/rejected) - - Atomic transaction handling - - Selective approval (approve individual items) - - 15-minute lock mechanism with auto-unlock - - 12 REST API endpoints - - ContentSubmission and SubmissionItem models - - ModerationLock tracking - - Beautiful admin interface with colored badges - - Email notifications via Celery - -✅ Versioning System (Phase 4) - - EntityVersion model with generic relations - - Automatic tracking via lifecycle hooks - - Full JSON snapshots for rollback - - Changed fields tracking with old/new values - - 16 REST API endpoints - - Version comparison and diff generation - - Admin interface (read-only, append-only) - - Integration with moderation workflow - -✅ Authentication System (Phase 5) - - JWT tokens (60-min access, 7-day refresh) - - MFA/2FA with TOTP - - Role-based permissions (user, moderator, admin) - - 23 authentication endpoints - - OAuth ready (Google, Discord) - - User management - - Password reset flow - - django-allauth + django-otp integration - - Permission decorators and helpers - -✅ Media Management (Phase 6) - - Photo model with CloudFlare Images - - Image validation and metadata - - Photo moderation workflow - - Generic relations to entities - - Admin interface with thumbnails - - Photo upload API endpoints - -✅ Background Tasks (Phase 7) - - Celery + Redis configuration - - 20+ background tasks: - * Media processing - * Email notifications - * Statistics updates - * Cleanup tasks - - 10 scheduled tasks with Celery Beat - - Email templates (base, welcome, password reset, moderation) - - Flower monitoring setup (production) - - Task retry logic and error handling - -✅ Search & Filtering (Phase 8) - - PostgreSQL full-text search with ranking - - SQLite fallback with LIKE queries - - SearchVector fields with GIN indexes - - Signal-based auto-update of search vectors - - Global search across all entities - - Entity-specific search endpoints - - Location-based search with PostGIS - - Autocomplete functionality - - Advanced filtering classes - - 6 search API endpoints -``` - -**API Coverage (90+ endpoints)** -``` -✅ Authentication: 23 endpoints - - Register, login, logout, token refresh - - Profile management - - MFA enable/disable/verify - - Password change/reset - - User administration - - Role assignment - -✅ Moderation: 12 endpoints - - Submission CRUD - - Start review, approve, reject - - Selective approval/rejection - - Queue views (pending, reviewing, my submissions) - - Manual unlock - -✅ Versioning: 16 endpoints - - Version history for all entities - - Get specific version - - Compare versions - - Diff with current - - Generic version endpoints - -✅ Search: 6 endpoints - - Global search - - Entity-specific search (companies, models, parks, rides) - - Autocomplete - -✅ Entity CRUD: ~40 endpoints - - Companies: 6 endpoints - - RideModels: 6 endpoints - - Parks: 7 endpoints (including nearby search) - - Rides: 6 endpoints - - Each with list, create, retrieve, update, delete - -✅ Photos: ~10 endpoints - - Photo CRUD - - Entity-specific photo lists - - Photo moderation - -✅ System: 2 endpoints - - Health check - - API info with statistics -``` - -**Admin Interfaces (100%)** -``` -✅ All models have rich admin interfaces: - - List views with custom columns - - Filtering and search - - Inline editing where appropriate - - Colored status badges - - Link navigation between related models - - Import/export functionality - - Bulk actions - - Read-only views for append-only models (versions, locks) -``` - -#### ❌ **Missing Implementation (15%)** - -**1. Reviews System** 🔴 CRITICAL -``` -Supabase Schema: -- reviews table with rating (1-5), title, content -- User → Park or Ride relationship -- Visit date and wait time tracking -- Photo attachments (JSONB array) -- Helpful votes (helpful_votes, total_votes) -- Moderation status and workflow -- Created/updated timestamps - -Django Status: NOT IMPLEMENTED - -Impact: -- Can't migrate user review data from Supabase -- Users can't leave reviews after migration -- Missing key user engagement feature - -Estimated Implementation: 1-2 days -``` - -**2. User Ride Credits** 🟡 IMPORTANT -``` -Supabase Schema: -- user_ride_credits table -- User → Ride relationship -- First ride date tracking -- Ride count per user/ride -- Created/updated timestamps - -Django Status: NOT IMPLEMENTED - -Impact: -- Can't track which rides users have been on -- Missing coaster counting/tracking feature -- Can't preserve user ride history - -Estimated Implementation: 0.5-1 day -``` - -**3. User Top Lists** 🟡 IMPORTANT -``` -Supabase Schema: -- user_top_lists table -- User ownership -- List type (parks, rides, coasters) -- Title and description -- Items array (JSONB with id, position, notes) -- Public/private flag -- Created/updated timestamps - -Django Status: NOT IMPLEMENTED - -Impact: -- Users can't create ranked lists -- Missing personalization feature -- Can't preserve user-created rankings - -Estimated Implementation: 0.5-1 day -``` - ---- - -### 2. Frontend Integration: 0% Complete - -**Current State:** -- React frontend using Supabase client -- All API calls via `@/integrations/supabase/client` -- Supabase Auth for authentication -- Real-time subscriptions (if any) via Supabase Realtime - -**Required Changes:** -```typescript -// Need to create: -1. Django API client (src/lib/djangoClient.ts) -2. JWT auth context (src/contexts/AuthContext.tsx) -3. React Query hooks for Django endpoints -4. Type definitions for Django responses - -// Need to replace: -- ~50-100 Supabase API calls across components -- Authentication flow (Supabase Auth → JWT) -- File uploads (Supabase Storage → CloudFlare) -- Real-time features (polling or WebSockets) -``` - -**Estimated Effort:** 4-6 weeks (160-240 hours) - -**Breakdown:** -``` -Week 1-2: Foundation -- Create Django API client -- Implement JWT auth management -- Replace auth in 2-3 components as proof-of-concept -- Establish patterns - -Week 3-4: Core Entities -- Update Companies pages -- Update Parks pages -- Update Rides pages -- Update RideModels pages -- Test all CRUD operations - -Week 5: Advanced Features -- Update Moderation Queue -- Update User Profiles -- Update Search functionality -- Update Photos/Media - -Week 6: Polish & Testing -- E2E tests -- Bug fixes -- Performance optimization -- User acceptance testing -``` - ---- - -### 3. Data Migration: 0% Complete - -**Supabase Database Analysis:** -``` -Migration Files: 187 files (heavily evolved schema) -Tables: ~15-20 core tables identified - -Core Tables: -✅ companies -✅ locations -✅ parks -✅ rides -✅ ride_models -✅ profiles -❌ reviews (not in Django yet) -❌ user_ride_credits (not in Django yet) -❌ user_top_lists (not in Django yet) -❌ park_operating_hours (deprioritized) -✅ content_submissions (different structure in Django) -``` - -**Critical Questions:** -1. Is there production data? (Unknown) -2. How many records per table? (Unknown) -3. Data quality assessment? (Unknown) -4. Which data to migrate? (Unknown) - -**Migration Strategy Options:** - -**Option A: Fresh Start** (If no production data) -``` -Pros: -- Skip migration complexity -- No data transformation needed -- Faster path to production -- Clean start - -Cons: -- Lose any test data -- Can't preserve user history - -Recommended: YES, if no prod data exists -Timeline: 0 weeks -``` - -**Option B: Full Migration** (If production data exists) -``` -Steps: -1. Audit Supabase database -2. Count records, assess quality -3. Export data (pg_dump or CSV) -4. Transform data (Python script) -5. Import to Django (ORM or bulk_create) -6. Validate integrity (checksums, counts) -7. Test with migrated data - -Timeline: 2-4 weeks -Risk: HIGH (data loss, corruption) -Complexity: HIGH -``` - -**Recommendation:** -- First, determine if production data exists -- If NO → Fresh start (Option A) -- If YES → Carefully execute Option B - ---- - -### 4. Testing: 0% Complete - -**Current State:** -- No unit tests -- No integration tests -- No E2E tests -- Manual testing only - -**Required Testing:** -``` -Backend Unit Tests: -- Model tests (create, update, relationships) -- Service tests (business logic) -- Permission tests (auth, roles) -- Admin tests (basic) - -API Integration Tests: -- Authentication flow -- CRUD operations -- Moderation workflow -- Search functionality -- Error handling - -Frontend Integration Tests: -- Django API client -- Auth context -- React Query hooks - -E2E Tests (Playwright/Cypress): -- User registration/login -- Create/edit entities -- Submit for moderation -- Approve/reject workflow -- Search and filter -``` - -**Estimated Effort:** 2-3 weeks - -**Target:** 80% backend code coverage - ---- - -### 5. Deployment: 0% Complete - -**Current State:** -- No production configuration -- No Docker setup -- No CI/CD pipeline -- No infrastructure planning - -**Required Components:** -``` -Infrastructure: -- Web server (Gunicorn/Daphne) -- PostgreSQL with PostGIS -- Redis (Celery broker + cache) -- Static file serving (WhiteNoise or CDN) -- SSL/TLS certificates - -Services: -- Django application -- Celery worker(s) -- Celery beat (scheduler) -- Flower (monitoring) - -Platform Options: -1. Railway (recommended for MVP) -2. Render.com (recommended for MVP) -3. DigitalOcean/Linode (more control) -4. AWS/GCP (enterprise, complex) - -Configuration: -- Environment variables -- Database connection -- Redis connection -- Email service (SendGrid/Mailgun) -- CloudFlare Images API -- Sentry error tracking -- Monitoring/logging -``` - -**Estimated Effort:** 1 week - ---- - -## 📈 Timeline & Effort Estimates - -### Phase 9: Complete Missing Models -**Duration:** 5-7 days -**Effort:** 40-56 hours -**Risk:** LOW -**Priority:** P0 (Must do before migration) - -``` -Tasks: -- Reviews model + API + admin: 12-16 hours -- User Ride Credits + API + admin: 6-8 hours -- User Top Lists + API + admin: 6-8 hours -- Testing: 8-12 hours -- Documentation: 4-6 hours -- Buffer: 4-6 hours -``` - -### Phase 10: Data Migration (Optional) -**Duration:** 0-14 days -**Effort:** 0-112 hours -**Risk:** HIGH (if doing migration) -**Priority:** P0 (If production data exists) - -``` -If production data exists: -- Database audit: 8 hours -- Export scripts: 16 hours -- Transformation logic: 24 hours -- Import scripts: 16 hours -- Validation: 16 hours -- Testing: 24 hours -- Buffer: 8 hours - -If no production data: -- Skip entirely: 0 hours -``` - -### Phase 11: Frontend Integration -**Duration:** 20-30 days -**Effort:** 160-240 hours -**Risk:** MEDIUM -**Priority:** P0 (Must do for launch) - -``` -Tasks: -- API client foundation: 40 hours -- Auth migration: 40 hours -- Entity pages: 60 hours -- Advanced features: 40 hours -- Testing & polish: 40 hours -- Buffer: 20 hours -``` - -### Phase 12: Testing -**Duration:** 7-10 days -**Effort:** 56-80 hours -**Risk:** LOW -**Priority:** P1 (Highly recommended) - -``` -Tasks: -- Backend unit tests: 24 hours -- API integration tests: 16 hours -- Frontend tests: 16 hours -- E2E tests: 16 hours -- Bug fixes: 8 hours -``` - -### Phase 13: Deployment -**Duration:** 5-7 days -**Effort:** 40-56 hours -**Risk:** MEDIUM -**Priority:** P0 (Must do for launch) - -``` -Tasks: -- Platform setup: 8 hours -- Configuration: 8 hours -- CI/CD pipeline: 8 hours -- Staging deployment: 8 hours -- Testing: 8 hours -- Production deployment: 4 hours -- Monitoring setup: 4 hours -- Buffer: 8 hours -``` - -### Total Remaining Effort - -**Minimum Path** (No data migration, skip testing): -- Phase 9: 40 hours -- Phase 11: 160 hours -- Phase 13: 40 hours -- **Total: 240 hours (6 weeks @ 40hrs/week)** - -**Realistic Path** (No data migration, with testing): -- Phase 9: 48 hours -- Phase 11: 200 hours -- Phase 12: 64 hours -- Phase 13: 48 hours -- **Total: 360 hours (9 weeks @ 40hrs/week)** - -**Full Path** (With data migration and testing): -- Phase 9: 48 hours -- Phase 10: 112 hours -- Phase 11: 200 hours -- Phase 12: 64 hours -- Phase 13: 48 hours -- **Total: 472 hours (12 weeks @ 40hrs/week)** - ---- - -## 🎯 Recommendations - -### Immediate (This Week) -1. ✅ **Implement 3 missing models** (Reviews, Credits, Lists) -2. ✅ **Run Django system check** - ensure 0 issues -3. ✅ **Create basic tests** for new models -4. ❓ **Determine if Supabase has production data** - Critical decision point - -### Short-term (Next 2-3 Weeks) -5. **If NO production data:** Skip data migration, go to frontend -6. **If YES production data:** Execute careful data migration -7. **Start frontend integration** planning -8. **Set up development environment** for testing - -### Medium-term (Next 4-8 Weeks) -9. **Frontend integration** - Create Django API client -10. **Replace all Supabase calls** systematically -11. **Test all user flows** thoroughly -12. **Write comprehensive tests** - -### Long-term (Next 8-12 Weeks) -13. **Deploy to staging** for testing -14. **User acceptance testing** -15. **Deploy to production** -16. **Monitor and iterate** - ---- - -## 🚨 Critical Risks & Mitigation - -### Risk 1: Data Loss During Migration 🔴 -**Probability:** HIGH (if migrating) -**Impact:** CATASTROPHIC - -**Mitigation:** -- Complete Supabase backup before ANY changes -- Multiple dry-run migrations -- Checksum validation at every step -- Keep Supabase running in parallel for 1-2 weeks -- Have rollback plan ready - -### Risk 2: Frontend Breaking Changes 🔴 -**Probability:** VERY HIGH -**Impact:** HIGH - -**Mitigation:** -- Systematic component-by-component migration -- Comprehensive testing at each step -- Feature flags for gradual rollout -- Beta testing with subset of users -- Quick rollback capability - -### Risk 3: Extended Downtime 🟡 -**Probability:** MEDIUM -**Impact:** HIGH - -**Mitigation:** -- Blue-green deployment -- Run systems in parallel temporarily -- Staged rollout by feature -- Monitor closely during cutover - -### Risk 4: Missing Features 🟡 -**Probability:** MEDIUM (after Phase 9) -**Impact:** MEDIUM - -**Mitigation:** -- Complete Phase 9 before any migration -- Test feature parity thoroughly -- User acceptance testing -- Beta testing period - -### Risk 5: No Testing = Production Bugs 🟡 -**Probability:** HIGH (if skipping tests) -**Impact:** MEDIUM - -**Mitigation:** -- Don't skip testing phase -- Minimum 80% backend coverage -- Critical path E2E tests -- Staging environment testing - ---- - -## ✅ Success Criteria - -### Phase 9 Success -- [ ] Reviews model implemented with full functionality -- [ ] User Ride Credits model implemented -- [ ] User Top Lists model implemented -- [ ] All API endpoints working -- [ ] All admin interfaces functional -- [ ] Basic tests passing -- [ ] Django system check: 0 issues -- [ ] Documentation updated - -### Overall Migration Success -- [ ] 100% backend feature parity with Supabase -- [ ] All data migrated (if applicable) with 0 loss -- [ ] Frontend 100% functional with Django backend -- [ ] 80%+ test coverage -- [ ] Production deployed and stable -- [ ] User acceptance testing passed -- [ ] Performance meets or exceeds Supabase -- [ ] Zero critical bugs in production - ---- - -## 📝 Conclusion - -The Django backend migration is in **excellent shape** with 85% completion. The core infrastructure is production-ready with outstanding moderation, versioning, authentication, and search systems. - -**The remaining work is well-defined:** -1. Complete 3 missing models (5-7 days) -2. Decide on data migration approach (0-14 days) -3. Frontend integration (4-6 weeks) -4. Testing (1-2 weeks) -5. Deployment (1 week) - -**Total estimated time to completion: 8-12 weeks** - -**Key Success Factors:** -- Complete Phase 9 (missing models) before ANY migration -- Make data migration decision early -- Don't skip testing -- Deploy to staging before production -- Have rollback plans ready - -**Nothing will be lost** if the data migration strategy is executed carefully with proper backups, validation, and rollback plans. - ---- - -**Audit Complete** -**Next Step:** Implement missing models (Phase 9) -**Last Updated:** November 8, 2025, 3:12 PM EST diff --git a/django/MIGRATION_PLAN.md b/django/MIGRATION_PLAN.md deleted file mode 100644 index e095d7ba..00000000 --- a/django/MIGRATION_PLAN.md +++ /dev/null @@ -1,566 +0,0 @@ -# ThrillWiki Django Backend Migration Plan - -## 🎯 Project Overview - -**Objective**: Migrate ThrillWiki from Supabase backend to Django REST backend while preserving 100% of functionality. - -**Timeline**: 12-16 weeks with 2 developers -**Status**: Foundation Phase - In Progress -**Branch**: `django-backend` - ---- - -## 📊 Architecture Overview - -### Current Stack (Supabase) -- **Frontend**: React 18.3 + TypeScript + Vite + React Query -- **Backend**: Supabase (PostgreSQL + Edge Functions) -- **Database**: PostgreSQL with 80+ tables -- **Auth**: Supabase Auth (OAuth + MFA) -- **Storage**: CloudFlare Images -- **Notifications**: Novu Cloud -- **Real-time**: Supabase Realtime - -### Target Stack (Django) -- **Frontend**: React 18.3 + TypeScript + Vite (unchanged) -- **Backend**: Django 4.2 + django-ninja -- **Database**: PostgreSQL (migrated schema) -- **Auth**: Django + django-allauth + django-otp -- **Storage**: CloudFlare Images (unchanged) -- **Notifications**: Novu Cloud (unchanged) -- **Real-time**: Django Channels + WebSockets -- **Tasks**: Celery + Redis -- **Caching**: Redis + django-cacheops - ---- - -## 🏗️ Project Structure - -``` -django/ -├── manage.py -├── config/ # Project settings -│ ├── settings/ -│ │ ├── __init__.py -│ │ ├── base.py # Shared settings -│ │ ├── local.py # Development -│ │ └── production.py # Production -│ ├── urls.py -│ ├── wsgi.py -│ └── asgi.py # For Channels -│ -├── apps/ -│ ├── core/ # Base models, utilities -│ │ ├── models.py # Abstract base models -│ │ ├── permissions.py # Reusable permissions -│ │ ├── mixins.py # Model mixins -│ │ └── utils.py -│ │ -│ ├── entities/ # Parks, Rides, Companies -│ │ ├── models/ -│ │ │ ├── park.py -│ │ │ ├── ride.py -│ │ │ ├── company.py -│ │ │ └── ride_model.py -│ │ ├── api/ -│ │ │ ├── views.py -│ │ │ ├── serializers.py -│ │ │ └── filters.py -│ │ ├── services.py -│ │ └── tasks.py -│ │ -│ ├── moderation/ # Content moderation -│ │ ├── models.py -│ │ ├── state_machine.py # django-fsm workflow -│ │ ├── services.py -│ │ └── api/ -│ │ -│ ├── versioning/ # Entity versioning -│ │ ├── models.py -│ │ ├── signals.py -│ │ └── services.py -│ │ -│ ├── users/ # User management -│ │ ├── models.py -│ │ ├── managers.py -│ │ └── api/ -│ │ -│ ├── media/ # Photo management -│ │ ├── models.py -│ │ ├── storage.py -│ │ └── tasks.py -│ │ -│ └── notifications/ # Notification system -│ ├── models.py -│ ├── providers/ -│ │ └── novu.py -│ └── tasks.py -│ -├── api/ -│ └── v1/ -│ ├── router.py # Main API router -│ └── schemas.py # Pydantic schemas -│ -└── scripts/ - ├── migrate_from_supabase.py - └── validate_data.py -``` - ---- - -## 📋 Implementation Phases - -### ✅ Phase 0: Foundation (CURRENT - Week 1) -- [x] Create git branch `django-backend` -- [x] Set up Python virtual environment -- [x] Install all dependencies (Django 4.2, django-ninja, celery, etc.) -- [x] Create Django project structure -- [x] Create app directories -- [x] Create .env.example -- [ ] Configure Django settings (base, local, production) -- [ ] Create base models and utilities -- [ ] Set up database connection -- [ ] Create initial migrations - -### Phase 1: Core Models (Week 2-3) -- [ ] Create abstract base models (TimeStamped, Versioned, etc.) -- [ ] Implement entity models (Park, Ride, Company, RideModel) -- [ ] Implement location models -- [ ] Implement user models with custom User -- [ ] Implement photo/media models -- [ ] Create Django migrations -- [ ] Test model relationships - -### Phase 2: Authentication System (Week 3-4) -- [ ] Set up django-allauth for OAuth (Google, Discord) -- [ ] Implement JWT authentication with djangorestframework-simplejwt -- [ ] Set up django-otp for MFA (TOTP) -- [ ] Create user registration/login endpoints -- [ ] Implement permission system (django-guardian) -- [ ] Create role-based access control -- [ ] Test authentication flow - -### Phase 3: Moderation System (Week 5-7) -- [ ] Create ContentSubmission and SubmissionItem models -- [ ] Implement django-fsm state machine -- [ ] Create ModerationService with atomic transactions -- [ ] Implement submission creation endpoints -- [ ] Implement approval/rejection endpoints -- [ ] Implement selective approval logic -- [ ] Create moderation queue API -- [ ] Add rate limiting with django-ratelimit -- [ ] Test moderation workflow end-to-end - -### Phase 4: Versioning System (Week 7-8) -- [ ] Create version models for all entities -- [ ] Implement django-lifecycle hooks for auto-versioning -- [ ] Create VersioningService -- [ ] Implement version history endpoints -- [ ] Add version diff functionality -- [ ] Test versioning with submissions - -### Phase 5: API Layer with django-ninja (Week 8-10) -- [ ] Set up django-ninja router -- [ ] Create Pydantic schemas for all entities -- [ ] Implement CRUD endpoints for parks -- [ ] Implement CRUD endpoints for rides -- [ ] Implement CRUD endpoints for companies -- [ ] Add filtering with django-filter -- [ ] Add search functionality -- [ ] Implement pagination -- [ ] Add API documentation (auto-generated) -- [ ] Test all endpoints - -### Phase 6: Celery Tasks (Week 10-11) -- [ ] Set up Celery with Redis -- [ ] Set up django-celery-beat for periodic tasks -- [ ] Migrate edge functions to Celery tasks: - - [ ] cleanup_old_page_views - - [ ] update_entity_view_counts - - [ ] process_submission_notifications - - [ ] generate_daily_stats -- [ ] Create notification tasks for Novu -- [ ] Set up Flower for monitoring -- [ ] Test async task execution - -### Phase 7: Real-time Features (Week 11-12) -- [ ] Set up Django Channels with Redis -- [ ] Create WebSocket consumers -- [ ] Implement moderation queue real-time updates -- [ ] Implement notification real-time delivery -- [ ] Test WebSocket connections -- [ ] OR: Implement Server-Sent Events as alternative - -### Phase 8: Caching & Performance (Week 12-13) -- [ ] Set up django-redis for caching -- [ ] Configure django-cacheops for automatic ORM caching -- [ ] Add cache invalidation logic -- [ ] Optimize database queries (select_related, prefetch_related) -- [ ] Add database indexes -- [ ] Profile with django-silk -- [ ] Load testing - -### Phase 9: Data Migration (Week 13-14) -- [ ] Export all data from Supabase -- [ ] Create migration script for entities -- [ ] Migrate user data (preserve UUIDs) -- [ ] Migrate submissions (pending only) -- [ ] Migrate version history -- [ ] Migrate photos/media references -- [ ] Validate data integrity -- [ ] Test with migrated data - -### Phase 10: Frontend Integration (Week 14-15) -- [ ] Create new API client (replace Supabase client) -- [ ] Update authentication logic -- [ ] Update all API calls to point to Django -- [ ] Update real-time subscriptions to WebSockets -- [ ] Test all user flows -- [ ] Fix any integration issues - -### Phase 11: Testing & QA (Week 15-16) -- [ ] Write unit tests for all models -- [ ] Write unit tests for all services -- [ ] Write API integration tests -- [ ] Write end-to-end tests -- [ ] Security audit -- [ ] Performance testing -- [ ] Load testing -- [ ] Bug fixes - -### Phase 12: Deployment (Week 16-17) -- [ ] Set up production environment -- [ ] Configure PostgreSQL -- [ ] Configure Redis -- [ ] Set up Celery workers -- [ ] Configure Gunicorn/Daphne -- [ ] Set up Docker containers -- [ ] Configure CI/CD -- [ ] Deploy to staging -- [ ] Final testing -- [ ] Deploy to production -- [ ] Monitor for issues - ---- - -## 🔑 Key Technical Decisions - -### 1. **django-ninja vs Django REST Framework** -**Choice**: django-ninja -- FastAPI-style syntax (modern, intuitive) -- Better performance -- Automatic OpenAPI documentation -- Pydantic integration for validation - -### 2. **State Machine for Moderation** -**Choice**: django-fsm -- Declarative state transitions -- Built-in guards and conditions -- Prevents invalid state changes -- Easy to visualize workflow - -### 3. **Auto-versioning Strategy** -**Choice**: django-lifecycle hooks -- Automatic version creation on model changes -- No manual intervention needed -- Tracks what changed -- Preserves full history - -### 4. **Real-time Communication** -**Primary**: Django Channels (WebSockets) -**Fallback**: Server-Sent Events (SSE) -- WebSockets for bidirectional communication -- SSE as simpler alternative -- Redis channel layer for scaling - -### 5. **Caching Strategy** -**Tool**: django-cacheops -- Automatic ORM query caching -- Transparent invalidation -- Minimal code changes -- Redis backend for consistency - ---- - -## 🚀 Critical Features to Preserve - -### 1. **Moderation System** -- ✅ Atomic transactions for approvals -- ✅ Selective approval (approve individual items) -- ✅ State machine workflow (pending → reviewing → approved/rejected) -- ✅ Lock mechanism (15-minute lock on review) -- ✅ Automatic unlock on timeout -- ✅ Batch operations - -### 2. **Versioning System** -- ✅ Full version history for all entities -- ✅ Track who made changes -- ✅ Track what changed -- ✅ Link versions to submissions -- ✅ Version diffs -- ✅ Rollback capability - -### 3. **Authentication** -- ✅ Password-based login -- ✅ Google OAuth -- ✅ Discord OAuth -- ✅ Two-factor authentication (TOTP) -- ✅ Session management -- ✅ JWT tokens for API - -### 4. **Permissions & Security** -- ✅ Role-based access control (user, moderator, admin, superuser) -- ✅ Object-level permissions -- ✅ Rate limiting -- ✅ CORS configuration -- ✅ Brute force protection - -### 5. **Image Management** -- ✅ CloudFlare direct upload -- ✅ Image validation -- ✅ Image metadata storage -- ✅ Multiple image variants (thumbnails, etc.) - -### 6. **Notifications** -- ✅ Email notifications via Novu -- ✅ In-app notifications -- ✅ Notification templates -- ✅ User preferences - -### 7. **Search & Filtering** -- ✅ Full-text search -- ✅ Advanced filtering -- ✅ Sorting options -- ✅ Pagination - ---- - -## 📊 Database Schema Preservation - -### Core Entity Tables (Must Migrate) -``` -✅ parks (80+ fields including dates, locations, operators) -✅ rides (100+ fields including ride_models, parks, manufacturers) -✅ companies (manufacturers, operators, designers) -✅ ride_models (coaster models, flat ride models) -✅ locations (countries, subdivisions, localities) -✅ profiles (user profiles linked to auth.users) -✅ user_roles (role assignments) -✅ content_submissions (moderation queue) -✅ submission_items (individual changes in submissions) -✅ park_versions, ride_versions, etc. (version history) -✅ photos (image metadata) -✅ photo_submissions (photo approval queue) -✅ reviews (user reviews) -✅ reports (user reports) -✅ entity_timeline_events (history timeline) -✅ notification_logs -✅ notification_templates -``` - -### Computed Fields Strategy -Some Supabase tables have computed fields. Options: -1. **Cache in model** (recommended for frequently accessed) -2. **Property method** (for rarely accessed) -3. **Cached query** (using django-cacheops) - -Example: -```python -class Park(models.Model): - # Cached computed fields - ride_count = models.IntegerField(default=0) - coaster_count = models.IntegerField(default=0) - - def update_counts(self): - """Update cached counts""" - self.ride_count = self.rides.count() - self.coaster_count = self.rides.filter( - is_coaster=True - ).count() - self.save() -``` - ---- - -## 🔧 Development Setup - -### Prerequisites -```bash -# System requirements -Python 3.11+ -PostgreSQL 15+ -Redis 7+ -Node.js 18+ (for frontend) -``` - -### Initial Setup -```bash -# 1. Clone and checkout branch -git checkout django-backend - -# 2. Set up Python environment -cd django -python3 -m venv venv -source venv/bin/activate - -# 3. Install dependencies -pip install -r requirements/local.txt - -# 4. Set up environment -cp .env.example .env -# Edit .env with your credentials - -# 5. Run migrations -python manage.py migrate - -# 6. Create superuser -python manage.py createsuperuser - -# 7. Run development server -python manage.py runserver - -# 8. Run Celery worker (separate terminal) -celery -A config worker -l info - -# 9. Run Celery beat (separate terminal) -celery -A config beat -l info -``` - -### Running Tests -```bash -# Run all tests -pytest - -# Run with coverage -pytest --cov=apps --cov-report=html - -# Run specific test file -pytest apps/moderation/tests/test_services.py -``` - ---- - -## 📝 Edge Functions to Migrate - -### Supabase Edge Functions → Django/Celery - -| Edge Function | Django Implementation | Priority | -|---------------|----------------------|----------| -| `process-submission` | `ModerationService.submit()` | P0 | -| `process-selective-approval` | `ModerationService.approve()` | P0 | -| `reject-submission` | `ModerationService.reject()` | P0 | -| `unlock-submission` | Celery periodic task | P0 | -| `cleanup_old_page_views` | Celery periodic task | P1 | -| `update_entity_view_counts` | Celery periodic task | P1 | -| `send-notification` | `NotificationService.send()` | P0 | -| `process-photo-submission` | `MediaService.submit_photo()` | P1 | -| `generate-daily-stats` | Celery periodic task | P2 | - ---- - -## 🎯 Success Criteria - -### Must Have (P0) -- ✅ All 80+ database tables migrated -- ✅ All user data preserved (with UUIDs) -- ✅ Authentication working (password + OAuth + MFA) -- ✅ Moderation workflow functional -- ✅ Versioning system working -- ✅ All API endpoints functional -- ✅ Frontend fully integrated -- ✅ No data loss during migration -- ✅ Performance equivalent or better - -### Should Have (P1) -- ✅ Real-time updates working -- ✅ All Celery tasks running -- ✅ Caching operational -- ✅ Image uploads working -- ✅ Notifications working -- ✅ Search functional -- ✅ Comprehensive test coverage (>80%) - -### Nice to Have (P2) -- Admin dashboard improvements -- Enhanced monitoring/observability -- API rate limiting per user -- Advanced analytics -- GraphQL endpoint (optional) - ---- - -## 🚨 Risk Mitigation - -### Risk 1: Data Loss During Migration -**Mitigation**: -- Comprehensive backup before migration -- Dry-run migration multiple times -- Validation scripts to check data integrity -- Rollback plan - -### Risk 2: Downtime During Cutover -**Mitigation**: -- Blue-green deployment strategy -- Run both systems in parallel briefly -- Feature flags to toggle between backends -- Quick rollback capability - -### Risk 3: Performance Degradation -**Mitigation**: -- Load testing before production -- Database query optimization -- Aggressive caching strategy -- Monitoring and alerting - -### Risk 4: Missing Edge Cases -**Mitigation**: -- Comprehensive test suite -- Manual QA testing -- Beta testing period -- Staged rollout - ---- - -## 📞 Support & Resources - -### Documentation -- Django: https://docs.djangoproject.com/ -- django-ninja: https://django-ninja.rest-framework.com/ -- Celery: https://docs.celeryq.dev/ -- Django Channels: https://channels.readthedocs.io/ - -### Key Files to Reference -- Original database schema: `supabase/migrations/` -- Current API endpoints: `src/lib/supabaseClient.ts` -- Moderation logic: `src/components/moderation/` -- Existing docs: `docs/moderation/`, `docs/versioning/` - ---- - -## 🎉 Next Steps - -1. **Immediate** (This Week): - - Configure Django settings - - Create base models - - Set up database connection - -2. **Short-term** (Next 2 Weeks): - - Implement entity models - - Set up authentication - - Create basic API endpoints - -3. **Medium-term** (Next 4-8 Weeks): - - Build moderation system - - Implement versioning - - Migrate edge functions - -4. **Long-term** (8-16 Weeks): - - Complete API layer - - Frontend integration - - Testing and deployment - ---- - -**Last Updated**: November 8, 2025 -**Status**: Foundation Phase - Dependencies Installed, Structure Created -**Next**: Configure Django settings and create base models diff --git a/django/MIGRATION_STATUS_FINAL.md b/django/MIGRATION_STATUS_FINAL.md deleted file mode 100644 index 68e3f5c7..00000000 --- a/django/MIGRATION_STATUS_FINAL.md +++ /dev/null @@ -1,186 +0,0 @@ -# Django Migration - Final Status & Action Plan - -**Date:** November 8, 2025 -**Overall Progress:** 65% Complete -**Backend Progress:** 85% Complete -**Status:** Ready for final implementation phase - ---- - -## 📊 Current State Summary - -### ✅ **COMPLETE (85%)** - -**Core Infrastructure:** -- ✅ Django project structure -- ✅ Settings configuration (base, local, production) -- ✅ PostgreSQL with PostGIS support -- ✅ SQLite fallback for development - -**Core Entity Models:** -- ✅ Company (manufacturers, operators, designers) -- ✅ RideModel (specific ride models from manufacturers) -- ✅ Park (theme parks, amusement parks, water parks) -- ✅ Ride (individual rides and roller coasters) -- ✅ Location models (Country, Subdivision, Locality) - -**Advanced Systems:** -- ✅ Moderation System (Phase 3) - FSM, atomic transactions, selective approval -- ✅ Versioning System (Phase 4) - Automatic tracking, full history -- ✅ Authentication System (Phase 5) - JWT, MFA, roles, OAuth ready -- ✅ Media Management (Phase 6) - CloudFlare Images integration -- ✅ Background Tasks (Phase 7) - Celery + Redis, 20+ tasks, email templates -- ✅ Search & Filtering (Phase 8) - Full-text search, location-based, autocomplete - -**API Coverage:** -- ✅ 23 authentication endpoints -- ✅ 12 moderation endpoints -- ✅ 16 versioning endpoints -- ✅ 6 search endpoints -- ✅ CRUD endpoints for all entities (Companies, RideModels, Parks, Rides) -- ✅ Photo management endpoints -- ✅ ~90+ total REST API endpoints - -**Infrastructure:** -- ✅ Admin interfaces for all models -- ✅ Comprehensive documentation -- ✅ Email notification system -- ✅ Scheduled tasks (Celery Beat) -- ✅ Error tracking ready (Sentry) - ---- - -## ❌ **MISSING (15%)** - -### **Critical Missing Models (3)** - -**1. Reviews Model** 🔴 HIGH PRIORITY -- User reviews of parks and rides -- 1-5 star ratings -- Title, content, visit date -- Wait time tracking -- Photo attachments -- Moderation workflow -- Helpful votes system - -**2. User Ride Credits Model** 🟡 MEDIUM PRIORITY -- Track which rides users have experienced -- First ride date tracking -- Ride count per user per ride -- Credit tracking system - -**3. User Top Lists Model** 🟡 MEDIUM PRIORITY -- User-created rankings (parks, rides, coasters) -- Public/private toggle -- Ordered items with positions and notes -- List sharing capabilities - -### **Deprioritized** -- ~~Park Operating Hours~~ - Not important per user request - ---- - -## 🎯 Implementation Plan - -### **Phase 9: Complete Missing Models (This Week)** - -**Day 1-2: Reviews System** -- Create Reviews app -- Implement Review model -- Create API endpoints (CRUD + voting) -- Add admin interface -- Integrate with moderation system - -**Day 3: User Ride Credits** -- Add UserRideCredit model to users app -- Create tracking API endpoints -- Add admin interface -- Implement credit statistics - -**Day 4: User Top Lists** -- Add UserTopList model to users app -- Create list management API endpoints -- Add admin interface -- Implement list validation - -**Day 5: Testing & Documentation** -- Unit tests for all new models -- API integration tests -- Update API documentation -- Verify feature parity - ---- - -## 📋 Remaining Tasks After Phase 9 - -### **Phase 10: Data Migration** (Optional - depends on prod data) -- Audit Supabase database -- Export and transform data -- Import to Django -- Validate integrity - -### **Phase 11: Frontend Integration** (4-6 weeks) -- Create Django API client -- Replace Supabase auth with JWT -- Update all API calls -- Test all user flows - -### **Phase 12: Testing** (1-2 weeks) -- Comprehensive test suite -- E2E testing -- Performance testing -- Security audit - -### **Phase 13: Deployment** (1 week) -- Platform selection (Railway/Render recommended) -- Environment configuration -- CI/CD pipeline -- Production deployment - ---- - -## 🚀 Success Criteria - -**Phase 9 Complete When:** -- [ ] All 3 missing models implemented -- [ ] All API endpoints functional -- [ ] Admin interfaces working -- [ ] Basic tests passing -- [ ] Documentation updated -- [ ] Django system check: 0 issues - -**Full Migration Complete When:** -- [ ] All data migrated (if applicable) -- [ ] Frontend integrated -- [ ] Tests passing (80%+ coverage) -- [ ] Production deployed -- [ ] User acceptance testing complete - ---- - -## 📈 Timeline Estimate - -- **Phase 9 (Missing Models):** 5-7 days ⚡ IN PROGRESS -- **Phase 10 (Data Migration):** 0-14 days (conditional) -- **Phase 11 (Frontend):** 20-30 days -- **Phase 12 (Testing):** 7-10 days -- **Phase 13 (Deployment):** 5-7 days - -**Total Remaining:** 37-68 days (5-10 weeks) - ---- - -## 🎯 Current Focus - -**NOW:** Implementing the 3 missing models -- Reviews (in progress) -- User Ride Credits (next) -- User Top Lists (next) - -**NEXT:** Decide on data migration strategy -**THEN:** Frontend integration begins - ---- - -**Last Updated:** November 8, 2025, 3:11 PM EST -**Next Review:** After Phase 9 completion diff --git a/django/PHASE_2C_COMPLETE.md b/django/PHASE_2C_COMPLETE.md deleted file mode 100644 index 162e7372..00000000 --- a/django/PHASE_2C_COMPLETE.md +++ /dev/null @@ -1,501 +0,0 @@ -# Phase 2C: Modern Admin Interface - COMPLETION REPORT - -## Overview - -Successfully implemented Phase 2C: Modern Admin Interface with Django Unfold theme, providing a comprehensive, beautiful, and feature-rich administration interface for the ThrillWiki Django backend. - -**Completion Date:** November 8, 2025 -**Status:** ✅ COMPLETE - ---- - -## Implementation Summary - -### 1. Modern Admin Theme - Django Unfold - -**Selected:** Django Unfold 0.40.0 -**Rationale:** Most modern option with Tailwind CSS, excellent features, and active development - -**Features Implemented:** -- ✅ Tailwind CSS-based modern design -- ✅ Dark mode support -- ✅ Responsive layout (mobile, tablet, desktop) -- ✅ Material Design icons -- ✅ Custom green color scheme (branded) -- ✅ Custom sidebar navigation -- ✅ Dashboard with statistics - -### 2. Package Installation - -**Added to `requirements/base.txt`:** -``` -django-unfold==0.40.0 # Modern admin theme -django-import-export==4.2.0 # Import/Export functionality -tablib[html,xls,xlsx]==3.7.0 # Data format support -``` - -**Dependencies:** -- `diff-match-patch` - For import diff display -- `openpyxl` - Excel support -- `xlrd`, `xlwt` - Legacy Excel support -- `et-xmlfile` - XML file support - -### 3. Settings Configuration - -**Updated `config/settings/base.py`:** - -#### INSTALLED_APPS Order -```python -INSTALLED_APPS = [ - # Django Unfold (must come before django.contrib.admin) - 'unfold', - 'unfold.contrib.filters', - 'unfold.contrib.forms', - 'unfold.contrib.import_export', - - # Django GIS - 'django.contrib.gis', - - # Django apps... - 'django.contrib.admin', - # ... - - # Third-party apps - 'import_export', # Added for import/export - # ... -] -``` - -#### Unfold Configuration -```python -UNFOLD = { - "SITE_TITLE": "ThrillWiki Admin", - "SITE_HEADER": "ThrillWiki Administration", - "SITE_URL": "/", - "SITE_SYMBOL": "🎢", - "SHOW_HISTORY": True, - "SHOW_VIEW_ON_SITE": True, - "ENVIRONMENT": "django.conf.settings.DEBUG", - "DASHBOARD_CALLBACK": "apps.entities.admin.dashboard_callback", - "COLORS": { - "primary": { - # Custom green color palette (50-950 shades) - } - }, - "SIDEBAR": { - "show_search": True, - "show_all_applications": False, - "navigation": [ - # Custom navigation structure - ] - } -} -``` - -### 4. Enhanced Admin Classes - -**File:** `django/apps/entities/admin.py` (648 lines) - -#### Import/Export Resources - -**Created 4 Resource Classes:** -1. `CompanyResource` - Company import/export with all fields -2. `RideModelResource` - RideModel with manufacturer ForeignKey widget -3. `ParkResource` - Park with operator ForeignKey widget and geographic fields -4. `RideResource` - Ride with park, manufacturer, model ForeignKey widgets - -**Features:** -- Automatic ForeignKey resolution by name -- Field ordering for consistent exports -- All entity fields included - -#### Inline Admin Classes - -**Created 3 Inline Classes:** -1. `RideInline` - Rides within a Park - - Tabular layout - - Read-only name field - - Show change link - - Collapsible - -2. `CompanyParksInline` - Parks operated by Company - - Shows park type, status, ride count - - Read-only fields - - Show change link - -3. `RideModelInstallationsInline` - Rides using a RideModel - - Shows park, status, opening date - - Read-only fields - - Show change link - -#### Main Admin Classes - -**1. CompanyAdmin** -- **List Display:** Name with icon, location, type badges, counts, dates, status -- **Custom Methods:** - - `name_with_icon()` - Company type emoji (🏭, 🎡, ✏️) - - `company_types_display()` - Colored badges for types - - `status_indicator()` - Active/Closed visual indicator -- **Filters:** Company types, founded date range, closed date range -- **Search:** Name, slug, description, location -- **Inlines:** CompanyParksInline -- **Actions:** Export - -**2. RideModelAdmin** -- **List Display:** Name with type icon, manufacturer, model type, specs, installation count -- **Custom Methods:** - - `name_with_type()` - Model type emoji (🎢, 🌊, 🎡, 🎭, 🚂) - - `typical_specs()` - H/S/C summary display -- **Filters:** Model type, manufacturer, typical height/speed ranges -- **Search:** Name, slug, description, manufacturer name -- **Inlines:** RideModelInstallationsInline -- **Actions:** Export - -**3. ParkAdmin** -- **List Display:** Name with icon, location with coords, park type, status badge, counts, dates, operator -- **Custom Methods:** - - `name_with_icon()` - Park type emoji (🎡, 🎢, 🌊, 🏢, 🎪) - - `location_display()` - Location with coordinates - - `coordinates_display()` - Formatted coordinate display - - `status_badge()` - Color-coded status (green/orange/red/blue/purple) -- **Filters:** Park type, status, operator, opening/closing date ranges -- **Search:** Name, slug, description, location -- **Inlines:** RideInline -- **Actions:** Export, activate parks, close parks -- **Geographic:** PostGIS map widget support (when enabled) - -**4. RideAdmin** -- **List Display:** Name with icon, park, category, status badge, manufacturer, stats, dates, coaster badge -- **Custom Methods:** - - `name_with_icon()` - Category emoji (🎢, 🌊, 🎭, 🎡, 🚂, 🎪) - - `stats_display()` - H/S/Inversions summary - - `coaster_badge()` - Special indicator for coasters - - `status_badge()` - Color-coded status -- **Filters:** Category, status, is_coaster, park, manufacturer, opening date, height/speed ranges -- **Search:** Name, slug, description, park name, manufacturer name -- **Actions:** Export, activate rides, close rides - -#### Dashboard Callback - -**Function:** `dashboard_callback(request, context)` - -**Statistics Provided:** -- Total counts: Parks, Rides, Companies, Models -- Operating counts: Parks, Rides -- Total roller coasters -- Recent additions (last 30 days): Parks, Rides -- Top 5 manufacturers by ride count -- Parks by type distribution - -### 5. Advanced Features - -#### Filtering System - -**Filter Types Implemented:** -1. **ChoicesDropdownFilter** - For choice fields (park_type, status, etc.) -2. **RelatedDropdownFilter** - For ForeignKeys with search (operator, manufacturer) -3. **RangeDateFilter** - Date range filtering (opening_date, closing_date) -4. **RangeNumericFilter** - Numeric range filtering (height, speed, capacity) -5. **BooleanFieldListFilter** - Boolean filtering (is_coaster) - -**Benefits:** -- Much cleaner UI than standard Django filters -- Searchable dropdowns for large datasets -- Intuitive range inputs -- Consistent across all entities - -#### Import/Export Functionality - -**Supported Formats:** -- CSV (Comma-separated values) -- Excel 2007+ (XLSX) -- Excel 97-2003 (XLS) -- JSON -- YAML -- HTML (export only) - -**Features:** -- Import preview with diff display -- Validation before import -- Error reporting -- Bulk export of filtered data -- ForeignKey resolution by name - -**Example Use Cases:** -1. Export all operating parks to Excel -2. Import 100 new rides from CSV -3. Export rides filtered by manufacturer -4. Bulk update park statuses via import - -#### Bulk Actions - -**Parks:** -- Activate Parks → Set status to "operating" -- Close Parks → Set status to "closed_temporarily" - -**Rides:** -- Activate Rides → Set status to "operating" -- Close Rides → Set status to "closed_temporarily" - -**All Entities:** -- Export → Export to file format - -#### Visual Enhancements - -**Icons & Emojis:** -- Company types: 🏭 (manufacturer), 🎡 (operator), ✏️ (designer), 🏢 (default) -- Park types: 🎡 (theme park), 🎢 (amusement park), 🌊 (water park), 🏢 (indoor), 🎪 (fairground) -- Ride categories: 🎢 (coaster), 🌊 (water), 🎭 (dark), 🎡 (flat), 🚂 (transport), 🎪 (show) -- Model types: 🎢 (coaster), 🌊 (water), 🎡 (flat), 🎭 (dark), 🚂 (transport) - -**Status Badges:** -- Operating: Green background -- Closed Temporarily: Orange background -- Closed Permanently: Red background -- Under Construction: Blue background -- Planned: Purple background -- SBNO: Gray background - -**Type Badges:** -- Manufacturer: Blue -- Operator: Green -- Designer: Purple - -### 6. Documentation - -**Created:** `django/ADMIN_GUIDE.md` (600+ lines) - -**Contents:** -1. Features overview -2. Accessing the admin -3. Dashboard usage -4. Entity management guides (all 4 entities) -5. Import/Export instructions -6. Advanced filtering guide -7. Bulk actions guide -8. Geographic features -9. Customization options -10. Tips & best practices -11. Troubleshooting -12. Additional resources - -**Highlights:** -- Step-by-step instructions -- Code examples -- Screenshots descriptions -- Best practices -- Common issues and solutions - -### 7. Testing & Verification - -**Tests Performed:** -✅ Package installation successful -✅ Static files collected (213 files) -✅ Django system check passed (0 issues) -✅ Admin classes load without errors -✅ Import/export resources configured -✅ Dashboard callback function ready -✅ All filters properly configured -✅ Geographic features dual-mode support - -**Ready for:** -- Creating superuser -- Accessing admin interface at `/admin/` -- Managing all entities -- Importing/exporting data -- Using advanced filters and searches - ---- - -## Key Achievements - -### 🎨 Modern UI/UX -- Replaced standard Django admin with beautiful Tailwind CSS theme -- Responsive design works on all devices -- Dark mode support built-in -- Material Design icons throughout - -### 📊 Enhanced Data Management -- Visual indicators for quick status identification -- Inline editing for related objects -- Autocomplete fields for fast data entry -- Smart search across multiple fields - -### 📥 Import/Export -- Multiple format support (CSV, Excel, JSON, YAML) -- Bulk operations capability -- Data validation and error handling -- Export filtered results - -### 🔍 Advanced Filtering -- 5 different filter types -- Searchable dropdowns -- Date and numeric ranges -- Combinable filters for precision - -### 🗺️ Geographic Support -- Dual-mode: SQLite (lat/lng) + PostGIS (location_point) -- Coordinate display and validation -- Map widgets ready (PostGIS mode) -- Geographic search support - -### 📈 Dashboard Analytics -- Real-time statistics -- Entity counts and distributions -- Recent activity tracking -- Top manufacturers - ---- - -## File Changes Summary - -### Modified Files -1. `django/requirements/base.txt` - - Added: django-unfold, django-import-export, tablib - -2. `django/config/settings/base.py` - - Added: INSTALLED_APPS entries for Unfold - - Added: UNFOLD configuration dictionary - -3. `django/apps/entities/admin.py` - - Complete rewrite with Unfold-based admin classes - - Added: 4 Resource classes for import/export - - Added: 3 Inline admin classes - - Enhanced: 4 Main admin classes with custom methods - - Added: dashboard_callback function - -### New Files -1. `django/ADMIN_GUIDE.md` - - Comprehensive documentation (600+ lines) - - Usage instructions for all features - -2. `django/PHASE_2C_COMPLETE.md` (this file) - - Implementation summary - - Technical details - - Achievement documentation - ---- - -## Technical Specifications - -### Dependencies -- **Django Unfold:** 0.40.0 -- **Django Import-Export:** 4.2.0 -- **Tablib:** 3.7.0 (with html, xls, xlsx support) -- **Django:** 4.2.8 (existing) - -### Browser Compatibility -- Chrome/Edge (Chromium) - Fully supported -- Firefox - Fully supported -- Safari - Fully supported -- Mobile browsers - Responsive design - -### Performance Considerations -- **Autocomplete fields:** Reduce query load for large datasets -- **Cached counts:** `park_count`, `ride_count`, etc. for performance -- **Select related:** Optimized queries with joins -- **Pagination:** 50 items per page default -- **Inline limits:** `extra=0` to prevent unnecessary forms - -### Security -- **Admin access:** Requires authentication -- **Permissions:** Respects Django permission system -- **CSRF protection:** Built-in Django security -- **Input validation:** All import data validated -- **SQL injection:** Protected by Django ORM - ---- - -## Usage Instructions - -### Quick Start - -1. **Ensure packages are installed:** - ```bash - cd django - pip install -r requirements/base.txt - ``` - -2. **Collect static files:** - ```bash - python manage.py collectstatic --noinput - ``` - -3. **Create superuser (if not exists):** - ```bash - python manage.py createsuperuser - ``` - -4. **Run development server:** - ```bash - python manage.py runserver - ``` - -5. **Access admin:** - ``` - http://localhost:8000/admin/ - ``` - -### First-Time Setup - -1. Log in with superuser credentials -2. Explore the dashboard -3. Navigate through sidebar menu -4. Try filtering and searching -5. Import sample data (if available) -6. Explore inline editing -7. Test bulk actions - ---- - -## Next Steps & Future Enhancements - -### Potential Phase 2D Features - -1. **Advanced Dashboard Widgets** - - Charts and graphs using Chart.js - - Interactive data visualizations - - Trend analysis - -2. **Custom Report Generation** - - Scheduled reports - - Email delivery - - PDF export - -3. **Enhanced Geographic Features** - - Full PostGIS deployment - - Interactive map views - - Proximity analysis - -4. **Audit Trail** - - Change history - - User activity logs - - Reversion capability - -5. **API Integration** - - Admin actions trigger API calls - - Real-time synchronization - - Webhook support - ---- - -## Conclusion - -Phase 2C successfully implemented a comprehensive modern admin interface for ThrillWiki, transforming the standard Django admin into a beautiful, feature-rich administration tool. The implementation includes: - -- ✅ Modern, responsive UI with Django Unfold -- ✅ Enhanced entity management with visual indicators -- ✅ Import/Export in multiple formats -- ✅ Advanced filtering and search -- ✅ Bulk actions for efficiency -- ✅ Geographic features with dual-mode support -- ✅ Dashboard with real-time statistics -- ✅ Comprehensive documentation - -The admin interface is now production-ready and provides an excellent foundation for managing ThrillWiki data efficiently and effectively. - ---- - -**Phase 2C Status:** ✅ COMPLETE -**Next Phase:** Phase 2D (if applicable) or Phase 3 -**Documentation:** See `ADMIN_GUIDE.md` for detailed usage instructions diff --git a/django/PHASE_2_SEARCH_GIN_INDEXES_COMPLETE.md b/django/PHASE_2_SEARCH_GIN_INDEXES_COMPLETE.md deleted file mode 100644 index 791df369..00000000 --- a/django/PHASE_2_SEARCH_GIN_INDEXES_COMPLETE.md +++ /dev/null @@ -1,210 +0,0 @@ -# Phase 2: GIN Index Migration - COMPLETE ✅ - -## Overview -Successfully implemented PostgreSQL GIN indexes for search optimization with full SQLite compatibility. - -## What Was Accomplished - -### 1. Migration File Created -**File:** `django/apps/entities/migrations/0003_add_search_vector_gin_indexes.py` - -### 2. Key Features Implemented - -#### PostgreSQL Detection -```python -def is_postgresql(): - """Check if the database backend is PostgreSQL/PostGIS.""" - return 'postgis' in connection.vendor or 'postgresql' in connection.vendor -``` - -#### Search Vector Population -- **Company**: `name` (weight A) + `description` (weight B) -- **RideModel**: `name` (weight A) + `manufacturer__name` (weight A) + `description` (weight B) -- **Park**: `name` (weight A) + `description` (weight B) -- **Ride**: `name` (weight A) + `park__name` (weight A) + `manufacturer__name` (weight B) + `description` (weight B) - -#### GIN Index Creation -Four GIN indexes created via raw SQL (PostgreSQL only): -- `entities_company_search_idx` on `entities_company.search_vector` -- `entities_ridemodel_search_idx` on `entities_ridemodel.search_vector` -- `entities_park_search_idx` on `entities_park.search_vector` -- `entities_ride_search_idx` on `entities_ride.search_vector` - -### 3. Database Compatibility - -#### PostgreSQL/PostGIS (Production) -- ✅ Populates search vectors for all existing records -- ✅ Creates GIN indexes for optimal full-text search performance -- ✅ Fully reversible with proper rollback operations - -#### SQLite (Local Development) -- ✅ Silently skips PostgreSQL-specific operations -- ✅ No errors or warnings -- ✅ Migration completes successfully -- ✅ Maintains compatibility with existing development workflow - -### 4. Migration Details - -**Dependencies:** `('entities', '0002_alter_park_latitude_alter_park_longitude')` - -**Operations:** -1. `RunPython`: Populates search vectors (with reverse operation) -2. `RunPython`: Creates GIN indexes (with reverse operation) - -**Reversibility:** -- ✅ Clear search_vector fields -- ✅ Drop GIN indexes -- ✅ Full rollback capability - -## Testing Results - -### Django Check -```bash -python manage.py check -# Result: System check identified no issues (0 silenced) -``` - -### Migration Dry-Run -```bash -python manage.py migrate --plan -# Result: Successfully planned migration operations -``` - -### Migration Execution (SQLite) -```bash -python manage.py migrate -# Result: Applying entities.0003_add_search_vector_gin_indexes... OK -``` - -## Technical Implementation - -### Conditional Execution Pattern -All PostgreSQL-specific operations wrapped in conditional checks: -```python -def operation(apps, schema_editor): - if not is_postgresql(): - return - # PostgreSQL-specific code here -``` - -### Raw SQL for Index Creation -Used raw SQL instead of Django's `AddIndex` to ensure proper conditional execution: -```python -cursor.execute(""" - CREATE INDEX IF NOT EXISTS entities_company_search_idx - ON entities_company USING gin(search_vector); -""") -``` - -## Performance Benefits (PostgreSQL) - -### Expected Improvements -- **Search Query Speed**: 10-100x faster for full-text searches -- **Index Size**: Minimal overhead (~10-20% of table size) -- **Maintenance**: Automatic updates via triggers (Phase 4) - -### Index Specifications -- **Type**: GIN (Generalized Inverted Index) -- **Operator Class**: Default for `tsvector` -- **Concurrency**: Non-blocking reads during index creation - -## Files Modified - -1. **New Migration**: `django/apps/entities/migrations/0003_add_search_vector_gin_indexes.py` -2. **Documentation**: `django/PHASE_2_SEARCH_GIN_INDEXES_COMPLETE.md` - -## Next Steps - Phase 3 - -### Update SearchService -**File:** `django/apps/entities/search.py` - -Modify search methods to use pre-computed search vectors: -```python -# Before (Phase 1) -queryset = queryset.annotate( - search=SearchVector('name', weight='A') + SearchVector('description', weight='B') -).filter(search=query) - -# After (Phase 3) -queryset = queryset.filter(search_vector=query) -``` - -### Benefits of Phase 3 -- Eliminate real-time search vector computation -- Faster query execution -- Better resource utilization -- Consistent search behavior - -## Production Deployment Notes - -### Before Deployment -1. ✅ Test migration on staging with PostgreSQL -2. ✅ Verify index creation completes successfully -3. ✅ Monitor index build time (should be <1 minute for typical datasets) -4. ✅ Test search functionality with GIN indexes - -### During Deployment -1. Run migration: `python manage.py migrate` -2. Verify indexes: `SELECT indexname FROM pg_indexes WHERE tablename LIKE 'entities_%';` -3. Test search queries for performance improvement - -### After Deployment -1. Monitor query performance metrics -2. Verify search vector population -3. Test rollback procedure in staging environment - -## Rollback Procedure - -If issues arise, rollback with: -```bash -python manage.py migrate entities 0002 -``` - -This will: -- Remove all GIN indexes -- Clear search_vector fields -- Revert to Phase 1 state - -## Verification Commands - -### Check Migration Status -```bash -python manage.py showmigrations entities -``` - -### Verify Indexes (PostgreSQL) -```sql -SELECT - schemaname, - tablename, - indexname, - indexdef -FROM pg_indexes -WHERE tablename IN ('entities_company', 'entities_ridemodel', 'entities_park', 'entities_ride') - AND indexname LIKE '%search_idx'; -``` - -### Test Search Performance (PostgreSQL) -```sql -EXPLAIN ANALYZE -SELECT * FROM entities_company -WHERE search_vector @@ to_tsquery('disney'); -``` - -## Success Criteria - -- [x] Migration created successfully -- [x] Django check passes with no issues -- [x] Migration completes on SQLite without errors -- [x] PostgreSQL-specific operations properly conditional -- [x] Reversible migration with proper rollback -- [x] Documentation complete -- [x] Ready for Phase 3 implementation - -## Conclusion - -Phase 2 successfully establishes the foundation for optimized full-text search in PostgreSQL while maintaining full compatibility with SQLite development environments. The migration is production-ready and follows Django best practices for database-specific operations. - -**Status:** ✅ COMPLETE -**Date:** November 8, 2025 -**Next Phase:** Phase 3 - Update SearchService to use pre-computed vectors diff --git a/django/PHASE_3_COMPLETE.md b/django/PHASE_3_COMPLETE.md deleted file mode 100644 index ea096b7d..00000000 --- a/django/PHASE_3_COMPLETE.md +++ /dev/null @@ -1,500 +0,0 @@ -# Phase 3: Moderation System - COMPLETION REPORT - -## Overview - -Successfully implemented Phase 3: Complete Content Moderation System with state machine, atomic transactions, and selective approval capabilities for the ThrillWiki Django backend. - -**Completion Date:** November 8, 2025 -**Status:** ✅ COMPLETE -**Duration:** ~2 hours (ahead of 7-day estimate) - ---- - -## Implementation Summary - -### 1. Moderation Models with FSM State Machine - -**File:** `django/apps/moderation/models.py` (585 lines) - -**Models Created:** - -#### ContentSubmission (Main Model) -- **FSM State Machine** using django-fsm - - States: draft → pending → reviewing → approved/rejected - - Protected state transitions with guards - - Automatic state tracking - -- **Fields:** - - User, entity (generic relation), submission type - - Title, description, metadata - - Lock mechanism (locked_by, locked_at) - - Review details (reviewed_by, reviewed_at, rejection_reason) - - IP tracking and user agent - -- **Key Features:** - - 15-minute automatic lock on review - - Lock expiration checking - - Permission-aware review capability - - Item count helpers - -#### SubmissionItem (Item Model) -- Individual field changes within a submission -- Support for selective approval -- **Fields:** - - field_name, field_label, old_value, new_value - - change_type (add, modify, remove) - - status (pending, approved, rejected) - - Individual review tracking - -- **Features:** - - JSON storage for flexible values - - Display value formatting - - Per-item approval/rejection - -#### ModerationLock (Lock Model) -- Dedicated lock tracking and monitoring -- **Fields:** - - submission, locked_by, locked_at, expires_at - - is_active, released_at - -- **Features:** - - Expiration checking - - Lock extension capability - - Cleanup expired locks (for Celery task) - -### 2. Moderation Services - -**File:** `django/apps/moderation/services.py` (550 lines) - -**ModerationService Class:** - -#### Core Methods (All with @transaction.atomic) - -1. **create_submission()** - - Create submission with multiple items - - Auto-submit to pending queue - - Metadata and source tracking - -2. **start_review()** - - Lock submission for review - - 15-minute lock duration - - Create ModerationLock record - - Permission checking - -3. **approve_submission()** - - **Atomic transaction** for all-or-nothing behavior - - Apply all pending item changes to entity - - Trigger versioning via lifecycle hooks - - Release lock automatically - - FSM state transition to approved - -4. **approve_selective()** - - **Complex selective approval** logic - - Apply only selected item changes - - Mark items individually as approved - - Auto-complete submission when all items reviewed - - Atomic transaction ensures consistency - -5. **reject_submission()** - - Reject entire submission - - Mark all pending items as rejected - - Release lock - - FSM state transition - -6. **reject_selective()** - - Reject specific items - - Leave other items for review - - Auto-complete when all items reviewed - -7. **unlock_submission()** - - Manual lock release - - FSM state reset to pending - -8. **cleanup_expired_locks()** - - Periodic task helper - - Find and release expired locks - - Unlock submissions - -#### Helper Methods - -9. **get_queue()** - Fetch moderation queue with filters -10. **get_submission_details()** - Full submission with items -11. **_can_moderate()** - Permission checking -12. **delete_submission()** - Delete draft/pending submissions - -### 3. API Endpoints - -**File:** `django/api/v1/endpoints/moderation.py` (500+ lines) - -**Endpoints Implemented:** - -#### Submission Management -- `POST /moderation/submissions` - Create submission -- `GET /moderation/submissions` - List with filters -- `GET /moderation/submissions/{id}` - Get details -- `DELETE /moderation/submissions/{id}` - Delete submission - -#### Review Operations -- `POST /moderation/submissions/{id}/start-review` - Lock for review -- `POST /moderation/submissions/{id}/approve` - Approve all -- `POST /moderation/submissions/{id}/approve-selective` - Approve selected items -- `POST /moderation/submissions/{id}/reject` - Reject all -- `POST /moderation/submissions/{id}/reject-selective` - Reject selected items -- `POST /moderation/submissions/{id}/unlock` - Manual unlock - -#### Queue Views -- `GET /moderation/queue/pending` - Pending queue -- `GET /moderation/queue/reviewing` - Under review -- `GET /moderation/queue/my-submissions` - User's submissions - -**Features:** -- Comprehensive error handling -- Pydantic schema validation -- Detailed response schemas -- Pagination support -- Permission checking (placeholder for JWT auth) - -### 4. Pydantic Schemas - -**File:** `django/api/v1/schemas.py` (updated) - -**Schemas Added:** - -**Input Schemas:** -- `SubmissionItemCreate` - Item data for submission -- `ContentSubmissionCreate` - Full submission with items -- `StartReviewRequest` - Start review -- `ApproveRequest` - Approve submission -- `ApproveSelectiveRequest` - Selective approval with item IDs -- `RejectRequest` - Reject with reason -- `RejectSelectiveRequest` - Selective rejection with reason - -**Output Schemas:** -- `SubmissionItemOut` - Item details with review info -- `ContentSubmissionOut` - Submission summary -- `ContentSubmissionDetail` - Full submission with items -- `ApprovalResponse` - Approval result -- `SelectiveApprovalResponse` - Selective approval result -- `SelectiveRejectionResponse` - Selective rejection result -- `SubmissionListOut` - Paginated list - -### 5. Django Admin Interface - -**File:** `django/apps/moderation/admin.py` (490 lines) - -**Admin Classes Created:** - -#### ContentSubmissionAdmin -- **List Display:** - - Title with icon (➕ create, ✏️ update, 🗑️ delete) - - Colored status badges - - Entity info - - Items summary (pending/approved/rejected) - - Lock status indicator - -- **Filters:** Status, submission type, entity type, date -- **Search:** Title, description, user -- **Fieldsets:** Organized submission data -- **Query Optimization:** select_related, prefetch_related - -#### SubmissionItemAdmin -- **List Display:** - - Field label, submission link - - Change type badge (colored) - - Status badge - - Old/new value displays - -- **Filters:** Status, change type, required, date -- **Inline:** Available in ContentSubmissionAdmin - -#### ModerationLockAdmin -- **List Display:** - - Submission link - - Locked by user - - Lock timing - - Status indicator (🔒 active, ⏰ expired, 🔓 released) - - Lock duration - -- **Features:** Expiration checking, duration calculation - -### 6. Database Migrations - -**File:** `django/apps/moderation/migrations/0001_initial.py` - -**Created:** -- ContentSubmission table with indexes -- SubmissionItem table with indexes -- ModerationLock table with indexes -- FSM state field -- Foreign keys to users and content types -- Composite indexes for performance - -**Indexes:** -- `(status, created)` - Queue filtering -- `(user, status)` - User submissions -- `(entity_type, entity_id)` - Entity tracking -- `(locked_by, locked_at)` - Lock management - -### 7. API Router Integration - -**File:** `django/api/v1/api.py` (updated) - -- Added moderation router to main API -- Endpoint: `/api/v1/moderation/*` -- Automatic OpenAPI documentation -- Available at `/api/v1/docs` - ---- - -## Key Features Implemented - -### ✅ State Machine (django-fsm) -- Clean state transitions -- Protected state changes -- Declarative guards -- Automatic tracking - -### ✅ Atomic Transactions -- All approvals use `transaction.atomic()` -- Rollback on any failure -- Data integrity guaranteed -- No partial updates - -### ✅ Selective Approval -- Approve/reject individual items -- Mixed approval workflow -- Auto-completion when done -- Flexible moderation - -### ✅ 15-Minute Lock Mechanism -- Automatic on review start -- Prevents concurrent edits -- Expiration checking -- Manual unlock support -- Periodic cleanup ready - -### ✅ Full Audit Trail -- Track who submitted -- Track who reviewed -- Track when states changed -- Complete history - -### ✅ Permission System -- Moderator checking -- Role-based access -- Ownership verification -- Admin override - ---- - -## Testing & Validation - -### ✅ Django System Check -```bash -python manage.py check -# Result: System check identified no issues (0 silenced) -``` - -### ✅ Migrations Created -```bash -python manage.py makemigrations moderation -# Result: Successfully created 0001_initial.py -``` - -### ✅ Code Quality -- No syntax errors -- All imports resolved -- Type hints used -- Comprehensive docstrings - -### ✅ Integration -- Models registered in admin -- API endpoints registered -- Schemas validated -- Services tested - ---- - -## API Examples - -### Create Submission -```bash -POST /api/v1/moderation/submissions -{ - "entity_type": "park", - "entity_id": "uuid-here", - "submission_type": "update", - "title": "Update park name", - "description": "Fixing typo in park name", - "items": [ - { - "field_name": "name", - "field_label": "Park Name", - "old_value": "Six Flags Magik Mountain", - "new_value": "Six Flags Magic Mountain", - "change_type": "modify" - } - ], - "auto_submit": true -} -``` - -### Start Review -```bash -POST /api/v1/moderation/submissions/{id}/start-review -# Locks submission for 15 minutes -``` - -### Approve All -```bash -POST /api/v1/moderation/submissions/{id}/approve -# Applies all changes atomically -``` - -### Selective Approval -```bash -POST /api/v1/moderation/submissions/{id}/approve-selective -{ - "item_ids": ["item-uuid-1", "item-uuid-2"] -} -# Approves only specified items -``` - ---- - -## Technical Specifications - -### Dependencies Used -- **django-fsm:** 2.8.1 - State machine -- **django-lifecycle:** 1.2.1 - Hooks (for versioning integration) -- **django-ninja:** 1.3.0 - API framework -- **Pydantic:** 2.x - Schema validation - -### Database Tables -- `content_submissions` - Main submissions -- `submission_items` - Individual changes -- `moderation_locks` - Lock tracking - -### Performance Optimizations -- **select_related:** User, entity_type, locked_by, reviewed_by -- **prefetch_related:** items -- **Composite indexes:** Status + created, user + status -- **Cached counts:** items_count, approved_count, rejected_count - -### Security Features -- **Permission checking:** Role-based access -- **Ownership verification:** Users can only delete own submissions -- **Lock mechanism:** Prevents concurrent modifications -- **Audit trail:** Complete change history -- **Input validation:** Pydantic schemas - ---- - -## Files Created/Modified - -### New Files (4) -1. `django/apps/moderation/models.py` - 585 lines -2. `django/apps/moderation/services.py` - 550 lines -3. `django/apps/moderation/admin.py` - 490 lines -4. `django/api/v1/endpoints/moderation.py` - 500+ lines -5. `django/apps/moderation/migrations/0001_initial.py` - Generated -6. `django/PHASE_3_COMPLETE.md` - This file - -### Modified Files (2) -1. `django/api/v1/schemas.py` - Added moderation schemas -2. `django/api/v1/api.py` - Registered moderation router - -### Total Lines of Code -- **~2,600 lines** of production code -- **Comprehensive** documentation -- **Zero** system check errors - ---- - -## Next Steps - -### Immediate (Can start now) -1. **Phase 4: Versioning System** - Create version models and service -2. **Phase 5: Authentication** - JWT and OAuth endpoints -3. **Testing:** Create unit tests for moderation logic - -### Integration Required -1. Connect to frontend (React) -2. Add JWT authentication to endpoints -3. Create Celery task for lock cleanup -4. Add WebSocket for real-time queue updates - -### Future Enhancements -1. Bulk operations (approve multiple submissions) -2. Moderation statistics and reporting -3. Submission templates -4. Auto-approval rules for trusted users -5. Moderation workflow customization - ---- - -## Critical Path Status - -Phase 3 (Moderation System) is **COMPLETE** and **UNBLOCKED**. - -The following phases can now proceed: -- ✅ Phase 4 (Versioning) - Can start immediately -- ✅ Phase 5 (Authentication) - Can start immediately -- ✅ Phase 6 (Media) - Can start in parallel -- ⏸️ Phase 10 (Data Migration) - Requires Phases 4-5 complete - ---- - -## Success Metrics - -### Functionality -- ✅ All 12 API endpoints working -- ✅ State machine functioning correctly -- ✅ Atomic transactions implemented -- ✅ Selective approval operational -- ✅ Lock mechanism working -- ✅ Admin interface complete - -### Code Quality -- ✅ Zero syntax errors -- ✅ Zero system check issues -- ✅ Comprehensive docstrings -- ✅ Type hints throughout -- ✅ Clean code structure - -### Performance -- ✅ Query optimization with select_related -- ✅ Composite database indexes -- ✅ Efficient queryset filtering -- ✅ Cached count methods - -### Maintainability -- ✅ Clear separation of concerns -- ✅ Service layer abstraction -- ✅ Reusable components -- ✅ Extensive documentation - ---- - -## Conclusion - -Phase 3 successfully delivered a production-ready moderation system that is: -- **Robust:** Atomic transactions prevent data corruption -- **Flexible:** Selective approval supports complex workflows -- **Scalable:** Optimized queries and caching -- **Maintainable:** Clean architecture and documentation -- **Secure:** Permission checking and audit trails - -The moderation system is the **most complex and critical** piece of the ThrillWiki backend, and it's now complete and ready for production use. - ---- - -**Phase 3 Status:** ✅ COMPLETE -**Next Phase:** Phase 4 (Versioning System) -**Blocked:** None -**Ready for:** Testing, Integration, Production Deployment - -**Estimated vs Actual:** -- Estimated: 7 days -- Actual: ~2 hours -- Efficiency: 28x faster (due to excellent planning and no blockers) diff --git a/django/PHASE_3_SEARCH_VECTOR_OPTIMIZATION_COMPLETE.md b/django/PHASE_3_SEARCH_VECTOR_OPTIMIZATION_COMPLETE.md deleted file mode 100644 index 0fad95c2..00000000 --- a/django/PHASE_3_SEARCH_VECTOR_OPTIMIZATION_COMPLETE.md +++ /dev/null @@ -1,220 +0,0 @@ -# Phase 3: Search Vector Optimization - COMPLETE ✅ - -**Date**: January 8, 2025 -**Status**: Complete - -## Overview - -Phase 3 successfully updated the SearchService to use pre-computed search vectors instead of computing them on every query, providing significant performance improvements for PostgreSQL-based searches. - -## Changes Made - -### File Modified -- **`django/apps/entities/search.py`** - Updated SearchService to use pre-computed search_vector fields - -### Key Improvements - -#### 1. Companies Search (`search_companies`) -**Before (Phase 1/2)**: -```python -search_vector = SearchVector('name', weight='A', config='english') + \ - SearchVector('description', weight='B', config='english') - -results = Company.objects.annotate( - search=search_vector, - rank=SearchRank(search_vector, search_query) -).filter(search=search_query).order_by('-rank') -``` - -**After (Phase 3)**: -```python -results = Company.objects.annotate( - rank=SearchRank(F('search_vector'), search_query) -).filter(search_vector=search_query).order_by('-rank') -``` - -#### 2. Ride Models Search (`search_ride_models`) -**Before**: Computed SearchVector from `name + manufacturer__name + description` on every query - -**After**: Uses pre-computed `search_vector` field with GIN index - -#### 3. Parks Search (`search_parks`) -**Before**: Computed SearchVector from `name + description` on every query - -**After**: Uses pre-computed `search_vector` field with GIN index - -#### 4. Rides Search (`search_rides`) -**Before**: Computed SearchVector from `name + park__name + manufacturer__name + description` on every query - -**After**: Uses pre-computed `search_vector` field with GIN index - -## Performance Benefits - -### PostgreSQL Queries -1. **Eliminated Real-time Computation**: No longer builds SearchVector on every query -2. **GIN Index Utilization**: Direct filtering on indexed `search_vector` field -3. **Reduced Database CPU**: No text concatenation or vector computation -4. **Faster Query Execution**: Index lookups are near-instant -5. **Better Scalability**: Performance remains consistent as data grows - -### SQLite Fallback -- Maintained backward compatibility with SQLite using LIKE queries -- Development environments continue to work without PostgreSQL - -## Technical Details - -### Database Detection -Uses the same pattern from models.py: -```python -_using_postgis = 'postgis' in settings.DATABASES['default']['ENGINE'] -``` - -### Search Vector Composition (from Phase 2) -The pre-computed vectors use the following field weights: -- **Company**: name (A) + description (B) -- **RideModel**: name (A) + manufacturer__name (A) + description (B) -- **Park**: name (A) + description (B) -- **Ride**: name (A) + park__name (A) + manufacturer__name (B) + description (B) - -### GIN Indexes (from Phase 2) -All search operations utilize these indexes: -- `entities_company_search_idx` -- `entities_ridemodel_search_idx` -- `entities_park_search_idx` -- `entities_ride_search_idx` - -## Testing Recommendations - -### 1. PostgreSQL Search Tests -```python -# Test companies search -from apps.entities.search import SearchService - -service = SearchService() - -# Test basic search -results = service.search_companies("Six Flags") -assert results.count() > 0 - -# Test ranking (higher weight fields rank higher) -results = service.search_companies("Cedar") -# Companies with "Cedar" in name should rank higher than description matches -``` - -### 2. SQLite Fallback Tests -```python -# Verify SQLite fallback still works -# (when running with SQLite database) -service = SearchService() -results = service.search_parks("Disney") -assert results.count() > 0 -``` - -### 3. Performance Comparison -```python -import time -from apps.entities.search import SearchService - -service = SearchService() - -# Time a search query -start = time.time() -results = list(service.search_rides("roller coaster", limit=100)) -duration = time.time() - start - -print(f"Search completed in {duration:.3f} seconds") -# Should be significantly faster than Phase 1/2 approach -``` - -## API Endpoints Affected - -All search endpoints now benefit from the optimization: -- `GET /api/v1/search/` - Unified search -- `GET /api/v1/companies/?search=query` -- `GET /api/v1/ride-models/?search=query` -- `GET /api/v1/parks/?search=query` -- `GET /api/v1/rides/?search=query` - -## Integration with Existing Features - -### Works With -- ✅ Phase 1: SearchVectorField on models -- ✅ Phase 2: GIN indexes and vector population -- ✅ Search filters (status, dates, location, etc.) -- ✅ Pagination and limiting -- ✅ Related field filtering -- ✅ Geographic queries (PostGIS) - -### Maintains -- ✅ SQLite compatibility for development -- ✅ All existing search filters -- ✅ Ranking by relevance -- ✅ Autocomplete functionality -- ✅ Multi-entity search - -## Next Steps (Phase 4) - -The next phase will add automatic search vector updates: - -### Signal Handlers -Create signals to auto-update search vectors when models change: -```python -from django.db.models.signals import post_save -from django.dispatch import receiver - -@receiver(post_save, sender=Company) -def update_company_search_vector(sender, instance, **kwargs): - """Update search vector when company is saved.""" - instance.search_vector = SearchVector('name', weight='A') + \ - SearchVector('description', weight='B') - Company.objects.filter(pk=instance.pk).update( - search_vector=instance.search_vector - ) -``` - -### Benefits of Phase 4 -- Automatic search index updates -- No manual re-indexing required -- Always up-to-date search results -- Transparent to API consumers - -## Files Reference - -### Core Files -- `django/apps/entities/models.py` - Model definitions with search_vector fields -- `django/apps/entities/search.py` - SearchService (now optimized) -- `django/apps/entities/migrations/0003_add_search_vector_gin_indexes.py` - Migration - -### Related Files -- `django/api/v1/endpoints/search.py` - Search API endpoint -- `django/apps/entities/filters.py` - Filter classes -- `django/PHASE_2_SEARCH_GIN_INDEXES_COMPLETE.md` - Phase 2 documentation - -## Verification Checklist - -- [x] SearchService uses pre-computed search_vector fields on PostgreSQL -- [x] All four search methods updated (companies, ride_models, parks, rides) -- [x] SQLite fallback maintained for development -- [x] PostgreSQL detection using _using_postgis pattern -- [x] SearchRank uses F('search_vector') for efficiency -- [x] No breaking changes to API or query interface -- [x] Code is clean and well-documented - -## Performance Metrics (Expected) - -Based on typical PostgreSQL full-text search benchmarks: - -| Metric | Before (Phase 1/2) | After (Phase 3) | Improvement | -|--------|-------------------|-----------------|-------------| -| Query Time | ~50-200ms | ~5-20ms | **5-10x faster** | -| CPU Usage | High (text processing) | Low (index lookup) | **80% reduction** | -| Scalability | Degrades with data | Consistent | **Linear → Constant** | -| Concurrent Queries | Limited | High | **5x throughput** | - -*Actual performance depends on database size, hardware, and query complexity* - -## Summary - -Phase 3 successfully optimized the SearchService to leverage pre-computed search vectors and GIN indexes, providing significant performance improvements for PostgreSQL environments while maintaining full backward compatibility with SQLite for development. - -**Result**: Production-ready, high-performance full-text search system. ✅ diff --git a/django/PHASE_4_COMPLETE.md b/django/PHASE_4_COMPLETE.md deleted file mode 100644 index bdae0a80..00000000 --- a/django/PHASE_4_COMPLETE.md +++ /dev/null @@ -1,397 +0,0 @@ -# Phase 4 Complete: Versioning System - -**Date**: November 8, 2025 -**Status**: ✅ Complete -**Django System Check**: 0 issues - -## Overview - -Successfully implemented automatic version tracking for all entity changes with full history, diffs, and rollback capabilities. - -## Files Created - -### 1. Models (`apps/versioning/models.py`) - 325 lines -**EntityVersion Model**: -- Generic version tracking using ContentType (supports all entity types) -- Full JSON snapshot of entity state -- Changed fields tracking with old/new values -- Links to ContentSubmission when changes come from moderation -- Metadata: user, IP address, user agent, comment -- Version numbering (auto-incremented per entity) - -**Key Features**: -- `get_snapshot_dict()` - Returns snapshot as Python dict -- `get_changed_fields_list()` - Lists changed field names -- `get_field_change(field_name)` - Gets old/new values for field -- `compare_with(other_version)` - Compares two versions -- `get_diff_summary()` - Human-readable change summary -- Class methods for version history and retrieval - -**Indexes**: -- `(entity_type, entity_id, -created)` - Fast history lookup -- `(entity_type, entity_id, -version_number)` - Version number lookup -- `(change_type)` - Filter by change type -- `(changed_by)` - Filter by user -- `(submission)` - Link to moderation - -### 2. Services (`apps/versioning/services.py`) - 480 lines -**VersionService Class**: -- `create_version()` - Creates version records (called by lifecycle hooks) -- `get_version_history()` - Retrieves version history with limit -- `get_version_by_number()` - Gets specific version by number -- `get_latest_version()` - Gets most recent version -- `compare_versions()` - Compares two versions -- `get_diff_with_current()` - Compares version with current state -- `restore_version()` - Rollback to previous version (creates new 'restored' version) -- `get_version_count()` - Count versions for entity -- `get_versions_by_user()` - Versions created by user -- `get_versions_by_submission()` - Versions from submission - -**Snapshot Creation**: -- Handles all Django field types (CharField, DecimalField, DateField, ForeignKey, JSONField, etc.) -- Normalizes values for JSON serialization -- Stores complete entity state for rollback - -**Changed Fields Tracking**: -- Extracts dirty fields from DirtyFieldsMixin -- Stores old and new values -- Normalizes for JSON storage - -### 3. API Endpoints (`api/v1/endpoints/versioning.py`) - 370 lines -**16 REST API Endpoints**: - -**Park Versions**: -- `GET /parks/{id}/versions` - Version history -- `GET /parks/{id}/versions/{number}` - Specific version -- `GET /parks/{id}/versions/{number}/diff` - Compare with current - -**Ride Versions**: -- `GET /rides/{id}/versions` - Version history -- `GET /rides/{id}/versions/{number}` - Specific version -- `GET /rides/{id}/versions/{number}/diff` - Compare with current - -**Company Versions**: -- `GET /companies/{id}/versions` - Version history -- `GET /companies/{id}/versions/{number}` - Specific version -- `GET /companies/{id}/versions/{number}/diff` - Compare with current - -**Ride Model Versions**: -- `GET /ride-models/{id}/versions` - Version history -- `GET /ride-models/{id}/versions/{number}` - Specific version -- `GET /ride-models/{id}/versions/{number}/diff` - Compare with current - -**Generic Endpoints**: -- `GET /versions/{id}` - Get version by ID -- `GET /versions/{id}/compare/{other_id}` - Compare two versions -- `POST /versions/{id}/restore` - Restore version (commented out, optional) - -### 4. Schemas (`api/v1/schemas.py`) - Updated -**New Schemas**: -- `EntityVersionSchema` - Version output with metadata -- `VersionHistoryResponseSchema` - Version history list -- `VersionDiffSchema` - Diff comparison -- `VersionComparisonSchema` - Compare two versions -- `MessageSchema` - Generic message response -- `ErrorSchema` - Error response - -### 5. Admin Interface (`apps/versioning/admin.py`) - 260 lines -**EntityVersionAdmin**: -- Read-only view of version history -- List display: version number, entity link, change type, user, submission, field count, date -- Filters: change type, entity type, created date -- Search: entity ID, comment, user email -- Date hierarchy on created date - -**Formatted Display**: -- Entity links to admin detail page -- User links to user admin -- Submission links to submission admin -- Pretty-printed JSON snapshot -- HTML table for changed fields with old/new values color-coded - -**Permissions**: -- No add permission (versions auto-created) -- No delete permission (append-only) -- No change permission (read-only) - -### 6. Migrations (`apps/versioning/migrations/0001_initial.py`) -**Created Tables**: -- `versioning_entityversion` with all fields and indexes -- Foreign keys to ContentType, User, and ContentSubmission - -## Integration Points - -### 1. Core Models Integration -The `VersionedModel` in `apps/core/models.py` already had lifecycle hooks ready: - -```python -@hook(AFTER_CREATE) -def create_version_on_create(self): - self._create_version('created') - -@hook(AFTER_UPDATE) -def create_version_on_update(self): - if self.get_dirty_fields(): - self._create_version('updated') -``` - -These hooks now successfully call `VersionService.create_version()`. - -### 2. Moderation Integration -When `ModerationService.approve_submission()` calls `entity.save()`, the lifecycle hooks automatically: -1. Create a version record -2. Link it to the ContentSubmission -3. Capture the user from submission -4. Track all changed fields - -### 3. Entity Models -All entity models inherit from `VersionedModel`: -- Company -- RideModel -- Park -- Ride - -Every save operation now automatically creates a version. - -## Key Technical Decisions - -### Generic Version Model -- Uses ContentType for flexibility -- Single table for all entity types -- Easier to query version history across entities -- Simpler to maintain - -### JSON Snapshot Storage -- Complete entity state stored as JSON -- Enables full rollback capability -- Includes all fields for historical reference -- Efficient with modern database JSON support - -### Changed Fields Tracking -- Separate from snapshot for quick access -- Shows exactly what changed in each version -- Includes old and new values -- Useful for audit trails and diffs - -### Append-Only Design -- Versions never deleted -- Admin is read-only -- Provides complete audit trail -- Supports compliance requirements - -### Performance Optimizations -- Indexes on (entity_type, entity_id, created) -- Indexes on (entity_type, entity_id, version_number) -- Select_related in queries -- Limited default history (50 versions) - -## API Examples - -### Get Version History -```bash -GET /api/v1/parks/{park_id}/versions?limit=20 -``` - -Response: -```json -{ - "entity_id": "uuid", - "entity_type": "park", - "entity_name": "Cedar Point", - "total_versions": 45, - "versions": [ - { - "id": "uuid", - "version_number": 45, - "change_type": "updated", - "changed_by_email": "user@example.com", - "created": "2025-11-08T12:00:00Z", - "diff_summary": "Updated name, description", - "changed_fields": { - "name": {"old": "Old Name", "new": "New Name"} - } - } - ] -} -``` - -### Compare Version with Current -```bash -GET /api/v1/parks/{park_id}/versions/40/diff -``` - -Response: -```json -{ - "entity_id": "uuid", - "entity_type": "park", - "entity_name": "Cedar Point", - "version_number": 40, - "version_date": "2025-10-01T10:00:00Z", - "differences": { - "name": { - "current": "Cedar Point", - "version": "Cedar Point Amusement Park" - }, - "status": { - "current": "operating", - "version": "closed" - } - }, - "changed_field_count": 2 -} -``` - -### Compare Two Versions -```bash -GET /api/v1/versions/{version_id}/compare/{other_version_id} -``` - -## Admin Interface - -Navigate to `/admin/versioning/entityversion/` to: -- View all version records -- Filter by entity type, change type, date -- Search by entity ID, user, comment -- See formatted snapshots and diffs -- Click links to entity, user, and submission records - -## Success Criteria - -✅ **Version created on every entity save** -✅ **Full snapshot stored in JSON** -✅ **Changed fields tracked** -✅ **Version history API endpoint** -✅ **Diff generation** -✅ **Link to ContentSubmission** -✅ **Django system check: 0 issues** -✅ **Migrations created successfully** - -## Testing the System - -### Create an Entity -```python -from apps.entities.models import Company -company = Company.objects.create(name="Test Company") -# Version 1 created automatically with change_type='created' -``` - -### Update an Entity -```python -company.name = "Updated Company" -company.save() -# Version 2 created automatically with change_type='updated' -# Changed fields captured: {'name': {'old': 'Test Company', 'new': 'Updated Company'}} -``` - -### View Version History -```python -from apps.versioning.services import VersionService -history = VersionService.get_version_history(company, limit=10) -for version in history: - print(f"v{version.version_number}: {version.get_diff_summary()}") -``` - -### Compare Versions -```python -version1 = VersionService.get_version_by_number(company, 1) -version2 = VersionService.get_version_by_number(company, 2) -diff = VersionService.compare_versions(version1, version2) -print(diff['differences']) -``` - -### Restore Version (Optional) -```python -from django.contrib.auth import get_user_model -User = get_user_model() -admin = User.objects.first() - -version1 = VersionService.get_version_by_number(company, 1) -restored = VersionService.restore_version(version1, user=admin, comment="Restored to original name") -# Creates version 3 with change_type='restored' -# Entity now back to original state -``` - -## Dependencies Used - -All dependencies were already installed: -- `django-lifecycle==2.1.1` - Lifecycle hooks (AFTER_CREATE, AFTER_UPDATE) -- `django-dirtyfields` - Track changed fields -- `django-ninja` - REST API framework -- `pydantic` - API schemas -- `unfold` - Admin UI theme - -## Performance Characteristics - -### Version Creation -- **Time**: ~10-20ms per version -- **Transaction**: Atomic with entity save -- **Storage**: ~1-5KB per version (depends on entity size) - -### History Queries -- **Time**: ~5-10ms for 50 versions -- **Optimization**: Indexed on (entity_type, entity_id, created) -- **Pagination**: Default limit of 50 versions - -### Snapshot Size -- **Company**: ~500 bytes -- **Park**: ~1-2KB (includes location data) -- **Ride**: ~1-2KB (includes stats) -- **RideModel**: ~500 bytes - -## Next Steps - -### Optional Enhancements -1. **Version Restoration API**: Uncomment restore endpoint in `versioning.py` -2. **Bulk Version Export**: Add CSV/JSON export for compliance -3. **Version Retention Policy**: Archive old versions after N days -4. **Version Notifications**: Notify on significant changes -5. **Version Search**: Full-text search across version snapshots - -### Integration with Frontend -1. Display "Version History" tab on entity detail pages -2. Show visual diff of changes -3. Allow rollback from UI (if restoration enabled) -4. Show version timeline - -## Statistics - -- **Files Created**: 5 -- **Lines of Code**: ~1,735 -- **API Endpoints**: 16 -- **Database Tables**: 1 -- **Indexes**: 5 -- **Implementation Time**: ~2 hours (vs 6 days estimated) ⚡ - -## Verification - -```bash -# Run Django checks -python manage.py check -# Output: System check identified no issues (0 silenced). - -# Create migrations -python manage.py makemigrations -# Output: Migrations for 'versioning': 0001_initial.py - -# View API docs -# Navigate to: http://localhost:8000/api/v1/docs -# See "Versioning" section with all endpoints -``` - -## Conclusion - -Phase 4 is complete! The versioning system provides: -- ✅ Automatic version tracking on all entity changes -- ✅ Complete audit trail with full snapshots -- ✅ Integration with moderation workflow -- ✅ Rich API for version history and comparison -- ✅ Admin interface for viewing version records -- ✅ Optional rollback capability -- ✅ Zero-configuration operation (works via lifecycle hooks) - -The system is production-ready and follows Django best practices for performance, security, and maintainability. - ---- - -**Next Phase**: Phase 5 - Media Management (if applicable) or Project Completion diff --git a/django/PHASE_4_SEARCH_VECTOR_SIGNALS_COMPLETE.md b/django/PHASE_4_SEARCH_VECTOR_SIGNALS_COMPLETE.md deleted file mode 100644 index 38bb93e9..00000000 --- a/django/PHASE_4_SEARCH_VECTOR_SIGNALS_COMPLETE.md +++ /dev/null @@ -1,401 +0,0 @@ -# Phase 4: Automatic Search Vector Updates - COMPLETE ✅ - -## Overview - -Phase 4 implements Django signal handlers that automatically update search vectors whenever entity models are created or modified. This eliminates the need for manual re-indexing and ensures search results are always up-to-date. - -## Implementation Summary - -### 1. Signal Handler Architecture - -Created `django/apps/entities/signals.py` with comprehensive signal handlers for all entity models. - -**Key Features:** -- ✅ PostgreSQL-only activation (respects `_using_postgis` flag) -- ✅ Automatic search vector updates on create/update -- ✅ Cascading updates for related objects -- ✅ Efficient bulk updates to minimize database queries -- ✅ Change detection to avoid unnecessary updates - -### 2. Signal Registration - -Updated `django/apps/entities/apps.py` to register signals on app startup: - -```python -class EntitiesConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.entities' - verbose_name = 'Entities' - - def ready(self): - """Import signal handlers when app is ready.""" - import apps.entities.signals # noqa -``` - -## Signal Handlers Implemented - -### Company Signals - -**1. `update_company_search_vector`** (post_save) -- Triggers: Company create/update -- Updates: Company's own search vector -- Fields indexed: - - `name` (weight A) - - `description` (weight B) - -**2. `check_company_name_change`** (pre_save) -- Tracks: Company name changes -- Purpose: Enables cascading updates - -**3. `cascade_company_name_updates`** (post_save) -- Triggers: Company name changes -- Updates: - - All RideModels from this manufacturer - - All Rides from this manufacturer -- Ensures: Related objects reflect new company name in search - -### Park Signals - -**1. `update_park_search_vector`** (post_save) -- Triggers: Park create/update -- Updates: Park's own search vector -- Fields indexed: - - `name` (weight A) - - `description` (weight B) - -**2. `check_park_name_change`** (pre_save) -- Tracks: Park name changes -- Purpose: Enables cascading updates - -**3. `cascade_park_name_updates`** (post_save) -- Triggers: Park name changes -- Updates: All Rides in this park -- Ensures: Rides reflect new park name in search - -### RideModel Signals - -**1. `update_ride_model_search_vector`** (post_save) -- Triggers: RideModel create/update -- Updates: RideModel's own search vector -- Fields indexed: - - `name` (weight A) - - `manufacturer__name` (weight A) - - `description` (weight B) - -**2. `check_ride_model_manufacturer_change`** (pre_save) -- Tracks: Manufacturer changes -- Purpose: Future cascading updates if needed - -### Ride Signals - -**1. `update_ride_search_vector`** (post_save) -- Triggers: Ride create/update -- Updates: Ride's own search vector -- Fields indexed: - - `name` (weight A) - - `park__name` (weight A) - - `manufacturer__name` (weight B) - - `description` (weight B) - -**2. `check_ride_relationships_change`** (pre_save) -- Tracks: Park and manufacturer changes -- Purpose: Future cascading updates if needed - -## Search Vector Composition - -Each entity model has a carefully weighted search vector: - -### Company -```sql -search_vector = - setweight(to_tsvector('english', name), 'A') || - setweight(to_tsvector('english', description), 'B') -``` - -### RideModel -```sql -search_vector = - setweight(to_tsvector('english', name), 'A') || - setweight(to_tsvector('english', manufacturer.name), 'A') || - setweight(to_tsvector('english', description), 'B') -``` - -### Park -```sql -search_vector = - setweight(to_tsvector('english', name), 'A') || - setweight(to_tsvector('english', description), 'B') -``` - -### Ride -```sql -search_vector = - setweight(to_tsvector('english', name), 'A') || - setweight(to_tsvector('english', park.name), 'A') || - setweight(to_tsvector('english', manufacturer.name), 'B') || - setweight(to_tsvector('english', description), 'B') -``` - -## Cascading Update Logic - -### When Company Name Changes - -1. **Pre-save signal** captures old name -2. **Post-save signal** compares old vs new name -3. If changed: - - Updates all RideModels from this manufacturer - - Updates all Rides from this manufacturer - -**Example:** -```python -# Rename "Bolliger & Mabillard" to "B&M" -company = Company.objects.get(name="Bolliger & Mabillard") -company.name = "B&M" -company.save() - -# Automatically updates search vectors for: -# - All RideModels (e.g., "B&M Inverted Coaster") -# - All Rides (e.g., "Batman: The Ride at Six Flags") -``` - -### When Park Name Changes - -1. **Pre-save signal** captures old name -2. **Post-save signal** compares old vs new name -3. If changed: - - Updates all Rides in this park - -**Example:** -```python -# Rename park -park = Park.objects.get(name="Cedar Point") -park.name = "Cedar Point Amusement Park" -park.save() - -# Automatically updates search vectors for: -# - All rides in this park (e.g., "Steel Vengeance") -``` - -## Performance Considerations - -### Efficient Update Strategy - -1. **Filter-then-update pattern**: - ```python - Model.objects.filter(pk=instance.pk).update( - search_vector=SearchVector(...) - ) - ``` - - Single database query - - No additional model save overhead - - Bypasses signal recursion - -2. **Change detection**: - - Only cascades updates when names actually change - - Avoids unnecessary database operations - - Checks `created` flag to skip cascades on new objects - -3. **PostgreSQL-only execution**: - - All signals wrapped in `if _using_postgis:` guard - - Zero overhead on SQLite (development) - -### Bulk Operations Consideration - -For large bulk updates, consider temporarily disconnecting signals: - -```python -from django.db.models.signals import post_save -from apps.entities.signals import update_company_search_vector -from apps.entities.models import Company - -# Disconnect signal -post_save.disconnect(update_company_search_vector, sender=Company) - -# Perform bulk operations -Company.objects.bulk_create([...]) - -# Reconnect signal -post_save.connect(update_company_search_vector, sender=Company) - -# Manually update search vectors if needed -from django.contrib.postgres.search import SearchVector -Company.objects.update( - search_vector=SearchVector('name', weight='A') + - SearchVector('description', weight='B') -) -``` - -## Testing Strategy - -### Manual Testing - -1. **Create new entity**: - ```python - company = Company.objects.create( - name="Test Manufacturer", - description="A test company" - ) - # Check: company.search_vector should be populated - ``` - -2. **Update entity**: - ```python - company.description = "Updated description" - company.save() - # Check: company.search_vector should be updated - ``` - -3. **Cascading updates**: - ```python - # Change company name - company.name = "New Name" - company.save() - # Check: Related RideModels and Rides should have updated search vectors - ``` - -### Automated Testing (Recommended) - -Create tests in `django/apps/entities/tests/test_signals.py`: - -```python -from django.test import TestCase -from django.contrib.postgres.search import SearchQuery -from apps.entities.models import Company, Park, Ride - -class SearchVectorSignalTests(TestCase): - def test_company_search_vector_on_create(self): - """Test search vector is populated on company creation.""" - company = Company.objects.create( - name="Intamin", - description="Ride manufacturer" - ) - self.assertIsNotNone(company.search_vector) - - def test_company_name_change_cascades(self): - """Test company name changes cascade to rides.""" - company = Company.objects.create(name="Old Name") - park = Park.objects.create(name="Test Park") - ride = Ride.objects.create( - name="Test Ride", - park=park, - manufacturer=company - ) - - # Change company name - company.name = "New Name" - company.save() - - # Verify ride search vector updated - ride.refresh_from_db() - results = Ride.objects.filter( - search_vector=SearchQuery("New Name") - ) - self.assertIn(ride, results) -``` - -## Benefits - -✅ **Automatic synchronization**: Search vectors always up-to-date -✅ **No manual re-indexing**: Zero maintenance overhead -✅ **Cascading updates**: Related objects stay synchronized -✅ **Performance optimized**: Minimal database queries -✅ **PostgreSQL-only**: No overhead on development (SQLite) -✅ **Transparent**: Works seamlessly with existing code - -## Integration with Previous Phases - -### Phase 1: SearchVectorField Implementation -- ✅ Added `search_vector` fields to models -- ✅ Conditional for PostgreSQL-only - -### Phase 2: GIN Indexes and Population -- ✅ Created GIN indexes for fast search -- ✅ Initial population of search vectors - -### Phase 3: SearchService Optimization -- ✅ Optimized queries to use pre-computed vectors -- ✅ 5-10x performance improvement - -### Phase 4: Automatic Updates (Current) -- ✅ Signal handlers for automatic updates -- ✅ Cascading updates for related objects -- ✅ Zero-maintenance search infrastructure - -## Complete Search Architecture - -``` -┌─────────────────────────────────────────────────────────┐ -│ Phase 1: Foundation │ -│ SearchVectorField added to all entity models │ -└────────────────────┬────────────────────────────────────┘ - │ -┌────────────────────▼────────────────────────────────────┐ -│ Phase 2: Indexing & Population │ -│ - GIN indexes for fast search │ -│ - Initial search vector population via migration │ -└────────────────────┬────────────────────────────────────┘ - │ -┌────────────────────▼────────────────────────────────────┐ -│ Phase 3: Query Optimization │ -│ - SearchService uses pre-computed vectors │ -│ - 5-10x faster than real-time computation │ -└────────────────────┬────────────────────────────────────┘ - │ -┌────────────────────▼────────────────────────────────────┐ -│ Phase 4: Automatic Updates (NEW) │ -│ - Django signals keep vectors synchronized │ -│ - Cascading updates for related objects │ -│ - Zero maintenance required │ -└─────────────────────────────────────────────────────────┘ -``` - -## Files Modified - -1. **`django/apps/entities/signals.py`** (NEW) - - Complete signal handler implementation - - 200+ lines of well-documented code - -2. **`django/apps/entities/apps.py`** (MODIFIED) - - Added `ready()` method to register signals - -## Next Steps (Optional Enhancements) - -1. **Performance Monitoring**: - - Add metrics for signal execution time - - Monitor cascading update frequency - -2. **Bulk Operation Optimization**: - - Create management command for bulk re-indexing - - Add signal disconnect context manager - -3. **Advanced Features**: - - Language-specific search configurations - - Partial word matching - - Synonym support - -## Verification - -Run system check to verify implementation: -```bash -cd django -python manage.py check -``` - -Expected output: `System check identified no issues (0 silenced).` - -## Conclusion - -Phase 4 completes the full-text search infrastructure by adding automatic search vector updates. The system now: - -1. ✅ Has optimized search fields (Phase 1) -2. ✅ Has GIN indexes for performance (Phase 2) -3. ✅ Uses pre-computed vectors (Phase 3) -4. ✅ **Automatically updates vectors (Phase 4)** ← NEW - -The search system is now production-ready with zero maintenance overhead! - ---- - -**Implementation Date**: 2025-11-08 -**Status**: ✅ COMPLETE -**Verified**: Django system check passed diff --git a/django/PHASE_5_AUTHENTICATION_COMPLETE.md b/django/PHASE_5_AUTHENTICATION_COMPLETE.md deleted file mode 100644 index 10203d4a..00000000 --- a/django/PHASE_5_AUTHENTICATION_COMPLETE.md +++ /dev/null @@ -1,578 +0,0 @@ -# Phase 5: Authentication System - COMPLETE ✅ - -**Implementation Date:** November 8, 2025 -**Duration:** ~2 hours -**Status:** Production Ready - ---- - -## 🎯 Overview - -Phase 5 implements a complete, enterprise-grade authentication system with JWT tokens, MFA support, role-based access control, and comprehensive user management. - -## ✅ What Was Implemented - -### 1. **Authentication Services Layer** (`apps/users/services.py`) - -#### AuthenticationService -- ✅ **User Registration** - - Email-based with password validation - - Automatic username generation - - Profile & role creation on signup - - Duplicate email prevention - -- ✅ **User Authentication** - - Email/password login - - Banned user detection - - Last login timestamp tracking - - OAuth user creation (Google, Discord) - -- ✅ **Password Management** - - Secure password changes - - Password reset functionality - - Django password validation integration - -#### MFAService (Multi-Factor Authentication) -- ✅ **TOTP-based 2FA** - - Device creation and management - - QR code generation for authenticator apps - - Token verification - - Enable/disable MFA per user - -#### RoleService -- ✅ **Role Management** - - Three-tier role system (user, moderator, admin) - - Role assignment with audit trail - - Permission checking - - Role-based capabilities - -#### UserManagementService -- ✅ **Profile Management** - - Update user information - - Manage preferences - - User statistics tracking - - Ban/unban functionality - -### 2. **Permission System** (`apps/users/permissions.py`) - -#### JWT Authentication -- ✅ **JWTAuth Class** - - Bearer token authentication - - Token validation and decoding - - Banned user filtering - - Automatic user lookup - -#### Permission Decorators -- ✅ `@require_auth` - Require any authenticated user -- ✅ `@require_role(role)` - Require specific role -- ✅ `@require_moderator` - Require moderator or admin -- ✅ `@require_admin` - Require admin only - -#### Permission Helpers -- ✅ `is_owner_or_moderator()` - Check ownership or moderation rights -- ✅ `can_moderate()` - Check moderation permissions -- ✅ `can_submit()` - Check submission permissions -- ✅ `PermissionChecker` class - Comprehensive permission checks - -### 3. **API Schemas** (`api/v1/schemas.py`) - -#### 26 New Authentication Schemas -- User registration and login -- Token management -- Profile and preferences -- MFA setup and verification -- User administration -- Role management - -### 4. **Authentication API Endpoints** (`api/v1/endpoints/auth.py`) - -#### Public Endpoints -- ✅ `POST /auth/register` - User registration -- ✅ `POST /auth/login` - Login with email/password -- ✅ `POST /auth/token/refresh` - Refresh JWT tokens -- ✅ `POST /auth/logout` - Logout (blacklist token) -- ✅ `POST /auth/password/reset` - Request password reset - -#### Authenticated Endpoints -- ✅ `GET /auth/me` - Get current user profile -- ✅ `PATCH /auth/me` - Update profile -- ✅ `GET /auth/me/role` - Get user role -- ✅ `GET /auth/me/permissions` - Get permissions -- ✅ `GET /auth/me/stats` - Get user statistics -- ✅ `GET /auth/me/preferences` - Get preferences -- ✅ `PATCH /auth/me/preferences` - Update preferences -- ✅ `POST /auth/password/change` - Change password - -#### MFA Endpoints -- ✅ `POST /auth/mfa/enable` - Enable MFA -- ✅ `POST /auth/mfa/confirm` - Confirm MFA setup -- ✅ `POST /auth/mfa/disable` - Disable MFA -- ✅ `POST /auth/mfa/verify` - Verify MFA token - -#### Admin Endpoints -- ✅ `GET /auth/users` - List all users (with filters) -- ✅ `GET /auth/users/{id}` - Get user by ID -- ✅ `POST /auth/users/ban` - Ban user -- ✅ `POST /auth/users/unban` - Unban user -- ✅ `POST /auth/users/assign-role` - Assign role - -**Total:** 23 authentication endpoints - -### 5. **Admin Interface** (`apps/users/admin.py`) - -#### User Admin -- ✅ Rich list view with badges (role, status, MFA, reputation) -- ✅ Advanced filtering (active, staff, banned, MFA, OAuth) -- ✅ Search by email, username, name -- ✅ Inline editing of role and profile -- ✅ Import/export functionality -- ✅ Bulk actions (ban, unban, role assignment) - -#### Role Admin -- ✅ Role assignment tracking -- ✅ Audit trail (who granted role, when) -- ✅ Role filtering - -#### Profile Admin -- ✅ Statistics display -- ✅ Approval rate calculation -- ✅ Preference management -- ✅ Privacy settings - -### 6. **API Documentation Updates** (`api/v1/api.py`) - -- ✅ Added authentication section to API docs -- ✅ JWT workflow explanation -- ✅ Permission levels documentation -- ✅ MFA setup instructions -- ✅ Added `/auth` to endpoint list - ---- - -## 📊 Architecture - -### Authentication Flow - -``` -┌─────────────┐ -│ Register │ -│ /register │ -└──────┬──────┘ - │ - ├─ Create User - ├─ Create UserRole (default: 'user') - ├─ Create UserProfile - └─ Return User - -┌─────────────┐ -│ Login │ -│ /login │ -└──────┬──────┘ - │ - ├─ Authenticate (email + password) - ├─ Check if banned - ├─ Verify MFA if enabled - ├─ Generate JWT tokens - └─ Return access & refresh tokens - -┌─────────────┐ -│ API Request │ -│ with Bearer │ -│ Token │ -└──────┬──────┘ - │ - ├─ JWTAuth.authenticate() - ├─ Decode JWT - ├─ Get User - ├─ Check not banned - └─ Attach user to request.auth - -┌─────────────┐ -│ Protected │ -│ Endpoint │ -└──────┬──────┘ - │ - ├─ @require_auth decorator - ├─ Check request.auth exists - ├─ @require_role decorator (optional) - └─ Execute endpoint -``` - -### Permission Hierarchy - -``` -┌──────────┐ -│ Admin │ ← Full access to everything -└────┬─────┘ - │ -┌────┴─────────┐ -│ Moderator │ ← Can moderate, approve submissions -└────┬─────────┘ - │ -┌────┴─────┐ -│ User │ ← Can submit, edit own content -└──────────┘ -``` - -### Role-Based Permissions - -| Role | Submit | Edit Own | Moderate | Admin | Ban Users | Assign Roles | -|-----------|--------|----------|----------|-------|-----------|--------------| -| User | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| Moderator | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| Admin | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | - ---- - -## 🔐 Security Features - -### 1. **JWT Token Security** -- HS256 algorithm -- 60-minute access token lifetime -- 7-day refresh token lifetime -- Automatic token rotation -- Token blacklisting on rotation - -### 2. **Password Security** -- Django password validation -- Minimum 8 characters -- Common password prevention -- User attribute similarity check -- Numeric-only prevention - -### 3. **MFA/2FA Support** -- TOTP-based (RFC 6238) -- Compatible with Google Authenticator, Authy, etc. -- QR code generation -- Backup codes (TODO) - -### 4. **Account Protection** -- Failed login tracking (django-defender) -- Account lockout after 5 failed attempts -- 5-minute cooldown period -- Ban system for problematic users - -### 5. **OAuth Integration** -- Google OAuth 2.0 -- Discord OAuth 2.0 -- Automatic account linking -- Provider tracking - ---- - -## 📝 API Usage Examples - -### 1. **Register a New User** - -```bash -POST /api/v1/auth/register -Content-Type: application/json - -{ - "email": "user@example.com", - "password": "SecurePass123", - "password_confirm": "SecurePass123", - "first_name": "John", - "last_name": "Doe" -} - -# Response -{ - "id": "550e8400-e29b-41d4-a716-446655440000", - "email": "user@example.com", - "username": "user", - "display_name": "John Doe", - "reputation_score": 0, - "mfa_enabled": false, - ... -} -``` - -### 2. **Login** - -```bash -POST /api/v1/auth/login -Content-Type: application/json - -{ - "email": "user@example.com", - "password": "SecurePass123" -} - -# Response -{ - "access": "eyJ0eXAiOiJKV1QiLCJhbGc...", - "refresh": "eyJ0eXAiOiJKV1QiLCJhbGc...", - "token_type": "Bearer" -} -``` - -### 3. **Access Protected Endpoint** - -```bash -GET /api/v1/auth/me -Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGc... - -# Response -{ - "id": "550e8400-e29b-41d4-a716-446655440000", - "email": "user@example.com", - "username": "user", - "display_name": "John Doe", - ... -} -``` - -### 4. **Enable MFA** - -```bash -# Step 1: Enable MFA -POST /api/v1/auth/mfa/enable -Authorization: Bearer - -# Response -{ - "secret": "JBSWY3DPEHPK3PXP", - "qr_code_url": "otpauth://totp/ThrillWiki:user@example.com?secret=JBSWY3DPEHPK3PXP&issuer=ThrillWiki", - "backup_codes": [] -} - -# Step 2: Scan QR code with authenticator app - -# Step 3: Confirm with 6-digit token -POST /api/v1/auth/mfa/confirm -Authorization: Bearer -Content-Type: application/json - -{ - "token": "123456" -} - -# Response -{ - "message": "MFA enabled successfully", - "success": true -} -``` - -### 5. **Login with MFA** - -```bash -POST /api/v1/auth/login -Content-Type: application/json - -{ - "email": "user@example.com", - "password": "SecurePass123", - "mfa_token": "123456" -} -``` - ---- - -## 🛠️ Integration with Existing Systems - -### Moderation System Integration - -The authentication system integrates seamlessly with the existing moderation system: - -```python -# In moderation endpoints -from apps.users.permissions import jwt_auth, require_moderator - -@router.post("/submissions/{id}/approve", auth=jwt_auth) -@require_moderator -def approve_submission(request: HttpRequest, id: UUID): - user = request.auth # Authenticated user - # Moderator can approve submissions - ... -``` - -### Versioning System Integration - -User information is automatically tracked in version records: - -```python -# Versions automatically track who made changes -version = EntityVersion.objects.create( - entity_type='park', - entity_id=park.id, - changed_by=request.auth, # User from JWT - ... -) -``` - ---- - -## 📈 Statistics - -| Metric | Count | -|--------|-------| -| **New Files Created** | 3 | -| **Files Modified** | 2 | -| **Lines of Code** | ~2,500 | -| **API Endpoints** | 23 | -| **Pydantic Schemas** | 26 | -| **Services** | 4 classes | -| **Permission Decorators** | 4 | -| **Admin Interfaces** | 3 | -| **System Check Issues** | 0 ✅ | - ---- - -## 🎓 Next Steps for Frontend Integration - -### 1. **Authentication Flow** - -```typescript -// Login -const response = await fetch('/api/v1/auth/login', { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - email: 'user@example.com', - password: 'password123' - }) -}); - -const { access, refresh } = await response.json(); - -// Store tokens -localStorage.setItem('access_token', access); -localStorage.setItem('refresh_token', refresh); - -// Use token in requests -const protectedResponse = await fetch('/api/v1/auth/me', { - headers: { - 'Authorization': `Bearer ${access}` - } -}); -``` - -### 2. **Token Refresh** - -```typescript -// Refresh token when access token expires -async function refreshToken() { - const refresh = localStorage.getItem('refresh_token'); - - const response = await fetch('/api/v1/auth/token/refresh', { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ refresh }) - }); - - const { access } = await response.json(); - localStorage.setItem('access_token', access); - - return access; -} -``` - -### 3. **Permission Checks** - -```typescript -// Get user permissions -const permissions = await fetch('/api/v1/auth/me/permissions', { - headers: { - 'Authorization': `Bearer ${access_token}` - } -}).then(r => r.json()); - -// { -// can_submit: true, -// can_moderate: false, -// can_admin: false, -// can_edit_own: true, -// can_delete_own: true -// } - -// Conditional rendering -{permissions.can_moderate && ( - -)} -``` - ---- - -## 🔧 Configuration - -### Environment Variables - -Add to `.env`: - -```bash -# JWT Settings (already configured in settings.py) -SECRET_KEY=your-secret-key-here - -# OAuth (if using) -GOOGLE_OAUTH_CLIENT_ID=your-google-client-id -GOOGLE_OAUTH_CLIENT_SECRET=your-google-client-secret -DISCORD_OAUTH_CLIENT_ID=your-discord-client-id -DISCORD_OAUTH_CLIENT_SECRET=your-discord-client-secret - -# Email (for password reset - TODO) -EMAIL_HOST=smtp.gmail.com -EMAIL_PORT=587 -EMAIL_HOST_USER=your-email@gmail.com -EMAIL_HOST_PASSWORD=your-email-password -EMAIL_USE_TLS=True -``` - ---- - -## 🐛 Known Limitations - -1. **Password Reset Email**: Currently a placeholder - needs email backend configuration -2. **OAuth Redirect URLs**: Need to be configured in Google/Discord consoles -3. **Backup Codes**: MFA backup codes generation not yet implemented -4. **Rate Limiting**: Uses django-defender, but API-specific rate limiting to be added -5. **Session Management**: No "view all sessions" or "logout everywhere" yet - ---- - -## ✅ Testing Checklist - -- [x] User can register -- [x] User can login -- [x] JWT tokens are generated -- [x] Protected endpoints require authentication -- [x] Role-based access control works -- [x] MFA can be enabled/disabled -- [x] User profile can be updated -- [x] Preferences can be managed -- [x] Admin can ban/unban users -- [x] Admin can assign roles -- [x] Admin interface works -- [x] Django system check passes -- [ ] Password reset email (needs email backend) -- [ ] OAuth flows (needs provider setup) - ---- - -## 📚 Additional Resources - -- **Django REST JWT**: https://django-rest-framework-simplejwt.readthedocs.io/ -- **Django Allauth**: https://django-allauth.readthedocs.io/ -- **Django OTP**: https://django-otp-official.readthedocs.io/ -- **Django Guardian**: https://django-guardian.readthedocs.io/ -- **TOTP RFC**: https://tools.ietf.org/html/rfc6238 - ---- - -## 🎉 Summary - -Phase 5 delivers a **complete, production-ready authentication system** that: - -- ✅ Provides secure JWT-based authentication -- ✅ Supports MFA/2FA for enhanced security -- ✅ Implements role-based access control -- ✅ Includes comprehensive user management -- ✅ Integrates seamlessly with existing systems -- ✅ Offers a beautiful admin interface -- ✅ Passes all Django system checks -- ✅ Ready for frontend integration - -**The ThrillWiki Django backend now has complete authentication!** 🚀 - -Users can register, login, enable MFA, manage their profiles, and admins have full user management capabilities. The system is secure, scalable, and ready for production use. diff --git a/django/PHASE_6_MEDIA_COMPLETE.md b/django/PHASE_6_MEDIA_COMPLETE.md deleted file mode 100644 index 2ff58047..00000000 --- a/django/PHASE_6_MEDIA_COMPLETE.md +++ /dev/null @@ -1,463 +0,0 @@ -# Phase 6: Media Management System - COMPLETE ✅ - -## Overview - -Phase 6 successfully implements a comprehensive media management system with CloudFlare Images integration, photo moderation, and entity attachment. The system provides a complete API for uploading, managing, and moderating photos with CDN delivery. - -**Completion Date:** November 8, 2025 -**Total Implementation Time:** ~4 hours -**Files Created:** 3 -**Files Modified:** 5 -**Total Lines Added:** ~1,800 lines - ---- - -## ✅ Completed Components - -### 1. CloudFlare Service Layer ✅ -**File:** `django/apps/media/services.py` (~500 lines) - -**CloudFlareService Features:** -- ✅ Image upload to CloudFlare Images API -- ✅ Image deletion from CloudFlare -- ✅ CDN URL generation for image variants -- ✅ Automatic mock mode for development (no CloudFlare credentials needed) -- ✅ Error handling and retry logic -- ✅ Support for multiple image variants (public, thumbnail, banner) - -**PhotoService Features:** -- ✅ Photo creation with CloudFlare upload -- ✅ Entity attachment/detachment -- ✅ Photo moderation (approve/reject/flag) -- ✅ Gallery reordering -- ✅ Photo deletion with CloudFlare cleanup -- ✅ Dimension extraction from uploads - -### 2. Image Validators ✅ -**File:** `django/apps/media/validators.py` (~170 lines) - -**Validation Features:** -- ✅ File type validation (JPEG, PNG, WebP, GIF) -- ✅ File size validation (1KB - 10MB) -- ✅ Image dimension validation (100x100 - 8000x8000) -- ✅ Aspect ratio validation for specific photo types -- ✅ Content type verification with python-magic -- ✅ Placeholder for content safety API integration - -### 3. API Schemas ✅ -**File:** `django/api/v1/schemas.py` (added ~200 lines) - -**New Schemas:** -- ✅ `PhotoBase` - Base photo fields -- ✅ `PhotoUploadRequest` - Multipart upload with entity attachment -- ✅ `PhotoUpdate` - Metadata updates -- ✅ `PhotoOut` - Complete photo response with CDN URLs -- ✅ `PhotoListOut` - Paginated photo list -- ✅ `PhotoUploadResponse` - Upload confirmation -- ✅ `PhotoModerateRequest` - Moderation actions -- ✅ `PhotoReorderRequest` - Gallery reordering -- ✅ `PhotoAttachRequest` - Entity attachment -- ✅ `PhotoStatsOut` - Photo statistics - -### 4. API Endpoints ✅ -**File:** `django/api/v1/endpoints/photos.py` (~650 lines) - -**Public Endpoints (No Auth Required):** -- ✅ `GET /photos` - List approved photos with filters -- ✅ `GET /photos/{id}` - Get photo details -- ✅ `GET /{entity_type}/{entity_id}/photos` - Get entity photos - -**Authenticated Endpoints (JWT Required):** -- ✅ `POST /photos/upload` - Upload new photo with multipart form data -- ✅ `PATCH /photos/{id}` - Update photo metadata -- ✅ `DELETE /photos/{id}` - Delete own photo -- ✅ `POST /{entity_type}/{entity_id}/photos` - Attach photo to entity - -**Moderator Endpoints:** -- ✅ `GET /photos/pending` - List pending photos -- ✅ `POST /photos/{id}/approve` - Approve photo -- ✅ `POST /photos/{id}/reject` - Reject photo with notes -- ✅ `POST /photos/{id}/flag` - Flag photo for review -- ✅ `GET /photos/stats` - Photo statistics - -**Admin Endpoints:** -- ✅ `DELETE /photos/{id}/admin` - Force delete any photo -- ✅ `POST /{entity_type}/{entity_id}/photos/reorder` - Reorder photos - -### 5. Enhanced Admin Interface ✅ -**File:** `django/apps/media/admin.py` (expanded to ~190 lines) - -**PhotoAdmin Features:** -- ✅ Thumbnail previews in list view (60x60px) -- ✅ Entity information display -- ✅ File size and dimension display -- ✅ Moderation status filters -- ✅ Photo statistics in changelist -- ✅ Bulk actions (approve, reject, flag, feature) -- ✅ Date hierarchy navigation -- ✅ Optimized queries with select_related - -**PhotoInline for Entity Admin:** -- ✅ Thumbnail previews (40x40px) -- ✅ Title, type, and status display -- ✅ Display order management -- ✅ Quick delete capability - -### 6. Entity Integration ✅ -**File:** `django/apps/entities/models.py` (added ~100 lines) - -**Added to All Entity Models (Company, RideModel, Park, Ride):** -- ✅ `photos` GenericRelation for photo attachment -- ✅ `get_photos(photo_type, approved_only)` method -- ✅ `main_photo` property -- ✅ Type-specific properties (logo_photo, banner_photo, gallery_photos) - -**File:** `django/apps/entities/admin.py` (modified) -- ✅ PhotoInline added to all entity admin pages -- ✅ Photos manageable directly from entity edit pages - -### 7. API Router Registration ✅ -**File:** `django/api/v1/api.py` (modified) -- ✅ Photos router registered -- ✅ Photo endpoints documented in API info -- ✅ Available at `/api/v1/photos/` and entity-nested routes - ---- - -## 📊 System Capabilities - -### Photo Upload Flow -``` -1. User uploads photo via API → Validation -2. Image validated → CloudFlare upload -3. Photo record created → Moderation status: pending -4. Optional entity attachment -5. Moderator reviews → Approve/Reject -6. Approved photos visible publicly -``` - -### Supported Photo Types -- `main` - Main/hero photo -- `gallery` - Gallery photos -- `banner` - Wide banner images -- `logo` - Square logo images -- `thumbnail` - Thumbnail images -- `other` - Other photo types - -### Supported Formats -- JPEG/JPG -- PNG -- WebP -- GIF - -### File Constraints -- **Size:** 1 KB - 10 MB -- **Dimensions:** 100x100 - 8000x8000 pixels -- **Aspect Ratios:** Enforced for banner (2:1 to 4:1) and logo (1:2 to 2:1) - -### CloudFlare Integration -- **Mock Mode:** Works without CloudFlare credentials (development) -- **Production Mode:** Full CloudFlare Images API integration -- **CDN Delivery:** Global CDN for fast image delivery -- **Image Variants:** Automatic generation of thumbnails, banners, etc. -- **URL Format:** `https://imagedelivery.net/{hash}/{image_id}/{variant}` - ---- - -## 🔒 Security & Permissions - -### Upload Permissions -- **Any Authenticated User:** Can upload photos -- **Photo enters moderation queue automatically** -- **Users can edit/delete own photos** - -### Moderation Permissions -- **Moderators:** Approve, reject, flag photos -- **Admins:** Force delete any photo, reorder galleries - -### API Security -- **JWT Authentication:** Required for uploads and management -- **Permission Checks:** Enforced on all write operations -- **User Isolation:** Users only see/edit own pending photos - ---- - -## 📁 File Structure - -``` -django/apps/media/ -├── models.py # Photo model (already existed) -├── services.py # NEW: CloudFlare + Photo services -├── validators.py # NEW: Image validation -└── admin.py # ENHANCED: Admin with thumbnails - -django/api/v1/ -├── schemas.py # ENHANCED: Photo schemas added -├── endpoints/ -│ └── photos.py # NEW: Photo API endpoints -└── api.py # MODIFIED: Router registration - -django/apps/entities/ -├── models.py # ENHANCED: Photo relationships -└── admin.py # ENHANCED: Photo inlines -``` - ---- - -## 🎯 Usage Examples - -### Upload Photo (API) -```bash -curl -X POST http://localhost:8000/api/v1/photos/upload \ - -H "Authorization: Bearer {token}" \ - -F "file=@photo.jpg" \ - -F "title=Amazing Roller Coaster" \ - -F "photo_type=gallery" \ - -F "entity_type=park" \ - -F "entity_id={park_uuid}" -``` - -### Get Entity Photos (API) -```bash -curl http://localhost:8000/api/v1/park/{park_id}/photos?photo_type=gallery -``` - -### In Python Code -```python -from apps.entities.models import Park -from apps.media.services import PhotoService - -# Get a park -park = Park.objects.get(slug='cedar-point') - -# Get photos -main_photo = park.main_photo -gallery = park.gallery_photos -all_photos = park.get_photos(approved_only=True) - -# Upload programmatically -service = PhotoService() -photo = service.create_photo( - file=uploaded_file, - user=request.user, - entity=park, - photo_type='gallery' -) -``` - ---- - -## ✨ Key Features - -### 1. Development-Friendly -- **Mock Mode:** Works without CloudFlare (uses placeholder URLs) -- **Automatic Fallback:** Detects missing credentials -- **Local Testing:** Full functionality in development - -### 2. Production-Ready -- **CDN Integration:** CloudFlare Images for global delivery -- **Scalable Storage:** No local file storage needed -- **Image Optimization:** Automatic variant generation - -### 3. Moderation System -- **Queue-Based:** All uploads enter moderation -- **Bulk Actions:** Approve/reject multiple photos -- **Status Tracking:** Pending, approved, rejected, flagged -- **Notes:** Moderators can add rejection reasons - -### 4. Entity Integration -- **Generic Relations:** Photos attach to any entity -- **Helper Methods:** Easy photo access on entities -- **Admin Inlines:** Manage photos directly on entity pages -- **Type Filtering:** Get specific photo types (main, gallery, etc.) - -### 5. API Completeness -- **Full CRUD:** Create, Read, Update, Delete -- **Pagination:** All list endpoints paginated -- **Filtering:** Filter by type, status, entity -- **Permission Control:** Role-based access -- **Error Handling:** Comprehensive validation and error responses - ---- - -## 🧪 Testing Checklist - -### Basic Functionality -- [x] Upload photo via API -- [x] Photo enters moderation queue -- [x] Moderator can approve photo -- [x] Approved photo visible publicly -- [x] User can edit own photo metadata -- [x] User can delete own photo - -### CloudFlare Integration -- [x] Mock mode works without credentials -- [x] Upload succeeds in mock mode -- [x] Placeholder URLs generated -- [x] Delete works in mock mode - -### Entity Integration -- [x] Photos attach to entities -- [x] Entity helper methods work -- [x] Photo inlines appear in admin -- [x] Gallery ordering works - -### Admin Interface -- [x] Thumbnail previews display -- [x] Bulk approve works -- [x] Bulk reject works -- [x] Statistics display correctly - -### API Endpoints -- [x] All endpoints registered -- [x] Authentication enforced -- [x] Permission checks work -- [x] Pagination functions -- [x] Filtering works - ---- - -## 📈 Performance Considerations - -### Optimizations Implemented -- ✅ `select_related` for user and content_type -- ✅ Indexed fields (moderation_status, photo_type, content_type) -- ✅ CDN delivery for images (not served through Django) -- ✅ Efficient queryset filtering - -### Recommended Database Indexes -Already in Photo model: -```python -indexes = [ - models.Index(fields=['moderation_status']), - models.Index(fields=['photo_type']), - models.Index(fields=['is_approved']), - models.Index(fields=['created_at']), -] -``` - ---- - -## 🔮 Future Enhancements (Not in Phase 6) - -### Phase 7 Candidates -- [ ] Image processing with Celery (resize, watermark) -- [ ] Automatic thumbnail generation fallback -- [ ] Duplicate detection -- [ ] Bulk upload via ZIP -- [ ] Image metadata extraction (EXIF) -- [ ] Content safety API integration -- [ ] Photo tagging system -- [ ] Advanced search - -### Possible Improvements -- [ ] Integration with ContentSubmission workflow -- [ ] Photo change history tracking -- [ ] Photo usage tracking (which entities use which photos) -- [ ] Photo performance analytics -- [ ] User photo quotas -- [ ] Photo quality scoring - ---- - -## 📝 Configuration Required - -### Environment Variables -Add to `.env`: -```bash -# CloudFlare Images (optional for development) -CLOUDFLARE_ACCOUNT_ID=your-account-id -CLOUDFLARE_IMAGE_TOKEN=your-api-token -CLOUDFLARE_IMAGE_HASH=your-delivery-hash -``` - -### Development Setup -1. **Without CloudFlare:** System works in mock mode automatically -2. **With CloudFlare:** Add credentials to `.env` file - -### Production Setup -1. Create CloudFlare Images account -2. Generate API token -3. Add credentials to production environment -4. Test upload flow -5. Monitor CDN delivery - ---- - -## 🎉 Success Metrics - -### Code Quality -- ✅ Comprehensive docstrings -- ✅ Type hints throughout -- ✅ Error handling on all operations -- ✅ Logging for debugging -- ✅ Consistent code style - -### Functionality -- ✅ All planned features implemented -- ✅ Full API coverage -- ✅ Admin interface complete -- ✅ Entity integration seamless - -### Performance -- ✅ Efficient database queries -- ✅ CDN delivery for images -- ✅ No bottlenecks identified - ---- - -## 🚀 What's Next? - -With Phase 6 complete, the system now has: -1. ✅ Complete entity models (Phases 1-2) -2. ✅ Moderation system (Phase 3) -3. ✅ Version history (Phase 4) -4. ✅ Authentication & permissions (Phase 5) -5. ✅ **Media management (Phase 6)** ← JUST COMPLETED - -### Recommended Next Steps - -**Option A: Phase 7 - Background Tasks with Celery** -- Async image processing -- Email notifications -- Scheduled cleanup tasks -- Stats generation -- Report generation - -**Option B: Phase 8 - Search & Discovery** -- Elasticsearch integration -- Full-text search across entities -- Geographic search improvements -- Related content recommendations -- Advanced filtering - -**Option C: Polish & Testing** -- Comprehensive test suite -- API documentation -- User guides -- Performance optimization -- Bug fixes - ---- - -## 📚 Documentation References - -- **API Guide:** `django/API_GUIDE.md` -- **Admin Guide:** `django/ADMIN_GUIDE.md` -- **Photo Model:** `django/apps/media/models.py` -- **Photo Service:** `django/apps/media/services.py` -- **Photo API:** `django/api/v1/endpoints/photos.py` - ---- - -## ✅ Phase 6 Complete! - -The Media Management System is fully functional and ready for use. Photos can be uploaded, moderated, and displayed across all entities with CloudFlare CDN delivery. - -**Estimated Build Time:** 4 hours -**Actual Build Time:** ~4 hours ✅ -**Lines of Code:** ~1,800 lines -**Files Created:** 3 -**Files Modified:** 5 - -**Status:** ✅ **PRODUCTION READY** diff --git a/django/PHASE_7_CELERY_COMPLETE.md b/django/PHASE_7_CELERY_COMPLETE.md deleted file mode 100644 index 3b279aaf..00000000 --- a/django/PHASE_7_CELERY_COMPLETE.md +++ /dev/null @@ -1,451 +0,0 @@ -# Phase 7: Background Tasks with Celery - COMPLETE ✅ - -**Completion Date:** November 8, 2025 -**Status:** Successfully Implemented - -## Overview - -Phase 7 implements a comprehensive background task processing system using Celery with Redis as the message broker. This phase adds asynchronous processing capabilities for long-running operations, scheduled tasks, and email notifications. - -## What Was Implemented - -### 1. Celery Infrastructure ✅ -- **Celery App Configuration** (`config/celery.py`) - - Auto-discovery of tasks from all apps - - Signal handlers for task failure/success logging - - Integration with Sentry for error tracking - -- **Django Integration** (`config/__init__.py`) - - Celery app loaded on Django startup - - Shared task decorators available throughout the project - -### 2. Email System ✅ -- **Email Templates** (`templates/emails/`) - - `base.html` - Base template with ThrillWiki branding - - `welcome.html` - Welcome email for new users - - `password_reset.html` - Password reset instructions - - `moderation_approved.html` - Submission approved notification - - `moderation_rejected.html` - Submission rejection notification - -- **Email Configuration** - - Development: Console backend (emails print to console) - - Production: SMTP/SendGrid (configurable via environment variables) - -### 3. Background Tasks ✅ - -#### Media Tasks (`apps/media/tasks.py`) -- `process_uploaded_image(photo_id)` - Post-upload image processing -- `cleanup_rejected_photos(days_old=30)` - Remove old rejected photos -- `generate_photo_thumbnails(photo_id)` - On-demand thumbnail generation -- `cleanup_orphaned_cloudflare_images()` - Remove orphaned images -- `update_photo_statistics()` - Update photo-related statistics - -#### Moderation Tasks (`apps/moderation/tasks.py`) -- `send_moderation_notification(submission_id, status)` - Email notifications -- `cleanup_expired_locks()` - Remove stale moderation locks -- `send_batch_moderation_summary(moderator_id)` - Daily moderator summaries -- `update_moderation_statistics()` - Update moderation statistics -- `auto_unlock_stale_reviews(hours=1)` - Auto-unlock stale submissions -- `notify_moderators_of_queue_size()` - Alert on queue threshold - -#### User Tasks (`apps/users/tasks.py`) -- `send_welcome_email(user_id)` - Welcome new users -- `send_password_reset_email(user_id, token, reset_url)` - Password resets -- `cleanup_expired_tokens()` - Remove expired JWT tokens -- `send_account_notification(user_id, type, data)` - Generic notifications -- `cleanup_inactive_users(days_inactive=365)` - Flag inactive accounts -- `update_user_statistics()` - Update user statistics -- `send_bulk_notification(user_ids, subject, message)` - Bulk emails -- `send_email_verification_reminder(user_id)` - Verification reminders - -#### Entity Tasks (`apps/entities/tasks.py`) -- `update_entity_statistics(entity_type, entity_id)` - Update entity stats -- `update_all_statistics()` - Bulk statistics update -- `generate_entity_report(entity_type, entity_id)` - Generate reports -- `cleanup_duplicate_entities()` - Detect duplicates -- `calculate_global_statistics()` - Global statistics -- `validate_entity_data(entity_type, entity_id)` - Data validation - -### 4. Scheduled Tasks (Celery Beat) ✅ - -Configured in `config/settings/base.py`: - -| Task | Schedule | Purpose | -|------|----------|---------| -| `cleanup-expired-locks` | Every 5 minutes | Remove expired moderation locks | -| `cleanup-expired-tokens` | Daily at 2 AM | Clean up expired JWT tokens | -| `update-all-statistics` | Every 6 hours | Update entity statistics | -| `cleanup-rejected-photos` | Weekly Mon 3 AM | Remove old rejected photos | -| `auto-unlock-stale-reviews` | Every 30 minutes | Auto-unlock stale reviews | -| `check-moderation-queue` | Every hour | Check queue size threshold | -| `update-photo-statistics` | Daily at 1 AM | Update photo statistics | -| `update-moderation-statistics` | Daily at 1:30 AM | Update moderation statistics | -| `update-user-statistics` | Daily at 4 AM | Update user statistics | -| `calculate-global-statistics` | Every 12 hours | Calculate global statistics | - -### 5. Service Integration ✅ -- **PhotoService** - Triggers `process_uploaded_image` on photo creation -- **ModerationService** - Sends email notifications on approval/rejection -- Error handling ensures service operations don't fail if tasks fail to queue - -### 6. Monitoring ✅ -- **Flower** - Web-based Celery monitoring (production only) -- **Task Logging** - Success/failure logging for all tasks -- **Sentry Integration** - Error tracking for failed tasks - -## Setup Instructions - -### Development Setup - -1. **Install Redis** (if not using eager mode): - ```bash - # macOS with Homebrew - brew install redis - brew services start redis - - # Or using Docker - docker run -d -p 6379:6379 redis:latest - ``` - -2. **Configure Environment** (`.env`): - ```env - # Redis Configuration - REDIS_URL=redis://localhost:6379/0 - CELERY_BROKER_URL=redis://localhost:6379/0 - CELERY_RESULT_BACKEND=redis://localhost:6379/1 - - # Email Configuration (Development) - EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend - DEFAULT_FROM_EMAIL=noreply@thrillwiki.com - SITE_URL=http://localhost:8000 - ``` - -3. **Run Celery Worker** (in separate terminal): - ```bash - cd django - celery -A config worker --loglevel=info - ``` - -4. **Run Celery Beat** (in separate terminal): - ```bash - cd django - celery -A config beat --loglevel=info - ``` - -5. **Development Mode** (No Redis Required): - - Tasks run synchronously when `CELERY_TASK_ALWAYS_EAGER = True` (default in `local.py`) - - Useful for debugging and testing without Redis - -### Production Setup - -1. **Configure Environment**: - ```env - # Redis Configuration - REDIS_URL=redis://your-redis-host:6379/0 - CELERY_BROKER_URL=redis://your-redis-host:6379/0 - CELERY_RESULT_BACKEND=redis://your-redis-host:6379/1 - - # Email Configuration (Production) - EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend - EMAIL_HOST=smtp.sendgrid.net - EMAIL_PORT=587 - EMAIL_USE_TLS=True - EMAIL_HOST_USER=apikey - EMAIL_HOST_PASSWORD=your-sendgrid-api-key - DEFAULT_FROM_EMAIL=noreply@thrillwiki.com - SITE_URL=https://thrillwiki.com - - # Flower Monitoring (Optional) - FLOWER_ENABLED=True - FLOWER_BASIC_AUTH=username:password - ``` - -2. **Run Celery Worker** (systemd service): - ```ini - [Unit] - Description=ThrillWiki Celery Worker - After=network.target redis.target - - [Service] - Type=forking - User=www-data - Group=www-data - WorkingDirectory=/var/www/thrillwiki/django - Environment="PATH=/var/www/thrillwiki/venv/bin" - ExecStart=/var/www/thrillwiki/venv/bin/celery -A config worker \ - --loglevel=info \ - --logfile=/var/log/celery/worker.log \ - --pidfile=/var/run/celery/worker.pid - - [Install] - WantedBy=multi-user.target - ``` - -3. **Run Celery Beat** (systemd service): - ```ini - [Unit] - Description=ThrillWiki Celery Beat - After=network.target redis.target - - [Service] - Type=forking - User=www-data - Group=www-data - WorkingDirectory=/var/www/thrillwiki/django - Environment="PATH=/var/www/thrillwiki/venv/bin" - ExecStart=/var/www/thrillwiki/venv/bin/celery -A config beat \ - --loglevel=info \ - --logfile=/var/log/celery/beat.log \ - --pidfile=/var/run/celery/beat.pid \ - --schedule=/var/run/celery/celerybeat-schedule - - [Install] - WantedBy=multi-user.target - ``` - -4. **Run Flower** (optional): - ```bash - celery -A config flower --port=5555 --basic_auth=$FLOWER_BASIC_AUTH - ``` - Access at: `https://your-domain.com/flower/` - -## Testing - -### Manual Testing - -1. **Test Photo Upload Task**: - ```python - from apps.media.tasks import process_uploaded_image - result = process_uploaded_image.delay(photo_id) - print(result.get()) # Wait for result - ``` - -2. **Test Email Notification**: - ```python - from apps.moderation.tasks import send_moderation_notification - result = send_moderation_notification.delay(str(submission_id), 'approved') - # Check console output for email - ``` - -3. **Test Scheduled Task**: - ```python - from apps.moderation.tasks import cleanup_expired_locks - result = cleanup_expired_locks.delay() - print(result.get()) - ``` - -### Integration Testing - -Test that services properly queue tasks: - -```python -# Test PhotoService integration -from apps.media.services import PhotoService -service = PhotoService() -photo = service.create_photo(file, user) -# Task should be queued automatically - -# Test ModerationService integration -from apps.moderation.services import ModerationService -ModerationService.approve_submission(submission_id, reviewer) -# Email notification should be queued -``` - -## Task Catalog - -### Task Retry Configuration - -All tasks implement retry logic: -- **Max Retries:** 2-3 (task-dependent) -- **Retry Delay:** 60 seconds base (exponential backoff) -- **Failure Handling:** Logged to Sentry and application logs - -### Task Priority - -Tasks are executed in the order they're queued. For priority queuing, configure Celery with multiple queues: - -```python -# config/celery.py (future enhancement) -CELERY_TASK_ROUTES = { - 'apps.media.tasks.process_uploaded_image': {'queue': 'media'}, - 'apps.moderation.tasks.send_moderation_notification': {'queue': 'notifications'}, -} -``` - -## Monitoring & Debugging - -### View Task Status - -```python -from celery.result import AsyncResult - -result = AsyncResult('task-id-here') -print(result.state) # PENDING, STARTED, SUCCESS, FAILURE -print(result.info) # Result or error details -``` - -### Flower Dashboard - -Access Flower at `/flower/` (production only) to: -- View active tasks -- Monitor worker status -- View task history -- Inspect failed tasks -- Retry failed tasks - -### Logs - -```bash -# View worker logs -tail -f /var/log/celery/worker.log - -# View beat logs -tail -f /var/log/celery/beat.log - -# View Django logs (includes task execution) -tail -f django/logs/django.log -``` - -## Troubleshooting - -### Common Issues - -1. **Tasks not executing** - - Check Redis connection: `redis-cli ping` - - Verify Celery worker is running: `ps aux | grep celery` - - Check for errors in worker logs - -2. **Emails not sending** - - Verify EMAIL_BACKEND configuration - - Check SMTP credentials - - Review email logs in console (development) - -3. **Scheduled tasks not running** - - Ensure Celery Beat is running - - Check Beat logs for scheduling errors - - Verify CELERY_BEAT_SCHEDULE configuration - -4. **Task failures** - - Check Sentry for error reports - - Review worker logs - - Test task in Django shell - -### Performance Tuning - -```python -# Increase worker concurrency -celery -A config worker --concurrency=4 - -# Use different pool implementation -celery -A config worker --pool=gevent - -# Set task time limits -CELERY_TASK_TIME_LIMIT = 30 * 60 # 30 minutes (already configured) -``` - -## Configuration Options - -### Environment Variables - -| Variable | Required | Default | Description | -|----------|----------|---------|-------------| -| `REDIS_URL` | Yes* | `redis://localhost:6379/0` | Redis connection URL | -| `CELERY_BROKER_URL` | Yes* | Same as REDIS_URL | Celery message broker | -| `CELERY_RESULT_BACKEND` | Yes* | `redis://localhost:6379/1` | Task result storage | -| `EMAIL_BACKEND` | No | Console (dev) / SMTP (prod) | Email backend | -| `EMAIL_HOST` | Yes** | - | SMTP host | -| `EMAIL_PORT` | Yes** | 587 | SMTP port | -| `EMAIL_HOST_USER` | Yes** | - | SMTP username | -| `EMAIL_HOST_PASSWORD` | Yes** | - | SMTP password | -| `DEFAULT_FROM_EMAIL` | Yes | `noreply@thrillwiki.com` | From email address | -| `SITE_URL` | Yes | `http://localhost:8000` | Site URL for emails | -| `FLOWER_ENABLED` | No | False | Enable Flower monitoring | -| `FLOWER_BASIC_AUTH` | No** | - | Flower authentication | - -\* Not required if using eager mode in development -\*\* Required for production email sending - -## Next Steps - -### Future Enhancements - -1. **Task Prioritization** - - Implement multiple queues for different priority levels - - Critical tasks (password reset) in high-priority queue - - Bulk operations in low-priority queue - -2. **Advanced Monitoring** - - Set up Prometheus metrics - - Configure Grafana dashboards - - Add task duration tracking - -3. **Email Improvements** - - Add plain text email versions - - Implement email templates for all notification types - - Add email preference management - -4. **Scalability** - - Configure multiple Celery workers - - Implement auto-scaling based on queue size - - Add Redis Sentinel for high availability - -5. **Additional Tasks** - - Backup generation tasks - - Data export tasks - - Analytics report generation - -## Success Criteria ✅ - -All success criteria for Phase 7 have been met: - -- ✅ Celery workers running successfully -- ✅ Tasks executing asynchronously -- ✅ Email notifications working (console backend configured) -- ✅ Scheduled tasks configured and ready -- ✅ Flower monitoring configured for production -- ✅ Error handling and retries implemented -- ✅ Integration with existing services complete -- ✅ Comprehensive documentation created - -## Files Created - -- `config/celery.py` - Celery app configuration -- `config/__init__.py` - Updated to load Celery -- `templates/emails/base.html` - Base email template -- `templates/emails/welcome.html` - Welcome email -- `templates/emails/password_reset.html` - Password reset email -- `templates/emails/moderation_approved.html` - Approval notification -- `templates/emails/moderation_rejected.html` - Rejection notification -- `apps/media/tasks.py` - Media processing tasks -- `apps/moderation/tasks.py` - Moderation workflow tasks -- `apps/users/tasks.py` - User management tasks -- `apps/entities/tasks.py` - Entity statistics tasks -- `PHASE_7_CELERY_COMPLETE.md` - This documentation - -## Files Modified - -- `config/settings/base.py` - Added Celery Beat schedule, SITE_URL, DEFAULT_FROM_EMAIL -- `config/urls.py` - Added Flower URL routing -- `apps/media/services.py` - Integrated photo processing task -- `apps/moderation/services.py` - Integrated email notification tasks - -## Dependencies - -All dependencies were already included in `requirements/base.txt`: -- `celery[redis]==5.3.4` -- `django-celery-beat==2.5.0` -- `django-celery-results==2.5.1` -- `flower==2.0.1` - -## Summary - -Phase 7 successfully implements a complete background task processing system with Celery. The system handles: -- Asynchronous image processing -- Email notifications for moderation workflow -- Scheduled maintenance tasks -- Statistics updates -- Token cleanup - -The implementation is production-ready with proper error handling, retry logic, monitoring, and documentation. - -**Phase 7: COMPLETE** ✅ diff --git a/django/PHASE_8_SEARCH_COMPLETE.md b/django/PHASE_8_SEARCH_COMPLETE.md deleted file mode 100644 index 12280d48..00000000 --- a/django/PHASE_8_SEARCH_COMPLETE.md +++ /dev/null @@ -1,411 +0,0 @@ -# Phase 8: Search & Filtering System - COMPLETE - -**Status:** ✅ Complete -**Date:** November 8, 2025 -**Django Version:** 5.x -**Database:** PostgreSQL (production) / SQLite (development) - ---- - -## Overview - -Phase 8 implements a comprehensive search and filtering system for ThrillWiki entities with PostgreSQL full-text search capabilities and SQLite fallback support. - -## Implementation Summary - -### 1. Search Service (`apps/entities/search.py`) -✅ **Created** - -**Features:** -- PostgreSQL full-text search with ranking and relevance scoring -- SQLite fallback using case-insensitive LIKE queries -- Search across all entity types (Company, RideModel, Park, Ride) -- Global search and entity-specific search methods -- Autocomplete functionality for quick suggestions - -**Key Methods:** -- `search_all()` - Search across all entity types -- `search_companies()` - Company-specific search with filters -- `search_ride_models()` - Ride model search with manufacturer filters -- `search_parks()` - Park search with location-based filtering (PostGIS) -- `search_rides()` - Ride search with extensive filtering options -- `autocomplete()` - Fast name-based suggestions - -**PostgreSQL Features:** -- Uses `SearchVector`, `SearchQuery`, `SearchRank` for full-text search -- Weighted search (name='A', description='B' for relevance) -- `websearch` search type for natural language queries -- English language configuration for stemming/stop words - -**SQLite Fallback:** -- Case-insensitive LIKE queries (`__icontains`) -- Basic text matching without ranking -- Functional but less performant than PostgreSQL - -### 2. Filter Classes (`apps/entities/filters.py`) -✅ **Created** - -**Base Filter Class:** -- `BaseEntityFilter` - Common filtering methods - - Date range filtering - - Status filtering - -**Entity-Specific Filters:** -- `CompanyFilter` - Company types, founding dates, location -- `RideModelFilter` - Manufacturer, model type, height/speed -- `ParkFilter` - Status, park type, operator, dates, location (PostGIS) -- `RideFilter` - Park, manufacturer, model, category, statistics - -**Location-Based Filtering (PostGIS):** -- Distance-based queries using Point geometries -- Radius filtering in kilometers -- Automatic ordering by distance - -### 3. API Schemas (`api/v1/schemas.py`) -✅ **Updated** - -**Added Search Schemas:** -- `SearchResultBase` - Base search result schema -- `CompanySearchResult` - Company search result with counts -- `RideModelSearchResult` - Ride model result with manufacturer -- `ParkSearchResult` - Park result with location and stats -- `RideSearchResult` - Ride result with park and category -- `GlobalSearchResponse` - Combined search results by type -- `AutocompleteItem` - Autocomplete suggestion item -- `AutocompleteResponse` - Autocomplete response wrapper - -**Filter Schemas:** -- `SearchFilters` - Base search filters -- `CompanySearchFilters` - Company-specific filters -- `RideModelSearchFilters` - Ride model filters -- `ParkSearchFilters` - Park filters with location -- `RideSearchFilters` - Extensive ride filters - -### 4. Search API Endpoints (`api/v1/endpoints/search.py`) -✅ **Created** - -**Global Search:** -- `GET /api/v1/search` - Search across all entity types - - Query parameter: `q` (min 2 chars) - - Optional: `entity_types` list to filter results - - Returns results grouped by entity type - -**Entity-Specific Search:** -- `GET /api/v1/search/companies` - Search companies - - Filters: company_types, founded_after, founded_before -- `GET /api/v1/search/ride-models` - Search ride models - - Filters: manufacturer_id, model_type -- `GET /api/v1/search/parks` - Search parks - - Filters: status, park_type, operator_id, dates - - Location: latitude, longitude, radius (PostGIS only) -- `GET /api/v1/search/rides` - Search rides - - Filters: park_id, manufacturer_id, model_id, status - - Category: ride_category, is_coaster - - Stats: min/max height, speed - -**Autocomplete:** -- `GET /api/v1/search/autocomplete` - Fast suggestions - - Query parameter: `q` (min 2 chars) - - Optional: `entity_type` to filter suggestions - - Returns up to 10-20 quick suggestions - -### 5. API Integration (`api/v1/api.py`) -✅ **Updated** - -**Changes:** -- Added search router import -- Registered search router at `/search` -- Updated API info endpoint with search endpoint - -**Available Endpoints:** -``` -GET /api/v1/search - Global search -GET /api/v1/search/companies - Company search -GET /api/v1/search/ride-models - Ride model search -GET /api/v1/search/parks - Park search -GET /api/v1/search/rides - Ride search -GET /api/v1/search/autocomplete - Autocomplete -``` - ---- - -## Database Compatibility - -### PostgreSQL (Production) -- ✅ Full-text search with ranking -- ✅ Location-based filtering with PostGIS -- ✅ SearchVector, SearchQuery, SearchRank -- ✅ Optimized for performance - -### SQLite (Development) -- ✅ Basic text search with LIKE queries -- ⚠️ No search ranking -- ⚠️ No location-based filtering -- ⚠️ Acceptable for development, not production - -**Note:** For full search capabilities in development, you can optionally set up PostgreSQL locally. See `POSTGIS_SETUP.md` for instructions. - ---- - -## Search Features - -### Full-Text Search -- **Natural Language Queries**: "Six Flags roller coaster" -- **Phrase Matching**: Search for exact phrases -- **Stemming**: Matches word variations (PostgreSQL only) -- **Relevance Ranking**: Results ordered by relevance score - -### Filtering Options - -**Companies:** -- Company types (manufacturer, operator, designer, supplier, contractor) -- Founded date range -- Location - -**Ride Models:** -- Manufacturer -- Model type -- Height/speed ranges - -**Parks:** -- Status (operating, closed, SBNO, under construction, planned) -- Park type (theme park, amusement park, water park, FEC, etc.) -- Operator -- Opening/closing dates -- Location + radius (PostGIS) -- Minimum ride/coaster counts - -**Rides:** -- Park, manufacturer, model -- Status -- Ride category (roller coaster, flat ride, water ride, etc.) -- Coaster filter -- Opening/closing dates -- Height, speed, length ranges -- Duration, inversions - -### Autocomplete -- Fast prefix matching on entity names -- Returns id, name, slug, entity_type -- Contextual information (park name for rides, manufacturer for models) -- Sorted by relevance (exact matches first) - ---- - -## API Examples - -### Global Search -```bash -# Search across all entities -curl "http://localhost:8000/api/v1/search?q=six%20flags" - -# Search specific entity types -curl "http://localhost:8000/api/v1/search?q=coaster&entity_types=park&entity_types=ride" -``` - -### Company Search -```bash -# Search companies -curl "http://localhost:8000/api/v1/search/companies?q=bolliger" - -# Filter by company type -curl "http://localhost:8000/api/v1/search/companies?q=manufacturer&company_types=manufacturer" -``` - -### Park Search -```bash -# Basic park search -curl "http://localhost:8000/api/v1/search/parks?q=cedar%20point" - -# Filter by status -curl "http://localhost:8000/api/v1/search/parks?q=park&status=operating" - -# Location-based search (PostGIS only) -curl "http://localhost:8000/api/v1/search/parks?q=park&latitude=41.4779&longitude=-82.6830&radius=50" -``` - -### Ride Search -```bash -# Search rides -curl "http://localhost:8000/api/v1/search/rides?q=millennium%20force" - -# Filter coasters only -curl "http://localhost:8000/api/v1/search/rides?q=coaster&is_coaster=true" - -# Filter by height -curl "http://localhost:8000/api/v1/search/rides?q=coaster&min_height=200&max_height=400" -``` - -### Autocomplete -```bash -# Get suggestions -curl "http://localhost:8000/api/v1/search/autocomplete?q=six" - -# Filter by entity type -curl "http://localhost:8000/api/v1/search/autocomplete?q=cedar&entity_type=park" -``` - ---- - -## Response Examples - -### Global Search Response -```json -{ - "query": "six flags", - "total_results": 15, - "companies": [ - { - "id": "uuid", - "name": "Six Flags Entertainment Corporation", - "slug": "six-flags", - "entity_type": "company", - "description": "...", - "company_types": ["operator"], - "park_count": 27, - "ride_count": 0 - } - ], - "parks": [ - { - "id": "uuid", - "name": "Six Flags Magic Mountain", - "slug": "six-flags-magic-mountain", - "entity_type": "park", - "park_type": "theme_park", - "status": "operating", - "ride_count": 45, - "coaster_count": 19 - } - ], - "ride_models": [], - "rides": [] -} -``` - -### Autocomplete Response -```json -{ - "query": "cedar", - "suggestions": [ - { - "id": "uuid", - "name": "Cedar Point", - "slug": "cedar-point", - "entity_type": "park" - }, - { - "id": "uuid", - "name": "Cedar Creek Mine Ride", - "slug": "cedar-creek-mine-ride", - "entity_type": "ride", - "park_name": "Cedar Point" - } - ] -} -``` - ---- - -## Performance Considerations - -### PostgreSQL Optimization -- Uses GIN indexes for fast full-text search (would be added with migration) -- Weighted search vectors prioritize name matches -- Efficient query execution with proper indexing - -### Query Limits -- Default limit: 20 results per entity type -- Maximum limit: 100 results per entity type -- Autocomplete: 10 suggestions default, max 20 - -### SQLite Performance -- Acceptable for development with small datasets -- LIKE queries can be slow with large datasets -- No search ranking means less relevant results - ---- - -## Testing - -### Manual Testing -```bash -# Run Django server -cd django -python manage.py runserver - -# Test endpoints (requires data) -curl "http://localhost:8000/api/v1/search?q=test" -curl "http://localhost:8000/api/v1/search/autocomplete?q=test" -``` - -### Django Check -```bash -cd django -python manage.py check -# ✅ System check identified no issues (0 silenced) -``` - ---- - -## Future Enhancements - -### Search Analytics (Optional - Not Implemented) -- Track popular searches -- User search history -- Click tracking for search results -- Search term suggestions based on popularity - -### Potential Improvements -1. **Search Vector Fields**: Add SearchVectorField to models with database triggers -2. **Search Indexes**: Create GIN indexes for better performance -3. **Trigram Similarity**: Use pg_trgm for fuzzy matching -4. **Search Highlighting**: Highlight matching terms in results -5. **Saved Searches**: Allow users to save and reuse searches -6. **Advanced Operators**: Support AND/OR/NOT operators -7. **Faceted Search**: Add result facets/filters based on results - ---- - -## Files Created/Modified - -### New Files -- ✅ `django/apps/entities/search.py` - Search service -- ✅ `django/apps/entities/filters.py` - Filter classes -- ✅ `django/api/v1/endpoints/search.py` - Search API endpoints -- ✅ `django/PHASE_8_SEARCH_COMPLETE.md` - This documentation - -### Modified Files -- ✅ `django/api/v1/schemas.py` - Added search schemas -- ✅ `django/api/v1/api.py` - Added search router - ---- - -## Dependencies - -All required dependencies already present in `requirements/base.txt`: -- ✅ Django 5.x with `django.contrib.postgres` -- ✅ psycopg[binary] for PostgreSQL -- ✅ django-ninja for API endpoints -- ✅ pydantic for schemas - ---- - -## Conclusion - -Phase 8 successfully implements a comprehensive search and filtering system with: -- ✅ Full-text search with PostgreSQL (and SQLite fallback) -- ✅ Advanced filtering for all entity types -- ✅ Location-based search with PostGIS -- ✅ Fast autocomplete functionality -- ✅ Clean API with extensive documentation -- ✅ Backward compatible with existing system -- ✅ Production-ready code - -The search system is ready for use and can be further enhanced with search vector fields and indexes when needed. - -**Next Steps:** -- Consider adding SearchVectorField to models for better performance -- Create database migration for GIN indexes -- Implement search analytics if desired -- Test with production data diff --git a/django/POSTGIS_SETUP.md b/django/POSTGIS_SETUP.md deleted file mode 100644 index 5fa2aa32..00000000 --- a/django/POSTGIS_SETUP.md +++ /dev/null @@ -1,297 +0,0 @@ -# PostGIS Integration - Dual-Mode Setup - -## Overview - -ThrillWiki Django backend uses a **conditional PostGIS setup** that allows geographic data to work in both local development (SQLite) and production (PostgreSQL with PostGIS). - -## How It Works - -### Database Backends - -- **Local Development**: Uses regular SQLite without GIS extensions - - Geographic coordinates stored in `latitude` and `longitude` DecimalFields - - No spatial query capabilities - - Simpler setup, easier for local development - -- **Production**: Uses PostgreSQL with PostGIS extension - - Geographic coordinates stored in `location_point` PointField (PostGIS) - - Full spatial query capabilities (distance calculations, geographic searches, etc.) - - Automatically syncs with legacy `latitude`/`longitude` fields - -### Model Implementation - -The `Park` model uses conditional field definition: - -```python -# Conditionally import GIS models only if using PostGIS backend -_using_postgis = ( - 'postgis' in settings.DATABASES['default']['ENGINE'] -) - -if _using_postgis: - from django.contrib.gis.db import models as gis_models - from django.contrib.gis.geos import Point -``` - -**Fields in SQLite mode:** -- `latitude` (DecimalField) - Primary coordinate storage -- `longitude` (DecimalField) - Primary coordinate storage - -**Fields in PostGIS mode:** -- `location_point` (PointField) - Primary coordinate storage with GIS capabilities -- `latitude` (DecimalField) - Deprecated, kept for backward compatibility -- `longitude` (DecimalField) - Deprecated, kept for backward compatibility - -### Helper Methods - -The Park model provides methods that work in both modes: - -#### `set_location(longitude, latitude)` -Sets park location from coordinates. Works in both modes: -- SQLite: Updates latitude/longitude fields -- PostGIS: Updates location_point and syncs to latitude/longitude - -```python -park.set_location(-118.2437, 34.0522) -``` - -#### `coordinates` property -Returns coordinates as `(longitude, latitude)` tuple: -- SQLite: Returns from latitude/longitude fields -- PostGIS: Returns from location_point (falls back to lat/lng if not set) - -```python -coords = park.coordinates # (-118.2437, 34.0522) -``` - -#### `latitude_value` property -Returns latitude value: -- SQLite: Returns from latitude field -- PostGIS: Returns from location_point.y - -#### `longitude_value` property -Returns longitude value: -- SQLite: Returns from longitude field -- PostGIS: Returns from location_point.x - -## Setup Instructions - -### Local Development (SQLite) - -1. **No special setup required!** Just use the standard SQLite database: - ```python - # django/config/settings/local.py - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } - } - ``` - -2. Run migrations as normal: - ```bash - python manage.py migrate - ``` - -3. Use latitude/longitude fields for coordinates: - ```python - park = Park.objects.create( - name="Test Park", - latitude=40.7128, - longitude=-74.0060 - ) - ``` - -### Production (PostgreSQL with PostGIS) - -1. **Install PostGIS extension in PostgreSQL:** - ```sql - CREATE EXTENSION postgis; - ``` - -2. **Configure production settings:** - ```python - # django/config/settings/production.py - DATABASES = { - 'default': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': 'thrillwiki', - 'USER': 'your_user', - 'PASSWORD': 'your_password', - 'HOST': 'your_host', - 'PORT': '5432', - } - } - ``` - -3. **Run migrations:** - ```bash - python manage.py migrate - ``` - - This will create the `location_point` PointField in addition to the latitude/longitude fields. - -4. **Use location_point for geographic queries:** - ```python - from django.contrib.gis.geos import Point - from django.contrib.gis.measure import D - - # Create park with PostGIS Point - park = Park.objects.create( - name="Test Park", - location_point=Point(-118.2437, 34.0522, srid=4326) - ) - - # Geographic queries (only in PostGIS mode) - nearby_parks = Park.objects.filter( - location_point__distance_lte=( - Point(-118.2500, 34.0500, srid=4326), - D(km=10) - ) - ) - ``` - -## Migration Strategy - -### From SQLite to PostgreSQL - -When migrating from local development (SQLite) to production (PostgreSQL): - -1. Export your data from SQLite -2. Set up PostgreSQL with PostGIS -3. Run migrations (will create location_point field) -4. Import your data (latitude/longitude fields will be populated) -5. Run a data migration to populate location_point from lat/lng: - -```python -# Example data migration -from django.contrib.gis.geos import Point - -for park in Park.objects.filter(latitude__isnull=False, longitude__isnull=False): - if not park.location_point: - park.location_point = Point( - float(park.longitude), - float(park.latitude), - srid=4326 - ) - park.save(update_fields=['location_point']) -``` - -## Benefits - -1. **Easy Local Development**: No need to install PostGIS or SpatiaLite for local development -2. **Production Power**: Full GIS capabilities in production with PostGIS -3. **Backward Compatible**: Keeps latitude/longitude fields for compatibility -4. **Unified API**: Helper methods work the same in both modes -5. **Gradual Migration**: Can migrate from SQLite to PostGIS without data loss - -## Limitations - -### In SQLite Mode (Local Development) - -- **No spatial queries**: Cannot use PostGIS query features like: - - `distance_lte`, `distance_gte` (distance-based searches) - - `dwithin` (within distance) - - `contains`, `intersects` (geometric operations) - - Geographic indexing for performance - -- **Workarounds for local development:** - - Use simple filters on latitude/longitude ranges - - Implement basic distance calculations in Python if needed - - Most development work doesn't require spatial queries - -### In PostGIS Mode (Production) - -- **Use location_point for queries**: Always use the `location_point` field for geographic queries, not lat/lng -- **Sync fields**: If updating location_point directly, remember to sync to lat/lng if needed for compatibility - -## Testing - -### Test in SQLite (Local) -```bash -cd django -python manage.py shell - -# Test basic CRUD -from apps.entities.models import Park -from decimal import Decimal - -park = Park.objects.create( - name="Test Park", - park_type="theme_park", - latitude=Decimal("40.7128"), - longitude=Decimal("-74.0060") -) - -print(park.coordinates) # Should work -print(park.latitude_value) # Should work -``` - -### Test in PostGIS (Production) -```bash -cd django -python manage.py shell - -# Test GIS features -from apps.entities.models import Park -from django.contrib.gis.geos import Point -from django.contrib.gis.measure import D - -park = Park.objects.create( - name="Test Park", - park_type="theme_park", - location_point=Point(-118.2437, 34.0522, srid=4326) -) - -# Test distance query -nearby = Park.objects.filter( - location_point__distance_lte=( - Point(-118.2500, 34.0500, srid=4326), - D(km=10) - ) -) -``` - -## Future Considerations - -1. **Remove Legacy Fields**: Once fully migrated to PostGIS in production and all code uses location_point, the latitude/longitude fields can be deprecated and eventually removed - -2. **Add Spatial Indexes**: In production, add spatial indexes for better query performance: - ```python - class Meta: - indexes = [ - models.Index(fields=['location_point']), # Spatial index - ] - ``` - -3. **Geographic Search API**: Build geographic search endpoints that work differently based on backend: - - SQLite: Simple bounding box searches - - PostGIS: Advanced spatial queries with distance calculations - -## Troubleshooting - -### "AttributeError: 'DatabaseOperations' object has no attribute 'geo_db_type'" - -This error occurs when trying to use PostGIS PointField with regular SQLite. Solution: -- Ensure you're using the local.py settings which uses regular SQLite -- Make sure migrations were created with SQLite active (no location_point field) - -### "No such column: location_point" - -This occurs when: -- Code tries to access location_point in SQLite mode -- Solution: Use the helper methods (coordinates, latitude_value, longitude_value) instead - -### "GDAL library not found" - -This occurs when django.contrib.gis is loaded but GDAL is not installed: -- Even with SQLite, GDAL libraries must be available because django.contrib.gis is in INSTALLED_APPS -- Install GDAL via Homebrew: `brew install gdal geos` -- Configure paths in settings if needed - -## References - -- [Django GIS Documentation](https://docs.djangoproject.com/en/stable/ref/contrib/gis/) -- [PostGIS Documentation](https://postgis.net/documentation/) -- [GeoDjango Tutorial](https://docs.djangoproject.com/en/stable/ref/contrib/gis/tutorial/) diff --git a/django/README.md b/django/README.md deleted file mode 100644 index f97a2129..00000000 --- a/django/README.md +++ /dev/null @@ -1,281 +0,0 @@ -# ThrillWiki Django Backend - -## 🚀 Overview - -This is the Django REST API backend for ThrillWiki, replacing the previous Supabase backend. Built with modern Django best practices and production-ready packages. - -## 📦 Tech Stack - -- **Framework**: Django 4.2 LTS -- **API**: django-ninja (FastAPI-style) -- **Database**: PostgreSQL 15+ -- **Cache**: Redis + django-cacheops -- **Tasks**: Celery + Redis -- **Real-time**: Django Channels + WebSockets -- **Auth**: django-allauth + django-otp -- **Storage**: CloudFlare Images -- **Monitoring**: Sentry + structlog - -## 🏗️ Project Structure - -``` -django/ -├── manage.py -├── config/ # Django settings -├── apps/ # Django applications -│ ├── core/ # Base models & utilities -│ ├── entities/ # Parks, Rides, Companies -│ ├── moderation/ # Content moderation system -│ ├── versioning/ # Entity versioning -│ ├── users/ # User management -│ ├── media/ # Image/photo management -│ └── notifications/ # Notification system -├── api/ # REST API layer -└── scripts/ # Utility scripts -``` - -## 🛠️ Setup - -### Prerequisites - -- Python 3.11+ -- PostgreSQL 15+ -- Redis 7+ - -### Installation - -```bash -# 1. Create virtual environment -python3 -m venv venv -source venv/bin/activate # On Windows: venv\Scripts\activate - -# 2. Install dependencies -pip install -r requirements/local.txt - -# 3. Set up environment variables -cp .env.example .env -# Edit .env with your configuration - -# 4. Run migrations -python manage.py migrate - -# 5. Create superuser -python manage.py createsuperuser - -# 6. Run development server -python manage.py runserver -``` - -### Running Services - -```bash -# Terminal 1: Django dev server -python manage.py runserver - -# Terminal 2: Celery worker -celery -A config worker -l info - -# Terminal 3: Celery beat (periodic tasks) -celery -A config beat -l info - -# Terminal 4: Flower (task monitoring) -celery -A config flower -``` - -## 📚 Documentation - -- **Migration Plan**: See `MIGRATION_PLAN.md` for full migration details -- **Architecture**: See project documentation in `/docs/` -- **API Docs**: Available at `/api/docs` when server is running - -## 🧪 Testing - -```bash -# Run all tests -pytest - -# Run with coverage -pytest --cov=apps --cov-report=html - -# Run specific app tests -pytest apps/moderation/ - -# Run specific test file -pytest apps/moderation/tests/test_services.py -v -``` - -## 📋 Key Features - -### Moderation System -- State machine workflow with django-fsm -- Atomic transaction handling -- Selective approval support -- Automatic lock/unlock mechanism -- Real-time queue updates - -### Versioning System -- Automatic version tracking with django-lifecycle -- Full change history for all entities -- Diff generation -- Rollback capability - -### Authentication -- JWT-based API authentication -- OAuth2 (Google, Discord) -- Two-factor authentication (TOTP) -- Role-based permissions - -### Performance -- Automatic query caching with django-cacheops -- Redis-based session storage -- Optimized database queries -- Background task processing with Celery - -## 🔧 Management Commands - -```bash -# Create test data -python manage.py seed_data - -# Export data from Supabase -python manage.py export_supabase_data - -# Import data to Django -python manage.py import_supabase_data - -# Update cached counts -python manage.py update_counts - -# Clean old data -python manage.py cleanup_old_data -``` - -## 🚀 Deployment - -### Docker - -```bash -# Build image -docker build -t thrillwiki-backend . - -# Run with docker-compose -docker-compose up -d -``` - -### Production Checklist - -- [ ] Set `DEBUG=False` in production -- [ ] Configure `ALLOWED_HOSTS` -- [ ] Set strong `SECRET_KEY` -- [ ] Configure PostgreSQL connection -- [ ] Set up Redis -- [ ] Configure Celery workers -- [ ] Set up SSL/TLS -- [ ] Configure CORS origins -- [ ] Set up Sentry for error tracking -- [ ] Configure CloudFlare Images -- [ ] Set up monitoring/logging - -## 📊 Development Status - -**Current Phase**: Foundation -**Branch**: `django-backend` - -### Completed -- ✅ Project structure created -- ✅ Dependencies installed -- ✅ Environment configuration - -### In Progress -- 🔄 Django settings configuration -- 🔄 Base models creation -- 🔄 Database connection setup - -### Upcoming -- ⏳ Entity models implementation -- ⏳ Authentication system -- ⏳ Moderation system -- ⏳ API layer with django-ninja - -See `MIGRATION_PLAN.md` for detailed roadmap. - -## 🤝 Contributing - -1. Create a feature branch from `django-backend` -2. Make your changes -3. Write/update tests -4. Run test suite -5. Submit pull request - -## 📝 Environment Variables - -Required environment variables (see `.env.example`): - -```bash -# Django -DEBUG=True -SECRET_KEY=your-secret-key -ALLOWED_HOSTS=localhost - -# Database -DATABASE_URL=postgresql://user:pass@localhost:5432/thrillwiki - -# Redis -REDIS_URL=redis://localhost:6379/0 - -# External Services -CLOUDFLARE_ACCOUNT_ID=xxx -CLOUDFLARE_IMAGE_TOKEN=xxx -NOVU_API_KEY=xxx -SENTRY_DSN=xxx - -# OAuth -GOOGLE_CLIENT_ID=xxx -GOOGLE_CLIENT_SECRET=xxx -DISCORD_CLIENT_ID=xxx -DISCORD_CLIENT_SECRET=xxx -``` - -## 🐛 Troubleshooting - -### Database Connection Issues -```bash -# Check PostgreSQL is running -pg_isready - -# Verify connection string -python manage.py dbshell -``` - -### Celery Not Processing Tasks -```bash -# Check Redis is running -redis-cli ping - -# Restart Celery worker -celery -A config worker --purge -l info -``` - -### Import Errors -```bash -# Ensure virtual environment is activated -which python # Should point to venv/bin/python - -# Reinstall dependencies -pip install -r requirements/local.txt --force-reinstall -``` - -## 📞 Support - -- **Documentation**: See `/docs/` directory -- **Issues**: GitHub Issues -- **Migration Questions**: See `MIGRATION_PLAN.md` - -## 📄 License - -Same as main ThrillWiki project. - ---- - -**Last Updated**: November 8, 2025 -**Status**: Foundation Phase - Active Development diff --git a/django/README_MONITORING.md b/django/README_MONITORING.md deleted file mode 100644 index b1e85a3d..00000000 --- a/django/README_MONITORING.md +++ /dev/null @@ -1,250 +0,0 @@ -# ThrillWiki Monitoring Setup - -## Overview - -This document describes the automatic metric collection system for anomaly detection and system monitoring. - -## Architecture - -The system collects metrics from two sources: - -1. **Django Backend (Celery Tasks)**: Collects Django-specific metrics like error rates, response times, queue sizes -2. **Supabase Edge Function**: Collects Supabase-specific metrics like API errors, rate limits, submission queues - -## Components - -### Django Components - -#### 1. Metrics Collector (`apps/monitoring/metrics_collector.py`) -- Collects system metrics from various sources -- Records metrics to Supabase `metric_time_series` table -- Provides utilities for tracking: - - Error rates - - API response times - - Celery queue sizes - - Database connection counts - - Cache hit rates - -#### 2. Celery Tasks (`apps/monitoring/tasks.py`) -Periodic background tasks: -- `collect_system_metrics`: Collects all metrics every minute -- `collect_error_metrics`: Tracks error rates -- `collect_performance_metrics`: Tracks response times and cache performance -- `collect_queue_metrics`: Monitors Celery queue health - -#### 3. Metrics Middleware (`apps/monitoring/middleware.py`) -- Tracks API response times for every request -- Records errors and exceptions -- Updates cache with performance data - -### Supabase Components - -#### Edge Function (`supabase/functions/collect-metrics`) -Collects Supabase-specific metrics: -- API error counts -- Rate limit violations -- Pending submissions -- Active incidents -- Unresolved alerts -- Submission approval rates -- Average moderation times - -## Setup Instructions - -### 1. Django Setup - -Add the monitoring app to your Django `INSTALLED_APPS`: - -```python -INSTALLED_APPS = [ - # ... other apps - 'apps.monitoring', -] -``` - -Add the metrics middleware to `MIDDLEWARE`: - -```python -MIDDLEWARE = [ - # ... other middleware - 'apps.monitoring.middleware.MetricsMiddleware', -] -``` - -Import and use the Celery Beat schedule in your Django settings: - -```python -from config.celery_beat_schedule import CELERY_BEAT_SCHEDULE - -CELERY_BEAT_SCHEDULE = CELERY_BEAT_SCHEDULE -``` - -Configure environment variables: - -```bash -SUPABASE_URL=https://api.thrillwiki.com -SUPABASE_SERVICE_ROLE_KEY=your_service_role_key -``` - -### 2. Start Celery Workers - -Start Celery worker for processing tasks: - -```bash -celery -A config worker -l info -Q monitoring,maintenance,analytics -``` - -Start Celery Beat for periodic task scheduling: - -```bash -celery -A config beat -l info -``` - -### 3. Supabase Edge Function Setup - -The `collect-metrics` edge function should be called periodically. Set up a cron job in Supabase: - -```sql -SELECT cron.schedule( - 'collect-metrics-every-minute', - '* * * * *', -- Every minute - $$ - SELECT net.http_post( - url:='https://api.thrillwiki.com/functions/v1/collect-metrics', - headers:='{"Content-Type": "application/json", "Authorization": "Bearer YOUR_ANON_KEY"}'::jsonb, - body:=concat('{"time": "', now(), '"}')::jsonb - ) as request_id; - $$ -); -``` - -### 4. Anomaly Detection Setup - -The `detect-anomalies` edge function should also run periodically: - -```sql -SELECT cron.schedule( - 'detect-anomalies-every-5-minutes', - '*/5 * * * *', -- Every 5 minutes - $$ - SELECT net.http_post( - url:='https://api.thrillwiki.com/functions/v1/detect-anomalies', - headers:='{"Content-Type": "application/json", "Authorization": "Bearer YOUR_ANON_KEY"}'::jsonb, - body:=concat('{"time": "', now(), '"}')::jsonb - ) as request_id; - $$ -); -``` - -### 5. Data Retention Cleanup Setup - -The `data-retention-cleanup` edge function should run daily: - -```sql -SELECT cron.schedule( - 'data-retention-cleanup-daily', - '0 3 * * *', -- Daily at 3:00 AM - $$ - SELECT net.http_post( - url:='https://api.thrillwiki.com/functions/v1/data-retention-cleanup', - headers:='{"Content-Type": "application/json", "Authorization": "Bearer YOUR_ANON_KEY"}'::jsonb, - body:=concat('{"time": "', now(), '"}')::jsonb - ) as request_id; - $$ -); -``` - -## Metrics Collected - -### Django Metrics -- `error_rate`: Percentage of error logs (performance) -- `api_response_time`: Average API response time in ms (performance) -- `celery_queue_size`: Number of queued Celery tasks (system) -- `database_connections`: Active database connections (system) -- `cache_hit_rate`: Cache hit percentage (performance) - -### Supabase Metrics -- `api_error_count`: Recent API errors (performance) -- `rate_limit_violations`: Rate limit blocks (security) -- `pending_submissions`: Submissions awaiting moderation (workflow) -- `active_incidents`: Open/investigating incidents (monitoring) -- `unresolved_alerts`: Unresolved system alerts (monitoring) -- `submission_approval_rate`: Percentage of approved submissions (workflow) -- `avg_moderation_time`: Average time to moderate in minutes (workflow) - -## Data Retention Policies - -The system automatically cleans up old data to manage database size: - -### Retention Periods -- **Metrics** (`metric_time_series`): 30 days -- **Anomaly Detections**: 30 days (resolved alerts archived after 7 days) -- **Resolved Alerts**: 90 days -- **Resolved Incidents**: 90 days - -### Cleanup Functions - -The following database functions manage data retention: - -1. **`cleanup_old_metrics(retention_days)`**: Deletes metrics older than specified days (default: 30) -2. **`cleanup_old_anomalies(retention_days)`**: Archives resolved anomalies and deletes old unresolved ones (default: 30) -3. **`cleanup_old_alerts(retention_days)`**: Deletes old resolved alerts (default: 90) -4. **`cleanup_old_incidents(retention_days)`**: Deletes old resolved incidents (default: 90) -5. **`run_data_retention_cleanup()`**: Master function that runs all cleanup operations - -### Automated Cleanup Schedule - -Django Celery tasks run retention cleanup automatically: -- Full cleanup: Daily at 3:00 AM -- Metrics cleanup: Daily at 3:30 AM -- Anomaly cleanup: Daily at 4:00 AM - -View retention statistics in the Admin Dashboard's Data Retention panel. - -## Monitoring - -View collected metrics in the Admin Monitoring Dashboard: -- Navigate to `/admin/monitoring` -- View anomaly detections, alerts, and incidents -- Manually trigger metric collection or anomaly detection -- View real-time system health - -## Troubleshooting - -### No metrics being collected - -1. Check Celery workers are running: - ```bash - celery -A config inspect active - ``` - -2. Check Celery Beat is running: - ```bash - celery -A config inspect scheduled - ``` - -3. Verify environment variables are set - -4. Check logs for errors: - ```bash - tail -f logs/celery.log - ``` - -### Edge function not collecting metrics - -1. Verify cron job is scheduled in Supabase -2. Check edge function logs in Supabase dashboard -3. Verify service role key is correct -4. Test edge function manually - -## Production Considerations - -1. **Resource Usage**: Collecting metrics every minute generates significant database writes. Consider adjusting frequency for production. - -2. **Data Retention**: Set up periodic cleanup of old metrics (older than 30 days) to manage database size. - -3. **Alert Fatigue**: Fine-tune anomaly detection sensitivity to reduce false positives. - -4. **Scaling**: As traffic grows, consider moving to a time-series database like TimescaleDB or InfluxDB. - -5. **Monitoring the Monitors**: Set up external health checks to ensure metric collection is working. diff --git a/django/api/__init__.py b/django/api/__init__.py deleted file mode 100644 index 67cfe727..00000000 --- a/django/api/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -REST API package for ThrillWiki Django backend. -""" diff --git a/django/api/__pycache__/__init__.cpython-313.pyc b/django/api/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index e8237d30529ebc8e06ce64a211d14dcb13e6a786..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmey&%ge<81gcg1nHE6$F^B^Lj8MjB4j^MHLoh=TLpq}-Q9cW_G56OIBiDdcHyuP&PF$MUTr*lkpaNe0)lNa(w(shR+~# zZ@KA*7N-^!>z5?vV}PeZnV~{KVsdt3 zda53mpC;oi_W1ae{N(ufl?v_l zGIMfDih%lcQ!5I93Q~*oQ?e5C()0Bb3o`Y~4E5vVGxIV_;^XxSDsOSvnm6Ijb1t>JQ9}jEtX{m>5}#Sb$srhMhG* diff --git a/django/api/v1/__pycache__/api.cpython-313.pyc b/django/api/v1/__pycache__/api.cpython-313.pyc deleted file mode 100644 index cd6ee4d7a3a3670964c8fd231f8ea8ef1be145f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5239 zcmb_gTW=f36<*${l|)I_{o;5WIgV&cTuF(GMzz!0mgQQuVpS_6Z6Q=#kt1?#a+jT5 z$`;X!^OQWM4@I4)yf$zB1^o>&EWpG91_~5?$eRSCD3FJu-2&VcR<=zh=x0euGaU_cLn9uDXc(4$P*ioUJr zNj;^f^)6l2yFW;Xv8}O<_d>PXzk1Ks;1%djAIP1~)4P>=BTr_l>y12pTitKu>EG&o zBhSEA-y3<(Yz_PmJi~9~8QdB@!E?p;Rp(P5(ucK(KBA9)5Yxvdl#oSC!k^)wLqH#w z{1cLYvV(uBG?hKu;Od%TTI~Az9k#c?gk5*J$f@dP*>qUdF4ilY73}JcX>o@cl?vll zv1Xf=8?a*1Dzcie_sk+V+%jj?a6fQyv1=4~PW_q`%0|5ON2c}Az+s@fiw_N}WN#aF zxBPX)Ur+i9e3RKM3$s%B*nDJ?YTqOla`U-)Im~lQ>lMI_X&xyv!}f z+~d-sU0X1tT6cJrL*tqu9?dcVMQ5ef#BW&ptZ29fOrD-*E8KAFf;*}@$1YvEDc4Qz zT)MQx)(oo-TWDE0v&^n>VYoJt!E^KGn2}b;lL^a?1@I&erTAugFdH z8ZVf;W^M$}u0wk%v{{BZ(il4YgmsvBY{2QQRj9Ud>!#B>TW)a2 zDw+sa-KfZO{SXSfQh{K>HXLjK55OJQ5g9nnEEuk7TLcQ&0S(QxPf4^tNu3IQuxC>D|4fWX#`sEU)H(fI_mqRzdYhp zy`&_JkQ{mT7%mERlS_<0shJXX)A0H_7gf`7;Bh~0>-C+ASs)B<;N$>#w8~~~-`dPF z+d@*hrVF6TICn&i7fI}<0IWH4>O0}SvxG0B#F_orqU7B*D_qJFG$pP{?s|>#nnUr2 zyx{(uyw6C*0ajCvX_4eg9hJg&+bjcGL~tIZAu`ZLQ88d)$)X8@+BCagBa9gp zWLmxAnsY12HK3=%7%a1ywUz5x6|qC66$~=m*uiF-_czz)b_|CX+2YD|2|I3;4Xc0& zi9gfbUm}#^fWmC-2x#m_Z5l#H?QSmG@)vv=f`r)3T0k+l#P0E*C;t& z%BfeYhS)FAZ6*A~LB#O)I)eu;<+zaRF+HA(T~M-##*fs_omxOdkT!xQ<;W8mobA@( zK;)9Vi}}&asb0!gZC}vszcJ8p_mO-H*_fB~g$2DicriHjE4pi?!uCYkGH+RvWm9vF ziY>GfidB6_D^w6XM|0(E%N0i9(Hwda7`V{<>shN0BUH70ugBMBTRKLJW9J(FoKZZU zDo6dw;8b&PqS^QMaVp-EJW}F`?Ryu2qp>VDvt+hrbob~H`do0sjYYc|#?R3`~ec@!SY`eD8G2vGMEt~e@R8YLG zmI7Wk?YQli6E7i;^AhqDPi=4RCH*~-iLwuFBK=g;*$!^g*@QR`d&S%In5M@CJiK&x z*+$h093g9C%jOd$GARh%qKhQET5k8$cHF$)6Rp+DgtgK^wpI<8H-wJk;Im@;3tdM>;DD}VwfDJ8pUEL5i4<5wi-c55+n4W-~>3k3RCcJiVwvq=BU>> zSv-$okx1k?8jr;Pt}2nqSIWh|DL;6n{P30Xp8Q^WrQo~pO1XmXaau|BHPwk`&)`w? z>OlIa5m7S3&Hi)8H={Qqsp!+#(P~tQ#6Qh^lKJfMv+hIX0>B%Le|2zn?oi1!m6%-q z&B3{aLuD}>K6y5Es9ZcbYRmrm;4SS?nQu>sgTV`j$~zqspIRT)s+N*N&ra`CK1L HO1ko2190R1 diff --git a/django/api/v1/__pycache__/schemas.cpython-313.pyc b/django/api/v1/__pycache__/schemas.cpython-313.pyc deleted file mode 100644 index 1cf689e47425c8eb1208a42a4ff9143f68b83486..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49575 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 WS8KsKh$dkvHN5_hCHN7x_5T9^kuB-~ diff --git a/django/api/v1/api.py b/django/api/v1/api.py deleted file mode 100644 index 78914eda..00000000 --- a/django/api/v1/api.py +++ /dev/null @@ -1,158 +0,0 @@ -""" -Main API v1 router. - -This module combines all endpoint routers and provides the main API interface. -""" -from ninja import NinjaAPI -from ninja.security import django_auth - -from .endpoints.companies import router as companies_router -from .endpoints.ride_models import router as ride_models_router -from .endpoints.parks import router as parks_router -from .endpoints.rides import router as rides_router -from .endpoints.moderation import router as moderation_router -from .endpoints.versioning import router as versioning_router -from .endpoints.auth import router as auth_router -from .endpoints.photos import router as photos_router -from .endpoints.search import router as search_router - - -# Create the main API instance -api = NinjaAPI( - title="ThrillWiki API", - version="1.0.0", - description=""" -# ThrillWiki REST API - -A comprehensive API for amusement park, ride, and company data. - -## Features - -- **Companies**: Manufacturers, operators, and designers in the amusement industry -- **Ride Models**: Specific ride models from manufacturers -- **Parks**: Theme parks, amusement parks, water parks, and FECs -- **Rides**: Individual rides and roller coasters - -## Authentication - -The API uses JWT (JSON Web Token) authentication for secure access. - -### Getting Started -1. Register: `POST /api/v1/auth/register` -2. Login: `POST /api/v1/auth/login` (returns access & refresh tokens) -3. Use token: Include `Authorization: Bearer ` header in requests -4. Refresh: `POST /api/v1/auth/token/refresh` when access token expires - -### Permissions -- **Public**: Read operations (GET) on entities -- **Authenticated**: Create submissions, manage own profile -- **Moderator**: Approve/reject submissions, moderate content -- **Admin**: Full access, user management, role assignment - -### Optional: Multi-Factor Authentication (MFA) -Users can enable TOTP-based 2FA for enhanced security: -1. Enable: `POST /api/v1/auth/mfa/enable` -2. Confirm: `POST /api/v1/auth/mfa/confirm` -3. Login with MFA: Include `mfa_token` in login request - -## Pagination - -List endpoints return paginated results: -- Default page size: 50 items -- Use `page` parameter to navigate (e.g., `?page=2`) - -## Filtering & Search - -Most list endpoints support filtering and search parameters. -See individual endpoint documentation for available filters. - -## Geographic Search - -The parks endpoint includes a special `/parks/nearby/` endpoint for geographic searches: -- **Production (PostGIS)**: Uses accurate distance-based queries -- **Local Development (SQLite)**: Uses bounding box approximation - -## Rate Limiting - -Rate limiting will be implemented in future versions. - -## Data Format - -All dates are in ISO 8601 format (YYYY-MM-DD). -All timestamps are in ISO 8601 format with timezone. -UUIDs are used for all entity IDs. - """, - docs_url="/docs", - openapi_url="/openapi.json", -) - -# Add authentication router -api.add_router("/auth", auth_router) - -# Add routers for each entity -api.add_router("/companies", companies_router) -api.add_router("/ride-models", ride_models_router) -api.add_router("/parks", parks_router) -api.add_router("/rides", rides_router) - -# Add moderation router -api.add_router("/moderation", moderation_router) - -# Add versioning router -api.add_router("", versioning_router) # Versioning endpoints are nested under entity paths - -# Add photos router -api.add_router("", photos_router) # Photos endpoints include both /photos and entity-nested routes - -# Add search router -api.add_router("/search", search_router) - - -# Health check endpoint -@api.get("/health", tags=["System"], summary="Health check") -def health_check(request): - """ - Health check endpoint. - - Returns system status and API version. - """ - return { - "status": "healthy", - "version": "1.0.0", - "api": "ThrillWiki API v1" - } - - -# API info endpoint -@api.get("/info", tags=["System"], summary="API information") -def api_info(request): - """ - Get API information and statistics. - - Returns basic API metadata and available endpoints. - """ - from apps.entities.models import Company, RideModel, Park, Ride - - return { - "version": "1.0.0", - "title": "ThrillWiki API", - "endpoints": { - "auth": "/api/v1/auth/", - "companies": "/api/v1/companies/", - "ride_models": "/api/v1/ride-models/", - "parks": "/api/v1/parks/", - "rides": "/api/v1/rides/", - "moderation": "/api/v1/moderation/", - "photos": "/api/v1/photos/", - "search": "/api/v1/search/", - }, - "statistics": { - "companies": Company.objects.count(), - "ride_models": RideModel.objects.count(), - "parks": Park.objects.count(), - "rides": Ride.objects.count(), - "coasters": Ride.objects.filter(is_coaster=True).count(), - }, - "documentation": "/api/v1/docs", - "openapi_schema": "/api/v1/openapi.json", - } diff --git a/django/api/v1/endpoints/__init__.py b/django/api/v1/endpoints/__init__.py deleted file mode 100644 index 37ba6ac0..00000000 --- a/django/api/v1/endpoints/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -API v1 endpoints package. -""" diff --git a/django/api/v1/endpoints/__pycache__/__init__.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index c012bc898eeeeaf31bc9b22aea9d3be39cd46fe0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmey&%ge<81kqLenMy$VF^B^Lj8MjB4j^MHLoh=TLpq}-Q}zQ`1q9!pFt+v3f2!TPAw|dFGZ7U`#CCFZ5)>n9du>X#Yn!)?)zkI&4@EQycT oE2zB1VUwGmQks)$SHuRi1LV|VkWW4^Gcq!MVq#)sDPjR~0Rs{}fB*mh diff --git a/django/api/v1/endpoints/__pycache__/auth.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/auth.cpython-313.pyc deleted file mode 100644 index b8858b335c65f8f16a0117464a2b9ba355379be5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22003 zcmc(Hd2Ae4nqO64EOs~9Jer3niYgrzFY(Yp>bAr~2b&Tlu}N7oq?T^6n^a59Zu)go zHhVl6jW?T6*-b2Ec3=*Yg*jMchgu*QZII0h@BkypMn;2OB-NA*G8GMWfH;T$3Fv6B zv+(?p{JvL5SGSw8oyjC^^VO?&eDC_M_kCaKMM;TUz%PE+7p)Bl!hfb0<5#9|%)=Hz+DpestBV2dY>Vuk#F62WnVNpqAAJHnB~C zI#$Qay@Q(r^{hUyg>4Bmu!g`^ww0Hc49bCRY+GPE+aB1#b_8~^oq<=_D}h~XSD=wK z2AWt?pqVuXT3AbIS_xkJkt5$GbYk;Fd%7@hvp>{kC9(wXZq<nNYS_pXW zH3Cw5K}Z7|K>#M{9QpzPaVEiIVG{(_Ls zZUCvPAQg2NgmG>I7zZ|(O)F+|upp!%Kq^F!hX83mcIU8;{|ya-@n0~&xzmyH^TDI| zJ2q|~zu*K3246LE$C0~8W&6Fs6EyC1(b!4j$%Z!=xd$T?Cp0LpfsfWZegSLfE4YT> z2D{Opw;LKH|M(t2I$03X$Oe#3Z2)O6Ae}AC}J$!wuKm0*Y6ZSrU`!ekbijwVw~ z>l=!PSXP<-xGPsiRrco+yiGZzbj%?TK1F9Z5~hnv0s4ycU_ffpt`?m3)f)urO6^ zOVlzdJWB^=l$7x04M&o*iFh)iR_d>O3ye0UmNlNAOR43S_t9DGZ$z!?yB3O1M~ovj zdinu4lFBcw7&$+3;bc5?H5M@k=4E|}_*9h57`@A>-K7YNPR$!de7k7_X&x1P9_Hec zROY3!U@Da2Z<{PLy^zH#YFJ;mN?%WDZzxU;jB(3G<5zP_%6ouD({Y-M(TGouaFXDc zoQourAcG)|WG19~I0or2rMXxFEOVqn)5&ykhelmEK-;H32aKt)VH zN(c5mG-)GJ(0>x1cKp4lL+SUyWyg#fVc6PEFWoMTio*`GiJ3vE%X~32C?)uLKa_G^ zKezap*rXSPF)nG&Xy?ssLvLSf7qlI6#%*JzM%&?XBbR*!?W49r^DY(k*$mwnV>(7{ z`)xagZNgZE(YHtl_2OP)AFDD-M(sgom%cZ~oI|J`tI4()t~K)6r!mfXx3#5F8g~R; z!J<(|P-@21-B{q9P-vd^;hjrc{hvazVO?eL3E{7&36Lawtq(Gb8(gM7V##&kqbH?8Yfk5wa zC>#bhCgmo=MDV3>GjBYrb9ZWQ5WL(39wi@?C$EKAXcGK2xf}AMP_Kzejr4PR>t&j# z$s3NQ8xPGyjOkHcZc6B)V7Cm`nP{7i#3PVYk+2+{lH-XKWDA#V`jo+IlBo#;$|-u2 zbKz)9i-j!B&f?_@t+1J?ITlaKkgW0~i|{e|j#?!f&1nX!nGD5Z^CUNuGPZ}hP}6p| zDl|J)C*NgNGWJuIjHRmX?1a@~b5iN5A>;TA?hy$emRSeTNA=EVTxcR3olLP#6s0S* zgV!ba6pl0!zGuU@Ttd3SkraxC(qP>dLC-4>%gsLKBe0M{R2g9tG&$CdGIoHHgOnVi zXpC*PWk@RMW5@P5z9KoSDmM|BPw zKouiuF`vT3OmaF&`k+id^?b)Ds*@e5P%ObZrlYBAb5}biV~KbKW!G3V7K5fTd7~}z z)+`!CSV#Ce#8jdqG#l->xu?Tadpbzcw$IKJqtzD1V7UZ1@e|+9 zRo~tf-`=%~>i1giwyafcdhg2JE5@T{^LyX9`<>OA-OJn8s_Wj1-;J+Uw=CN}^SH{~ z3yxov3B|s5J-0ndb?b8fj|2At%SRRe!DrH;HDAS@{)Kr(s{Q*FjZ{2%; z&;9sn>&Z;($v^H}6yGoXLFqGp z#4%Hj4VxT03x2zBd0QcgXv{VbZc$J&;To1PVc3*cR=A_4Y>V52#a0P6T%B!a#>U;00~xjrku3F0>-6x||par9M0*@p6qSIkU>CQ@`6AW;K7Uccm+ z@`z*$6-VjDL^>^`izyH2QUsw&@{;a0P(dL(uW2BXGHzeVIbJ(82f>V}49S|T z8A_LECuYc$GEJtGTh<@RlPju+PC?&Zwb(ooMpUDEZt^<J6>oUmC3wqLJ)80W zT4l|9ufF%{T20+jTsiU0O#PTrGp3Y{eNwq)wX%7ovUz#uUzPqv>1yTiOyzO3Qg$6u zPEKU%Usq~gSIS=hl}o7Hx?0h=Qqj2Vcv{i6Q1nY*#q;V-i;b&w?U}mvr_~+LYw8vc zeDCeGy6vA8IjY?2f}@O*V)x(w$}4y`zYs($fJ=$4k18Kt{IELXKco20d@P+Y1j~RS zSnhm#>EcqKQq}ZKYA)P^6(huG4{wDi}eqUd+ z{lgt1<(o?=?QZPfVgG0gm3*|ri8Ni>!Ep+ABaUK)Wz0bw1D7#)YCmvxU9&ez=xOk? zxGgA-ks`r=kP`*&JVsk0X*52a%ei!>svijPMWZ+G zl4XB%vC!F{28@`Xp`=3x)~+5p9E~f2?-7q-LzJASgxKKcB?gn?a5#e-N>`0=dy~;$ zXDDfZZn4I8nkCK}G{PpXz%Enbp(KwPII{Yug%3E;l9W!34L}3t`=#@gaa7*LU-F+L z0XwKDah?&MS2Qf9-hcZCZ$GWr{k18wnkce|C~`6JlgbAdKLA0VP<$somQEN1i4hD< zZ};-WWl&`2GieW}$o(JLANG9c%J@$!zSAE|r@5wg1{B$b`Mq=Si12~Cca!~*)7MjH zf8-Y_UspnDV`Hx$>K~On_B)ZLi%88&%%%9TkkyU&G}{9>lP0a%ld&H9A*~`(x znw{ws$!UO*o36&7lE-j;$VIAVVAW6}6(MBeS44=+T!|=?RGN%MAqC~+wZvR3EJGM3 zDrZcn{_$mG2(Cee_oU zny2)RW8skE@Ut-Lnr#{tcOqYyVei!$_6A#F1N){8%li>p9TH)}A#~%vLW~=xE!%#v zQy8`Pi`^oWTKlL&S9tSTwUe`I;sX3P>MY2rojpz{yhU+5!KzKhtg~w8ml&+1QD>gQ zOXA^cjcKy#;`HZk%|^K~ZjkLJYbqf2{M*mJ|v(W6d zd8q;*%9g z)(i<>CP8|#5~OW8v>a5b_B@mJ7L+-p()Abur0byYz};JIe`NFZ)Yu=Di$_s zZ@K-khe{roJCUX(FvAW8JGssjKK)~mehzn}9pc<^_sf|A*^vwAbYuf4R9@IlTv*pb zsmU5J8~uk;Q!g{h1ffaKhH&#P+@g@R`#iXN(AMt6{oOul+`mm5!Z3-=ydT&LMkiZ# zkSq{IhVHmiFxi2W9xNm$Xtymwf?jbuggDRz18$0-A=2xzz9ablhG2hmP-E2_O-{@t z!el*#+f2e6_ra-dkaZje)rn9_Ei>|0=O?()Qe*jVU=``oVH%Q5u2V25htt)>HDo>y zD#Ya+zLQ9pQ)#nCj4X+cEJev2B{z{|$GbYOSs6>H)Z3qkB%v#ud<$Acv#zcYEpixS zoz%P~6GW0p5*1nM^XMXt=EA;(s{ew&d}PJl4<4cr}A ztCv^n+cNcSYqj<7m;9h)t*+tyjvsWa9Xj^Ytv}tmAhrU(0YenvQ5{A`plY5~A zGP11l&N;=mO_8>NDl1n#a>gT*c1J_Oh}W(h9?tlKiZ8e#1=sCV{&|vk(mOqSd%A>2 zU7LF=?T;%&q-h_~lI6^D$cRXYlM(688!H)OCJ7aCqmWz3kb!hb(%dLeNX`{PG|N;h z_!feiH8T@p^KxQJe)C!=Wg5BV$xvJlCk*w&&ek9SjK?i$62jY|m;Ys>d=~ zk``*R)CxmS$vOkschKN};V((#nxm^cuh_C$v3I3n@BRHxD-PZoB;CcMcs47J&0Kkb z9}c^mBq!qk!~LBuw7)b7;COVBJoARmmz=w*JF#UxNph;p&QVJ;D8U94f&T*+Ex25w zH>0U}E9vL$ye9h0o#)_k_T0&fa(COS?>4VuzmM(pf^R1qzp&5VZL8kS6>sN#|5I=G zt&_CR&V|E@qe|Om4ViI~(%t0H4Ju@*h3yA$gwAw;DCnJ-Cp=+fT@5XM& zZk?trD_S_JIBNKo6;`GH2fCB(7y%)A)XV!)>Ol&&u2ajyN8Vsp6X4*C^s<$cW zf)c6RP`&wcN;KtOap*KQZbMDja#&eU=7jZhlbY3HG7`NR(apv=)s}9F_(YcCCPK3~ z@SBk^_1CPhZz7ro49}oRTwC=f8^U0b>#)+k6o%1+!_ZM|Vs`FoEILUep9|gKrd%F1 zqZPxPaxUtmU&(yv4II@FEG>;vT-V_jL-a(kq3;IWx~-HyEnL8p&bYO}qc2>BbKO6QSa`zNaw3O5 z-K=7iUvi4%Mf@GdF;da?Jh-C4@{2SfJmGk5KL;k~}8~ z`=?YvNq|U_XcHvqFL9pBD%YP#TUMpE6{&5lylQRJmeoxynN2Nb=6@E!GqLW4>a57e zpY&(^7Zu+{MY?GC$IpE=|9JPq=8PXV;y zQqe7)c%O#ZG)B%zuBS&}K-CO}{5mH`=z0akQ^U7|15;d$x7I<=%wK0L8owbU#zVdu zA+ZSK<%ougSFvHR06<(Io35Up~Ol%zn*R{%XaF>1N zw3oZq1-q9Lr%Tf)JsofjBCLblusPZ!Auc~Q*UNdT_@z8G=W-OMShNBh7Cek>5(T*I zsG~!$c#f>xRnwtNnNw}B2t_b2}QdOB44J+~HxNv>WB(&YwYtI64-8dEGL zjuT#JT;G9b7l-9Z7zntDj_k}9TRpwa&H{1xrGI7)mVTYvX=?d~#Yloks zv!u(Yg2OJz^@x;JkJgbpkySUJ?=&C7ej_sfGA)L4YlKblKwlSvi{}uq*GD+C^D(Y9u8&}H7uUp=>;DRl%qG7?cR$jAOzCBaE zeZd8lWv#mYz3X?cuWjD8R^L#_y<0_rLH$`{U-R;|WhgRj&!l#4g6RB7-$U_(QyG7s z;_LfZ>f^k!AH1>wvwEjT>~RQ>9PVDh{;0IE=ZO7Lmq_^|PNZosr#bzAb9kjmbPoXK zw^3veR8xS+4AlclOOCS%N{dN&P+BOg1!11JYGf_$S?8$rs-cBwN~CO9l#Jr^pSb(9 z=tLe8q2Un^H{o#y#&wZnv(Dgoo)nGlwr~_-X)>oC4d16&V&;p~;>H*n5hN|6gr*Q< zCu`viWUV6)mj(q~pA(V6oolnWUr-U~Bs{Cs*P(ldc<7(50Jt<=o|A%CKTM4loP0n{ z^!EXZVQ-`GJg%x}NbbO^#mZ)YARJ#p)gs~e7&4>?NC-MJt!$r26|2(L6^YDe*ME2& z9!y}gA|HO3(nPl+oi&Wv)Qh6tz7WO+qZx&<;i!do_I3$>>F(KN|EaIX4}2AoedKo{ z)iD*`!Y_yinmiW|BgkxQZ20QJAs;8<03CDpYa_p$+s@!}385d0X*i?t6%>Hw>ND36 zL=WttuPh84*hDy>H!6e#P%Zg|O*>@0AwOg`g>~l$WRFoz2l%I`{a18=yOF^GX5D_z z9i^*|%`1-0i~Y|W+kWXORq78s?9Y@9D4qeuF<_O-8W!g;2y@$S0q%y|Zu_!re>r;~ z^B?^}MM55<(5&iO#58=a#p!AHB_2t{DNv)cChkLpW&-jf4>hT8yrwX9XN`2Q3Yh9t zVUjH!;n52QCF^Pu5h^1>Nmq|psU6k{jp8}Mf(Xr{WS6MR`$+ET)>4x+b8S#%+7V3P zNcFIVKSQSv=wSPiA<8uUxt|o3uNG}tDcZ6a{!!qEfz_gpOi>3>pWOLiB;)T@e7%a) z3rbx~D2Fa){KJZGSdoUc19x?h9XF}_d!iI>t~zGn&{K;kok&L05fbPjHhE1m*}L#{ z1^fY%RyL3G(unc_`hWjRzGfIUBVW)<{{>B5ZJ1!?{krt`xNFpI;z&0&CAhIw<8-- z<-u19p3$OFxC}-m#F*mST~L)bB;fem^jQq&Y8*4Ira zT!rLo3P+|wbFtK6d5`gxfsQ`Zav&9%K}-bNQC~~ruFl=~$m}ij>g?3|X}Ct6f*kAQ ztMi6AjPZa7@@RA7CchB1I~9$Q>_t27wQ8by1FGQ@!_9|2z|x>=$eY_sE8_hmoxVkL@^42}2Zi=Dd$o(6IRd*!V{sQB%}kYW-DC66rP#lrioc{X z@-?uOYR5HJb#gpO(nLtBFn(I_m79j(zM>?1gccbrF=<0`OZZijQ06DM`Kqra<7-*& ze(Kx1>g&$oHL&LOzdLk$=&83JzL3h=Oy$m{H!_t?%iqXUbl)2MWl8y+p4*of zH)XurQSbI;+?#Lpec~;(Dzg)66FyqhpM~+#K_2*?n3CH;VXW?AXutl zVKMH}>F_ zXVM91lS{8GJAUlG=U#eS+1IDY{mRABjQ^72yQD~$a0|4M!4(S`jQof3pN~HoQVx%0 z{Nsvmd_@{3Qn&(ApvAt^)6~-{JZf#Cn4~I-Ou|)=P9@nfN1yc;rUwV)$^R)&+?XD+ zrint4MHIMbXon_-6T`{-y%fU>(9Lg&;m6$k^XIRP<9v55h|K;P>qu8*(U>=QIU-91 z5t-w#n|IeD?Vz{|oENiyiChl4I&-_{^(T^X}Us3O)W;Mjnugu1f?sICbWMi2>Lr_ z*kYm2<_MiPV&(gI@Z0Z>k&pSYpZurW3d#NGv3y#c{RGZr|3R<*2^@b~Y=tH1gu92w zwrRHp@Ok1h`I?InQVY$@A{BD3AHz6y5)&F0$QxcivQi?Af5QTO8q=kXW_%q%*jPxU zy~alsgk(d|*-hOhUuMvqPxWY%;WrFTmCsTgVWsBW|H7wK|DLK&Bgyv?u22OfCx|Y| zNK6vM<2>;dB}k=dH;n!;dcW$Kbb!co*Rub|o9=B|_S}E<;m)76JZgDZugF8n*hI$v zy5f6XkzW5=)cTx0$Q3as=wplVpV%Mte1Oj?jw`<7A4|u7Lt^Fx#LP}i{+*uvJqLtG z2b%gE_Q%_bDQ)rf9=AU}BvSsk6DdA4``2jt>0Ts5LqpB4sYMeL;l$*`gzCaKb1*V7 zqHX3tqI$yoYvuN9_(x3`>FR2=UP3Wm?FfX{zM4*I#@QljQKq*DUu~zmYAmT;(46sT z{CbFyVME;t*IH^~is8nIe~#q_tTAMG#=kex&h1o5?Gw5k8@95HOBQvt2p>n_Ulf^E z%emKw3sz%rj!;ne1x8Xyt+ccNU69Kp$-n;NAM)`yKrND_+S1Sx^~Wj+6j3azqNJLD zmf~yf_M3a!ll))WNHY31fzgMpY!fA96lUb}W#mI-TPPv72HQ%BOvyG%wo|f$5;{!w z3MIQJX{4lyl4eR;C~2i+Hxj5%_%H+>pJFKa{5unb%TDlrQ~+1;6V$>no4}{;0qQ|& zKO3iHk`k_%O(Ul|XG1C2!e*)TTa-{33lFX1QDQv2Mf0lPp$hUEakDx%&9Xnkt7^x; z-@_?TbzDs(V*FyvFC3btM)Hpn8@o!mFeL-jPdW-jnTthUW&a(okSU1d12qG)Me#G6 zTXg)oRuH%ULfG-QLjNy>hF=J^zYq@oLOA@Ngwp>e9LflXer*b}H2dx?T6m>nlZrddehx z3-nZWb-&;l>UsuUsc?PR=&F=#S)O^=nrRxMzUS9%RpJ?O5q;^YwD-K=8R~lheW`H0 z(-`#|iF5AHL+yfCZWZh!50EOsaGi_r^Iy!6|6T<*Shc4Eu37G?l(NV zk!c;iRi}tS-nB@qT0~Dg%#I`Ih=75g zwJy+8+1vMmXG{>60D@}P4;o_!Fzp+F(K$k6YcQ(B5pfY8hSD>qD-~!f#q8%7F{i`J%q&`Xvu7x!&wL%vW5$UTq9IxOnaUj{9#bd-|!Lu~*fLt<bk8|bS(|83wS68aOQZ@6pr(X^%i~Xg)2+7%Hgv# z_I}IQo5X%`5&KO~bK*246==syO%IMe`BtWDjK&=2(=G!oEpA>H=&9^}^##wE zFs=Xw)vWI_CIA@sCm$SBx&{bFfWs&j0~}T8X?7h%S1LfzhEC0x`-8S8H!}ObNnOWy z*Af_z7D3YVRQB|~;29IfIABoCdK1AQDmk-w@ctmEq}`yBQn}5b-9v9)svEgI z^eciv)9_J3G)J{D<M0H!NL#5T|1}I6*iF6ewK>x4g{x6Frwfb@ViW&~Z?~dY!Q! z<4e+mEl(fw5wk=B!wE#R zW|xk|B#n#~jg1103^a&ub(^BKfgX&Wd~1#=(1TbNk-SKd07VZz6rig#0eb3tv%4h4 z$THA2hoTE`IG^|4yf^PVvla~c34B+}VXeJ~kiX!-`9!<3*5@MR10oYjWKQPCxdc!7 zgp0Z)9J|JagqylqUl{i!ywuD3?r~qDg|@K1XWX9%&_F_@A{%?hgNYCgCBih!#=h~^ zL>p~`ev9lMZ%;&MBoU?2LD%3|(TMuv+WJ&~jQMp6z9OdnPS3`eG zt-n?7#{P&P_oQ5@9;7Mv)_U8Z=Vo);ow*U8yrY|35-xELYtBFIeGI=+sw34UKQ+wD zeezD^Rqju@M|k;Zq*KG*2G}n)%4zlGFvH#j*t_Kch8;^q0DEv9_71>)c>`>=H|+k* zuuI+}4>`Nbu~Zaf9$rV|DWGxu2{hvJ-XpQD8c1=&U2vOqmE?wH4Hvv;a9{;(Uc%F@x2ZWQJu zTSyRy=_JE61se}P+z()P$wbU+`qJsVGN-1~razsYD`ZPK?2GC28zm)YuY}X-X^rYe zPRpzL0xWye>1-hbofgRlDFerymD^iU@dGr<4kQC>n)U1@l^}=)= z#InhPZEkhrjJZr7b(HGWOLKDyoi_tu>KUpr=!tTt%#2r>nz!lAOL(L)j_yWgI!`c5 zZ(KI!i)y*OKA$UOm_`26H|$O9Y~cu>sr zSpH**mdx{M+`$Yubkkba^c859`CA6Vhx2)%gIQ+n5}4!%&E;jHv~9N<^qa*jbiKLC?I2^d2*{PDtJ;4xl2(g2Mmc8g>gMpf<$KXPx93+i_tU9egZ%lFwJ%*A^sz!w;TwgNvK-(^5A@2O4DnlCEav^N=?r+^LvVJV0v;ogv+Ash3TpJn9uZ5^^KAW^D%&+ zgV-QjbPpo?R z+*uhoSrJdJx%jC6y6%PBxNVm!@37xC$ z-5N~FIM>A!tpIWm0RSM?Dwx^TAYCedDd;kD(+-s`?E z1CfQZEW($A@wXg(YT0*UJnaWz9{vp6s2srfZZDR1fHhG~1*2Ca9in4Sb(S!ko;qgw z>tr&GQ4XUUi-mZG5DS5_^N$miWuaGC?poh+ zOu|A2laDc5HfQ%$!l2<*#itQTf6I`SR&J-(186~@H%o2hF}>% z01G91g<>Tt!%y#k1}tDZ2}{57-bqwK&o8{P8fagbV22#zAN~OV9xmdkhO8>cIlc0* zJyxW=`ld504WJck;NX%{0*Ufa8(7tq=`AYrxq^~icgQFKJLGBTJTc)20Mzusb%x(d zlH5k=#YslTxaYV$R8vWQ1Qq2fzwO_Mcc!VA*Kv&@XwniWi%MzMqb<^yR8x^+D9zfl zQn+(MewqLgScw!9nDXcgFkyPEsACFQEn~!NeV#_plhCZ!Wypf9sq-8_-~s9wFhHGy zB;5Ia;YML4)c>bYeF1QY6B9wpWcLaCD{Wna+J}9WUHg@$PNXE=B zV42-3vd(4_B%5YqY69`o<8YwoAs__RtC?I0Qc(%gym8l4j}7!JfS7L0Q0H{h3yWB) zn}V)fQ30$LHfYV(OxI;~-gHBrfpmnLvyzFOOG=E%n(1MQ_%8g`5FJc!Ph%vhdPvvy z4|6wj_o9orrOxM8IuBJk4}IEs_=f+w>oZ??(R)k%)Yt#WMY@gvtXq8V^tIDJny3e$ zawm8kt5mFQouerqw&!#6lD+c(W}J8Y-#!B8c)nXRJ;90&$tc)I-xTjQHc>hW_Ce2M za{-!f*;QxJQgph>zP=B@KS!(-HcvqVN$HQ+$9Po^9aD3VR~^C2gZ5Z)W;O{>wKNWd zYRUd37;GA#AlYvepz6V6hKCIELw_?P-+@lnm&y|bkU4Ka%9RH8!!w8#8=y)^gGdvQ zQP7pG%G8r(r$%3anWoHQt<>Cm3Lt)uP}`ufGD}0DAOzl8B=wAdg@@^8 zpgNu?<^d}Uuva%Hvstt*1Hc3L>FAf=Dk;Utir7~X`&PtV6>-b>|94HQ#7yc5 z^86RgitW^FRx}IBq$)IK5CPIq%&Rj6cus9JtM)G`+_NG+TM?hVckKSIk9U1Cuyj7NEM~uDRQ6I*;5x##rbVOY8>X}(}PSI%yq2b|*PKZ2ZDb#WZ`h!;5F8$aRtJ|`WYli|796 zC)?eLO5fQB+jrhhEFHR3*?##^V33P`DMlCN8)vF+=tG4W>ACgn&7rCnM?TWteXIZG z_G$}`{3P79sNb0T3bEE)gx|Ingx#wlTzrkIF$)hH+ist!1oy9sTUT56)%mQ7elBwR z{2GBj3l%4--H6$9tp~-dVSIjnPz1F)bSZv!Q`d3@eA&HQ^J>ps2blnnej@jq7W3}}_qXYr2>(0m;fj=7? Tdez=dutzt+ek1}mGva>%a;tmE diff --git a/django/api/v1/endpoints/__pycache__/moderation.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/moderation.cpython-313.pyc deleted file mode 100644 index 644c737441133cb89582a0ada6a912bdb5ad1801..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19099 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 IB-PFT2dJE7L;wH) diff --git a/django/api/v1/endpoints/__pycache__/parks.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/parks.cpython-313.pyc deleted file mode 100644 index 12e8c28670c9db76d5b277c1d602e49a2497590c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11828 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 OCQz{1k3CRhjPu_vFtu9% diff --git a/django/api/v1/endpoints/__pycache__/photos.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/photos.cpython-313.pyc deleted file mode 100644 index 606d946e66c5bbe187f4bf8585fce40e53ac0b7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21210 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 XS{w|);xs)lL+F7Oa^J_?l+XQt$wdz$ diff --git a/django/api/v1/endpoints/__pycache__/ride_models.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/ride_models.cpython-313.pyc deleted file mode 100644 index b1a2fdbcd32b890b5fb24f54778953f2c5b5aca6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8192 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 diff --git a/django/api/v1/endpoints/__pycache__/search.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/search.cpython-313.pyc deleted file mode 100644 index 31f9dd19e52a6e73cc3bb7a34594fe223ec07a03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15835 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 Q5~Kk|h1jtJMREUs0ItKr)Bpeg diff --git a/django/api/v1/endpoints/__pycache__/versioning.cpython-313.pyc b/django/api/v1/endpoints/__pycache__/versioning.cpython-313.pyc deleted file mode 100644 index e43b20cb17c786a695fad8e3cac8b7d61a7f03ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12175 zcmeHNT~Hg>6<$dz1d@=z{0Ib?1!IG-ErAUt5dVW~EaHrdOp+E-MV1zj4HCU8aFLT4 z(wDv_<7N_fGUGht0Y7wxzU9&BQy%(YL8oYT?9OzWX(uloQPRn@Pd(@E-rd!ofl2z4 z8SjktUfp}o-Fwdc?)mQDZgsVtgXfPwcgGL=IquK+hdmW)WY^Dg+y`8UBV5Q7GEbO- zW?~jFZkezIdBW2;KVc14kO~^NPS}E#q>{!fCaQvVVyAK2gd^xA&R{jE4!Vdd=q7HO zUO7<{tR=NHUNvzjSV!t;+&)nsY#sDdZeB zk(Qa3$zj%TJq%UPG|n`KTz+%N9jY0&gf53_XZX;enYIBwROjVx^S4cdYH@P7Oda(z z4Qd??v<|GHk=EeB8Z`O#GV)C`9#y`%K;D}tFO-pQ(R654b!gLcI9#AZN0~a>H5~+6 z2iBnI(2>`M&NA|ynhr+_Ixty35pYTGL^G)`2xBIt=Eup{I=e8BK?w z0{NHn~tC+@e~Z;<3lJSIxQL@C?o(kx+DAT#U%AYO!&}Mw6nnluSsXnp>;pqUvgr zM@>>qBqbAShT{q$NuvI#zAj2qWRBHi=uK!EpNh;$>E-~K_>L5~he0?Vdnd4>^n>Ix zfAs}eEdEOq$EBODiYWn$u&!X;=`+ifU~t-8*(NP7E=I_zY*TBKtqbwRcq(d9{WAtg zR``F{2^D|9O~YGxrp+uiWeS;w%?Zmike2dHG9qIM5O#8JoC=wt96w#flBX<_lnmK_ zB^*@05wbwOGd~ai8NTBx&h6x;EUbnpzK(m%DwzYEWUk}Jn>j9FovvXrlZRML4?)_> zq;Ht7w{V<;6F@p)4e@?!7sQl*vz*VGUb3T|)gE9brXwaotqZG65?GL9>Q##z##D3ADLuxJod;$ zywGBq$8LLMm8z%sHP%~) zLrl#MtA0SXNGU?v=x1qtbR4om(d2R>MX)pE%2|?Jgps)jgU3e1pDsiD2^gNEZ6@s) zJBkHOD-xnappQHin3BK@0cc~A1m?hDEZ+)57m^7P(x~G~kx2B;N%3b(P(UPs*zHJS zE*Xd{#RDt-0nO8~@c?efzqG1&3yN;0E`d20cLaXYU3jf=UpI2jwvTUqGM91q*T$Z@ z+qT{Po9_ONu8ezZZT#yBuCe)}`iGtep8GRdPg~a0^5N?Ht53Z>+uo5)@5pBZTi%O* z8a%gaF*n%d!E+m?-#gp4ojse*p7q*4IFJA4jUCL{aa1}ha$Kdg;-7!F!~b2>{PR}f zvdNk5Ejy$G_n3VX%Zs-}@=m%L@g^}BY#iXSE5B^s7{>mkWB6AP`L<(tP#yOPev0pb z`tXT4U{q?OI%H-eNHk4r4 zR%pS$nAa5&Nf$dCErt8$kz?N%#?do3~hn~6`o;3QlT)j^! zd%tuX-gb0vI=a_wTaLabeBUnA!KDNH$4DRsw3F^om`2Pe0V5CR0R+cB1xV|6;N%Yo z5S=tMsG!cuV+07eZgfxd0b(fO`WcicacFLy$#4L+QZ64->-91$HU$nJyBb0(hM@|- z4IpYur|rzPC2&eDoSFx3uFiHSX6cm2Kn7Ri6HL06#EZi^BT>W%p-N)043fYtF> zmBIfjV~KvmIF`a#j9dhXSKueT3$G%Nz1M(h-gX2w9f1uPP%o{Gm2v1}7}W*(djK`US)MsWHZxQ9XBL`<1{VY1ejj6-c| z;k>bjsHbD^#RRKpg4K?6z(#~|MG_Ivl#1&ohrxm}j|oJ8D4WnAAJGX7Ifk(UsQNGs zeTd@pRjgjZ1e{!vQG6Z6*9mwPL6uH_Xm_g3lgJp9TfnmF#3JAC|92)9BmfP7DFwEy z6gc;qQlK0&cpgg81yYoLzo!sXzcNz@>R8#NK?jfK0}W_Vrw9}+bc#UHf}Tx6LlsUB zj5r}bfCA{q$QgW5XA;gq zWt4!OrNBKUii=o%Pb1xe{$I^uZi%h4WxFnthxQkQ$_eFmEIP{*s%lLmr`puCJX%Hb z9+XzEp$w(f35=De)p}e_v3}K<6(@hchM&%?ZsAkgdNAV}TDz(**}F6Dt8B^cdFXxM zy&ukcgskWAhi||Cw!UN^+VYMbe95jbYyV!5EhgAjG`Y5BS9N1x&I9iEhhxv6P7z%z zHbtY$bf)5dXjTW)b7+>Lhx$H>o>DYRx2y_qLtX{Q{1#zz5ngm5ZiJ2I^MEc;dOUp(o-9!{?%zY3Pms zr;&Fhlgaad8g<)E-+rU=pob0m2Bv<1U^r@ULLU@7dmc4tdsLG(1)}ixKt~Nn(VooB z7O#W_YEC0}+vyyTCM)z^rEKmv;L9cH+lLuN3*sMQDl)fhRq86w-5!Ln{#AB@Adx8$ z{~P>t`mR3waeRF|;~ZSOqSN=$jQa|s?}mp>51Q`3ne`lb>hXRwct5Sv_u!WI(!uGQ z&XYfH5iWDibpKxHEhcfg5uuTIF|PAa{QcqaVMJ94r%8F-pyht3TnE;3sGP!yQu$2; zRw*iPEDa;_ItW<6E$D1+M3KhkgIlg^`)701@i}g+2nY(BcQd{*n23$dy$Rj>9r(8Y zhdp-VZamw0pW;h-I!G;X)LM24evX;91Tu^0+|UI@j2=Ra6)?Jb+F1&%1&mH%YFvYt z0B>nBZz&C7h0lKkjjBT&zY7sMD?JE~OYwP;vpg`LH?m_>AafPSNayKV^bZW#-~_IX z$#y+Is@(tpO*E$$gg?(cV>BB`70(t59-u|-{16UY%;}CYP72x+hpR2u#uVD~@e08q zPaAm5q8vi}7*nacu|Nzq=#&!&2lkYz5t)IU0QO7=MA&+vdZRbvItR_D+h=F@aIMgBR6V#~n4Bn}`NoHJ0t|=^7no^!X)1GTxOUWA=W_m+|-^=oE3}}wU zI*q%A^eJ^m!#MTXv!r&$3q#(FK!MPLA>66pp^vTU*R(@5qfzkK7th2bxWE9HneeU- zoT6O@OKEl!7MJ0E#4VBDx+p5EY|3dK04@cwYY+We?3C^yV6zQdMJR;utWmC^s|6ym z4wMYYQg`Mkvff0oFuvYGF=cCt#Nnb(;RYRvU@3f!Ak=0dLXWg+IzDaN7|FQLuZ=&2 z34Ys?)1&kT!k4w}+qHe0wS5~+TeV|rK{&u_=-ICC+pNcw`jMyg-G+ZzPsb-GGoHR| zyYETwg-rX!ohmEdJg{0TC|+OnnZCmFL*EJ677oXf(QsIL6_@((INkx}a5;czOP?P83%9V09XoU-Bwjtgr3uri&$z5U$`$%aGR98f-l@WAUE)Z(^oqCAn3ZO zm!SRkNZGwt97*L_X#Vnoc%Bd_1U<`1AA>=27L&=eW3Dps|7he)P0zT7XPo~T*Zz!a z`YU%~i@WfQ>wCtX{>E%GnZM!SwR4EG*Sxpz-cK@BU27FNJ7=!^h4)==mT%A21vc(v zsxN1q$8t8#?96ez*}P+~HC3$hISzu2(AOC3Iv_oV>A4(V)U zrK$gu6kJR(^?w%H#XyyYSgui%9?aHtt-qY99?CicM(IZQ_E?UC;PH`N3{+`|<<4l* zXC#IRvUS#Bzcr{hw+1A*JOIV9Oy;zYVdRU;Fkk-R3@B?;Sg~JeI>Ie|EZj z%ZGHE_v+Hr=Ib}9%^#mGZ}YRd%}*Jnp@kb=Ic)M5mVLGSgf6YL9QqquKDw`#pVXz5 zmV@2^j>n_>YWbj18e2Y~w7jl-%UgA;wHu`^fYh72umWHZg;>t1brl%9ccUd!eJ<X+gSAn@8c-*y%0qy7=JH)6%{5Ml3I0OIy diff --git a/django/api/v1/endpoints/auth.py b/django/api/v1/endpoints/auth.py deleted file mode 100644 index 7baf0cf4..00000000 --- a/django/api/v1/endpoints/auth.py +++ /dev/null @@ -1,596 +0,0 @@ -""" -Authentication API endpoints. - -Provides endpoints for: -- User registration and login -- JWT token management -- MFA/2FA -- Password management -- User profile and preferences -- User administration -""" - -from typing import List, Optional -from django.http import HttpRequest -from django.core.exceptions import ValidationError, PermissionDenied -from django.db.models import Q -from ninja import Router -from rest_framework_simplejwt.tokens import RefreshToken -from rest_framework_simplejwt.exceptions import TokenError -import logging - -from apps.users.models import User, UserRole, UserProfile -from apps.users.services import ( - AuthenticationService, - MFAService, - RoleService, - UserManagementService -) -from apps.users.permissions import ( - jwt_auth, - require_auth, - require_admin, - get_permission_checker -) -from api.v1.schemas import ( - UserRegisterRequest, - UserLoginRequest, - TokenResponse, - TokenRefreshRequest, - UserProfileOut, - UserProfileUpdate, - ChangePasswordRequest, - ResetPasswordRequest, - TOTPEnableResponse, - TOTPConfirmRequest, - TOTPVerifyRequest, - UserRoleOut, - UserPermissionsOut, - UserStatsOut, - UserProfilePreferencesOut, - UserProfilePreferencesUpdate, - BanUserRequest, - UnbanUserRequest, - AssignRoleRequest, - UserListOut, - MessageSchema, - ErrorSchema, -) - -router = Router(tags=["Authentication"]) -logger = logging.getLogger(__name__) - - -# ============================================================================ -# Public Authentication Endpoints -# ============================================================================ - -@router.post("/register", response={201: UserProfileOut, 400: ErrorSchema}) -def register(request: HttpRequest, data: UserRegisterRequest): - """ - Register a new user account. - - - **email**: User's email address (required) - - **password**: Password (min 8 characters, required) - - **password_confirm**: Password confirmation (required) - - **username**: Username (optional, auto-generated if not provided) - - **first_name**: First name (optional) - - **last_name**: Last name (optional) - - Returns the created user profile and automatically logs in the user. - """ - try: - # Register user - user = AuthenticationService.register_user( - email=data.email, - password=data.password, - username=data.username, - first_name=data.first_name or '', - last_name=data.last_name or '' - ) - - logger.info(f"New user registered: {user.email}") - return 201, user - - except ValidationError as e: - error_msg = str(e.message_dict) if hasattr(e, 'message_dict') else str(e) - return 400, {"error": "Registration failed", "detail": error_msg} - except Exception as e: - logger.error(f"Registration error: {e}") - return 400, {"error": "Registration failed", "detail": str(e)} - - -@router.post("/login", response={200: TokenResponse, 401: ErrorSchema}) -def login(request: HttpRequest, data: UserLoginRequest): - """ - Login with email and password. - - - **email**: User's email address - - **password**: Password - - **mfa_token**: MFA token (required if MFA is enabled) - - Returns JWT access and refresh tokens on successful authentication. - """ - try: - # Authenticate user - user = AuthenticationService.authenticate_user(data.email, data.password) - - if not user: - return 401, {"error": "Invalid credentials", "detail": "Email or password is incorrect"} - - # Check MFA if enabled - if user.mfa_enabled: - if not data.mfa_token: - return 401, {"error": "MFA required", "detail": "Please provide MFA token"} - - if not MFAService.verify_totp(user, data.mfa_token): - return 401, {"error": "Invalid MFA token", "detail": "The MFA token is invalid"} - - # Generate tokens - refresh = RefreshToken.for_user(user) - - return 200, { - "access": str(refresh.access_token), - "refresh": str(refresh), - "token_type": "Bearer" - } - - except ValidationError as e: - return 401, {"error": "Authentication failed", "detail": str(e)} - except Exception as e: - logger.error(f"Login error: {e}") - return 401, {"error": "Authentication failed", "detail": str(e)} - - -@router.post("/token/refresh", response={200: TokenResponse, 401: ErrorSchema}) -def refresh_token(request: HttpRequest, data: TokenRefreshRequest): - """ - Refresh JWT access token using refresh token. - - - **refresh**: Refresh token - - Returns new access token and optionally a new refresh token. - """ - try: - refresh = RefreshToken(data.refresh) - - return 200, { - "access": str(refresh.access_token), - "refresh": str(refresh), - "token_type": "Bearer" - } - - except TokenError as e: - return 401, {"error": "Invalid token", "detail": str(e)} - except Exception as e: - logger.error(f"Token refresh error: {e}") - return 401, {"error": "Token refresh failed", "detail": str(e)} - - -@router.post("/logout", auth=jwt_auth, response={200: MessageSchema}) -@require_auth -def logout(request: HttpRequest): - """ - Logout (blacklist refresh token). - - Note: Requires authentication. The client should also discard the access token. - """ - # Note: Token blacklisting is handled by djangorestframework-simplejwt - # when BLACKLIST_AFTER_ROTATION is True in settings - return 200, {"message": "Logged out successfully", "success": True} - - -# ============================================================================ -# User Profile Endpoints -# ============================================================================ - -@router.get("/me", auth=jwt_auth, response={200: UserProfileOut, 401: ErrorSchema}) -@require_auth -def get_my_profile(request: HttpRequest): - """ - Get current user's profile. - - Returns detailed profile information for the authenticated user. - """ - user = request.auth - return 200, user - - -@router.patch("/me", auth=jwt_auth, response={200: UserProfileOut, 400: ErrorSchema}) -@require_auth -def update_my_profile(request: HttpRequest, data: UserProfileUpdate): - """ - Update current user's profile. - - - **first_name**: First name (optional) - - **last_name**: Last name (optional) - - **username**: Username (optional) - - **bio**: User biography (optional, max 500 characters) - - **avatar_url**: Avatar image URL (optional) - """ - try: - user = request.auth - - # Prepare update data - update_data = data.dict(exclude_unset=True) - - # Update profile - updated_user = UserManagementService.update_profile(user, **update_data) - - return 200, updated_user - - except ValidationError as e: - return 400, {"error": "Update failed", "detail": str(e)} - except Exception as e: - logger.error(f"Profile update error: {e}") - return 400, {"error": "Update failed", "detail": str(e)} - - -@router.get("/me/role", auth=jwt_auth, response={200: UserRoleOut, 404: ErrorSchema}) -@require_auth -def get_my_role(request: HttpRequest): - """ - Get current user's role. - - Returns role information including permissions. - """ - try: - user = request.auth - role = user.role - - response_data = { - "role": role.role, - "is_moderator": role.is_moderator, - "is_admin": role.is_admin, - "granted_at": role.granted_at, - "granted_by_email": role.granted_by.email if role.granted_by else None - } - - return 200, response_data - - except UserRole.DoesNotExist: - return 404, {"error": "Role not found", "detail": "User role not assigned"} - - -@router.get("/me/permissions", auth=jwt_auth, response={200: UserPermissionsOut}) -@require_auth -def get_my_permissions(request: HttpRequest): - """ - Get current user's permissions. - - Returns a summary of what the user can do. - """ - user = request.auth - permissions = RoleService.get_user_permissions(user) - return 200, permissions - - -@router.get("/me/stats", auth=jwt_auth, response={200: UserStatsOut}) -@require_auth -def get_my_stats(request: HttpRequest): - """ - Get current user's statistics. - - Returns submission stats, reputation score, and activity information. - """ - user = request.auth - stats = UserManagementService.get_user_stats(user) - return 200, stats - - -# ============================================================================ -# User Preferences Endpoints -# ============================================================================ - -@router.get("/me/preferences", auth=jwt_auth, response={200: UserProfilePreferencesOut}) -@require_auth -def get_my_preferences(request: HttpRequest): - """ - Get current user's preferences. - - Returns notification and privacy preferences. - """ - user = request.auth - profile = user.profile - return 200, profile - - -@router.patch("/me/preferences", auth=jwt_auth, response={200: UserProfilePreferencesOut, 400: ErrorSchema}) -@require_auth -def update_my_preferences(request: HttpRequest, data: UserProfilePreferencesUpdate): - """ - Update current user's preferences. - - - **email_notifications**: Receive email notifications - - **email_on_submission_approved**: Email when submissions approved - - **email_on_submission_rejected**: Email when submissions rejected - - **profile_public**: Make profile publicly visible - - **show_email**: Show email on public profile - """ - try: - user = request.auth - - # Prepare update data - update_data = data.dict(exclude_unset=True) - - # Update preferences - updated_profile = UserManagementService.update_preferences(user, **update_data) - - return 200, updated_profile - - except Exception as e: - logger.error(f"Preferences update error: {e}") - return 400, {"error": "Update failed", "detail": str(e)} - - -# ============================================================================ -# Password Management Endpoints -# ============================================================================ - -@router.post("/password/change", auth=jwt_auth, response={200: MessageSchema, 400: ErrorSchema}) -@require_auth -def change_password(request: HttpRequest, data: ChangePasswordRequest): - """ - Change current user's password. - - - **old_password**: Current password (required) - - **new_password**: New password (min 8 characters, required) - - **new_password_confirm**: New password confirmation (required) - """ - try: - user = request.auth - - AuthenticationService.change_password( - user=user, - old_password=data.old_password, - new_password=data.new_password - ) - - return 200, {"message": "Password changed successfully", "success": True} - - except ValidationError as e: - error_msg = str(e.message_dict) if hasattr(e, 'message_dict') else str(e) - return 400, {"error": "Password change failed", "detail": error_msg} - - -@router.post("/password/reset", response={200: MessageSchema}) -def request_password_reset(request: HttpRequest, data: ResetPasswordRequest): - """ - Request password reset email. - - - **email**: User's email address - - Note: This is a placeholder. In production, this should send a reset email. - For now, it returns success regardless of whether the email exists. - """ - # TODO: Implement email sending with password reset token - # For security, always return success even if email doesn't exist - return 200, { - "message": "If the email exists, a password reset link has been sent", - "success": True - } - - -# ============================================================================ -# MFA/2FA Endpoints -# ============================================================================ - -@router.post("/mfa/enable", auth=jwt_auth, response={200: TOTPEnableResponse, 400: ErrorSchema}) -@require_auth -def enable_mfa(request: HttpRequest): - """ - Enable MFA/2FA for current user. - - Returns TOTP secret and QR code URL for authenticator apps. - User must confirm with a valid token to complete setup. - """ - try: - user = request.auth - - # Create TOTP device - device = MFAService.enable_totp(user) - - # Generate QR code URL - issuer = "ThrillWiki" - qr_url = device.config_url - - return 200, { - "secret": device.key, - "qr_code_url": qr_url, - "backup_codes": [] # TODO: Generate backup codes - } - - except Exception as e: - logger.error(f"MFA enable error: {e}") - return 400, {"error": "MFA setup failed", "detail": str(e)} - - -@router.post("/mfa/confirm", auth=jwt_auth, response={200: MessageSchema, 400: ErrorSchema}) -@require_auth -def confirm_mfa(request: HttpRequest, data: TOTPConfirmRequest): - """ - Confirm MFA setup with verification token. - - - **token**: 6-digit TOTP token from authenticator app - - Completes MFA setup after verifying the token is valid. - """ - try: - user = request.auth - - MFAService.confirm_totp(user, data.token) - - return 200, {"message": "MFA enabled successfully", "success": True} - - except ValidationError as e: - return 400, {"error": "Confirmation failed", "detail": str(e)} - - -@router.post("/mfa/disable", auth=jwt_auth, response={200: MessageSchema}) -@require_auth -def disable_mfa(request: HttpRequest): - """ - Disable MFA/2FA for current user. - - Removes all TOTP devices and disables MFA requirement. - """ - user = request.auth - MFAService.disable_totp(user) - - return 200, {"message": "MFA disabled successfully", "success": True} - - -@router.post("/mfa/verify", auth=jwt_auth, response={200: MessageSchema, 400: ErrorSchema}) -@require_auth -def verify_mfa_token(request: HttpRequest, data: TOTPVerifyRequest): - """ - Verify MFA token (for testing). - - - **token**: 6-digit TOTP token - - Returns whether the token is valid. - """ - user = request.auth - - if MFAService.verify_totp(user, data.token): - return 200, {"message": "Token is valid", "success": True} - else: - return 400, {"error": "Invalid token", "detail": "The token is not valid"} - - -# ============================================================================ -# User Management Endpoints (Admin Only) -# ============================================================================ - -@router.get("/users", auth=jwt_auth, response={200: UserListOut, 403: ErrorSchema}) -@require_admin -def list_users( - request: HttpRequest, - page: int = 1, - page_size: int = 50, - search: Optional[str] = None, - role: Optional[str] = None, - banned: Optional[bool] = None -): - """ - List all users (admin only). - - - **page**: Page number (default: 1) - - **page_size**: Items per page (default: 50, max: 100) - - **search**: Search by email or username - - **role**: Filter by role (user, moderator, admin) - - **banned**: Filter by banned status - """ - # Build query - queryset = User.objects.select_related('role').all() - - # Apply filters - if search: - queryset = queryset.filter( - Q(email__icontains=search) | - Q(username__icontains=search) | - Q(first_name__icontains=search) | - Q(last_name__icontains=search) - ) - - if role: - queryset = queryset.filter(role__role=role) - - if banned is not None: - queryset = queryset.filter(banned=banned) - - # Pagination - page_size = min(page_size, 100) # Max 100 items per page - total = queryset.count() - total_pages = (total + page_size - 1) // page_size - - start = (page - 1) * page_size - end = start + page_size - - users = list(queryset[start:end]) - - return 200, { - "items": users, - "total": total, - "page": page, - "page_size": page_size, - "total_pages": total_pages - } - - -@router.get("/users/{user_id}", auth=jwt_auth, response={200: UserProfileOut, 404: ErrorSchema}) -@require_admin -def get_user(request: HttpRequest, user_id: str): - """ - Get user by ID (admin only). - - Returns detailed profile information for the specified user. - """ - try: - user = User.objects.get(id=user_id) - return 200, user - except User.DoesNotExist: - return 404, {"error": "User not found", "detail": f"No user with ID {user_id}"} - - -@router.post("/users/ban", auth=jwt_auth, response={200: MessageSchema, 400: ErrorSchema}) -@require_admin -def ban_user(request: HttpRequest, data: BanUserRequest): - """ - Ban a user (admin only). - - - **user_id**: User ID to ban - - **reason**: Reason for ban - """ - try: - user = User.objects.get(id=data.user_id) - admin = request.auth - - UserManagementService.ban_user(user, data.reason, admin) - - return 200, {"message": f"User {user.email} has been banned", "success": True} - - except User.DoesNotExist: - return 400, {"error": "User not found", "detail": f"No user with ID {data.user_id}"} - - -@router.post("/users/unban", auth=jwt_auth, response={200: MessageSchema, 400: ErrorSchema}) -@require_admin -def unban_user(request: HttpRequest, data: UnbanUserRequest): - """ - Unban a user (admin only). - - - **user_id**: User ID to unban - """ - try: - user = User.objects.get(id=data.user_id) - - UserManagementService.unban_user(user) - - return 200, {"message": f"User {user.email} has been unbanned", "success": True} - - except User.DoesNotExist: - return 400, {"error": "User not found", "detail": f"No user with ID {data.user_id}"} - - -@router.post("/users/assign-role", auth=jwt_auth, response={200: MessageSchema, 400: ErrorSchema}) -@require_admin -def assign_role(request: HttpRequest, data: AssignRoleRequest): - """ - Assign role to user (admin only). - - - **user_id**: User ID - - **role**: Role to assign (user, moderator, admin) - """ - try: - user = User.objects.get(id=data.user_id) - admin = request.auth - - RoleService.assign_role(user, data.role, admin) - - return 200, {"message": f"Role '{data.role}' assigned to {user.email}", "success": True} - - except User.DoesNotExist: - return 400, {"error": "User not found", "detail": f"No user with ID {data.user_id}"} - except ValidationError as e: - return 400, {"error": "Invalid role", "detail": str(e)} diff --git a/django/api/v1/endpoints/companies.py b/django/api/v1/endpoints/companies.py deleted file mode 100644 index 5bf41350..00000000 --- a/django/api/v1/endpoints/companies.py +++ /dev/null @@ -1,254 +0,0 @@ -""" -Company endpoints for API v1. - -Provides CRUD operations for Company entities with filtering and search. -""" -from typing import List, Optional -from uuid import UUID -from django.shortcuts import get_object_or_404 -from django.db.models import Q -from ninja import Router, Query -from ninja.pagination import paginate, PageNumberPagination - -from apps.entities.models import Company -from ..schemas import ( - CompanyCreate, - CompanyUpdate, - CompanyOut, - CompanyListOut, - ErrorResponse -) - - -router = Router(tags=["Companies"]) - - -class CompanyPagination(PageNumberPagination): - """Custom pagination for companies.""" - page_size = 50 - - -@router.get( - "/", - response={200: List[CompanyOut]}, - summary="List companies", - description="Get a paginated list of companies with optional filtering" -) -@paginate(CompanyPagination) -def list_companies( - request, - search: Optional[str] = Query(None, description="Search by company name"), - company_type: Optional[str] = Query(None, description="Filter by company type"), - location_id: Optional[UUID] = Query(None, description="Filter by location"), - ordering: Optional[str] = Query("-created", description="Sort by field (prefix with - for descending)") -): - """ - List all companies with optional filters. - - **Filters:** - - search: Search company names (case-insensitive partial match) - - company_type: Filter by specific company type - - location_id: Filter by headquarters location - - ordering: Sort results (default: -created) - - **Returns:** Paginated list of companies - """ - queryset = Company.objects.all() - - # Apply search filter - if search: - queryset = queryset.filter( - Q(name__icontains=search) | Q(description__icontains=search) - ) - - # Apply company type filter - if company_type: - queryset = queryset.filter(company_types__contains=[company_type]) - - # Apply location filter - if location_id: - queryset = queryset.filter(location_id=location_id) - - # Apply ordering - valid_order_fields = ['name', 'created', 'modified', 'founded_date', 'park_count', 'ride_count'] - order_field = ordering.lstrip('-') - if order_field in valid_order_fields: - queryset = queryset.order_by(ordering) - else: - queryset = queryset.order_by('-created') - - return queryset - - -@router.get( - "/{company_id}", - response={200: CompanyOut, 404: ErrorResponse}, - summary="Get company", - description="Retrieve a single company by ID" -) -def get_company(request, company_id: UUID): - """ - Get a company by ID. - - **Parameters:** - - company_id: UUID of the company - - **Returns:** Company details - """ - company = get_object_or_404(Company, id=company_id) - return company - - -@router.post( - "/", - response={201: CompanyOut, 400: ErrorResponse}, - summary="Create company", - description="Create a new company (requires authentication)" -) -def create_company(request, payload: CompanyCreate): - """ - Create a new company. - - **Authentication:** Required - - **Parameters:** - - payload: Company data - - **Returns:** Created company - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - company = Company.objects.create(**payload.dict()) - return 201, company - - -@router.put( - "/{company_id}", - response={200: CompanyOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Update company", - description="Update an existing company (requires authentication)" -) -def update_company(request, company_id: UUID, payload: CompanyUpdate): - """ - Update a company. - - **Authentication:** Required - - **Parameters:** - - company_id: UUID of the company - - payload: Updated company data - - **Returns:** Updated company - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - company = get_object_or_404(Company, id=company_id) - - # Update only provided fields - for key, value in payload.dict(exclude_unset=True).items(): - setattr(company, key, value) - - company.save() - return company - - -@router.patch( - "/{company_id}", - response={200: CompanyOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Partial update company", - description="Partially update an existing company (requires authentication)" -) -def partial_update_company(request, company_id: UUID, payload: CompanyUpdate): - """ - Partially update a company. - - **Authentication:** Required - - **Parameters:** - - company_id: UUID of the company - - payload: Fields to update - - **Returns:** Updated company - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - company = get_object_or_404(Company, id=company_id) - - # Update only provided fields - for key, value in payload.dict(exclude_unset=True).items(): - setattr(company, key, value) - - company.save() - return company - - -@router.delete( - "/{company_id}", - response={204: None, 404: ErrorResponse}, - summary="Delete company", - description="Delete a company (requires authentication)" -) -def delete_company(request, company_id: UUID): - """ - Delete a company. - - **Authentication:** Required - - **Parameters:** - - company_id: UUID of the company - - **Returns:** No content (204) - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - company = get_object_or_404(Company, id=company_id) - company.delete() - return 204, None - - -@router.get( - "/{company_id}/parks", - response={200: List[dict], 404: ErrorResponse}, - summary="Get company parks", - description="Get all parks operated by a company" -) -def get_company_parks(request, company_id: UUID): - """ - Get parks operated by a company. - - **Parameters:** - - company_id: UUID of the company - - **Returns:** List of parks - """ - company = get_object_or_404(Company, id=company_id) - parks = company.operated_parks.all().values('id', 'name', 'slug', 'status', 'park_type') - return list(parks) - - -@router.get( - "/{company_id}/rides", - response={200: List[dict], 404: ErrorResponse}, - summary="Get company rides", - description="Get all rides manufactured by a company" -) -def get_company_rides(request, company_id: UUID): - """ - Get rides manufactured by a company. - - **Parameters:** - - company_id: UUID of the company - - **Returns:** List of rides - """ - company = get_object_or_404(Company, id=company_id) - rides = company.manufactured_rides.all().values('id', 'name', 'slug', 'status', 'ride_category') - return list(rides) diff --git a/django/api/v1/endpoints/moderation.py b/django/api/v1/endpoints/moderation.py deleted file mode 100644 index aa69df8d..00000000 --- a/django/api/v1/endpoints/moderation.py +++ /dev/null @@ -1,496 +0,0 @@ -""" -Moderation API endpoints. - -Provides REST API for content submission and moderation workflow. -""" -from typing import List, Optional -from uuid import UUID -from ninja import Router -from django.shortcuts import get_object_or_404 -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ValidationError, PermissionDenied - -from apps.moderation.models import ContentSubmission, SubmissionItem -from apps.moderation.services import ModerationService -from api.v1.schemas import ( - ContentSubmissionCreate, - ContentSubmissionOut, - ContentSubmissionDetail, - SubmissionListOut, - StartReviewRequest, - ApproveRequest, - ApproveSelectiveRequest, - RejectRequest, - RejectSelectiveRequest, - ApprovalResponse, - SelectiveApprovalResponse, - SelectiveRejectionResponse, - ErrorResponse, -) - -router = Router(tags=['Moderation']) - - -# ============================================================================ -# Helper Functions -# ============================================================================ - -def _submission_to_dict(submission: ContentSubmission) -> dict: - """Convert submission model to dict for schema.""" - return { - 'id': submission.id, - 'status': submission.status, - 'submission_type': submission.submission_type, - 'title': submission.title, - 'description': submission.description or '', - 'entity_type': submission.entity_type.model, - 'entity_id': submission.entity_id, - 'user_id': submission.user.id, - 'user_email': submission.user.email, - 'locked_by_id': submission.locked_by.id if submission.locked_by else None, - 'locked_by_email': submission.locked_by.email if submission.locked_by else None, - 'locked_at': submission.locked_at, - 'reviewed_by_id': submission.reviewed_by.id if submission.reviewed_by else None, - 'reviewed_by_email': submission.reviewed_by.email if submission.reviewed_by else None, - 'reviewed_at': submission.reviewed_at, - 'rejection_reason': submission.rejection_reason or '', - 'source': submission.source, - 'metadata': submission.metadata, - 'items_count': submission.get_items_count(), - 'approved_items_count': submission.get_approved_items_count(), - 'rejected_items_count': submission.get_rejected_items_count(), - 'created': submission.created, - 'modified': submission.modified, - } - - -def _item_to_dict(item: SubmissionItem) -> dict: - """Convert submission item model to dict for schema.""" - return { - 'id': item.id, - 'submission_id': item.submission.id, - 'field_name': item.field_name, - 'field_label': item.field_label or item.field_name, - 'old_value': item.old_value, - 'new_value': item.new_value, - 'change_type': item.change_type, - 'is_required': item.is_required, - 'order': item.order, - 'status': item.status, - 'reviewed_by_id': item.reviewed_by.id if item.reviewed_by else None, - 'reviewed_by_email': item.reviewed_by.email if item.reviewed_by else None, - 'reviewed_at': item.reviewed_at, - 'rejection_reason': item.rejection_reason or '', - 'old_value_display': item.old_value_display, - 'new_value_display': item.new_value_display, - 'created': item.created, - 'modified': item.modified, - } - - -def _get_entity(entity_type: str, entity_id: UUID): - """Get entity instance from type string and ID.""" - # Map entity type strings to models - type_map = { - 'park': 'entities.Park', - 'ride': 'entities.Ride', - 'company': 'entities.Company', - 'ridemodel': 'entities.RideModel', - } - - app_label, model = type_map.get(entity_type.lower(), '').split('.') - content_type = ContentType.objects.get(app_label=app_label, model=model.lower()) - model_class = content_type.model_class() - - return get_object_or_404(model_class, id=entity_id) - - -# ============================================================================ -# Submission Endpoints -# ============================================================================ - -@router.post('/submissions', response={201: ContentSubmissionOut, 400: ErrorResponse, 401: ErrorResponse}) -def create_submission(request, data: ContentSubmissionCreate): - """ - Create a new content submission. - - Creates a submission with multiple items representing field changes. - If auto_submit is True, the submission is immediately moved to pending state. - """ - # TODO: Require authentication - # For now, use a test user or get from request - from apps.users.models import User - user = User.objects.first() # TEMP: Get first user for testing - - if not user: - return 401, {'detail': 'Authentication required'} - - try: - # Get entity - entity = _get_entity(data.entity_type, data.entity_id) - - # Prepare items data - items_data = [ - { - 'field_name': item.field_name, - 'field_label': item.field_label, - 'old_value': item.old_value, - 'new_value': item.new_value, - 'change_type': item.change_type, - 'is_required': item.is_required, - 'order': item.order, - } - for item in data.items - ] - - # Create submission - submission = ModerationService.create_submission( - user=user, - entity=entity, - submission_type=data.submission_type, - title=data.title, - description=data.description or '', - items_data=items_data, - metadata=data.metadata, - auto_submit=data.auto_submit, - source='api' - ) - - return 201, _submission_to_dict(submission) - - except Exception as e: - return 400, {'detail': str(e)} - - -@router.get('/submissions', response=SubmissionListOut) -def list_submissions( - request, - status: Optional[str] = None, - page: int = 1, - page_size: int = 50 -): - """ - List content submissions with optional filtering. - - Query Parameters: - - status: Filter by status (draft, pending, reviewing, approved, rejected) - - page: Page number (default: 1) - - page_size: Items per page (default: 50, max: 100) - """ - # Validate page_size - page_size = min(page_size, 100) - offset = (page - 1) * page_size - - # Get submissions - submissions = ModerationService.get_queue( - status=status, - limit=page_size, - offset=offset - ) - - # Get total count - total_queryset = ContentSubmission.objects.all() - if status: - total_queryset = total_queryset.filter(status=status) - total = total_queryset.count() - - # Calculate total pages - total_pages = (total + page_size - 1) // page_size - - # Convert to dicts - items = [_submission_to_dict(sub) for sub in submissions] - - return { - 'items': items, - 'total': total, - 'page': page, - 'page_size': page_size, - 'total_pages': total_pages, - } - - -@router.get('/submissions/{submission_id}', response={200: ContentSubmissionDetail, 404: ErrorResponse}) -def get_submission(request, submission_id: UUID): - """ - Get detailed submission information with all items. - """ - try: - submission = ModerationService.get_submission_details(submission_id) - - # Convert to dict with items - data = _submission_to_dict(submission) - data['items'] = [_item_to_dict(item) for item in submission.items.all()] - - return 200, data - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - - -@router.delete('/submissions/{submission_id}', response={204: None, 403: ErrorResponse, 404: ErrorResponse}) -def delete_submission(request, submission_id: UUID): - """ - Delete a submission (only if draft/pending and owned by user). - """ - # TODO: Get current user from request - from apps.users.models import User - user = User.objects.first() # TEMP - - try: - ModerationService.delete_submission(submission_id, user) - return 204, None - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - except PermissionDenied as e: - return 403, {'detail': str(e)} - except ValidationError as e: - return 400, {'detail': str(e)} - - -# ============================================================================ -# Review Endpoints -# ============================================================================ - -@router.post( - '/submissions/{submission_id}/start-review', - response={200: ContentSubmissionOut, 400: ErrorResponse, 403: ErrorResponse, 404: ErrorResponse} -) -def start_review(request, submission_id: UUID, data: StartReviewRequest): - """ - Start reviewing a submission (lock it for 15 minutes). - - Only moderators can start reviews. - """ - # TODO: Get current user (moderator) from request - from apps.users.models import User - user = User.objects.first() # TEMP - - try: - submission = ModerationService.start_review(submission_id, user) - return 200, _submission_to_dict(submission) - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - except PermissionDenied as e: - return 403, {'detail': str(e)} - except ValidationError as e: - return 400, {'detail': str(e)} - - -@router.post( - '/submissions/{submission_id}/approve', - response={200: ApprovalResponse, 400: ErrorResponse, 403: ErrorResponse, 404: ErrorResponse} -) -def approve_submission(request, submission_id: UUID, data: ApproveRequest): - """ - Approve an entire submission and apply all changes. - - Uses atomic transactions - all changes are applied or none are. - Only moderators can approve submissions. - """ - # TODO: Get current user (moderator) from request - from apps.users.models import User - user = User.objects.first() # TEMP - - try: - submission = ModerationService.approve_submission(submission_id, user) - - return 200, { - 'success': True, - 'message': 'Submission approved successfully', - 'submission': _submission_to_dict(submission) - } - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - except PermissionDenied as e: - return 403, {'detail': str(e)} - except ValidationError as e: - return 400, {'detail': str(e)} - - -@router.post( - '/submissions/{submission_id}/approve-selective', - response={200: SelectiveApprovalResponse, 400: ErrorResponse, 403: ErrorResponse, 404: ErrorResponse} -) -def approve_selective(request, submission_id: UUID, data: ApproveSelectiveRequest): - """ - Approve only specific items in a submission. - - Allows moderators to approve some changes while leaving others pending or rejected. - Uses atomic transactions for data integrity. - """ - # TODO: Get current user (moderator) from request - from apps.users.models import User - user = User.objects.first() # TEMP - - try: - result = ModerationService.approve_selective( - submission_id, - user, - [str(item_id) for item_id in data.item_ids] - ) - - return 200, { - 'success': True, - 'message': f"Approved {result['approved']} of {result['total']} items", - **result - } - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - except PermissionDenied as e: - return 403, {'detail': str(e)} - except ValidationError as e: - return 400, {'detail': str(e)} - - -@router.post( - '/submissions/{submission_id}/reject', - response={200: ApprovalResponse, 400: ErrorResponse, 403: ErrorResponse, 404: ErrorResponse} -) -def reject_submission(request, submission_id: UUID, data: RejectRequest): - """ - Reject an entire submission. - - All pending items are rejected with the provided reason. - Only moderators can reject submissions. - """ - # TODO: Get current user (moderator) from request - from apps.users.models import User - user = User.objects.first() # TEMP - - try: - submission = ModerationService.reject_submission(submission_id, user, data.reason) - - return 200, { - 'success': True, - 'message': 'Submission rejected', - 'submission': _submission_to_dict(submission) - } - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - except PermissionDenied as e: - return 403, {'detail': str(e)} - except ValidationError as e: - return 400, {'detail': str(e)} - - -@router.post( - '/submissions/{submission_id}/reject-selective', - response={200: SelectiveRejectionResponse, 400: ErrorResponse, 403: ErrorResponse, 404: ErrorResponse} -) -def reject_selective(request, submission_id: UUID, data: RejectSelectiveRequest): - """ - Reject only specific items in a submission. - - Allows moderators to reject some changes while leaving others pending or approved. - """ - # TODO: Get current user (moderator) from request - from apps.users.models import User - user = User.objects.first() # TEMP - - try: - result = ModerationService.reject_selective( - submission_id, - user, - [str(item_id) for item_id in data.item_ids], - data.reason or '' - ) - - return 200, { - 'success': True, - 'message': f"Rejected {result['rejected']} of {result['total']} items", - **result - } - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - except PermissionDenied as e: - return 403, {'detail': str(e)} - except ValidationError as e: - return 400, {'detail': str(e)} - - -@router.post( - '/submissions/{submission_id}/unlock', - response={200: ContentSubmissionOut, 404: ErrorResponse} -) -def unlock_submission(request, submission_id: UUID): - """ - Manually unlock a submission. - - Removes the review lock. Can be used by moderators or automatically by cleanup tasks. - """ - try: - submission = ModerationService.unlock_submission(submission_id) - return 200, _submission_to_dict(submission) - - except ContentSubmission.DoesNotExist: - return 404, {'detail': 'Submission not found'} - - -# ============================================================================ -# Queue Endpoints -# ============================================================================ - -@router.get('/queue/pending', response=SubmissionListOut) -def get_pending_queue(request, page: int = 1, page_size: int = 50): - """ - Get pending submissions queue. - - Returns all submissions awaiting review. - """ - return list_submissions(request, status='pending', page=page, page_size=page_size) - - -@router.get('/queue/reviewing', response=SubmissionListOut) -def get_reviewing_queue(request, page: int = 1, page_size: int = 50): - """ - Get submissions currently under review. - - Returns all submissions being reviewed by moderators. - """ - return list_submissions(request, status='reviewing', page=page, page_size=page_size) - - -@router.get('/queue/my-submissions', response=SubmissionListOut) -def get_my_submissions(request, page: int = 1, page_size: int = 50): - """ - Get current user's submissions. - - Returns all submissions created by the authenticated user. - """ - # TODO: Get current user from request - from apps.users.models import User - user = User.objects.first() # TEMP - - # Validate page_size - page_size = min(page_size, 100) - offset = (page - 1) * page_size - - # Get user's submissions - submissions = ModerationService.get_queue( - user=user, - limit=page_size, - offset=offset - ) - - # Get total count - total = ContentSubmission.objects.filter(user=user).count() - - # Calculate total pages - total_pages = (total + page_size - 1) // page_size - - # Convert to dicts - items = [_submission_to_dict(sub) for sub in submissions] - - return { - 'items': items, - 'total': total, - 'page': page, - 'page_size': page_size, - 'total_pages': total_pages, - } diff --git a/django/api/v1/endpoints/parks.py b/django/api/v1/endpoints/parks.py deleted file mode 100644 index c1c1d1fd..00000000 --- a/django/api/v1/endpoints/parks.py +++ /dev/null @@ -1,362 +0,0 @@ -""" -Park endpoints for API v1. - -Provides CRUD operations for Park entities with filtering, search, and geographic queries. -Supports both SQLite (lat/lng) and PostGIS (location_point) modes. -""" -from typing import List, Optional -from uuid import UUID -from decimal import Decimal -from django.shortcuts import get_object_or_404 -from django.db.models import Q -from django.conf import settings -from ninja import Router, Query -from ninja.pagination import paginate, PageNumberPagination -import math - -from apps.entities.models import Park, Company, _using_postgis -from ..schemas import ( - ParkCreate, - ParkUpdate, - ParkOut, - ParkListOut, - ErrorResponse -) - - -router = Router(tags=["Parks"]) - - -class ParkPagination(PageNumberPagination): - """Custom pagination for parks.""" - page_size = 50 - - -@router.get( - "/", - response={200: List[ParkOut]}, - summary="List parks", - description="Get a paginated list of parks with optional filtering" -) -@paginate(ParkPagination) -def list_parks( - request, - search: Optional[str] = Query(None, description="Search by park name"), - park_type: Optional[str] = Query(None, description="Filter by park type"), - status: Optional[str] = Query(None, description="Filter by status"), - operator_id: Optional[UUID] = Query(None, description="Filter by operator"), - ordering: Optional[str] = Query("-created", description="Sort by field (prefix with - for descending)") -): - """ - List all parks with optional filters. - - **Filters:** - - search: Search park names (case-insensitive partial match) - - park_type: Filter by park type - - status: Filter by operational status - - operator_id: Filter by operator company - - ordering: Sort results (default: -created) - - **Returns:** Paginated list of parks - """ - queryset = Park.objects.select_related('operator').all() - - # Apply search filter - if search: - queryset = queryset.filter( - Q(name__icontains=search) | Q(description__icontains=search) - ) - - # Apply park type filter - if park_type: - queryset = queryset.filter(park_type=park_type) - - # Apply status filter - if status: - queryset = queryset.filter(status=status) - - # Apply operator filter - if operator_id: - queryset = queryset.filter(operator_id=operator_id) - - # Apply ordering - valid_order_fields = ['name', 'created', 'modified', 'opening_date', 'ride_count', 'coaster_count'] - order_field = ordering.lstrip('-') - if order_field in valid_order_fields: - queryset = queryset.order_by(ordering) - else: - queryset = queryset.order_by('-created') - - # Annotate with operator name - for park in queryset: - park.operator_name = park.operator.name if park.operator else None - - return queryset - - -@router.get( - "/{park_id}", - response={200: ParkOut, 404: ErrorResponse}, - summary="Get park", - description="Retrieve a single park by ID" -) -def get_park(request, park_id: UUID): - """ - Get a park by ID. - - **Parameters:** - - park_id: UUID of the park - - **Returns:** Park details - """ - park = get_object_or_404(Park.objects.select_related('operator'), id=park_id) - park.operator_name = park.operator.name if park.operator else None - park.coordinates = park.coordinates - return park - - -@router.get( - "/nearby/", - response={200: List[ParkOut]}, - summary="Find nearby parks", - description="Find parks within a radius of given coordinates. Uses PostGIS in production, bounding box in SQLite." -) -def find_nearby_parks( - request, - latitude: float = Query(..., description="Latitude coordinate"), - longitude: float = Query(..., description="Longitude coordinate"), - radius: float = Query(50, description="Search radius in kilometers"), - limit: int = Query(50, description="Maximum number of results") -): - """ - Find parks near a geographic point. - - **Geographic Search Modes:** - - **PostGIS (Production)**: Uses accurate distance-based search with location_point field - - **SQLite (Local Dev)**: Uses bounding box approximation with latitude/longitude fields - - **Parameters:** - - latitude: Center point latitude - - longitude: Center point longitude - - radius: Search radius in kilometers (default: 50) - - limit: Maximum results to return (default: 50) - - **Returns:** List of nearby parks - """ - if _using_postgis: - # Use PostGIS for accurate distance-based search - try: - from django.contrib.gis.measure import D - from django.contrib.gis.geos import Point - - user_point = Point(longitude, latitude, srid=4326) - nearby_parks = Park.objects.filter( - location_point__distance_lte=(user_point, D(km=radius)) - ).select_related('operator')[:limit] - except Exception as e: - return {"detail": f"Geographic search error: {str(e)}"}, 500 - else: - # Use bounding box approximation for SQLite - # Calculate rough bounding box (1 degree ≈ 111 km at equator) - lat_offset = radius / 111.0 - lng_offset = radius / (111.0 * math.cos(math.radians(latitude))) - - min_lat = latitude - lat_offset - max_lat = latitude + lat_offset - min_lng = longitude - lng_offset - max_lng = longitude + lng_offset - - nearby_parks = Park.objects.filter( - latitude__gte=Decimal(str(min_lat)), - latitude__lte=Decimal(str(max_lat)), - longitude__gte=Decimal(str(min_lng)), - longitude__lte=Decimal(str(max_lng)) - ).select_related('operator')[:limit] - - # Annotate results - results = [] - for park in nearby_parks: - park.operator_name = park.operator.name if park.operator else None - park.coordinates = park.coordinates - results.append(park) - - return results - - -@router.post( - "/", - response={201: ParkOut, 400: ErrorResponse}, - summary="Create park", - description="Create a new park (requires authentication)" -) -def create_park(request, payload: ParkCreate): - """ - Create a new park. - - **Authentication:** Required - - **Parameters:** - - payload: Park data - - **Returns:** Created park - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - data = payload.dict() - - # Extract coordinates to use set_location method - latitude = data.pop('latitude', None) - longitude = data.pop('longitude', None) - - park = Park.objects.create(**data) - - # Set location using helper method (handles both SQLite and PostGIS) - if latitude is not None and longitude is not None: - park.set_location(longitude, latitude) - park.save() - - park.coordinates = park.coordinates - if park.operator: - park.operator_name = park.operator.name - - return 201, park - - -@router.put( - "/{park_id}", - response={200: ParkOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Update park", - description="Update an existing park (requires authentication)" -) -def update_park(request, park_id: UUID, payload: ParkUpdate): - """ - Update a park. - - **Authentication:** Required - - **Parameters:** - - park_id: UUID of the park - - payload: Updated park data - - **Returns:** Updated park - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - park = get_object_or_404(Park.objects.select_related('operator'), id=park_id) - - data = payload.dict(exclude_unset=True) - - # Handle coordinates separately - latitude = data.pop('latitude', None) - longitude = data.pop('longitude', None) - - # Update other fields - for key, value in data.items(): - setattr(park, key, value) - - # Update location if coordinates provided - if latitude is not None and longitude is not None: - park.set_location(longitude, latitude) - - park.save() - park.operator_name = park.operator.name if park.operator else None - park.coordinates = park.coordinates - - return park - - -@router.patch( - "/{park_id}", - response={200: ParkOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Partial update park", - description="Partially update an existing park (requires authentication)" -) -def partial_update_park(request, park_id: UUID, payload: ParkUpdate): - """ - Partially update a park. - - **Authentication:** Required - - **Parameters:** - - park_id: UUID of the park - - payload: Fields to update - - **Returns:** Updated park - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - park = get_object_or_404(Park.objects.select_related('operator'), id=park_id) - - data = payload.dict(exclude_unset=True) - - # Handle coordinates separately - latitude = data.pop('latitude', None) - longitude = data.pop('longitude', None) - - # Update other fields - for key, value in data.items(): - setattr(park, key, value) - - # Update location if coordinates provided - if latitude is not None and longitude is not None: - park.set_location(longitude, latitude) - - park.save() - park.operator_name = park.operator.name if park.operator else None - park.coordinates = park.coordinates - - return park - - -@router.delete( - "/{park_id}", - response={204: None, 404: ErrorResponse}, - summary="Delete park", - description="Delete a park (requires authentication)" -) -def delete_park(request, park_id: UUID): - """ - Delete a park. - - **Authentication:** Required - - **Parameters:** - - park_id: UUID of the park - - **Returns:** No content (204) - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - park = get_object_or_404(Park, id=park_id) - park.delete() - return 204, None - - -@router.get( - "/{park_id}/rides", - response={200: List[dict], 404: ErrorResponse}, - summary="Get park rides", - description="Get all rides at a park" -) -def get_park_rides(request, park_id: UUID): - """ - Get all rides at a park. - - **Parameters:** - - park_id: UUID of the park - - **Returns:** List of rides - """ - park = get_object_or_404(Park, id=park_id) - rides = park.rides.select_related('manufacturer').all().values( - 'id', 'name', 'slug', 'status', 'ride_category', 'is_coaster', 'manufacturer__name' - ) - return list(rides) diff --git a/django/api/v1/endpoints/photos.py b/django/api/v1/endpoints/photos.py deleted file mode 100644 index 8e96bb6f..00000000 --- a/django/api/v1/endpoints/photos.py +++ /dev/null @@ -1,600 +0,0 @@ -""" -Photo management API endpoints. - -Provides endpoints for photo upload, management, moderation, and entity attachment. -""" - -import logging -from typing import List, Optional -from uuid import UUID - -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ValidationError as DjangoValidationError -from django.db.models import Q, Count, Sum -from django.http import HttpRequest -from ninja import Router, File, Form -from ninja.files import UploadedFile -from ninja.pagination import paginate - -from api.v1.schemas import ( - PhotoOut, - PhotoListOut, - PhotoUpdate, - PhotoUploadResponse, - PhotoModerateRequest, - PhotoReorderRequest, - PhotoAttachRequest, - PhotoStatsOut, - MessageSchema, - ErrorSchema, -) -from apps.media.models import Photo -from apps.media.services import PhotoService, CloudFlareError -from apps.media.validators import validate_image -from apps.users.permissions import jwt_auth, require_moderator, require_admin -from apps.entities.models import Park, Ride, Company, RideModel - -logger = logging.getLogger(__name__) - -router = Router(tags=["Photos"]) -photo_service = PhotoService() - - -# ============================================================================ -# Helper Functions -# ============================================================================ - -def serialize_photo(photo: Photo) -> dict: - """ - Serialize a Photo instance to dict for API response. - - Args: - photo: Photo instance - - Returns: - Dict with photo data - """ - # Get entity info if attached - entity_type = None - entity_id = None - entity_name = None - - if photo.content_type and photo.object_id: - entity = photo.content_object - entity_type = photo.content_type.model - entity_id = str(photo.object_id) - entity_name = getattr(entity, 'name', str(entity)) if entity else None - - # Generate variant URLs - cloudflare_service = photo_service.cloudflare - thumbnail_url = cloudflare_service.get_image_url(photo.cloudflare_image_id, 'thumbnail') - banner_url = cloudflare_service.get_image_url(photo.cloudflare_image_id, 'banner') - - return { - 'id': photo.id, - 'cloudflare_image_id': photo.cloudflare_image_id, - 'cloudflare_url': photo.cloudflare_url, - 'title': photo.title, - 'description': photo.description, - 'credit': photo.credit, - 'photo_type': photo.photo_type, - 'is_visible': photo.is_visible, - 'uploaded_by_id': photo.uploaded_by_id, - 'uploaded_by_email': photo.uploaded_by.email if photo.uploaded_by else None, - 'moderation_status': photo.moderation_status, - 'moderated_by_id': photo.moderated_by_id, - 'moderated_by_email': photo.moderated_by.email if photo.moderated_by else None, - 'moderated_at': photo.moderated_at, - 'moderation_notes': photo.moderation_notes, - 'entity_type': entity_type, - 'entity_id': entity_id, - 'entity_name': entity_name, - 'width': photo.width, - 'height': photo.height, - 'file_size': photo.file_size, - 'mime_type': photo.mime_type, - 'display_order': photo.display_order, - 'thumbnail_url': thumbnail_url, - 'banner_url': banner_url, - 'created': photo.created_at, - 'modified': photo.modified_at, - } - - -def get_entity_by_type(entity_type: str, entity_id: UUID): - """ - Get entity instance by type and ID. - - Args: - entity_type: Entity type (park, ride, company, ridemodel) - entity_id: Entity UUID - - Returns: - Entity instance - - Raises: - ValueError: If entity type is invalid or not found - """ - entity_map = { - 'park': Park, - 'ride': Ride, - 'company': Company, - 'ridemodel': RideModel, - } - - model = entity_map.get(entity_type.lower()) - if not model: - raise ValueError(f"Invalid entity type: {entity_type}") - - try: - return model.objects.get(id=entity_id) - except model.DoesNotExist: - raise ValueError(f"{entity_type} with ID {entity_id} not found") - - -# ============================================================================ -# Public Endpoints -# ============================================================================ - -@router.get("/photos", response=List[PhotoOut], auth=None) -@paginate -def list_photos( - request: HttpRequest, - status: Optional[str] = None, - photo_type: Optional[str] = None, - entity_type: Optional[str] = None, - entity_id: Optional[UUID] = None, -): - """ - List approved photos (public endpoint). - - Query Parameters: - - status: Filter by moderation status (defaults to 'approved') - - photo_type: Filter by photo type - - entity_type: Filter by entity type - - entity_id: Filter by entity ID - """ - queryset = Photo.objects.select_related( - 'uploaded_by', 'moderated_by', 'content_type' - ) - - # Default to approved photos for public - if status: - queryset = queryset.filter(moderation_status=status) - else: - queryset = queryset.approved() - - if photo_type: - queryset = queryset.filter(photo_type=photo_type) - - if entity_type and entity_id: - try: - entity = get_entity_by_type(entity_type, entity_id) - content_type = ContentType.objects.get_for_model(entity) - queryset = queryset.filter( - content_type=content_type, - object_id=entity_id - ) - except ValueError as e: - return [] - - queryset = queryset.filter(is_visible=True).order_by('display_order', '-created_at') - - return queryset - - -@router.get("/photos/{photo_id}", response=PhotoOut, auth=None) -def get_photo(request: HttpRequest, photo_id: UUID): - """ - Get photo details by ID (public endpoint). - - Only returns approved photos for non-authenticated users. - """ - try: - photo = Photo.objects.select_related( - 'uploaded_by', 'moderated_by', 'content_type' - ).get(id=photo_id) - - # Only show approved photos to public - if not request.auth and photo.moderation_status != 'approved': - return 404, {"detail": "Photo not found"} - - return serialize_photo(photo) - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -@router.get("/{entity_type}/{entity_id}/photos", response=List[PhotoOut], auth=None) -def get_entity_photos( - request: HttpRequest, - entity_type: str, - entity_id: UUID, - photo_type: Optional[str] = None, -): - """ - Get photos for a specific entity (public endpoint). - - Path Parameters: - - entity_type: Entity type (park, ride, company, ridemodel) - - entity_id: Entity UUID - - Query Parameters: - - photo_type: Filter by photo type - """ - try: - entity = get_entity_by_type(entity_type, entity_id) - photos = photo_service.get_entity_photos( - entity, - photo_type=photo_type, - approved_only=not request.auth - ) - return [serialize_photo(photo) for photo in photos] - except ValueError as e: - return 404, {"detail": str(e)} - - -# ============================================================================ -# Authenticated Endpoints -# ============================================================================ - -@router.post("/photos/upload", response=PhotoUploadResponse, auth=jwt_auth) -def upload_photo( - request: HttpRequest, - file: UploadedFile = File(...), - title: Optional[str] = Form(None), - description: Optional[str] = Form(None), - credit: Optional[str] = Form(None), - photo_type: str = Form('gallery'), - entity_type: Optional[str] = Form(None), - entity_id: Optional[str] = Form(None), -): - """ - Upload a new photo. - - Requires authentication. Photo enters moderation queue. - - Form Data: - - file: Image file (required) - - title: Photo title - - description: Photo description - - credit: Photo credit/attribution - - photo_type: Type of photo (main, gallery, banner, logo, thumbnail, other) - - entity_type: Entity type to attach to (optional) - - entity_id: Entity ID to attach to (optional) - """ - user = request.auth - - try: - # Validate image - validate_image(file, photo_type) - - # Get entity if provided - entity = None - if entity_type and entity_id: - try: - entity = get_entity_by_type(entity_type, UUID(entity_id)) - except (ValueError, TypeError) as e: - return 400, {"detail": f"Invalid entity: {str(e)}"} - - # Create photo - photo = photo_service.create_photo( - file=file, - user=user, - entity=entity, - photo_type=photo_type, - title=title or file.name, - description=description or '', - credit=credit or '', - is_visible=True, - ) - - return { - 'success': True, - 'message': 'Photo uploaded successfully and pending moderation', - 'photo': serialize_photo(photo), - } - - except DjangoValidationError as e: - return 400, {"detail": str(e)} - except CloudFlareError as e: - logger.error(f"CloudFlare upload failed: {str(e)}") - return 500, {"detail": "Failed to upload image"} - except Exception as e: - logger.error(f"Photo upload failed: {str(e)}") - return 500, {"detail": "An error occurred during upload"} - - -@router.patch("/photos/{photo_id}", response=PhotoOut, auth=jwt_auth) -def update_photo( - request: HttpRequest, - photo_id: UUID, - payload: PhotoUpdate, -): - """ - Update photo metadata. - - Users can only update their own photos. - Moderators can update any photo. - """ - user = request.auth - - try: - photo = Photo.objects.get(id=photo_id) - - # Check permissions - if photo.uploaded_by_id != user.id and not user.is_moderator: - return 403, {"detail": "Permission denied"} - - # Update fields - update_fields = [] - if payload.title is not None: - photo.title = payload.title - update_fields.append('title') - if payload.description is not None: - photo.description = payload.description - update_fields.append('description') - if payload.credit is not None: - photo.credit = payload.credit - update_fields.append('credit') - if payload.photo_type is not None: - photo.photo_type = payload.photo_type - update_fields.append('photo_type') - if payload.is_visible is not None: - photo.is_visible = payload.is_visible - update_fields.append('is_visible') - if payload.display_order is not None: - photo.display_order = payload.display_order - update_fields.append('display_order') - - if update_fields: - photo.save(update_fields=update_fields) - logger.info(f"Photo {photo_id} updated by user {user.id}") - - return serialize_photo(photo) - - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -@router.delete("/photos/{photo_id}", response=MessageSchema, auth=jwt_auth) -def delete_photo(request: HttpRequest, photo_id: UUID): - """ - Delete own photo. - - Users can only delete their own photos. - Photos are soft-deleted and removed from CloudFlare. - """ - user = request.auth - - try: - photo = Photo.objects.get(id=photo_id) - - # Check permissions - if photo.uploaded_by_id != user.id and not user.is_moderator: - return 403, {"detail": "Permission denied"} - - photo_service.delete_photo(photo) - - return { - 'success': True, - 'message': 'Photo deleted successfully', - } - - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -@router.post("/{entity_type}/{entity_id}/photos", response=MessageSchema, auth=jwt_auth) -def attach_photo_to_entity( - request: HttpRequest, - entity_type: str, - entity_id: UUID, - payload: PhotoAttachRequest, -): - """ - Attach an existing photo to an entity. - - Requires authentication. - """ - user = request.auth - - try: - # Get entity - entity = get_entity_by_type(entity_type, entity_id) - - # Get photo - photo = Photo.objects.get(id=payload.photo_id) - - # Check permissions (can only attach own photos unless moderator) - if photo.uploaded_by_id != user.id and not user.is_moderator: - return 403, {"detail": "Permission denied"} - - # Attach photo - photo_service.attach_to_entity(photo, entity) - - # Update photo type if provided - if payload.photo_type: - photo.photo_type = payload.photo_type - photo.save(update_fields=['photo_type']) - - return { - 'success': True, - 'message': f'Photo attached to {entity_type} successfully', - } - - except ValueError as e: - return 400, {"detail": str(e)} - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -# ============================================================================ -# Moderator Endpoints -# ============================================================================ - -@router.get("/photos/pending", response=List[PhotoOut], auth=require_moderator) -@paginate -def list_pending_photos(request: HttpRequest): - """ - List photos pending moderation (moderators only). - """ - queryset = Photo.objects.select_related( - 'uploaded_by', 'moderated_by', 'content_type' - ).pending().order_by('-created_at') - - return queryset - - -@router.post("/photos/{photo_id}/approve", response=PhotoOut, auth=require_moderator) -def approve_photo(request: HttpRequest, photo_id: UUID): - """ - Approve a photo (moderators only). - """ - user = request.auth - - try: - photo = Photo.objects.get(id=photo_id) - photo = photo_service.moderate_photo( - photo=photo, - status='approved', - moderator=user, - ) - - return serialize_photo(photo) - - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -@router.post("/photos/{photo_id}/reject", response=PhotoOut, auth=require_moderator) -def reject_photo( - request: HttpRequest, - photo_id: UUID, - payload: PhotoModerateRequest, -): - """ - Reject a photo (moderators only). - """ - user = request.auth - - try: - photo = Photo.objects.get(id=photo_id) - photo = photo_service.moderate_photo( - photo=photo, - status='rejected', - moderator=user, - notes=payload.notes or '', - ) - - return serialize_photo(photo) - - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -@router.post("/photos/{photo_id}/flag", response=PhotoOut, auth=require_moderator) -def flag_photo( - request: HttpRequest, - photo_id: UUID, - payload: PhotoModerateRequest, -): - """ - Flag a photo for review (moderators only). - """ - user = request.auth - - try: - photo = Photo.objects.get(id=photo_id) - photo = photo_service.moderate_photo( - photo=photo, - status='flagged', - moderator=user, - notes=payload.notes or '', - ) - - return serialize_photo(photo) - - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -@router.get("/photos/stats", response=PhotoStatsOut, auth=require_moderator) -def get_photo_stats(request: HttpRequest): - """ - Get photo statistics (moderators only). - """ - stats = Photo.objects.aggregate( - total=Count('id'), - pending=Count('id', filter=Q(moderation_status='pending')), - approved=Count('id', filter=Q(moderation_status='approved')), - rejected=Count('id', filter=Q(moderation_status='rejected')), - flagged=Count('id', filter=Q(moderation_status='flagged')), - total_size=Sum('file_size'), - ) - - return { - 'total_photos': stats['total'] or 0, - 'pending_photos': stats['pending'] or 0, - 'approved_photos': stats['approved'] or 0, - 'rejected_photos': stats['rejected'] or 0, - 'flagged_photos': stats['flagged'] or 0, - 'total_size_mb': round((stats['total_size'] or 0) / (1024 * 1024), 2), - } - - -# ============================================================================ -# Admin Endpoints -# ============================================================================ - -@router.delete("/photos/{photo_id}/admin", response=MessageSchema, auth=require_admin) -def admin_delete_photo(request: HttpRequest, photo_id: UUID): - """ - Force delete any photo (admins only). - - Permanently removes photo from database and CloudFlare. - """ - try: - photo = Photo.objects.get(id=photo_id) - photo_service.delete_photo(photo, delete_from_cloudflare=True) - - logger.info(f"Photo {photo_id} force deleted by admin {request.auth.id}") - - return { - 'success': True, - 'message': 'Photo permanently deleted', - } - - except Photo.DoesNotExist: - return 404, {"detail": "Photo not found"} - - -@router.post( - "/{entity_type}/{entity_id}/photos/reorder", - response=MessageSchema, - auth=require_admin -) -def reorder_entity_photos( - request: HttpRequest, - entity_type: str, - entity_id: UUID, - payload: PhotoReorderRequest, -): - """ - Reorder photos for an entity (admins only). - """ - try: - entity = get_entity_by_type(entity_type, entity_id) - - photo_service.reorder_photos( - entity=entity, - photo_ids=payload.photo_ids, - photo_type=payload.photo_type, - ) - - return { - 'success': True, - 'message': 'Photos reordered successfully', - } - - except ValueError as e: - return 400, {"detail": str(e)} diff --git a/django/api/v1/endpoints/ride_models.py b/django/api/v1/endpoints/ride_models.py deleted file mode 100644 index a0541ca4..00000000 --- a/django/api/v1/endpoints/ride_models.py +++ /dev/null @@ -1,247 +0,0 @@ -""" -Ride Model endpoints for API v1. - -Provides CRUD operations for RideModel entities with filtering and search. -""" -from typing import List, Optional -from uuid import UUID -from django.shortcuts import get_object_or_404 -from django.db.models import Q -from ninja import Router, Query -from ninja.pagination import paginate, PageNumberPagination - -from apps.entities.models import RideModel, Company -from ..schemas import ( - RideModelCreate, - RideModelUpdate, - RideModelOut, - RideModelListOut, - ErrorResponse -) - - -router = Router(tags=["Ride Models"]) - - -class RideModelPagination(PageNumberPagination): - """Custom pagination for ride models.""" - page_size = 50 - - -@router.get( - "/", - response={200: List[RideModelOut]}, - summary="List ride models", - description="Get a paginated list of ride models with optional filtering" -) -@paginate(RideModelPagination) -def list_ride_models( - request, - search: Optional[str] = Query(None, description="Search by model name"), - manufacturer_id: Optional[UUID] = Query(None, description="Filter by manufacturer"), - model_type: Optional[str] = Query(None, description="Filter by model type"), - ordering: Optional[str] = Query("-created", description="Sort by field (prefix with - for descending)") -): - """ - List all ride models with optional filters. - - **Filters:** - - search: Search model names (case-insensitive partial match) - - manufacturer_id: Filter by manufacturer - - model_type: Filter by model type - - ordering: Sort results (default: -created) - - **Returns:** Paginated list of ride models - """ - queryset = RideModel.objects.select_related('manufacturer').all() - - # Apply search filter - if search: - queryset = queryset.filter( - Q(name__icontains=search) | Q(description__icontains=search) - ) - - # Apply manufacturer filter - if manufacturer_id: - queryset = queryset.filter(manufacturer_id=manufacturer_id) - - # Apply model type filter - if model_type: - queryset = queryset.filter(model_type=model_type) - - # Apply ordering - valid_order_fields = ['name', 'created', 'modified', 'installation_count'] - order_field = ordering.lstrip('-') - if order_field in valid_order_fields: - queryset = queryset.order_by(ordering) - else: - queryset = queryset.order_by('-created') - - # Annotate with manufacturer name - for model in queryset: - model.manufacturer_name = model.manufacturer.name if model.manufacturer else None - - return queryset - - -@router.get( - "/{model_id}", - response={200: RideModelOut, 404: ErrorResponse}, - summary="Get ride model", - description="Retrieve a single ride model by ID" -) -def get_ride_model(request, model_id: UUID): - """ - Get a ride model by ID. - - **Parameters:** - - model_id: UUID of the ride model - - **Returns:** Ride model details - """ - model = get_object_or_404(RideModel.objects.select_related('manufacturer'), id=model_id) - model.manufacturer_name = model.manufacturer.name if model.manufacturer else None - return model - - -@router.post( - "/", - response={201: RideModelOut, 400: ErrorResponse, 404: ErrorResponse}, - summary="Create ride model", - description="Create a new ride model (requires authentication)" -) -def create_ride_model(request, payload: RideModelCreate): - """ - Create a new ride model. - - **Authentication:** Required - - **Parameters:** - - payload: Ride model data - - **Returns:** Created ride model - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - # Verify manufacturer exists - manufacturer = get_object_or_404(Company, id=payload.manufacturer_id) - - model = RideModel.objects.create(**payload.dict()) - model.manufacturer_name = manufacturer.name - return 201, model - - -@router.put( - "/{model_id}", - response={200: RideModelOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Update ride model", - description="Update an existing ride model (requires authentication)" -) -def update_ride_model(request, model_id: UUID, payload: RideModelUpdate): - """ - Update a ride model. - - **Authentication:** Required - - **Parameters:** - - model_id: UUID of the ride model - - payload: Updated ride model data - - **Returns:** Updated ride model - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - model = get_object_or_404(RideModel.objects.select_related('manufacturer'), id=model_id) - - # Update only provided fields - for key, value in payload.dict(exclude_unset=True).items(): - setattr(model, key, value) - - model.save() - model.manufacturer_name = model.manufacturer.name if model.manufacturer else None - return model - - -@router.patch( - "/{model_id}", - response={200: RideModelOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Partial update ride model", - description="Partially update an existing ride model (requires authentication)" -) -def partial_update_ride_model(request, model_id: UUID, payload: RideModelUpdate): - """ - Partially update a ride model. - - **Authentication:** Required - - **Parameters:** - - model_id: UUID of the ride model - - payload: Fields to update - - **Returns:** Updated ride model - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - model = get_object_or_404(RideModel.objects.select_related('manufacturer'), id=model_id) - - # Update only provided fields - for key, value in payload.dict(exclude_unset=True).items(): - setattr(model, key, value) - - model.save() - model.manufacturer_name = model.manufacturer.name if model.manufacturer else None - return model - - -@router.delete( - "/{model_id}", - response={204: None, 404: ErrorResponse}, - summary="Delete ride model", - description="Delete a ride model (requires authentication)" -) -def delete_ride_model(request, model_id: UUID): - """ - Delete a ride model. - - **Authentication:** Required - - **Parameters:** - - model_id: UUID of the ride model - - **Returns:** No content (204) - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - model = get_object_or_404(RideModel, id=model_id) - model.delete() - return 204, None - - -@router.get( - "/{model_id}/installations", - response={200: List[dict], 404: ErrorResponse}, - summary="Get ride model installations", - description="Get all ride installations of this model" -) -def get_ride_model_installations(request, model_id: UUID): - """ - Get all installations of a ride model. - - **Parameters:** - - model_id: UUID of the ride model - - **Returns:** List of rides using this model - """ - model = get_object_or_404(RideModel, id=model_id) - rides = model.rides.select_related('park').all().values( - 'id', 'name', 'slug', 'status', 'park__name', 'park__id' - ) - return list(rides) diff --git a/django/api/v1/endpoints/rides.py b/django/api/v1/endpoints/rides.py deleted file mode 100644 index f1501826..00000000 --- a/django/api/v1/endpoints/rides.py +++ /dev/null @@ -1,360 +0,0 @@ -""" -Ride endpoints for API v1. - -Provides CRUD operations for Ride entities with filtering and search. -""" -from typing import List, Optional -from uuid import UUID -from django.shortcuts import get_object_or_404 -from django.db.models import Q -from ninja import Router, Query -from ninja.pagination import paginate, PageNumberPagination - -from apps.entities.models import Ride, Park, Company, RideModel -from ..schemas import ( - RideCreate, - RideUpdate, - RideOut, - RideListOut, - ErrorResponse -) - - -router = Router(tags=["Rides"]) - - -class RidePagination(PageNumberPagination): - """Custom pagination for rides.""" - page_size = 50 - - -@router.get( - "/", - response={200: List[RideOut]}, - summary="List rides", - description="Get a paginated list of rides with optional filtering" -) -@paginate(RidePagination) -def list_rides( - request, - search: Optional[str] = Query(None, description="Search by ride name"), - park_id: Optional[UUID] = Query(None, description="Filter by park"), - ride_category: Optional[str] = Query(None, description="Filter by ride category"), - status: Optional[str] = Query(None, description="Filter by status"), - is_coaster: Optional[bool] = Query(None, description="Filter for roller coasters only"), - manufacturer_id: Optional[UUID] = Query(None, description="Filter by manufacturer"), - ordering: Optional[str] = Query("-created", description="Sort by field (prefix with - for descending)") -): - """ - List all rides with optional filters. - - **Filters:** - - search: Search ride names (case-insensitive partial match) - - park_id: Filter by park - - ride_category: Filter by ride category - - status: Filter by operational status - - is_coaster: Filter for roller coasters (true/false) - - manufacturer_id: Filter by manufacturer - - ordering: Sort results (default: -created) - - **Returns:** Paginated list of rides - """ - queryset = Ride.objects.select_related('park', 'manufacturer', 'model').all() - - # Apply search filter - if search: - queryset = queryset.filter( - Q(name__icontains=search) | Q(description__icontains=search) - ) - - # Apply park filter - if park_id: - queryset = queryset.filter(park_id=park_id) - - # Apply ride category filter - if ride_category: - queryset = queryset.filter(ride_category=ride_category) - - # Apply status filter - if status: - queryset = queryset.filter(status=status) - - # Apply coaster filter - if is_coaster is not None: - queryset = queryset.filter(is_coaster=is_coaster) - - # Apply manufacturer filter - if manufacturer_id: - queryset = queryset.filter(manufacturer_id=manufacturer_id) - - # Apply ordering - valid_order_fields = ['name', 'created', 'modified', 'opening_date', 'height', 'speed', 'length'] - order_field = ordering.lstrip('-') - if order_field in valid_order_fields: - queryset = queryset.order_by(ordering) - else: - queryset = queryset.order_by('-created') - - # Annotate with related names - for ride in queryset: - ride.park_name = ride.park.name if ride.park else None - ride.manufacturer_name = ride.manufacturer.name if ride.manufacturer else None - ride.model_name = ride.model.name if ride.model else None - - return queryset - - -@router.get( - "/{ride_id}", - response={200: RideOut, 404: ErrorResponse}, - summary="Get ride", - description="Retrieve a single ride by ID" -) -def get_ride(request, ride_id: UUID): - """ - Get a ride by ID. - - **Parameters:** - - ride_id: UUID of the ride - - **Returns:** Ride details - """ - ride = get_object_or_404( - Ride.objects.select_related('park', 'manufacturer', 'model'), - id=ride_id - ) - ride.park_name = ride.park.name if ride.park else None - ride.manufacturer_name = ride.manufacturer.name if ride.manufacturer else None - ride.model_name = ride.model.name if ride.model else None - return ride - - -@router.post( - "/", - response={201: RideOut, 400: ErrorResponse, 404: ErrorResponse}, - summary="Create ride", - description="Create a new ride (requires authentication)" -) -def create_ride(request, payload: RideCreate): - """ - Create a new ride. - - **Authentication:** Required - - **Parameters:** - - payload: Ride data - - **Returns:** Created ride - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - # Verify park exists - park = get_object_or_404(Park, id=payload.park_id) - - # Verify manufacturer if provided - if payload.manufacturer_id: - get_object_or_404(Company, id=payload.manufacturer_id) - - # Verify model if provided - if payload.model_id: - get_object_or_404(RideModel, id=payload.model_id) - - ride = Ride.objects.create(**payload.dict()) - - # Reload with related objects - ride = Ride.objects.select_related('park', 'manufacturer', 'model').get(id=ride.id) - ride.park_name = ride.park.name if ride.park else None - ride.manufacturer_name = ride.manufacturer.name if ride.manufacturer else None - ride.model_name = ride.model.name if ride.model else None - - return 201, ride - - -@router.put( - "/{ride_id}", - response={200: RideOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Update ride", - description="Update an existing ride (requires authentication)" -) -def update_ride(request, ride_id: UUID, payload: RideUpdate): - """ - Update a ride. - - **Authentication:** Required - - **Parameters:** - - ride_id: UUID of the ride - - payload: Updated ride data - - **Returns:** Updated ride - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - ride = get_object_or_404( - Ride.objects.select_related('park', 'manufacturer', 'model'), - id=ride_id - ) - - # Update only provided fields - for key, value in payload.dict(exclude_unset=True).items(): - setattr(ride, key, value) - - ride.save() - - # Reload to get updated relationships - ride = Ride.objects.select_related('park', 'manufacturer', 'model').get(id=ride.id) - ride.park_name = ride.park.name if ride.park else None - ride.manufacturer_name = ride.manufacturer.name if ride.manufacturer else None - ride.model_name = ride.model.name if ride.model else None - - return ride - - -@router.patch( - "/{ride_id}", - response={200: RideOut, 404: ErrorResponse, 400: ErrorResponse}, - summary="Partial update ride", - description="Partially update an existing ride (requires authentication)" -) -def partial_update_ride(request, ride_id: UUID, payload: RideUpdate): - """ - Partially update a ride. - - **Authentication:** Required - - **Parameters:** - - ride_id: UUID of the ride - - payload: Fields to update - - **Returns:** Updated ride - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - ride = get_object_or_404( - Ride.objects.select_related('park', 'manufacturer', 'model'), - id=ride_id - ) - - # Update only provided fields - for key, value in payload.dict(exclude_unset=True).items(): - setattr(ride, key, value) - - ride.save() - - # Reload to get updated relationships - ride = Ride.objects.select_related('park', 'manufacturer', 'model').get(id=ride.id) - ride.park_name = ride.park.name if ride.park else None - ride.manufacturer_name = ride.manufacturer.name if ride.manufacturer else None - ride.model_name = ride.model.name if ride.model else None - - return ride - - -@router.delete( - "/{ride_id}", - response={204: None, 404: ErrorResponse}, - summary="Delete ride", - description="Delete a ride (requires authentication)" -) -def delete_ride(request, ride_id: UUID): - """ - Delete a ride. - - **Authentication:** Required - - **Parameters:** - - ride_id: UUID of the ride - - **Returns:** No content (204) - """ - # TODO: Add authentication check - # if not request.auth: - # return 401, {"detail": "Authentication required"} - - ride = get_object_or_404(Ride, id=ride_id) - ride.delete() - return 204, None - - -@router.get( - "/coasters/", - response={200: List[RideOut]}, - summary="List roller coasters", - description="Get a paginated list of roller coasters only" -) -@paginate(RidePagination) -def list_coasters( - request, - search: Optional[str] = Query(None, description="Search by ride name"), - park_id: Optional[UUID] = Query(None, description="Filter by park"), - status: Optional[str] = Query(None, description="Filter by status"), - manufacturer_id: Optional[UUID] = Query(None, description="Filter by manufacturer"), - min_height: Optional[float] = Query(None, description="Minimum height in feet"), - min_speed: Optional[float] = Query(None, description="Minimum speed in mph"), - ordering: Optional[str] = Query("-height", description="Sort by field (prefix with - for descending)") -): - """ - List only roller coasters with optional filters. - - **Filters:** - - search: Search coaster names - - park_id: Filter by park - - status: Filter by operational status - - manufacturer_id: Filter by manufacturer - - min_height: Minimum height filter - - min_speed: Minimum speed filter - - ordering: Sort results (default: -height) - - **Returns:** Paginated list of roller coasters - """ - queryset = Ride.objects.filter(is_coaster=True).select_related( - 'park', 'manufacturer', 'model' - ) - - # Apply search filter - if search: - queryset = queryset.filter( - Q(name__icontains=search) | Q(description__icontains=search) - ) - - # Apply park filter - if park_id: - queryset = queryset.filter(park_id=park_id) - - # Apply status filter - if status: - queryset = queryset.filter(status=status) - - # Apply manufacturer filter - if manufacturer_id: - queryset = queryset.filter(manufacturer_id=manufacturer_id) - - # Apply height filter - if min_height is not None: - queryset = queryset.filter(height__gte=min_height) - - # Apply speed filter - if min_speed is not None: - queryset = queryset.filter(speed__gte=min_speed) - - # Apply ordering - valid_order_fields = ['name', 'height', 'speed', 'length', 'opening_date', 'inversions'] - order_field = ordering.lstrip('-') - if order_field in valid_order_fields: - queryset = queryset.order_by(ordering) - else: - queryset = queryset.order_by('-height') - - # Annotate with related names - for ride in queryset: - ride.park_name = ride.park.name if ride.park else None - ride.manufacturer_name = ride.manufacturer.name if ride.manufacturer else None - ride.model_name = ride.model.name if ride.model else None - - return queryset diff --git a/django/api/v1/endpoints/search.py b/django/api/v1/endpoints/search.py deleted file mode 100644 index ecc1f01d..00000000 --- a/django/api/v1/endpoints/search.py +++ /dev/null @@ -1,438 +0,0 @@ -""" -Search and autocomplete endpoints for ThrillWiki API. - -Provides full-text search and filtering across all entity types. -""" -from typing import List, Optional -from uuid import UUID -from datetime import date -from decimal import Decimal - -from django.http import HttpRequest -from ninja import Router, Query - -from apps.entities.search import SearchService -from apps.users.permissions import jwt_auth -from api.v1.schemas import ( - GlobalSearchResponse, - CompanySearchResult, - RideModelSearchResult, - ParkSearchResult, - RideSearchResult, - AutocompleteResponse, - AutocompleteItem, - ErrorResponse, -) - -router = Router(tags=["Search"]) -search_service = SearchService() - - -# ============================================================================ -# Helper Functions -# ============================================================================ - -def _company_to_search_result(company) -> CompanySearchResult: - """Convert Company model to search result.""" - return CompanySearchResult( - id=company.id, - name=company.name, - slug=company.slug, - entity_type='company', - description=company.description, - image_url=company.logo_image_url or None, - company_types=company.company_types or [], - park_count=company.park_count, - ride_count=company.ride_count, - ) - - -def _ride_model_to_search_result(model) -> RideModelSearchResult: - """Convert RideModel to search result.""" - return RideModelSearchResult( - id=model.id, - name=model.name, - slug=model.slug, - entity_type='ride_model', - description=model.description, - image_url=model.image_url or None, - manufacturer_name=model.manufacturer.name if model.manufacturer else '', - model_type=model.model_type, - installation_count=model.installation_count, - ) - - -def _park_to_search_result(park) -> ParkSearchResult: - """Convert Park model to search result.""" - return ParkSearchResult( - id=park.id, - name=park.name, - slug=park.slug, - entity_type='park', - description=park.description, - image_url=park.banner_image_url or park.logo_image_url or None, - park_type=park.park_type, - status=park.status, - operator_name=park.operator.name if park.operator else None, - ride_count=park.ride_count, - coaster_count=park.coaster_count, - coordinates=park.coordinates, - ) - - -def _ride_to_search_result(ride) -> RideSearchResult: - """Convert Ride model to search result.""" - return RideSearchResult( - id=ride.id, - name=ride.name, - slug=ride.slug, - entity_type='ride', - description=ride.description, - image_url=ride.image_url or None, - park_name=ride.park.name if ride.park else '', - park_slug=ride.park.slug if ride.park else '', - manufacturer_name=ride.manufacturer.name if ride.manufacturer else None, - ride_category=ride.ride_category, - status=ride.status, - is_coaster=ride.is_coaster, - ) - - -# ============================================================================ -# Search Endpoints -# ============================================================================ - -@router.get( - "", - response={200: GlobalSearchResponse, 400: ErrorResponse}, - summary="Global search across all entities" -) -def search_all( - request: HttpRequest, - q: str = Query(..., min_length=2, max_length=200, description="Search query"), - entity_types: Optional[List[str]] = Query(None, description="Filter by entity types (company, ride_model, park, ride)"), - limit: int = Query(20, ge=1, le=100, description="Maximum results per entity type"), -): - """ - Search across all entity types with full-text search. - - - **q**: Search query (minimum 2 characters) - - **entity_types**: Optional list of entity types to search (defaults to all) - - **limit**: Maximum results per entity type (1-100, default 20) - - Returns results grouped by entity type. - """ - try: - results = search_service.search_all( - query=q, - entity_types=entity_types, - limit=limit - ) - - # Convert to schema objects - response_data = { - 'query': q, - 'total_results': 0, - 'companies': [], - 'ride_models': [], - 'parks': [], - 'rides': [], - } - - if 'companies' in results: - response_data['companies'] = [ - _company_to_search_result(c) for c in results['companies'] - ] - response_data['total_results'] += len(response_data['companies']) - - if 'ride_models' in results: - response_data['ride_models'] = [ - _ride_model_to_search_result(m) for m in results['ride_models'] - ] - response_data['total_results'] += len(response_data['ride_models']) - - if 'parks' in results: - response_data['parks'] = [ - _park_to_search_result(p) for p in results['parks'] - ] - response_data['total_results'] += len(response_data['parks']) - - if 'rides' in results: - response_data['rides'] = [ - _ride_to_search_result(r) for r in results['rides'] - ] - response_data['total_results'] += len(response_data['rides']) - - return GlobalSearchResponse(**response_data) - - except Exception as e: - return 400, ErrorResponse(detail=str(e)) - - -@router.get( - "/companies", - response={200: List[CompanySearchResult], 400: ErrorResponse}, - summary="Search companies" -) -def search_companies( - request: HttpRequest, - q: str = Query(..., min_length=2, max_length=200, description="Search query"), - company_types: Optional[List[str]] = Query(None, description="Filter by company types"), - founded_after: Optional[date] = Query(None, description="Founded after date"), - founded_before: Optional[date] = Query(None, description="Founded before date"), - limit: int = Query(20, ge=1, le=100, description="Maximum results"), -): - """ - Search companies with optional filters. - - - **q**: Search query - - **company_types**: Filter by types (manufacturer, operator, designer, etc.) - - **founded_after/before**: Filter by founding date range - - **limit**: Maximum results (1-100, default 20) - """ - try: - filters = {} - if company_types: - filters['company_types'] = company_types - if founded_after: - filters['founded_after'] = founded_after - if founded_before: - filters['founded_before'] = founded_before - - results = search_service.search_companies( - query=q, - filters=filters if filters else None, - limit=limit - ) - - return [_company_to_search_result(c) for c in results] - - except Exception as e: - return 400, ErrorResponse(detail=str(e)) - - -@router.get( - "/ride-models", - response={200: List[RideModelSearchResult], 400: ErrorResponse}, - summary="Search ride models" -) -def search_ride_models( - request: HttpRequest, - q: str = Query(..., min_length=2, max_length=200, description="Search query"), - manufacturer_id: Optional[UUID] = Query(None, description="Filter by manufacturer"), - model_type: Optional[str] = Query(None, description="Filter by model type"), - limit: int = Query(20, ge=1, le=100, description="Maximum results"), -): - """ - Search ride models with optional filters. - - - **q**: Search query - - **manufacturer_id**: Filter by specific manufacturer - - **model_type**: Filter by model type - - **limit**: Maximum results (1-100, default 20) - """ - try: - filters = {} - if manufacturer_id: - filters['manufacturer_id'] = manufacturer_id - if model_type: - filters['model_type'] = model_type - - results = search_service.search_ride_models( - query=q, - filters=filters if filters else None, - limit=limit - ) - - return [_ride_model_to_search_result(m) for m in results] - - except Exception as e: - return 400, ErrorResponse(detail=str(e)) - - -@router.get( - "/parks", - response={200: List[ParkSearchResult], 400: ErrorResponse}, - summary="Search parks" -) -def search_parks( - request: HttpRequest, - q: str = Query(..., min_length=2, max_length=200, description="Search query"), - status: Optional[str] = Query(None, description="Filter by status"), - park_type: Optional[str] = Query(None, description="Filter by park type"), - operator_id: Optional[UUID] = Query(None, description="Filter by operator"), - opening_after: Optional[date] = Query(None, description="Opened after date"), - opening_before: Optional[date] = Query(None, description="Opened before date"), - latitude: Optional[float] = Query(None, description="Search center latitude"), - longitude: Optional[float] = Query(None, description="Search center longitude"), - radius: Optional[float] = Query(None, ge=0, le=500, description="Search radius in km (PostGIS only)"), - limit: int = Query(20, ge=1, le=100, description="Maximum results"), -): - """ - Search parks with optional filters including location-based search. - - - **q**: Search query - - **status**: Filter by operational status - - **park_type**: Filter by park type - - **operator_id**: Filter by operator company - - **opening_after/before**: Filter by opening date range - - **latitude/longitude/radius**: Location-based filtering (PostGIS only) - - **limit**: Maximum results (1-100, default 20) - """ - try: - filters = {} - if status: - filters['status'] = status - if park_type: - filters['park_type'] = park_type - if operator_id: - filters['operator_id'] = operator_id - if opening_after: - filters['opening_after'] = opening_after - if opening_before: - filters['opening_before'] = opening_before - - # Location-based search (PostGIS only) - if latitude is not None and longitude is not None and radius is not None: - filters['location'] = (longitude, latitude) - filters['radius'] = radius - - results = search_service.search_parks( - query=q, - filters=filters if filters else None, - limit=limit - ) - - return [_park_to_search_result(p) for p in results] - - except Exception as e: - return 400, ErrorResponse(detail=str(e)) - - -@router.get( - "/rides", - response={200: List[RideSearchResult], 400: ErrorResponse}, - summary="Search rides" -) -def search_rides( - request: HttpRequest, - q: str = Query(..., min_length=2, max_length=200, description="Search query"), - park_id: Optional[UUID] = Query(None, description="Filter by park"), - manufacturer_id: Optional[UUID] = Query(None, description="Filter by manufacturer"), - model_id: Optional[UUID] = Query(None, description="Filter by model"), - status: Optional[str] = Query(None, description="Filter by status"), - ride_category: Optional[str] = Query(None, description="Filter by category"), - is_coaster: Optional[bool] = Query(None, description="Filter coasters only"), - opening_after: Optional[date] = Query(None, description="Opened after date"), - opening_before: Optional[date] = Query(None, description="Opened before date"), - min_height: Optional[Decimal] = Query(None, description="Minimum height in feet"), - max_height: Optional[Decimal] = Query(None, description="Maximum height in feet"), - min_speed: Optional[Decimal] = Query(None, description="Minimum speed in mph"), - max_speed: Optional[Decimal] = Query(None, description="Maximum speed in mph"), - limit: int = Query(20, ge=1, le=100, description="Maximum results"), -): - """ - Search rides with extensive filtering options. - - - **q**: Search query - - **park_id**: Filter by specific park - - **manufacturer_id**: Filter by manufacturer - - **model_id**: Filter by specific ride model - - **status**: Filter by operational status - - **ride_category**: Filter by category (roller_coaster, flat_ride, etc.) - - **is_coaster**: Filter to show only coasters - - **opening_after/before**: Filter by opening date range - - **min_height/max_height**: Filter by height range (feet) - - **min_speed/max_speed**: Filter by speed range (mph) - - **limit**: Maximum results (1-100, default 20) - """ - try: - filters = {} - if park_id: - filters['park_id'] = park_id - if manufacturer_id: - filters['manufacturer_id'] = manufacturer_id - if model_id: - filters['model_id'] = model_id - if status: - filters['status'] = status - if ride_category: - filters['ride_category'] = ride_category - if is_coaster is not None: - filters['is_coaster'] = is_coaster - if opening_after: - filters['opening_after'] = opening_after - if opening_before: - filters['opening_before'] = opening_before - if min_height: - filters['min_height'] = min_height - if max_height: - filters['max_height'] = max_height - if min_speed: - filters['min_speed'] = min_speed - if max_speed: - filters['max_speed'] = max_speed - - results = search_service.search_rides( - query=q, - filters=filters if filters else None, - limit=limit - ) - - return [_ride_to_search_result(r) for r in results] - - except Exception as e: - return 400, ErrorResponse(detail=str(e)) - - -# ============================================================================ -# Autocomplete Endpoint -# ============================================================================ - -@router.get( - "/autocomplete", - response={200: AutocompleteResponse, 400: ErrorResponse}, - summary="Autocomplete suggestions" -) -def autocomplete( - request: HttpRequest, - q: str = Query(..., min_length=2, max_length=100, description="Partial search query"), - entity_type: Optional[str] = Query(None, description="Filter by entity type (company, park, ride, ride_model)"), - limit: int = Query(10, ge=1, le=20, description="Maximum suggestions"), -): - """ - Get autocomplete suggestions for search. - - - **q**: Partial query (minimum 2 characters) - - **entity_type**: Optional entity type filter - - **limit**: Maximum suggestions (1-20, default 10) - - Returns quick name-based suggestions for autocomplete UIs. - """ - try: - suggestions = search_service.autocomplete( - query=q, - entity_type=entity_type, - limit=limit - ) - - # Convert to schema objects - items = [ - AutocompleteItem( - id=s['id'], - name=s['name'], - slug=s['slug'], - entity_type=s['entity_type'], - park_name=s.get('park_name'), - manufacturer_name=s.get('manufacturer_name'), - ) - for s in suggestions - ] - - return AutocompleteResponse( - query=q, - suggestions=items - ) - - except Exception as e: - return 400, ErrorResponse(detail=str(e)) diff --git a/django/api/v1/endpoints/versioning.py b/django/api/v1/endpoints/versioning.py deleted file mode 100644 index fa9244c2..00000000 --- a/django/api/v1/endpoints/versioning.py +++ /dev/null @@ -1,369 +0,0 @@ -""" -Versioning API endpoints for ThrillWiki. - -Provides REST API for: -- Version history for entities -- Specific version details -- Comparing versions -- Diff with current state -- Version restoration (optional) -""" - -from typing import List -from uuid import UUID -from django.shortcuts import get_object_or_404 -from django.http import Http404 -from ninja import Router - -from apps.entities.models import Park, Ride, Company, RideModel -from apps.versioning.models import EntityVersion -from apps.versioning.services import VersionService -from api.v1.schemas import ( - EntityVersionSchema, - VersionHistoryResponseSchema, - VersionDiffSchema, - VersionComparisonSchema, - ErrorSchema, - MessageSchema -) - -router = Router(tags=['Versioning']) - - -# Park Versions - -@router.get( - '/parks/{park_id}/versions', - response={200: VersionHistoryResponseSchema, 404: ErrorSchema}, - summary="Get park version history" -) -def get_park_versions(request, park_id: UUID, limit: int = 50): - """ - Get version history for a park. - - Returns up to `limit` versions in reverse chronological order (newest first). - """ - park = get_object_or_404(Park, id=park_id) - versions = VersionService.get_version_history(park, limit=limit) - - return { - 'entity_id': str(park.id), - 'entity_type': 'park', - 'entity_name': park.name, - 'total_versions': VersionService.get_version_count(park), - 'versions': [ - EntityVersionSchema.from_orm(v) for v in versions - ] - } - - -@router.get( - '/parks/{park_id}/versions/{version_number}', - response={200: EntityVersionSchema, 404: ErrorSchema}, - summary="Get specific park version" -) -def get_park_version(request, park_id: UUID, version_number: int): - """Get a specific version of a park by version number.""" - park = get_object_or_404(Park, id=park_id) - version = VersionService.get_version_by_number(park, version_number) - - if not version: - raise Http404("Version not found") - - return EntityVersionSchema.from_orm(version) - - -@router.get( - '/parks/{park_id}/versions/{version_number}/diff', - response={200: VersionDiffSchema, 404: ErrorSchema}, - summary="Compare park version with current" -) -def get_park_version_diff(request, park_id: UUID, version_number: int): - """ - Compare a specific version with the current park state. - - Returns the differences between the version and current values. - """ - park = get_object_or_404(Park, id=park_id) - version = VersionService.get_version_by_number(park, version_number) - - if not version: - raise Http404("Version not found") - - diff = VersionService.get_diff_with_current(version) - - return { - 'entity_id': str(park.id), - 'entity_type': 'park', - 'entity_name': park.name, - 'version_number': version.version_number, - 'version_date': version.created, - 'differences': diff['differences'], - 'changed_field_count': diff['changed_field_count'] - } - - -# Ride Versions - -@router.get( - '/rides/{ride_id}/versions', - response={200: VersionHistoryResponseSchema, 404: ErrorSchema}, - summary="Get ride version history" -) -def get_ride_versions(request, ride_id: UUID, limit: int = 50): - """Get version history for a ride.""" - ride = get_object_or_404(Ride, id=ride_id) - versions = VersionService.get_version_history(ride, limit=limit) - - return { - 'entity_id': str(ride.id), - 'entity_type': 'ride', - 'entity_name': ride.name, - 'total_versions': VersionService.get_version_count(ride), - 'versions': [ - EntityVersionSchema.from_orm(v) for v in versions - ] - } - - -@router.get( - '/rides/{ride_id}/versions/{version_number}', - response={200: EntityVersionSchema, 404: ErrorSchema}, - summary="Get specific ride version" -) -def get_ride_version(request, ride_id: UUID, version_number: int): - """Get a specific version of a ride by version number.""" - ride = get_object_or_404(Ride, id=ride_id) - version = VersionService.get_version_by_number(ride, version_number) - - if not version: - raise Http404("Version not found") - - return EntityVersionSchema.from_orm(version) - - -@router.get( - '/rides/{ride_id}/versions/{version_number}/diff', - response={200: VersionDiffSchema, 404: ErrorSchema}, - summary="Compare ride version with current" -) -def get_ride_version_diff(request, ride_id: UUID, version_number: int): - """Compare a specific version with the current ride state.""" - ride = get_object_or_404(Ride, id=ride_id) - version = VersionService.get_version_by_number(ride, version_number) - - if not version: - raise Http404("Version not found") - - diff = VersionService.get_diff_with_current(version) - - return { - 'entity_id': str(ride.id), - 'entity_type': 'ride', - 'entity_name': ride.name, - 'version_number': version.version_number, - 'version_date': version.created, - 'differences': diff['differences'], - 'changed_field_count': diff['changed_field_count'] - } - - -# Company Versions - -@router.get( - '/companies/{company_id}/versions', - response={200: VersionHistoryResponseSchema, 404: ErrorSchema}, - summary="Get company version history" -) -def get_company_versions(request, company_id: UUID, limit: int = 50): - """Get version history for a company.""" - company = get_object_or_404(Company, id=company_id) - versions = VersionService.get_version_history(company, limit=limit) - - return { - 'entity_id': str(company.id), - 'entity_type': 'company', - 'entity_name': company.name, - 'total_versions': VersionService.get_version_count(company), - 'versions': [ - EntityVersionSchema.from_orm(v) for v in versions - ] - } - - -@router.get( - '/companies/{company_id}/versions/{version_number}', - response={200: EntityVersionSchema, 404: ErrorSchema}, - summary="Get specific company version" -) -def get_company_version(request, company_id: UUID, version_number: int): - """Get a specific version of a company by version number.""" - company = get_object_or_404(Company, id=company_id) - version = VersionService.get_version_by_number(company, version_number) - - if not version: - raise Http404("Version not found") - - return EntityVersionSchema.from_orm(version) - - -@router.get( - '/companies/{company_id}/versions/{version_number}/diff', - response={200: VersionDiffSchema, 404: ErrorSchema}, - summary="Compare company version with current" -) -def get_company_version_diff(request, company_id: UUID, version_number: int): - """Compare a specific version with the current company state.""" - company = get_object_or_404(Company, id=company_id) - version = VersionService.get_version_by_number(company, version_number) - - if not version: - raise Http404("Version not found") - - diff = VersionService.get_diff_with_current(version) - - return { - 'entity_id': str(company.id), - 'entity_type': 'company', - 'entity_name': company.name, - 'version_number': version.version_number, - 'version_date': version.created, - 'differences': diff['differences'], - 'changed_field_count': diff['changed_field_count'] - } - - -# Ride Model Versions - -@router.get( - '/ride-models/{model_id}/versions', - response={200: VersionHistoryResponseSchema, 404: ErrorSchema}, - summary="Get ride model version history" -) -def get_ride_model_versions(request, model_id: UUID, limit: int = 50): - """Get version history for a ride model.""" - model = get_object_or_404(RideModel, id=model_id) - versions = VersionService.get_version_history(model, limit=limit) - - return { - 'entity_id': str(model.id), - 'entity_type': 'ride_model', - 'entity_name': str(model), - 'total_versions': VersionService.get_version_count(model), - 'versions': [ - EntityVersionSchema.from_orm(v) for v in versions - ] - } - - -@router.get( - '/ride-models/{model_id}/versions/{version_number}', - response={200: EntityVersionSchema, 404: ErrorSchema}, - summary="Get specific ride model version" -) -def get_ride_model_version(request, model_id: UUID, version_number: int): - """Get a specific version of a ride model by version number.""" - model = get_object_or_404(RideModel, id=model_id) - version = VersionService.get_version_by_number(model, version_number) - - if not version: - raise Http404("Version not found") - - return EntityVersionSchema.from_orm(version) - - -@router.get( - '/ride-models/{model_id}/versions/{version_number}/diff', - response={200: VersionDiffSchema, 404: ErrorSchema}, - summary="Compare ride model version with current" -) -def get_ride_model_version_diff(request, model_id: UUID, version_number: int): - """Compare a specific version with the current ride model state.""" - model = get_object_or_404(RideModel, id=model_id) - version = VersionService.get_version_by_number(model, version_number) - - if not version: - raise Http404("Version not found") - - diff = VersionService.get_diff_with_current(version) - - return { - 'entity_id': str(model.id), - 'entity_type': 'ride_model', - 'entity_name': str(model), - 'version_number': version.version_number, - 'version_date': version.created, - 'differences': diff['differences'], - 'changed_field_count': diff['changed_field_count'] - } - - -# Generic Version Endpoints - -@router.get( - '/versions/{version_id}', - response={200: EntityVersionSchema, 404: ErrorSchema}, - summary="Get version by ID" -) -def get_version(request, version_id: UUID): - """Get a specific version by its ID.""" - version = get_object_or_404(EntityVersion, id=version_id) - return EntityVersionSchema.from_orm(version) - - -@router.get( - '/versions/{version_id}/compare/{other_version_id}', - response={200: VersionComparisonSchema, 404: ErrorSchema}, - summary="Compare two versions" -) -def compare_versions(request, version_id: UUID, other_version_id: UUID): - """ - Compare two versions of the same entity. - - Both versions must be for the same entity. - """ - version1 = get_object_or_404(EntityVersion, id=version_id) - version2 = get_object_or_404(EntityVersion, id=other_version_id) - - comparison = VersionService.compare_versions(version1, version2) - - return { - 'version1': EntityVersionSchema.from_orm(version1), - 'version2': EntityVersionSchema.from_orm(version2), - 'differences': comparison['differences'], - 'changed_field_count': comparison['changed_field_count'] - } - - -# Optional: Version Restoration -# Uncomment if you want to enable version restoration via API - -# @router.post( -# '/versions/{version_id}/restore', -# response={200: MessageSchema, 404: ErrorSchema}, -# summary="Restore a version" -# ) -# def restore_version(request, version_id: UUID): -# """ -# Restore an entity to a previous version. -# -# This creates a new version with change_type='restored'. -# Requires authentication and appropriate permissions. -# """ -# version = get_object_or_404(EntityVersion, id=version_id) -# -# # Check authentication -# if not request.user.is_authenticated: -# return 401, {'error': 'Authentication required'} -# -# # Restore version -# restored_version = VersionService.restore_version( -# version, -# user=request.user, -# comment='Restored via API' -# ) -# -# return { -# 'message': f'Successfully restored to version {version.version_number}', -# 'new_version_number': restored_version.version_number -# } diff --git a/django/api/v1/schemas.py b/django/api/v1/schemas.py deleted file mode 100644 index 414d7ede..00000000 --- a/django/api/v1/schemas.py +++ /dev/null @@ -1,969 +0,0 @@ -""" -Pydantic schemas for API v1 endpoints. - -These schemas define the structure of request and response data for the REST API. -""" -from datetime import date, datetime -from typing import Optional, List -from decimal import Decimal -from pydantic import BaseModel, Field, field_validator -from uuid import UUID - - -# ============================================================================ -# Base Schemas -# ============================================================================ - -class TimestampSchema(BaseModel): - """Base schema with timestamps.""" - created: datetime - modified: datetime - - -# ============================================================================ -# Company Schemas -# ============================================================================ - -class CompanyBase(BaseModel): - """Base company schema with common fields.""" - name: str = Field(..., min_length=1, max_length=255) - description: Optional[str] = None - company_types: List[str] = Field(default_factory=list) - founded_date: Optional[date] = None - founded_date_precision: str = Field(default='day') - closed_date: Optional[date] = None - closed_date_precision: str = Field(default='day') - website: Optional[str] = None - logo_image_id: Optional[str] = None - logo_image_url: Optional[str] = None - - -class CompanyCreate(CompanyBase): - """Schema for creating a company.""" - pass - - -class CompanyUpdate(BaseModel): - """Schema for updating a company (all fields optional).""" - name: Optional[str] = Field(None, min_length=1, max_length=255) - description: Optional[str] = None - company_types: Optional[List[str]] = None - founded_date: Optional[date] = None - founded_date_precision: Optional[str] = None - closed_date: Optional[date] = None - closed_date_precision: Optional[str] = None - website: Optional[str] = None - logo_image_id: Optional[str] = None - logo_image_url: Optional[str] = None - - -class CompanyOut(CompanyBase, TimestampSchema): - """Schema for company output.""" - id: UUID - slug: str - park_count: int - ride_count: int - - class Config: - from_attributes = True - - -# ============================================================================ -# RideModel Schemas -# ============================================================================ - -class RideModelBase(BaseModel): - """Base ride model schema.""" - name: str = Field(..., min_length=1, max_length=255) - description: Optional[str] = None - manufacturer_id: UUID - model_type: str - typical_height: Optional[Decimal] = None - typical_speed: Optional[Decimal] = None - typical_capacity: Optional[int] = None - image_id: Optional[str] = None - image_url: Optional[str] = None - - -class RideModelCreate(RideModelBase): - """Schema for creating a ride model.""" - pass - - -class RideModelUpdate(BaseModel): - """Schema for updating a ride model (all fields optional).""" - name: Optional[str] = Field(None, min_length=1, max_length=255) - description: Optional[str] = None - manufacturer_id: Optional[UUID] = None - model_type: Optional[str] = None - typical_height: Optional[Decimal] = None - typical_speed: Optional[Decimal] = None - typical_capacity: Optional[int] = None - image_id: Optional[str] = None - image_url: Optional[str] = None - - -class RideModelOut(RideModelBase, TimestampSchema): - """Schema for ride model output.""" - id: UUID - slug: str - installation_count: int - manufacturer_name: Optional[str] = None - - class Config: - from_attributes = True - - -# ============================================================================ -# Park Schemas -# ============================================================================ - -class ParkBase(BaseModel): - """Base park schema.""" - name: str = Field(..., min_length=1, max_length=255) - description: Optional[str] = None - park_type: str - status: str = Field(default='operating') - opening_date: Optional[date] = None - opening_date_precision: str = Field(default='day') - closing_date: Optional[date] = None - closing_date_precision: str = Field(default='day') - latitude: Optional[Decimal] = None - longitude: Optional[Decimal] = None - operator_id: Optional[UUID] = None - website: Optional[str] = None - banner_image_id: Optional[str] = None - banner_image_url: Optional[str] = None - logo_image_id: Optional[str] = None - logo_image_url: Optional[str] = None - - -class ParkCreate(ParkBase): - """Schema for creating a park.""" - pass - - -class ParkUpdate(BaseModel): - """Schema for updating a park (all fields optional).""" - name: Optional[str] = Field(None, min_length=1, max_length=255) - description: Optional[str] = None - park_type: Optional[str] = None - status: Optional[str] = None - opening_date: Optional[date] = None - opening_date_precision: Optional[str] = None - closing_date: Optional[date] = None - closing_date_precision: Optional[str] = None - latitude: Optional[Decimal] = None - longitude: Optional[Decimal] = None - operator_id: Optional[UUID] = None - website: Optional[str] = None - banner_image_id: Optional[str] = None - banner_image_url: Optional[str] = None - logo_image_id: Optional[str] = None - logo_image_url: Optional[str] = None - - -class ParkOut(ParkBase, TimestampSchema): - """Schema for park output.""" - id: UUID - slug: str - ride_count: int - coaster_count: int - operator_name: Optional[str] = None - coordinates: Optional[tuple[float, float]] = None - - class Config: - from_attributes = True - - -# ============================================================================ -# Ride Schemas -# ============================================================================ - -class RideBase(BaseModel): - """Base ride schema.""" - name: str = Field(..., min_length=1, max_length=255) - description: Optional[str] = None - park_id: UUID - ride_category: str - ride_type: Optional[str] = None - is_coaster: bool = Field(default=False) - status: str = Field(default='operating') - opening_date: Optional[date] = None - opening_date_precision: str = Field(default='day') - closing_date: Optional[date] = None - closing_date_precision: str = Field(default='day') - manufacturer_id: Optional[UUID] = None - model_id: Optional[UUID] = None - height: Optional[Decimal] = None - speed: Optional[Decimal] = None - length: Optional[Decimal] = None - duration: Optional[int] = None - inversions: Optional[int] = None - capacity: Optional[int] = None - image_id: Optional[str] = None - image_url: Optional[str] = None - - -class RideCreate(RideBase): - """Schema for creating a ride.""" - pass - - -class RideUpdate(BaseModel): - """Schema for updating a ride (all fields optional).""" - name: Optional[str] = Field(None, min_length=1, max_length=255) - description: Optional[str] = None - park_id: Optional[UUID] = None - ride_category: Optional[str] = None - ride_type: Optional[str] = None - is_coaster: Optional[bool] = None - status: Optional[str] = None - opening_date: Optional[date] = None - opening_date_precision: Optional[str] = None - closing_date: Optional[date] = None - closing_date_precision: Optional[str] = None - manufacturer_id: Optional[UUID] = None - model_id: Optional[UUID] = None - height: Optional[Decimal] = None - speed: Optional[Decimal] = None - length: Optional[Decimal] = None - duration: Optional[int] = None - inversions: Optional[int] = None - capacity: Optional[int] = None - image_id: Optional[str] = None - image_url: Optional[str] = None - - -class RideOut(RideBase, TimestampSchema): - """Schema for ride output.""" - id: UUID - slug: str - park_name: Optional[str] = None - manufacturer_name: Optional[str] = None - model_name: Optional[str] = None - - class Config: - from_attributes = True - - -# ============================================================================ -# Pagination Schemas -# ============================================================================ - -class PaginatedResponse(BaseModel): - """Generic paginated response schema.""" - items: List - total: int - page: int - page_size: int - total_pages: int - - -class CompanyListOut(BaseModel): - """Paginated company list response.""" - items: List[CompanyOut] - total: int - page: int - page_size: int - total_pages: int - - -class RideModelListOut(BaseModel): - """Paginated ride model list response.""" - items: List[RideModelOut] - total: int - page: int - page_size: int - total_pages: int - - -class ParkListOut(BaseModel): - """Paginated park list response.""" - items: List[ParkOut] - total: int - page: int - page_size: int - total_pages: int - - -class RideListOut(BaseModel): - """Paginated ride list response.""" - items: List[RideOut] - total: int - page: int - page_size: int - total_pages: int - - -# ============================================================================ -# Error Schemas -# ============================================================================ - -class ErrorResponse(BaseModel): - """Standard error response schema.""" - detail: str - code: Optional[str] = None - - -class ValidationErrorResponse(BaseModel): - """Validation error response schema.""" - detail: str - errors: Optional[List[dict]] = None - - -# ============================================================================ -# Moderation Schemas -# ============================================================================ - -class SubmissionItemBase(BaseModel): - """Base submission item schema.""" - field_name: str = Field(..., min_length=1, max_length=100) - field_label: Optional[str] = None - old_value: Optional[dict] = None - new_value: Optional[dict] = None - change_type: str = Field(default='modify') - is_required: bool = Field(default=False) - order: int = Field(default=0) - - -class SubmissionItemCreate(SubmissionItemBase): - """Schema for creating a submission item.""" - pass - - -class SubmissionItemOut(SubmissionItemBase, TimestampSchema): - """Schema for submission item output.""" - id: UUID - submission_id: UUID - status: str - reviewed_by_id: Optional[UUID] = None - reviewed_by_email: Optional[str] = None - reviewed_at: Optional[datetime] = None - rejection_reason: Optional[str] = None - old_value_display: str - new_value_display: str - - class Config: - from_attributes = True - - -class ContentSubmissionBase(BaseModel): - """Base content submission schema.""" - submission_type: str - title: str = Field(..., min_length=1, max_length=255) - description: Optional[str] = None - entity_type: str - entity_id: UUID - - -class ContentSubmissionCreate(BaseModel): - """Schema for creating a content submission.""" - entity_type: str = Field(..., description="Entity type (park, ride, company, ridemodel)") - entity_id: UUID = Field(..., description="ID of entity being modified") - submission_type: str = Field(..., description="Operation type (create, update, delete)") - title: str = Field(..., min_length=1, max_length=255, description="Brief description") - description: Optional[str] = Field(None, description="Detailed description") - items: List[SubmissionItemCreate] = Field(..., min_items=1, description="List of changes") - metadata: Optional[dict] = Field(default_factory=dict) - auto_submit: bool = Field(default=True, description="Auto-submit for review") - - -class ContentSubmissionOut(TimestampSchema): - """Schema for content submission output.""" - id: UUID - status: str - submission_type: str - title: str - description: Optional[str] = None - entity_type: str - entity_id: UUID - user_id: UUID - user_email: str - locked_by_id: Optional[UUID] = None - locked_by_email: Optional[str] = None - locked_at: Optional[datetime] = None - reviewed_by_id: Optional[UUID] = None - reviewed_by_email: Optional[str] = None - reviewed_at: Optional[datetime] = None - rejection_reason: Optional[str] = None - source: str - metadata: dict - items_count: int - approved_items_count: int - rejected_items_count: int - - class Config: - from_attributes = True - - -class ContentSubmissionDetail(ContentSubmissionOut): - """Detailed submission with items.""" - items: List[SubmissionItemOut] - - class Config: - from_attributes = True - - -class StartReviewRequest(BaseModel): - """Schema for starting a review.""" - pass # No additional fields needed - - -class ApproveRequest(BaseModel): - """Schema for approving a submission.""" - pass # No additional fields needed - - -class ApproveSelectiveRequest(BaseModel): - """Schema for selective approval.""" - item_ids: List[UUID] = Field(..., min_items=1, description="List of item IDs to approve") - - -class RejectRequest(BaseModel): - """Schema for rejecting a submission.""" - reason: str = Field(..., min_length=1, description="Reason for rejection") - - -class RejectSelectiveRequest(BaseModel): - """Schema for selective rejection.""" - item_ids: List[UUID] = Field(..., min_items=1, description="List of item IDs to reject") - reason: Optional[str] = Field(None, description="Reason for rejection") - - -class ApprovalResponse(BaseModel): - """Response for approval operations.""" - success: bool - message: str - submission: ContentSubmissionOut - - -class SelectiveApprovalResponse(BaseModel): - """Response for selective approval.""" - success: bool - message: str - approved: int - total: int - pending: int - submission_approved: bool - - -class SelectiveRejectionResponse(BaseModel): - """Response for selective rejection.""" - success: bool - message: str - rejected: int - total: int - pending: int - submission_complete: bool - - -class SubmissionListOut(BaseModel): - """Paginated submission list response.""" - items: List[ContentSubmissionOut] - total: int - page: int - page_size: int - total_pages: int - - -# ============================================================================ -# Versioning Schemas -# ============================================================================ - -class EntityVersionSchema(TimestampSchema): - """Schema for entity version output.""" - id: UUID - entity_type: str - entity_id: UUID - entity_name: str - version_number: int - change_type: str - snapshot: dict - changed_fields: dict - changed_by_id: Optional[UUID] = None - changed_by_email: Optional[str] = None - submission_id: Optional[UUID] = None - comment: Optional[str] = None - diff_summary: str - - class Config: - from_attributes = True - - -class VersionHistoryResponseSchema(BaseModel): - """Response schema for version history.""" - entity_id: str - entity_type: str - entity_name: str - total_versions: int - versions: List[EntityVersionSchema] - - -class VersionDiffSchema(BaseModel): - """Schema for version diff response.""" - entity_id: str - entity_type: str - entity_name: str - version_number: int - version_date: datetime - differences: dict - changed_field_count: int - - -class VersionComparisonSchema(BaseModel): - """Schema for comparing two versions.""" - version1: EntityVersionSchema - version2: EntityVersionSchema - differences: dict - changed_field_count: int - - -# ============================================================================ -# Generic Utility Schemas -# ============================================================================ - -class MessageSchema(BaseModel): - """Generic message response.""" - message: str - success: bool = True - - -class ErrorSchema(BaseModel): - """Standard error response.""" - error: str - detail: Optional[str] = None - - -# ============================================================================ -# Authentication Schemas -# ============================================================================ - -class UserBase(BaseModel): - """Base user schema.""" - email: str = Field(..., description="Email address") - username: Optional[str] = Field(None, description="Username") - first_name: Optional[str] = Field(None, max_length=150) - last_name: Optional[str] = Field(None, max_length=150) - - -class UserRegisterRequest(BaseModel): - """Schema for user registration.""" - email: str = Field(..., description="Email address") - password: str = Field(..., min_length=8, description="Password (min 8 characters)") - password_confirm: str = Field(..., description="Password confirmation") - username: Optional[str] = Field(None, description="Username (auto-generated if not provided)") - first_name: Optional[str] = Field(None, max_length=150) - last_name: Optional[str] = Field(None, max_length=150) - - @field_validator('password_confirm') - def passwords_match(cls, v, info): - if 'password' in info.data and v != info.data['password']: - raise ValueError('Passwords do not match') - return v - - -class UserLoginRequest(BaseModel): - """Schema for user login.""" - email: str = Field(..., description="Email address") - password: str = Field(..., description="Password") - mfa_token: Optional[str] = Field(None, description="MFA token if enabled") - - -class TokenResponse(BaseModel): - """Schema for token response.""" - access: str = Field(..., description="JWT access token") - refresh: str = Field(..., description="JWT refresh token") - token_type: str = Field(default="Bearer") - - -class TokenRefreshRequest(BaseModel): - """Schema for token refresh.""" - refresh: str = Field(..., description="Refresh token") - - -class UserProfileOut(BaseModel): - """Schema for user profile output.""" - id: UUID - email: str - username: str - first_name: str - last_name: str - display_name: str - avatar_url: Optional[str] = None - bio: Optional[str] = None - reputation_score: int - mfa_enabled: bool - banned: bool - date_joined: datetime - last_login: Optional[datetime] = None - oauth_provider: str - - class Config: - from_attributes = True - - -class UserProfileUpdate(BaseModel): - """Schema for updating user profile.""" - first_name: Optional[str] = Field(None, max_length=150) - last_name: Optional[str] = Field(None, max_length=150) - username: Optional[str] = Field(None, max_length=150) - bio: Optional[str] = Field(None, max_length=500) - avatar_url: Optional[str] = None - - -class ChangePasswordRequest(BaseModel): - """Schema for password change.""" - old_password: str = Field(..., description="Current password") - new_password: str = Field(..., min_length=8, description="New password") - new_password_confirm: str = Field(..., description="New password confirmation") - - @field_validator('new_password_confirm') - def passwords_match(cls, v, info): - if 'new_password' in info.data and v != info.data['new_password']: - raise ValueError('Passwords do not match') - return v - - -class ResetPasswordRequest(BaseModel): - """Schema for password reset.""" - email: str = Field(..., description="Email address") - - -class ResetPasswordConfirm(BaseModel): - """Schema for password reset confirmation.""" - token: str = Field(..., description="Reset token") - password: str = Field(..., min_length=8, description="New password") - password_confirm: str = Field(..., description="Password confirmation") - - @field_validator('password_confirm') - def passwords_match(cls, v, info): - if 'password' in info.data and v != info.data['password']: - raise ValueError('Passwords do not match') - return v - - -class UserRoleOut(BaseModel): - """Schema for user role output.""" - role: str - is_moderator: bool - is_admin: bool - granted_at: datetime - granted_by_email: Optional[str] = None - - class Config: - from_attributes = True - - -class UserPermissionsOut(BaseModel): - """Schema for user permissions.""" - can_submit: bool - can_moderate: bool - can_admin: bool - can_edit_own: bool - can_delete_own: bool - - -class UserStatsOut(BaseModel): - """Schema for user statistics.""" - total_submissions: int - approved_submissions: int - reputation_score: int - member_since: datetime - last_active: Optional[datetime] = None - - -class UserProfilePreferencesOut(BaseModel): - """Schema for user preferences.""" - email_notifications: bool - email_on_submission_approved: bool - email_on_submission_rejected: bool - profile_public: bool - show_email: bool - - class Config: - from_attributes = True - - -class UserProfilePreferencesUpdate(BaseModel): - """Schema for updating user preferences.""" - email_notifications: Optional[bool] = None - email_on_submission_approved: Optional[bool] = None - email_on_submission_rejected: Optional[bool] = None - profile_public: Optional[bool] = None - show_email: Optional[bool] = None - - -class TOTPEnableResponse(BaseModel): - """Schema for TOTP enable response.""" - secret: str = Field(..., description="TOTP secret key") - qr_code_url: str = Field(..., description="QR code URL for authenticator apps") - backup_codes: List[str] = Field(default_factory=list, description="Backup codes") - - -class TOTPConfirmRequest(BaseModel): - """Schema for TOTP confirmation.""" - token: str = Field(..., min_length=6, max_length=6, description="6-digit TOTP token") - - -class TOTPVerifyRequest(BaseModel): - """Schema for TOTP verification.""" - token: str = Field(..., min_length=6, max_length=6, description="6-digit TOTP token") - - -class BanUserRequest(BaseModel): - """Schema for banning a user.""" - user_id: UUID = Field(..., description="User ID to ban") - reason: str = Field(..., min_length=1, description="Reason for ban") - - -class UnbanUserRequest(BaseModel): - """Schema for unbanning a user.""" - user_id: UUID = Field(..., description="User ID to unban") - - -class AssignRoleRequest(BaseModel): - """Schema for assigning a role.""" - user_id: UUID = Field(..., description="User ID") - role: str = Field(..., description="Role to assign (user, moderator, admin)") - - -class UserListOut(BaseModel): - """Paginated user list response.""" - items: List[UserProfileOut] - total: int - page: int - page_size: int - total_pages: int - - -# ============================================================================ -# Photo/Media Schemas -# ============================================================================ - -class PhotoBase(BaseModel): - """Base photo schema.""" - title: Optional[str] = Field(None, max_length=255) - description: Optional[str] = None - credit: Optional[str] = Field(None, max_length=255, description="Photo credit/attribution") - photo_type: str = Field(default='gallery', description="Type: main, gallery, banner, logo, thumbnail, other") - is_visible: bool = Field(default=True) - - -class PhotoUploadRequest(PhotoBase): - """Schema for photo upload request (form data).""" - entity_type: Optional[str] = Field(None, description="Entity type to attach to") - entity_id: Optional[UUID] = Field(None, description="Entity ID to attach to") - - -class PhotoUpdate(BaseModel): - """Schema for updating photo metadata.""" - title: Optional[str] = Field(None, max_length=255) - description: Optional[str] = None - credit: Optional[str] = Field(None, max_length=255) - photo_type: Optional[str] = None - is_visible: Optional[bool] = None - display_order: Optional[int] = None - - -class PhotoOut(PhotoBase, TimestampSchema): - """Schema for photo output.""" - id: UUID - cloudflare_image_id: str - cloudflare_url: str - uploaded_by_id: UUID - uploaded_by_email: Optional[str] = None - moderation_status: str - moderated_by_id: Optional[UUID] = None - moderated_by_email: Optional[str] = None - moderated_at: Optional[datetime] = None - moderation_notes: Optional[str] = None - entity_type: Optional[str] = None - entity_id: Optional[str] = None - entity_name: Optional[str] = None - width: int - height: int - file_size: int - mime_type: str - display_order: int - - # Generated URLs for different variants - thumbnail_url: Optional[str] = None - banner_url: Optional[str] = None - - class Config: - from_attributes = True - - -class PhotoListOut(BaseModel): - """Paginated photo list response.""" - items: List[PhotoOut] - total: int - page: int - page_size: int - total_pages: int - - -class PhotoUploadResponse(BaseModel): - """Response for photo upload.""" - success: bool - message: str - photo: PhotoOut - - -class PhotoModerateRequest(BaseModel): - """Schema for moderating a photo.""" - status: str = Field(..., description="Status: approved, rejected, flagged") - notes: Optional[str] = Field(None, description="Moderation notes") - - -class PhotoReorderRequest(BaseModel): - """Schema for reordering photos.""" - photo_ids: List[int] = Field(..., min_items=1, description="Ordered list of photo IDs") - photo_type: Optional[str] = Field(None, description="Optional photo type filter") - - -class PhotoAttachRequest(BaseModel): - """Schema for attaching photo to entity.""" - photo_id: UUID = Field(..., description="Photo ID to attach") - photo_type: Optional[str] = Field('gallery', description="Photo type") - - -class PhotoStatsOut(BaseModel): - """Statistics about photos.""" - total_photos: int - pending_photos: int - approved_photos: int - rejected_photos: int - flagged_photos: int - total_size_mb: float - - -# ============================================================================ -# Search Schemas -# ============================================================================ - -class SearchResultBase(BaseModel): - """Base schema for search results.""" - id: UUID - name: str - slug: str - entity_type: str - description: Optional[str] = None - image_url: Optional[str] = None - - -class CompanySearchResult(SearchResultBase): - """Company search result.""" - company_types: List[str] = Field(default_factory=list) - park_count: int = 0 - ride_count: int = 0 - - -class RideModelSearchResult(SearchResultBase): - """Ride model search result.""" - manufacturer_name: str - model_type: str - installation_count: int = 0 - - -class ParkSearchResult(SearchResultBase): - """Park search result.""" - park_type: str - status: str - operator_name: Optional[str] = None - ride_count: int = 0 - coaster_count: int = 0 - coordinates: Optional[tuple[float, float]] = None - - -class RideSearchResult(SearchResultBase): - """Ride search result.""" - park_name: str - park_slug: str - manufacturer_name: Optional[str] = None - ride_category: str - status: str - is_coaster: bool - - -class GlobalSearchResponse(BaseModel): - """Response for global search across all entities.""" - query: str - total_results: int - companies: List[CompanySearchResult] = Field(default_factory=list) - ride_models: List[RideModelSearchResult] = Field(default_factory=list) - parks: List[ParkSearchResult] = Field(default_factory=list) - rides: List[RideSearchResult] = Field(default_factory=list) - - -class AutocompleteItem(BaseModel): - """Single autocomplete suggestion.""" - id: UUID - name: str - slug: str - entity_type: str - park_name: Optional[str] = None # For rides - manufacturer_name: Optional[str] = None # For ride models - - -class AutocompleteResponse(BaseModel): - """Response for autocomplete suggestions.""" - query: str - suggestions: List[AutocompleteItem] - - -class SearchFilters(BaseModel): - """Base filters for search operations.""" - q: str = Field(..., min_length=2, max_length=200, description="Search query") - entity_types: Optional[List[str]] = Field(None, description="Filter by entity types") - limit: int = Field(20, ge=1, le=100, description="Maximum results per entity type") - - -class CompanySearchFilters(BaseModel): - """Filters for company search.""" - q: str = Field(..., min_length=2, max_length=200, description="Search query") - company_types: Optional[List[str]] = Field(None, description="Filter by company types") - founded_after: Optional[date] = Field(None, description="Founded after date") - founded_before: Optional[date] = Field(None, description="Founded before date") - limit: int = Field(20, ge=1, le=100) - - -class RideModelSearchFilters(BaseModel): - """Filters for ride model search.""" - q: str = Field(..., min_length=2, max_length=200, description="Search query") - manufacturer_id: Optional[UUID] = Field(None, description="Filter by manufacturer") - model_type: Optional[str] = Field(None, description="Filter by model type") - limit: int = Field(20, ge=1, le=100) - - -class ParkSearchFilters(BaseModel): - """Filters for park search.""" - q: str = Field(..., min_length=2, max_length=200, description="Search query") - status: Optional[str] = Field(None, description="Filter by status") - park_type: Optional[str] = Field(None, description="Filter by park type") - operator_id: Optional[UUID] = Field(None, description="Filter by operator") - opening_after: Optional[date] = Field(None, description="Opened after date") - opening_before: Optional[date] = Field(None, description="Opened before date") - latitude: Optional[float] = Field(None, description="Search center latitude") - longitude: Optional[float] = Field(None, description="Search center longitude") - radius: Optional[float] = Field(None, ge=0, le=500, description="Search radius in km") - limit: int = Field(20, ge=1, le=100) - - -class RideSearchFilters(BaseModel): - """Filters for ride search.""" - q: str = Field(..., min_length=2, max_length=200, description="Search query") - park_id: Optional[UUID] = Field(None, description="Filter by park") - manufacturer_id: Optional[UUID] = Field(None, description="Filter by manufacturer") - model_id: Optional[UUID] = Field(None, description="Filter by model") - status: Optional[str] = Field(None, description="Filter by status") - ride_category: Optional[str] = Field(None, description="Filter by category") - is_coaster: Optional[bool] = Field(None, description="Filter coasters only") - opening_after: Optional[date] = Field(None, description="Opened after date") - opening_before: Optional[date] = Field(None, description="Opened before date") - min_height: Optional[Decimal] = Field(None, description="Minimum height in feet") - max_height: Optional[Decimal] = Field(None, description="Maximum height in feet") - min_speed: Optional[Decimal] = Field(None, description="Minimum speed in mph") - max_speed: Optional[Decimal] = Field(None, description="Maximum speed in mph") - limit: int = Field(20, ge=1, le=100) diff --git a/django/apps/__init__.py b/django/apps/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/__pycache__/__init__.cpython-313.pyc b/django/apps/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index bf8e4e226af33003923e94af38b6fb5992674179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 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 diff --git a/django/apps/core/apps.py b/django/apps/core/apps.py deleted file mode 100644 index 8acdc11d..00000000 --- a/django/apps/core/apps.py +++ /dev/null @@ -1,11 +0,0 @@ -""" -Core app configuration. -""" - -from django.apps import AppConfig - - -class CoreConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.core' - verbose_name = 'Core' diff --git a/django/apps/core/migrations/0001_initial.py b/django/apps/core/migrations/0001_initial.py deleted file mode 100644 index 4bedf241..00000000 --- a/django/apps/core/migrations/0001_initial.py +++ /dev/null @@ -1,194 +0,0 @@ -# Generated by Django 4.2.8 on 2025-11-08 16:35 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import django_lifecycle.mixins -import model_utils.fields -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [] - - operations = [ - migrations.CreateModel( - name="Country", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ("name", models.CharField(max_length=255, unique=True)), - ( - "code", - models.CharField( - help_text="ISO 3166-1 alpha-2 country code", - max_length=2, - unique=True, - ), - ), - ( - "code3", - models.CharField( - blank=True, - help_text="ISO 3166-1 alpha-3 country code", - max_length=3, - ), - ), - ], - options={ - "verbose_name_plural": "countries", - "db_table": "countries", - "ordering": ["name"], - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - migrations.CreateModel( - name="Subdivision", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ("name", models.CharField(max_length=255)), - ( - "code", - models.CharField( - help_text="ISO 3166-2 subdivision code (without country prefix)", - max_length=10, - ), - ), - ( - "subdivision_type", - models.CharField( - blank=True, - help_text="Type of subdivision (state, province, region, etc.)", - max_length=50, - ), - ), - ( - "country", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="subdivisions", - to="core.country", - ), - ), - ], - options={ - "db_table": "subdivisions", - "ordering": ["country", "name"], - "unique_together": {("country", "code")}, - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - migrations.CreateModel( - name="Locality", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ("name", models.CharField(max_length=255)), - ( - "latitude", - models.DecimalField( - blank=True, decimal_places=6, max_digits=9, null=True - ), - ), - ( - "longitude", - models.DecimalField( - blank=True, decimal_places=6, max_digits=9, null=True - ), - ), - ( - "subdivision", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="localities", - to="core.subdivision", - ), - ), - ], - options={ - "verbose_name_plural": "localities", - "db_table": "localities", - "ordering": ["subdivision", "name"], - "indexes": [ - models.Index( - fields=["subdivision", "name"], - name="localities_subdivi_675d5a_idx", - ) - ], - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - ] diff --git a/django/apps/core/migrations/__init__.py b/django/apps/core/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/core/migrations/__pycache__/0001_initial.cpython-313.pyc b/django/apps/core/migrations/__pycache__/0001_initial.cpython-313.pyc deleted file mode 100644 index 88ad81531b8a85a61ca833aea99280be424e3a0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4748 zcmeHK&2JmW72jQce^{pYAzQLO))e)zwnXaNW~>@<<;bxuCjci#f>iBd$sLg!uekK= z(w5XqfC4=i1&ZeCligeX1ozY&MP0ZUT?`Z`pc@6Z$T5AhOGy+cxdDWArn>WL^7cPW3_&j)eQTtav$NiIajy}G2e)3-QxNQ!g#kF zq7~p5%6lQ+FxXCZ>i~Wc(2C{-(7AA~P7k^WS}|wkz2|BPD2@^+$+U8Ql!9+K$D_Wi zXFXMz>Ylrh?UsS>nQke>b}8>YmjRc5VZaY$K!2WpXZ{D!6*TB@Wau5)A4Vf?_K^r$ zbKQ9arbY@2-SUEXhHU8!+0AYlx{A_h)ZttJ+9GgHK$%${js4`j8~=rOKML)XX@Q0w9UZm@5eVWF8dx#vRf}xXK#5?*!s@Ezp#c?dD0SVUL9A+)Qq(bx zKEtGFm{_hVo0taSoYpoptWrT!B`;xD3&I@INR4Ql3fY#Q;B6W*G0_xV+riY!><+#I z73auTwqzYw%T|T@>s9S(9TZA%^zV$^M<0vxvr9|Uv!bHcD$4YnSaKtTw~7x0=D|Zl z6|C1}3vXE@!RAh~xqVDy{tO@Ur+u(%2>9?7b*1`*Tw?aj2@Sb3Y1o9(MCXF#nqDW0 zPJ?PucJT-rM1{pw%dq-hX6y$zbk(E*qvqaad_~2?CXJwaQPrMlCR}hN-kE4;;dqsE zqIojxtWcbMu2~hMZXL&5BX~pGk`5TilF$)vtix8ewrhB2{u6kL#>OeHlcoiUof2!r zc&1fL&?2}D(M*ZhDrKbuR*ND1Z5~8BoSHk)l0k5`J;rc1sxsWrumy}DSZ9QB86j8( z#KtZfgx#zp4;fpBhTMishXO(Pvq)3ENkheYngoCS1_4xNn3ZMnR3 zV^LjHWKG?IMX+0%lT(O<-SawD640tD-oobJxR0c(G$=c3mt`83W!MpQ9YZ@R%TMcy z&iD?!i?Y0-5!2GODy|wJ02i7Cn}SAFT*Kh5T7ozU<0Or&ID7CBy9CpSa~GEDmZqCd zOf+_S?M2wR5H1?UE)<_=o9bN2%pz3XPyoyK>cVM@bB4IljtNXatetX7g0%OYB_ zZedfF2|M85!jGfB$vuYBV&*JGH%JaRP^lMlC7=TaS%ql2ZV{#QWEyYPKmn7SyOf+# ztC=~*h}_Aaj@-=5%&gqbO18F57!#cbD`@6#0j@uCZ+hZi-g}cseYw{1bD=~tIJ_4e zwtEMlmm0Q{BhBP^BRSqo-e@Fm*y8xh=!-PpZ1$$=B&^ol*2u}4M^1D%l#o+u2bZAYg=;U0fI+0*)* z=O*Xv!3le4^s5iqXiqE5B{R*$wMODvGjY3-xc%DykLcf{yYWYdWqu(PZhgUbz&HFe zgRjw_-;KR@8obZ!(Xm6HhvDr9yklHy;xuxfGKEvn0%0I=V|&RlJ3aYQdLcE_bB**| zGkvR(zST^xGyv_fdHaggVfL7x1HdahH+0<|8h_>A9n9I88@r=7{}=3a{uaQ#)d~BR zpDFAvZWDXS341vG_3Z23Z<2=|fg$e$|5%uH&IB`iR8z^XSv5?x$DKnUdwd35a>Xb0JL{Hj z@{k$D9arx0lHG9bF64a{$%pLW)Ie5m-RM4p77Z?g37m1a$?u@c!_Sm22-2E3J3>i}Z diff --git a/django/apps/core/migrations/__pycache__/__init__.cpython-313.pyc b/django/apps/core/migrations/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 6da67ee594c05b6176f7833f76a770b9acb68103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 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 R`Q>DO%JUjUk@ynh{{RNY{ks4F diff --git a/django/apps/entities/__pycache__/search.cpython-313.pyc b/django/apps/entities/__pycache__/search.cpython-313.pyc deleted file mode 100644 index 2577d9b6d14e59f63d7e7d06018d45ccd6b3f98e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14491 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 Tsrkg$)>(_8^A`-Jbj<$+U8I0Q diff --git a/django/apps/entities/__pycache__/signals.cpython-313.pyc b/django/apps/entities/__pycache__/signals.cpython-313.pyc deleted file mode 100644 index 17d28fdecbadee72d43c0dc24dade0ee19e4f36e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8865 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 Qd%t<8 diff --git a/django/apps/entities/admin.py b/django/apps/entities/admin.py deleted file mode 100644 index f0aa1177..00000000 --- a/django/apps/entities/admin.py +++ /dev/null @@ -1,706 +0,0 @@ -""" -Django Admin configuration for entity models with Unfold theme. -""" -from django.contrib import admin -from django.contrib.gis import admin as gis_admin -from django.db.models import Count, Q -from django.utils.html import format_html -from django.urls import reverse -from django.conf import settings -from unfold.admin import ModelAdmin, TabularInline -from unfold.contrib.filters.admin import RangeDateFilter, RangeNumericFilter, RelatedDropdownFilter, ChoicesDropdownFilter -from unfold.contrib.import_export.forms import ImportForm, ExportForm -from import_export.admin import ImportExportModelAdmin -from import_export import resources, fields -from import_export.widgets import ForeignKeyWidget -from .models import Company, RideModel, Park, Ride -from apps.media.admin import PhotoInline - - -# ============================================================================ -# IMPORT/EXPORT RESOURCES -# ============================================================================ - -class CompanyResource(resources.ModelResource): - """Import/Export resource for Company model.""" - - class Meta: - model = Company - fields = ( - 'id', 'name', 'slug', 'description', 'location', - 'company_types', 'founded_date', 'founded_date_precision', - 'closed_date', 'closed_date_precision', 'website', - 'logo_image_url', 'created', 'modified' - ) - export_order = fields - - -class RideModelResource(resources.ModelResource): - """Import/Export resource for RideModel model.""" - - manufacturer = fields.Field( - column_name='manufacturer', - attribute='manufacturer', - widget=ForeignKeyWidget(Company, 'name') - ) - - class Meta: - model = RideModel - fields = ( - 'id', 'name', 'slug', 'description', 'manufacturer', - 'model_type', 'typical_height', 'typical_speed', - 'typical_capacity', 'image_url', 'created', 'modified' - ) - export_order = fields - - -class ParkResource(resources.ModelResource): - """Import/Export resource for Park model.""" - - operator = fields.Field( - column_name='operator', - attribute='operator', - widget=ForeignKeyWidget(Company, 'name') - ) - - class Meta: - model = Park - fields = ( - 'id', 'name', 'slug', 'description', 'park_type', 'status', - 'latitude', 'longitude', 'operator', 'opening_date', - 'opening_date_precision', 'closing_date', 'closing_date_precision', - 'website', 'banner_image_url', 'logo_image_url', - 'created', 'modified' - ) - export_order = fields - - -class RideResource(resources.ModelResource): - """Import/Export resource for Ride model.""" - - park = fields.Field( - column_name='park', - attribute='park', - widget=ForeignKeyWidget(Park, 'name') - ) - manufacturer = fields.Field( - column_name='manufacturer', - attribute='manufacturer', - widget=ForeignKeyWidget(Company, 'name') - ) - model = fields.Field( - column_name='model', - attribute='model', - widget=ForeignKeyWidget(RideModel, 'name') - ) - - class Meta: - model = Ride - fields = ( - 'id', 'name', 'slug', 'description', 'park', 'ride_category', - 'ride_type', 'status', 'manufacturer', 'model', 'height', - 'speed', 'length', 'duration', 'inversions', 'capacity', - 'opening_date', 'opening_date_precision', 'closing_date', - 'closing_date_precision', 'image_url', 'created', 'modified' - ) - export_order = fields - - -# ============================================================================ -# INLINE ADMIN CLASSES -# ============================================================================ - -class RideInline(TabularInline): - """Inline for Rides within a Park.""" - - model = Ride - extra = 0 - fields = ['name', 'ride_category', 'status', 'manufacturer', 'opening_date'] - readonly_fields = ['name'] - show_change_link = True - classes = ['collapse'] - - def has_add_permission(self, request, obj=None): - return False - - -class CompanyParksInline(TabularInline): - """Inline for Parks operated by a Company.""" - - model = Park - fk_name = 'operator' - extra = 0 - fields = ['name', 'park_type', 'status', 'ride_count', 'opening_date'] - readonly_fields = ['name', 'ride_count'] - show_change_link = True - classes = ['collapse'] - - def has_add_permission(self, request, obj=None): - return False - - -class RideModelInstallationsInline(TabularInline): - """Inline for Ride installations of a RideModel.""" - - model = Ride - fk_name = 'model' - extra = 0 - fields = ['name', 'park', 'status', 'opening_date'] - readonly_fields = ['name', 'park'] - show_change_link = True - classes = ['collapse'] - - def has_add_permission(self, request, obj=None): - return False - - -# ============================================================================ -# MAIN ADMIN CLASSES -# ============================================================================ - -@admin.register(Company) -class CompanyAdmin(ModelAdmin, ImportExportModelAdmin): - """Enhanced admin interface for Company model.""" - - resource_class = CompanyResource - import_form_class = ImportForm - export_form_class = ExportForm - - list_display = [ - 'name_with_icon', - 'location', - 'company_types_display', - 'park_count', - 'ride_count', - 'founded_date', - 'status_indicator', - 'created' - ] - list_filter = [ - ('company_types', ChoicesDropdownFilter), - ('founded_date', RangeDateFilter), - ('closed_date', RangeDateFilter), - ] - search_fields = ['name', 'slug', 'description', 'location'] - readonly_fields = ['id', 'created', 'modified', 'park_count', 'ride_count', 'slug'] - prepopulated_fields = {} # Slug is auto-generated via lifecycle hook - autocomplete_fields = [] - inlines = [CompanyParksInline, PhotoInline] - - list_per_page = 50 - list_max_show_all = 200 - - fieldsets = ( - ('Basic Information', { - 'fields': ('name', 'slug', 'description', 'company_types') - }), - ('Location & Contact', { - 'fields': ('location', 'website') - }), - ('History', { - 'fields': ( - 'founded_date', 'founded_date_precision', - 'closed_date', 'closed_date_precision' - ) - }), - ('Media', { - 'fields': ('logo_image_id', 'logo_image_url'), - 'classes': ['collapse'] - }), - ('Statistics', { - 'fields': ('park_count', 'ride_count'), - 'classes': ['collapse'] - }), - ('System Information', { - 'fields': ('id', 'created', 'modified'), - 'classes': ['collapse'] - }), - ) - - def name_with_icon(self, obj): - """Display name with company type icon.""" - icons = { - 'manufacturer': '🏭', - 'operator': '🎡', - 'designer': '✏️', - } - icon = '🏢' # Default company icon - if obj.company_types: - for ctype in obj.company_types: - if ctype in icons: - icon = icons[ctype] - break - return format_html('{} {}', icon, obj.name) - name_with_icon.short_description = 'Company' - name_with_icon.admin_order_field = 'name' - - def company_types_display(self, obj): - """Display company types as badges.""" - if not obj.company_types: - return '-' - badges = [] - for ctype in obj.company_types: - color = { - 'manufacturer': 'blue', - 'operator': 'green', - 'designer': 'purple', - }.get(ctype, 'gray') - badges.append( - f'{ctype.upper()}' - ) - return format_html(' '.join(badges)) - company_types_display.short_description = 'Types' - - def status_indicator(self, obj): - """Visual status indicator.""" - if obj.closed_date: - return format_html( - '● Closed' - ) - return format_html( - '● Active' - ) - status_indicator.short_description = 'Status' - - actions = ['export_admin_action'] - - -@admin.register(RideModel) -class RideModelAdmin(ModelAdmin, ImportExportModelAdmin): - """Enhanced admin interface for RideModel model.""" - - resource_class = RideModelResource - import_form_class = ImportForm - export_form_class = ExportForm - - list_display = [ - 'name_with_type', - 'manufacturer', - 'model_type', - 'typical_specs', - 'installation_count', - 'created' - ] - list_filter = [ - ('model_type', ChoicesDropdownFilter), - ('manufacturer', RelatedDropdownFilter), - ('typical_height', RangeNumericFilter), - ('typical_speed', RangeNumericFilter), - ] - search_fields = ['name', 'slug', 'description', 'manufacturer__name'] - readonly_fields = ['id', 'created', 'modified', 'installation_count', 'slug'] - prepopulated_fields = {} - autocomplete_fields = ['manufacturer'] - inlines = [RideModelInstallationsInline, PhotoInline] - - list_per_page = 50 - - fieldsets = ( - ('Basic Information', { - 'fields': ('name', 'slug', 'description', 'manufacturer', 'model_type') - }), - ('Typical Specifications', { - 'fields': ( - 'typical_height', 'typical_speed', 'typical_capacity' - ), - 'description': 'Standard specifications for this ride model' - }), - ('Media', { - 'fields': ('image_id', 'image_url'), - 'classes': ['collapse'] - }), - ('Statistics', { - 'fields': ('installation_count',), - 'classes': ['collapse'] - }), - ('System Information', { - 'fields': ('id', 'created', 'modified'), - 'classes': ['collapse'] - }), - ) - - def name_with_type(self, obj): - """Display name with model type icon.""" - icons = { - 'roller_coaster': '🎢', - 'water_ride': '🌊', - 'flat_ride': '🎡', - 'dark_ride': '🎭', - 'transport': '🚂', - } - icon = icons.get(obj.model_type, '🎪') - return format_html('{} {}', icon, obj.name) - name_with_type.short_description = 'Model Name' - name_with_type.admin_order_field = 'name' - - def typical_specs(self, obj): - """Display typical specifications.""" - specs = [] - if obj.typical_height: - specs.append(f'H: {obj.typical_height}m') - if obj.typical_speed: - specs.append(f'S: {obj.typical_speed}km/h') - if obj.typical_capacity: - specs.append(f'C: {obj.typical_capacity}') - return ' | '.join(specs) if specs else '-' - typical_specs.short_description = 'Typical Specs' - - actions = ['export_admin_action'] - - -@admin.register(Park) -class ParkAdmin(ModelAdmin, ImportExportModelAdmin): - """Enhanced admin interface for Park model with geographic features.""" - - resource_class = ParkResource - import_form_class = ImportForm - export_form_class = ExportForm - - list_display = [ - 'name_with_icon', - 'location_display', - 'park_type', - 'status_badge', - 'ride_count', - 'coaster_count', - 'opening_date', - 'operator' - ] - list_filter = [ - ('park_type', ChoicesDropdownFilter), - ('status', ChoicesDropdownFilter), - ('operator', RelatedDropdownFilter), - ('opening_date', RangeDateFilter), - ('closing_date', RangeDateFilter), - ] - search_fields = ['name', 'slug', 'description', 'location'] - readonly_fields = [ - 'id', 'created', 'modified', 'ride_count', 'coaster_count', - 'slug', 'coordinates_display' - ] - prepopulated_fields = {} - autocomplete_fields = ['operator'] - inlines = [RideInline, PhotoInline] - - list_per_page = 50 - - # Use GeoDjango admin for PostGIS mode - if hasattr(settings, 'DATABASES') and 'postgis' in settings.DATABASES['default'].get('ENGINE', ''): - change_form_template = 'gis/admin/change_form.html' - - fieldsets = ( - ('Basic Information', { - 'fields': ('name', 'slug', 'description', 'park_type', 'status') - }), - ('Geographic Location', { - 'fields': ('location', 'latitude', 'longitude', 'coordinates_display'), - 'description': 'Enter latitude and longitude for the park location' - }), - ('Dates', { - 'fields': ( - 'opening_date', 'opening_date_precision', - 'closing_date', 'closing_date_precision' - ) - }), - ('Operator', { - 'fields': ('operator',) - }), - ('Media & Web', { - 'fields': ( - 'banner_image_id', 'banner_image_url', - 'logo_image_id', 'logo_image_url', - 'website' - ), - 'classes': ['collapse'] - }), - ('Statistics', { - 'fields': ('ride_count', 'coaster_count'), - 'classes': ['collapse'] - }), - ('Custom Data', { - 'fields': ('custom_fields',), - 'classes': ['collapse'], - 'description': 'Additional custom data in JSON format' - }), - ('System Information', { - 'fields': ('id', 'created', 'modified'), - 'classes': ['collapse'] - }), - ) - - def name_with_icon(self, obj): - """Display name with park type icon.""" - icons = { - 'theme_park': '🎡', - 'amusement_park': '🎢', - 'water_park': '🌊', - 'indoor_park': '🏢', - 'fairground': '🎪', - } - icon = icons.get(obj.park_type, '🎠') - return format_html('{} {}', icon, obj.name) - name_with_icon.short_description = 'Park Name' - name_with_icon.admin_order_field = 'name' - - def location_display(self, obj): - """Display location with coordinates.""" - if obj.location: - coords = obj.coordinates - if coords: - return format_html( - '{}
({:.4f}, {:.4f})', - obj.location, coords[0], coords[1] - ) - return obj.location - return '-' - location_display.short_description = 'Location' - - def coordinates_display(self, obj): - """Read-only display of coordinates.""" - coords = obj.coordinates - if coords: - return f"Longitude: {coords[0]:.6f}, Latitude: {coords[1]:.6f}" - return "No coordinates set" - coordinates_display.short_description = 'Current Coordinates' - - def status_badge(self, obj): - """Display status as colored badge.""" - colors = { - 'operating': 'green', - 'closed_temporarily': 'orange', - 'closed_permanently': 'red', - 'under_construction': 'blue', - 'planned': 'purple', - } - color = colors.get(obj.status, 'gray') - return format_html( - '' - '{}', - color, obj.get_status_display() - ) - status_badge.short_description = 'Status' - status_badge.admin_order_field = 'status' - - actions = ['export_admin_action', 'activate_parks', 'close_parks'] - - def activate_parks(self, request, queryset): - """Bulk action to activate parks.""" - updated = queryset.update(status='operating') - self.message_user(request, f'{updated} park(s) marked as operating.') - activate_parks.short_description = 'Mark selected parks as operating' - - def close_parks(self, request, queryset): - """Bulk action to close parks temporarily.""" - updated = queryset.update(status='closed_temporarily') - self.message_user(request, f'{updated} park(s) marked as temporarily closed.') - close_parks.short_description = 'Mark selected parks as temporarily closed' - - -@admin.register(Ride) -class RideAdmin(ModelAdmin, ImportExportModelAdmin): - """Enhanced admin interface for Ride model.""" - - resource_class = RideResource - import_form_class = ImportForm - export_form_class = ExportForm - - list_display = [ - 'name_with_icon', - 'park', - 'ride_category', - 'status_badge', - 'manufacturer', - 'stats_display', - 'opening_date', - 'coaster_badge' - ] - list_filter = [ - ('ride_category', ChoicesDropdownFilter), - ('status', ChoicesDropdownFilter), - ('is_coaster', admin.BooleanFieldListFilter), - ('park', RelatedDropdownFilter), - ('manufacturer', RelatedDropdownFilter), - ('opening_date', RangeDateFilter), - ('height', RangeNumericFilter), - ('speed', RangeNumericFilter), - ] - search_fields = [ - 'name', 'slug', 'description', - 'park__name', 'manufacturer__name' - ] - readonly_fields = ['id', 'created', 'modified', 'is_coaster', 'slug'] - prepopulated_fields = {} - autocomplete_fields = ['park', 'manufacturer', 'model'] - inlines = [PhotoInline] - - list_per_page = 50 - - fieldsets = ( - ('Basic Information', { - 'fields': ('name', 'slug', 'description', 'park') - }), - ('Classification', { - 'fields': ('ride_category', 'ride_type', 'is_coaster', 'status') - }), - ('Dates', { - 'fields': ( - 'opening_date', 'opening_date_precision', - 'closing_date', 'closing_date_precision' - ) - }), - ('Manufacturer & Model', { - 'fields': ('manufacturer', 'model') - }), - ('Ride Statistics', { - 'fields': ( - 'height', 'speed', 'length', - 'duration', 'inversions', 'capacity' - ), - 'description': 'Technical specifications and statistics' - }), - ('Media', { - 'fields': ('image_id', 'image_url'), - 'classes': ['collapse'] - }), - ('Custom Data', { - 'fields': ('custom_fields',), - 'classes': ['collapse'] - }), - ('System Information', { - 'fields': ('id', 'created', 'modified'), - 'classes': ['collapse'] - }), - ) - - def name_with_icon(self, obj): - """Display name with category icon.""" - icons = { - 'roller_coaster': '🎢', - 'water_ride': '🌊', - 'dark_ride': '🎭', - 'flat_ride': '🎡', - 'transport': '🚂', - 'show': '🎪', - } - icon = icons.get(obj.ride_category, '🎠') - return format_html('{} {}', icon, obj.name) - name_with_icon.short_description = 'Ride Name' - name_with_icon.admin_order_field = 'name' - - def stats_display(self, obj): - """Display key statistics.""" - stats = [] - if obj.height: - stats.append(f'H: {obj.height}m') - if obj.speed: - stats.append(f'S: {obj.speed}km/h') - if obj.inversions: - stats.append(f'🔄 {obj.inversions}') - return ' | '.join(stats) if stats else '-' - stats_display.short_description = 'Key Stats' - - def coaster_badge(self, obj): - """Display coaster indicator.""" - if obj.is_coaster: - return format_html( - '' - '🎢 COASTER' - ) - return '' - coaster_badge.short_description = 'Type' - - def status_badge(self, obj): - """Display status as colored badge.""" - colors = { - 'operating': 'green', - 'closed_temporarily': 'orange', - 'closed_permanently': 'red', - 'under_construction': 'blue', - 'sbno': 'gray', - } - color = colors.get(obj.status, 'gray') - return format_html( - '' - '{}', - color, obj.get_status_display() - ) - status_badge.short_description = 'Status' - status_badge.admin_order_field = 'status' - - actions = ['export_admin_action', 'activate_rides', 'close_rides'] - - def activate_rides(self, request, queryset): - """Bulk action to activate rides.""" - updated = queryset.update(status='operating') - self.message_user(request, f'{updated} ride(s) marked as operating.') - activate_rides.short_description = 'Mark selected rides as operating' - - def close_rides(self, request, queryset): - """Bulk action to close rides temporarily.""" - updated = queryset.update(status='closed_temporarily') - self.message_user(request, f'{updated} ride(s) marked as temporarily closed.') - close_rides.short_description = 'Mark selected rides as temporarily closed' - - -# ============================================================================ -# DASHBOARD CALLBACK -# ============================================================================ - -def dashboard_callback(request, context): - """ - Callback function for Unfold dashboard. - Provides statistics and overview data. - """ - # Entity counts - total_parks = Park.objects.count() - total_rides = Ride.objects.count() - total_companies = Company.objects.count() - total_models = RideModel.objects.count() - - # Operating counts - operating_parks = Park.objects.filter(status='operating').count() - operating_rides = Ride.objects.filter(status='operating').count() - - # Coaster count - total_coasters = Ride.objects.filter(is_coaster=True).count() - - # Recent additions (last 30 days) - from django.utils import timezone - from datetime import timedelta - thirty_days_ago = timezone.now() - timedelta(days=30) - - recent_parks = Park.objects.filter(created__gte=thirty_days_ago).count() - recent_rides = Ride.objects.filter(created__gte=thirty_days_ago).count() - - # Top manufacturers by ride count - top_manufacturers = Company.objects.filter( - company_types__contains=['manufacturer'] - ).annotate( - ride_count_actual=Count('manufactured_rides') - ).order_by('-ride_count_actual')[:5] - - # Parks by type - parks_by_type = Park.objects.values('park_type').annotate( - count=Count('id') - ).order_by('-count') - - context.update({ - 'total_parks': total_parks, - 'total_rides': total_rides, - 'total_companies': total_companies, - 'total_models': total_models, - 'operating_parks': operating_parks, - 'operating_rides': operating_rides, - 'total_coasters': total_coasters, - 'recent_parks': recent_parks, - 'recent_rides': recent_rides, - 'top_manufacturers': top_manufacturers, - 'parks_by_type': parks_by_type, - }) - - return context diff --git a/django/apps/entities/apps.py b/django/apps/entities/apps.py deleted file mode 100644 index 68234afe..00000000 --- a/django/apps/entities/apps.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Entities app configuration. -""" - -from django.apps import AppConfig - - -class EntitiesConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.entities' - verbose_name = 'Entities' - - def ready(self): - """Import signal handlers when app is ready.""" - import apps.entities.signals # noqa diff --git a/django/apps/entities/filters.py b/django/apps/entities/filters.py deleted file mode 100644 index 74056f13..00000000 --- a/django/apps/entities/filters.py +++ /dev/null @@ -1,418 +0,0 @@ -""" -Filter classes for advanced entity filtering. - -Provides reusable filter logic for complex queries. -""" -from typing import Optional, Any, Dict -from datetime import date -from django.db.models import QuerySet, Q -from django.conf import settings - - -# Check if using PostGIS for location-based filtering -_using_postgis = 'postgis' in settings.DATABASES['default']['ENGINE'] - -if _using_postgis: - from django.contrib.gis.geos import Point - from django.contrib.gis.measure import D - - -class BaseEntityFilter: - """Base filter class with common filtering methods.""" - - @staticmethod - def filter_by_date_range( - queryset: QuerySet, - field_name: str, - start_date: Optional[date] = None, - end_date: Optional[date] = None - ) -> QuerySet: - """ - Filter by date range. - - Args: - queryset: Base queryset to filter - field_name: Name of the date field - start_date: Start of date range (inclusive) - end_date: End of date range (inclusive) - - Returns: - Filtered queryset - """ - if start_date: - queryset = queryset.filter(**{f"{field_name}__gte": start_date}) - - if end_date: - queryset = queryset.filter(**{f"{field_name}__lte": end_date}) - - return queryset - - @staticmethod - def filter_by_status( - queryset: QuerySet, - status: Optional[str] = None, - exclude_status: Optional[list] = None - ) -> QuerySet: - """ - Filter by status. - - Args: - queryset: Base queryset to filter - status: Single status to filter by - exclude_status: List of statuses to exclude - - Returns: - Filtered queryset - """ - if status: - queryset = queryset.filter(status=status) - - if exclude_status: - queryset = queryset.exclude(status__in=exclude_status) - - return queryset - - -class CompanyFilter(BaseEntityFilter): - """Filter class for Company entities.""" - - @staticmethod - def filter_by_types( - queryset: QuerySet, - company_types: Optional[list] = None - ) -> QuerySet: - """ - Filter companies by type. - - Args: - queryset: Base queryset to filter - company_types: List of company types to filter by - - Returns: - Filtered queryset - """ - if company_types: - # Since company_types is a JSONField containing a list, - # we need to check if any of the requested types are in the field - q = Q() - for company_type in company_types: - q |= Q(company_types__contains=[company_type]) - queryset = queryset.filter(q) - - return queryset - - @staticmethod - def apply_filters( - queryset: QuerySet, - filters: Dict[str, Any] - ) -> QuerySet: - """ - Apply all company filters. - - Args: - queryset: Base queryset to filter - filters: Dictionary of filter parameters - - Returns: - Filtered queryset - """ - # Company types - if filters.get('company_types'): - queryset = CompanyFilter.filter_by_types( - queryset, - company_types=filters['company_types'] - ) - - # Founded date range - queryset = CompanyFilter.filter_by_date_range( - queryset, - 'founded_date', - start_date=filters.get('founded_after'), - end_date=filters.get('founded_before') - ) - - # Closed date range - queryset = CompanyFilter.filter_by_date_range( - queryset, - 'closed_date', - start_date=filters.get('closed_after'), - end_date=filters.get('closed_before') - ) - - # Location - if filters.get('location_id'): - queryset = queryset.filter(location_id=filters['location_id']) - - return queryset - - -class RideModelFilter(BaseEntityFilter): - """Filter class for RideModel entities.""" - - @staticmethod - def apply_filters( - queryset: QuerySet, - filters: Dict[str, Any] - ) -> QuerySet: - """ - Apply all ride model filters. - - Args: - queryset: Base queryset to filter - filters: Dictionary of filter parameters - - Returns: - Filtered queryset - """ - # Manufacturer - if filters.get('manufacturer_id'): - queryset = queryset.filter(manufacturer_id=filters['manufacturer_id']) - - # Model type - if filters.get('model_type'): - queryset = queryset.filter(model_type=filters['model_type']) - - # Height range - if filters.get('min_height'): - queryset = queryset.filter(typical_height__gte=filters['min_height']) - - if filters.get('max_height'): - queryset = queryset.filter(typical_height__lte=filters['max_height']) - - # Speed range - if filters.get('min_speed'): - queryset = queryset.filter(typical_speed__gte=filters['min_speed']) - - if filters.get('max_speed'): - queryset = queryset.filter(typical_speed__lte=filters['max_speed']) - - return queryset - - -class ParkFilter(BaseEntityFilter): - """Filter class for Park entities.""" - - @staticmethod - def filter_by_location( - queryset: QuerySet, - longitude: float, - latitude: float, - radius_km: float - ) -> QuerySet: - """ - Filter parks by proximity to a location (PostGIS only). - - Args: - queryset: Base queryset to filter - longitude: Longitude coordinate - latitude: Latitude coordinate - radius_km: Search radius in kilometers - - Returns: - Filtered queryset ordered by distance - """ - if not _using_postgis: - # Fallback: No spatial filtering in SQLite - return queryset - - point = Point(longitude, latitude, srid=4326) - - # Filter by distance and annotate with distance - queryset = queryset.filter( - location_point__distance_lte=(point, D(km=radius_km)) - ) - - # This will be ordered by distance in the search service - return queryset - - @staticmethod - def apply_filters( - queryset: QuerySet, - filters: Dict[str, Any] - ) -> QuerySet: - """ - Apply all park filters. - - Args: - queryset: Base queryset to filter - filters: Dictionary of filter parameters - - Returns: - Filtered queryset - """ - # Status - queryset = ParkFilter.filter_by_status( - queryset, - status=filters.get('status'), - exclude_status=filters.get('exclude_status') - ) - - # Park type - if filters.get('park_type'): - queryset = queryset.filter(park_type=filters['park_type']) - - # Operator - if filters.get('operator_id'): - queryset = queryset.filter(operator_id=filters['operator_id']) - - # Opening date range - queryset = ParkFilter.filter_by_date_range( - queryset, - 'opening_date', - start_date=filters.get('opening_after'), - end_date=filters.get('opening_before') - ) - - # Closing date range - queryset = ParkFilter.filter_by_date_range( - queryset, - 'closing_date', - start_date=filters.get('closing_after'), - end_date=filters.get('closing_before') - ) - - # Location-based filtering (PostGIS only) - if _using_postgis and filters.get('location') and filters.get('radius'): - longitude, latitude = filters['location'] - queryset = ParkFilter.filter_by_location( - queryset, - longitude=longitude, - latitude=latitude, - radius_km=filters['radius'] - ) - - # Location (locality) - if filters.get('location_id'): - queryset = queryset.filter(location_id=filters['location_id']) - - # Ride counts - if filters.get('min_ride_count'): - queryset = queryset.filter(ride_count__gte=filters['min_ride_count']) - - if filters.get('min_coaster_count'): - queryset = queryset.filter(coaster_count__gte=filters['min_coaster_count']) - - return queryset - - -class RideFilter(BaseEntityFilter): - """Filter class for Ride entities.""" - - @staticmethod - def filter_by_statistics( - queryset: QuerySet, - filters: Dict[str, Any] - ) -> QuerySet: - """ - Filter rides by statistical attributes (height, speed, length, etc.). - - Args: - queryset: Base queryset to filter - filters: Dictionary of filter parameters - - Returns: - Filtered queryset - """ - # Height range - if filters.get('min_height'): - queryset = queryset.filter(height__gte=filters['min_height']) - - if filters.get('max_height'): - queryset = queryset.filter(height__lte=filters['max_height']) - - # Speed range - if filters.get('min_speed'): - queryset = queryset.filter(speed__gte=filters['min_speed']) - - if filters.get('max_speed'): - queryset = queryset.filter(speed__lte=filters['max_speed']) - - # Length range - if filters.get('min_length'): - queryset = queryset.filter(length__gte=filters['min_length']) - - if filters.get('max_length'): - queryset = queryset.filter(length__lte=filters['max_length']) - - # Duration range - if filters.get('min_duration'): - queryset = queryset.filter(duration__gte=filters['min_duration']) - - if filters.get('max_duration'): - queryset = queryset.filter(duration__lte=filters['max_duration']) - - # Inversions - if filters.get('min_inversions') is not None: - queryset = queryset.filter(inversions__gte=filters['min_inversions']) - - if filters.get('max_inversions') is not None: - queryset = queryset.filter(inversions__lte=filters['max_inversions']) - - return queryset - - @staticmethod - def apply_filters( - queryset: QuerySet, - filters: Dict[str, Any] - ) -> QuerySet: - """ - Apply all ride filters. - - Args: - queryset: Base queryset to filter - filters: Dictionary of filter parameters - - Returns: - Filtered queryset - """ - # Park - if filters.get('park_id'): - queryset = queryset.filter(park_id=filters['park_id']) - - # Manufacturer - if filters.get('manufacturer_id'): - queryset = queryset.filter(manufacturer_id=filters['manufacturer_id']) - - # Model - if filters.get('model_id'): - queryset = queryset.filter(model_id=filters['model_id']) - - # Status - queryset = RideFilter.filter_by_status( - queryset, - status=filters.get('status'), - exclude_status=filters.get('exclude_status') - ) - - # Ride category - if filters.get('ride_category'): - queryset = queryset.filter(ride_category=filters['ride_category']) - - # Ride type - if filters.get('ride_type'): - queryset = queryset.filter(ride_type__icontains=filters['ride_type']) - - # Is coaster - if filters.get('is_coaster') is not None: - queryset = queryset.filter(is_coaster=filters['is_coaster']) - - # Opening date range - queryset = RideFilter.filter_by_date_range( - queryset, - 'opening_date', - start_date=filters.get('opening_after'), - end_date=filters.get('opening_before') - ) - - # Closing date range - queryset = RideFilter.filter_by_date_range( - queryset, - 'closing_date', - start_date=filters.get('closing_after'), - end_date=filters.get('closing_before') - ) - - # Statistical filters - queryset = RideFilter.filter_by_statistics(queryset, filters) - - return queryset diff --git a/django/apps/entities/migrations/0001_initial.py b/django/apps/entities/migrations/0001_initial.py deleted file mode 100644 index 1ad70e03..00000000 --- a/django/apps/entities/migrations/0001_initial.py +++ /dev/null @@ -1,846 +0,0 @@ -# Generated by Django 4.2.8 on 2025-11-08 16:41 - -import dirtyfields.dirtyfields -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import django_lifecycle.mixins -import model_utils.fields -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ("core", "0001_initial"), - ] - - operations = [ - migrations.CreateModel( - name="Company", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "name", - models.CharField( - db_index=True, - help_text="Official company name", - max_length=255, - unique=True, - ), - ), - ( - "slug", - models.SlugField( - help_text="URL-friendly identifier", max_length=255, unique=True - ), - ), - ( - "description", - models.TextField( - blank=True, help_text="Company description and history" - ), - ), - ( - "company_types", - models.JSONField( - default=list, - help_text="List of company types (manufacturer, operator, etc.)", - ), - ), - ( - "founded_date", - models.DateField( - blank=True, help_text="Company founding date", null=True - ), - ), - ( - "founded_date_precision", - models.CharField( - choices=[("year", "Year"), ("month", "Month"), ("day", "Day")], - default="day", - help_text="Precision of founded date", - max_length=20, - ), - ), - ( - "closed_date", - models.DateField( - blank=True, - help_text="Company closure date (if applicable)", - null=True, - ), - ), - ( - "closed_date_precision", - models.CharField( - choices=[("year", "Year"), ("month", "Month"), ("day", "Day")], - default="day", - help_text="Precision of closed date", - max_length=20, - ), - ), - ( - "website", - models.URLField(blank=True, help_text="Official company website"), - ), - ( - "logo_image_id", - models.CharField( - blank=True, - help_text="CloudFlare image ID for company logo", - max_length=255, - ), - ), - ( - "logo_image_url", - models.URLField( - blank=True, help_text="CloudFlare image URL for company logo" - ), - ), - ( - "park_count", - models.IntegerField( - default=0, help_text="Number of parks operated (for operators)" - ), - ), - ( - "ride_count", - models.IntegerField( - default=0, - help_text="Number of rides manufactured (for manufacturers)", - ), - ), - ( - "location", - models.ForeignKey( - blank=True, - help_text="Company headquarters location", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="companies", - to="core.locality", - ), - ), - ], - options={ - "verbose_name": "Company", - "verbose_name_plural": "Companies", - "ordering": ["name"], - }, - bases=( - dirtyfields.dirtyfields.DirtyFieldsMixin, - django_lifecycle.mixins.LifecycleModelMixin, - models.Model, - ), - ), - migrations.CreateModel( - name="Park", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "name", - models.CharField( - db_index=True, help_text="Official park name", max_length=255 - ), - ), - ( - "slug", - models.SlugField( - help_text="URL-friendly identifier", max_length=255, unique=True - ), - ), - ( - "description", - models.TextField( - blank=True, help_text="Park description and history" - ), - ), - ( - "park_type", - models.CharField( - choices=[ - ("theme_park", "Theme Park"), - ("amusement_park", "Amusement Park"), - ("water_park", "Water Park"), - ( - "family_entertainment_center", - "Family Entertainment Center", - ), - ("traveling_park", "Traveling Park"), - ("zoo", "Zoo"), - ("aquarium", "Aquarium"), - ], - db_index=True, - help_text="Type of park", - max_length=50, - ), - ), - ( - "status", - models.CharField( - choices=[ - ("operating", "Operating"), - ("closed", "Closed"), - ("sbno", "Standing But Not Operating"), - ("under_construction", "Under Construction"), - ("planned", "Planned"), - ], - db_index=True, - default="operating", - help_text="Current operational status", - max_length=50, - ), - ), - ( - "opening_date", - models.DateField( - blank=True, - db_index=True, - help_text="Park opening date", - null=True, - ), - ), - ( - "opening_date_precision", - models.CharField( - choices=[("year", "Year"), ("month", "Month"), ("day", "Day")], - default="day", - help_text="Precision of opening date", - max_length=20, - ), - ), - ( - "closing_date", - models.DateField( - blank=True, help_text="Park closing date (if closed)", null=True - ), - ), - ( - "closing_date_precision", - models.CharField( - choices=[("year", "Year"), ("month", "Month"), ("day", "Day")], - default="day", - help_text="Precision of closing date", - max_length=20, - ), - ), - ( - "latitude", - models.DecimalField( - blank=True, - decimal_places=7, - help_text="Latitude coordinate", - max_digits=10, - null=True, - ), - ), - ( - "longitude", - models.DecimalField( - blank=True, - decimal_places=7, - help_text="Longitude coordinate", - max_digits=10, - null=True, - ), - ), - ( - "website", - models.URLField(blank=True, help_text="Official park website"), - ), - ( - "banner_image_id", - models.CharField( - blank=True, - help_text="CloudFlare image ID for park banner", - max_length=255, - ), - ), - ( - "banner_image_url", - models.URLField( - blank=True, help_text="CloudFlare image URL for park banner" - ), - ), - ( - "logo_image_id", - models.CharField( - blank=True, - help_text="CloudFlare image ID for park logo", - max_length=255, - ), - ), - ( - "logo_image_url", - models.URLField( - blank=True, help_text="CloudFlare image URL for park logo" - ), - ), - ( - "ride_count", - models.IntegerField(default=0, help_text="Total number of rides"), - ), - ( - "coaster_count", - models.IntegerField( - default=0, help_text="Number of roller coasters" - ), - ), - ( - "custom_fields", - models.JSONField( - blank=True, - default=dict, - help_text="Additional park-specific data", - ), - ), - ( - "location", - models.ForeignKey( - blank=True, - help_text="Park location", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="parks", - to="core.locality", - ), - ), - ( - "operator", - models.ForeignKey( - blank=True, - help_text="Current park operator", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="operated_parks", - to="entities.company", - ), - ), - ], - options={ - "verbose_name": "Park", - "verbose_name_plural": "Parks", - "ordering": ["name"], - }, - bases=( - dirtyfields.dirtyfields.DirtyFieldsMixin, - django_lifecycle.mixins.LifecycleModelMixin, - models.Model, - ), - ), - migrations.CreateModel( - name="RideModel", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "name", - models.CharField( - db_index=True, - help_text="Model name (e.g., 'Inverted Coaster', 'Boomerang')", - max_length=255, - ), - ), - ( - "slug", - models.SlugField( - help_text="URL-friendly identifier", max_length=255, unique=True - ), - ), - ( - "description", - models.TextField( - blank=True, help_text="Model description and technical details" - ), - ), - ( - "model_type", - models.CharField( - choices=[ - ("coaster_model", "Roller Coaster Model"), - ("flat_ride_model", "Flat Ride Model"), - ("water_ride_model", "Water Ride Model"), - ("dark_ride_model", "Dark Ride Model"), - ("transport_ride_model", "Transport Ride Model"), - ], - db_index=True, - help_text="Type of ride model", - max_length=50, - ), - ), - ( - "typical_height", - models.DecimalField( - blank=True, - decimal_places=1, - help_text="Typical height in feet", - max_digits=6, - null=True, - ), - ), - ( - "typical_speed", - models.DecimalField( - blank=True, - decimal_places=1, - help_text="Typical speed in mph", - max_digits=6, - null=True, - ), - ), - ( - "typical_capacity", - models.IntegerField( - blank=True, help_text="Typical hourly capacity", null=True - ), - ), - ( - "image_id", - models.CharField( - blank=True, help_text="CloudFlare image ID", max_length=255 - ), - ), - ( - "image_url", - models.URLField(blank=True, help_text="CloudFlare image URL"), - ), - ( - "installation_count", - models.IntegerField( - default=0, help_text="Number of installations worldwide" - ), - ), - ( - "manufacturer", - models.ForeignKey( - help_text="Manufacturer of this ride model", - on_delete=django.db.models.deletion.CASCADE, - related_name="ride_models", - to="entities.company", - ), - ), - ], - options={ - "verbose_name": "Ride Model", - "verbose_name_plural": "Ride Models", - "ordering": ["manufacturer__name", "name"], - }, - bases=( - dirtyfields.dirtyfields.DirtyFieldsMixin, - django_lifecycle.mixins.LifecycleModelMixin, - models.Model, - ), - ), - migrations.CreateModel( - name="Ride", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "name", - models.CharField( - db_index=True, help_text="Ride name", max_length=255 - ), - ), - ( - "slug", - models.SlugField( - help_text="URL-friendly identifier", max_length=255, unique=True - ), - ), - ( - "description", - models.TextField( - blank=True, help_text="Ride description and history" - ), - ), - ( - "ride_category", - models.CharField( - choices=[ - ("roller_coaster", "Roller Coaster"), - ("flat_ride", "Flat Ride"), - ("water_ride", "Water Ride"), - ("dark_ride", "Dark Ride"), - ("transport_ride", "Transport Ride"), - ("other", "Other"), - ], - db_index=True, - help_text="Broad ride category", - max_length=50, - ), - ), - ( - "ride_type", - models.CharField( - blank=True, - db_index=True, - help_text="Specific ride type (e.g., 'Inverted Coaster', 'Drop Tower')", - max_length=100, - ), - ), - ( - "is_coaster", - models.BooleanField( - db_index=True, - default=False, - help_text="Is this ride a roller coaster?", - ), - ), - ( - "status", - models.CharField( - choices=[ - ("operating", "Operating"), - ("closed", "Closed"), - ("sbno", "Standing But Not Operating"), - ("relocated", "Relocated"), - ("under_construction", "Under Construction"), - ("planned", "Planned"), - ], - db_index=True, - default="operating", - help_text="Current operational status", - max_length=50, - ), - ), - ( - "opening_date", - models.DateField( - blank=True, - db_index=True, - help_text="Ride opening date", - null=True, - ), - ), - ( - "opening_date_precision", - models.CharField( - choices=[("year", "Year"), ("month", "Month"), ("day", "Day")], - default="day", - help_text="Precision of opening date", - max_length=20, - ), - ), - ( - "closing_date", - models.DateField( - blank=True, help_text="Ride closing date (if closed)", null=True - ), - ), - ( - "closing_date_precision", - models.CharField( - choices=[("year", "Year"), ("month", "Month"), ("day", "Day")], - default="day", - help_text="Precision of closing date", - max_length=20, - ), - ), - ( - "height", - models.DecimalField( - blank=True, - decimal_places=1, - help_text="Height in feet", - max_digits=6, - null=True, - ), - ), - ( - "speed", - models.DecimalField( - blank=True, - decimal_places=1, - help_text="Top speed in mph", - max_digits=6, - null=True, - ), - ), - ( - "length", - models.DecimalField( - blank=True, - decimal_places=1, - help_text="Track/ride length in feet", - max_digits=8, - null=True, - ), - ), - ( - "duration", - models.IntegerField( - blank=True, help_text="Ride duration in seconds", null=True - ), - ), - ( - "inversions", - models.IntegerField( - blank=True, - help_text="Number of inversions (for coasters)", - null=True, - ), - ), - ( - "capacity", - models.IntegerField( - blank=True, - help_text="Hourly capacity (riders per hour)", - null=True, - ), - ), - ( - "image_id", - models.CharField( - blank=True, - help_text="CloudFlare image ID for main photo", - max_length=255, - ), - ), - ( - "image_url", - models.URLField( - blank=True, help_text="CloudFlare image URL for main photo" - ), - ), - ( - "custom_fields", - models.JSONField( - blank=True, - default=dict, - help_text="Additional ride-specific data", - ), - ), - ( - "manufacturer", - models.ForeignKey( - blank=True, - help_text="Ride manufacturer", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="manufactured_rides", - to="entities.company", - ), - ), - ( - "model", - models.ForeignKey( - blank=True, - help_text="Specific ride model", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="rides", - to="entities.ridemodel", - ), - ), - ( - "park", - models.ForeignKey( - help_text="Park where ride is located", - on_delete=django.db.models.deletion.CASCADE, - related_name="rides", - to="entities.park", - ), - ), - ], - options={ - "verbose_name": "Ride", - "verbose_name_plural": "Rides", - "ordering": ["park__name", "name"], - }, - bases=( - dirtyfields.dirtyfields.DirtyFieldsMixin, - django_lifecycle.mixins.LifecycleModelMixin, - models.Model, - ), - ), - migrations.AddIndex( - model_name="ridemodel", - index=models.Index( - fields=["manufacturer", "name"], name="entities_ri_manufac_1fe3c1_idx" - ), - ), - migrations.AddIndex( - model_name="ridemodel", - index=models.Index( - fields=["model_type"], name="entities_ri_model_t_610d23_idx" - ), - ), - migrations.AlterUniqueTogether( - name="ridemodel", - unique_together={("manufacturer", "name")}, - ), - migrations.AddIndex( - model_name="ride", - index=models.Index( - fields=["park", "name"], name="entities_ri_park_id_e73e3b_idx" - ), - ), - migrations.AddIndex( - model_name="ride", - index=models.Index(fields=["slug"], name="entities_ri_slug_d2d6bb_idx"), - ), - migrations.AddIndex( - model_name="ride", - index=models.Index(fields=["status"], name="entities_ri_status_b69114_idx"), - ), - migrations.AddIndex( - model_name="ride", - index=models.Index( - fields=["is_coaster"], name="entities_ri_is_coas_912a4d_idx" - ), - ), - migrations.AddIndex( - model_name="ride", - index=models.Index( - fields=["ride_category"], name="entities_ri_ride_ca_bc4554_idx" - ), - ), - migrations.AddIndex( - model_name="ride", - index=models.Index( - fields=["opening_date"], name="entities_ri_opening_c4fc53_idx" - ), - ), - migrations.AddIndex( - model_name="ride", - index=models.Index( - fields=["manufacturer"], name="entities_ri_manufac_0d9a25_idx" - ), - ), - migrations.AddIndex( - model_name="park", - index=models.Index(fields=["name"], name="entities_pa_name_f8a746_idx"), - ), - migrations.AddIndex( - model_name="park", - index=models.Index(fields=["slug"], name="entities_pa_slug_a21c73_idx"), - ), - migrations.AddIndex( - model_name="park", - index=models.Index(fields=["status"], name="entities_pa_status_805296_idx"), - ), - migrations.AddIndex( - model_name="park", - index=models.Index( - fields=["park_type"], name="entities_pa_park_ty_8eba41_idx" - ), - ), - migrations.AddIndex( - model_name="park", - index=models.Index( - fields=["opening_date"], name="entities_pa_opening_102a60_idx" - ), - ), - migrations.AddIndex( - model_name="park", - index=models.Index( - fields=["location"], name="entities_pa_locatio_20a884_idx" - ), - ), - migrations.AddIndex( - model_name="company", - index=models.Index(fields=["name"], name="entities_co_name_d061e8_idx"), - ), - migrations.AddIndex( - model_name="company", - index=models.Index(fields=["slug"], name="entities_co_slug_00ae5c_idx"), - ), - ] diff --git a/django/apps/entities/migrations/0002_alter_park_latitude_alter_park_longitude.py b/django/apps/entities/migrations/0002_alter_park_latitude_alter_park_longitude.py deleted file mode 100644 index ab3177c2..00000000 --- a/django/apps/entities/migrations/0002_alter_park_latitude_alter_park_longitude.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 4.2.8 on 2025-11-08 17:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("entities", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="park", - name="latitude", - field=models.DecimalField( - blank=True, - decimal_places=7, - help_text="Latitude coordinate. Primary in local dev, use location_point in production.", - max_digits=10, - null=True, - ), - ), - migrations.AlterField( - model_name="park", - name="longitude", - field=models.DecimalField( - blank=True, - decimal_places=7, - help_text="Longitude coordinate. Primary in local dev, use location_point in production.", - max_digits=10, - null=True, - ), - ), - ] diff --git a/django/apps/entities/migrations/0003_add_search_vector_gin_indexes.py b/django/apps/entities/migrations/0003_add_search_vector_gin_indexes.py deleted file mode 100644 index f9351ce4..00000000 --- a/django/apps/entities/migrations/0003_add_search_vector_gin_indexes.py +++ /dev/null @@ -1,141 +0,0 @@ -# Generated migration for Phase 2 - GIN Index Optimization -from django.db import migrations, connection -from django.contrib.postgres.indexes import GinIndex -from django.contrib.postgres.search import SearchVector - - -def is_postgresql(): - """Check if the database backend is PostgreSQL/PostGIS.""" - return 'postgis' in connection.vendor or 'postgresql' in connection.vendor - - -def populate_search_vectors(apps, schema_editor): - """Populate search_vector fields for all existing records.""" - if not is_postgresql(): - return - - # Get models - Company = apps.get_model('entities', 'Company') - RideModel = apps.get_model('entities', 'RideModel') - Park = apps.get_model('entities', 'Park') - Ride = apps.get_model('entities', 'Ride') - - # Update Company search vectors - Company.objects.update( - search_vector=( - SearchVector('name', weight='A') + - SearchVector('description', weight='B') - ) - ) - - # Update RideModel search vectors - RideModel.objects.update( - search_vector=( - SearchVector('name', weight='A') + - SearchVector('manufacturer__name', weight='A') + - SearchVector('description', weight='B') - ) - ) - - # Update Park search vectors - Park.objects.update( - search_vector=( - SearchVector('name', weight='A') + - SearchVector('description', weight='B') - ) - ) - - # Update Ride search vectors - Ride.objects.update( - search_vector=( - SearchVector('name', weight='A') + - SearchVector('park__name', weight='A') + - SearchVector('manufacturer__name', weight='B') + - SearchVector('description', weight='B') - ) - ) - - -def reverse_search_vectors(apps, schema_editor): - """Clear search_vector fields for all records.""" - if not is_postgresql(): - return - - # Get models - Company = apps.get_model('entities', 'Company') - RideModel = apps.get_model('entities', 'RideModel') - Park = apps.get_model('entities', 'Park') - Ride = apps.get_model('entities', 'Ride') - - # Clear all search vectors - Company.objects.update(search_vector=None) - RideModel.objects.update(search_vector=None) - Park.objects.update(search_vector=None) - Ride.objects.update(search_vector=None) - - -def add_gin_indexes(apps, schema_editor): - """Add GIN indexes on search_vector fields (PostgreSQL only).""" - if not is_postgresql(): - return - - # Use raw SQL to add GIN indexes - with schema_editor.connection.cursor() as cursor: - cursor.execute(""" - CREATE INDEX IF NOT EXISTS entities_company_search_idx - ON entities_company USING gin(search_vector); - """) - cursor.execute(""" - CREATE INDEX IF NOT EXISTS entities_ridemodel_search_idx - ON entities_ridemodel USING gin(search_vector); - """) - cursor.execute(""" - CREATE INDEX IF NOT EXISTS entities_park_search_idx - ON entities_park USING gin(search_vector); - """) - cursor.execute(""" - CREATE INDEX IF NOT EXISTS entities_ride_search_idx - ON entities_ride USING gin(search_vector); - """) - - -def remove_gin_indexes(apps, schema_editor): - """Remove GIN indexes (PostgreSQL only).""" - if not is_postgresql(): - return - - # Use raw SQL to drop GIN indexes - with schema_editor.connection.cursor() as cursor: - cursor.execute("DROP INDEX IF EXISTS entities_company_search_idx;") - cursor.execute("DROP INDEX IF EXISTS entities_ridemodel_search_idx;") - cursor.execute("DROP INDEX IF EXISTS entities_park_search_idx;") - cursor.execute("DROP INDEX IF EXISTS entities_ride_search_idx;") - - -class Migration(migrations.Migration): - """ - Phase 2 Migration: Add GIN indexes for search optimization. - - This migration: - 1. Adds GIN indexes on search_vector fields for optimal full-text search - 2. Populates search vectors for all existing database records - 3. Is PostgreSQL-specific and safe for SQLite environments - """ - - dependencies = [ - ('entities', '0002_alter_park_latitude_alter_park_longitude'), - ] - - operations = [ - # First, populate search vectors for existing records - migrations.RunPython( - populate_search_vectors, - reverse_search_vectors, - ), - - # Add GIN indexes for each model's search_vector field - migrations.RunPython( - add_gin_indexes, - remove_gin_indexes, - ), - ] diff --git a/django/apps/entities/migrations/__init__.py b/django/apps/entities/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/entities/migrations/__pycache__/0001_initial.cpython-313.pyc b/django/apps/entities/migrations/__pycache__/0001_initial.cpython-313.pyc deleted file mode 100644 index 01eb3292f4058bba7e3467630411e2c7897ed4ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16395 zcmeHOX>{Dybso+>!yz>yhZ04K5;&qrjw}rqkrZjkjwMp7sck^Xj>`rG2OtS+I2Z#M zOGKU6X;Qaox+rc_r@P$EOVid#(=AQ+O-=uh`a>M}M|w_w=^quhzuSA?126z*u~gcp z_Br-BngQPX?tS-N-22^&H}v~0EpZ?G_dR8Y^wpa_-+$tb{a?tsc)ti2U-z*-w&`h~ z(gffBr~MZKO5j3J2{Lp%q=d)VQn#p%UNp$+sJ~q(hV}tX7T$jB_<$F9p zua%aircCHQ-dxJ~&G?G6r0|*~7gaO7A`4kM=bFjwN|7z_ew|6Vb=VQZch>c7I#{6uw z&YJtHrMA6h)LJt(pUkDJ^{0LFZMpvHaj@18|Kd|Yu(ugxZ9lu9;6Fc`U|Zm`mEd*& z?vM*$T>>siP&>))+W>XACd$vYv#BXRtk?mVY%R=uC%cQ?O)#B+8Lfo@d-lM;F0xuT zplaGa?3o`?rGpn0&l?HpkQ$J5gio$?7roC_BcE zPld<)LpvcSC)nnpCiYl1Fwf+ksz&EdRgcZ5b7!hYbLXnZU~dX`3$ZbFS8TKjmB+2bl4Y1P$JHws^^qHv;@XuL5 z*W(sHdk!?8Ct5Ew&`R0mX@?7D8|b{~u*;+xni}!i=PX|1z@mEm_+u7^ z2TaY%1H3oDF0gqL!;KhH_(&L1v>B3J1Pkl2^U_DM_A)D3?A*ytvCn_(*!jk%?7U5O zE_{gWykcc!5#qESJIjP|OAb4~0N8p=rm!ljIZRe=hu-pz3kiOV)lrUw6GD>=!I{c^NRZbN7{Pc2!rZ>j3*j$lIU5IyKbFeu@1u`;(Bl z{*P5(_3EdYyUon~sSh!8f7*)Vuhh#4cxU<|5ZG+I;S3-~LF}euw=7+KaK@th@Ffegw7T9rll`TGGY7%KkC? z?*C&gnXAbo-vWPJuQ~HFvGv>RpG^7L?@amOE&ow96yZGLPhIlQ)?DXX?4OM^v47rR zg};N0TyAAnMApcj}kiQM`-`j@#S3v%+w;_KPCNsK>nXUQ2t*U`u|_I zA&>sQYs(MqQjW0yrev4CpZRw)cG3O~;(h`We-3_@2CgZ0bLbJ@oqFjbe z3Y-A$);nx#$f#6YVsIF?(2dp;fnc#*D44t4Vq8fP^O6eN$prAhu8O>320sg*X#I*@ z1ZRaV;uqWp1b)>F%irbV!*ht_mt`q0suiP&FU{tB0V2RM zyw5fq2VvJl12ZTsGJL62kn$Kc8MDJBQZZWZ^w>Z#M1dK(DK4lIIHt2IRIC}Zr64cK z97NfY$Vr0UH(ij+!kGdOHjqK){0wYMah?#u-43OjX?1BSD+T>vl^O`IDm`Yr#49(r zJUl{8@uNEjFO^poLyjsMS&SaBkV{}GiF?Y7^R~6a77A7RmK%RmZWP$0qJN# z&Xb=M^&Z>v%OWqlQ05g)R8+>EHe)nkB?wlCT}8~|OhM9CGvP{5Df_^7GbR@~_;FIy zAiou{fay>3+po!Hj4lIuzB>zIgb^+MbaPC;}4gWq}BH#v|fIiF_a|fn2A7m$F*f~MdWZ$kI&&X zgW@pL%CD4FxG!pSw)LcaZzJM2Vb6*s`wU*&Gu?~)id0zTKv+~XUMdnbd2*|FpCOaX zY4;>EO(t<&P2pb@3*ZxL-8uW-)*jGh*$g}<%YcsZ_zb1;iWxm=UFnHAAR9ZR?&G08 zcy|Du=w ztTC5ljd4r0AxS9^u0>T-%6USaZP##&nRbnVwnz!svIw;xa)n+f_zRZaHC^Pms`xmG+wrID>4)47iXm& zvXV7aAv5Z`jJeAVuB+cI4jBvis+9%tegyr|K5N|qF+t8qMF_Y1_?HZs5ZRI0DgdXi z@CC>$9@&?WKPi8Lv?OV&m9qu82zQ`XPtDqwE|sntiz&g_thr+WACgkx%>&bQc$0`x zw3+lsAx~D*t<94zIlZ@`a-?28T?O$dBAAXjS%au4IuuLD5^FNAV&W1W*7vx`R4x=C zLalifkYy<9D;(t{z2~F=4Gj%NH1~*F0-r-mf)AXxi-Z%Addn4bp+l`9lu?25tnv=k z+lq0rcYD}urB}eFL_kkM8o;umnx)*lYKBm;YQ}Ov{ul8NMD$VeMF^1@6thd&!_2_> zA}}tHGGrXt?*NRQlI0a>E{aP78GV4tY;9yTF~3}d3S0mR1?noO&_v-Hlruvaf5m}h zTuei$ar z7Fz_7_YlsGoE#vZ2GhTDV zXDXBxLcJs44h8FsaumH5uRIvNxpJ+VZSJKw+AIVSpp#H0;j8Z@5?iCvYOl=}1(%0j zMqI*fI}CBws*w1D9g{HETfOlJh?o0khw2_ zv*8htUcXY%@WsW9ORD3KedkrzQ{)-yE}P{(V>eI^Z$YPb7M~^l&4_Xl*8qP&gNGd? z)ah8xzEmzF;wpUTJ9B8hyFltaWGGLoWOYdl)0EO%&yjqyQ_Bp|Y)a0-Mm?Dnrmu1O z9&ma7#t`ur9kONbN5K?$4}{K=G#s780{a$Gst6qkbeC}nxe?!hRQ-TEMeI@9e%plr z`e!>!_1<&dv}Fd-5@?};)fr6bOpV%Py;H0}C&-kRWlh$r>!)46Tp)MB!BxBk$8x$m zr#u-Z5XOWKnzC=ZH`FNWg;1@kw>c#S@99(!tB>A=rG~i)u`JRk1~#xFL2q%S5Nd{U zsLOiCp~+1movPbsgTX4!vY8uM6p!ZNI6=4tFS*Asn(!q6;>{{KzXhq^C zMuvsaqn3hlMFD-8*g@a;IZa*?Nmd4Nd!|Pdnhx@ucLQZU+Y~ouX>+k|h>p7>L*h zS_wgf7YH~E%0s`U;NRz(&C}#)>mo*+*-V0&D{Igfk$^RmC(D{lA;KAacQwPp^Uz?) zW{9B7s3yVLm0T3fKvBMFb|8KhDitUshhRiV3F1<*YuC=tP$j`~SrR}6e2&4(^fIr| z@fZv7XkE_1372(wfxUdm5-h+GlLjA5mj_BTqwMK9?$Wi{S+iM?6m4~pzLFTFG{zhqM4*S)(R&6ZXb z>fOl?2Gko2K=e;E3=z%U#xv2y6;|epRuzGW;*s6sr?(N z{`FMX^awznOR=vB8Y5Gvgb~)H*X|^!6JEvzrlL$K<9j*s*If6xrFf+2-rm z?~*;So;p!ab_ivk@XGEnQe7LVzI&-YgXw!S{ze>E=^HfC0}o;$Tq6o=qe^-~02ao59WML#rBVBVey{d}mZX6jxaKv#m#jQ+FEwB=y=zCFX)tS~ z=e(|g#}AM2;JwsA&}^hn!nTa`;G3B@G8^g9_4MdQ`uKYK_(pnWJw0O_95%WSJ!pxb zYvW+}jlfg>RO{wU(ARs&7#KBr4t(Prn%%mY@a^2YksMf04s0YR*OQY*lCf`(uP2Wi z$z87}zLwaG1lwC5Tn%3I$KspwL04Gs{=|j#+Q{j(+?EI9iu;F&=~?fCW5}by?E0a< zxwmT*{+Ez`BRz~kwLgiEpdB8;Azw$23l|1lE8>{PjP#QT-JL+_4uGb&B!YptIF51b zN!Eu+hAjzou_{|1MhOi)61EU}13(+cz+kkeIgB>Pz~)`P4(bLsY_b;2omyAdQ#mKK z`W^R>2tQkuS_1&Uq$H^|=Y0lS^73?*uqQ8bUg1h!zT33+M2&oRQudrz(7P%U+DR`P zY{}Y@##wvVo3)*U^xauM)mVPq=sx1g`qSZy0m%B#g?+sP#z6M}nDsZp&jldsUxdQu z6tlgbxU4tQ*Q-L}5wpG~UDK?0vN=70soc?wY0(O4!T35b@HSHJw0PV&&{vf`G?d&h z$ewB#=76JZEqnH^;EhNcaHP^>0h(UB!g>LirFLbzvYxu?q+h0@8H>{uuNWl~Qhw6Y zH4D%5I!qiK#SpB})a5{_2|`c^_YHtV}o3XR7GU&U8{Px3EAZa4;Zh6fRf3qkY(Y)XaL?Zccd% z4-_uyO{ZNw)>s}2-;k?tfjrF%$~RBeT$%C>DVdcxemT61C2uZbm%Pkdz&E3h&NqCd zj8(4?A$-$)FWPPFP8)5VuOEKxu+iE7R(Ngq(Avaxc&N}Ahe7~N)I|2({=(W}%vvw3 z|6a7;*tyr}8DHBw0gXP$M_uwg&Px04z)Aya*-KR_s7*HV&Wm@J*T!?}ZESsQcW&Kz ze(l)x^|oi~V~ox^7JHX7ItSKv53UX2+nsl3TXFplWj?s{p>Pki%@55L2X23U?Xjmn zv@ND@zqEGfLLGIC^~f9TupVY*kDh1?f9Zm$UzDo+)&#Ml!%@H5jfI&QuzVg;%{{7FnnwVnwpy45Br+-|G+o+o{xFYxA#5Y gzW024-t#s8SNK#*Q}}j#BiXl}?E7yY-Vu%e3lN8+4gdfE diff --git a/django/apps/entities/migrations/__pycache__/0002_add_postgis_location.cpython-313.pyc b/django/apps/entities/migrations/__pycache__/0002_add_postgis_location.cpython-313.pyc deleted file mode 100644 index 47699b83e16b9d4cf8a5cab769a410ec4e95b934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1585 zcma)6(Qn&C7(d6clQ?Obx?Aa*bu*)74HI@j>ch}LE3}*F##F^aVp64(W8c!Fu5Hd2 z)a?lgiD!5~{0;m!q%Vo?g$E?0zGVu$^PQcDqJ)7H-`)4!_xrx@zTf8?FDw`cp6b_& z^qGdxZ&H{(AZO3`0Zcz47rDwK#1xndj|vAWQxA%)XrWbf3%TkVa*Ic5JM%WdO{N_+ zUofq!w6qH;JZTk#aZ0<)<1~&^p`XS92~&T9$fo*47`GJ}{V0pf3a-Lbx8NwOc%-#! zmjU@&<^q|N+Kt)0wmC<4WsYuTj&601t~sl7HTdc9mfZ4P&8^&3A+_UY|IE&!QOb!I*w*6-;!=wCh3wOo#$*GDdO&=7>V-H7 zJ)fjZb{=Hlo#B9XDNos=R8+z^0!fDc@PCJ%LN3St8QR|zWt^Q3V_{$nr|pFV)-{a3 z>Up6&F-VITKc_6^A&p2B%k6+9Bnn9614m4LSE9Td1P`*(=)sp>)Qv^Sk0Z`#N2pzz zibBv~MQNyK1x$sJk&;7<-H;QOuWNgG6(&1zLZ)BmRg6;(Mf9=9rQ;rOj4`_gUdQkv z5js$RmO9)EW9C4Sj(Z))hk6mv9Wxq+oO%AqyW}hZ1Hzm|7fgqc*&v%X{RM{a&`3v>&5>HTqJQ&vWT49Opxit!H-~Sm50~B? znyWwAKiC6vqi=2u%-enQ_Q16JCTMp0=FY&p-#70MSJsAWH->8;53gQ>|EP+Vca;&+ zm+P-eM#UJdWKP%5%j=obCO93Ko9E`H1m3iUYhMhT>i~RJ{Wr+<8OXC4h;z%-zdc~@ zOpn;o#anr?>c79{pIjPJ7fT&C?fpOUy8SQzsBvrZ7JJPUxFK@Vym<=La luPD6(d1-y`$ zc=o~{q5q9sXeROGiQ5t|UVXDmgM`GBlXT{LZ{BTVY|3h&V#Q{pkn!j?V+u)YhRAw zuIStTkY9q+SuOhRs`Za5!~d*O{=1523dgSqw>?rHRnA7<*_l=YdM(jNGRbJF$}1}? zk1&hCB3u;`B6d}YgAB48(${B05P#TgUfH!Ejz!2KB59-cO0Yd54r(l_@i-v77Si_* zYTcCfO|2tNVirjqkcc?!2HMv+)6ZHjs$z?iXjhGdG=MrBC!7Sp$LUa>U`h8SJP6sx zA!{?4szTJ|yl#O{KMan@9tEG?i#v?+P&qt~AQDI)ZZvcFKlpw{oAqH;!u@|@tXzzN zLzh#)WsKi-3D-Qp8pU{riBxhH(J0o}Ax&r$(kK9>g&sQPKI4*#7n-stXh-?^p#Q#0 zxp6}C8Jxs8l^}e8iIjr1x{{_Ci)qNZfDfr7?@dZY>Pf<5;X(7AZp#Zm2MWH9V4O=q zg58I7KY;)$yzniF+ObEHB=zzE@UExcgHd>li6)5k9N>HmZuoL-8_9vt)70NINI$~% z8TD-BEcYz)u6@+(xyYF~EmcoS)oi+&-I>qEXHLhLPsW$Csk!W4Et~6P^VMu}_I%i$ z7&#wu9k(}iGiBjc3cHmuJ3VfHS{L_oHk__8U%CKW&oT_-w~dVYrCl}bFYf8s()Y2YUkHqT_8;UHNU;C_ diff --git a/django/apps/entities/migrations/__pycache__/0003_add_search_vector_gin_indexes.cpython-313.pyc b/django/apps/entities/migrations/__pycache__/0003_add_search_vector_gin_indexes.cpython-313.pyc deleted file mode 100644 index 4aeff7129f6c35b4d61694a58ffef267e401b74b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5462 zcmeGgU2hZF_0Fd~V>`))Ktf<)fOLgPVnYH#kcBM^Y}O$-sRvf8CF*E0zIFzj8SkAj z4N)J0DixtV&_1A|Y9IEgO4OJBfWGWMh!<2xqpnn`D^>dz5~`K@)N^M%PV9Vc#lBR% zNlxxP_uO+o=6tUw5;B7JhcDXAgPjQdgAT$b)H~}gbesmv`j#t>$VC9Fcn>@9AL zC%oV1ZV6)|5uwlbA`(#rfKgQhD5(*EvKj>#>p>@xD)k~&o?>!6;Z_^}FK|Jh#EY?H z{5v{GvYtF^7K!efw&i%TVOth9=pe~>(NWXNSb01L{kV#CV$6I3lQuCncp}8YfHGd6 z0svQG?lop}bgre1!1xMtx{l2sKnSkI?!BfDCAs*$g8C9 zI+!?VS1;KlT{PX9%5>T&*%k)e3^7Y3m%wI&c&-ctn56Ufb*pHn^>W!sW6L#N6DT)c zG=28$*Ucz*=jkA$9I7$TmoKpZ6(BETSU&ytd zWEFm6$yzMCIQ5s$YFDyV_#MnH^H~xHI%D%=M*-n~lurQr9NlAJ?6(W`|BVj-Gezbu z%2Dc;rm`w`q0ZG}cckGPG~A9fLW73ikw$FL2zS{W{W>izN8hBS-IGFu8d0OFbcx-B zk<}Q*3<8N7zr-l$F85aWCW4(P-(7d(-^y-VZy~%DzHQsyBC+viyWOqGB-`gNPTJ*4 zNq4c*B;88E#HGBW6l|jCrILc@Ovg2?qC&7?lf0A4deKlpv)E&&5ceF^E~FX3AqeTw=UL)BaxPtZr2by5Uwp zMK#UmAeVt>&`%1!hIvvEyV|V3W5k}m51Q$CVxym1x_l zh}sW4vz}TnK3hEevTb-_bfu%~_ievxdojN_^0MRNLS`k_{_N`0t1r%cS$G*6T)5FX z1`a~}$;9J{8sA&xd%unMyg0PTRpSGHgWkJ~PBlLKnqv~@R|O;-d5r`?T1lV)rjffJ5LzWRPI7H7HiU{IX3rOvUZvlS^@BF`P0aZqg z{4m?rSg~*W)L5}^%M-2uI}x4lzg`0Gx4V&O*ap%8Uv4`cBfT(@0De>zT~ z>feg|n(yB#-_+pv^4+yR`DV5Y#&TgC3e3V5MhGkdpU-aRb5-^N>`5DV)a@y_Jt_D- zDTECQkS6#E;{ydEmJ?_IZH{3Itb&fidFb2~?l>wiNpb%2wR~O~&198&sHND}_Ck1? z#)?7M2sEWf$y9d!i5%GT0AA1CymsfNlF8n<`KglmNXbszQEq;kQSYcq=*l!B@MNL5 znfW=TiN{2C3$1cj&16Rv2nSC$xv=C&W99sB8eMvn{TzgV2y^({YpBsSb#|3S=-aLRmAng-ylv( ztVWU4{@s9@t>hd z!qY%ipp?@9_ATMd-D9t!x9Z})+&%s(db=?geHHzkS5KNxXP16QAmoObUQ4r zeCGgXy#pMlJUK&)7DGy7?y}PAsA%dG*i6NSJZILN_bW6hS-vv^RgOl1;j(-#MHf3w za<`M4qg;JO z!z`GFqC;WE(F@p52ca%wLb`~phbFPDS#X_>45b(v@_B<$D;d)C5@cVRFP@NDnr;P5 z_hy`JK~)BjBnE4;$u=(l;j_GG(^!+P04O>>P{wB#AY&>+I)f&o-%5reCLr%KNa|L!erR!OQL%nW zVorXMetKp}Mro3Ma!!6;Do`w=C^ILgq$n{tTQ{|$0H`3fNIxYjF)uw|Ke3>oSU)wd zB(o$Fs4_P*y(qCHGe56bKR!M)FS8^*Uaz3?7Kcr4eoARhs$CH)&@PZ$ib0Hz%#4hT IMa)1J063yD^8f$< diff --git a/django/apps/entities/models.py b/django/apps/entities/models.py deleted file mode 100644 index b991714f..00000000 --- a/django/apps/entities/models.py +++ /dev/null @@ -1,930 +0,0 @@ -""" -Entity models for ThrillWiki Django backend. - -This module contains the core entity models: -- Company: Manufacturers, operators, designers -- RideModel: Specific ride models from manufacturers -- Park: Theme parks, amusement parks, water parks, FECs -- Ride: Individual rides and roller coasters -""" -from django.db import models -from django.conf import settings -from django.contrib.contenttypes.fields import GenericRelation -from django.utils.text import slugify -from django_lifecycle import hook, AFTER_CREATE, AFTER_UPDATE, BEFORE_SAVE - -from apps.core.models import VersionedModel, BaseModel - -# Conditionally import GIS models only if using PostGIS backend -# This allows migrations to run on SQLite during local development -_using_postgis = ( - 'postgis' in settings.DATABASES['default']['ENGINE'] -) - -if _using_postgis: - from django.contrib.gis.db import models as gis_models - from django.contrib.gis.geos import Point - from django.contrib.postgres.search import SearchVectorField - - -class Company(VersionedModel): - """ - Represents a company in the amusement industry. - Can be a manufacturer, operator, designer, or combination. - """ - - COMPANY_TYPE_CHOICES = [ - ('manufacturer', 'Manufacturer'), - ('operator', 'Operator'), - ('designer', 'Designer'), - ('supplier', 'Supplier'), - ('contractor', 'Contractor'), - ] - - # Basic Info - name = models.CharField( - max_length=255, - unique=True, - db_index=True, - help_text="Official company name" - ) - slug = models.SlugField( - max_length=255, - unique=True, - db_index=True, - help_text="URL-friendly identifier" - ) - description = models.TextField( - blank=True, - help_text="Company description and history" - ) - - # Company Types (can be multiple) - company_types = models.JSONField( - default=list, - help_text="List of company types (manufacturer, operator, etc.)" - ) - - # Location - location = models.ForeignKey( - 'core.Locality', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='companies', - help_text="Company headquarters location" - ) - - # Dates with precision tracking - founded_date = models.DateField( - null=True, - blank=True, - help_text="Company founding date" - ) - founded_date_precision = models.CharField( - max_length=20, - default='day', - choices=[ - ('year', 'Year'), - ('month', 'Month'), - ('day', 'Day'), - ], - help_text="Precision of founded date" - ) - - closed_date = models.DateField( - null=True, - blank=True, - help_text="Company closure date (if applicable)" - ) - closed_date_precision = models.CharField( - max_length=20, - default='day', - choices=[ - ('year', 'Year'), - ('month', 'Month'), - ('day', 'Day'), - ], - help_text="Precision of closed date" - ) - - # External Links - website = models.URLField( - blank=True, - help_text="Official company website" - ) - - # CloudFlare Images - logo_image_id = models.CharField( - max_length=255, - blank=True, - help_text="CloudFlare image ID for company logo" - ) - logo_image_url = models.URLField( - blank=True, - help_text="CloudFlare image URL for company logo" - ) - - # Cached statistics - park_count = models.IntegerField( - default=0, - help_text="Number of parks operated (for operators)" - ) - ride_count = models.IntegerField( - default=0, - help_text="Number of rides manufactured (for manufacturers)" - ) - - # Generic relation to photos - photos = GenericRelation( - 'media.Photo', - related_query_name='company' - ) - - # Full-text search vector (PostgreSQL only) - # Populated automatically via signals or database triggers - # Includes: name (weight A) + description (weight B) - - class Meta: - verbose_name = 'Company' - verbose_name_plural = 'Companies' - ordering = ['name'] - indexes = [ - models.Index(fields=['name']), - models.Index(fields=['slug']), - ] - - def __str__(self): - return self.name - - @hook(BEFORE_SAVE, when='slug', is_now=None) - def auto_generate_slug(self): - """Auto-generate slug from name if not provided.""" - if not self.slug and self.name: - base_slug = slugify(self.name) - slug = base_slug - counter = 1 - while Company.objects.filter(slug=slug).exists(): - slug = f"{base_slug}-{counter}" - counter += 1 - self.slug = slug - - def update_counts(self): - """Update cached park and ride counts.""" - self.park_count = self.operated_parks.count() - self.ride_count = self.manufactured_rides.count() - self.save(update_fields=['park_count', 'ride_count']) - - def get_photos(self, photo_type=None, approved_only=True): - """Get photos for this company.""" - from apps.media.services import PhotoService - service = PhotoService() - return service.get_entity_photos(self, photo_type=photo_type, approved_only=approved_only) - - @property - def main_photo(self): - """Get the main photo.""" - photos = self.photos.filter(photo_type='main', moderation_status='approved').first() - return photos - - @property - def logo_photo(self): - """Get the logo photo.""" - photos = self.photos.filter(photo_type='logo', moderation_status='approved').first() - return photos - - -class RideModel(VersionedModel): - """ - Represents a specific ride model from a manufacturer. - E.g., "B&M Inverted Coaster", "Vekoma Boomerang", "Zamperla Family Gravity Coaster" - """ - - MODEL_TYPE_CHOICES = [ - ('coaster_model', 'Roller Coaster Model'), - ('flat_ride_model', 'Flat Ride Model'), - ('water_ride_model', 'Water Ride Model'), - ('dark_ride_model', 'Dark Ride Model'), - ('transport_ride_model', 'Transport Ride Model'), - ] - - # Basic Info - name = models.CharField( - max_length=255, - db_index=True, - help_text="Model name (e.g., 'Inverted Coaster', 'Boomerang')" - ) - slug = models.SlugField( - max_length=255, - unique=True, - db_index=True, - help_text="URL-friendly identifier" - ) - description = models.TextField( - blank=True, - help_text="Model description and technical details" - ) - - # Manufacturer - manufacturer = models.ForeignKey( - 'Company', - on_delete=models.CASCADE, - related_name='ride_models', - help_text="Manufacturer of this ride model" - ) - - # Model Type - model_type = models.CharField( - max_length=50, - choices=MODEL_TYPE_CHOICES, - db_index=True, - help_text="Type of ride model" - ) - - # Technical Specifications (common to most instances) - typical_height = models.DecimalField( - max_digits=6, - decimal_places=1, - null=True, - blank=True, - help_text="Typical height in feet" - ) - typical_speed = models.DecimalField( - max_digits=6, - decimal_places=1, - null=True, - blank=True, - help_text="Typical speed in mph" - ) - typical_capacity = models.IntegerField( - null=True, - blank=True, - help_text="Typical hourly capacity" - ) - - # CloudFlare Images - image_id = models.CharField( - max_length=255, - blank=True, - help_text="CloudFlare image ID" - ) - image_url = models.URLField( - blank=True, - help_text="CloudFlare image URL" - ) - - # Cached statistics - installation_count = models.IntegerField( - default=0, - help_text="Number of installations worldwide" - ) - - # Generic relation to photos - photos = GenericRelation( - 'media.Photo', - related_query_name='ride_model' - ) - - class Meta: - verbose_name = 'Ride Model' - verbose_name_plural = 'Ride Models' - ordering = ['manufacturer__name', 'name'] - unique_together = [['manufacturer', 'name']] - indexes = [ - models.Index(fields=['manufacturer', 'name']), - models.Index(fields=['model_type']), - ] - - def __str__(self): - return f"{self.manufacturer.name} {self.name}" - - @hook(BEFORE_SAVE, when='slug', is_now=None) - def auto_generate_slug(self): - """Auto-generate slug from manufacturer and name if not provided.""" - if not self.slug and self.manufacturer and self.name: - base_slug = slugify(f"{self.manufacturer.name} {self.name}") - slug = base_slug - counter = 1 - while RideModel.objects.filter(slug=slug).exists(): - slug = f"{base_slug}-{counter}" - counter += 1 - self.slug = slug - - def update_installation_count(self): - """Update cached installation count.""" - self.installation_count = self.rides.count() - self.save(update_fields=['installation_count']) - - def get_photos(self, photo_type=None, approved_only=True): - """Get photos for this ride model.""" - from apps.media.services import PhotoService - service = PhotoService() - return service.get_entity_photos(self, photo_type=photo_type, approved_only=approved_only) - - @property - def main_photo(self): - """Get the main photo.""" - photos = self.photos.filter(photo_type='main', moderation_status='approved').first() - return photos - - -class Park(VersionedModel): - """ - Represents an amusement park, theme park, water park, or FEC. - - Note: Geographic coordinates are stored differently based on database backend: - - Production (PostGIS): Uses location_point PointField with full GIS capabilities - - Local Dev (SQLite): Uses latitude/longitude DecimalFields (no spatial queries) - """ - - PARK_TYPE_CHOICES = [ - ('theme_park', 'Theme Park'), - ('amusement_park', 'Amusement Park'), - ('water_park', 'Water Park'), - ('family_entertainment_center', 'Family Entertainment Center'), - ('traveling_park', 'Traveling Park'), - ('zoo', 'Zoo'), - ('aquarium', 'Aquarium'), - ] - - STATUS_CHOICES = [ - ('operating', 'Operating'), - ('closed', 'Closed'), - ('sbno', 'Standing But Not Operating'), - ('under_construction', 'Under Construction'), - ('planned', 'Planned'), - ] - - # Basic Info - name = models.CharField( - max_length=255, - db_index=True, - help_text="Official park name" - ) - slug = models.SlugField( - max_length=255, - unique=True, - db_index=True, - help_text="URL-friendly identifier" - ) - description = models.TextField( - blank=True, - help_text="Park description and history" - ) - - # Type & Status - park_type = models.CharField( - max_length=50, - choices=PARK_TYPE_CHOICES, - db_index=True, - help_text="Type of park" - ) - status = models.CharField( - max_length=50, - choices=STATUS_CHOICES, - default='operating', - db_index=True, - help_text="Current operational status" - ) - - # Dates with precision tracking - opening_date = models.DateField( - null=True, - blank=True, - db_index=True, - help_text="Park opening date" - ) - opening_date_precision = models.CharField( - max_length=20, - default='day', - choices=[ - ('year', 'Year'), - ('month', 'Month'), - ('day', 'Day'), - ], - help_text="Precision of opening date" - ) - - closing_date = models.DateField( - null=True, - blank=True, - help_text="Park closing date (if closed)" - ) - closing_date_precision = models.CharField( - max_length=20, - default='day', - choices=[ - ('year', 'Year'), - ('month', 'Month'), - ('day', 'Day'), - ], - help_text="Precision of closing date" - ) - - # Location - location = models.ForeignKey( - 'core.Locality', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='parks', - help_text="Park location" - ) - - # Precise coordinates for mapping - # Primary in local dev (SQLite), deprecated in production (PostGIS) - latitude = models.DecimalField( - max_digits=10, - decimal_places=7, - null=True, - blank=True, - help_text="Latitude coordinate. Primary in local dev, use location_point in production." - ) - longitude = models.DecimalField( - max_digits=10, - decimal_places=7, - null=True, - blank=True, - help_text="Longitude coordinate. Primary in local dev, use location_point in production." - ) - - # NOTE: location_point PointField is added conditionally below if using PostGIS - - # Relationships - operator = models.ForeignKey( - 'Company', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='operated_parks', - help_text="Current park operator" - ) - - # External Links - website = models.URLField( - blank=True, - help_text="Official park website" - ) - - # CloudFlare Images - banner_image_id = models.CharField( - max_length=255, - blank=True, - help_text="CloudFlare image ID for park banner" - ) - banner_image_url = models.URLField( - blank=True, - help_text="CloudFlare image URL for park banner" - ) - logo_image_id = models.CharField( - max_length=255, - blank=True, - help_text="CloudFlare image ID for park logo" - ) - logo_image_url = models.URLField( - blank=True, - help_text="CloudFlare image URL for park logo" - ) - - # Cached statistics (for performance) - ride_count = models.IntegerField( - default=0, - help_text="Total number of rides" - ) - coaster_count = models.IntegerField( - default=0, - help_text="Number of roller coasters" - ) - - # Custom fields for flexible data - custom_fields = models.JSONField( - default=dict, - blank=True, - help_text="Additional park-specific data" - ) - - # Generic relation to photos - photos = GenericRelation( - 'media.Photo', - related_query_name='park' - ) - - class Meta: - verbose_name = 'Park' - verbose_name_plural = 'Parks' - ordering = ['name'] - indexes = [ - models.Index(fields=['name']), - models.Index(fields=['slug']), - models.Index(fields=['status']), - models.Index(fields=['park_type']), - models.Index(fields=['opening_date']), - models.Index(fields=['location']), - ] - - def __str__(self): - return self.name - - @hook(BEFORE_SAVE, when='slug', is_now=None) - def auto_generate_slug(self): - """Auto-generate slug from name if not provided.""" - if not self.slug and self.name: - base_slug = slugify(self.name) - slug = base_slug - counter = 1 - while Park.objects.filter(slug=slug).exists(): - slug = f"{base_slug}-{counter}" - counter += 1 - self.slug = slug - - def update_counts(self): - """Update cached ride counts.""" - self.ride_count = self.rides.count() - self.coaster_count = self.rides.filter(is_coaster=True).count() - self.save(update_fields=['ride_count', 'coaster_count']) - - def set_location(self, longitude, latitude): - """ - Set park location from coordinates. - - Args: - longitude: Longitude coordinate (X) - latitude: Latitude coordinate (Y) - - Note: Works in both PostGIS and non-PostGIS modes. - - PostGIS: Sets location_point and syncs to lat/lng - - SQLite: Sets lat/lng directly - """ - if longitude is not None and latitude is not None: - # Always update lat/lng fields - self.longitude = longitude - self.latitude = latitude - - # If using PostGIS, also update location_point - if _using_postgis and hasattr(self, 'location_point'): - self.location_point = Point(float(longitude), float(latitude), srid=4326) - - @property - def coordinates(self): - """ - Get coordinates as (longitude, latitude) tuple. - - Returns: - tuple: (longitude, latitude) or None if no location set - """ - # Try PostGIS field first if available - if _using_postgis and hasattr(self, 'location_point') and self.location_point: - return (self.location_point.x, self.location_point.y) - # Fall back to lat/lng fields - elif self.longitude and self.latitude: - return (float(self.longitude), float(self.latitude)) - return None - - @property - def latitude_value(self): - """Get latitude value (from location_point if PostGIS, else from latitude field).""" - if _using_postgis and hasattr(self, 'location_point') and self.location_point: - return self.location_point.y - return float(self.latitude) if self.latitude else None - - @property - def longitude_value(self): - """Get longitude value (from location_point if PostGIS, else from longitude field).""" - if _using_postgis and hasattr(self, 'location_point') and self.location_point: - return self.location_point.x - return float(self.longitude) if self.longitude else None - - def get_photos(self, photo_type=None, approved_only=True): - """Get photos for this park.""" - from apps.media.services import PhotoService - service = PhotoService() - return service.get_entity_photos(self, photo_type=photo_type, approved_only=approved_only) - - @property - def main_photo(self): - """Get the main photo.""" - photos = self.photos.filter(photo_type='main', moderation_status='approved').first() - return photos - - @property - def banner_photo(self): - """Get the banner photo.""" - photos = self.photos.filter(photo_type='banner', moderation_status='approved').first() - return photos - - @property - def logo_photo(self): - """Get the logo photo.""" - photos = self.photos.filter(photo_type='logo', moderation_status='approved').first() - return photos - - @property - def gallery_photos(self): - """Get gallery photos.""" - return self.photos.filter(photo_type='gallery', moderation_status='approved').order_by('display_order') - - -# Conditionally add PostGIS PointField to Park model if using PostGIS backend -if _using_postgis: - Park.add_to_class( - 'location_point', - gis_models.PointField( - geography=True, - null=True, - blank=True, - srid=4326, - help_text="Geographic coordinates (PostGIS Point). Production only." - ) - ) - - -class Ride(VersionedModel): - """ - Represents an individual ride or roller coaster. - """ - - RIDE_CATEGORY_CHOICES = [ - ('roller_coaster', 'Roller Coaster'), - ('flat_ride', 'Flat Ride'), - ('water_ride', 'Water Ride'), - ('dark_ride', 'Dark Ride'), - ('transport_ride', 'Transport Ride'), - ('other', 'Other'), - ] - - STATUS_CHOICES = [ - ('operating', 'Operating'), - ('closed', 'Closed'), - ('sbno', 'Standing But Not Operating'), - ('relocated', 'Relocated'), - ('under_construction', 'Under Construction'), - ('planned', 'Planned'), - ] - - # Basic Info - name = models.CharField( - max_length=255, - db_index=True, - help_text="Ride name" - ) - slug = models.SlugField( - max_length=255, - unique=True, - db_index=True, - help_text="URL-friendly identifier" - ) - description = models.TextField( - blank=True, - help_text="Ride description and history" - ) - - # Park Relationship - park = models.ForeignKey( - 'Park', - on_delete=models.CASCADE, - related_name='rides', - db_index=True, - help_text="Park where ride is located" - ) - - # Ride Classification - ride_category = models.CharField( - max_length=50, - choices=RIDE_CATEGORY_CHOICES, - db_index=True, - help_text="Broad ride category" - ) - ride_type = models.CharField( - max_length=100, - blank=True, - db_index=True, - help_text="Specific ride type (e.g., 'Inverted Coaster', 'Drop Tower')" - ) - - # Quick coaster identification - is_coaster = models.BooleanField( - default=False, - db_index=True, - help_text="Is this ride a roller coaster?" - ) - - # Status - status = models.CharField( - max_length=50, - choices=STATUS_CHOICES, - default='operating', - db_index=True, - help_text="Current operational status" - ) - - # Dates with precision tracking - opening_date = models.DateField( - null=True, - blank=True, - db_index=True, - help_text="Ride opening date" - ) - opening_date_precision = models.CharField( - max_length=20, - default='day', - choices=[ - ('year', 'Year'), - ('month', 'Month'), - ('day', 'Day'), - ], - help_text="Precision of opening date" - ) - - closing_date = models.DateField( - null=True, - blank=True, - help_text="Ride closing date (if closed)" - ) - closing_date_precision = models.CharField( - max_length=20, - default='day', - choices=[ - ('year', 'Year'), - ('month', 'Month'), - ('day', 'Day'), - ], - help_text="Precision of closing date" - ) - - # Manufacturer & Model - manufacturer = models.ForeignKey( - 'Company', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='manufactured_rides', - help_text="Ride manufacturer" - ) - model = models.ForeignKey( - 'RideModel', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='rides', - help_text="Specific ride model" - ) - - # Statistics - height = models.DecimalField( - max_digits=6, - decimal_places=1, - null=True, - blank=True, - help_text="Height in feet" - ) - speed = models.DecimalField( - max_digits=6, - decimal_places=1, - null=True, - blank=True, - help_text="Top speed in mph" - ) - length = models.DecimalField( - max_digits=8, - decimal_places=1, - null=True, - blank=True, - help_text="Track/ride length in feet" - ) - duration = models.IntegerField( - null=True, - blank=True, - help_text="Ride duration in seconds" - ) - inversions = models.IntegerField( - null=True, - blank=True, - help_text="Number of inversions (for coasters)" - ) - capacity = models.IntegerField( - null=True, - blank=True, - help_text="Hourly capacity (riders per hour)" - ) - - # CloudFlare Images - image_id = models.CharField( - max_length=255, - blank=True, - help_text="CloudFlare image ID for main photo" - ) - image_url = models.URLField( - blank=True, - help_text="CloudFlare image URL for main photo" - ) - - # Custom fields for flexible data - custom_fields = models.JSONField( - default=dict, - blank=True, - help_text="Additional ride-specific data" - ) - - # Generic relation to photos - photos = GenericRelation( - 'media.Photo', - related_query_name='ride' - ) - - class Meta: - verbose_name = 'Ride' - verbose_name_plural = 'Rides' - ordering = ['park__name', 'name'] - indexes = [ - models.Index(fields=['park', 'name']), - models.Index(fields=['slug']), - models.Index(fields=['status']), - models.Index(fields=['is_coaster']), - models.Index(fields=['ride_category']), - models.Index(fields=['opening_date']), - models.Index(fields=['manufacturer']), - ] - - def __str__(self): - return f"{self.name} ({self.park.name})" - - @hook(BEFORE_SAVE, when='slug', is_now=None) - def auto_generate_slug(self): - """Auto-generate slug from park and name if not provided.""" - if not self.slug and self.park and self.name: - base_slug = slugify(f"{self.park.name} {self.name}") - slug = base_slug - counter = 1 - while Ride.objects.filter(slug=slug).exists(): - slug = f"{base_slug}-{counter}" - counter += 1 - self.slug = slug - - @hook(BEFORE_SAVE) - def set_is_coaster_flag(self): - """Auto-set is_coaster flag based on ride_category.""" - self.is_coaster = (self.ride_category == 'roller_coaster') - - @hook(AFTER_CREATE) - @hook(AFTER_UPDATE, when='park', has_changed=True) - def update_park_counts(self): - """Update parent park's ride counts when ride is created or moved.""" - if self.park: - self.park.update_counts() - - def get_photos(self, photo_type=None, approved_only=True): - """Get photos for this ride.""" - from apps.media.services import PhotoService - service = PhotoService() - return service.get_entity_photos(self, photo_type=photo_type, approved_only=approved_only) - - @property - def main_photo(self): - """Get the main photo.""" - photos = self.photos.filter(photo_type='main', moderation_status='approved').first() - return photos - - @property - def gallery_photos(self): - """Get gallery photos.""" - return self.photos.filter(photo_type='gallery', moderation_status='approved').order_by('display_order') - - -# Add SearchVectorField to all models for full-text search (PostgreSQL only) -# Must be at the very end after ALL class definitions -if _using_postgis: - Company.add_to_class( - 'search_vector', - SearchVectorField( - null=True, - blank=True, - help_text="Pre-computed search vector for full-text search. Auto-updated via signals." - ) - ) - - RideModel.add_to_class( - 'search_vector', - SearchVectorField( - null=True, - blank=True, - help_text="Pre-computed search vector for full-text search. Auto-updated via signals." - ) - ) - - Park.add_to_class( - 'search_vector', - SearchVectorField( - null=True, - blank=True, - help_text="Pre-computed search vector for full-text search. Auto-updated via signals." - ) - ) - - Ride.add_to_class( - 'search_vector', - SearchVectorField( - null=True, - blank=True, - help_text="Pre-computed search vector for full-text search. Auto-updated via signals." - ) - ) diff --git a/django/apps/entities/search.py b/django/apps/entities/search.py deleted file mode 100644 index 9641bfd4..00000000 --- a/django/apps/entities/search.py +++ /dev/null @@ -1,386 +0,0 @@ -""" -Search service for ThrillWiki entities. - -Provides full-text search capabilities with PostgreSQL and fallback for SQLite. -- PostgreSQL: Uses SearchVector, SearchQuery, SearchRank for full-text search -- SQLite: Falls back to case-insensitive LIKE queries -""" -from typing import List, Optional, Dict, Any -from django.db.models import Q, QuerySet, Value, CharField, F -from django.db.models.functions import Concat -from django.conf import settings - -# Conditionally import PostgreSQL search features -_using_postgis = 'postgis' in settings.DATABASES['default']['ENGINE'] - -if _using_postgis: - from django.contrib.postgres.search import SearchVector, SearchQuery, SearchRank, TrigramSimilarity - from django.contrib.postgres.aggregates import StringAgg - - -class SearchService: - """Service for searching across all entity types.""" - - def __init__(self): - self.using_postgres = _using_postgis - - def search_all( - self, - query: str, - entity_types: Optional[List[str]] = None, - limit: int = 20 - ) -> Dict[str, Any]: - """ - Search across all entity types. - - Args: - query: Search query string - entity_types: Optional list to filter by entity types - limit: Maximum results per entity type - - Returns: - Dictionary with results grouped by entity type - """ - results = {} - - # Default to all entity types if not specified - if not entity_types: - entity_types = ['company', 'ride_model', 'park', 'ride'] - - if 'company' in entity_types: - results['companies'] = list(self.search_companies(query, limit=limit)) - - if 'ride_model' in entity_types: - results['ride_models'] = list(self.search_ride_models(query, limit=limit)) - - if 'park' in entity_types: - results['parks'] = list(self.search_parks(query, limit=limit)) - - if 'ride' in entity_types: - results['rides'] = list(self.search_rides(query, limit=limit)) - - return results - - def search_companies( - self, - query: str, - filters: Optional[Dict[str, Any]] = None, - limit: int = 20 - ) -> QuerySet: - """ - Search companies with full-text search. - - Args: - query: Search query string - filters: Optional filters (company_types, founded_after, etc.) - limit: Maximum number of results - - Returns: - QuerySet of Company objects - """ - from apps.entities.models import Company - - if self.using_postgres: - # PostgreSQL full-text search using pre-computed search_vector - search_query = SearchQuery(query, search_type='websearch') - - results = Company.objects.annotate( - rank=SearchRank(F('search_vector'), search_query) - ).filter(search_vector=search_query).order_by('-rank') - else: - # SQLite fallback using LIKE - results = Company.objects.filter( - Q(name__icontains=query) | Q(description__icontains=query) - ).order_by('name') - - # Apply additional filters - if filters: - if filters.get('company_types'): - # Filter by company types (stored in JSONField) - results = results.filter( - company_types__contains=filters['company_types'] - ) - - if filters.get('founded_after'): - results = results.filter(founded_date__gte=filters['founded_after']) - - if filters.get('founded_before'): - results = results.filter(founded_date__lte=filters['founded_before']) - - return results[:limit] - - def search_ride_models( - self, - query: str, - filters: Optional[Dict[str, Any]] = None, - limit: int = 20 - ) -> QuerySet: - """ - Search ride models with full-text search. - - Args: - query: Search query string - filters: Optional filters (manufacturer_id, model_type, etc.) - limit: Maximum number of results - - Returns: - QuerySet of RideModel objects - """ - from apps.entities.models import RideModel - - if self.using_postgres: - # PostgreSQL full-text search using pre-computed search_vector - search_query = SearchQuery(query, search_type='websearch') - - results = RideModel.objects.select_related('manufacturer').annotate( - rank=SearchRank(F('search_vector'), search_query) - ).filter(search_vector=search_query).order_by('-rank') - else: - # SQLite fallback using LIKE - results = RideModel.objects.select_related('manufacturer').filter( - Q(name__icontains=query) | - Q(manufacturer__name__icontains=query) | - Q(description__icontains=query) - ).order_by('manufacturer__name', 'name') - - # Apply additional filters - if filters: - if filters.get('manufacturer_id'): - results = results.filter(manufacturer_id=filters['manufacturer_id']) - - if filters.get('model_type'): - results = results.filter(model_type=filters['model_type']) - - return results[:limit] - - def search_parks( - self, - query: str, - filters: Optional[Dict[str, Any]] = None, - limit: int = 20 - ) -> QuerySet: - """ - Search parks with full-text search and location filtering. - - Args: - query: Search query string - filters: Optional filters (status, park_type, location, radius, etc.) - limit: Maximum number of results - - Returns: - QuerySet of Park objects - """ - from apps.entities.models import Park - - if self.using_postgres: - # PostgreSQL full-text search using pre-computed search_vector - search_query = SearchQuery(query, search_type='websearch') - - results = Park.objects.annotate( - rank=SearchRank(F('search_vector'), search_query) - ).filter(search_vector=search_query).order_by('-rank') - else: - # SQLite fallback using LIKE - results = Park.objects.filter( - Q(name__icontains=query) | Q(description__icontains=query) - ).order_by('name') - - # Apply additional filters - if filters: - if filters.get('status'): - results = results.filter(status=filters['status']) - - if filters.get('park_type'): - results = results.filter(park_type=filters['park_type']) - - if filters.get('operator_id'): - results = results.filter(operator_id=filters['operator_id']) - - if filters.get('opening_after'): - results = results.filter(opening_date__gte=filters['opening_after']) - - if filters.get('opening_before'): - results = results.filter(opening_date__lte=filters['opening_before']) - - # Location-based filtering (PostGIS only) - if self.using_postgres and filters.get('location') and filters.get('radius'): - from django.contrib.gis.geos import Point - from django.contrib.gis.measure import D - - longitude, latitude = filters['location'] - point = Point(longitude, latitude, srid=4326) - radius_km = filters['radius'] - - # Use distance filter - results = results.filter( - location_point__distance_lte=(point, D(km=radius_km)) - ).annotate( - distance=F('location_point__distance') - ).order_by('distance') - - return results[:limit] - - def search_rides( - self, - query: str, - filters: Optional[Dict[str, Any]] = None, - limit: int = 20 - ) -> QuerySet: - """ - Search rides with full-text search. - - Args: - query: Search query string - filters: Optional filters (park_id, manufacturer_id, status, etc.) - limit: Maximum number of results - - Returns: - QuerySet of Ride objects - """ - from apps.entities.models import Ride - - if self.using_postgres: - # PostgreSQL full-text search using pre-computed search_vector - search_query = SearchQuery(query, search_type='websearch') - - results = Ride.objects.select_related('park', 'manufacturer', 'model').annotate( - rank=SearchRank(F('search_vector'), search_query) - ).filter(search_vector=search_query).order_by('-rank') - else: - # SQLite fallback using LIKE - results = Ride.objects.select_related('park', 'manufacturer', 'model').filter( - Q(name__icontains=query) | - Q(park__name__icontains=query) | - Q(manufacturer__name__icontains=query) | - Q(description__icontains=query) - ).order_by('park__name', 'name') - - # Apply additional filters - if filters: - if filters.get('park_id'): - results = results.filter(park_id=filters['park_id']) - - if filters.get('manufacturer_id'): - results = results.filter(manufacturer_id=filters['manufacturer_id']) - - if filters.get('model_id'): - results = results.filter(model_id=filters['model_id']) - - if filters.get('status'): - results = results.filter(status=filters['status']) - - if filters.get('ride_category'): - results = results.filter(ride_category=filters['ride_category']) - - if filters.get('is_coaster') is not None: - results = results.filter(is_coaster=filters['is_coaster']) - - if filters.get('opening_after'): - results = results.filter(opening_date__gte=filters['opening_after']) - - if filters.get('opening_before'): - results = results.filter(opening_date__lte=filters['opening_before']) - - # Height/speed filters - if filters.get('min_height'): - results = results.filter(height__gte=filters['min_height']) - - if filters.get('max_height'): - results = results.filter(height__lte=filters['max_height']) - - if filters.get('min_speed'): - results = results.filter(speed__gte=filters['min_speed']) - - if filters.get('max_speed'): - results = results.filter(speed__lte=filters['max_speed']) - - return results[:limit] - - def autocomplete( - self, - query: str, - entity_type: Optional[str] = None, - limit: int = 10 - ) -> List[Dict[str, Any]]: - """ - Get autocomplete suggestions for search. - - Args: - query: Partial search query - entity_type: Optional specific entity type - limit: Maximum number of suggestions - - Returns: - List of suggestion dictionaries with name and entity_type - """ - suggestions = [] - - if not query or len(query) < 2: - return suggestions - - # Search in names only for autocomplete - if entity_type == 'company' or not entity_type: - from apps.entities.models import Company - companies = Company.objects.filter( - name__istartswith=query - ).values('id', 'name', 'slug')[:limit] - - for company in companies: - suggestions.append({ - 'id': company['id'], - 'name': company['name'], - 'slug': company['slug'], - 'entity_type': 'company' - }) - - if entity_type == 'park' or not entity_type: - from apps.entities.models import Park - parks = Park.objects.filter( - name__istartswith=query - ).values('id', 'name', 'slug')[:limit] - - for park in parks: - suggestions.append({ - 'id': park['id'], - 'name': park['name'], - 'slug': park['slug'], - 'entity_type': 'park' - }) - - if entity_type == 'ride' or not entity_type: - from apps.entities.models import Ride - rides = Ride.objects.select_related('park').filter( - name__istartswith=query - ).values('id', 'name', 'slug', 'park__name')[:limit] - - for ride in rides: - suggestions.append({ - 'id': ride['id'], - 'name': ride['name'], - 'slug': ride['slug'], - 'park_name': ride['park__name'], - 'entity_type': 'ride' - }) - - if entity_type == 'ride_model' or not entity_type: - from apps.entities.models import RideModel - models = RideModel.objects.select_related('manufacturer').filter( - name__istartswith=query - ).values('id', 'name', 'slug', 'manufacturer__name')[:limit] - - for model in models: - suggestions.append({ - 'id': model['id'], - 'name': model['name'], - 'slug': model['slug'], - 'manufacturer_name': model['manufacturer__name'], - 'entity_type': 'ride_model' - }) - - # Sort by relevance (exact matches first, then alphabetically) - suggestions.sort(key=lambda x: ( - not x['name'].lower().startswith(query.lower()), - x['name'].lower() - )) - - return suggestions[:limit] diff --git a/django/apps/entities/signals.py b/django/apps/entities/signals.py deleted file mode 100644 index 7f162262..00000000 --- a/django/apps/entities/signals.py +++ /dev/null @@ -1,252 +0,0 @@ -""" -Signal handlers for automatic search vector updates. - -These signals ensure search vectors stay synchronized with model changes, -eliminating the need for manual re-indexing. - -Signal handlers are only active when using PostgreSQL with PostGIS backend. -""" -from django.db.models.signals import post_save, pre_save -from django.dispatch import receiver -from django.conf import settings -from django.contrib.postgres.search import SearchVector - -from apps.entities.models import Company, RideModel, Park, Ride - -# Only register signals if using PostgreSQL with PostGIS -_using_postgis = 'postgis' in settings.DATABASES['default']['ENGINE'] - - -if _using_postgis: - - # ========================================== - # Company Signals - # ========================================== - - @receiver(post_save, sender=Company) - def update_company_search_vector(sender, instance, created, **kwargs): - """ - Update search vector when company is created or updated. - - Search vector includes: - - name (weight A) - - description (weight B) - """ - # Update the company's own search vector - Company.objects.filter(pk=instance.pk).update( - search_vector=( - SearchVector('name', weight='A', config='english') + - SearchVector('description', weight='B', config='english') - ) - ) - - - @receiver(pre_save, sender=Company) - def check_company_name_change(sender, instance, **kwargs): - """ - Track if company name is changing to trigger cascading updates. - - Stores the old name on the instance for use in post_save signal. - """ - if instance.pk: - try: - old_instance = Company.objects.get(pk=instance.pk) - instance._old_name = old_instance.name - except Company.DoesNotExist: - instance._old_name = None - else: - instance._old_name = None - - - @receiver(post_save, sender=Company) - def cascade_company_name_updates(sender, instance, created, **kwargs): - """ - When company name changes, update search vectors for related objects. - - Updates: - - All RideModels from this manufacturer - - All Rides from this manufacturer - """ - # Skip if this is a new company or name hasn't changed - if created or not hasattr(instance, '_old_name'): - return - - old_name = getattr(instance, '_old_name', None) - if old_name == instance.name: - return - - # Update all RideModels from this manufacturer - ride_models = RideModel.objects.filter(manufacturer=instance) - for ride_model in ride_models: - RideModel.objects.filter(pk=ride_model.pk).update( - search_vector=( - SearchVector('name', weight='A', config='english') + - SearchVector('manufacturer__name', weight='A', config='english') + - SearchVector('description', weight='B', config='english') - ) - ) - - # Update all Rides from this manufacturer - rides = Ride.objects.filter(manufacturer=instance) - for ride in rides: - Ride.objects.filter(pk=ride.pk).update( - search_vector=( - SearchVector('name', weight='A', config='english') + - SearchVector('park__name', weight='A', config='english') + - SearchVector('manufacturer__name', weight='B', config='english') + - SearchVector('description', weight='B', config='english') - ) - ) - - - # ========================================== - # Park Signals - # ========================================== - - @receiver(post_save, sender=Park) - def update_park_search_vector(sender, instance, created, **kwargs): - """ - Update search vector when park is created or updated. - - Search vector includes: - - name (weight A) - - description (weight B) - """ - # Update the park's own search vector - Park.objects.filter(pk=instance.pk).update( - search_vector=( - SearchVector('name', weight='A', config='english') + - SearchVector('description', weight='B', config='english') - ) - ) - - - @receiver(pre_save, sender=Park) - def check_park_name_change(sender, instance, **kwargs): - """ - Track if park name is changing to trigger cascading updates. - - Stores the old name on the instance for use in post_save signal. - """ - if instance.pk: - try: - old_instance = Park.objects.get(pk=instance.pk) - instance._old_name = old_instance.name - except Park.DoesNotExist: - instance._old_name = None - else: - instance._old_name = None - - - @receiver(post_save, sender=Park) - def cascade_park_name_updates(sender, instance, created, **kwargs): - """ - When park name changes, update search vectors for related rides. - - Updates: - - All Rides in this park - """ - # Skip if this is a new park or name hasn't changed - if created or not hasattr(instance, '_old_name'): - return - - old_name = getattr(instance, '_old_name', None) - if old_name == instance.name: - return - - # Update all Rides in this park - rides = Ride.objects.filter(park=instance) - for ride in rides: - Ride.objects.filter(pk=ride.pk).update( - search_vector=( - SearchVector('name', weight='A', config='english') + - SearchVector('park__name', weight='A', config='english') + - SearchVector('manufacturer__name', weight='B', config='english') + - SearchVector('description', weight='B', config='english') - ) - ) - - - # ========================================== - # RideModel Signals - # ========================================== - - @receiver(post_save, sender=RideModel) - def update_ride_model_search_vector(sender, instance, created, **kwargs): - """ - Update search vector when ride model is created or updated. - - Search vector includes: - - name (weight A) - - manufacturer__name (weight A) - - description (weight B) - """ - RideModel.objects.filter(pk=instance.pk).update( - search_vector=( - SearchVector('name', weight='A', config='english') + - SearchVector('manufacturer__name', weight='A', config='english') + - SearchVector('description', weight='B', config='english') - ) - ) - - - @receiver(pre_save, sender=RideModel) - def check_ride_model_manufacturer_change(sender, instance, **kwargs): - """ - Track if ride model manufacturer is changing. - - Stores the old manufacturer on the instance for use in post_save signal. - """ - if instance.pk: - try: - old_instance = RideModel.objects.get(pk=instance.pk) - instance._old_manufacturer = old_instance.manufacturer - except RideModel.DoesNotExist: - instance._old_manufacturer = None - else: - instance._old_manufacturer = None - - - # ========================================== - # Ride Signals - # ========================================== - - @receiver(post_save, sender=Ride) - def update_ride_search_vector(sender, instance, created, **kwargs): - """ - Update search vector when ride is created or updated. - - Search vector includes: - - name (weight A) - - park__name (weight A) - - manufacturer__name (weight B) - - description (weight B) - """ - Ride.objects.filter(pk=instance.pk).update( - search_vector=( - SearchVector('name', weight='A', config='english') + - SearchVector('park__name', weight='A', config='english') + - SearchVector('manufacturer__name', weight='B', config='english') + - SearchVector('description', weight='B', config='english') - ) - ) - - - @receiver(pre_save, sender=Ride) - def check_ride_relationships_change(sender, instance, **kwargs): - """ - Track if ride park or manufacturer are changing. - - Stores old values on the instance for use in post_save signal. - """ - if instance.pk: - try: - old_instance = Ride.objects.get(pk=instance.pk) - instance._old_park = old_instance.park - instance._old_manufacturer = old_instance.manufacturer - except Ride.DoesNotExist: - instance._old_park = None - instance._old_manufacturer = None - else: - instance._old_park = None - instance._old_manufacturer = None diff --git a/django/apps/entities/tasks.py b/django/apps/entities/tasks.py deleted file mode 100644 index d9723cef..00000000 --- a/django/apps/entities/tasks.py +++ /dev/null @@ -1,354 +0,0 @@ -""" -Background tasks for entity statistics and maintenance. -""" - -import logging -from celery import shared_task -from django.db.models import Count, Q -from django.utils import timezone - -logger = logging.getLogger(__name__) - - -@shared_task(bind=True, max_retries=2) -def update_entity_statistics(self, entity_type, entity_id): - """ - Update cached statistics for a specific entity. - - Args: - entity_type: Type of entity ('park', 'ride', 'company', 'ridemodel') - entity_id: ID of the entity - - Returns: - dict: Updated statistics - """ - from apps.entities.models import Park, Ride, Company, RideModel - from apps.media.models import Photo - from apps.moderation.models import ContentSubmission - - try: - # Get the entity model - model_map = { - 'park': Park, - 'ride': Ride, - 'company': Company, - 'ridemodel': RideModel, - } - - model = model_map.get(entity_type.lower()) - if not model: - raise ValueError(f"Invalid entity type: {entity_type}") - - entity = model.objects.get(id=entity_id) - - # Calculate statistics - stats = {} - - # Photo count - stats['photo_count'] = Photo.objects.filter( - content_type__model=entity_type.lower(), - object_id=entity_id, - moderation_status='approved' - ).count() - - # Submission count - stats['submission_count'] = ContentSubmission.objects.filter( - entity_type__model=entity_type.lower(), - entity_id=entity_id - ).count() - - # Entity-specific stats - if entity_type.lower() == 'park': - stats['ride_count'] = entity.rides.count() - elif entity_type.lower() == 'company': - stats['park_count'] = entity.parks.count() - stats['ride_model_count'] = entity.ride_models.count() - elif entity_type.lower() == 'ridemodel': - stats['installation_count'] = entity.rides.count() - - logger.info(f"Updated statistics for {entity_type} {entity_id}: {stats}") - return stats - - except Exception as exc: - logger.error(f"Error updating statistics for {entity_type} {entity_id}: {str(exc)}") - raise self.retry(exc=exc, countdown=300) - - -@shared_task(bind=True, max_retries=2) -def update_all_statistics(self): - """ - Update cached statistics for all entities. - - This task runs periodically (e.g., every 6 hours) to ensure - all entity statistics are up to date. - - Returns: - dict: Update summary - """ - from apps.entities.models import Park, Ride, Company, RideModel - - try: - summary = { - 'parks_updated': 0, - 'rides_updated': 0, - 'companies_updated': 0, - 'ride_models_updated': 0, - } - - # Update parks - for park in Park.objects.all(): - try: - update_entity_statistics.delay('park', park.id) - summary['parks_updated'] += 1 - except Exception as e: - logger.error(f"Failed to queue update for park {park.id}: {str(e)}") - - # Update rides - for ride in Ride.objects.all(): - try: - update_entity_statistics.delay('ride', ride.id) - summary['rides_updated'] += 1 - except Exception as e: - logger.error(f"Failed to queue update for ride {ride.id}: {str(e)}") - - # Update companies - for company in Company.objects.all(): - try: - update_entity_statistics.delay('company', company.id) - summary['companies_updated'] += 1 - except Exception as e: - logger.error(f"Failed to queue update for company {company.id}: {str(e)}") - - # Update ride models - for ride_model in RideModel.objects.all(): - try: - update_entity_statistics.delay('ridemodel', ride_model.id) - summary['ride_models_updated'] += 1 - except Exception as e: - logger.error(f"Failed to queue update for ride model {ride_model.id}: {str(e)}") - - logger.info(f"Statistics update queued: {summary}") - return summary - - except Exception as exc: - logger.error(f"Error updating all statistics: {str(exc)}") - raise self.retry(exc=exc, countdown=300) - - -@shared_task -def generate_entity_report(entity_type, entity_id): - """ - Generate a detailed report for an entity. - - This can be used for admin dashboards, analytics, etc. - - Args: - entity_type: Type of entity - entity_id: ID of the entity - - Returns: - dict: Detailed report - """ - from apps.entities.models import Park, Ride, Company, RideModel - from apps.media.models import Photo - from apps.moderation.models import ContentSubmission - from apps.versioning.models import EntityVersion - - try: - model_map = { - 'park': Park, - 'ride': Ride, - 'company': Company, - 'ridemodel': RideModel, - } - - model = model_map.get(entity_type.lower()) - if not model: - raise ValueError(f"Invalid entity type: {entity_type}") - - entity = model.objects.get(id=entity_id) - - report = { - 'entity': { - 'type': entity_type, - 'id': str(entity_id), - 'name': str(entity), - }, - 'photos': { - 'total': Photo.objects.filter( - content_type__model=entity_type.lower(), - object_id=entity_id - ).count(), - 'approved': Photo.objects.filter( - content_type__model=entity_type.lower(), - object_id=entity_id, - moderation_status='approved' - ).count(), - 'pending': Photo.objects.filter( - content_type__model=entity_type.lower(), - object_id=entity_id, - moderation_status='pending' - ).count(), - }, - 'submissions': { - 'total': ContentSubmission.objects.filter( - entity_type__model=entity_type.lower(), - entity_id=entity_id - ).count(), - 'approved': ContentSubmission.objects.filter( - entity_type__model=entity_type.lower(), - entity_id=entity_id, - status='approved' - ).count(), - 'pending': ContentSubmission.objects.filter( - entity_type__model=entity_type.lower(), - entity_id=entity_id, - status='pending' - ).count(), - }, - 'versions': EntityVersion.objects.filter( - content_type__model=entity_type.lower(), - object_id=entity_id - ).count(), - } - - logger.info(f"Generated report for {entity_type} {entity_id}") - return report - - except Exception as e: - logger.error(f"Error generating report: {str(e)}") - raise - - -@shared_task(bind=True, max_retries=2) -def cleanup_duplicate_entities(self): - """ - Detect and flag potential duplicate entities. - - This helps maintain database quality by identifying - entities that might be duplicates based on name similarity. - - Returns: - dict: Duplicate detection results - """ - from apps.entities.models import Park, Ride, Company, RideModel - - try: - # This is a simplified implementation - # In production, you'd want more sophisticated duplicate detection - - results = { - 'parks_flagged': 0, - 'rides_flagged': 0, - 'companies_flagged': 0, - } - - logger.info(f"Duplicate detection completed: {results}") - return results - - except Exception as exc: - logger.error(f"Error detecting duplicates: {str(exc)}") - raise self.retry(exc=exc, countdown=300) - - -@shared_task -def calculate_global_statistics(): - """ - Calculate global statistics across all entities. - - Returns: - dict: Global statistics - """ - from apps.entities.models import Park, Ride, Company, RideModel - from apps.media.models import Photo - from apps.moderation.models import ContentSubmission - from apps.users.models import User - - try: - stats = { - 'entities': { - 'parks': Park.objects.count(), - 'rides': Ride.objects.count(), - 'companies': Company.objects.count(), - 'ride_models': RideModel.objects.count(), - }, - 'photos': { - 'total': Photo.objects.count(), - 'approved': Photo.objects.filter(moderation_status='approved').count(), - }, - 'submissions': { - 'total': ContentSubmission.objects.count(), - 'pending': ContentSubmission.objects.filter(status='pending').count(), - }, - 'users': { - 'total': User.objects.count(), - 'active': User.objects.filter(is_active=True).count(), - }, - 'timestamp': timezone.now().isoformat(), - } - - logger.info(f"Global statistics calculated: {stats}") - return stats - - except Exception as e: - logger.error(f"Error calculating global statistics: {str(e)}") - raise - - -@shared_task(bind=True, max_retries=2) -def validate_entity_data(self, entity_type, entity_id): - """ - Validate entity data integrity and flag issues. - - Args: - entity_type: Type of entity - entity_id: ID of the entity - - Returns: - dict: Validation results - """ - from apps.entities.models import Park, Ride, Company, RideModel - - try: - model_map = { - 'park': Park, - 'ride': Ride, - 'company': Company, - 'ridemodel': RideModel, - } - - model = model_map.get(entity_type.lower()) - if not model: - raise ValueError(f"Invalid entity type: {entity_type}") - - entity = model.objects.get(id=entity_id) - - issues = [] - - # Check for missing required fields - if not entity.name or entity.name.strip() == '': - issues.append('Missing or empty name') - - # Entity-specific validation - if entity_type.lower() == 'park' and not entity.country: - issues.append('Missing country') - - if entity_type.lower() == 'ride' and not entity.park: - issues.append('Missing park association') - - result = { - 'entity': f"{entity_type} {entity_id}", - 'valid': len(issues) == 0, - 'issues': issues, - } - - if issues: - logger.warning(f"Validation issues for {entity_type} {entity_id}: {issues}") - else: - logger.info(f"Validation passed for {entity_type} {entity_id}") - - return result - - except Exception as exc: - logger.error(f"Error validating {entity_type} {entity_id}: {str(exc)}") - raise self.retry(exc=exc, countdown=300) diff --git a/django/apps/media/__init__.py b/django/apps/media/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/media/__pycache__/__init__.cpython-313.pyc b/django/apps/media/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 0ba36b500daca3e90da38cfdb7c7108c21a59f72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmey&%ge<81P%rKnIQTxh=2h`DC08=kTI1Zok5e)ZzV$!6Oi{ABz4PIKeRZts93)w zF(`275aS~=BO_xGGmr%U$8ao` diff --git a/django/apps/media/__pycache__/admin.cpython-313.pyc b/django/apps/media/__pycache__/admin.cpython-313.pyc deleted file mode 100644 index 264c5a5ffc4cda6aeb65869359678a77e5e1dee6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8711 zcmd5>-ESM&bsr9ANQxgKDN)piC3z%EmT6m**Vb+-Tb5(5KP5}fYOH1vD_ED__uTJu&OPUM&)o}!{0w|Q+X^d*L5BHHEZCpN%Iy6EWIkj>hA^T_ zWanJ7EMW!AyXV}q9N}o5o8xCa#6$D^oOjkod^GQwYn$~G|7?H+pzIZWbHUjV2?@+H zyV!3})%YD|mP2p4%yJJi%!qA$jOd59u)5aoO}9yT)2bj5+9Loxg3Fv;OQP9OqP>*# zpMOuvXA8pFOisxQ=|X;0$rg#ED}}tUS|CDB&M1m#{fxVwdE+ zOqBF>X{D%2`t=Krw6FLl-eimv#FCl z;urf#0OlHixq?f~q)Qy^W8U+Tkhs5(A?>2D+^&Z04T(cQi-^O^5eMx6(4ykVa@0W^ z1zLxAaJj=lJ3&Vu!_nV!kxuatw26s{<(Q+*VW4%1N0z%Bw4*?ai{s022Q3M-ZgFC{ z+d(@9v>x$|J zwxX{Ia(+$9r{#>WDoc8i$XYVdW<>S1Vs0fbDQaq+$hQ>vw!!O)uF8gg9hD%ZZ>-Bk z6!pzi!jz^%Z_NnEd1$whQu3<>BT!sd3sOeTq*gWze@4m4c?}d+Goq`CDyKB1B&RZp zwysJWhBr-MemRrykSHwP2q;=gT3;uHTXKd(Y>KtUjL`%|pSNs~BKCU}BkGy)k} zOA}=s&xO&MRtv?BIgWU|~klDYr_|vzk^&E67se0+mUE zB?2@fLy(j@mZ)fiDDC@eC z&*DfSOG8ox0?I~ua237S%Oh@Rx|{>

>|mw!3yLA6?XEWNxJ!Es?T=+W|{6RmxYQ!nQ|OaTf^2 z5mE$6(MAe7e21A=md(Y2C9Ar*Y$z*sw=0#-+HBARE`4sr4!rtQ90gf+Kwp*>RmGZV z+5s{ZSy_Nt(<#^j9BCb-sijE$kci*SJBJI_%Jw<~C3xJkV{WuF9w6eqAJScbHQV_i zw(la{5i{YzeWY_Q;TA4ymZB<_0wUvtx`z~Go_H@QKuw~Y2MYHg+KXtbZ4QciXn{$1 zN<$y$rZQ(}pmx+IePI#}QdA6MCHc{(DB-a=Q#0m?a=1~{Ov@xB&jH&Zd(Op55_DpwJjX>5|jKo0`VUC*>@UYh73BzfMzEi|#!tH8}3=d+$^>O<^oPcagA z#*=4fh@PO2#An%=u=|$vxK`h_^!uD|YcV|!ty4Kw7*MJR-hv-{8x644-gN5$�zl(fyrwoi6;=TpY!6ue-59hp$XMXb%A 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 diff --git a/django/apps/versioning/__pycache__/models.cpython-313.pyc b/django/apps/versioning/__pycache__/models.cpython-313.pyc deleted file mode 100644 index b913ccafe1af9ac4d1c6b57c1242568d7ad675f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9800 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 diff --git a/django/apps/versioning/__pycache__/services.cpython-313.pyc b/django/apps/versioning/__pycache__/services.cpython-313.pyc deleted file mode 100644 index ba7149a5ddd6fe62c0aea08f7445f877d2b8493c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15407 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 diff --git a/django/apps/versioning/admin.py b/django/apps/versioning/admin.py deleted file mode 100644 index 0c84ad5e..00000000 --- a/django/apps/versioning/admin.py +++ /dev/null @@ -1,236 +0,0 @@ -""" -Admin interface for versioning models. - -Provides Django admin interface for viewing version history, -comparing versions, and managing version records. -""" - -from django.contrib import admin -from django.utils.html import format_html -from django.urls import reverse -from unfold.admin import ModelAdmin - -from apps.versioning.models import EntityVersion - - -@admin.register(EntityVersion) -class EntityVersionAdmin(ModelAdmin): - """ - Admin interface for EntityVersion model. - - Provides read-only view of version history with search and filtering. - """ - - # Display settings - list_display = [ - 'version_number', - 'entity_link', - 'change_type', - 'changed_by_link', - 'submission_link', - 'changed_field_count', - 'created', - ] - - list_filter = [ - 'change_type', - 'entity_type', - 'created', - ] - - search_fields = [ - 'entity_id', - 'comment', - 'changed_by__email', - 'changed_by__username', - ] - - ordering = ['-created'] - - date_hierarchy = 'created' - - # Read-only admin (versions should not be modified) - readonly_fields = [ - 'id', - 'entity_type', - 'entity_id', - 'entity_link', - 'version_number', - 'change_type', - 'snapshot_display', - 'changed_fields_display', - 'changed_by', - 'submission', - 'comment', - 'ip_address', - 'user_agent', - 'created', - 'modified', - ] - - fieldsets = ( - ('Version Information', { - 'fields': ( - 'id', - 'version_number', - 'change_type', - 'created', - 'modified', - ) - }), - ('Entity', { - 'fields': ( - 'entity_type', - 'entity_id', - 'entity_link', - ) - }), - ('Changes', { - 'fields': ( - 'changed_fields_display', - 'snapshot_display', - ) - }), - ('Metadata', { - 'fields': ( - 'changed_by', - 'submission', - 'comment', - 'ip_address', - 'user_agent', - ) - }), - ) - - def has_add_permission(self, request): - """Disable adding versions manually.""" - return False - - def has_delete_permission(self, request, obj=None): - """Disable deleting versions.""" - return False - - def has_change_permission(self, request, obj=None): - """Only allow viewing versions, not editing.""" - return False - - def entity_link(self, obj): - """Display link to the entity.""" - try: - entity = obj.entity - if entity: - # Try to get admin URL for entity - admin_url = reverse( - f'admin:{obj.entity_type.app_label}_{obj.entity_type.model}_change', - args=[entity.pk] - ) - return format_html( - '{}', - admin_url, - str(entity) - ) - except: - pass - return f"{obj.entity_type.model}:{obj.entity_id}" - entity_link.short_description = 'Entity' - - def changed_by_link(self, obj): - """Display link to user who made the change.""" - if obj.changed_by: - try: - admin_url = reverse( - 'admin:users_user_change', - args=[obj.changed_by.pk] - ) - return format_html( - '{}', - admin_url, - obj.changed_by.email - ) - except: - return obj.changed_by.email - return '-' - changed_by_link.short_description = 'Changed By' - - def submission_link(self, obj): - """Display link to content submission if applicable.""" - if obj.submission: - try: - admin_url = reverse( - 'admin:moderation_contentsubmission_change', - args=[obj.submission.pk] - ) - return format_html( - '#{}', - admin_url, - obj.submission.pk - ) - except: - return str(obj.submission.pk) - return '-' - submission_link.short_description = 'Submission' - - def changed_field_count(self, obj): - """Display count of changed fields.""" - count = len(obj.changed_fields) - if count == 0: - return '-' - return f"{count} field{'s' if count != 1 else ''}" - changed_field_count.short_description = 'Changed Fields' - - def snapshot_display(self, obj): - """Display snapshot in a formatted way.""" - import json - snapshot = obj.get_snapshot_dict() - - # Format as pretty JSON - formatted = json.dumps(snapshot, indent=2, sort_keys=True) - - return format_html( - '

{}
', - formatted - ) - snapshot_display.short_description = 'Snapshot' - - def changed_fields_display(self, obj): - """Display changed fields in a formatted way.""" - if not obj.changed_fields: - return format_html('No fields changed') - - html_parts = [''] - html_parts.append('') - html_parts.append('') - html_parts.append('') - html_parts.append('') - html_parts.append('') - - for field_name, change in obj.changed_fields.items(): - old_val = change.get('old', '-') - new_val = change.get('new', '-') - - # Truncate long values - if isinstance(old_val, str) and len(old_val) > 100: - old_val = old_val[:97] + '...' - if isinstance(new_val, str) and len(new_val) > 100: - new_val = new_val[:97] + '...' - - html_parts.append('') - html_parts.append(f'') - html_parts.append(f'') - html_parts.append(f'') - html_parts.append('') - - html_parts.append('
FieldOld ValueNew Value
{field_name}{old_val}{new_val}
') - - return format_html(''.join(html_parts)) - changed_fields_display.short_description = 'Changed Fields' - - def get_queryset(self, request): - """Optimize queryset with select_related.""" - qs = super().get_queryset(request) - return qs.select_related( - 'entity_type', - 'changed_by', - 'submission', - 'submission__user' - ) diff --git a/django/apps/versioning/apps.py b/django/apps/versioning/apps.py deleted file mode 100644 index 84c20f0c..00000000 --- a/django/apps/versioning/apps.py +++ /dev/null @@ -1,11 +0,0 @@ -""" -Versioning app configuration. -""" - -from django.apps import AppConfig - - -class VersioningConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.versioning' - verbose_name = 'Versioning' diff --git a/django/apps/versioning/migrations/0001_initial.py b/django/apps/versioning/migrations/0001_initial.py deleted file mode 100644 index f2a2f6b6..00000000 --- a/django/apps/versioning/migrations/0001_initial.py +++ /dev/null @@ -1,165 +0,0 @@ -# Generated by Django 4.2.8 on 2025-11-08 17:51 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import django_lifecycle.mixins -import model_utils.fields -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ("contenttypes", "0002_remove_content_type_name"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("moderation", "0001_initial"), - ] - - operations = [ - migrations.CreateModel( - name="EntityVersion", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "entity_id", - models.UUIDField(db_index=True, help_text="ID of the entity"), - ), - ( - "version_number", - models.PositiveIntegerField( - default=1, help_text="Sequential version number for this entity" - ), - ), - ( - "change_type", - models.CharField( - choices=[ - ("created", "Created"), - ("updated", "Updated"), - ("deleted", "Deleted"), - ("restored", "Restored"), - ], - db_index=True, - help_text="Type of change", - max_length=20, - ), - ), - ( - "snapshot", - models.JSONField( - help_text="Complete snapshot of entity state as JSON" - ), - ), - ( - "changed_fields", - models.JSONField( - default=dict, - help_text="Dict of changed fields with old/new values: {'field': {'old': ..., 'new': ...}}", - ), - ), - ( - "comment", - models.TextField( - blank=True, help_text="Optional comment about this version" - ), - ), - ( - "ip_address", - models.GenericIPAddressField( - blank=True, help_text="IP address of change origin", null=True - ), - ), - ( - "user_agent", - models.CharField( - blank=True, help_text="User agent string", max_length=500 - ), - ), - ( - "changed_by", - models.ForeignKey( - blank=True, - help_text="User who made the change", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="entity_versions", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "entity_type", - models.ForeignKey( - help_text="Type of entity (Park, Ride, Company, etc.)", - on_delete=django.db.models.deletion.CASCADE, - related_name="entity_versions", - to="contenttypes.contenttype", - ), - ), - ( - "submission", - models.ForeignKey( - blank=True, - help_text="Submission that caused this version (if applicable)", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="versions", - to="moderation.contentsubmission", - ), - ), - ], - options={ - "verbose_name": "Entity Version", - "verbose_name_plural": "Entity Versions", - "ordering": ["-created"], - "indexes": [ - models.Index( - fields=["entity_type", "entity_id", "-created"], - name="versioning__entity__8eabd9_idx", - ), - models.Index( - fields=["entity_type", "entity_id", "-version_number"], - name="versioning__entity__fe6f1b_idx", - ), - models.Index( - fields=["change_type"], name="versioning__change__17de57_idx" - ), - models.Index( - fields=["changed_by"], name="versioning__changed_39d5fd_idx" - ), - models.Index( - fields=["submission"], name="versioning__submiss_345f6b_idx" - ), - ], - "unique_together": {("entity_type", "entity_id", "version_number")}, - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - ] diff --git a/django/apps/versioning/migrations/__init__.py b/django/apps/versioning/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/versioning/migrations/__pycache__/0001_initial.cpython-313.pyc b/django/apps/versioning/migrations/__pycache__/0001_initial.cpython-313.pyc deleted file mode 100644 index 98c4977de79047a15978e9a4de413ab2abb959a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4794 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 diff --git a/django/apps/versioning/migrations/__pycache__/__init__.cpython-313.pyc b/django/apps/versioning/migrations/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 8326cfe489e1601aa392ca768570f09123c5abe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmXwz%?-jZ422sC5<;q&g9CU0U<7U)Q54!J7}6wiQUqsaU(k`?C<$U z_E1%`g0*?fG3R#>rn7oW6TX(ei5Whn I5Q0jkFJ@jdW&i*H diff --git a/django/apps/versioning/models.py b/django/apps/versioning/models.py deleted file mode 100644 index 0db37194..00000000 --- a/django/apps/versioning/models.py +++ /dev/null @@ -1,287 +0,0 @@ -""" -Versioning models for ThrillWiki. - -This module provides automatic version tracking for all entities: -- EntityVersion: Generic version model using ContentType -- Full snapshot storage in JSON -- Changed fields tracking with old/new values -- Link to ContentSubmission when changes come from moderation -""" - -import json -from django.db import models -from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes.fields import GenericForeignKey -from django.conf import settings - -from apps.core.models import BaseModel - - -class EntityVersion(BaseModel): - """ - Generic version tracking for all entities. - - Stores a complete snapshot of the entity state at the time of change, - along with metadata about what changed and who made the change. - """ - - CHANGE_TYPE_CHOICES = [ - ('created', 'Created'), - ('updated', 'Updated'), - ('deleted', 'Deleted'), - ('restored', 'Restored'), - ] - - # Entity reference (generic) - entity_type = models.ForeignKey( - ContentType, - on_delete=models.CASCADE, - related_name='entity_versions', - help_text="Type of entity (Park, Ride, Company, etc.)" - ) - entity_id = models.UUIDField( - db_index=True, - help_text="ID of the entity" - ) - entity = GenericForeignKey('entity_type', 'entity_id') - - # Version info - version_number = models.PositiveIntegerField( - default=1, - help_text="Sequential version number for this entity" - ) - change_type = models.CharField( - max_length=20, - choices=CHANGE_TYPE_CHOICES, - db_index=True, - help_text="Type of change" - ) - - # Snapshot of entity state - snapshot = models.JSONField( - help_text="Complete snapshot of entity state as JSON" - ) - - # Changed fields tracking - changed_fields = models.JSONField( - default=dict, - help_text="Dict of changed fields with old/new values: {'field': {'old': ..., 'new': ...}}" - ) - - # User who made the change - changed_by = models.ForeignKey( - settings.AUTH_USER_MODEL, - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='entity_versions', - help_text="User who made the change" - ) - - # Link to ContentSubmission (if change came from moderation) - submission = models.ForeignKey( - 'moderation.ContentSubmission', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='versions', - help_text="Submission that caused this version (if applicable)" - ) - - # Metadata - comment = models.TextField( - blank=True, - help_text="Optional comment about this version" - ) - ip_address = models.GenericIPAddressField( - null=True, - blank=True, - help_text="IP address of change origin" - ) - user_agent = models.CharField( - max_length=500, - blank=True, - help_text="User agent string" - ) - - class Meta: - verbose_name = 'Entity Version' - verbose_name_plural = 'Entity Versions' - ordering = ['-created'] - indexes = [ - models.Index(fields=['entity_type', 'entity_id', '-created']), - models.Index(fields=['entity_type', 'entity_id', '-version_number']), - models.Index(fields=['change_type']), - models.Index(fields=['changed_by']), - models.Index(fields=['submission']), - ] - unique_together = [['entity_type', 'entity_id', 'version_number']] - - def __str__(self): - return f"{self.entity_type.model} v{self.version_number} ({self.change_type})" - - @property - def entity_name(self): - """Get display name of the entity.""" - try: - entity = self.entity - if entity: - return str(entity) - except: - pass - return f"{self.entity_type.model}:{self.entity_id}" - - def get_snapshot_dict(self): - """ - Get snapshot as Python dict. - - Returns: - dict: Entity snapshot - """ - if isinstance(self.snapshot, str): - return json.loads(self.snapshot) - return self.snapshot - - def get_changed_fields_list(self): - """ - Get list of changed field names. - - Returns: - list: Field names that changed - """ - return list(self.changed_fields.keys()) - - def get_field_change(self, field_name): - """ - Get old and new values for a specific field. - - Args: - field_name: Name of the field - - Returns: - dict: {'old': old_value, 'new': new_value} or None if field didn't change - """ - return self.changed_fields.get(field_name) - - def compare_with(self, other_version): - """ - Compare this version with another version. - - Args: - other_version: EntityVersion to compare with - - Returns: - dict: Comparison result with differences - """ - if not other_version or self.entity_id != other_version.entity_id: - return None - - this_snapshot = self.get_snapshot_dict() - other_snapshot = other_version.get_snapshot_dict() - - differences = {} - all_keys = set(this_snapshot.keys()) | set(other_snapshot.keys()) - - for key in all_keys: - this_val = this_snapshot.get(key) - other_val = other_snapshot.get(key) - - if this_val != other_val: - differences[key] = { - 'this': this_val, - 'other': other_val - } - - return { - 'this_version': self.version_number, - 'other_version': other_version.version_number, - 'differences': differences, - 'changed_field_count': len(differences) - } - - def get_diff_summary(self): - """ - Get human-readable summary of changes in this version. - - Returns: - str: Summary of changes - """ - if self.change_type == 'created': - return f"Created {self.entity_name}" - - if self.change_type == 'deleted': - return f"Deleted {self.entity_name}" - - changed_count = len(self.changed_fields) - if changed_count == 0: - return f"No changes to {self.entity_name}" - - field_names = ', '.join(self.get_changed_fields_list()[:3]) - if changed_count > 3: - field_names += f" and {changed_count - 3} more" - - return f"Updated {field_names}" - - @classmethod - def get_latest_version_number(cls, entity_type, entity_id): - """ - Get the latest version number for an entity. - - Args: - entity_type: ContentType of entity - entity_id: UUID of entity - - Returns: - int: Latest version number (0 if no versions exist) - """ - latest = cls.objects.filter( - entity_type=entity_type, - entity_id=entity_id - ).aggregate( - max_version=models.Max('version_number') - ) - return latest['max_version'] or 0 - - @classmethod - def get_history(cls, entity_type, entity_id, limit=50): - """ - Get version history for an entity. - - Args: - entity_type: ContentType of entity - entity_id: UUID of entity - limit: Maximum number of versions to return - - Returns: - QuerySet: Ordered list of versions (newest first) - """ - return cls.objects.filter( - entity_type=entity_type, - entity_id=entity_id - ).select_related( - 'changed_by', - 'submission', - 'submission__user' - ).order_by('-version_number')[:limit] - - @classmethod - def get_version_by_number(cls, entity_type, entity_id, version_number): - """ - Get a specific version by number. - - Args: - entity_type: ContentType of entity - entity_id: UUID of entity - version_number: Version number to retrieve - - Returns: - EntityVersion or None - """ - try: - return cls.objects.get( - entity_type=entity_type, - entity_id=entity_id, - version_number=version_number - ) - except cls.DoesNotExist: - return None diff --git a/django/apps/versioning/services.py b/django/apps/versioning/services.py deleted file mode 100644 index 9a025dbf..00000000 --- a/django/apps/versioning/services.py +++ /dev/null @@ -1,473 +0,0 @@ -""" -Versioning services for ThrillWiki. - -This module provides the business logic for creating and managing entity versions: -- Creating versions automatically via lifecycle hooks -- Generating snapshots and tracking changed fields -- Linking versions to content submissions -- Retrieving version history and diffs -- Restoring previous versions -""" - -import json -from decimal import Decimal -from datetime import date, datetime -from django.db import models, transaction -from django.contrib.contenttypes.models import ContentType -from django.core.serializers.json import DjangoJSONEncoder -from django.core.exceptions import ValidationError - -from apps.versioning.models import EntityVersion - - -class VersionService: - """ - Service class for versioning operations. - - All methods handle automatic version creation and tracking. - """ - - @staticmethod - @transaction.atomic - def create_version( - entity, - change_type='updated', - changed_fields=None, - user=None, - submission=None, - comment='', - ip_address=None, - user_agent='' - ): - """ - Create a version record for an entity. - - This is called automatically by the VersionedModel lifecycle hooks, - but can also be called manually when needed. - - Args: - entity: Entity instance (Park, Ride, Company, etc.) - change_type: Type of change ('created', 'updated', 'deleted', 'restored') - changed_fields: Dict of dirty fields from DirtyFieldsMixin - user: User who made the change (optional) - submission: ContentSubmission that caused this change (optional) - comment: Optional comment about the change - ip_address: IP address of the change origin - user_agent: User agent string - - Returns: - EntityVersion instance - """ - # Get ContentType for entity - entity_type = ContentType.objects.get_for_model(entity) - - # Get next version number - version_number = EntityVersion.get_latest_version_number( - entity_type, entity.id - ) + 1 - - # Create snapshot of current entity state - snapshot = VersionService._create_snapshot(entity) - - # Build changed_fields dict with old/new values - changed_fields_data = {} - if changed_fields and change_type == 'updated': - changed_fields_data = VersionService._build_changed_fields( - entity, changed_fields - ) - - # Try to get user from submission if not provided - if not user and submission: - user = submission.user - - # Create version record - version = EntityVersion.objects.create( - entity_type=entity_type, - entity_id=entity.id, - version_number=version_number, - change_type=change_type, - snapshot=snapshot, - changed_fields=changed_fields_data, - changed_by=user, - submission=submission, - comment=comment, - ip_address=ip_address, - user_agent=user_agent - ) - - return version - - @staticmethod - def _create_snapshot(entity): - """ - Create a JSON snapshot of the entity's current state. - - Args: - entity: Entity instance - - Returns: - dict: Serializable snapshot of entity - """ - snapshot = {} - - # Get all model fields - for field in entity._meta.get_fields(): - # Skip reverse relations - if field.is_relation and field.many_to_one is False and field.one_to_many is True: - continue - if field.is_relation and field.many_to_many is True: - continue - - field_name = field.name - - try: - value = getattr(entity, field_name) - - # Handle different field types - if value is None: - snapshot[field_name] = None - elif isinstance(value, (str, int, float, bool)): - snapshot[field_name] = value - elif isinstance(value, Decimal): - snapshot[field_name] = float(value) - elif isinstance(value, (date, datetime)): - snapshot[field_name] = value.isoformat() - elif isinstance(value, models.Model): - # Store FK as ID - snapshot[field_name] = str(value.id) if value.id else None - elif isinstance(value, dict): - # JSONField - snapshot[field_name] = value - elif isinstance(value, list): - # JSONField array - snapshot[field_name] = value - else: - # Try to serialize as string - snapshot[field_name] = str(value) - except Exception: - # Skip fields that can't be serialized - continue - - return snapshot - - @staticmethod - def _build_changed_fields(entity, dirty_fields): - """ - Build a dict of changed fields with old and new values. - - Args: - entity: Entity instance - dirty_fields: Dict from DirtyFieldsMixin.get_dirty_fields() - - Returns: - dict: Changed fields with old/new values - """ - changed = {} - - for field_name, old_value in dirty_fields.items(): - try: - new_value = getattr(entity, field_name) - - # Normalize values for JSON - old_normalized = VersionService._normalize_value(old_value) - new_normalized = VersionService._normalize_value(new_value) - - changed[field_name] = { - 'old': old_normalized, - 'new': new_normalized - } - except Exception: - continue - - return changed - - @staticmethod - def _normalize_value(value): - """ - Normalize a value for JSON serialization. - - Args: - value: Value to normalize - - Returns: - Normalized value - """ - if value is None: - return None - elif isinstance(value, (str, int, float, bool)): - return value - elif isinstance(value, Decimal): - return float(value) - elif isinstance(value, (date, datetime)): - return value.isoformat() - elif isinstance(value, models.Model): - return str(value.id) if value.id else None - elif isinstance(value, (dict, list)): - return value - else: - return str(value) - - @staticmethod - def get_version_history(entity, limit=50): - """ - Get version history for an entity. - - Args: - entity: Entity instance - limit: Maximum number of versions to return - - Returns: - QuerySet: Ordered list of versions (newest first) - """ - entity_type = ContentType.objects.get_for_model(entity) - return EntityVersion.get_history(entity_type, entity.id, limit) - - @staticmethod - def get_version_by_number(entity, version_number): - """ - Get a specific version by number. - - Args: - entity: Entity instance - version_number: Version number to retrieve - - Returns: - EntityVersion or None - """ - entity_type = ContentType.objects.get_for_model(entity) - return EntityVersion.get_version_by_number(entity_type, entity.id, version_number) - - @staticmethod - def get_latest_version(entity): - """ - Get the latest version for an entity. - - Args: - entity: Entity instance - - Returns: - EntityVersion or None - """ - entity_type = ContentType.objects.get_for_model(entity) - return EntityVersion.objects.filter( - entity_type=entity_type, - entity_id=entity.id - ).order_by('-version_number').first() - - @staticmethod - def compare_versions(version1, version2): - """ - Compare two versions of the same entity. - - Args: - version1: First EntityVersion - version2: Second EntityVersion - - Returns: - dict: Comparison result with differences - """ - if version1.entity_id != version2.entity_id: - raise ValidationError("Versions must be for the same entity") - - return version1.compare_with(version2) - - @staticmethod - def get_diff_with_current(version): - """ - Compare a version with the current entity state. - - Args: - version: EntityVersion to compare - - Returns: - dict: Differences between version and current state - """ - entity = version.entity - if not entity: - raise ValidationError("Entity no longer exists") - - current_snapshot = VersionService._create_snapshot(entity) - version_snapshot = version.get_snapshot_dict() - - differences = {} - all_keys = set(current_snapshot.keys()) | set(version_snapshot.keys()) - - for key in all_keys: - current_val = current_snapshot.get(key) - version_val = version_snapshot.get(key) - - if current_val != version_val: - differences[key] = { - 'current': current_val, - 'version': version_val - } - - return { - 'version_number': version.version_number, - 'differences': differences, - 'changed_field_count': len(differences) - } - - @staticmethod - @transaction.atomic - def restore_version(version, user=None, comment=''): - """ - Restore an entity to a previous version. - - This creates a new version with change_type='restored'. - - Args: - version: EntityVersion to restore - user: User performing the restore - comment: Optional comment about the restore - - Returns: - EntityVersion: New version created by restore - - Raises: - ValidationError: If entity doesn't exist - """ - entity = version.entity - if not entity: - raise ValidationError("Entity no longer exists") - - # Get snapshot to restore - snapshot = version.get_snapshot_dict() - - # Track which fields are changing - changed_fields = {} - - # Apply snapshot values to entity - for field_name, value in snapshot.items(): - # Skip metadata fields - if field_name in ['id', 'created', 'modified']: - continue - - try: - # Get current value - current_value = getattr(entity, field_name, None) - current_normalized = VersionService._normalize_value(current_value) - - # Check if value is different - if current_normalized != value: - changed_fields[field_name] = { - 'old': current_normalized, - 'new': value - } - - # Apply restored value - # Handle special field types - field = entity._meta.get_field(field_name) - - if isinstance(field, models.ForeignKey): - # FK fields need model instance - if value: - related_model = field.related_model - try: - related_obj = related_model.objects.get(id=value) - setattr(entity, field_name, related_obj) - except: - pass - else: - setattr(entity, field_name, None) - elif isinstance(field, models.DateField): - # Date fields - if value: - setattr(entity, field_name, datetime.fromisoformat(value).date()) - else: - setattr(entity, field_name, None) - elif isinstance(field, models.DateTimeField): - # DateTime fields - if value: - setattr(entity, field_name, datetime.fromisoformat(value)) - else: - setattr(entity, field_name, None) - elif isinstance(field, models.DecimalField): - # Decimal fields - if value is not None: - setattr(entity, field_name, Decimal(str(value))) - else: - setattr(entity, field_name, None) - else: - # Regular fields - setattr(entity, field_name, value) - except Exception: - # Skip fields that can't be restored - continue - - # Save entity (this will trigger lifecycle hooks) - # But we need to create the version manually to mark it as 'restored' - entity.save() - - # Create restore version - entity_type = ContentType.objects.get_for_model(entity) - version_number = EntityVersion.get_latest_version_number( - entity_type, entity.id - ) + 1 - - restored_version = EntityVersion.objects.create( - entity_type=entity_type, - entity_id=entity.id, - version_number=version_number, - change_type='restored', - snapshot=VersionService._create_snapshot(entity), - changed_fields=changed_fields, - changed_by=user, - comment=f"Restored from version {version.version_number}. {comment}".strip() - ) - - return restored_version - - @staticmethod - def get_version_count(entity): - """ - Get total number of versions for an entity. - - Args: - entity: Entity instance - - Returns: - int: Number of versions - """ - entity_type = ContentType.objects.get_for_model(entity) - return EntityVersion.objects.filter( - entity_type=entity_type, - entity_id=entity.id - ).count() - - @staticmethod - def get_versions_by_user(user, limit=50): - """ - Get versions created by a specific user. - - Args: - user: User instance - limit: Maximum number of versions to return - - Returns: - QuerySet: Versions by user (newest first) - """ - return EntityVersion.objects.filter( - changed_by=user - ).select_related( - 'entity_type', - 'submission' - ).order_by('-created')[:limit] - - @staticmethod - def get_versions_by_submission(submission): - """ - Get all versions created by a content submission. - - Args: - submission: ContentSubmission instance - - Returns: - QuerySet: Versions from submission - """ - return EntityVersion.objects.filter( - submission=submission - ).select_related( - 'entity_type', - 'changed_by' - ).order_by('-created') diff --git a/django/config/__init__.py b/django/config/__init__.py deleted file mode 100644 index df33ac9c..00000000 --- a/django/config/__init__.py +++ /dev/null @@ -1,11 +0,0 @@ -""" -ThrillWiki Django configuration package. - -This module ensures the Celery app is loaded when Django starts -so that @shared_task decorators can use it. -""" - -# Load Celery app when Django starts -from .celery import app as celery_app - -__all__ = ('celery_app',) diff --git a/django/config/__pycache__/__init__.cpython-313.pyc b/django/config/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index fb51a5886fbd010a85b3a72b97b6ccda45b855cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmXv~u};G<5Vf0xLQn+*18g@Tb)ew`5JG|lkXQm@v`k_WQ)5SGM^H9C0{8}gDH9SC z8>nLE+R_`&_wJtF`Q3CdNEyZc>xND^W1lmyjNX4S-KOG&>tO^ek1(#{ zVe<5rUe>6Mxz=M1CwJ0T4hm;)b=9H_+F591F_x7YrNq=8?p@g$1Y)X)Ir`eTP=(8Y=!>rPwZf~-} zIIE~Pw;qrj?y1Ly2nw@ueuQjsgiHu+br53IOuE&Bh518VC*|1({T8L~h;#naOL+Xd P$@uO^y7Sz}H5&W@k@tP1 diff --git a/django/config/__pycache__/celery.cpython-313.pyc b/django/config/__pycache__/celery.cpython-313.pyc deleted file mode 100644 index 996098d82e4b02672d80e83acf8440b9d2a05974..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2523 zcmb7FO>7fK6rTOHy~fTDaS{TBB`pwF#HkcWMVg{QlcvP3LEczxMI>vp9y?1myYB27 zf+eKnL{1ePD5->0uDwyUQaSe6qg|*Ht%Q2$iJOCa;?y_0Yhy~(sw2(pn|a^7**EWd zZ(6aKgrJ@LrbnL^5&Dx(+D!>drD*PuFL#ehM3I!} zITrBI+~IDGFDnN|P}_!wd21g`Oo=J+bF9(>*g#EsmV}(V54K3a>=UuKg7wR_UX*udnbtXXDBFIS1`=$0v$EFv$i5Zy37*H`tFBrUG!w!CH)s|J>J zQ+IUL&}-P1ofRwx7Su|`&^3R*Y8E>du`M~Oy($-VTeGgiS*K-82pq5iC_^{Pr)3IX zv%suHV4jkmQ$Mpw#ua_rN!C3;Z4^qXZd3^lW_DH6ux$e_Y-7iPt+qQjyKo^pf4QK{ zEiPWl&MSq_F3;vObG3x;V5$vF8J4CRuH<-L-T*Ia1I25qS+-IXIo-y=FU)1;a$mwB z5mQ~mc16{&)*S~*2o8E{6oz}~YDbp~sMA>h;T@D@vPqTzuaO(SlvNflWHNKJg$q}% zDBq(Ng}U<-c^eaZ!ch&2Oq6wJrMf(!8J3A*&HG)4sM_i{UatTElL`O7CwvblG%uj3 z%1t*sW2kG(MfE)C1-nDgZJJpd=)wBVv8msVO_4ZE7vXmKW!)^gF}-Yp!2-c{)o`?c z=>S29hweE!1p+wP(J4$G?dRwW8%LAuE2ab6xZ2n(Uapp9j}DF{JJ@#G?0JoUsahn5 zzp8?IT87(lg$nS(aYMvkgjn!4HcB@A3z_u5=t@Ouxgfn{dl-fd^p}VPY3tIR z;(g<;(MX)AODBKlPkFv;)Ted}gAj$@`WgnPEwrv6lh59SHSB)vn20^ z469s*+;Ssj?7&ZyF##pbV3+rHiLPj4vj|JH-nkJlfh)9(xZ>&!m6UCAjIN8+4)B^@ ziR?8$as%G^fl~#qD1fO`fI1G{z6`?#YC#MS?#2doVn-XXquaNh#Kt#1+2y6%na#|u z)N@C?AH5shy0v|A`^L8Zu=XhV=x{y!;cj1IcjWlb(I29X_)If|guWMu7eqhw-Psv} zL%h&G0HG6lF3{Sp*957c&%b!2N&gFSE*_kH=q9sS|~?H;NyyZ-X|Gyl&%V1*oaJ3 zJf#E~r6OlL1axnMOx~r#2|CaSlanym^g7;%Zg6HNy5j&!QS=oU{w2EU&2(3E>qjQ* z;WN8OM!!pcoBnC?(e)occR9b3&nru|%TuO%)yWOP787tD&k4N_5~Bkx$bMRcXZ+{(Jeh_y zTIuY^Ff=)aVfI*o;ahRUNYBurKhW7{NN$RV;ciQt(hf>AP@+DVs=qh?6n(lUqEKvW z>4`Y9!BGsqg9aODus$^Yc(_i*i(RXYp{b|neOO?H+ryi~Th7BX8^d*GY>#D`u@;Be lWRptG1Bi|9Fo_0}Xt7~Nq?*Adm72p{noywGV?pvf`x}|3PU`>w diff --git a/django/config/__pycache__/urls.cpython-313.pyc b/django/config/__pycache__/urls.cpython-313.pyc deleted file mode 100644 index fb1781314478a9e49e209eda9e5ac0ae49c740f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1483 zcmb7E-*4MQ96vjDoH|WAqzSr$&~30KQB$8ftq(+lX=4d2DML!A(4RC;)r|+JJ(#(pH;FL!~N|IMd8DG^#aps>jb-Gutqz5o5iX zYphTcf{u0xw6h(x^?F)(F}F4rI7Pea9L0G?$NaY#q|!piXuXx@F6L4KoofJyh_@GS zQq;PbqQ%_KwO88adup0(pBLGMm`T2)3mvPw!V5W4mPpwy06+`F_*Y)DzZCS%{nj4r zlVIQu$JFL73E+UxWCezlJivW!ndWCB4DXMr7uuX-8nFA&a~X$}j5%gd6k(7PIC1eq zX2H6s;1i0W8;D~5ylm)Un_u9{Gc5$7SRBIJ-hvz!NZFeGWaKJgI_&^7BS;v{tY z49Q?5+B0O<9@)OA#j0j~9Q0$xaof1)jsf}O=aC^22Bw{gav`o;ESJqcZla5D55-r~3 z80K7vVFG9D&^^e;q3FO64`{N3qP6mtx_@W38>{J<0yCCC(hWzAJ7Y;s=NT$*Wz!M zQ55A=U01X}F9GG^Z{YH;0R9f%JXZCz739u6J$!ojZRxwp^U5!qTR&}Xy{KIO5x>~n`gwD2mIL~^m$}uWd(VyU h3)2m2nnSaUdOmv!R6YAubG8EB{6u+jNZ$}_{sLD?nvVbg diff --git a/django/config/__pycache__/wsgi.cpython-313.pyc b/django/config/__pycache__/wsgi.cpython-313.pyc deleted file mode 100644 index ce2b6965d324ec2e06af93a09dea952c3537e48d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 656 zcmYjP!EO^V5VdzhQ*CI95bfEjxJ07sg4zp0NJR}%T1cgC3m2q~yF1yqc00dBTtr=0_5VAT;}gFLcgY)dDO1JN=E|L1&l$EG1Gij zk}QXm^!uzR1W%adO7{D%-*YFDD-DE8rSaBSor5?oJ!Q%}m5(rS_QPpc?K_>a4sy)3 zl4anCDGb<1*s^g$@DrL$4V7(rWI!8gnNXT$+zv;_G!aUII~!^)gw-s0yYA-gE`X+$ z9<6N6-WC>T<>HfS;!kzcb#H|zf6>sl9qB*V*}t*? diff --git a/django/config/asgi.py b/django/config/asgi.py deleted file mode 100644 index 87078af4..00000000 --- a/django/config/asgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -ASGI config for config project. - -It exposes the ASGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/ -""" - -import os - -from django.core.asgi import get_asgi_application - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") - -application = get_asgi_application() diff --git a/django/config/celery.py b/django/config/celery.py deleted file mode 100644 index dd8d09f7..00000000 --- a/django/config/celery.py +++ /dev/null @@ -1,54 +0,0 @@ -""" -Celery configuration for ThrillWiki. - -This module initializes the Celery application and configures -task discovery, error handling, and monitoring. -""" - -import os -from celery import Celery -from celery.signals import task_failure, task_success -from django.conf import settings - -# Set default Django settings module -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.local') - -# Create Celery app -app = Celery('thrillwiki') - -# Load configuration from Django settings -app.config_from_object('django.conf:settings', namespace='CELERY') - -# Auto-discover tasks from all installed apps -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) - - -@app.task(bind=True, ignore_result=True) -def debug_task(self): - """Debug task to test Celery configuration.""" - print(f'Request: {self.request!r}') - - -# Task failure signal handler -@task_failure.connect -def task_failure_handler(sender=None, task_id=None, exception=None, **kwargs): - """Log task failures for monitoring.""" - import logging - logger = logging.getLogger('celery.task') - logger.error( - f'Task {sender.name} ({task_id}) failed: {exception}', - exc_info=True, - extra={'task_id': task_id, 'task_name': sender.name} - ) - - -# Task success signal handler -@task_success.connect -def task_success_handler(sender=None, result=None, **kwargs): - """Log task successes for monitoring.""" - import logging - logger = logging.getLogger('celery.task') - logger.info( - f'Task {sender.name} completed successfully', - extra={'task_name': sender.name, 'result': str(result)[:200]} - ) diff --git a/django/config/celery_beat_schedule.py b/django/config/celery_beat_schedule.py deleted file mode 100644 index 3a7651a4..00000000 --- a/django/config/celery_beat_schedule.py +++ /dev/null @@ -1,73 +0,0 @@ -""" -Celery Beat schedule configuration for periodic tasks. -Import this in your Django settings. -""" -from celery.schedules import crontab - -CELERY_BEAT_SCHEDULE = { - # Collect all system metrics every minute - 'collect-system-metrics': { - 'task': 'monitoring.collect_system_metrics', - 'schedule': 60.0, # Every 60 seconds - 'options': {'queue': 'monitoring'} - }, - - # Collect error metrics every minute - 'collect-error-metrics': { - 'task': 'monitoring.collect_error_metrics', - 'schedule': 60.0, - 'options': {'queue': 'monitoring'} - }, - - # Collect performance metrics every minute - 'collect-performance-metrics': { - 'task': 'monitoring.collect_performance_metrics', - 'schedule': 60.0, - 'options': {'queue': 'monitoring'} - }, - - # Collect queue metrics every 30 seconds - 'collect-queue-metrics': { - 'task': 'monitoring.collect_queue_metrics', - 'schedule': 30.0, - 'options': {'queue': 'monitoring'} - }, - - # Data retention cleanup tasks - 'run-data-retention-cleanup': { - 'task': 'monitoring.run_data_retention_cleanup', - 'schedule': crontab(hour=3, minute=0), # Daily at 3 AM - 'options': {'queue': 'maintenance'} - }, - - 'cleanup-old-metrics': { - 'task': 'monitoring.cleanup_old_metrics', - 'schedule': crontab(hour=3, minute=30), # Daily at 3:30 AM - 'options': {'queue': 'maintenance'} - }, - - 'cleanup-old-anomalies': { - 'task': 'monitoring.cleanup_old_anomalies', - 'schedule': crontab(hour=4, minute=0), # Daily at 4 AM - 'options': {'queue': 'maintenance'} - }, - - # Existing user tasks - 'cleanup-expired-tokens': { - 'task': 'users.cleanup_expired_tokens', - 'schedule': crontab(hour='*/6', minute=0), # Every 6 hours - 'options': {'queue': 'maintenance'} - }, - - 'cleanup-inactive-users': { - 'task': 'users.cleanup_inactive_users', - 'schedule': crontab(hour=2, minute=0, day_of_week=1), # Weekly on Monday at 2 AM - 'options': {'queue': 'maintenance'} - }, - - 'update-user-statistics': { - 'task': 'users.update_user_statistics', - 'schedule': crontab(hour='*', minute=0), # Every hour - 'options': {'queue': 'analytics'} - }, -} diff --git a/django/config/settings/__init__.py b/django/config/settings/__init__.py deleted file mode 100644 index 8c404068..00000000 --- a/django/config/settings/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -""" -Django settings package. -Automatically loads the correct settings based on DJANGO_SETTINGS_MODULE environment variable. -""" - -import os - -# Determine which settings to use -settings_module = os.getenv('DJANGO_SETTINGS_MODULE', 'config.settings.local') - -if settings_module == 'config.settings.production': - from .production import * -elif settings_module == 'config.settings.local': - from .local import * -else: - # Default to local for development - from .local import * diff --git a/django/config/settings/__pycache__/__init__.cpython-313.pyc b/django/config/settings/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index f923913e04b5b9828f9878f4f3b89a9f8787dd3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 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 diff --git a/django/config/settings/__pycache__/local.cpython-313.pyc b/django/config/settings/__pycache__/local.cpython-313.pyc deleted file mode 100644 index f5ee32ef2eb33909f6c5b6562ce6ce9a6b0ac9c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1273 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 .select2-results__options { - max-height: 200px; - overflow-y: auto; - color: var(--body-fg); - background: var(--body-bg); -} - -.select2-container--admin-autocomplete .select2-results__option[role=group] { - padding: 0; -} - -.select2-container--admin-autocomplete .select2-results__option[aria-disabled=true] { - color: var(--body-quiet-color); -} - -.select2-container--admin-autocomplete .select2-results__option[aria-selected=true] { - background-color: var(--selected-bg); - color: var(--body-fg); -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option { - padding-left: 1em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__group { - padding-left: 0; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option { - margin-left: -1em; - padding-left: 2em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -2em; - padding-left: 3em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -3em; - padding-left: 4em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -4em; - padding-left: 5em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -5em; - padding-left: 6em; -} - -.select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] { - background-color: var(--primary); - color: var(--primary-fg); -} - -.select2-container--admin-autocomplete .select2-results__group { - cursor: default; - display: block; - padding: 6px; -} diff --git a/django/staticfiles/admin/css/base.css b/django/staticfiles/admin/css/base.css deleted file mode 100644 index 93db7d06..00000000 --- a/django/staticfiles/admin/css/base.css +++ /dev/null @@ -1,1145 +0,0 @@ -/* - DJANGO Admin styles -*/ - -/* VARIABLE DEFINITIONS */ -html[data-theme="light"], -:root { - --primary: #79aec8; - --secondary: #417690; - --accent: #f5dd5d; - --primary-fg: #fff; - - --body-fg: #333; - --body-bg: #fff; - --body-quiet-color: #666; - --body-loud-color: #000; - - --header-color: #ffc; - --header-branding-color: var(--accent); - --header-bg: var(--secondary); - --header-link-color: var(--primary-fg); - - --breadcrumbs-fg: #c4dce8; - --breadcrumbs-link-fg: var(--body-bg); - --breadcrumbs-bg: var(--primary); - - --link-fg: #417893; - --link-hover-color: #036; - --link-selected-fg: #5b80b2; - - --hairline-color: #e8e8e8; - --border-color: #ccc; - - --error-fg: #ba2121; - - --message-success-bg: #dfd; - --message-warning-bg: #ffc; - --message-error-bg: #ffefef; - - --darkened-bg: #f8f8f8; /* A bit darker than --body-bg */ - --selected-bg: #e4e4e4; /* E.g. selected table cells */ - --selected-row: #ffc; - - --button-fg: #fff; - --button-bg: var(--primary); - --button-hover-bg: #609ab6; - --default-button-bg: var(--secondary); - --default-button-hover-bg: #205067; - --close-button-bg: #747474; - --close-button-hover-bg: #333; - --delete-button-bg: #ba2121; - --delete-button-hover-bg: #a41515; - - --object-tools-fg: var(--button-fg); - --object-tools-bg: var(--close-button-bg); - --object-tools-hover-bg: var(--close-button-hover-bg); - - --font-family-primary: - -apple-system, - BlinkMacSystemFont, - "Segoe UI", - system-ui, - Roboto, - "Helvetica Neue", - Arial, - sans-serif, - "Apple Color Emoji", - "Segoe UI Emoji", - "Segoe UI Symbol", - "Noto Color Emoji"; - --font-family-monospace: - ui-monospace, - Menlo, - Monaco, - "Cascadia Mono", - "Segoe UI Mono", - "Roboto Mono", - "Oxygen Mono", - "Ubuntu Monospace", - "Source Code Pro", - "Fira Mono", - "Droid Sans Mono", - "Courier New", - monospace, - "Apple Color Emoji", - "Segoe UI Emoji", - "Segoe UI Symbol", - "Noto Color Emoji"; -} - -html, body { - height: 100%; -} - -body { - margin: 0; - padding: 0; - font-size: 0.875rem; - font-family: var(--font-family-primary); - color: var(--body-fg); - background: var(--body-bg); -} - -/* LINKS */ - -a:link, a:visited { - color: var(--link-fg); - text-decoration: none; - transition: color 0.15s, background 0.15s; -} - -a:focus, a:hover { - color: var(--link-hover-color); -} - -a:focus { - text-decoration: underline; -} - -a img { - border: none; -} - -a.section:link, a.section:visited { - color: var(--header-link-color); - text-decoration: none; -} - -a.section:focus, a.section:hover { - text-decoration: underline; -} - -/* GLOBAL DEFAULTS */ - -p, ol, ul, dl { - margin: .2em 0 .8em 0; -} - -p { - padding: 0; - line-height: 140%; -} - -h1,h2,h3,h4,h5 { - font-weight: bold; -} - -h1 { - margin: 0 0 20px; - font-weight: 300; - font-size: 1.25rem; - color: var(--body-quiet-color); -} - -h2 { - font-size: 1rem; - margin: 1em 0 .5em 0; -} - -h2.subhead { - font-weight: normal; - margin-top: 0; -} - -h3 { - font-size: 0.875rem; - margin: .8em 0 .3em 0; - color: var(--body-quiet-color); - font-weight: bold; -} - -h4 { - font-size: 0.75rem; - margin: 1em 0 .8em 0; - padding-bottom: 3px; -} - -h5 { - font-size: 0.625rem; - margin: 1.5em 0 .5em 0; - color: var(--body-quiet-color); - text-transform: uppercase; - letter-spacing: 1px; -} - -ul > li { - list-style-type: square; - padding: 1px 0; -} - -li ul { - margin-bottom: 0; -} - -li, dt, dd { - font-size: 0.8125rem; - line-height: 1.25rem; -} - -dt { - font-weight: bold; - margin-top: 4px; -} - -dd { - margin-left: 0; -} - -form { - margin: 0; - padding: 0; -} - -fieldset { - margin: 0; - min-width: 0; - padding: 0; - border: none; - border-top: 1px solid var(--hairline-color); -} - -blockquote { - font-size: 0.6875rem; - color: #777; - margin-left: 2px; - padding-left: 10px; - border-left: 5px solid #ddd; -} - -code, pre { - font-family: var(--font-family-monospace); - color: var(--body-quiet-color); - font-size: 0.75rem; - overflow-x: auto; -} - -pre.literal-block { - margin: 10px; - background: var(--darkened-bg); - padding: 6px 8px; -} - -code strong { - color: #930; -} - -hr { - clear: both; - color: var(--hairline-color); - background-color: var(--hairline-color); - height: 1px; - border: none; - margin: 0; - padding: 0; - line-height: 1px; -} - -/* TEXT STYLES & MODIFIERS */ - -.small { - font-size: 0.6875rem; -} - -.mini { - font-size: 0.625rem; -} - -.help, p.help, form p.help, div.help, form div.help, div.help li { - font-size: 0.6875rem; - color: var(--body-quiet-color); -} - -div.help ul { - margin-bottom: 0; -} - -.help-tooltip { - cursor: help; -} - -p img, h1 img, h2 img, h3 img, h4 img, td img { - vertical-align: middle; -} - -.quiet, a.quiet:link, a.quiet:visited { - color: var(--body-quiet-color); - font-weight: normal; -} - -.clear { - clear: both; -} - -.nowrap { - white-space: nowrap; -} - -.hidden { - display: none !important; -} - -/* TABLES */ - -table { - border-collapse: collapse; - border-color: var(--border-color); -} - -td, th { - font-size: 0.8125rem; - line-height: 1rem; - border-bottom: 1px solid var(--hairline-color); - vertical-align: top; - padding: 8px; -} - -th { - font-weight: 600; - text-align: left; -} - -thead th, -tfoot td { - color: var(--body-quiet-color); - padding: 5px 10px; - font-size: 0.6875rem; - background: var(--body-bg); - border: none; - border-top: 1px solid var(--hairline-color); - border-bottom: 1px solid var(--hairline-color); -} - -tfoot td { - border-bottom: none; - border-top: 1px solid var(--hairline-color); -} - -thead th.required { - color: var(--body-loud-color); -} - -tr.alt { - background: var(--darkened-bg); -} - -tr:nth-child(odd), .row-form-errors { - background: var(--body-bg); -} - -tr:nth-child(even), -tr:nth-child(even) .errorlist, -tr:nth-child(odd) + .row-form-errors, -tr:nth-child(odd) + .row-form-errors .errorlist { - background: var(--darkened-bg); -} - -/* SORTABLE TABLES */ - -thead th { - padding: 5px 10px; - line-height: normal; - text-transform: uppercase; - background: var(--darkened-bg); -} - -thead th a:link, thead th a:visited { - color: var(--body-quiet-color); -} - -thead th.sorted { - background: var(--selected-bg); -} - -thead th.sorted .text { - padding-right: 42px; -} - -table thead th .text span { - padding: 8px 10px; - display: block; -} - -table thead th .text a { - display: block; - cursor: pointer; - padding: 8px 10px; -} - -table thead th .text a:focus, table thead th .text a:hover { - background: var(--selected-bg); -} - -thead th.sorted a.sortremove { - visibility: hidden; -} - -table thead th.sorted:hover a.sortremove { - visibility: visible; -} - -table thead th.sorted .sortoptions { - display: block; - padding: 9px 5px 0 5px; - float: right; - text-align: right; -} - -table thead th.sorted .sortpriority { - font-size: .8em; - min-width: 12px; - text-align: center; - vertical-align: 3px; - margin-left: 2px; - margin-right: 2px; -} - -table thead th.sorted .sortoptions a { - position: relative; - width: 14px; - height: 14px; - display: inline-block; - background: url(../img/sorting-icons.svg) 0 0 no-repeat; - background-size: 14px auto; -} - -table thead th.sorted .sortoptions a.sortremove { - background-position: 0 0; -} - -table thead th.sorted .sortoptions a.sortremove:after { - content: '\\'; - position: absolute; - top: -6px; - left: 3px; - font-weight: 200; - font-size: 1.125rem; - color: var(--body-quiet-color); -} - -table thead th.sorted .sortoptions a.sortremove:focus:after, -table thead th.sorted .sortoptions a.sortremove:hover:after { - color: var(--link-fg); -} - -table thead th.sorted .sortoptions a.sortremove:focus, -table thead th.sorted .sortoptions a.sortremove:hover { - background-position: 0 -14px; -} - -table thead th.sorted .sortoptions a.ascending { - background-position: 0 -28px; -} - -table thead th.sorted .sortoptions a.ascending:focus, -table thead th.sorted .sortoptions a.ascending:hover { - background-position: 0 -42px; -} - -table thead th.sorted .sortoptions a.descending { - top: 1px; - background-position: 0 -56px; -} - -table thead th.sorted .sortoptions a.descending:focus, -table thead th.sorted .sortoptions a.descending:hover { - background-position: 0 -70px; -} - -/* FORM DEFAULTS */ - -input, textarea, select, .form-row p, form .button { - margin: 2px 0; - padding: 2px 3px; - vertical-align: middle; - font-family: var(--font-family-primary); - font-weight: normal; - font-size: 0.8125rem; -} -.form-row div.help { - padding: 2px 3px; -} - -textarea { - vertical-align: top; -} - -input[type=text], input[type=password], input[type=email], input[type=url], -input[type=number], input[type=tel], textarea, select, .vTextField { - border: 1px solid var(--border-color); - border-radius: 4px; - padding: 5px 6px; - margin-top: 0; - color: var(--body-fg); - background-color: var(--body-bg); -} - -input[type=text]:focus, input[type=password]:focus, input[type=email]:focus, -input[type=url]:focus, input[type=number]:focus, input[type=tel]:focus, -textarea:focus, select:focus, .vTextField:focus { - border-color: var(--body-quiet-color); -} - -select { - height: 1.875rem; -} - -select[multiple] { - /* Allow HTML size attribute to override the height in the rule above. */ - height: auto; - min-height: 150px; -} - -/* FORM BUTTONS */ - -.button, input[type=submit], input[type=button], .submit-row input, a.button { - background: var(--button-bg); - padding: 10px 15px; - border: none; - border-radius: 4px; - color: var(--button-fg); - cursor: pointer; - transition: background 0.15s; -} - -a.button { - padding: 4px 5px; -} - -.button:active, input[type=submit]:active, input[type=button]:active, -.button:focus, input[type=submit]:focus, input[type=button]:focus, -.button:hover, input[type=submit]:hover, input[type=button]:hover { - background: var(--button-hover-bg); -} - -.button[disabled], input[type=submit][disabled], input[type=button][disabled] { - opacity: 0.4; -} - -.button.default, input[type=submit].default, .submit-row input.default { - border: none; - font-weight: 400; - background: var(--default-button-bg); -} - -.button.default:active, input[type=submit].default:active, -.button.default:focus, input[type=submit].default:focus, -.button.default:hover, input[type=submit].default:hover { - background: var(--default-button-hover-bg); -} - -.button[disabled].default, -input[type=submit][disabled].default, -input[type=button][disabled].default { - opacity: 0.4; -} - - -/* MODULES */ - -.module { - border: none; - margin-bottom: 30px; - background: var(--body-bg); -} - -.module p, .module ul, .module h3, .module h4, .module dl, .module pre { - padding-left: 10px; - padding-right: 10px; -} - -.module blockquote { - margin-left: 12px; -} - -.module ul, .module ol { - margin-left: 1.5em; -} - -.module h3 { - margin-top: .6em; -} - -.module h2, .module caption, .inline-group h2 { - margin: 0; - padding: 8px; - font-weight: 400; - font-size: 0.8125rem; - text-align: left; - background: var(--primary); - color: var(--header-link-color); -} - -.module caption, -.inline-group h2 { - font-size: 0.75rem; - letter-spacing: 0.5px; - text-transform: uppercase; -} - -.module table { - border-collapse: collapse; -} - -/* MESSAGES & ERRORS */ - -ul.messagelist { - padding: 0; - margin: 0; -} - -ul.messagelist li { - display: block; - font-weight: 400; - font-size: 0.8125rem; - padding: 10px 10px 10px 65px; - margin: 0 0 10px 0; - background: var(--message-success-bg) url(../img/icon-yes.svg) 40px 12px no-repeat; - background-size: 16px auto; - color: var(--body-fg); - word-break: break-word; -} - -ul.messagelist li.warning { - background: var(--message-warning-bg) url(../img/icon-alert.svg) 40px 14px no-repeat; - background-size: 14px auto; -} - -ul.messagelist li.error { - background: var(--message-error-bg) url(../img/icon-no.svg) 40px 12px no-repeat; - background-size: 16px auto; -} - -.errornote { - font-size: 0.875rem; - font-weight: 700; - display: block; - padding: 10px 12px; - margin: 0 0 10px 0; - color: var(--error-fg); - border: 1px solid var(--error-fg); - border-radius: 4px; - background-color: var(--body-bg); - background-position: 5px 12px; - overflow-wrap: break-word; -} - -ul.errorlist { - margin: 0 0 4px; - padding: 0; - color: var(--error-fg); - background: var(--body-bg); -} - -ul.errorlist li { - font-size: 0.8125rem; - display: block; - margin-bottom: 4px; - overflow-wrap: break-word; -} - -ul.errorlist li:first-child { - margin-top: 0; -} - -ul.errorlist li a { - color: inherit; - text-decoration: underline; -} - -td ul.errorlist { - margin: 0; - padding: 0; -} - -td ul.errorlist li { - margin: 0; -} - -.form-row.errors { - margin: 0; - border: none; - border-bottom: 1px solid var(--hairline-color); - background: none; -} - -.form-row.errors ul.errorlist li { - padding-left: 0; -} - -.errors input, .errors select, .errors textarea, -td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea { - border: 1px solid var(--error-fg); -} - -.description { - font-size: 0.75rem; - padding: 5px 0 0 12px; -} - -/* BREADCRUMBS */ - -div.breadcrumbs { - background: var(--breadcrumbs-bg); - padding: 10px 40px; - border: none; - color: var(--breadcrumbs-fg); - text-align: left; -} - -div.breadcrumbs a { - color: var(--breadcrumbs-link-fg); -} - -div.breadcrumbs a:focus, div.breadcrumbs a:hover { - color: var(--breadcrumbs-fg); -} - -/* ACTION ICONS */ - -.viewlink, .inlineviewlink { - padding-left: 16px; - background: url(../img/icon-viewlink.svg) 0 1px no-repeat; -} - -.addlink { - padding-left: 16px; - background: url(../img/icon-addlink.svg) 0 1px no-repeat; -} - -.changelink, .inlinechangelink { - padding-left: 16px; - background: url(../img/icon-changelink.svg) 0 1px no-repeat; -} - -.deletelink { - padding-left: 16px; - background: url(../img/icon-deletelink.svg) 0 1px no-repeat; -} - -a.deletelink:link, a.deletelink:visited { - color: #CC3434; /* XXX Probably unused? */ -} - -a.deletelink:focus, a.deletelink:hover { - color: #993333; /* XXX Probably unused? */ - text-decoration: none; -} - -/* OBJECT TOOLS */ - -.object-tools { - font-size: 0.625rem; - font-weight: bold; - padding-left: 0; - float: right; - position: relative; - margin-top: -48px; -} - -.object-tools li { - display: block; - float: left; - margin-left: 5px; - height: 1rem; -} - -.object-tools a { - border-radius: 15px; -} - -.object-tools a:link, .object-tools a:visited { - display: block; - float: left; - padding: 3px 12px; - background: var(--object-tools-bg); - color: var(--object-tools-fg); - font-weight: 400; - font-size: 0.6875rem; - text-transform: uppercase; - letter-spacing: 0.5px; -} - -.object-tools a:focus, .object-tools a:hover { - background-color: var(--object-tools-hover-bg); -} - -.object-tools a:focus{ - text-decoration: none; -} - -.object-tools a.viewsitelink, .object-tools a.addlink { - background-repeat: no-repeat; - background-position: right 7px center; - padding-right: 26px; -} - -.object-tools a.viewsitelink { - background-image: url(../img/tooltag-arrowright.svg); -} - -.object-tools a.addlink { - background-image: url(../img/tooltag-add.svg); -} - -/* OBJECT HISTORY */ - -#change-history table { - width: 100%; -} - -#change-history table tbody th { - width: 16em; -} - -#change-history .paginator { - color: var(--body-quiet-color); - border-bottom: 1px solid var(--hairline-color); - background: var(--body-bg); - overflow: hidden; -} - -/* PAGE STRUCTURE */ - -#container { - position: relative; - width: 100%; - min-width: 980px; - padding: 0; - display: flex; - flex-direction: column; - height: 100%; -} - -#container > div { - flex-shrink: 0; -} - -#container > .main { - display: flex; - flex: 1 0 auto; -} - -.main > .content { - flex: 1 0; - max-width: 100%; -} - -.skip-to-content-link { - position: absolute; - top: -999px; - margin: 5px; - padding: 5px; - background: var(--body-bg); - z-index: 1; -} - -.skip-to-content-link:focus { - left: 0px; - top: 0px; -} - -#content { - padding: 20px 40px; -} - -.dashboard #content { - width: 600px; -} - -#content-main { - float: left; - width: 100%; -} - -#content-related { - float: right; - width: 260px; - position: relative; - margin-right: -300px; -} - -#footer { - clear: both; - padding: 10px; -} - -/* COLUMN TYPES */ - -.colMS { - margin-right: 300px; -} - -.colSM { - margin-left: 300px; -} - -.colSM #content-related { - float: left; - margin-right: 0; - margin-left: -300px; -} - -.colSM #content-main { - float: right; -} - -.popup .colM { - width: auto; -} - -/* HEADER */ - -#header { - width: auto; - height: auto; - display: flex; - justify-content: space-between; - align-items: center; - padding: 10px 40px; - background: var(--header-bg); - color: var(--header-color); - overflow: hidden; -} - -#header a:link, #header a:visited, #logout-form button { - color: var(--header-link-color); -} - -#header a:focus , #header a:hover { - text-decoration: underline; -} - -#branding { - display: flex; -} - -#branding h1 { - padding: 0; - margin: 0; - margin-inline-end: 20px; - font-weight: 300; - font-size: 1.5rem; - color: var(--header-branding-color); -} - -#branding h1 a:link, #branding h1 a:visited { - color: var(--accent); -} - -#branding h2 { - padding: 0 10px; - font-size: 0.875rem; - margin: -8px 0 8px 0; - font-weight: normal; - color: var(--header-color); -} - -#branding a:hover { - text-decoration: none; -} - -#logout-form { - display: inline; -} - -#logout-form button { - background: none; - border: 0; - cursor: pointer; - font-family: var(--font-family-primary); -} - -#user-tools { - float: right; - margin: 0 0 0 20px; - text-align: right; -} - -#user-tools, #logout-form button{ - padding: 0; - font-weight: 300; - font-size: 0.6875rem; - letter-spacing: 0.5px; - text-transform: uppercase; -} - -#user-tools a, #logout-form button { - border-bottom: 1px solid rgba(255, 255, 255, 0.25); -} - -#user-tools a:focus, #user-tools a:hover, -#logout-form button:active, #logout-form button:hover { - text-decoration: none; - border-bottom: 0; -} - -#logout-form button:active, #logout-form button:hover { - margin-bottom: 1px; -} - -/* SIDEBAR */ - -#content-related { - background: var(--darkened-bg); -} - -#content-related .module { - background: none; -} - -#content-related h3 { - color: var(--body-quiet-color); - padding: 0 16px; - margin: 0 0 16px; -} - -#content-related h4 { - font-size: 0.8125rem; -} - -#content-related p { - padding-left: 16px; - padding-right: 16px; -} - -#content-related .actionlist { - padding: 0; - margin: 16px; -} - -#content-related .actionlist li { - line-height: 1.2; - margin-bottom: 10px; - padding-left: 18px; -} - -#content-related .module h2 { - background: none; - padding: 16px; - margin-bottom: 16px; - border-bottom: 1px solid var(--hairline-color); - font-size: 1.125rem; - color: var(--body-fg); -} - -.delete-confirmation form input[type="submit"] { - background: var(--delete-button-bg); - border-radius: 4px; - padding: 10px 15px; - color: var(--button-fg); -} - -.delete-confirmation form input[type="submit"]:active, -.delete-confirmation form input[type="submit"]:focus, -.delete-confirmation form input[type="submit"]:hover { - background: var(--delete-button-hover-bg); -} - -.delete-confirmation form .cancel-link { - display: inline-block; - vertical-align: middle; - height: 0.9375rem; - line-height: 0.9375rem; - border-radius: 4px; - padding: 10px 15px; - color: var(--button-fg); - background: var(--close-button-bg); - margin: 0 0 0 10px; -} - -.delete-confirmation form .cancel-link:active, -.delete-confirmation form .cancel-link:focus, -.delete-confirmation form .cancel-link:hover { - background: var(--close-button-hover-bg); -} - -/* POPUP */ -.popup #content { - padding: 20px; -} - -.popup #container { - min-width: 0; -} - -.popup #header { - padding: 10px 20px; -} - -/* PAGINATOR */ - -.paginator { - display: flex; - align-items: center; - gap: 4px; - font-size: 0.8125rem; - padding-top: 10px; - padding-bottom: 10px; - line-height: 22px; - margin: 0; - border-top: 1px solid var(--hairline-color); - width: 100%; -} - -.paginator a:link, .paginator a:visited { - padding: 2px 6px; - background: var(--button-bg); - text-decoration: none; - color: var(--button-fg); -} - -.paginator a.showall { - border: none; - background: none; - color: var(--link-fg); -} - -.paginator a.showall:focus, .paginator a.showall:hover { - background: none; - color: var(--link-hover-color); -} - -.paginator .end { - margin-right: 6px; -} - -.paginator .this-page { - padding: 2px 6px; - font-weight: bold; - font-size: 0.8125rem; - vertical-align: top; -} - -.paginator a:focus, .paginator a:hover { - color: white; - background: var(--link-hover-color); -} - -.paginator input { - margin-left: auto; -} - -.base-svgs { - display: none; -} diff --git a/django/staticfiles/admin/css/changelists.css b/django/staticfiles/admin/css/changelists.css deleted file mode 100644 index a7545131..00000000 --- a/django/staticfiles/admin/css/changelists.css +++ /dev/null @@ -1,328 +0,0 @@ -/* CHANGELISTS */ - -#changelist { - display: flex; - align-items: flex-start; - justify-content: space-between; -} - -#changelist .changelist-form-container { - flex: 1 1 auto; - min-width: 0; -} - -#changelist table { - width: 100%; -} - -.change-list .hiddenfields { display:none; } - -.change-list .filtered table { - border-right: none; -} - -.change-list .filtered { - min-height: 400px; -} - -.change-list .filtered .results, .change-list .filtered .paginator, -.filtered #toolbar, .filtered div.xfull { - width: auto; -} - -.change-list .filtered table tbody th { - padding-right: 1em; -} - -#changelist-form .results { - overflow-x: auto; - width: 100%; -} - -#changelist .toplinks { - border-bottom: 1px solid var(--hairline-color); -} - -#changelist .paginator { - color: var(--body-quiet-color); - border-bottom: 1px solid var(--hairline-color); - background: var(--body-bg); - overflow: hidden; -} - -/* CHANGELIST TABLES */ - -#changelist table thead th { - padding: 0; - white-space: nowrap; - vertical-align: middle; -} - -#changelist table thead th.action-checkbox-column { - width: 1.5em; - text-align: center; -} - -#changelist table tbody td.action-checkbox { - text-align: center; -} - -#changelist table tfoot { - color: var(--body-quiet-color); -} - -/* TOOLBAR */ - -#toolbar { - padding: 8px 10px; - margin-bottom: 15px; - border-top: 1px solid var(--hairline-color); - border-bottom: 1px solid var(--hairline-color); - background: var(--darkened-bg); - color: var(--body-quiet-color); -} - -#toolbar form input { - border-radius: 4px; - font-size: 0.875rem; - padding: 5px; - color: var(--body-fg); -} - -#toolbar #searchbar { - height: 1.1875rem; - border: 1px solid var(--border-color); - padding: 2px 5px; - margin: 0; - vertical-align: top; - font-size: 0.8125rem; - max-width: 100%; -} - -#toolbar #searchbar:focus { - border-color: var(--body-quiet-color); -} - -#toolbar form input[type="submit"] { - border: 1px solid var(--border-color); - font-size: 0.8125rem; - padding: 4px 8px; - margin: 0; - vertical-align: middle; - background: var(--body-bg); - box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; - cursor: pointer; - color: var(--body-fg); -} - -#toolbar form input[type="submit"]:focus, -#toolbar form input[type="submit"]:hover { - border-color: var(--body-quiet-color); -} - -#changelist-search img { - vertical-align: middle; - margin-right: 4px; -} - -#changelist-search .help { - word-break: break-word; -} - -/* FILTER COLUMN */ - -#changelist-filter { - flex: 0 0 240px; - order: 1; - background: var(--darkened-bg); - border-left: none; - margin: 0 0 0 30px; -} - -#changelist-filter h2 { - font-size: 0.875rem; - text-transform: uppercase; - letter-spacing: 0.5px; - padding: 5px 15px; - margin-bottom: 12px; - border-bottom: none; -} - -#changelist-filter h3, -#changelist-filter details summary { - font-weight: 400; - padding: 0 15px; - margin-bottom: 10px; -} - -#changelist-filter details summary > * { - display: inline; -} - -#changelist-filter details > summary { - list-style-type: none; -} - -#changelist-filter details > summary::-webkit-details-marker { - display: none; -} - -#changelist-filter details > summary::before { - content: '→'; - font-weight: bold; - color: var(--link-hover-color); -} - -#changelist-filter details[open] > summary::before { - content: '↓'; -} - -#changelist-filter ul { - margin: 5px 0; - padding: 0 15px 15px; - border-bottom: 1px solid var(--hairline-color); -} - -#changelist-filter ul:last-child { - border-bottom: none; -} - -#changelist-filter li { - list-style-type: none; - margin-left: 0; - padding-left: 0; -} - -#changelist-filter a { - display: block; - color: var(--body-quiet-color); - word-break: break-word; -} - -#changelist-filter li.selected { - border-left: 5px solid var(--hairline-color); - padding-left: 10px; - margin-left: -15px; -} - -#changelist-filter li.selected a { - color: var(--link-selected-fg); -} - -#changelist-filter a:focus, #changelist-filter a:hover, -#changelist-filter li.selected a:focus, -#changelist-filter li.selected a:hover { - color: var(--link-hover-color); -} - -#changelist-filter #changelist-filter-clear a { - font-size: 0.8125rem; - padding-bottom: 10px; - border-bottom: 1px solid var(--hairline-color); -} - -/* DATE DRILLDOWN */ - -.change-list .toplinks { - display: flex; - padding-bottom: 5px; - flex-wrap: wrap; - gap: 3px 17px; - font-weight: bold; -} - -.change-list .toplinks a { - font-size: 0.8125rem; -} - -.change-list .toplinks .date-back { - color: var(--body-quiet-color); -} - -.change-list .toplinks .date-back:focus, -.change-list .toplinks .date-back:hover { - color: var(--link-hover-color); -} - -/* ACTIONS */ - -.filtered .actions { - border-right: none; -} - -#changelist table input { - margin: 0; - vertical-align: baseline; -} - -/* Once the :has() pseudo-class is supported by all browsers, the tr.selected - selector and the JS adding the class can be removed. */ -#changelist tbody tr.selected { - background-color: var(--selected-row); -} - -#changelist tbody tr:has(.action-select:checked) { - background-color: var(--selected-row); -} - -#changelist .actions { - padding: 10px; - background: var(--body-bg); - border-top: none; - border-bottom: none; - line-height: 1.5rem; - color: var(--body-quiet-color); - width: 100%; -} - -#changelist .actions span.all, -#changelist .actions span.action-counter, -#changelist .actions span.clear, -#changelist .actions span.question { - font-size: 0.8125rem; - margin: 0 0.5em; -} - -#changelist .actions:last-child { - border-bottom: none; -} - -#changelist .actions select { - vertical-align: top; - height: 1.5rem; - color: var(--body-fg); - border: 1px solid var(--border-color); - border-radius: 4px; - font-size: 0.875rem; - padding: 0 0 0 4px; - margin: 0; - margin-left: 10px; -} - -#changelist .actions select:focus { - border-color: var(--body-quiet-color); -} - -#changelist .actions label { - display: inline-block; - vertical-align: middle; - font-size: 0.8125rem; -} - -#changelist .actions .button { - font-size: 0.8125rem; - border: 1px solid var(--border-color); - border-radius: 4px; - background: var(--body-bg); - box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; - cursor: pointer; - height: 1.5rem; - line-height: 1; - padding: 4px 8px; - margin: 0; - color: var(--body-fg); -} - -#changelist .actions .button:focus, #changelist .actions .button:hover { - border-color: var(--body-quiet-color); -} diff --git a/django/staticfiles/admin/css/dark_mode.css b/django/staticfiles/admin/css/dark_mode.css deleted file mode 100644 index 6d08233a..00000000 --- a/django/staticfiles/admin/css/dark_mode.css +++ /dev/null @@ -1,137 +0,0 @@ -@media (prefers-color-scheme: dark) { - :root { - --primary: #264b5d; - --primary-fg: #f7f7f7; - - --body-fg: #eeeeee; - --body-bg: #121212; - --body-quiet-color: #e0e0e0; - --body-loud-color: #ffffff; - - --breadcrumbs-link-fg: #e0e0e0; - --breadcrumbs-bg: var(--primary); - - --link-fg: #81d4fa; - --link-hover-color: #4ac1f7; - --link-selected-fg: #6f94c6; - - --hairline-color: #272727; - --border-color: #353535; - - --error-fg: #e35f5f; - --message-success-bg: #006b1b; - --message-warning-bg: #583305; - --message-error-bg: #570808; - - --darkened-bg: #212121; - --selected-bg: #1b1b1b; - --selected-row: #00363a; - - --close-button-bg: #333333; - --close-button-hover-bg: #666666; - } - } - - -html[data-theme="dark"] { - --primary: #264b5d; - --primary-fg: #f7f7f7; - - --body-fg: #eeeeee; - --body-bg: #121212; - --body-quiet-color: #e0e0e0; - --body-loud-color: #ffffff; - - --breadcrumbs-link-fg: #e0e0e0; - --breadcrumbs-bg: var(--primary); - - --link-fg: #81d4fa; - --link-hover-color: #4ac1f7; - --link-selected-fg: #6f94c6; - - --hairline-color: #272727; - --border-color: #353535; - - --error-fg: #e35f5f; - --message-success-bg: #006b1b; - --message-warning-bg: #583305; - --message-error-bg: #570808; - - --darkened-bg: #212121; - --selected-bg: #1b1b1b; - --selected-row: #00363a; - - --close-button-bg: #333333; - --close-button-hover-bg: #666666; -} - -/* THEME SWITCH */ -.theme-toggle { - cursor: pointer; - border: none; - padding: 0; - background: transparent; - vertical-align: middle; - margin-inline-start: 5px; - margin-top: -1px; -} - -.theme-toggle svg { - vertical-align: middle; - height: 1rem; - width: 1rem; - display: none; -} - -/* -Fully hide screen reader text so we only show the one matching the current -theme. -*/ -.theme-toggle .visually-hidden { - display: none; -} - -html[data-theme="auto"] .theme-toggle .theme-label-when-auto { - display: block; -} - -html[data-theme="dark"] .theme-toggle .theme-label-when-dark { - display: block; -} - -html[data-theme="light"] .theme-toggle .theme-label-when-light { - display: block; -} - -/* ICONS */ -.theme-toggle svg.theme-icon-when-auto, -.theme-toggle svg.theme-icon-when-dark, -.theme-toggle svg.theme-icon-when-light { - fill: var(--header-link-color); - color: var(--header-bg); -} - -html[data-theme="auto"] .theme-toggle svg.theme-icon-when-auto { - display: block; -} - -html[data-theme="dark"] .theme-toggle svg.theme-icon-when-dark { - display: block; -} - -html[data-theme="light"] .theme-toggle svg.theme-icon-when-light { - display: block; -} - -.visually-hidden { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - overflow: hidden; - clip: rect(0,0,0,0); - white-space: nowrap; - border: 0; - color: var(--body-fg); - background-color: var(--body-bg); -} diff --git a/django/staticfiles/admin/css/dashboard.css b/django/staticfiles/admin/css/dashboard.css deleted file mode 100644 index 242b81a4..00000000 --- a/django/staticfiles/admin/css/dashboard.css +++ /dev/null @@ -1,29 +0,0 @@ -/* DASHBOARD */ -.dashboard td, .dashboard th { - word-break: break-word; -} - -.dashboard .module table th { - width: 100%; -} - -.dashboard .module table td { - white-space: nowrap; -} - -.dashboard .module table td a { - display: block; - padding-right: .6em; -} - -/* RECENT ACTIONS MODULE */ - -.module ul.actionlist { - margin-left: 0; -} - -ul.actionlist li { - list-style-type: none; - overflow: hidden; - text-overflow: ellipsis; -} diff --git a/django/staticfiles/admin/css/forms.css b/django/staticfiles/admin/css/forms.css deleted file mode 100644 index 6cfe9da1..00000000 --- a/django/staticfiles/admin/css/forms.css +++ /dev/null @@ -1,530 +0,0 @@ -@import url('widgets.css'); - -/* FORM ROWS */ - -.form-row { - overflow: hidden; - padding: 10px; - font-size: 0.8125rem; - border-bottom: 1px solid var(--hairline-color); -} - -.form-row img, .form-row input { - vertical-align: middle; -} - -.form-row label input[type="checkbox"] { - margin-top: 0; - vertical-align: 0; -} - -form .form-row p { - padding-left: 0; -} - -.flex-container { - display: flex; -} - -.form-multiline > div { - padding-bottom: 10px; -} - -/* FORM LABELS */ - -label { - font-weight: normal; - color: var(--body-quiet-color); - font-size: 0.8125rem; -} - -.required label, label.required { - font-weight: bold; - color: var(--body-fg); -} - -/* RADIO BUTTONS */ - -form div.radiolist div { - padding-right: 7px; -} - -form div.radiolist.inline div { - display: inline-block; -} - -form div.radiolist label { - width: auto; -} - -form div.radiolist input[type="radio"] { - margin: -2px 4px 0 0; - padding: 0; -} - -form ul.inline { - margin-left: 0; - padding: 0; -} - -form ul.inline li { - float: left; - padding-right: 7px; -} - -/* ALIGNED FIELDSETS */ - -.aligned label { - display: block; - padding: 4px 10px 0 0; - min-width: 160px; - width: 160px; - word-wrap: break-word; - line-height: 1; -} - -.aligned label:not(.vCheckboxLabel):after { - content: ''; - display: inline-block; - vertical-align: middle; - height: 1.625rem; -} - -.aligned label + p, .aligned .checkbox-row + div.help, .aligned label + div.readonly { - padding: 6px 0; - margin-top: 0; - margin-bottom: 0; - margin-left: 0; - overflow-wrap: break-word; -} - -.aligned ul label { - display: inline; - float: none; - width: auto; -} - -.aligned .form-row input { - margin-bottom: 0; -} - -.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { - width: 350px; -} - -form .aligned ul { - margin-left: 160px; - padding-left: 10px; -} - -form .aligned div.radiolist { - display: inline-block; - margin: 0; - padding: 0; -} - -form .aligned p.help, -form .aligned div.help { - margin-top: 0; - margin-left: 160px; - padding-left: 10px; -} - -form .aligned p.date div.help.timezonewarning, -form .aligned p.datetime div.help.timezonewarning, -form .aligned p.time div.help.timezonewarning { - margin-left: 0; - padding-left: 0; - font-weight: normal; -} - -form .aligned p.help:last-child, -form .aligned div.help:last-child { - margin-bottom: 0; - padding-bottom: 0; -} - -form .aligned input + p.help, -form .aligned textarea + p.help, -form .aligned select + p.help, -form .aligned input + div.help, -form .aligned textarea + div.help, -form .aligned select + div.help { - margin-left: 160px; - padding-left: 10px; -} - -form .aligned ul li { - list-style: none; -} - -form .aligned table p { - margin-left: 0; - padding-left: 0; -} - -.aligned .vCheckboxLabel { - float: none; - width: auto; - display: inline-block; - vertical-align: -3px; - padding: 0 0 5px 5px; -} - -.aligned .vCheckboxLabel + p.help, -.aligned .vCheckboxLabel + div.help { - margin-top: -4px; -} - -.colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField { - width: 610px; -} - -fieldset .fieldBox { - margin-right: 20px; -} - -/* WIDE FIELDSETS */ - -.wide label { - width: 200px; -} - -form .wide p, -form .wide ul.errorlist, -form .wide input + p.help, -form .wide input + div.help { - margin-left: 200px; -} - -form .wide p.help, -form .wide div.help { - padding-left: 50px; -} - -form div.help ul { - padding-left: 0; - margin-left: 0; -} - -.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField { - width: 450px; -} - -/* COLLAPSED FIELDSETS */ - -fieldset.collapsed * { - display: none; -} - -fieldset.collapsed h2, fieldset.collapsed { - display: block; -} - -fieldset.collapsed { - border: 1px solid var(--hairline-color); - border-radius: 4px; - overflow: hidden; -} - -fieldset.collapsed h2 { - background: var(--darkened-bg); - color: var(--body-quiet-color); -} - -fieldset .collapse-toggle { - color: var(--header-link-color); -} - -fieldset.collapsed .collapse-toggle { - background: transparent; - display: inline; - color: var(--link-fg); -} - -/* MONOSPACE TEXTAREAS */ - -fieldset.monospace textarea { - font-family: var(--font-family-monospace); -} - -/* SUBMIT ROW */ - -.submit-row { - padding: 12px 14px 12px; - margin: 0 0 20px; - background: var(--darkened-bg); - border: 1px solid var(--hairline-color); - border-radius: 4px; - overflow: hidden; - display: flex; - gap: 10px; - flex-wrap: wrap; -} - -body.popup .submit-row { - overflow: auto; -} - -.submit-row input { - height: 2.1875rem; - line-height: 0.9375rem; -} - -.submit-row input, .submit-row a { - margin: 0; -} - -.submit-row input.default { - text-transform: uppercase; -} - -.submit-row a.deletelink { - margin-left: auto; -} - -.submit-row a.deletelink { - display: block; - background: var(--delete-button-bg); - border-radius: 4px; - padding: 0.625rem 0.9375rem; - height: 0.9375rem; - line-height: 0.9375rem; - color: var(--button-fg); -} - -.submit-row a.closelink { - display: inline-block; - background: var(--close-button-bg); - border-radius: 4px; - padding: 10px 15px; - height: 0.9375rem; - line-height: 0.9375rem; - color: var(--button-fg); -} - -.submit-row a.deletelink:focus, -.submit-row a.deletelink:hover, -.submit-row a.deletelink:active { - background: var(--delete-button-hover-bg); - text-decoration: none; -} - -.submit-row a.closelink:focus, -.submit-row a.closelink:hover, -.submit-row a.closelink:active { - background: var(--close-button-hover-bg); - text-decoration: none; -} - -/* CUSTOM FORM FIELDS */ - -.vSelectMultipleField { - vertical-align: top; -} - -.vCheckboxField { - border: none; -} - -.vDateField, .vTimeField { - margin-right: 2px; - margin-bottom: 4px; -} - -.vDateField { - min-width: 6.85em; -} - -.vTimeField { - min-width: 4.7em; -} - -.vURLField { - width: 30em; -} - -.vLargeTextField, .vXMLLargeTextField { - width: 48em; -} - -.flatpages-flatpage #id_content { - height: 40.2em; -} - -.module table .vPositiveSmallIntegerField { - width: 2.2em; -} - -.vIntegerField { - width: 5em; -} - -.vBigIntegerField { - width: 10em; -} - -.vForeignKeyRawIdAdminField { - width: 5em; -} - -.vTextField, .vUUIDField { - width: 20em; -} - -/* INLINES */ - -.inline-group { - padding: 0; - margin: 0 0 30px; -} - -.inline-group thead th { - padding: 8px 10px; -} - -.inline-group .aligned label { - width: 160px; -} - -.inline-related { - position: relative; -} - -.inline-related h3 { - margin: 0; - color: var(--body-quiet-color); - padding: 5px; - font-size: 0.8125rem; - background: var(--darkened-bg); - border-top: 1px solid var(--hairline-color); - border-bottom: 1px solid var(--hairline-color); -} - -.inline-related h3 span.delete { - float: right; -} - -.inline-related h3 span.delete label { - margin-left: 2px; - font-size: 0.6875rem; -} - -.inline-related fieldset { - margin: 0; - background: var(--body-bg); - border: none; - width: 100%; -} - -.inline-related fieldset.module h3 { - margin: 0; - padding: 2px 5px 3px 5px; - font-size: 0.6875rem; - text-align: left; - font-weight: bold; - background: #bcd; - color: var(--body-bg); -} - -.inline-group .tabular fieldset.module { - border: none; -} - -.inline-related.tabular fieldset.module table { - width: 100%; - overflow-x: scroll; -} - -.last-related fieldset { - border: none; -} - -.inline-group .tabular tr.has_original td { - padding-top: 2em; -} - -.inline-group .tabular tr td.original { - padding: 2px 0 0 0; - width: 0; - _position: relative; -} - -.inline-group .tabular th.original { - width: 0px; - padding: 0; -} - -.inline-group .tabular td.original p { - position: absolute; - left: 0; - height: 1.1em; - padding: 2px 9px; - overflow: hidden; - font-size: 0.5625rem; - font-weight: bold; - color: var(--body-quiet-color); - _width: 700px; -} - -.inline-group ul.tools { - padding: 0; - margin: 0; - list-style: none; -} - -.inline-group ul.tools li { - display: inline; - padding: 0 5px; -} - -.inline-group div.add-row, -.inline-group .tabular tr.add-row td { - color: var(--body-quiet-color); - background: var(--darkened-bg); - padding: 8px 10px; - border-bottom: 1px solid var(--hairline-color); -} - -.inline-group .tabular tr.add-row td { - padding: 8px 10px; - border-bottom: 1px solid var(--hairline-color); -} - -.inline-group ul.tools a.add, -.inline-group div.add-row a, -.inline-group .tabular tr.add-row td a { - background: url(../img/icon-addlink.svg) 0 1px no-repeat; - padding-left: 16px; - font-size: 0.75rem; -} - -.empty-form { - display: none; -} - -/* RELATED FIELD ADD ONE / LOOKUP */ - -.related-lookup { - margin-left: 5px; - display: inline-block; - vertical-align: middle; - background-repeat: no-repeat; - background-size: 14px; -} - -.related-lookup { - width: 1rem; - height: 1rem; - background-image: url(../img/search.svg); -} - -form .related-widget-wrapper ul { - display: inline-block; - margin-left: 0; - padding-left: 0; -} - -.clearable-file-input input { - margin-top: 0; -} diff --git a/django/staticfiles/admin/css/login.css b/django/staticfiles/admin/css/login.css deleted file mode 100644 index 389772f5..00000000 --- a/django/staticfiles/admin/css/login.css +++ /dev/null @@ -1,61 +0,0 @@ -/* LOGIN FORM */ - -.login { - background: var(--darkened-bg); - height: auto; -} - -.login #header { - height: auto; - padding: 15px 16px; - justify-content: center; -} - -.login #header h1 { - font-size: 1.125rem; - margin: 0; -} - -.login #header h1 a { - color: var(--header-link-color); -} - -.login #content { - padding: 20px 20px 0; -} - -.login #container { - background: var(--body-bg); - border: 1px solid var(--hairline-color); - border-radius: 4px; - overflow: hidden; - width: 28em; - min-width: 300px; - margin: 100px auto; - height: auto; -} - -.login .form-row { - padding: 4px 0; -} - -.login .form-row label { - display: block; - line-height: 2em; -} - -.login .form-row #id_username, .login .form-row #id_password { - padding: 8px; - width: 100%; - box-sizing: border-box; -} - -.login .submit-row { - padding: 1em 0 0 0; - margin: 0; - text-align: center; -} - -.login .password-reset-link { - text-align: center; -} diff --git a/django/staticfiles/admin/css/nav_sidebar.css b/django/staticfiles/admin/css/nav_sidebar.css deleted file mode 100644 index f76e6ce4..00000000 --- a/django/staticfiles/admin/css/nav_sidebar.css +++ /dev/null @@ -1,144 +0,0 @@ -.sticky { - position: sticky; - top: 0; - max-height: 100vh; -} - -.toggle-nav-sidebar { - z-index: 20; - left: 0; - display: flex; - align-items: center; - justify-content: center; - flex: 0 0 23px; - width: 23px; - border: 0; - border-right: 1px solid var(--hairline-color); - background-color: var(--body-bg); - cursor: pointer; - font-size: 1.25rem; - color: var(--link-fg); - padding: 0; -} - -[dir="rtl"] .toggle-nav-sidebar { - border-left: 1px solid var(--hairline-color); - border-right: 0; -} - -.toggle-nav-sidebar:hover, -.toggle-nav-sidebar:focus { - background-color: var(--darkened-bg); -} - -#nav-sidebar { - z-index: 15; - flex: 0 0 275px; - left: -276px; - margin-left: -276px; - border-top: 1px solid transparent; - border-right: 1px solid var(--hairline-color); - background-color: var(--body-bg); - overflow: auto; -} - -[dir="rtl"] #nav-sidebar { - border-left: 1px solid var(--hairline-color); - border-right: 0; - left: 0; - margin-left: 0; - right: -276px; - margin-right: -276px; -} - -.toggle-nav-sidebar::before { - content: '\00BB'; -} - -.main.shifted .toggle-nav-sidebar::before { - content: '\00AB'; -} - -.main > #nav-sidebar { - visibility: hidden; -} - -.main.shifted > #nav-sidebar { - margin-left: 0; - visibility: visible; -} - -[dir="rtl"] .main.shifted > #nav-sidebar { - margin-right: 0; -} - -#nav-sidebar .module th { - width: 100%; - overflow-wrap: anywhere; -} - -#nav-sidebar .module th, -#nav-sidebar .module caption { - padding-left: 16px; -} - -#nav-sidebar .module td { - white-space: nowrap; -} - -[dir="rtl"] #nav-sidebar .module th, -[dir="rtl"] #nav-sidebar .module caption { - padding-left: 8px; - padding-right: 16px; -} - -#nav-sidebar .current-app .section:link, -#nav-sidebar .current-app .section:visited { - color: var(--header-color); - font-weight: bold; -} - -#nav-sidebar .current-model { - background: var(--selected-row); -} - -.main > #nav-sidebar + .content { - max-width: calc(100% - 23px); -} - -.main.shifted > #nav-sidebar + .content { - max-width: calc(100% - 299px); -} - -@media (max-width: 767px) { - #nav-sidebar, #toggle-nav-sidebar { - display: none; - } - - .main > #nav-sidebar + .content, - .main.shifted > #nav-sidebar + .content { - max-width: 100%; - } -} - -#nav-filter { - width: 100%; - box-sizing: border-box; - padding: 2px 5px; - margin: 5px 0; - border: 1px solid var(--border-color); - background-color: var(--darkened-bg); - color: var(--body-fg); -} - -#nav-filter:focus { - border-color: var(--body-quiet-color); -} - -#nav-filter.no-results { - background: var(--message-error-bg); -} - -#nav-sidebar table { - width: 100%; -} diff --git a/django/staticfiles/admin/css/responsive.css b/django/staticfiles/admin/css/responsive.css deleted file mode 100644 index 1d0a188f..00000000 --- a/django/staticfiles/admin/css/responsive.css +++ /dev/null @@ -1,999 +0,0 @@ -/* Tablets */ - -input[type="submit"], button { - -webkit-appearance: none; - appearance: none; -} - -@media (max-width: 1024px) { - /* Basic */ - - html { - -webkit-text-size-adjust: 100%; - } - - td, th { - padding: 10px; - font-size: 0.875rem; - } - - .small { - font-size: 0.75rem; - } - - /* Layout */ - - #container { - min-width: 0; - } - - #content { - padding: 15px 20px 20px; - } - - div.breadcrumbs { - padding: 10px 30px; - } - - /* Header */ - - #header { - flex-direction: column; - padding: 15px 30px; - justify-content: flex-start; - } - - #branding h1 { - margin: 0 0 8px; - line-height: 1.2; - } - - #user-tools { - margin: 0; - font-weight: 400; - line-height: 1.85; - text-align: left; - } - - #user-tools a { - display: inline-block; - line-height: 1.4; - } - - /* Dashboard */ - - .dashboard #content { - width: auto; - } - - #content-related { - margin-right: -290px; - } - - .colSM #content-related { - margin-left: -290px; - } - - .colMS { - margin-right: 290px; - } - - .colSM { - margin-left: 290px; - } - - .dashboard .module table td a { - padding-right: 0; - } - - td .changelink, td .addlink { - font-size: 0.8125rem; - } - - /* Changelist */ - - #toolbar { - border: none; - padding: 15px; - } - - #changelist-search > div { - display: flex; - flex-wrap: nowrap; - max-width: 480px; - } - - #changelist-search label { - line-height: 1.375rem; - } - - #toolbar form #searchbar { - flex: 1 0 auto; - width: 0; - height: 1.375rem; - margin: 0 10px 0 6px; - } - - #toolbar form input[type=submit] { - flex: 0 1 auto; - } - - #changelist-search .quiet { - width: 0; - flex: 1 0 auto; - margin: 5px 0 0 25px; - } - - #changelist .actions { - display: flex; - flex-wrap: wrap; - padding: 15px 0; - } - - #changelist .actions label { - display: flex; - } - - #changelist .actions select { - background: var(--body-bg); - } - - #changelist .actions .button { - min-width: 48px; - margin: 0 10px; - } - - #changelist .actions span.all, - #changelist .actions span.clear, - #changelist .actions span.question, - #changelist .actions span.action-counter { - font-size: 0.6875rem; - margin: 0 10px 0 0; - } - - #changelist-filter { - flex-basis: 200px; - } - - .change-list .filtered .results, - .change-list .filtered .paginator, - .filtered #toolbar, - .filtered .actions, - - #changelist .paginator { - border-top-color: var(--hairline-color); /* XXX Is this used at all? */ - } - - #changelist .results + .paginator { - border-top: none; - } - - /* Forms */ - - label { - font-size: 0.875rem; - } - - .form-row input[type=text], - .form-row input[type=password], - .form-row input[type=email], - .form-row input[type=url], - .form-row input[type=tel], - .form-row input[type=number], - .form-row textarea, - .form-row select, - .form-row .vTextField { - box-sizing: border-box; - margin: 0; - padding: 6px 8px; - min-height: 2.25rem; - font-size: 0.875rem; - } - - .form-row select { - height: 2.25rem; - } - - .form-row select[multiple] { - height: auto; - min-height: 0; - } - - fieldset .fieldBox + .fieldBox { - margin-top: 10px; - padding-top: 10px; - border-top: 1px solid var(--hairline-color); - } - - textarea { - max-width: 100%; - max-height: 120px; - } - - .aligned label { - padding-top: 6px; - } - - .aligned .related-lookup, - .aligned .datetimeshortcuts, - .aligned .related-lookup + strong { - align-self: center; - margin-left: 15px; - } - - form .aligned div.radiolist { - margin-left: 2px; - } - - .submit-row { - padding: 8px; - } - - .submit-row a.deletelink { - padding: 10px 7px; - } - - .button, input[type=submit], input[type=button], .submit-row input, a.button { - padding: 7px; - } - - /* Related widget */ - - .related-widget-wrapper { - float: none; - } - - .related-widget-wrapper-link + .selector { - max-width: calc(100% - 30px); - margin-right: 15px; - } - - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 10px; - } - - /* Selector */ - - .selector { - display: flex; - width: 100%; - } - - .selector .selector-filter { - display: flex; - align-items: center; - } - - .selector .selector-filter label { - margin: 0 8px 0 0; - } - - .selector .selector-filter input { - width: auto; - min-height: 0; - flex: 1 1; - } - - .selector-available, .selector-chosen { - width: auto; - flex: 1 1; - display: flex; - flex-direction: column; - } - - .selector select { - width: 100%; - flex: 1 0 auto; - margin-bottom: 5px; - } - - .selector ul.selector-chooser { - width: 26px; - height: 52px; - padding: 2px 0; - margin: auto 15px; - border-radius: 20px; - transform: translateY(-10px); - } - - .selector-add, .selector-remove { - width: 20px; - height: 20px; - background-size: 20px auto; - } - - .selector-add { - background-position: 0 -120px; - } - - .selector-remove { - background-position: 0 -80px; - } - - a.selector-chooseall, a.selector-clearall { - align-self: center; - } - - .stacked { - flex-direction: column; - max-width: 480px; - } - - .stacked > * { - flex: 0 1 auto; - } - - .stacked select { - margin-bottom: 0; - } - - .stacked .selector-available, .stacked .selector-chosen { - width: auto; - } - - .stacked ul.selector-chooser { - width: 52px; - height: 26px; - padding: 0 2px; - margin: 15px auto; - transform: none; - } - - .stacked .selector-chooser li { - padding: 3px; - } - - .stacked .selector-add, .stacked .selector-remove { - background-size: 20px auto; - } - - .stacked .selector-add { - background-position: 0 -40px; - } - - .stacked .active.selector-add { - background-position: 0 -40px; - } - - .active.selector-add:focus, .active.selector-add:hover { - background-position: 0 -140px; - } - - .stacked .active.selector-add:focus, .stacked .active.selector-add:hover { - background-position: 0 -60px; - } - - .stacked .selector-remove { - background-position: 0 0; - } - - .stacked .active.selector-remove { - background-position: 0 0; - } - - .active.selector-remove:focus, .active.selector-remove:hover { - background-position: 0 -100px; - } - - .stacked .active.selector-remove:focus, .stacked .active.selector-remove:hover { - background-position: 0 -20px; - } - - .help-tooltip, .selector .help-icon { - display: none; - } - - .datetime input { - width: 50%; - max-width: 120px; - } - - .datetime span { - font-size: 0.8125rem; - } - - .datetime .timezonewarning { - display: block; - font-size: 0.6875rem; - color: var(--body-quiet-color); - } - - .datetimeshortcuts { - color: var(--border-color); /* XXX Redundant, .datetime span also sets #ccc */ - } - - .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField { - width: 75%; - } - - .inline-group { - overflow: auto; - } - - /* Messages */ - - ul.messagelist li { - padding-left: 55px; - background-position: 30px 12px; - } - - ul.messagelist li.error { - background-position: 30px 12px; - } - - ul.messagelist li.warning { - background-position: 30px 14px; - } - - /* Login */ - - .login #header { - padding: 15px 20px; - } - - .login #branding h1 { - margin: 0; - } - - /* GIS */ - - div.olMap { - max-width: calc(100vw - 30px); - max-height: 300px; - } - - .olMap + .clear_features { - display: block; - margin-top: 10px; - } - - /* Docs */ - - .module table.xfull { - width: 100%; - } - - pre.literal-block { - overflow: auto; - } -} - -/* Mobile */ - -@media (max-width: 767px) { - /* Layout */ - - #header, #content, #footer { - padding: 15px; - } - - #footer:empty { - padding: 0; - } - - div.breadcrumbs { - padding: 10px 15px; - } - - /* Dashboard */ - - .colMS, .colSM { - margin: 0; - } - - #content-related, .colSM #content-related { - width: 100%; - margin: 0; - } - - #content-related .module { - margin-bottom: 0; - } - - #content-related .module h2 { - padding: 10px 15px; - font-size: 1rem; - } - - /* Changelist */ - - #changelist { - align-items: stretch; - flex-direction: column; - } - - #toolbar { - padding: 10px; - } - - #changelist-filter { - margin-left: 0; - } - - #changelist .actions label { - flex: 1 1; - } - - #changelist .actions select { - flex: 1 0; - width: 100%; - } - - #changelist .actions span { - flex: 1 0 100%; - } - - #changelist-filter { - position: static; - width: auto; - margin-top: 30px; - } - - .object-tools { - float: none; - margin: 0 0 15px; - padding: 0; - overflow: hidden; - } - - .object-tools li { - height: auto; - margin-left: 0; - } - - .object-tools li + li { - margin-left: 15px; - } - - /* Forms */ - - .form-row { - padding: 15px 0; - } - - .aligned .form-row, - .aligned .form-row > div { - max-width: 100vw; - } - - .aligned .form-row > div { - width: calc(100vw - 30px); - } - - .flex-container { - flex-flow: column; - } - - .flex-container.checkbox-row { - flex-flow: row; - } - - textarea { - max-width: none; - } - - .vURLField { - width: auto; - } - - fieldset .fieldBox + .fieldBox { - margin-top: 15px; - padding-top: 15px; - } - - fieldset.collapsed .form-row { - display: none; - } - - .aligned label { - width: 100%; - min-width: auto; - padding: 0 0 10px; - } - - .aligned label:after { - max-height: 0; - } - - .aligned .form-row input, - .aligned .form-row select, - .aligned .form-row textarea { - flex: 1 1 auto; - max-width: 100%; - } - - .aligned .checkbox-row input { - flex: 0 1 auto; - margin: 0; - } - - .aligned .vCheckboxLabel { - flex: 1 0; - padding: 1px 0 0 5px; - } - - .aligned label + p, - .aligned label + div.help, - .aligned label + div.readonly { - padding: 0; - margin-left: 0; - } - - .aligned p.file-upload { - font-size: 0.8125rem; - } - - span.clearable-file-input { - margin-left: 15px; - } - - span.clearable-file-input label { - font-size: 0.8125rem; - padding-bottom: 0; - } - - .aligned .timezonewarning { - flex: 1 0 100%; - margin-top: 5px; - } - - form .aligned .form-row div.help { - width: 100%; - margin: 5px 0 0; - padding: 0; - } - - form .aligned ul, - form .aligned ul.errorlist { - margin-left: 0; - padding-left: 0; - } - - form .aligned div.radiolist { - margin-top: 5px; - margin-right: 15px; - margin-bottom: -3px; - } - - form .aligned div.radiolist:not(.inline) div + div { - margin-top: 5px; - } - - /* Related widget */ - - .related-widget-wrapper { - width: 100%; - display: flex; - align-items: flex-start; - } - - .related-widget-wrapper .selector { - order: 1; - } - - .related-widget-wrapper > a { - order: 2; - } - - .related-widget-wrapper .radiolist ~ a { - align-self: flex-end; - } - - .related-widget-wrapper > select ~ a { - align-self: center; - } - - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 15px; - } - - /* Selector */ - - .selector { - flex-direction: column; - } - - .selector > * { - float: none; - } - - .selector-available, .selector-chosen { - margin-bottom: 0; - flex: 1 1 auto; - } - - .selector select { - max-height: 96px; - } - - .selector ul.selector-chooser { - display: block; - float: none; - width: 52px; - height: 26px; - padding: 0 2px; - margin: 15px auto 20px; - transform: none; - } - - .selector ul.selector-chooser li { - float: left; - } - - .selector-remove { - background-position: 0 0; - } - - .active.selector-remove:focus, .active.selector-remove:hover { - background-position: 0 -20px; - } - - .selector-add { - background-position: 0 -40px; - } - - .active.selector-add:focus, .active.selector-add:hover { - background-position: 0 -60px; - } - - /* Inlines */ - - .inline-group[data-inline-type="stacked"] .inline-related { - border: 1px solid var(--hairline-color); - border-radius: 4px; - margin-top: 15px; - overflow: auto; - } - - .inline-group[data-inline-type="stacked"] .inline-related > * { - box-sizing: border-box; - } - - .inline-group[data-inline-type="stacked"] .inline-related .module { - padding: 0 10px; - } - - .inline-group[data-inline-type="stacked"] .inline-related .module .form-row { - border-top: 1px solid var(--hairline-color); - border-bottom: none; - } - - .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:first-child { - border-top: none; - } - - .inline-group[data-inline-type="stacked"] .inline-related h3 { - padding: 10px; - border-top-width: 0; - border-bottom-width: 2px; - display: flex; - flex-wrap: wrap; - align-items: center; - } - - .inline-group[data-inline-type="stacked"] .inline-related h3 .inline_label { - margin-right: auto; - } - - .inline-group[data-inline-type="stacked"] .inline-related h3 span.delete { - float: none; - flex: 1 1 100%; - margin-top: 5px; - } - - .inline-group[data-inline-type="stacked"] .aligned .form-row > div:not([class]) { - width: 100%; - } - - .inline-group[data-inline-type="stacked"] .aligned label { - width: 100%; - } - - .inline-group[data-inline-type="stacked"] div.add-row { - margin-top: 15px; - border: 1px solid var(--hairline-color); - border-radius: 4px; - } - - .inline-group div.add-row, - .inline-group .tabular tr.add-row td { - padding: 0; - } - - .inline-group div.add-row a, - .inline-group .tabular tr.add-row td a { - display: block; - padding: 8px 10px 8px 26px; - background-position: 8px 9px; - } - - /* Submit row */ - - .submit-row { - padding: 10px; - margin: 0 0 15px; - flex-direction: column; - gap: 8px; - } - - .submit-row input, .submit-row input.default, .submit-row a { - text-align: center; - } - - .submit-row a.closelink { - padding: 10px 0; - text-align: center; - } - - .submit-row a.deletelink { - margin: 0; - } - - /* Messages */ - - ul.messagelist li { - padding-left: 40px; - background-position: 15px 12px; - } - - ul.messagelist li.error { - background-position: 15px 12px; - } - - ul.messagelist li.warning { - background-position: 15px 14px; - } - - /* Paginator */ - - .paginator .this-page, .paginator a:link, .paginator a:visited { - padding: 4px 10px; - } - - /* Login */ - - body.login { - padding: 0 15px; - } - - .login #container { - width: auto; - max-width: 480px; - margin: 50px auto; - } - - .login #header, - .login #content { - padding: 15px; - } - - .login #content-main { - float: none; - } - - .login .form-row { - padding: 0; - } - - .login .form-row + .form-row { - margin-top: 15px; - } - - .login .form-row label { - margin: 0 0 5px; - line-height: 1.2; - } - - .login .submit-row { - padding: 15px 0 0; - } - - .login br { - display: none; - } - - .login .submit-row input { - margin: 0; - text-transform: uppercase; - } - - .errornote { - margin: 0 0 20px; - padding: 8px 12px; - font-size: 0.8125rem; - } - - /* Calendar and clock */ - - .calendarbox, .clockbox { - position: fixed !important; - top: 50% !important; - left: 50% !important; - transform: translate(-50%, -50%); - margin: 0; - border: none; - overflow: visible; - } - - .calendarbox:before, .clockbox:before { - content: ''; - position: fixed; - top: 50%; - left: 50%; - width: 100vw; - height: 100vh; - background: rgba(0, 0, 0, 0.75); - transform: translate(-50%, -50%); - } - - .calendarbox > *, .clockbox > * { - position: relative; - z-index: 1; - } - - .calendarbox > div:first-child { - z-index: 2; - } - - .calendarbox .calendar, .clockbox h2 { - border-radius: 4px 4px 0 0; - overflow: hidden; - } - - .calendarbox .calendar-cancel, .clockbox .calendar-cancel { - border-radius: 0 0 4px 4px; - overflow: hidden; - } - - .calendar-shortcuts { - padding: 10px 0; - font-size: 0.75rem; - line-height: 0.75rem; - } - - .calendar-shortcuts a { - margin: 0 4px; - } - - .timelist a { - background: var(--body-bg); - padding: 4px; - } - - .calendar-cancel { - padding: 8px 10px; - } - - .clockbox h2 { - padding: 8px 15px; - } - - .calendar caption { - padding: 10px; - } - - .calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { - z-index: 1; - top: 10px; - } - - /* History */ - - table#change-history tbody th, table#change-history tbody td { - font-size: 0.8125rem; - word-break: break-word; - } - - table#change-history tbody th { - width: auto; - } - - /* Docs */ - - table.model tbody th, table.model tbody td { - font-size: 0.8125rem; - word-break: break-word; - } -} diff --git a/django/staticfiles/admin/css/responsive_rtl.css b/django/staticfiles/admin/css/responsive_rtl.css deleted file mode 100644 index 31dc8ff7..00000000 --- a/django/staticfiles/admin/css/responsive_rtl.css +++ /dev/null @@ -1,84 +0,0 @@ -/* TABLETS */ - -@media (max-width: 1024px) { - [dir="rtl"] .colMS { - margin-right: 0; - } - - [dir="rtl"] #user-tools { - text-align: right; - } - - [dir="rtl"] #changelist .actions label { - padding-left: 10px; - padding-right: 0; - } - - [dir="rtl"] #changelist .actions select { - margin-left: 0; - margin-right: 15px; - } - - [dir="rtl"] .change-list .filtered .results, - [dir="rtl"] .change-list .filtered .paginator, - [dir="rtl"] .filtered #toolbar, - [dir="rtl"] .filtered div.xfull, - [dir="rtl"] .filtered .actions, - [dir="rtl"] #changelist-filter { - margin-left: 0; - } - - [dir="rtl"] .inline-group ul.tools a.add, - [dir="rtl"] .inline-group div.add-row a, - [dir="rtl"] .inline-group .tabular tr.add-row td a { - padding: 8px 26px 8px 10px; - background-position: calc(100% - 8px) 9px; - } - - [dir="rtl"] .related-widget-wrapper-link + .selector { - margin-right: 0; - margin-left: 15px; - } - - [dir="rtl"] .selector .selector-filter label { - margin-right: 0; - margin-left: 8px; - } - - [dir="rtl"] .object-tools li { - float: right; - } - - [dir="rtl"] .object-tools li + li { - margin-left: 0; - margin-right: 15px; - } - - [dir="rtl"] .dashboard .module table td a { - padding-left: 0; - padding-right: 16px; - } -} - -/* MOBILE */ - -@media (max-width: 767px) { - [dir="rtl"] .aligned .related-lookup, - [dir="rtl"] .aligned .datetimeshortcuts { - margin-left: 0; - margin-right: 15px; - } - - [dir="rtl"] .aligned ul, - [dir="rtl"] form .aligned ul.errorlist { - margin-right: 0; - } - - [dir="rtl"] #changelist-filter { - margin-left: 0; - margin-right: 0; - } - [dir="rtl"] .aligned .vCheckboxLabel { - padding: 1px 5px 0 0; - } -} diff --git a/django/staticfiles/admin/css/rtl.css b/django/staticfiles/admin/css/rtl.css deleted file mode 100644 index c349a939..00000000 --- a/django/staticfiles/admin/css/rtl.css +++ /dev/null @@ -1,298 +0,0 @@ -/* GLOBAL */ - -th { - text-align: right; -} - -.module h2, .module caption { - text-align: right; -} - -.module ul, .module ol { - margin-left: 0; - margin-right: 1.5em; -} - -.viewlink, .addlink, .changelink { - padding-left: 0; - padding-right: 16px; - background-position: 100% 1px; -} - -.deletelink { - padding-left: 0; - padding-right: 16px; - background-position: 100% 1px; -} - -.object-tools { - float: left; -} - -thead th:first-child, -tfoot td:first-child { - border-left: none; -} - -/* LAYOUT */ - -#user-tools { - right: auto; - left: 0; - text-align: left; -} - -div.breadcrumbs { - text-align: right; -} - -#content-main { - float: right; -} - -#content-related { - float: left; - margin-left: -300px; - margin-right: auto; -} - -.colMS { - margin-left: 300px; - margin-right: 0; -} - -/* SORTABLE TABLES */ - -table thead th.sorted .sortoptions { - float: left; -} - -thead th.sorted .text { - padding-right: 0; - padding-left: 42px; -} - -/* dashboard styles */ - -.dashboard .module table td a { - padding-left: .6em; - padding-right: 16px; -} - -/* changelists styles */ - -.change-list .filtered table { - border-left: none; - border-right: 0px none; -} - -#changelist-filter { - border-left: none; - border-right: none; - margin-left: 0; - margin-right: 30px; -} - -#changelist-filter li.selected { - border-left: none; - padding-left: 10px; - margin-left: 0; - border-right: 5px solid var(--hairline-color); - padding-right: 10px; - margin-right: -15px; -} - -#changelist table tbody td:first-child, #changelist table tbody th:first-child { - border-right: none; - border-left: none; -} - -.paginator .end { - margin-left: 6px; - margin-right: 0; -} - -.paginator input { - margin-left: 0; - margin-right: auto; -} - -/* FORMS */ - -.aligned label { - padding: 0 0 3px 1em; -} - -.submit-row a.deletelink { - margin-left: 0; - margin-right: auto; -} - -.vDateField, .vTimeField { - margin-left: 2px; -} - -.aligned .form-row input { - margin-left: 5px; -} - -form .aligned ul { - margin-right: 163px; - padding-right: 10px; - margin-left: 0; - padding-left: 0; -} - -form ul.inline li { - float: right; - padding-right: 0; - padding-left: 7px; -} - -form .aligned p.help, -form .aligned div.help { - margin-right: 160px; - padding-right: 10px; -} - -form div.help ul, -form .aligned .checkbox-row + .help, -form .aligned p.date div.help.timezonewarning, -form .aligned p.datetime div.help.timezonewarning, -form .aligned p.time div.help.timezonewarning { - margin-right: 0; - padding-right: 0; -} - -form .wide p.help, form .wide div.help { - padding-left: 0; - padding-right: 50px; -} - -form .wide p, -form .wide ul.errorlist, -form .wide input + p.help, -form .wide input + div.help { - margin-right: 200px; - margin-left: 0px; -} - -.submit-row { - text-align: right; -} - -fieldset .fieldBox { - margin-left: 20px; - margin-right: 0; -} - -.errorlist li { - background-position: 100% 12px; - padding: 0; -} - -.errornote { - background-position: 100% 12px; - padding: 10px 12px; -} - -/* WIDGETS */ - -.calendarnav-previous { - top: 0; - left: auto; - right: 10px; - background: url(../img/calendar-icons.svg) 0 -30px no-repeat; -} - -.calendarbox .calendarnav-previous:focus, -.calendarbox .calendarnav-previous:hover { - background-position: 0 -45px; -} - -.calendarnav-next { - top: 0; - right: auto; - left: 10px; - background: url(../img/calendar-icons.svg) 0 0 no-repeat; -} - -.calendarbox .calendarnav-next:focus, -.calendarbox .calendarnav-next:hover { - background-position: 0 -15px; -} - -.calendar caption, .calendarbox h2 { - text-align: center; -} - -.selector { - float: right; -} - -.selector .selector-filter { - text-align: right; -} - -.selector-add { - background: url(../img/selector-icons.svg) 0 -64px no-repeat; -} - -.active.selector-add:focus, .active.selector-add:hover { - background-position: 0 -80px; -} - -.selector-remove { - background: url(../img/selector-icons.svg) 0 -96px no-repeat; -} - -.active.selector-remove:focus, .active.selector-remove:hover { - background-position: 0 -112px; -} - -a.selector-chooseall { - background: url(../img/selector-icons.svg) right -128px no-repeat; -} - -a.active.selector-chooseall:focus, a.active.selector-chooseall:hover { - background-position: 100% -144px; -} - -a.selector-clearall { - background: url(../img/selector-icons.svg) 0 -160px no-repeat; -} - -a.active.selector-clearall:focus, a.active.selector-clearall:hover { - background-position: 0 -176px; -} - -.inline-deletelink { - float: left; -} - -form .form-row p.datetime { - overflow: hidden; -} - -.related-widget-wrapper { - float: right; -} - -/* MISC */ - -.inline-related h2, .inline-group h2 { - text-align: right -} - -.inline-related h3 span.delete { - padding-right: 20px; - padding-left: inherit; - left: 10px; - right: inherit; - float:left; -} - -.inline-related h3 span.delete label { - margin-left: inherit; - margin-right: 2px; -} diff --git a/django/staticfiles/admin/css/vendor/select2/LICENSE-SELECT2.md b/django/staticfiles/admin/css/vendor/select2/LICENSE-SELECT2.md deleted file mode 100644 index 8cb8a2b1..00000000 --- a/django/staticfiles/admin/css/vendor/select2/LICENSE-SELECT2.md +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2012-2017 Kevin Brown, Igor Vaynberg, and Select2 contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/django/staticfiles/admin/css/vendor/select2/select2.css b/django/staticfiles/admin/css/vendor/select2/select2.css deleted file mode 100644 index 750b3207..00000000 --- a/django/staticfiles/admin/css/vendor/select2/select2.css +++ /dev/null @@ -1,481 +0,0 @@ -.select2-container { - box-sizing: border-box; - display: inline-block; - margin: 0; - position: relative; - vertical-align: middle; } - .select2-container .select2-selection--single { - box-sizing: border-box; - cursor: pointer; - display: block; - height: 28px; - user-select: none; - -webkit-user-select: none; } - .select2-container .select2-selection--single .select2-selection__rendered { - display: block; - padding-left: 8px; - padding-right: 20px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } - .select2-container .select2-selection--single .select2-selection__clear { - position: relative; } - .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered { - padding-right: 8px; - padding-left: 20px; } - .select2-container .select2-selection--multiple { - box-sizing: border-box; - cursor: pointer; - display: block; - min-height: 32px; - user-select: none; - -webkit-user-select: none; } - .select2-container .select2-selection--multiple .select2-selection__rendered { - display: inline-block; - overflow: hidden; - padding-left: 8px; - text-overflow: ellipsis; - white-space: nowrap; } - .select2-container .select2-search--inline { - float: left; } - .select2-container .select2-search--inline .select2-search__field { - box-sizing: border-box; - border: none; - font-size: 100%; - margin-top: 5px; - padding: 0; } - .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button { - -webkit-appearance: none; } - -.select2-dropdown { - background-color: white; - border: 1px solid #aaa; - border-radius: 4px; - box-sizing: border-box; - display: block; - position: absolute; - left: -100000px; - width: 100%; - z-index: 1051; } - -.select2-results { - display: block; } - -.select2-results__options { - list-style: none; - margin: 0; - padding: 0; } - -.select2-results__option { - padding: 6px; - user-select: none; - -webkit-user-select: none; } - .select2-results__option[aria-selected] { - cursor: pointer; } - -.select2-container--open .select2-dropdown { - left: 0; } - -.select2-container--open .select2-dropdown--above { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - -.select2-container--open .select2-dropdown--below { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; } - -.select2-search--dropdown { - display: block; - padding: 4px; } - .select2-search--dropdown .select2-search__field { - padding: 4px; - width: 100%; - box-sizing: border-box; } - .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button { - -webkit-appearance: none; } - .select2-search--dropdown.select2-search--hide { - display: none; } - -.select2-close-mask { - border: 0; - margin: 0; - padding: 0; - display: block; - position: fixed; - left: 0; - top: 0; - min-height: 100%; - min-width: 100%; - height: auto; - width: auto; - opacity: 0; - z-index: 99; - background-color: #fff; - filter: alpha(opacity=0); } - -.select2-hidden-accessible { - border: 0 !important; - clip: rect(0 0 0 0) !important; - -webkit-clip-path: inset(50%) !important; - clip-path: inset(50%) !important; - height: 1px !important; - overflow: hidden !important; - padding: 0 !important; - position: absolute !important; - width: 1px !important; - white-space: nowrap !important; } - -.select2-container--default .select2-selection--single { - background-color: #fff; - border: 1px solid #aaa; - border-radius: 4px; } - .select2-container--default .select2-selection--single .select2-selection__rendered { - color: #444; - line-height: 28px; } - .select2-container--default .select2-selection--single .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; } - .select2-container--default .select2-selection--single .select2-selection__placeholder { - color: #999; } - .select2-container--default .select2-selection--single .select2-selection__arrow { - height: 26px; - position: absolute; - top: 1px; - right: 1px; - width: 20px; } - .select2-container--default .select2-selection--single .select2-selection__arrow b { - border-color: #888 transparent transparent transparent; - border-style: solid; - border-width: 5px 4px 0 4px; - height: 0; - left: 50%; - margin-left: -4px; - margin-top: -2px; - position: absolute; - top: 50%; - width: 0; } - -.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear { - float: left; } - -.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow { - left: 1px; - right: auto; } - -.select2-container--default.select2-container--disabled .select2-selection--single { - background-color: #eee; - cursor: default; } - .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear { - display: none; } - -.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b { - border-color: transparent transparent #888 transparent; - border-width: 0 4px 5px 4px; } - -.select2-container--default .select2-selection--multiple { - background-color: white; - border: 1px solid #aaa; - border-radius: 4px; - cursor: text; } - .select2-container--default .select2-selection--multiple .select2-selection__rendered { - box-sizing: border-box; - list-style: none; - margin: 0; - padding: 0 5px; - width: 100%; } - .select2-container--default .select2-selection--multiple .select2-selection__rendered li { - list-style: none; } - .select2-container--default .select2-selection--multiple .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; - margin-top: 5px; - margin-right: 10px; - padding: 1px; } - .select2-container--default .select2-selection--multiple .select2-selection__choice { - background-color: #e4e4e4; - border: 1px solid #aaa; - border-radius: 4px; - cursor: default; - float: left; - margin-right: 5px; - margin-top: 5px; - padding: 0 5px; } - .select2-container--default .select2-selection--multiple .select2-selection__choice__remove { - color: #999; - cursor: pointer; - display: inline-block; - font-weight: bold; - margin-right: 2px; } - .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #333; } - -.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline { - float: right; } - -.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice { - margin-left: 5px; - margin-right: auto; } - -.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { - margin-left: 2px; - margin-right: auto; } - -.select2-container--default.select2-container--focus .select2-selection--multiple { - border: solid black 1px; - outline: 0; } - -.select2-container--default.select2-container--disabled .select2-selection--multiple { - background-color: #eee; - cursor: default; } - -.select2-container--default.select2-container--disabled .select2-selection__choice__remove { - display: none; } - -.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple { - border-top-left-radius: 0; - border-top-right-radius: 0; } - -.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - -.select2-container--default .select2-search--dropdown .select2-search__field { - border: 1px solid #aaa; } - -.select2-container--default .select2-search--inline .select2-search__field { - background: transparent; - border: none; - outline: 0; - box-shadow: none; - -webkit-appearance: textfield; } - -.select2-container--default .select2-results > .select2-results__options { - max-height: 200px; - overflow-y: auto; } - -.select2-container--default .select2-results__option[role=group] { - padding: 0; } - -.select2-container--default .select2-results__option[aria-disabled=true] { - color: #999; } - -.select2-container--default .select2-results__option[aria-selected=true] { - background-color: #ddd; } - -.select2-container--default .select2-results__option .select2-results__option { - padding-left: 1em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__group { - padding-left: 0; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option { - margin-left: -1em; - padding-left: 2em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -2em; - padding-left: 3em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -3em; - padding-left: 4em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -4em; - padding-left: 5em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -5em; - padding-left: 6em; } - -.select2-container--default .select2-results__option--highlighted[aria-selected] { - background-color: #5897fb; - color: white; } - -.select2-container--default .select2-results__group { - cursor: default; - display: block; - padding: 6px; } - -.select2-container--classic .select2-selection--single { - background-color: #f7f7f7; - border: 1px solid #aaa; - border-radius: 4px; - outline: 0; - background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%); - background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%); - background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); } - .select2-container--classic .select2-selection--single:focus { - border: 1px solid #5897fb; } - .select2-container--classic .select2-selection--single .select2-selection__rendered { - color: #444; - line-height: 28px; } - .select2-container--classic .select2-selection--single .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; - margin-right: 10px; } - .select2-container--classic .select2-selection--single .select2-selection__placeholder { - color: #999; } - .select2-container--classic .select2-selection--single .select2-selection__arrow { - background-color: #ddd; - border: none; - border-left: 1px solid #aaa; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - height: 26px; - position: absolute; - top: 1px; - right: 1px; - width: 20px; - background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%); - background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%); - background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); } - .select2-container--classic .select2-selection--single .select2-selection__arrow b { - border-color: #888 transparent transparent transparent; - border-style: solid; - border-width: 5px 4px 0 4px; - height: 0; - left: 50%; - margin-left: -4px; - margin-top: -2px; - position: absolute; - top: 50%; - width: 0; } - -.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear { - float: left; } - -.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow { - border: none; - border-right: 1px solid #aaa; - border-radius: 0; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - left: 1px; - right: auto; } - -.select2-container--classic.select2-container--open .select2-selection--single { - border: 1px solid #5897fb; } - .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow { - background: transparent; - border: none; } - .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b { - border-color: transparent transparent #888 transparent; - border-width: 0 4px 5px 4px; } - -.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; - background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%); - background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%); - background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); } - -.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%); - background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%); - background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); } - -.select2-container--classic .select2-selection--multiple { - background-color: white; - border: 1px solid #aaa; - border-radius: 4px; - cursor: text; - outline: 0; } - .select2-container--classic .select2-selection--multiple:focus { - border: 1px solid #5897fb; } - .select2-container--classic .select2-selection--multiple .select2-selection__rendered { - list-style: none; - margin: 0; - padding: 0 5px; } - .select2-container--classic .select2-selection--multiple .select2-selection__clear { - display: none; } - .select2-container--classic .select2-selection--multiple .select2-selection__choice { - background-color: #e4e4e4; - border: 1px solid #aaa; - border-radius: 4px; - cursor: default; - float: left; - margin-right: 5px; - margin-top: 5px; - padding: 0 5px; } - .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove { - color: #888; - cursor: pointer; - display: inline-block; - font-weight: bold; - margin-right: 2px; } - .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #555; } - -.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice { - float: right; - margin-left: 5px; - margin-right: auto; } - -.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { - margin-left: 2px; - margin-right: auto; } - -.select2-container--classic.select2-container--open .select2-selection--multiple { - border: 1px solid #5897fb; } - -.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; } - -.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - -.select2-container--classic .select2-search--dropdown .select2-search__field { - border: 1px solid #aaa; - outline: 0; } - -.select2-container--classic .select2-search--inline .select2-search__field { - outline: 0; - box-shadow: none; } - -.select2-container--classic .select2-dropdown { - background-color: white; - border: 1px solid transparent; } - -.select2-container--classic .select2-dropdown--above { - border-bottom: none; } - -.select2-container--classic .select2-dropdown--below { - border-top: none; } - -.select2-container--classic .select2-results > .select2-results__options { - max-height: 200px; - overflow-y: auto; } - -.select2-container--classic .select2-results__option[role=group] { - padding: 0; } - -.select2-container--classic .select2-results__option[aria-disabled=true] { - color: grey; } - -.select2-container--classic .select2-results__option--highlighted[aria-selected] { - background-color: #3875d7; - color: white; } - -.select2-container--classic .select2-results__group { - cursor: default; - display: block; - padding: 6px; } - -.select2-container--classic.select2-container--open .select2-dropdown { - border-color: #5897fb; } diff --git a/django/staticfiles/admin/css/vendor/select2/select2.min.css b/django/staticfiles/admin/css/vendor/select2/select2.min.css deleted file mode 100644 index 7c18ad59..00000000 --- a/django/staticfiles/admin/css/vendor/select2/select2.min.css +++ /dev/null @@ -1 +0,0 @@ -.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb} diff --git a/django/staticfiles/admin/css/widgets.css b/django/staticfiles/admin/css/widgets.css deleted file mode 100644 index 1104e8b1..00000000 --- a/django/staticfiles/admin/css/widgets.css +++ /dev/null @@ -1,604 +0,0 @@ -/* SELECTOR (FILTER INTERFACE) */ - -.selector { - width: 800px; - float: left; - display: flex; -} - -.selector select { - width: 380px; - height: 17.2em; - flex: 1 0 auto; -} - -.selector-available, .selector-chosen { - width: 380px; - text-align: center; - margin-bottom: 5px; - display: flex; - flex-direction: column; -} - -.selector-available h2, .selector-chosen h2 { - border: 1px solid var(--border-color); - border-radius: 4px 4px 0 0; -} - -.selector-chosen .list-footer-display { - border: 1px solid var(--border-color); - border-top: none; - border-radius: 0 0 4px 4px; - margin: 0 0 10px; - padding: 8px; - text-align: center; - background: var(--primary); - color: var(--header-link-color); - cursor: pointer; -} -.selector-chosen .list-footer-display__clear { - color: var(--breadcrumbs-fg); -} - -.selector-chosen h2 { - background: var(--primary); - color: var(--header-link-color); -} - -.selector .selector-available h2 { - background: var(--darkened-bg); - color: var(--body-quiet-color); -} - -.selector .selector-filter { - border: 1px solid var(--border-color); - border-width: 0 1px; - padding: 8px; - color: var(--body-quiet-color); - font-size: 0.625rem; - margin: 0; - text-align: left; -} - -.selector .selector-filter label, -.inline-group .aligned .selector .selector-filter label { - float: left; - margin: 7px 0 0; - width: 18px; - height: 18px; - padding: 0; - overflow: hidden; - line-height: 1; - min-width: auto; -} - -.selector .selector-available input, -.selector .selector-chosen input { - width: 320px; - margin-left: 8px; -} - -.selector ul.selector-chooser { - align-self: center; - width: 22px; - background-color: var(--selected-bg); - border-radius: 10px; - margin: 0 5px; - padding: 0; - transform: translateY(-17px); -} - -.selector-chooser li { - margin: 0; - padding: 3px; - list-style-type: none; -} - -.selector select { - padding: 0 10px; - margin: 0 0 10px; - border-radius: 0 0 4px 4px; -} -.selector .selector-chosen--with-filtered select { - margin: 0; - border-radius: 0; - height: 14em; -} - -.selector .selector-chosen:not(.selector-chosen--with-filtered) .list-footer-display { - display: none; -} - -.selector-add, .selector-remove { - width: 16px; - height: 16px; - display: block; - text-indent: -3000px; - overflow: hidden; - cursor: default; - opacity: 0.55; -} - -.active.selector-add, .active.selector-remove { - opacity: 1; -} - -.active.selector-add:hover, .active.selector-remove:hover { - cursor: pointer; -} - -.selector-add { - background: url(../img/selector-icons.svg) 0 -96px no-repeat; -} - -.active.selector-add:focus, .active.selector-add:hover { - background-position: 0 -112px; -} - -.selector-remove { - background: url(../img/selector-icons.svg) 0 -64px no-repeat; -} - -.active.selector-remove:focus, .active.selector-remove:hover { - background-position: 0 -80px; -} - -a.selector-chooseall, a.selector-clearall { - display: inline-block; - height: 16px; - text-align: left; - margin: 1px auto 3px; - overflow: hidden; - font-weight: bold; - line-height: 16px; - color: var(--body-quiet-color); - text-decoration: none; - opacity: 0.55; -} - -a.active.selector-chooseall:focus, a.active.selector-clearall:focus, -a.active.selector-chooseall:hover, a.active.selector-clearall:hover { - color: var(--link-fg); -} - -a.active.selector-chooseall, a.active.selector-clearall { - opacity: 1; -} - -a.active.selector-chooseall:hover, a.active.selector-clearall:hover { - cursor: pointer; -} - -a.selector-chooseall { - padding: 0 18px 0 0; - background: url(../img/selector-icons.svg) right -160px no-repeat; - cursor: default; -} - -a.active.selector-chooseall:focus, a.active.selector-chooseall:hover { - background-position: 100% -176px; -} - -a.selector-clearall { - padding: 0 0 0 18px; - background: url(../img/selector-icons.svg) 0 -128px no-repeat; - cursor: default; -} - -a.active.selector-clearall:focus, a.active.selector-clearall:hover { - background-position: 0 -144px; -} - -/* STACKED SELECTORS */ - -.stacked { - float: left; - width: 490px; - display: block; -} - -.stacked select { - width: 480px; - height: 10.1em; -} - -.stacked .selector-available, .stacked .selector-chosen { - width: 480px; -} - -.stacked .selector-available { - margin-bottom: 0; -} - -.stacked .selector-available input { - width: 422px; -} - -.stacked ul.selector-chooser { - height: 22px; - width: 50px; - margin: 0 0 10px 40%; - background-color: #eee; - border-radius: 10px; - transform: none; -} - -.stacked .selector-chooser li { - float: left; - padding: 3px 3px 3px 5px; -} - -.stacked .selector-chooseall, .stacked .selector-clearall { - display: none; -} - -.stacked .selector-add { - background: url(../img/selector-icons.svg) 0 -32px no-repeat; - cursor: default; -} - -.stacked .active.selector-add { - background-position: 0 -32px; - cursor: pointer; -} - -.stacked .active.selector-add:focus, .stacked .active.selector-add:hover { - background-position: 0 -48px; - cursor: pointer; -} - -.stacked .selector-remove { - background: url(../img/selector-icons.svg) 0 0 no-repeat; - cursor: default; -} - -.stacked .active.selector-remove { - background-position: 0 0px; - cursor: pointer; -} - -.stacked .active.selector-remove:focus, .stacked .active.selector-remove:hover { - background-position: 0 -16px; - cursor: pointer; -} - -.selector .help-icon { - background: url(../img/icon-unknown.svg) 0 0 no-repeat; - display: inline-block; - vertical-align: middle; - margin: -2px 0 0 2px; - width: 13px; - height: 13px; -} - -.selector .selector-chosen .help-icon { - background: url(../img/icon-unknown-alt.svg) 0 0 no-repeat; -} - -.selector .search-label-icon { - background: url(../img/search.svg) 0 0 no-repeat; - display: inline-block; - height: 1.125rem; - width: 1.125rem; -} - -/* DATE AND TIME */ - -p.datetime { - line-height: 20px; - margin: 0; - padding: 0; - color: var(--body-quiet-color); - font-weight: bold; -} - -.datetime span { - white-space: nowrap; - font-weight: normal; - font-size: 0.6875rem; - color: var(--body-quiet-color); -} - -.datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField { - margin-left: 5px; - margin-bottom: 4px; -} - -table p.datetime { - font-size: 0.6875rem; - margin-left: 0; - padding-left: 0; -} - -.datetimeshortcuts .clock-icon, .datetimeshortcuts .date-icon { - position: relative; - display: inline-block; - vertical-align: middle; - height: 16px; - width: 16px; - overflow: hidden; -} - -.datetimeshortcuts .clock-icon { - background: url(../img/icon-clock.svg) 0 0 no-repeat; -} - -.datetimeshortcuts a:focus .clock-icon, -.datetimeshortcuts a:hover .clock-icon { - background-position: 0 -16px; -} - -.datetimeshortcuts .date-icon { - background: url(../img/icon-calendar.svg) 0 0 no-repeat; - top: -1px; -} - -.datetimeshortcuts a:focus .date-icon, -.datetimeshortcuts a:hover .date-icon { - background-position: 0 -16px; -} - -.timezonewarning { - font-size: 0.6875rem; - color: var(--body-quiet-color); -} - -/* URL */ - -p.url { - line-height: 20px; - margin: 0; - padding: 0; - color: var(--body-quiet-color); - font-size: 0.6875rem; - font-weight: bold; -} - -.url a { - font-weight: normal; -} - -/* FILE UPLOADS */ - -p.file-upload { - line-height: 20px; - margin: 0; - padding: 0; - color: var(--body-quiet-color); - font-size: 0.6875rem; - font-weight: bold; -} - -.file-upload a { - font-weight: normal; -} - -.file-upload .deletelink { - margin-left: 5px; -} - -span.clearable-file-input label { - color: var(--body-fg); - font-size: 0.6875rem; - display: inline; - float: none; -} - -/* CALENDARS & CLOCKS */ - -.calendarbox, .clockbox { - margin: 5px auto; - font-size: 0.75rem; - width: 19em; - text-align: center; - background: var(--body-bg); - color: var(--body-fg); - border: 1px solid var(--hairline-color); - border-radius: 4px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15); - overflow: hidden; - position: relative; -} - -.clockbox { - width: auto; -} - -.calendar { - margin: 0; - padding: 0; -} - -.calendar table { - margin: 0; - padding: 0; - border-collapse: collapse; - background: white; - width: 100%; -} - -.calendar caption, .calendarbox h2 { - margin: 0; - text-align: center; - border-top: none; - font-weight: 700; - font-size: 0.75rem; - color: #333; - background: var(--accent); -} - -.calendar th { - padding: 8px 5px; - background: var(--darkened-bg); - border-bottom: 1px solid var(--border-color); - font-weight: 400; - font-size: 0.75rem; - text-align: center; - color: var(--body-quiet-color); -} - -.calendar td { - font-weight: 400; - font-size: 0.75rem; - text-align: center; - padding: 0; - border-top: 1px solid var(--hairline-color); - border-bottom: none; -} - -.calendar td.selected a { - background: var(--primary); - color: var(--button-fg); -} - -.calendar td.nonday { - background: var(--darkened-bg); -} - -.calendar td.today a { - font-weight: 700; -} - -.calendar td a, .timelist a { - display: block; - font-weight: 400; - padding: 6px; - text-decoration: none; - color: var(--body-quiet-color); -} - -.calendar td a:focus, .timelist a:focus, -.calendar td a:hover, .timelist a:hover { - background: var(--primary); - color: white; -} - -.calendar td a:active, .timelist a:active { - background: var(--header-bg); - color: white; -} - -.calendarnav { - font-size: 0.625rem; - text-align: center; - color: #ccc; - margin: 0; - padding: 1px 3px; -} - -.calendarnav a:link, #calendarnav a:visited, -#calendarnav a:focus, #calendarnav a:hover { - color: var(--body-quiet-color); -} - -.calendar-shortcuts { - background: var(--body-bg); - color: var(--body-quiet-color); - font-size: 0.6875rem; - line-height: 0.6875rem; - border-top: 1px solid var(--hairline-color); - padding: 8px 0; -} - -.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { - display: block; - position: absolute; - top: 8px; - width: 15px; - height: 15px; - text-indent: -9999px; - padding: 0; -} - -.calendarnav-previous { - left: 10px; - background: url(../img/calendar-icons.svg) 0 0 no-repeat; -} - -.calendarbox .calendarnav-previous:focus, -.calendarbox .calendarnav-previous:hover { - background-position: 0 -15px; -} - -.calendarnav-next { - right: 10px; - background: url(../img/calendar-icons.svg) 0 -30px no-repeat; -} - -.calendarbox .calendarnav-next:focus, -.calendarbox .calendarnav-next:hover { - background-position: 0 -45px; -} - -.calendar-cancel { - margin: 0; - padding: 4px 0; - font-size: 0.75rem; - background: #eee; - border-top: 1px solid var(--border-color); - color: var(--body-fg); -} - -.calendar-cancel:focus, .calendar-cancel:hover { - background: #ddd; -} - -.calendar-cancel a { - color: black; - display: block; -} - -ul.timelist, .timelist li { - list-style-type: none; - margin: 0; - padding: 0; -} - -.timelist a { - padding: 2px; -} - -/* EDIT INLINE */ - -.inline-deletelink { - float: right; - text-indent: -9999px; - background: url(../img/inline-delete.svg) 0 0 no-repeat; - width: 16px; - height: 16px; - border: 0px none; -} - -.inline-deletelink:focus, .inline-deletelink:hover { - cursor: pointer; -} - -/* RELATED WIDGET WRAPPER */ -.related-widget-wrapper { - float: left; /* display properly in form rows with multiple fields */ - overflow: hidden; /* clear floated contents */ -} - -.related-widget-wrapper-link { - opacity: 0.3; -} - -.related-widget-wrapper-link:link { - opacity: .8; -} - -.related-widget-wrapper-link:link:focus, -.related-widget-wrapper-link:link:hover { - opacity: 1; -} - -select + .related-widget-wrapper-link, -.related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 7px; -} - -/* GIS MAPS */ -.dj_map { - width: 600px; - height: 400px; -} diff --git a/django/staticfiles/admin/img/LICENSE b/django/staticfiles/admin/img/LICENSE deleted file mode 100644 index a4faaa1d..00000000 --- a/django/staticfiles/admin/img/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Code Charm Ltd - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/django/staticfiles/admin/img/README.txt b/django/staticfiles/admin/img/README.txt deleted file mode 100644 index 4eb2e492..00000000 --- a/django/staticfiles/admin/img/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -All icons are taken from Font Awesome (http://fontawesome.io/) project. -The Font Awesome font is licensed under the SIL OFL 1.1: -- https://scripts.sil.org/OFL - -SVG icons source: https://github.com/encharm/Font-Awesome-SVG-PNG -Font-Awesome-SVG-PNG is licensed under the MIT license (see file license -in current folder). diff --git a/django/staticfiles/admin/img/calendar-icons.svg b/django/staticfiles/admin/img/calendar-icons.svg deleted file mode 100644 index dbf21c39..00000000 --- a/django/staticfiles/admin/img/calendar-icons.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/django/staticfiles/admin/img/gis/move_vertex_off.svg b/django/staticfiles/admin/img/gis/move_vertex_off.svg deleted file mode 100644 index 228854f3..00000000 --- a/django/staticfiles/admin/img/gis/move_vertex_off.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/django/staticfiles/admin/img/gis/move_vertex_on.svg b/django/staticfiles/admin/img/gis/move_vertex_on.svg deleted file mode 100644 index 96b87fdd..00000000 --- a/django/staticfiles/admin/img/gis/move_vertex_on.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/django/staticfiles/admin/img/icon-addlink.svg b/django/staticfiles/admin/img/icon-addlink.svg deleted file mode 100644 index e004fb16..00000000 --- a/django/staticfiles/admin/img/icon-addlink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-alert.svg b/django/staticfiles/admin/img/icon-alert.svg deleted file mode 100644 index e51ea83f..00000000 --- a/django/staticfiles/admin/img/icon-alert.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-calendar.svg b/django/staticfiles/admin/img/icon-calendar.svg deleted file mode 100644 index 97910a99..00000000 --- a/django/staticfiles/admin/img/icon-calendar.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/django/staticfiles/admin/img/icon-changelink.svg b/django/staticfiles/admin/img/icon-changelink.svg deleted file mode 100644 index bbb137aa..00000000 --- a/django/staticfiles/admin/img/icon-changelink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-clock.svg b/django/staticfiles/admin/img/icon-clock.svg deleted file mode 100644 index bf9985d3..00000000 --- a/django/staticfiles/admin/img/icon-clock.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/django/staticfiles/admin/img/icon-deletelink.svg b/django/staticfiles/admin/img/icon-deletelink.svg deleted file mode 100644 index 4059b155..00000000 --- a/django/staticfiles/admin/img/icon-deletelink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-no.svg b/django/staticfiles/admin/img/icon-no.svg deleted file mode 100644 index 2e0d3832..00000000 --- a/django/staticfiles/admin/img/icon-no.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-unknown-alt.svg b/django/staticfiles/admin/img/icon-unknown-alt.svg deleted file mode 100644 index 1c6b99fc..00000000 --- a/django/staticfiles/admin/img/icon-unknown-alt.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-unknown.svg b/django/staticfiles/admin/img/icon-unknown.svg deleted file mode 100644 index 50b4f972..00000000 --- a/django/staticfiles/admin/img/icon-unknown.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-viewlink.svg b/django/staticfiles/admin/img/icon-viewlink.svg deleted file mode 100644 index a1ca1d3f..00000000 --- a/django/staticfiles/admin/img/icon-viewlink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/icon-yes.svg b/django/staticfiles/admin/img/icon-yes.svg deleted file mode 100644 index 5883d877..00000000 --- a/django/staticfiles/admin/img/icon-yes.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/inline-delete.svg b/django/staticfiles/admin/img/inline-delete.svg deleted file mode 100644 index 17d1ad67..00000000 --- a/django/staticfiles/admin/img/inline-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/search.svg b/django/staticfiles/admin/img/search.svg deleted file mode 100644 index c8c69b2a..00000000 --- a/django/staticfiles/admin/img/search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/selector-icons.svg b/django/staticfiles/admin/img/selector-icons.svg deleted file mode 100644 index 926b8e21..00000000 --- a/django/staticfiles/admin/img/selector-icons.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/django/staticfiles/admin/img/sorting-icons.svg b/django/staticfiles/admin/img/sorting-icons.svg deleted file mode 100644 index 7c31ec91..00000000 --- a/django/staticfiles/admin/img/sorting-icons.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/django/staticfiles/admin/img/tooltag-add.svg b/django/staticfiles/admin/img/tooltag-add.svg deleted file mode 100644 index 1ca64ae5..00000000 --- a/django/staticfiles/admin/img/tooltag-add.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/img/tooltag-arrowright.svg b/django/staticfiles/admin/img/tooltag-arrowright.svg deleted file mode 100644 index b664d619..00000000 --- a/django/staticfiles/admin/img/tooltag-arrowright.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/staticfiles/admin/js/SelectBox.js b/django/staticfiles/admin/js/SelectBox.js deleted file mode 100644 index 3db4ec7f..00000000 --- a/django/staticfiles/admin/js/SelectBox.js +++ /dev/null @@ -1,116 +0,0 @@ -'use strict'; -{ - const SelectBox = { - cache: {}, - init: function(id) { - const box = document.getElementById(id); - SelectBox.cache[id] = []; - const cache = SelectBox.cache[id]; - for (const node of box.options) { - cache.push({value: node.value, text: node.text, displayed: 1}); - } - }, - redisplay: function(id) { - // Repopulate HTML select box from cache - const box = document.getElementById(id); - const scroll_value_from_top = box.scrollTop; - box.innerHTML = ''; - for (const node of SelectBox.cache[id]) { - if (node.displayed) { - const new_option = new Option(node.text, node.value, false, false); - // Shows a tooltip when hovering over the option - new_option.title = node.text; - box.appendChild(new_option); - } - } - box.scrollTop = scroll_value_from_top; - }, - filter: function(id, text) { - // Redisplay the HTML select box, displaying only the choices containing ALL - // the words in text. (It's an AND search.) - const tokens = text.toLowerCase().split(/\s+/); - for (const node of SelectBox.cache[id]) { - node.displayed = 1; - const node_text = node.text.toLowerCase(); - for (const token of tokens) { - if (!node_text.includes(token)) { - node.displayed = 0; - break; // Once the first token isn't found we're done - } - } - } - SelectBox.redisplay(id); - }, - get_hidden_node_count(id) { - const cache = SelectBox.cache[id] || []; - return cache.filter(node => node.displayed === 0).length; - }, - delete_from_cache: function(id, value) { - let delete_index = null; - const cache = SelectBox.cache[id]; - for (const [i, node] of cache.entries()) { - if (node.value === value) { - delete_index = i; - break; - } - } - cache.splice(delete_index, 1); - }, - add_to_cache: function(id, option) { - SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1}); - }, - cache_contains: function(id, value) { - // Check if an item is contained in the cache - for (const node of SelectBox.cache[id]) { - if (node.value === value) { - return true; - } - } - return false; - }, - move: function(from, to) { - const from_box = document.getElementById(from); - for (const option of from_box.options) { - const option_value = option.value; - if (option.selected && SelectBox.cache_contains(from, option_value)) { - SelectBox.add_to_cache(to, {value: option_value, text: option.text, displayed: 1}); - SelectBox.delete_from_cache(from, option_value); - } - } - SelectBox.redisplay(from); - SelectBox.redisplay(to); - }, - move_all: function(from, to) { - const from_box = document.getElementById(from); - for (const option of from_box.options) { - const option_value = option.value; - if (SelectBox.cache_contains(from, option_value)) { - SelectBox.add_to_cache(to, {value: option_value, text: option.text, displayed: 1}); - SelectBox.delete_from_cache(from, option_value); - } - } - SelectBox.redisplay(from); - SelectBox.redisplay(to); - }, - sort: function(id) { - SelectBox.cache[id].sort(function(a, b) { - a = a.text.toLowerCase(); - b = b.text.toLowerCase(); - if (a > b) { - return 1; - } - if (a < b) { - return -1; - } - return 0; - } ); - }, - select_all: function(id) { - const box = document.getElementById(id); - for (const option of box.options) { - option.selected = true; - } - } - }; - window.SelectBox = SelectBox; -} diff --git a/django/staticfiles/admin/js/SelectFilter2.js b/django/staticfiles/admin/js/SelectFilter2.js deleted file mode 100644 index 9a4e0a3a..00000000 --- a/django/staticfiles/admin/js/SelectFilter2.js +++ /dev/null @@ -1,283 +0,0 @@ -/*global SelectBox, gettext, interpolate, quickElement, SelectFilter*/ -/* -SelectFilter2 - Turns a multiple-select box into a filter interface. - -Requires core.js and SelectBox.js. -*/ -'use strict'; -{ - window.SelectFilter = { - init: function(field_id, field_name, is_stacked) { - if (field_id.match(/__prefix__/)) { - // Don't initialize on empty forms. - return; - } - const from_box = document.getElementById(field_id); - from_box.id += '_from'; // change its ID - from_box.className = 'filtered'; - - for (const p of from_box.parentNode.getElementsByTagName('p')) { - if (p.classList.contains("info")) { - // Remove

, because it just gets in the way. - from_box.parentNode.removeChild(p); - } else if (p.classList.contains("help")) { - // Move help text up to the top so it isn't below the select - // boxes or wrapped off on the side to the right of the add - // button: - from_box.parentNode.insertBefore(p, from_box.parentNode.firstChild); - } - } - - //

or
- const selector_div = quickElement('div', from_box.parentNode); - selector_div.className = is_stacked ? 'selector stacked' : 'selector'; - - //
- const selector_available = quickElement('div', selector_div); - selector_available.className = 'selector-available'; - const title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name])); - quickElement( - 'span', title_available, '', - 'class', 'help help-tooltip help-icon', - 'title', interpolate( - gettext( - 'This is the list of available %s. You may choose some by ' + - 'selecting them in the box below and then clicking the ' + - '"Choose" arrow between the two boxes.' - ), - [field_name] - ) - ); - - const filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter'); - filter_p.className = 'selector-filter'; - - const search_filter_label = quickElement('label', filter_p, '', 'for', field_id + '_input'); - - quickElement( - 'span', search_filter_label, '', - 'class', 'help-tooltip search-label-icon', - 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name]) - ); - - filter_p.appendChild(document.createTextNode(' ')); - - const filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter")); - filter_input.id = field_id + '_input'; - - selector_available.appendChild(from_box); - const choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_add_all_link'); - choose_all.className = 'selector-chooseall'; - - //
    - const selector_chooser = quickElement('ul', selector_div); - selector_chooser.className = 'selector-chooser'; - const add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', '#', 'id', field_id + '_add_link'); - add_link.className = 'selector-add'; - const remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', '#', 'id', field_id + '_remove_link'); - remove_link.className = 'selector-remove'; - - //
    - const selector_chosen = quickElement('div', selector_div, '', 'id', field_id + '_selector_chosen'); - selector_chosen.className = 'selector-chosen'; - const title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name])); - quickElement( - 'span', title_chosen, '', - 'class', 'help help-tooltip help-icon', - 'title', interpolate( - gettext( - 'This is the list of chosen %s. You may remove some by ' + - 'selecting them in the box below and then clicking the ' + - '"Remove" arrow between the two boxes.' - ), - [field_name] - ) - ); - - const filter_selected_p = quickElement('p', selector_chosen, '', 'id', field_id + '_filter_selected'); - filter_selected_p.className = 'selector-filter'; - - const search_filter_selected_label = quickElement('label', filter_selected_p, '', 'for', field_id + '_selected_input'); - - quickElement( - 'span', search_filter_selected_label, '', - 'class', 'help-tooltip search-label-icon', - 'title', interpolate(gettext("Type into this box to filter down the list of selected %s."), [field_name]) - ); - - filter_selected_p.appendChild(document.createTextNode(' ')); - - const filter_selected_input = quickElement('input', filter_selected_p, '', 'type', 'text', 'placeholder', gettext("Filter")); - filter_selected_input.id = field_id + '_selected_input'; - - const to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', '', 'size', from_box.size, 'name', from_box.name); - to_box.className = 'filtered'; - - const warning_footer = quickElement('div', selector_chosen, '', 'class', 'list-footer-display'); - quickElement('span', warning_footer, '', 'id', field_id + '_list-footer-display-text'); - quickElement('span', warning_footer, ' (click to clear)', 'class', 'list-footer-display__clear'); - - const clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link'); - clear_all.className = 'selector-clearall'; - - from_box.name = from_box.name + '_old'; - - // Set up the JavaScript event handlers for the select box filter interface - const move_selection = function(e, elem, move_func, from, to) { - if (elem.classList.contains('active')) { - move_func(from, to); - SelectFilter.refresh_icons(field_id); - SelectFilter.refresh_filtered_selects(field_id); - SelectFilter.refresh_filtered_warning(field_id); - } - e.preventDefault(); - }; - choose_all.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move_all, field_id + '_from', field_id + '_to'); - }); - add_link.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move, field_id + '_from', field_id + '_to'); - }); - remove_link.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move, field_id + '_to', field_id + '_from'); - }); - clear_all.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move_all, field_id + '_to', field_id + '_from'); - }); - warning_footer.addEventListener('click', function(e) { - filter_selected_input.value = ''; - SelectBox.filter(field_id + '_to', ''); - SelectFilter.refresh_filtered_warning(field_id); - SelectFilter.refresh_icons(field_id); - }); - filter_input.addEventListener('keypress', function(e) { - SelectFilter.filter_key_press(e, field_id, '_from', '_to'); - }); - filter_input.addEventListener('keyup', function(e) { - SelectFilter.filter_key_up(e, field_id, '_from'); - }); - filter_input.addEventListener('keydown', function(e) { - SelectFilter.filter_key_down(e, field_id, '_from', '_to'); - }); - filter_selected_input.addEventListener('keypress', function(e) { - SelectFilter.filter_key_press(e, field_id, '_to', '_from'); - }); - filter_selected_input.addEventListener('keyup', function(e) { - SelectFilter.filter_key_up(e, field_id, '_to', '_selected_input'); - }); - filter_selected_input.addEventListener('keydown', function(e) { - SelectFilter.filter_key_down(e, field_id, '_to', '_from'); - }); - selector_div.addEventListener('change', function(e) { - if (e.target.tagName === 'SELECT') { - SelectFilter.refresh_icons(field_id); - } - }); - selector_div.addEventListener('dblclick', function(e) { - if (e.target.tagName === 'OPTION') { - if (e.target.closest('select').id === field_id + '_to') { - SelectBox.move(field_id + '_to', field_id + '_from'); - } else { - SelectBox.move(field_id + '_from', field_id + '_to'); - } - SelectFilter.refresh_icons(field_id); - } - }); - from_box.closest('form').addEventListener('submit', function() { - SelectBox.filter(field_id + '_to', ''); - SelectBox.select_all(field_id + '_to'); - }); - SelectBox.init(field_id + '_from'); - SelectBox.init(field_id + '_to'); - // Move selected from_box options to to_box - SelectBox.move(field_id + '_from', field_id + '_to'); - - // Initial icon refresh - SelectFilter.refresh_icons(field_id); - }, - any_selected: function(field) { - // Temporarily add the required attribute and check validity. - field.required = true; - const any_selected = field.checkValidity(); - field.required = false; - return any_selected; - }, - refresh_filtered_warning: function(field_id) { - const count = SelectBox.get_hidden_node_count(field_id + '_to'); - const selector = document.getElementById(field_id + '_selector_chosen'); - const warning = document.getElementById(field_id + '_list-footer-display-text'); - selector.className = selector.className.replace('selector-chosen--with-filtered', ''); - warning.textContent = interpolate(ngettext( - '%s selected option not visible', - '%s selected options not visible', - count - ), [count]); - if(count > 0) { - selector.className += ' selector-chosen--with-filtered'; - } - }, - refresh_filtered_selects: function(field_id) { - SelectBox.filter(field_id + '_from', document.getElementById(field_id + "_input").value); - SelectBox.filter(field_id + '_to', document.getElementById(field_id + "_selected_input").value); - }, - refresh_icons: function(field_id) { - const from = document.getElementById(field_id + '_from'); - const to = document.getElementById(field_id + '_to'); - // Active if at least one item is selected - document.getElementById(field_id + '_add_link').classList.toggle('active', SelectFilter.any_selected(from)); - document.getElementById(field_id + '_remove_link').classList.toggle('active', SelectFilter.any_selected(to)); - // Active if the corresponding box isn't empty - document.getElementById(field_id + '_add_all_link').classList.toggle('active', from.querySelector('option')); - document.getElementById(field_id + '_remove_all_link').classList.toggle('active', to.querySelector('option')); - SelectFilter.refresh_filtered_warning(field_id); - }, - filter_key_press: function(event, field_id, source, target) { - const source_box = document.getElementById(field_id + source); - // don't submit form if user pressed Enter - if ((event.which && event.which === 13) || (event.keyCode && event.keyCode === 13)) { - source_box.selectedIndex = 0; - SelectBox.move(field_id + source, field_id + target); - source_box.selectedIndex = 0; - event.preventDefault(); - } - }, - filter_key_up: function(event, field_id, source, filter_input) { - const input = filter_input || '_input'; - const source_box = document.getElementById(field_id + source); - const temp = source_box.selectedIndex; - SelectBox.filter(field_id + source, document.getElementById(field_id + input).value); - source_box.selectedIndex = temp; - SelectFilter.refresh_filtered_warning(field_id); - SelectFilter.refresh_icons(field_id); - }, - filter_key_down: function(event, field_id, source, target) { - const source_box = document.getElementById(field_id + source); - // right key (39) or left key (37) - const direction = source === '_from' ? 39 : 37; - // right arrow -- move across - if ((event.which && event.which === direction) || (event.keyCode && event.keyCode === direction)) { - const old_index = source_box.selectedIndex; - SelectBox.move(field_id + source, field_id + target); - SelectFilter.refresh_filtered_selects(field_id); - SelectFilter.refresh_filtered_warning(field_id); - source_box.selectedIndex = (old_index === source_box.length) ? source_box.length - 1 : old_index; - return; - } - // down arrow -- wrap around - if ((event.which && event.which === 40) || (event.keyCode && event.keyCode === 40)) { - source_box.selectedIndex = (source_box.length === source_box.selectedIndex + 1) ? 0 : source_box.selectedIndex + 1; - } - // up arrow -- wrap around - if ((event.which && event.which === 38) || (event.keyCode && event.keyCode === 38)) { - source_box.selectedIndex = (source_box.selectedIndex === 0) ? source_box.length - 1 : source_box.selectedIndex - 1; - } - } - }; - - window.addEventListener('load', function(e) { - document.querySelectorAll('select.selectfilter, select.selectfilterstacked').forEach(function(el) { - const data = el.dataset; - SelectFilter.init(el.id, data.fieldName, parseInt(data.isStacked, 10)); - }); - }); -} diff --git a/django/staticfiles/admin/js/actions.js b/django/staticfiles/admin/js/actions.js deleted file mode 100644 index 20a5c143..00000000 --- a/django/staticfiles/admin/js/actions.js +++ /dev/null @@ -1,201 +0,0 @@ -/*global gettext, interpolate, ngettext*/ -'use strict'; -{ - function show(selector) { - document.querySelectorAll(selector).forEach(function(el) { - el.classList.remove('hidden'); - }); - } - - function hide(selector) { - document.querySelectorAll(selector).forEach(function(el) { - el.classList.add('hidden'); - }); - } - - function showQuestion(options) { - hide(options.acrossClears); - show(options.acrossQuestions); - hide(options.allContainer); - } - - function showClear(options) { - show(options.acrossClears); - hide(options.acrossQuestions); - document.querySelector(options.actionContainer).classList.remove(options.selectedClass); - show(options.allContainer); - hide(options.counterContainer); - } - - function reset(options) { - hide(options.acrossClears); - hide(options.acrossQuestions); - hide(options.allContainer); - show(options.counterContainer); - } - - function clearAcross(options) { - reset(options); - const acrossInputs = document.querySelectorAll(options.acrossInput); - acrossInputs.forEach(function(acrossInput) { - acrossInput.value = 0; - }); - document.querySelector(options.actionContainer).classList.remove(options.selectedClass); - } - - function checker(actionCheckboxes, options, checked) { - if (checked) { - showQuestion(options); - } else { - reset(options); - } - actionCheckboxes.forEach(function(el) { - el.checked = checked; - el.closest('tr').classList.toggle(options.selectedClass, checked); - }); - } - - function updateCounter(actionCheckboxes, options) { - const sel = Array.from(actionCheckboxes).filter(function(el) { - return el.checked; - }).length; - const counter = document.querySelector(options.counterContainer); - // data-actions-icnt is defined in the generated HTML - // and contains the total amount of objects in the queryset - const actions_icnt = Number(counter.dataset.actionsIcnt); - counter.textContent = interpolate( - ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { - sel: sel, - cnt: actions_icnt - }, true); - const allToggle = document.getElementById(options.allToggleId); - allToggle.checked = sel === actionCheckboxes.length; - if (allToggle.checked) { - showQuestion(options); - } else { - clearAcross(options); - } - } - - const defaults = { - actionContainer: "div.actions", - counterContainer: "span.action-counter", - allContainer: "div.actions span.all", - acrossInput: "div.actions input.select-across", - acrossQuestions: "div.actions span.question", - acrossClears: "div.actions span.clear", - allToggleId: "action-toggle", - selectedClass: "selected" - }; - - window.Actions = function(actionCheckboxes, options) { - options = Object.assign({}, defaults, options); - let list_editable_changed = false; - let lastChecked = null; - let shiftPressed = false; - - document.addEventListener('keydown', (event) => { - shiftPressed = event.shiftKey; - }); - - document.addEventListener('keyup', (event) => { - shiftPressed = event.shiftKey; - }); - - document.getElementById(options.allToggleId).addEventListener('click', function(event) { - checker(actionCheckboxes, options, this.checked); - updateCounter(actionCheckboxes, options); - }); - - document.querySelectorAll(options.acrossQuestions + " a").forEach(function(el) { - el.addEventListener('click', function(event) { - event.preventDefault(); - const acrossInputs = document.querySelectorAll(options.acrossInput); - acrossInputs.forEach(function(acrossInput) { - acrossInput.value = 1; - }); - showClear(options); - }); - }); - - document.querySelectorAll(options.acrossClears + " a").forEach(function(el) { - el.addEventListener('click', function(event) { - event.preventDefault(); - document.getElementById(options.allToggleId).checked = false; - clearAcross(options); - checker(actionCheckboxes, options, false); - updateCounter(actionCheckboxes, options); - }); - }); - - function affectedCheckboxes(target, withModifier) { - const multiSelect = (lastChecked && withModifier && lastChecked !== target); - if (!multiSelect) { - return [target]; - } - const checkboxes = Array.from(actionCheckboxes); - const targetIndex = checkboxes.findIndex(el => el === target); - const lastCheckedIndex = checkboxes.findIndex(el => el === lastChecked); - const startIndex = Math.min(targetIndex, lastCheckedIndex); - const endIndex = Math.max(targetIndex, lastCheckedIndex); - const filtered = checkboxes.filter((el, index) => (startIndex <= index) && (index <= endIndex)); - return filtered; - }; - - Array.from(document.getElementById('result_list').tBodies).forEach(function(el) { - el.addEventListener('change', function(event) { - const target = event.target; - if (target.classList.contains('action-select')) { - const checkboxes = affectedCheckboxes(target, shiftPressed); - checker(checkboxes, options, target.checked); - updateCounter(actionCheckboxes, options); - lastChecked = target; - } else { - list_editable_changed = true; - } - }); - }); - - document.querySelector('#changelist-form button[name=index]').addEventListener('click', function(event) { - if (list_editable_changed) { - const confirmed = confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); - if (!confirmed) { - event.preventDefault(); - } - } - }); - - const el = document.querySelector('#changelist-form input[name=_save]'); - // The button does not exist if no fields are editable. - if (el) { - el.addEventListener('click', function(event) { - if (document.querySelector('[name=action]').value) { - const text = list_editable_changed - ? gettext("You have selected an action, but you haven’t saved your changes to individual fields yet. Please click OK to save. You’ll need to re-run the action.") - : gettext("You have selected an action, and you haven’t made any changes on individual fields. You’re probably looking for the Go button rather than the Save button."); - if (!confirm(text)) { - event.preventDefault(); - } - } - }); - } - }; - - // Call function fn when the DOM is loaded and ready. If it is already - // loaded, call the function now. - // http://youmightnotneedjquery.com/#ready - function ready(fn) { - if (document.readyState !== 'loading') { - fn(); - } else { - document.addEventListener('DOMContentLoaded', fn); - } - } - - ready(function() { - const actionsEls = document.querySelectorAll('tr input.action-select'); - if (actionsEls.length > 0) { - Actions(actionsEls); - } - }); -} diff --git a/django/staticfiles/admin/js/admin/DateTimeShortcuts.js b/django/staticfiles/admin/js/admin/DateTimeShortcuts.js deleted file mode 100644 index aa1cae9e..00000000 --- a/django/staticfiles/admin/js/admin/DateTimeShortcuts.js +++ /dev/null @@ -1,408 +0,0 @@ -/*global Calendar, findPosX, findPosY, get_format, gettext, gettext_noop, interpolate, ngettext, quickElement*/ -// Inserts shortcut buttons after all of the following: -// -// -'use strict'; -{ - const DateTimeShortcuts = { - calendars: [], - calendarInputs: [], - clockInputs: [], - clockHours: { - default_: [ - [gettext_noop('Now'), -1], - [gettext_noop('Midnight'), 0], - [gettext_noop('6 a.m.'), 6], - [gettext_noop('Noon'), 12], - [gettext_noop('6 p.m.'), 18] - ] - }, - dismissClockFunc: [], - dismissCalendarFunc: [], - calendarDivName1: 'calendarbox', // name of calendar
    that gets toggled - calendarDivName2: 'calendarin', // name of
    that contains calendar - calendarLinkName: 'calendarlink', // name of the link that is used to toggle - clockDivName: 'clockbox', // name of clock
    that gets toggled - clockLinkName: 'clocklink', // name of the link that is used to toggle - shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts - timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch - timezoneOffset: 0, - init: function() { - const serverOffset = document.body.dataset.adminUtcOffset; - if (serverOffset) { - const localOffset = new Date().getTimezoneOffset() * -60; - DateTimeShortcuts.timezoneOffset = localOffset - serverOffset; - } - - for (const inp of document.getElementsByTagName('input')) { - if (inp.type === 'text' && inp.classList.contains('vTimeField')) { - DateTimeShortcuts.addClock(inp); - DateTimeShortcuts.addTimezoneWarning(inp); - } - else if (inp.type === 'text' && inp.classList.contains('vDateField')) { - DateTimeShortcuts.addCalendar(inp); - DateTimeShortcuts.addTimezoneWarning(inp); - } - } - }, - // Return the current time while accounting for the server timezone. - now: function() { - const serverOffset = document.body.dataset.adminUtcOffset; - if (serverOffset) { - const localNow = new Date(); - const localOffset = localNow.getTimezoneOffset() * -60; - localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset)); - return localNow; - } else { - return new Date(); - } - }, - // Add a warning when the time zone in the browser and backend do not match. - addTimezoneWarning: function(inp) { - const warningClass = DateTimeShortcuts.timezoneWarningClass; - let timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600; - - // Only warn if there is a time zone mismatch. - if (!timezoneOffset) { - return; - } - - // Check if warning is already there. - if (inp.parentNode.querySelectorAll('.' + warningClass).length) { - return; - } - - let message; - if (timezoneOffset > 0) { - message = ngettext( - 'Note: You are %s hour ahead of server time.', - 'Note: You are %s hours ahead of server time.', - timezoneOffset - ); - } - else { - timezoneOffset *= -1; - message = ngettext( - 'Note: You are %s hour behind server time.', - 'Note: You are %s hours behind server time.', - timezoneOffset - ); - } - message = interpolate(message, [timezoneOffset]); - - const warning = document.createElement('div'); - warning.classList.add('help', warningClass); - warning.textContent = message; - inp.parentNode.appendChild(warning); - }, - // Add clock widget to a given field - addClock: function(inp) { - const num = DateTimeShortcuts.clockInputs.length; - DateTimeShortcuts.clockInputs[num] = inp; - DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; }; - - // Shortcut links (clock icon and "Now" link) - const shortcuts_span = document.createElement('span'); - shortcuts_span.className = DateTimeShortcuts.shortCutsClass; - inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); - const now_link = document.createElement('a'); - now_link.href = "#"; - now_link.textContent = gettext('Now'); - now_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleClockQuicklink(num, -1); - }); - const clock_link = document.createElement('a'); - clock_link.href = '#'; - clock_link.id = DateTimeShortcuts.clockLinkName + num; - clock_link.addEventListener('click', function(e) { - e.preventDefault(); - // avoid triggering the document click handler to dismiss the clock - e.stopPropagation(); - DateTimeShortcuts.openClock(num); - }); - - quickElement( - 'span', clock_link, '', - 'class', 'clock-icon', - 'title', gettext('Choose a Time') - ); - shortcuts_span.appendChild(document.createTextNode('\u00A0')); - shortcuts_span.appendChild(now_link); - shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0')); - shortcuts_span.appendChild(clock_link); - - // Create clock link div - // - // Markup looks like: - //
    - //

    Choose a time

    - // - //

    Cancel

    - //
    - - const clock_box = document.createElement('div'); - clock_box.style.display = 'none'; - clock_box.style.position = 'absolute'; - clock_box.className = 'clockbox module'; - clock_box.id = DateTimeShortcuts.clockDivName + num; - document.body.appendChild(clock_box); - clock_box.addEventListener('click', function(e) { e.stopPropagation(); }); - - quickElement('h2', clock_box, gettext('Choose a time')); - const time_list = quickElement('ul', clock_box); - time_list.className = 'timelist'; - // The list of choices can be overridden in JavaScript like this: - // DateTimeShortcuts.clockHours.name = [['3 a.m.', 3]]; - // where name is the name attribute of the . - const name = typeof DateTimeShortcuts.clockHours[inp.name] === 'undefined' ? 'default_' : inp.name; - DateTimeShortcuts.clockHours[name].forEach(function(element) { - const time_link = quickElement('a', quickElement('li', time_list), gettext(element[0]), 'href', '#'); - time_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleClockQuicklink(num, element[1]); - }); - }); - - const cancel_p = quickElement('p', clock_box); - cancel_p.className = 'calendar-cancel'; - const cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#'); - cancel_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.dismissClock(num); - }); - - document.addEventListener('keyup', function(event) { - if (event.which === 27) { - // ESC key closes popup - DateTimeShortcuts.dismissClock(num); - event.preventDefault(); - } - }); - }, - openClock: function(num) { - const clock_box = document.getElementById(DateTimeShortcuts.clockDivName + num); - const clock_link = document.getElementById(DateTimeShortcuts.clockLinkName + num); - - // Recalculate the clockbox position - // is it left-to-right or right-to-left layout ? - if (window.getComputedStyle(document.body).direction !== 'rtl') { - clock_box.style.left = findPosX(clock_link) + 17 + 'px'; - } - else { - // since style's width is in em, it'd be tough to calculate - // px value of it. let's use an estimated px for now - clock_box.style.left = findPosX(clock_link) - 110 + 'px'; - } - clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px'; - - // Show the clock box - clock_box.style.display = 'block'; - document.addEventListener('click', DateTimeShortcuts.dismissClockFunc[num]); - }, - dismissClock: function(num) { - document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none'; - document.removeEventListener('click', DateTimeShortcuts.dismissClockFunc[num]); - }, - handleClockQuicklink: function(num, val) { - let d; - if (val === -1) { - d = DateTimeShortcuts.now(); - } - else { - d = new Date(1970, 1, 1, val, 0, 0, 0); - } - DateTimeShortcuts.clockInputs[num].value = d.strftime(get_format('TIME_INPUT_FORMATS')[0]); - DateTimeShortcuts.clockInputs[num].focus(); - DateTimeShortcuts.dismissClock(num); - }, - // Add calendar widget to a given field. - addCalendar: function(inp) { - const num = DateTimeShortcuts.calendars.length; - - DateTimeShortcuts.calendarInputs[num] = inp; - DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; }; - - // Shortcut links (calendar icon and "Today" link) - const shortcuts_span = document.createElement('span'); - shortcuts_span.className = DateTimeShortcuts.shortCutsClass; - inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); - const today_link = document.createElement('a'); - today_link.href = '#'; - today_link.appendChild(document.createTextNode(gettext('Today'))); - today_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, 0); - }); - const cal_link = document.createElement('a'); - cal_link.href = '#'; - cal_link.id = DateTimeShortcuts.calendarLinkName + num; - cal_link.addEventListener('click', function(e) { - e.preventDefault(); - // avoid triggering the document click handler to dismiss the calendar - e.stopPropagation(); - DateTimeShortcuts.openCalendar(num); - }); - quickElement( - 'span', cal_link, '', - 'class', 'date-icon', - 'title', gettext('Choose a Date') - ); - shortcuts_span.appendChild(document.createTextNode('\u00A0')); - shortcuts_span.appendChild(today_link); - shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0')); - shortcuts_span.appendChild(cal_link); - - // Create calendarbox div. - // - // Markup looks like: - // - //
    - //

    - // - // February 2003 - //

    - //
    - // - //
    - //
    - // Yesterday | Today | Tomorrow - //
    - //

    Cancel

    - //
    - const cal_box = document.createElement('div'); - cal_box.style.display = 'none'; - cal_box.style.position = 'absolute'; - cal_box.className = 'calendarbox module'; - cal_box.id = DateTimeShortcuts.calendarDivName1 + num; - document.body.appendChild(cal_box); - cal_box.addEventListener('click', function(e) { e.stopPropagation(); }); - - // next-prev links - const cal_nav = quickElement('div', cal_box); - const cal_nav_prev = quickElement('a', cal_nav, '<', 'href', '#'); - cal_nav_prev.className = 'calendarnav-previous'; - cal_nav_prev.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.drawPrev(num); - }); - - const cal_nav_next = quickElement('a', cal_nav, '>', 'href', '#'); - cal_nav_next.className = 'calendarnav-next'; - cal_nav_next.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.drawNext(num); - }); - - // main box - const cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num); - cal_main.className = 'calendar'; - DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num)); - DateTimeShortcuts.calendars[num].drawCurrent(); - - // calendar shortcuts - const shortcuts = quickElement('div', cal_box); - shortcuts.className = 'calendar-shortcuts'; - let day_link = quickElement('a', shortcuts, gettext('Yesterday'), 'href', '#'); - day_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, -1); - }); - shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0')); - day_link = quickElement('a', shortcuts, gettext('Today'), 'href', '#'); - day_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, 0); - }); - shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0')); - day_link = quickElement('a', shortcuts, gettext('Tomorrow'), 'href', '#'); - day_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, +1); - }); - - // cancel bar - const cancel_p = quickElement('p', cal_box); - cancel_p.className = 'calendar-cancel'; - const cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#'); - cancel_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.dismissCalendar(num); - }); - document.addEventListener('keyup', function(event) { - if (event.which === 27) { - // ESC key closes popup - DateTimeShortcuts.dismissCalendar(num); - event.preventDefault(); - } - }); - }, - openCalendar: function(num) { - const cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1 + num); - const cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName + num); - const inp = DateTimeShortcuts.calendarInputs[num]; - - // Determine if the current value in the input has a valid date. - // If so, draw the calendar with that date's year and month. - if (inp.value) { - const format = get_format('DATE_INPUT_FORMATS')[0]; - const selected = inp.value.strptime(format); - const year = selected.getUTCFullYear(); - const month = selected.getUTCMonth() + 1; - const re = /\d{4}/; - if (re.test(year.toString()) && month >= 1 && month <= 12) { - DateTimeShortcuts.calendars[num].drawDate(month, year, selected); - } - } - - // Recalculate the clockbox position - // is it left-to-right or right-to-left layout ? - if (window.getComputedStyle(document.body).direction !== 'rtl') { - cal_box.style.left = findPosX(cal_link) + 17 + 'px'; - } - else { - // since style's width is in em, it'd be tough to calculate - // px value of it. let's use an estimated px for now - cal_box.style.left = findPosX(cal_link) - 180 + 'px'; - } - cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px'; - - cal_box.style.display = 'block'; - document.addEventListener('click', DateTimeShortcuts.dismissCalendarFunc[num]); - }, - dismissCalendar: function(num) { - document.getElementById(DateTimeShortcuts.calendarDivName1 + num).style.display = 'none'; - document.removeEventListener('click', DateTimeShortcuts.dismissCalendarFunc[num]); - }, - drawPrev: function(num) { - DateTimeShortcuts.calendars[num].drawPreviousMonth(); - }, - drawNext: function(num) { - DateTimeShortcuts.calendars[num].drawNextMonth(); - }, - handleCalendarCallback: function(num) { - const format = get_format('DATE_INPUT_FORMATS')[0]; - return function(y, m, d) { - DateTimeShortcuts.calendarInputs[num].value = new Date(y, m - 1, d).strftime(format); - DateTimeShortcuts.calendarInputs[num].focus(); - document.getElementById(DateTimeShortcuts.calendarDivName1 + num).style.display = 'none'; - }; - }, - handleCalendarQuickLink: function(num, offset) { - const d = DateTimeShortcuts.now(); - d.setDate(d.getDate() + offset); - DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]); - DateTimeShortcuts.calendarInputs[num].focus(); - DateTimeShortcuts.dismissCalendar(num); - } - }; - - window.addEventListener('load', DateTimeShortcuts.init); - window.DateTimeShortcuts = DateTimeShortcuts; -} diff --git a/django/staticfiles/admin/js/admin/RelatedObjectLookups.js b/django/staticfiles/admin/js/admin/RelatedObjectLookups.js deleted file mode 100644 index 1b96a2ea..00000000 --- a/django/staticfiles/admin/js/admin/RelatedObjectLookups.js +++ /dev/null @@ -1,295 +0,0 @@ -/*global SelectBox, interpolate*/ -// Handles related-objects functionality: lookup link for raw_id_fields -// and Add Another links. -"use strict"; -{ - const $ = django.jQuery; - let popupIndex = 0; - const relatedWindows = []; - - function dismissChildPopups() { - relatedWindows.forEach(function (win) { - if (!win.closed) { - win.dismissChildPopups(); - win.close(); - } - }); - } - - function setPopupIndex() { - if (document.getElementsByName("_popup").length > 0) { - const index = window.name.lastIndexOf("__") + 2; - popupIndex = parseInt(window.name.substring(index)); - } else { - popupIndex = 0; - } - } - - function addPopupIndex(name) { - return name + "__" + (popupIndex + 1); - } - - function removePopupIndex(name) { - return name.replace(new RegExp("__" + (popupIndex + 1) + "$"), ""); - } - - function showAdminPopup(triggeringLink, name_regexp, add_popup) { - const name = addPopupIndex(triggeringLink.id.replace(name_regexp, "")); - const href = new URL(triggeringLink.href); - if (add_popup) { - href.searchParams.set("_popup", 1); - } - const win = window.open( - href, - name, - "height=768,width=1024,resizable=yes,scrollbars=yes" - ); - relatedWindows.push(win); - win.focus(); - return false; - } - - function showRelatedObjectLookupPopup(triggeringLink) { - return showAdminPopup(triggeringLink, /^lookup_/, true); - } - - function dismissRelatedLookupPopup(win, chosenId) { - const name = removePopupIndex(win.name); - const elem = document.getElementById(name); - if (elem.classList.contains("vManyToManyRawIdAdminField") && elem.value) { - elem.value += "," + chosenId; - } else { - document.getElementById(name).value = chosenId; - } - const index = relatedWindows.indexOf(win); - if (index > -1) { - relatedWindows.splice(index, 1); - } - win.close(); - } - - function showRelatedObjectPopup(triggeringLink) { - return showAdminPopup(triggeringLink, /^(change|add|delete)_/, false); - } - - function updateRelatedObjectLinks(triggeringLink) { - const $this = $(triggeringLink); - const siblings = $this.nextAll( - ".view-related, .change-related, .delete-related" - ); - if (!siblings.length) { - return; - } - const value = $this.val(); - if (value) { - siblings.each(function () { - const elm = $(this); - elm.attr( - "href", - elm.attr("data-href-template").replace("__fk__", value) - ); - elm.removeAttr("aria-disabled"); - }); - } else { - siblings.removeAttr("href"); - siblings.attr("aria-disabled", true); - } - } - - function updateRelatedSelectsOptions( - currentSelect, - win, - objId, - newRepr, - newId, - skipIds = [] - ) { - // After create/edit a model from the options next to the current - // select (+ or :pencil:) update ForeignKey PK of the rest of selects - // in the page. - - const path = win.location.pathname; - // Extract the model from the popup url '...//add/' or - // '...///change/' depending the action (add or change). - const modelName = path.split("/")[path.split("/").length - (objId ? 4 : 3)]; - // Select elements with a specific model reference and context of "available-source". - const selectsRelated = document.querySelectorAll( - `[data-model-ref="${modelName}"] [data-context="available-source"]` - ); - - selectsRelated.forEach(function (select) { - if ( - currentSelect === select || - (skipIds && skipIds.includes(select.id)) - ) { - return; - } - - let option = select.querySelector(`option[value="${objId}"]`); - - if (!option) { - option = new Option(newRepr, newId); - select.options.add(option); - // Update SelectBox cache for related fields. - if ( - window.SelectBox !== undefined && - !SelectBox.cache[currentSelect.id] - ) { - SelectBox.add_to_cache(select.id, option); - SelectBox.redisplay(select.id); - } - return; - } - - option.textContent = newRepr; - option.value = newId; - }); - } - - function dismissAddRelatedObjectPopup(win, newId, newRepr) { - const name = removePopupIndex(win.name); - const elem = document.getElementById(name); - if (elem) { - const elemName = elem.nodeName.toUpperCase(); - if (elemName === "SELECT") { - elem.options[elem.options.length] = new Option( - newRepr, - newId, - true, - true - ); - updateRelatedSelectsOptions(elem, win, null, newRepr, newId); - } else if (elemName === "INPUT") { - if ( - elem.classList.contains("vManyToManyRawIdAdminField") && - elem.value - ) { - elem.value += "," + newId; - } else { - elem.value = newId; - } - } - // Trigger a change event to update related links if required. - $(elem).trigger("change"); - } else { - const toId = name + "_to"; - const toElem = document.getElementById(toId); - const o = new Option(newRepr, newId); - SelectBox.add_to_cache(toId, o); - SelectBox.redisplay(toId); - if (toElem && toElem.nodeName.toUpperCase() === "SELECT") { - const skipIds = [name + "_from"]; - updateRelatedSelectsOptions(toElem, win, null, newRepr, newId, skipIds); - } - } - const index = relatedWindows.indexOf(win); - if (index > -1) { - relatedWindows.splice(index, 1); - } - win.close(); - } - - function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) { - const id = removePopupIndex(win.name.replace(/^edit_/, "")); - const selectsSelector = interpolate("#%s, #%s_from, #%s_to", [id, id, id]); - const selects = $(selectsSelector); - selects - .find("option") - .each(function () { - if (this.value === objId) { - this.textContent = newRepr; - this.value = newId; - } - }) - .trigger("change"); - updateRelatedSelectsOptions(selects[0], win, objId, newRepr, newId); - selects - .next() - .find(".select2-selection__rendered") - .each(function () { - // The element can have a clear button as a child. - // Use the lastChild to modify only the displayed value. - this.lastChild.textContent = newRepr; - this.title = newRepr; - }); - const index = relatedWindows.indexOf(win); - if (index > -1) { - relatedWindows.splice(index, 1); - } - win.close(); - } - - function dismissDeleteRelatedObjectPopup(win, objId) { - const id = removePopupIndex(win.name.replace(/^delete_/, "")); - const selectsSelector = interpolate("#%s, #%s_from, #%s_to", [id, id, id]); - const selects = $(selectsSelector); - selects - .find("option") - .each(function () { - if (this.value === objId) { - $(this).remove(); - } - }) - .trigger("change"); - const index = relatedWindows.indexOf(win); - if (index > -1) { - relatedWindows.splice(index, 1); - } - win.close(); - } - - window.showRelatedObjectLookupPopup = showRelatedObjectLookupPopup; - window.dismissRelatedLookupPopup = dismissRelatedLookupPopup; - window.showRelatedObjectPopup = showRelatedObjectPopup; - window.updateRelatedObjectLinks = updateRelatedObjectLinks; - window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup; - window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup; - window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup; - window.dismissChildPopups = dismissChildPopups; - - // Kept for backward compatibility - window.showAddAnotherPopup = showRelatedObjectPopup; - window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup; - - window.addEventListener("unload", function (evt) { - window.dismissChildPopups(); - }); - - $(document).ready(function () { - setPopupIndex(); - $("a[data-popup-opener]").on("click", function (event) { - event.preventDefault(); - opener.dismissRelatedLookupPopup(window, $(this).data("popup-opener")); - }); - $("body").on( - "click", - '.related-widget-wrapper-link[data-popup="yes"]', - function (e) { - e.preventDefault(); - if (this.href) { - const event = $.Event("django:show-related", { href: this.href }); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectPopup(this); - } - } - } - ); - $("body").on("change", ".related-widget-wrapper select", function (e) { - const event = $.Event("django:update-related"); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - updateRelatedObjectLinks(this); - } - }); - $(".related-widget-wrapper select").trigger("change"); - $("body").on("click", ".related-lookup", function (e) { - e.preventDefault(); - const event = $.Event("django:lookup-related"); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectLookupPopup(this); - } - }); - }); -} diff --git a/django/staticfiles/admin/js/autocomplete.js b/django/staticfiles/admin/js/autocomplete.js deleted file mode 100644 index d3daeab8..00000000 --- a/django/staticfiles/admin/js/autocomplete.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; -{ - const $ = django.jQuery; - - $.fn.djangoAdminSelect2 = function() { - $.each(this, function(i, element) { - $(element).select2({ - ajax: { - data: (params) => { - return { - term: params.term, - page: params.page, - app_label: element.dataset.appLabel, - model_name: element.dataset.modelName, - field_name: element.dataset.fieldName - }; - } - } - }); - }); - return this; - }; - - $(function() { - // Initialize all autocomplete widgets except the one in the template - // form used when a new formset is added. - $('.admin-autocomplete').not('[name*=__prefix__]').djangoAdminSelect2(); - }); - - document.addEventListener('formset:added', (event) => { - $(event.target).find('.admin-autocomplete').djangoAdminSelect2(); - }); -} diff --git a/django/staticfiles/admin/js/calendar.js b/django/staticfiles/admin/js/calendar.js deleted file mode 100644 index a62d10a7..00000000 --- a/django/staticfiles/admin/js/calendar.js +++ /dev/null @@ -1,221 +0,0 @@ -/*global gettext, pgettext, get_format, quickElement, removeChildren*/ -/* -calendar.js - Calendar functions by Adrian Holovaty -depends on core.js for utility functions like removeChildren or quickElement -*/ -'use strict'; -{ - // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions - const CalendarNamespace = { - monthsOfYear: [ - gettext('January'), - gettext('February'), - gettext('March'), - gettext('April'), - gettext('May'), - gettext('June'), - gettext('July'), - gettext('August'), - gettext('September'), - gettext('October'), - gettext('November'), - gettext('December') - ], - monthsOfYearAbbrev: [ - pgettext('abbrev. month January', 'Jan'), - pgettext('abbrev. month February', 'Feb'), - pgettext('abbrev. month March', 'Mar'), - pgettext('abbrev. month April', 'Apr'), - pgettext('abbrev. month May', 'May'), - pgettext('abbrev. month June', 'Jun'), - pgettext('abbrev. month July', 'Jul'), - pgettext('abbrev. month August', 'Aug'), - pgettext('abbrev. month September', 'Sep'), - pgettext('abbrev. month October', 'Oct'), - pgettext('abbrev. month November', 'Nov'), - pgettext('abbrev. month December', 'Dec') - ], - daysOfWeek: [ - pgettext('one letter Sunday', 'S'), - pgettext('one letter Monday', 'M'), - pgettext('one letter Tuesday', 'T'), - pgettext('one letter Wednesday', 'W'), - pgettext('one letter Thursday', 'T'), - pgettext('one letter Friday', 'F'), - pgettext('one letter Saturday', 'S') - ], - firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')), - isLeapYear: function(year) { - return (((year % 4) === 0) && ((year % 100) !== 0 ) || ((year % 400) === 0)); - }, - getDaysInMonth: function(month, year) { - let days; - if (month === 1 || month === 3 || month === 5 || month === 7 || month === 8 || month === 10 || month === 12) { - days = 31; - } - else if (month === 4 || month === 6 || month === 9 || month === 11) { - days = 30; - } - else if (month === 2 && CalendarNamespace.isLeapYear(year)) { - days = 29; - } - else { - days = 28; - } - return days; - }, - draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999 - const today = new Date(); - const todayDay = today.getDate(); - const todayMonth = today.getMonth() + 1; - const todayYear = today.getFullYear(); - let todayClass = ''; - - // Use UTC functions here because the date field does not contain time - // and using the UTC function variants prevent the local time offset - // from altering the date, specifically the day field. For example: - // - // ``` - // var x = new Date('2013-10-02'); - // var day = x.getDate(); - // ``` - // - // The day variable above will be 1 instead of 2 in, say, US Pacific time - // zone. - let isSelectedMonth = false; - if (typeof selected !== 'undefined') { - isSelectedMonth = (selected.getUTCFullYear() === year && (selected.getUTCMonth() + 1) === month); - } - - month = parseInt(month); - year = parseInt(year); - const calDiv = document.getElementById(div_id); - removeChildren(calDiv); - const calTable = document.createElement('table'); - quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month - 1] + ' ' + year); - const tableBody = quickElement('tbody', calTable); - - // Draw days-of-week header - let tableRow = quickElement('tr', tableBody); - for (let i = 0; i < 7; i++) { - quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]); - } - - const startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay(); - const days = CalendarNamespace.getDaysInMonth(month, year); - - let nonDayCell; - - // Draw blanks before first of month - tableRow = quickElement('tr', tableBody); - for (let i = 0; i < startingPos; i++) { - nonDayCell = quickElement('td', tableRow, ' '); - nonDayCell.className = "nonday"; - } - - function calendarMonth(y, m) { - function onClick(e) { - e.preventDefault(); - callback(y, m, this.textContent); - } - return onClick; - } - - // Draw days of month - let currentDay = 1; - for (let i = startingPos; currentDay <= days; i++) { - if (i % 7 === 0 && currentDay !== 1) { - tableRow = quickElement('tr', tableBody); - } - if ((currentDay === todayDay) && (month === todayMonth) && (year === todayYear)) { - todayClass = 'today'; - } else { - todayClass = ''; - } - - // use UTC function; see above for explanation. - if (isSelectedMonth && currentDay === selected.getUTCDate()) { - if (todayClass !== '') { - todayClass += " "; - } - todayClass += "selected"; - } - - const cell = quickElement('td', tableRow, '', 'class', todayClass); - const link = quickElement('a', cell, currentDay, 'href', '#'); - link.addEventListener('click', calendarMonth(year, month)); - currentDay++; - } - - // Draw blanks after end of month (optional, but makes for valid code) - while (tableRow.childNodes.length < 7) { - nonDayCell = quickElement('td', tableRow, ' '); - nonDayCell.className = "nonday"; - } - - calDiv.appendChild(calTable); - } - }; - - // Calendar -- A calendar instance - function Calendar(div_id, callback, selected) { - // div_id (string) is the ID of the element in which the calendar will - // be displayed - // callback (string) is the name of a JavaScript function that will be - // called with the parameters (year, month, day) when a day in the - // calendar is clicked - this.div_id = div_id; - this.callback = callback; - this.today = new Date(); - this.currentMonth = this.today.getMonth() + 1; - this.currentYear = this.today.getFullYear(); - if (typeof selected !== 'undefined') { - this.selected = selected; - } - } - Calendar.prototype = { - drawCurrent: function() { - CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback, this.selected); - }, - drawDate: function(month, year, selected) { - this.currentMonth = month; - this.currentYear = year; - - if(selected) { - this.selected = selected; - } - - this.drawCurrent(); - }, - drawPreviousMonth: function() { - if (this.currentMonth === 1) { - this.currentMonth = 12; - this.currentYear--; - } - else { - this.currentMonth--; - } - this.drawCurrent(); - }, - drawNextMonth: function() { - if (this.currentMonth === 12) { - this.currentMonth = 1; - this.currentYear++; - } - else { - this.currentMonth++; - } - this.drawCurrent(); - }, - drawPreviousYear: function() { - this.currentYear--; - this.drawCurrent(); - }, - drawNextYear: function() { - this.currentYear++; - this.drawCurrent(); - } - }; - window.Calendar = Calendar; - window.CalendarNamespace = CalendarNamespace; -} diff --git a/django/staticfiles/admin/js/cancel.js b/django/staticfiles/admin/js/cancel.js deleted file mode 100644 index 3069c6f2..00000000 --- a/django/staticfiles/admin/js/cancel.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; -{ - // Call function fn when the DOM is loaded and ready. If it is already - // loaded, call the function now. - // http://youmightnotneedjquery.com/#ready - function ready(fn) { - if (document.readyState !== 'loading') { - fn(); - } else { - document.addEventListener('DOMContentLoaded', fn); - } - } - - ready(function() { - function handleClick(event) { - event.preventDefault(); - const params = new URLSearchParams(window.location.search); - if (params.has('_popup')) { - window.close(); // Close the popup. - } else { - window.history.back(); // Otherwise, go back. - } - } - - document.querySelectorAll('.cancel-link').forEach(function(el) { - el.addEventListener('click', handleClick); - }); - }); -} diff --git a/django/staticfiles/admin/js/change_form.js b/django/staticfiles/admin/js/change_form.js deleted file mode 100644 index 96a4c62e..00000000 --- a/django/staticfiles/admin/js/change_form.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; -{ - const inputTags = ['BUTTON', 'INPUT', 'SELECT', 'TEXTAREA']; - const modelName = document.getElementById('django-admin-form-add-constants').dataset.modelName; - if (modelName) { - const form = document.getElementById(modelName + '_form'); - for (const element of form.elements) { - // HTMLElement.offsetParent returns null when the element is not - // rendered. - if (inputTags.includes(element.tagName) && !element.disabled && element.offsetParent) { - element.focus(); - break; - } - } - } -} diff --git a/django/staticfiles/admin/js/collapse.js b/django/staticfiles/admin/js/collapse.js deleted file mode 100644 index c6c7b0f6..00000000 --- a/django/staticfiles/admin/js/collapse.js +++ /dev/null @@ -1,43 +0,0 @@ -/*global gettext*/ -'use strict'; -{ - window.addEventListener('load', function() { - // Add anchor tag for Show/Hide link - const fieldsets = document.querySelectorAll('fieldset.collapse'); - for (const [i, elem] of fieldsets.entries()) { - // Don't hide if fields in this fieldset have errors - if (elem.querySelectorAll('div.errors, ul.errorlist').length === 0) { - elem.classList.add('collapsed'); - const h2 = elem.querySelector('h2'); - const link = document.createElement('a'); - link.id = 'fieldsetcollapser' + i; - link.className = 'collapse-toggle'; - link.href = '#'; - link.textContent = gettext('Show'); - h2.appendChild(document.createTextNode(' (')); - h2.appendChild(link); - h2.appendChild(document.createTextNode(')')); - } - } - // Add toggle to hide/show anchor tag - const toggleFunc = function(ev) { - if (ev.target.matches('.collapse-toggle')) { - ev.preventDefault(); - ev.stopPropagation(); - const fieldset = ev.target.closest('fieldset'); - if (fieldset.classList.contains('collapsed')) { - // Show - ev.target.textContent = gettext('Hide'); - fieldset.classList.remove('collapsed'); - } else { - // Hide - ev.target.textContent = gettext('Show'); - fieldset.classList.add('collapsed'); - } - } - }; - document.querySelectorAll('fieldset.module').forEach(function(el) { - el.addEventListener('click', toggleFunc); - }); - }); -} diff --git a/django/staticfiles/admin/js/core.js b/django/staticfiles/admin/js/core.js deleted file mode 100644 index 0344a13f..00000000 --- a/django/staticfiles/admin/js/core.js +++ /dev/null @@ -1,170 +0,0 @@ -// Core JavaScript helper functions -'use strict'; - -// quickElement(tagType, parentReference [, textInChildNode, attribute, attributeValue ...]); -function quickElement() { - const obj = document.createElement(arguments[0]); - if (arguments[2]) { - const textNode = document.createTextNode(arguments[2]); - obj.appendChild(textNode); - } - const len = arguments.length; - for (let i = 3; i < len; i += 2) { - obj.setAttribute(arguments[i], arguments[i + 1]); - } - arguments[1].appendChild(obj); - return obj; -} - -// "a" is reference to an object -function removeChildren(a) { - while (a.hasChildNodes()) { - a.removeChild(a.lastChild); - } -} - -// ---------------------------------------------------------------------------- -// Find-position functions by PPK -// See https://www.quirksmode.org/js/findpos.html -// ---------------------------------------------------------------------------- -function findPosX(obj) { - let curleft = 0; - if (obj.offsetParent) { - while (obj.offsetParent) { - curleft += obj.offsetLeft - obj.scrollLeft; - obj = obj.offsetParent; - } - } else if (obj.x) { - curleft += obj.x; - } - return curleft; -} - -function findPosY(obj) { - let curtop = 0; - if (obj.offsetParent) { - while (obj.offsetParent) { - curtop += obj.offsetTop - obj.scrollTop; - obj = obj.offsetParent; - } - } else if (obj.y) { - curtop += obj.y; - } - return curtop; -} - -//----------------------------------------------------------------------------- -// Date object extensions -// ---------------------------------------------------------------------------- -{ - Date.prototype.getTwelveHours = function() { - return this.getHours() % 12 || 12; - }; - - Date.prototype.getTwoDigitMonth = function() { - return (this.getMonth() < 9) ? '0' + (this.getMonth() + 1) : (this.getMonth() + 1); - }; - - Date.prototype.getTwoDigitDate = function() { - return (this.getDate() < 10) ? '0' + this.getDate() : this.getDate(); - }; - - Date.prototype.getTwoDigitTwelveHour = function() { - return (this.getTwelveHours() < 10) ? '0' + this.getTwelveHours() : this.getTwelveHours(); - }; - - Date.prototype.getTwoDigitHour = function() { - return (this.getHours() < 10) ? '0' + this.getHours() : this.getHours(); - }; - - Date.prototype.getTwoDigitMinute = function() { - return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes(); - }; - - Date.prototype.getTwoDigitSecond = function() { - return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds(); - }; - - Date.prototype.getAbbrevMonthName = function() { - return typeof window.CalendarNamespace === "undefined" - ? this.getTwoDigitMonth() - : window.CalendarNamespace.monthsOfYearAbbrev[this.getMonth()]; - }; - - Date.prototype.getFullMonthName = function() { - return typeof window.CalendarNamespace === "undefined" - ? this.getTwoDigitMonth() - : window.CalendarNamespace.monthsOfYear[this.getMonth()]; - }; - - Date.prototype.strftime = function(format) { - const fields = { - b: this.getAbbrevMonthName(), - B: this.getFullMonthName(), - c: this.toString(), - d: this.getTwoDigitDate(), - H: this.getTwoDigitHour(), - I: this.getTwoDigitTwelveHour(), - m: this.getTwoDigitMonth(), - M: this.getTwoDigitMinute(), - p: (this.getHours() >= 12) ? 'PM' : 'AM', - S: this.getTwoDigitSecond(), - w: '0' + this.getDay(), - x: this.toLocaleDateString(), - X: this.toLocaleTimeString(), - y: ('' + this.getFullYear()).substr(2, 4), - Y: '' + this.getFullYear(), - '%': '%' - }; - let result = '', i = 0; - while (i < format.length) { - if (format.charAt(i) === '%') { - result += fields[format.charAt(i + 1)]; - ++i; - } - else { - result += format.charAt(i); - } - ++i; - } - return result; - }; - - // ---------------------------------------------------------------------------- - // String object extensions - // ---------------------------------------------------------------------------- - String.prototype.strptime = function(format) { - const split_format = format.split(/[.\-/]/); - const date = this.split(/[.\-/]/); - let i = 0; - let day, month, year; - while (i < split_format.length) { - switch (split_format[i]) { - case "%d": - day = date[i]; - break; - case "%m": - month = date[i] - 1; - break; - case "%Y": - year = date[i]; - break; - case "%y": - // A %y value in the range of [00, 68] is in the current - // century, while [69, 99] is in the previous century, - // according to the Open Group Specification. - if (parseInt(date[i], 10) >= 69) { - year = date[i]; - } else { - year = (new Date(Date.UTC(date[i], 0))).getUTCFullYear() + 100; - } - break; - } - ++i; - } - // Create Date object from UTC since the parsed value is supposed to be - // in UTC, not local time. Also, the calendar uses UTC functions for - // date extraction. - return new Date(Date.UTC(year, month, day)); - }; -} diff --git a/django/staticfiles/admin/js/filters.js b/django/staticfiles/admin/js/filters.js deleted file mode 100644 index f5536ebc..00000000 --- a/django/staticfiles/admin/js/filters.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Persist changelist filters state (collapsed/expanded). - */ -'use strict'; -{ - // Init filters. - let filters = JSON.parse(sessionStorage.getItem('django.admin.filtersState')); - - if (!filters) { - filters = {}; - } - - Object.entries(filters).forEach(([key, value]) => { - const detailElement = document.querySelector(`[data-filter-title='${CSS.escape(key)}']`); - - // Check if the filter is present, it could be from other view. - if (detailElement) { - value ? detailElement.setAttribute('open', '') : detailElement.removeAttribute('open'); - } - }); - - // Save filter state when clicks. - const details = document.querySelectorAll('details'); - details.forEach(detail => { - detail.addEventListener('toggle', event => { - filters[`${event.target.dataset.filterTitle}`] = detail.open; - sessionStorage.setItem('django.admin.filtersState', JSON.stringify(filters)); - }); - }); -} diff --git a/django/staticfiles/admin/js/inlines.js b/django/staticfiles/admin/js/inlines.js deleted file mode 100644 index e9a1dfe1..00000000 --- a/django/staticfiles/admin/js/inlines.js +++ /dev/null @@ -1,359 +0,0 @@ -/*global DateTimeShortcuts, SelectFilter*/ -/** - * Django admin inlines - * - * Based on jQuery Formset 1.1 - * @author Stanislaus Madueke (stan DOT madueke AT gmail DOT com) - * @requires jQuery 1.2.6 or later - * - * Copyright (c) 2009, Stanislaus Madueke - * All rights reserved. - * - * Spiced up with Code from Zain Memon's GSoC project 2009 - * and modified for Django by Jannis Leidel, Travis Swicegood and Julien Phalip. - * - * Licensed under the New BSD License - * See: https://opensource.org/licenses/bsd-license.php - */ -'use strict'; -{ - const $ = django.jQuery; - $.fn.formset = function(opts) { - const options = $.extend({}, $.fn.formset.defaults, opts); - const $this = $(this); - const $parent = $this.parent(); - const updateElementIndex = function(el, prefix, ndx) { - const id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))"); - const replacement = prefix + "-" + ndx; - if ($(el).prop("for")) { - $(el).prop("for", $(el).prop("for").replace(id_regex, replacement)); - } - if (el.id) { - el.id = el.id.replace(id_regex, replacement); - } - if (el.name) { - el.name = el.name.replace(id_regex, replacement); - } - }; - const totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off"); - let nextIndex = parseInt(totalForms.val(), 10); - const maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off"); - const minForms = $("#id_" + options.prefix + "-MIN_NUM_FORMS").prop("autocomplete", "off"); - let addButton; - - /** - * The "Add another MyModel" button below the inline forms. - */ - const addInlineAddButton = function() { - if (addButton === null) { - if ($this.prop("tagName") === "TR") { - // If forms are laid out as table rows, insert the - // "add" button in a new table row: - const numCols = $this.eq(-1).children().length; - $parent.append('' + options.addText + ""); - addButton = $parent.find("tr:last a"); - } else { - // Otherwise, insert it immediately after the last form: - $this.filter(":last").after('
    ' + options.addText + "
    "); - addButton = $this.filter(":last").next().find("a"); - } - } - addButton.on('click', addInlineClickHandler); - }; - - const addInlineClickHandler = function(e) { - e.preventDefault(); - const template = $("#" + options.prefix + "-empty"); - const row = template.clone(true); - row.removeClass(options.emptyCssClass) - .addClass(options.formCssClass) - .attr("id", options.prefix + "-" + nextIndex); - addInlineDeleteButton(row); - row.find("*").each(function() { - updateElementIndex(this, options.prefix, totalForms.val()); - }); - // Insert the new form when it has been fully edited. - row.insertBefore($(template)); - // Update number of total forms. - $(totalForms).val(parseInt(totalForms.val(), 10) + 1); - nextIndex += 1; - // Hide the add button if there's a limit and it's been reached. - if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) { - addButton.parent().hide(); - } - // Show the remove buttons if there are more than min_num. - toggleDeleteButtonVisibility(row.closest('.inline-group')); - - // Pass the new form to the post-add callback, if provided. - if (options.added) { - options.added(row); - } - row.get(0).dispatchEvent(new CustomEvent("formset:added", { - bubbles: true, - detail: { - formsetName: options.prefix - } - })); - }; - - /** - * The "X" button that is part of every unsaved inline. - * (When saved, it is replaced with a "Delete" checkbox.) - */ - const addInlineDeleteButton = function(row) { - if (row.is("tr")) { - // If the forms are laid out in table rows, insert - // the remove button into the last table cell: - row.children(":last").append('"); - } else if (row.is("ul") || row.is("ol")) { - // If they're laid out as an ordered/unordered list, - // insert an
  • after the last list item: - row.append('
  • ' + options.deleteText + "
    • "); - } else { - // Otherwise, just insert the remove button as the - // last child element of the form's container: - row.children(":first").append('' + options.deleteText + ""); - } - // Add delete handler for each row. - row.find("a." + options.deleteCssClass).on('click', inlineDeleteHandler.bind(this)); - }; - - const inlineDeleteHandler = function(e1) { - e1.preventDefault(); - const deleteButton = $(e1.target); - const row = deleteButton.closest('.' + options.formCssClass); - const inlineGroup = row.closest('.inline-group'); - // Remove the parent form containing this button, - // and also remove the relevant row with non-field errors: - const prevRow = row.prev(); - if (prevRow.length && prevRow.hasClass('row-form-errors')) { - prevRow.remove(); - } - row.remove(); - nextIndex -= 1; - // Pass the deleted form to the post-delete callback, if provided. - if (options.removed) { - options.removed(row); - } - document.dispatchEvent(new CustomEvent("formset:removed", { - detail: { - formsetName: options.prefix - } - })); - // Update the TOTAL_FORMS form count. - const forms = $("." + options.formCssClass); - $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length); - // Show add button again once below maximum number. - if ((maxForms.val() === '') || (maxForms.val() - forms.length) > 0) { - addButton.parent().show(); - } - // Hide the remove buttons if at min_num. - toggleDeleteButtonVisibility(inlineGroup); - // Also, update names and ids for all remaining form controls so - // they remain in sequence: - let i, formCount; - const updateElementCallback = function() { - updateElementIndex(this, options.prefix, i); - }; - for (i = 0, formCount = forms.length; i < formCount; i++) { - updateElementIndex($(forms).get(i), options.prefix, i); - $(forms.get(i)).find("*").each(updateElementCallback); - } - }; - - const toggleDeleteButtonVisibility = function(inlineGroup) { - if ((minForms.val() !== '') && (minForms.val() - totalForms.val()) >= 0) { - inlineGroup.find('.inline-deletelink').hide(); - } else { - inlineGroup.find('.inline-deletelink').show(); - } - }; - - $this.each(function(i) { - $(this).not("." + options.emptyCssClass).addClass(options.formCssClass); - }); - - // Create the delete buttons for all unsaved inlines: - $this.filter('.' + options.formCssClass + ':not(.has_original):not(.' + options.emptyCssClass + ')').each(function() { - addInlineDeleteButton($(this)); - }); - toggleDeleteButtonVisibility($this); - - // Create the add button, initially hidden. - addButton = options.addButton; - addInlineAddButton(); - - // Show the add button if allowed to add more items. - // Note that max_num = None translates to a blank string. - const showAddButton = maxForms.val() === '' || (maxForms.val() - totalForms.val()) > 0; - if ($this.length && showAddButton) { - addButton.parent().show(); - } else { - addButton.parent().hide(); - } - - return this; - }; - - /* Setup plugin defaults */ - $.fn.formset.defaults = { - prefix: "form", // The form prefix for your django formset - addText: "add another", // Text for the add link - deleteText: "remove", // Text for the delete link - addCssClass: "add-row", // CSS class applied to the add link - deleteCssClass: "delete-row", // CSS class applied to the delete link - emptyCssClass: "empty-row", // CSS class applied to the empty row - formCssClass: "dynamic-form", // CSS class applied to each form in a formset - added: null, // Function called each time a new form is added - removed: null, // Function called each time a form is deleted - addButton: null // Existing add button to use - }; - - - // Tabular inlines --------------------------------------------------------- - $.fn.tabularFormset = function(selector, options) { - const $rows = $(this); - - const reinitDateTimeShortCuts = function() { - // Reinitialize the calendar and clock widgets by force - if (typeof DateTimeShortcuts !== "undefined") { - $(".datetimeshortcuts").remove(); - DateTimeShortcuts.init(); - } - }; - - const updateSelectFilter = function() { - // If any SelectFilter widgets are a part of the new form, - // instantiate a new SelectFilter instance for it. - if (typeof SelectFilter !== 'undefined') { - $('.selectfilter').each(function(index, value) { - SelectFilter.init(value.id, this.dataset.fieldName, false); - }); - $('.selectfilterstacked').each(function(index, value) { - SelectFilter.init(value.id, this.dataset.fieldName, true); - }); - } - }; - - const initPrepopulatedFields = function(row) { - row.find('.prepopulated_field').each(function() { - const field = $(this), - input = field.find('input, select, textarea'), - dependency_list = input.data('dependency_list') || [], - dependencies = []; - $.each(dependency_list, function(i, field_name) { - dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id')); - }); - if (dependencies.length) { - input.prepopulate(dependencies, input.attr('maxlength')); - } - }); - }; - - $rows.formset({ - prefix: options.prefix, - addText: options.addText, - formCssClass: "dynamic-" + options.prefix, - deleteCssClass: "inline-deletelink", - deleteText: options.deleteText, - emptyCssClass: "empty-form", - added: function(row) { - initPrepopulatedFields(row); - reinitDateTimeShortCuts(); - updateSelectFilter(); - }, - addButton: options.addButton - }); - - return $rows; - }; - - // Stacked inlines --------------------------------------------------------- - $.fn.stackedFormset = function(selector, options) { - const $rows = $(this); - const updateInlineLabel = function(row) { - $(selector).find(".inline_label").each(function(i) { - const count = i + 1; - $(this).html($(this).html().replace(/(#\d+)/g, "#" + count)); - }); - }; - - const reinitDateTimeShortCuts = function() { - // Reinitialize the calendar and clock widgets by force, yuck. - if (typeof DateTimeShortcuts !== "undefined") { - $(".datetimeshortcuts").remove(); - DateTimeShortcuts.init(); - } - }; - - const updateSelectFilter = function() { - // If any SelectFilter widgets were added, instantiate a new instance. - if (typeof SelectFilter !== "undefined") { - $(".selectfilter").each(function(index, value) { - SelectFilter.init(value.id, this.dataset.fieldName, false); - }); - $(".selectfilterstacked").each(function(index, value) { - SelectFilter.init(value.id, this.dataset.fieldName, true); - }); - } - }; - - const initPrepopulatedFields = function(row) { - row.find('.prepopulated_field').each(function() { - const field = $(this), - input = field.find('input, select, textarea'), - dependency_list = input.data('dependency_list') || [], - dependencies = []; - $.each(dependency_list, function(i, field_name) { - // Dependency in a fieldset. - let field_element = row.find('.form-row .field-' + field_name); - // Dependency without a fieldset. - if (!field_element.length) { - field_element = row.find('.form-row.field-' + field_name); - } - dependencies.push('#' + field_element.find('input, select, textarea').attr('id')); - }); - if (dependencies.length) { - input.prepopulate(dependencies, input.attr('maxlength')); - } - }); - }; - - $rows.formset({ - prefix: options.prefix, - addText: options.addText, - formCssClass: "dynamic-" + options.prefix, - deleteCssClass: "inline-deletelink", - deleteText: options.deleteText, - emptyCssClass: "empty-form", - removed: updateInlineLabel, - added: function(row) { - initPrepopulatedFields(row); - reinitDateTimeShortCuts(); - updateSelectFilter(); - updateInlineLabel(row); - }, - addButton: options.addButton - }); - - return $rows; - }; - - $(document).ready(function() { - $(".js-inline-admin-formset").each(function() { - const data = $(this).data(), - inlineOptions = data.inlineFormset; - let selector; - switch(data.inlineType) { - case "stacked": - selector = inlineOptions.name + "-group .inline-related"; - $(selector).stackedFormset(selector, inlineOptions.options); - break; - case "tabular": - selector = inlineOptions.name + "-group .tabular.inline-related tbody:first > tr.form-row"; - $(selector).tabularFormset(selector, inlineOptions.options); - break; - } - }); - }); -} diff --git a/django/staticfiles/admin/js/jquery.init.js b/django/staticfiles/admin/js/jquery.init.js deleted file mode 100644 index f40b27f4..00000000 --- a/django/staticfiles/admin/js/jquery.init.js +++ /dev/null @@ -1,8 +0,0 @@ -/*global jQuery:false*/ -'use strict'; -/* Puts the included jQuery into our own namespace using noConflict and passing - * it 'true'. This ensures that the included jQuery doesn't pollute the global - * namespace (i.e. this preserves pre-existing values for both window.$ and - * window.jQuery). - */ -window.django = {jQuery: jQuery.noConflict(true)}; diff --git a/django/staticfiles/admin/js/nav_sidebar.js b/django/staticfiles/admin/js/nav_sidebar.js deleted file mode 100644 index 7e735db1..00000000 --- a/django/staticfiles/admin/js/nav_sidebar.js +++ /dev/null @@ -1,79 +0,0 @@ -'use strict'; -{ - const toggleNavSidebar = document.getElementById('toggle-nav-sidebar'); - if (toggleNavSidebar !== null) { - const navSidebar = document.getElementById('nav-sidebar'); - const main = document.getElementById('main'); - let navSidebarIsOpen = localStorage.getItem('django.admin.navSidebarIsOpen'); - if (navSidebarIsOpen === null) { - navSidebarIsOpen = 'true'; - } - main.classList.toggle('shifted', navSidebarIsOpen === 'true'); - navSidebar.setAttribute('aria-expanded', navSidebarIsOpen); - - toggleNavSidebar.addEventListener('click', function() { - if (navSidebarIsOpen === 'true') { - navSidebarIsOpen = 'false'; - } else { - navSidebarIsOpen = 'true'; - } - localStorage.setItem('django.admin.navSidebarIsOpen', navSidebarIsOpen); - main.classList.toggle('shifted'); - navSidebar.setAttribute('aria-expanded', navSidebarIsOpen); - }); - } - - function initSidebarQuickFilter() { - const options = []; - const navSidebar = document.getElementById('nav-sidebar'); - if (!navSidebar) { - return; - } - navSidebar.querySelectorAll('th[scope=row] a').forEach((container) => { - options.push({title: container.innerHTML, node: container}); - }); - - function checkValue(event) { - let filterValue = event.target.value; - if (filterValue) { - filterValue = filterValue.toLowerCase(); - } - if (event.key === 'Escape') { - filterValue = ''; - event.target.value = ''; // clear input - } - let matches = false; - for (const o of options) { - let displayValue = ''; - if (filterValue) { - if (o.title.toLowerCase().indexOf(filterValue) === -1) { - displayValue = 'none'; - } else { - matches = true; - } - } - // show/hide parent - o.node.parentNode.parentNode.style.display = displayValue; - } - if (!filterValue || matches) { - event.target.classList.remove('no-results'); - } else { - event.target.classList.add('no-results'); - } - sessionStorage.setItem('django.admin.navSidebarFilterValue', filterValue); - } - - const nav = document.getElementById('nav-filter'); - nav.addEventListener('change', checkValue, false); - nav.addEventListener('input', checkValue, false); - nav.addEventListener('keyup', checkValue, false); - - const storedValue = sessionStorage.getItem('django.admin.navSidebarFilterValue'); - if (storedValue) { - nav.value = storedValue; - checkValue({target: nav, key: ''}); - } - } - window.initSidebarQuickFilter = initSidebarQuickFilter; - initSidebarQuickFilter(); -} diff --git a/django/staticfiles/admin/js/popup_response.js b/django/staticfiles/admin/js/popup_response.js deleted file mode 100644 index 2b1d3dd3..00000000 --- a/django/staticfiles/admin/js/popup_response.js +++ /dev/null @@ -1,16 +0,0 @@ -/*global opener */ -'use strict'; -{ - const initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse); - switch(initData.action) { - case 'change': - opener.dismissChangeRelatedObjectPopup(window, initData.value, initData.obj, initData.new_value); - break; - case 'delete': - opener.dismissDeleteRelatedObjectPopup(window, initData.value); - break; - default: - opener.dismissAddRelatedObjectPopup(window, initData.value, initData.obj); - break; - } -} diff --git a/django/staticfiles/admin/js/prepopulate.js b/django/staticfiles/admin/js/prepopulate.js deleted file mode 100644 index 89e95ab4..00000000 --- a/django/staticfiles/admin/js/prepopulate.js +++ /dev/null @@ -1,43 +0,0 @@ -/*global URLify*/ -'use strict'; -{ - const $ = django.jQuery; - $.fn.prepopulate = function(dependencies, maxLength, allowUnicode) { - /* - Depends on urlify.js - Populates a selected field with the values of the dependent fields, - URLifies and shortens the string. - dependencies - array of dependent fields ids - maxLength - maximum length of the URLify'd string - allowUnicode - Unicode support of the URLify'd string - */ - return this.each(function() { - const prepopulatedField = $(this); - - const populate = function() { - // Bail if the field's value has been changed by the user - if (prepopulatedField.data('_changed')) { - return; - } - - const values = []; - $.each(dependencies, function(i, field) { - field = $(field); - if (field.val().length > 0) { - values.push(field.val()); - } - }); - prepopulatedField.val(URLify(values.join(' '), maxLength, allowUnicode)); - }; - - prepopulatedField.data('_changed', false); - prepopulatedField.on('change', function() { - prepopulatedField.data('_changed', true); - }); - - if (!prepopulatedField.val()) { - $(dependencies.join(',')).on('keyup change focus', populate); - } - }); - }; -} diff --git a/django/staticfiles/admin/js/prepopulate_init.js b/django/staticfiles/admin/js/prepopulate_init.js deleted file mode 100644 index a58841f0..00000000 --- a/django/staticfiles/admin/js/prepopulate_init.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; -{ - const $ = django.jQuery; - const fields = $('#django-admin-prepopulated-fields-constants').data('prepopulatedFields'); - $.each(fields, function(index, field) { - $( - '.empty-form .form-row .field-' + field.name + - ', .empty-form.form-row .field-' + field.name + - ', .empty-form .form-row.field-' + field.name - ).addClass('prepopulated_field'); - $(field.id).data('dependency_list', field.dependency_list).prepopulate( - field.dependency_ids, field.maxLength, field.allowUnicode - ); - }); -} diff --git a/django/staticfiles/admin/js/theme.js b/django/staticfiles/admin/js/theme.js deleted file mode 100644 index 794cd15f..00000000 --- a/django/staticfiles/admin/js/theme.js +++ /dev/null @@ -1,56 +0,0 @@ -'use strict'; -{ - window.addEventListener('load', function(e) { - - function setTheme(mode) { - if (mode !== "light" && mode !== "dark" && mode !== "auto") { - console.error(`Got invalid theme mode: ${mode}. Resetting to auto.`); - mode = "auto"; - } - document.documentElement.dataset.theme = mode; - localStorage.setItem("theme", mode); - } - - function cycleTheme() { - const currentTheme = localStorage.getItem("theme") || "auto"; - const prefersDark = window.matchMedia("(prefers-color-scheme: dark)").matches; - - if (prefersDark) { - // Auto (dark) -> Light -> Dark - if (currentTheme === "auto") { - setTheme("light"); - } else if (currentTheme === "light") { - setTheme("dark"); - } else { - setTheme("auto"); - } - } else { - // Auto (light) -> Dark -> Light - if (currentTheme === "auto") { - setTheme("dark"); - } else if (currentTheme === "dark") { - setTheme("light"); - } else { - setTheme("auto"); - } - } - } - - function initTheme() { - // set theme defined in localStorage if there is one, or fallback to auto mode - const currentTheme = localStorage.getItem("theme"); - currentTheme ? setTheme(currentTheme) : setTheme("auto"); - } - - function setupTheme() { - // Attach event handlers for toggling themes - const buttons = document.getElementsByClassName("theme-toggle"); - Array.from(buttons).forEach((btn) => { - btn.addEventListener("click", cycleTheme); - }); - initTheme(); - } - - setupTheme(); - }); -} diff --git a/django/staticfiles/admin/js/urlify.js b/django/staticfiles/admin/js/urlify.js deleted file mode 100644 index 9fc04094..00000000 --- a/django/staticfiles/admin/js/urlify.js +++ /dev/null @@ -1,169 +0,0 @@ -/*global XRegExp*/ -'use strict'; -{ - const LATIN_MAP = { - 'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', - 'Ç': 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', - 'Î': 'I', 'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', - 'Õ': 'O', 'Ö': 'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', - 'Ü': 'U', 'Ű': 'U', 'Ý': 'Y', 'Þ': 'TH', 'Ÿ': 'Y', 'ß': 'ss', 'à': 'a', - 'á': 'a', 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', - 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'í': 'i', 'î': 'i', - 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o', - 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u', - 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y' - }; - const LATIN_SYMBOLS_MAP = { - '©': '(c)' - }; - const GREEK_MAP = { - 'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h', - 'θ': '8', 'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3', - 'ο': 'o', 'π': 'p', 'ρ': 'r', 'σ': 's', 'τ': 't', 'υ': 'y', 'φ': 'f', - 'χ': 'x', 'ψ': 'ps', 'ω': 'w', 'ά': 'a', 'έ': 'e', 'ί': 'i', 'ό': 'o', - 'ύ': 'y', 'ή': 'h', 'ώ': 'w', 'ς': 's', 'ϊ': 'i', 'ΰ': 'y', 'ϋ': 'y', - 'ΐ': 'i', 'Α': 'A', 'Β': 'B', 'Γ': 'G', 'Δ': 'D', 'Ε': 'E', 'Ζ': 'Z', - 'Η': 'H', 'Θ': '8', 'Ι': 'I', 'Κ': 'K', 'Λ': 'L', 'Μ': 'M', 'Ν': 'N', - 'Ξ': '3', 'Ο': 'O', 'Π': 'P', 'Ρ': 'R', 'Σ': 'S', 'Τ': 'T', 'Υ': 'Y', - 'Φ': 'F', 'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W', 'Ά': 'A', 'Έ': 'E', 'Ί': 'I', - 'Ό': 'O', 'Ύ': 'Y', 'Ή': 'H', 'Ώ': 'W', 'Ϊ': 'I', 'Ϋ': 'Y' - }; - const TURKISH_MAP = { - 'ş': 's', 'Ş': 'S', 'ı': 'i', 'İ': 'I', 'ç': 'c', 'Ç': 'C', 'ü': 'u', - 'Ü': 'U', 'ö': 'o', 'Ö': 'O', 'ğ': 'g', 'Ğ': 'G' - }; - const ROMANIAN_MAP = { - 'ă': 'a', 'î': 'i', 'ș': 's', 'ț': 't', 'â': 'a', - 'Ă': 'A', 'Î': 'I', 'Ș': 'S', 'Ț': 'T', 'Â': 'A' - }; - const RUSSIAN_MAP = { - 'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo', - 'ж': 'zh', 'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm', - 'н': 'n', 'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u', - 'ф': 'f', 'х': 'h', 'ц': 'c', 'ч': 'ch', 'ш': 'sh', 'щ': 'sh', 'ъ': '', - 'ы': 'y', 'ь': '', 'э': 'e', 'ю': 'yu', 'я': 'ya', - 'А': 'A', 'Б': 'B', 'В': 'V', 'Г': 'G', 'Д': 'D', 'Е': 'E', 'Ё': 'Yo', - 'Ж': 'Zh', 'З': 'Z', 'И': 'I', 'Й': 'J', 'К': 'K', 'Л': 'L', 'М': 'M', - 'Н': 'N', 'О': 'O', 'П': 'P', 'Р': 'R', 'С': 'S', 'Т': 'T', 'У': 'U', - 'Ф': 'F', 'Х': 'H', 'Ц': 'C', 'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': '', - 'Ы': 'Y', 'Ь': '', 'Э': 'E', 'Ю': 'Yu', 'Я': 'Ya' - }; - const UKRAINIAN_MAP = { - 'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ґ': 'G', 'є': 'ye', 'і': 'i', - 'ї': 'yi', 'ґ': 'g' - }; - const CZECH_MAP = { - 'č': 'c', 'ď': 'd', 'ě': 'e', 'ň': 'n', 'ř': 'r', 'š': 's', 'ť': 't', - 'ů': 'u', 'ž': 'z', 'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R', - 'Š': 'S', 'Ť': 'T', 'Ů': 'U', 'Ž': 'Z' - }; - const SLOVAK_MAP = { - 'á': 'a', 'ä': 'a', 'č': 'c', 'ď': 'd', 'é': 'e', 'í': 'i', 'ľ': 'l', - 'ĺ': 'l', 'ň': 'n', 'ó': 'o', 'ô': 'o', 'ŕ': 'r', 'š': 's', 'ť': 't', - 'ú': 'u', 'ý': 'y', 'ž': 'z', - 'Á': 'a', 'Ä': 'A', 'Č': 'C', 'Ď': 'D', 'É': 'E', 'Í': 'I', 'Ľ': 'L', - 'Ĺ': 'L', 'Ň': 'N', 'Ó': 'O', 'Ô': 'O', 'Ŕ': 'R', 'Š': 'S', 'Ť': 'T', - 'Ú': 'U', 'Ý': 'Y', 'Ž': 'Z' - }; - const POLISH_MAP = { - 'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's', - 'ź': 'z', 'ż': 'z', - 'Ą': 'A', 'Ć': 'C', 'Ę': 'E', 'Ł': 'L', 'Ń': 'N', 'Ó': 'O', 'Ś': 'S', - 'Ź': 'Z', 'Ż': 'Z' - }; - const LATVIAN_MAP = { - 'ā': 'a', 'č': 'c', 'ē': 'e', 'ģ': 'g', 'ī': 'i', 'ķ': 'k', 'ļ': 'l', - 'ņ': 'n', 'š': 's', 'ū': 'u', 'ž': 'z', - 'Ā': 'A', 'Č': 'C', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'I', 'Ķ': 'K', 'Ļ': 'L', - 'Ņ': 'N', 'Š': 'S', 'Ū': 'U', 'Ž': 'Z' - }; - const ARABIC_MAP = { - 'أ': 'a', 'ب': 'b', 'ت': 't', 'ث': 'th', 'ج': 'g', 'ح': 'h', 'خ': 'kh', 'د': 'd', - 'ذ': 'th', 'ر': 'r', 'ز': 'z', 'س': 's', 'ش': 'sh', 'ص': 's', 'ض': 'd', 'ط': 't', - 'ظ': 'th', 'ع': 'aa', 'غ': 'gh', 'ف': 'f', 'ق': 'k', 'ك': 'k', 'ل': 'l', 'م': 'm', - 'ن': 'n', 'ه': 'h', 'و': 'o', 'ي': 'y' - }; - const LITHUANIAN_MAP = { - 'ą': 'a', 'č': 'c', 'ę': 'e', 'ė': 'e', 'į': 'i', 'š': 's', 'ų': 'u', - 'ū': 'u', 'ž': 'z', - 'Ą': 'A', 'Č': 'C', 'Ę': 'E', 'Ė': 'E', 'Į': 'I', 'Š': 'S', 'Ų': 'U', - 'Ū': 'U', 'Ž': 'Z' - }; - const SERBIAN_MAP = { - 'ђ': 'dj', 'ј': 'j', 'љ': 'lj', 'њ': 'nj', 'ћ': 'c', 'џ': 'dz', - 'đ': 'dj', 'Ђ': 'Dj', 'Ј': 'j', 'Љ': 'Lj', 'Њ': 'Nj', 'Ћ': 'C', - 'Џ': 'Dz', 'Đ': 'Dj' - }; - const AZERBAIJANI_MAP = { - 'ç': 'c', 'ə': 'e', 'ğ': 'g', 'ı': 'i', 'ö': 'o', 'ş': 's', 'ü': 'u', - 'Ç': 'C', 'Ə': 'E', 'Ğ': 'G', 'İ': 'I', 'Ö': 'O', 'Ş': 'S', 'Ü': 'U' - }; - const GEORGIAN_MAP = { - 'ა': 'a', 'ბ': 'b', 'გ': 'g', 'დ': 'd', 'ე': 'e', 'ვ': 'v', 'ზ': 'z', - 'თ': 't', 'ი': 'i', 'კ': 'k', 'ლ': 'l', 'მ': 'm', 'ნ': 'n', 'ო': 'o', - 'პ': 'p', 'ჟ': 'j', 'რ': 'r', 'ს': 's', 'ტ': 't', 'უ': 'u', 'ფ': 'f', - 'ქ': 'q', 'ღ': 'g', 'ყ': 'y', 'შ': 'sh', 'ჩ': 'ch', 'ც': 'c', 'ძ': 'dz', - 'წ': 'w', 'ჭ': 'ch', 'ხ': 'x', 'ჯ': 'j', 'ჰ': 'h' - }; - - const ALL_DOWNCODE_MAPS = [ - LATIN_MAP, - LATIN_SYMBOLS_MAP, - GREEK_MAP, - TURKISH_MAP, - ROMANIAN_MAP, - RUSSIAN_MAP, - UKRAINIAN_MAP, - CZECH_MAP, - SLOVAK_MAP, - POLISH_MAP, - LATVIAN_MAP, - ARABIC_MAP, - LITHUANIAN_MAP, - SERBIAN_MAP, - AZERBAIJANI_MAP, - GEORGIAN_MAP - ]; - - const Downcoder = { - 'Initialize': function() { - if (Downcoder.map) { // already made - return; - } - Downcoder.map = {}; - for (const lookup of ALL_DOWNCODE_MAPS) { - Object.assign(Downcoder.map, lookup); - } - Downcoder.regex = new RegExp(Object.keys(Downcoder.map).join('|'), 'g'); - } - }; - - function downcode(slug) { - Downcoder.Initialize(); - return slug.replace(Downcoder.regex, function(m) { - return Downcoder.map[m]; - }); - } - - - function URLify(s, num_chars, allowUnicode) { - // changes, e.g., "Petty theft" to "petty-theft" - if (!allowUnicode) { - s = downcode(s); - } - s = s.toLowerCase(); // convert to lowercase - // if downcode doesn't hit, the char will be stripped here - if (allowUnicode) { - // Keep Unicode letters including both lowercase and uppercase - // characters, whitespace, and dash; remove other characters. - s = XRegExp.replace(s, XRegExp('[^-_\\p{L}\\p{N}\\s]', 'g'), ''); - } else { - s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars - } - s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces - s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens - s = s.substring(0, num_chars); // trim to first num_chars chars - return s.replace(/-+$/g, ''); // trim any trailing hyphens - } - window.URLify = URLify; -} diff --git a/django/staticfiles/admin/js/vendor/jquery/LICENSE.txt b/django/staticfiles/admin/js/vendor/jquery/LICENSE.txt deleted file mode 100644 index f642c3f7..00000000 --- a/django/staticfiles/admin/js/vendor/jquery/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright OpenJS Foundation and other contributors, https://openjsf.org/ - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/django/staticfiles/admin/js/vendor/jquery/jquery.js b/django/staticfiles/admin/js/vendor/jquery/jquery.js deleted file mode 100644 index 7f35c11b..00000000 --- a/django/staticfiles/admin/js/vendor/jquery/jquery.js +++ /dev/null @@ -1,10965 +0,0 @@ -/*! - * jQuery JavaScript Library v3.6.4 - * https://jquery.com/ - * - * Includes Sizzle.js - * https://sizzlejs.com/ - * - * Copyright OpenJS Foundation and other contributors - * Released under the MIT license - * https://jquery.org/license - * - * Date: 2023-03-08T15:28Z - */ -( function( global, factory ) { - - "use strict"; - - if ( typeof module === "object" && typeof module.exports === "object" ) { - - // For CommonJS and CommonJS-like environments where a proper `window` - // is present, execute the factory and get jQuery. - // For environments that do not have a `window` with a `document` - // (such as Node.js), expose a factory as module.exports. - // This accentuates the need for the creation of a real `window`. - // e.g. var jQuery = require("jquery")(window); - // See ticket trac-14549 for more info. - module.exports = global.document ? - factory( global, true ) : - function( w ) { - if ( !w.document ) { - throw new Error( "jQuery requires a window with a document" ); - } - return factory( w ); - }; - } else { - factory( global ); - } - -// Pass this if window is not defined yet -} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) { - -// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1 -// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode -// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common -// enough that all such attempts are guarded in a try block. -"use strict"; - -var arr = []; - -var getProto = Object.getPrototypeOf; - -var slice = arr.slice; - -var flat = arr.flat ? function( array ) { - return arr.flat.call( array ); -} : function( array ) { - return arr.concat.apply( [], array ); -}; - - -var push = arr.push; - -var indexOf = arr.indexOf; - -var class2type = {}; - -var toString = class2type.toString; - -var hasOwn = class2type.hasOwnProperty; - -var fnToString = hasOwn.toString; - -var ObjectFunctionString = fnToString.call( Object ); - -var support = {}; - -var isFunction = function isFunction( obj ) { - - // Support: Chrome <=57, Firefox <=52 - // In some browsers, typeof returns "function" for HTML elements - // (i.e., `typeof document.createElement( "object" ) === "function"`). - // We don't want to classify *any* DOM node as a function. - // Support: QtWeb <=3.8.5, WebKit <=534.34, wkhtmltopdf tool <=0.12.5 - // Plus for old WebKit, typeof returns "function" for HTML collections - // (e.g., `typeof document.getElementsByTagName("div") === "function"`). (gh-4756) - return typeof obj === "function" && typeof obj.nodeType !== "number" && - typeof obj.item !== "function"; - }; - - -var isWindow = function isWindow( obj ) { - return obj != null && obj === obj.window; - }; - - -var document = window.document; - - - - var preservedScriptAttributes = { - type: true, - src: true, - nonce: true, - noModule: true - }; - - function DOMEval( code, node, doc ) { - doc = doc || document; - - var i, val, - script = doc.createElement( "script" ); - - script.text = code; - if ( node ) { - for ( i in preservedScriptAttributes ) { - - // Support: Firefox 64+, Edge 18+ - // Some browsers don't support the "nonce" property on scripts. - // On the other hand, just using `getAttribute` is not enough as - // the `nonce` attribute is reset to an empty string whenever it - // becomes browsing-context connected. - // See https://github.com/whatwg/html/issues/2369 - // See https://html.spec.whatwg.org/#nonce-attributes - // The `node.getAttribute` check was added for the sake of - // `jQuery.globalEval` so that it can fake a nonce-containing node - // via an object. - val = node[ i ] || node.getAttribute && node.getAttribute( i ); - if ( val ) { - script.setAttribute( i, val ); - } - } - } - doc.head.appendChild( script ).parentNode.removeChild( script ); - } - - -function toType( obj ) { - if ( obj == null ) { - return obj + ""; - } - - // Support: Android <=2.3 only (functionish RegExp) - return typeof obj === "object" || typeof obj === "function" ? - class2type[ toString.call( obj ) ] || "object" : - typeof obj; -} -/* global Symbol */ -// Defining this global in .eslintrc.json would create a danger of using the global -// unguarded in another place, it seems safer to define global only for this module - - - -var - version = "3.6.4", - - // Define a local copy of jQuery - jQuery = function( selector, context ) { - - // The jQuery object is actually just the init constructor 'enhanced' - // Need init if jQuery is called (just allow error to be thrown if not included) - return new jQuery.fn.init( selector, context ); - }; - -jQuery.fn = jQuery.prototype = { - - // The current version of jQuery being used - jquery: version, - - constructor: jQuery, - - // The default length of a jQuery object is 0 - length: 0, - - toArray: function() { - return slice.call( this ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - - // Return all the elements in a clean array - if ( num == null ) { - return slice.call( this ); - } - - // Return just the one element from the set - return num < 0 ? this[ num + this.length ] : this[ num ]; - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems ) { - - // Build a new jQuery matched element set - var ret = jQuery.merge( this.constructor(), elems ); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - each: function( callback ) { - return jQuery.each( this, callback ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map( this, function( elem, i ) { - return callback.call( elem, i, elem ); - } ) ); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ) ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - even: function() { - return this.pushStack( jQuery.grep( this, function( _elem, i ) { - return ( i + 1 ) % 2; - } ) ); - }, - - odd: function() { - return this.pushStack( jQuery.grep( this, function( _elem, i ) { - return i % 2; - } ) ); - }, - - eq: function( i ) { - var len = this.length, - j = +i + ( i < 0 ? len : 0 ); - return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); - }, - - end: function() { - return this.prevObject || this.constructor(); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: arr.sort, - splice: arr.splice -}; - -jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, - target = arguments[ 0 ] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - - // Skip the boolean and the target - target = arguments[ i ] || {}; - i++; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !isFunction( target ) ) { - target = {}; - } - - // Extend jQuery itself if only one argument is passed - if ( i === length ) { - target = this; - i--; - } - - for ( ; i < length; i++ ) { - - // Only deal with non-null/undefined values - if ( ( options = arguments[ i ] ) != null ) { - - // Extend the base object - for ( name in options ) { - copy = options[ name ]; - - // Prevent Object.prototype pollution - // Prevent never-ending loop - if ( name === "__proto__" || target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject( copy ) || - ( copyIsArray = Array.isArray( copy ) ) ) ) { - src = target[ name ]; - - // Ensure proper type for the source value - if ( copyIsArray && !Array.isArray( src ) ) { - clone = []; - } else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) { - clone = {}; - } else { - clone = src; - } - copyIsArray = false; - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend( { - - // Unique for each copy of jQuery on the page - expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), - - // Assume jQuery is ready without the ready module - isReady: true, - - error: function( msg ) { - throw new Error( msg ); - }, - - noop: function() {}, - - isPlainObject: function( obj ) { - var proto, Ctor; - - // Detect obvious negatives - // Use toString instead of jQuery.type to catch host objects - if ( !obj || toString.call( obj ) !== "[object Object]" ) { - return false; - } - - proto = getProto( obj ); - - // Objects with no prototype (e.g., `Object.create( null )`) are plain - if ( !proto ) { - return true; - } - - // Objects with prototype are plain iff they were constructed by a global Object function - Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor; - return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString; - }, - - isEmptyObject: function( obj ) { - var name; - - for ( name in obj ) { - return false; - } - return true; - }, - - // Evaluates a script in a provided context; falls back to the global one - // if not specified. - globalEval: function( code, options, doc ) { - DOMEval( code, { nonce: options && options.nonce }, doc ); - }, - - each: function( obj, callback ) { - var length, i = 0; - - if ( isArrayLike( obj ) ) { - length = obj.length; - for ( ; i < length; i++ ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } else { - for ( i in obj ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } - - return obj; - }, - - // results is for internal usage only - makeArray: function( arr, results ) { - var ret = results || []; - - if ( arr != null ) { - if ( isArrayLike( Object( arr ) ) ) { - jQuery.merge( ret, - typeof arr === "string" ? - [ arr ] : arr - ); - } else { - push.call( ret, arr ); - } - } - - return ret; - }, - - inArray: function( elem, arr, i ) { - return arr == null ? -1 : indexOf.call( arr, elem, i ); - }, - - // Support: Android <=4.0 only, PhantomJS 1 only - // push.apply(_, arraylike) throws on ancient WebKit - merge: function( first, second ) { - var len = +second.length, - j = 0, - i = first.length; - - for ( ; j < len; j++ ) { - first[ i++ ] = second[ j ]; - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, invert ) { - var callbackInverse, - matches = [], - i = 0, - length = elems.length, - callbackExpect = !invert; - - // Go through the array, only saving the items - // that pass the validator function - for ( ; i < length; i++ ) { - callbackInverse = !callback( elems[ i ], i ); - if ( callbackInverse !== callbackExpect ) { - matches.push( elems[ i ] ); - } - } - - return matches; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var length, value, - i = 0, - ret = []; - - // Go through the array, translating each of the items to their new values - if ( isArrayLike( elems ) ) { - length = elems.length; - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - - // Go through every key on the object, - } else { - for ( i in elems ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - } - - // Flatten any nested arrays - return flat( ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // jQuery.support is not used in Core but other projects attach their - // properties to it so it needs to exist. - support: support -} ); - -if ( typeof Symbol === "function" ) { - jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; -} - -// Populate the class2type map -jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), - function( _i, name ) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); - } ); - -function isArrayLike( obj ) { - - // Support: real iOS 8.2 only (not reproducible in simulator) - // `in` check used to prevent JIT error (gh-2145) - // hasOwn isn't used here due to false negatives - // regarding Nodelist length in IE - var length = !!obj && "length" in obj && obj.length, - type = toType( obj ); - - if ( isFunction( obj ) || isWindow( obj ) ) { - return false; - } - - return type === "array" || length === 0 || - typeof length === "number" && length > 0 && ( length - 1 ) in obj; -} -var Sizzle = -/*! - * Sizzle CSS Selector Engine v2.3.10 - * https://sizzlejs.com/ - * - * Copyright JS Foundation and other contributors - * Released under the MIT license - * https://js.foundation/ - * - * Date: 2023-02-14 - */ -( function( window ) { -var i, - support, - Expr, - getText, - isXML, - tokenize, - compile, - select, - outermostContext, - sortInput, - hasDuplicate, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + 1 * new Date(), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - nonnativeSelectorCache = createCache(), - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - } - return 0; - }, - - // Instance methods - hasOwn = ( {} ).hasOwnProperty, - arr = [], - pop = arr.pop, - pushNative = arr.push, - push = arr.push, - slice = arr.slice, - - // Use a stripped-down indexOf as it's faster than native - // https://jsperf.com/thor-indexof-vs-for/5 - indexOf = function( list, elem ) { - var i = 0, - len = list.length; - for ( ; i < len; i++ ) { - if ( list[ i ] === elem ) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" + - "ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - - // https://www.w3.org/TR/css-syntax-3/#ident-token-diagram - identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace + - "?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+", - - // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + - - // Operator (capture 2) - "*([*^$|!~]?=)" + whitespace + - - // "Attribute values must be CSS identifiers [capture 5] - // or strings [capture 3 or capture 4]" - "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + - whitespace + "*\\]", - - pseudos = ":(" + identifier + ")(?:\\((" + - - // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: - // 1. quoted (capture 3; capture 4 or capture 5) - "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + - - // 2. simple (capture 6) - "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + - - // 3. anything else (capture 2) - ".*" + - ")\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rwhitespace = new RegExp( whitespace + "+", "g" ), - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + - whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rleadingCombinator = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + - "*" ), - rdescend = new RegExp( whitespace + "|>" ), - - rpseudo = new RegExp( pseudos ), - ridentifier = new RegExp( "^" + identifier + "$" ), - - matchExpr = { - "ID": new RegExp( "^#(" + identifier + ")" ), - "CLASS": new RegExp( "^\\.(" + identifier + ")" ), - "TAG": new RegExp( "^(" + identifier + "|[*])" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + - whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + - whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), - - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp( "^" + whitespace + - "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace + - "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) - }, - - rhtml = /HTML$/i, - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rsibling = /[+~]/, - - // CSS escapes - // http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ), - funescape = function( escape, nonHex ) { - var high = "0x" + escape.slice( 1 ) - 0x10000; - - return nonHex ? - - // Strip the backslash prefix from a non-hex escape sequence - nonHex : - - // Replace a hexadecimal escape sequence with the encoded Unicode code point - // Support: IE <=11+ - // For values outside the Basic Multilingual Plane (BMP), manually construct a - // surrogate pair - high < 0 ? - String.fromCharCode( high + 0x10000 ) : - String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); - }, - - // CSS string/identifier serialization - // https://drafts.csswg.org/cssom/#common-serializing-idioms - rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g, - fcssescape = function( ch, asCodePoint ) { - if ( asCodePoint ) { - - // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER - if ( ch === "\0" ) { - return "\uFFFD"; - } - - // Control characters and (dependent upon position) numbers get escaped as code points - return ch.slice( 0, -1 ) + "\\" + - ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " "; - } - - // Other potentially-special ASCII characters get backslash-escaped - return "\\" + ch; - }, - - // Used for iframes - // See setDocument() - // Removing the function wrapper causes a "Permission Denied" - // error in IE - unloadHandler = function() { - setDocument(); - }, - - inDisabledFieldset = addCombinator( - function( elem ) { - return elem.disabled === true && elem.nodeName.toLowerCase() === "fieldset"; - }, - { dir: "parentNode", next: "legend" } - ); - -// Optimize for push.apply( _, NodeList ) -try { - push.apply( - ( arr = slice.call( preferredDoc.childNodes ) ), - preferredDoc.childNodes - ); - - // Support: Android<4.0 - // Detect silently failing push.apply - // eslint-disable-next-line no-unused-expressions - arr[ preferredDoc.childNodes.length ].nodeType; -} catch ( e ) { - push = { apply: arr.length ? - - // Leverage slice if possible - function( target, els ) { - pushNative.apply( target, slice.call( els ) ); - } : - - // Support: IE<9 - // Otherwise append directly - function( target, els ) { - var j = target.length, - i = 0; - - // Can't trust NodeList.length - while ( ( target[ j++ ] = els[ i++ ] ) ) {} - target.length = j - 1; - } - }; -} - -function Sizzle( selector, context, results, seed ) { - var m, i, elem, nid, match, groups, newSelector, - newContext = context && context.ownerDocument, - - // nodeType defaults to 9, since context defaults to document - nodeType = context ? context.nodeType : 9; - - results = results || []; - - // Return early from calls with invalid selector or context - if ( typeof selector !== "string" || !selector || - nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { - - return results; - } - - // Try to shortcut find operations (as opposed to filters) in HTML documents - if ( !seed ) { - setDocument( context ); - context = context || document; - - if ( documentIsHTML ) { - - // If the selector is sufficiently simple, try using a "get*By*" DOM method - // (excepting DocumentFragment context, where the methods don't exist) - if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) { - - // ID selector - if ( ( m = match[ 1 ] ) ) { - - // Document context - if ( nodeType === 9 ) { - if ( ( elem = context.getElementById( m ) ) ) { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - - // Element context - } else { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( newContext && ( elem = newContext.getElementById( m ) ) && - contains( context, elem ) && - elem.id === m ) { - - results.push( elem ); - return results; - } - } - - // Type selector - } else if ( match[ 2 ] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Class selector - } else if ( ( m = match[ 3 ] ) && support.getElementsByClassName && - context.getElementsByClassName ) { - - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // Take advantage of querySelectorAll - if ( support.qsa && - !nonnativeSelectorCache[ selector + " " ] && - ( !rbuggyQSA || !rbuggyQSA.test( selector ) ) && - - // Support: IE 8 only - // Exclude object elements - ( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) { - - newSelector = selector; - newContext = context; - - // qSA considers elements outside a scoping root when evaluating child or - // descendant combinators, which is not what we want. - // In such cases, we work around the behavior by prefixing every selector in the - // list with an ID selector referencing the scope context. - // The technique has to be used as well when a leading combinator is used - // as such selectors are not recognized by querySelectorAll. - // Thanks to Andrew Dupont for this technique. - if ( nodeType === 1 && - ( rdescend.test( selector ) || rleadingCombinator.test( selector ) ) ) { - - // Expand context for sibling selectors - newContext = rsibling.test( selector ) && testContext( context.parentNode ) || - context; - - // We can use :scope instead of the ID hack if the browser - // supports it & if we're not changing the context. - if ( newContext !== context || !support.scope ) { - - // Capture the context ID, setting it first if necessary - if ( ( nid = context.getAttribute( "id" ) ) ) { - nid = nid.replace( rcssescape, fcssescape ); - } else { - context.setAttribute( "id", ( nid = expando ) ); - } - } - - // Prefix every selector in the list - groups = tokenize( selector ); - i = groups.length; - while ( i-- ) { - groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " + - toSelector( groups[ i ] ); - } - newSelector = groups.join( "," ); - } - - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); - return results; - } catch ( qsaError ) { - nonnativeSelectorCache( selector, true ); - } finally { - if ( nid === expando ) { - context.removeAttribute( "id" ); - } - } - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed ); -} - -/** - * Create key-value caches of limited size - * @returns {function(string, object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ -function createCache() { - var keys = []; - - function cache( key, value ) { - - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if ( keys.push( key + " " ) > Expr.cacheLength ) { - - // Only keep the most recent entries - delete cache[ keys.shift() ]; - } - return ( cache[ key + " " ] = value ); - } - return cache; -} - -/** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ -function markFunction( fn ) { - fn[ expando ] = true; - return fn; -} - -/** - * Support testing using an element - * @param {Function} fn Passed the created element and returns a boolean result - */ -function assert( fn ) { - var el = document.createElement( "fieldset" ); - - try { - return !!fn( el ); - } catch ( e ) { - return false; - } finally { - - // Remove from its parent by default - if ( el.parentNode ) { - el.parentNode.removeChild( el ); - } - - // release memory in IE - el = null; - } -} - -/** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ -function addHandle( attrs, handler ) { - var arr = attrs.split( "|" ), - i = arr.length; - - while ( i-- ) { - Expr.attrHandle[ arr[ i ] ] = handler; - } -} - -/** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ -function siblingCheck( a, b ) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - a.sourceIndex - b.sourceIndex; - - // Use IE sourceIndex if available on both nodes - if ( diff ) { - return diff; - } - - // Check if b follows a - if ( cur ) { - while ( ( cur = cur.nextSibling ) ) { - if ( cur === b ) { - return -1; - } - } - } - - return a ? 1 : -1; -} - -/** - * Returns a function to use in pseudos for input types - * @param {String} type - */ -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return ( name === "input" || name === "button" ) && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for :enabled/:disabled - * @param {Boolean} disabled true for :disabled; false for :enabled - */ -function createDisabledPseudo( disabled ) { - - // Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable - return function( elem ) { - - // Only certain elements can match :enabled or :disabled - // https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled - // https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled - if ( "form" in elem ) { - - // Check for inherited disabledness on relevant non-disabled elements: - // * listed form-associated elements in a disabled fieldset - // https://html.spec.whatwg.org/multipage/forms.html#category-listed - // https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled - // * option elements in a disabled optgroup - // https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled - // All such elements have a "form" property. - if ( elem.parentNode && elem.disabled === false ) { - - // Option elements defer to a parent optgroup if present - if ( "label" in elem ) { - if ( "label" in elem.parentNode ) { - return elem.parentNode.disabled === disabled; - } else { - return elem.disabled === disabled; - } - } - - // Support: IE 6 - 11 - // Use the isDisabled shortcut property to check for disabled fieldset ancestors - return elem.isDisabled === disabled || - - // Where there is no isDisabled, check manually - /* jshint -W018 */ - elem.isDisabled !== !disabled && - inDisabledFieldset( elem ) === disabled; - } - - return elem.disabled === disabled; - - // Try to winnow out elements that can't be disabled before trusting the disabled property. - // Some victims get caught in our net (label, legend, menu, track), but it shouldn't - // even exist on them, let alone have a boolean value. - } else if ( "label" in elem ) { - return elem.disabled === disabled; - } - - // Remaining elements are neither :enabled nor :disabled - return false; - }; -} - -/** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ -function createPositionalPseudo( fn ) { - return markFunction( function( argument ) { - argument = +argument; - return markFunction( function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ ( j = matchIndexes[ i ] ) ] ) { - seed[ j ] = !( matches[ j ] = seed[ j ] ); - } - } - } ); - } ); -} - -/** - * Checks a node for validity as a Sizzle context - * @param {Element|Object=} context - * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value - */ -function testContext( context ) { - return context && typeof context.getElementsByTagName !== "undefined" && context; -} - -// Expose support vars for convenience -support = Sizzle.support = {}; - -/** - * Detects XML nodes - * @param {Element|Object} elem An element or a document - * @returns {Boolean} True iff elem is a non-HTML XML node - */ -isXML = Sizzle.isXML = function( elem ) { - var namespace = elem && elem.namespaceURI, - docElem = elem && ( elem.ownerDocument || elem ).documentElement; - - // Support: IE <=8 - // Assume HTML when documentElement doesn't yet exist, such as inside loading iframes - // https://bugs.jquery.com/ticket/4833 - return !rhtml.test( namespace || docElem && docElem.nodeName || "HTML" ); -}; - -/** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ -setDocument = Sizzle.setDocument = function( node ) { - var hasCompare, subWindow, - doc = node ? node.ownerDocument || node : preferredDoc; - - // Return early if doc is invalid or already selected - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) { - return document; - } - - // Update global variables - document = doc; - docElem = document.documentElement; - documentIsHTML = !isXML( document ); - - // Support: IE 9 - 11+, Edge 12 - 18+ - // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( preferredDoc != document && - ( subWindow = document.defaultView ) && subWindow.top !== subWindow ) { - - // Support: IE 11, Edge - if ( subWindow.addEventListener ) { - subWindow.addEventListener( "unload", unloadHandler, false ); - - // Support: IE 9 - 10 only - } else if ( subWindow.attachEvent ) { - subWindow.attachEvent( "onunload", unloadHandler ); - } - } - - // Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only, - // Safari 4 - 5 only, Opera <=11.6 - 12.x only - // IE/Edge & older browsers don't support the :scope pseudo-class. - // Support: Safari 6.0 only - // Safari 6.0 supports :scope but it's an alias of :root there. - support.scope = assert( function( el ) { - docElem.appendChild( el ).appendChild( document.createElement( "div" ) ); - return typeof el.querySelectorAll !== "undefined" && - !el.querySelectorAll( ":scope fieldset div" ).length; - } ); - - // Support: Chrome 105 - 110+, Safari 15.4 - 16.3+ - // Make sure the the `:has()` argument is parsed unforgivingly. - // We include `*` in the test to detect buggy implementations that are - // _selectively_ forgiving (specifically when the list includes at least - // one valid selector). - // Note that we treat complete lack of support for `:has()` as if it were - // spec-compliant support, which is fine because use of `:has()` in such - // environments will fail in the qSA path and fall back to jQuery traversal - // anyway. - support.cssHas = assert( function() { - try { - document.querySelector( ":has(*,:jqfake)" ); - return false; - } catch ( e ) { - return true; - } - } ); - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties - // (excepting IE8 booleans) - support.attributes = assert( function( el ) { - el.className = "i"; - return !el.getAttribute( "className" ); - } ); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert( function( el ) { - el.appendChild( document.createComment( "" ) ); - return !el.getElementsByTagName( "*" ).length; - } ); - - // Support: IE<9 - support.getElementsByClassName = rnative.test( document.getElementsByClassName ); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programmatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert( function( el ) { - docElem.appendChild( el ).id = expando; - return !document.getElementsByName || !document.getElementsByName( expando ).length; - } ); - - // ID filter and find - if ( support.getById ) { - Expr.filter[ "ID" ] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - return elem.getAttribute( "id" ) === attrId; - }; - }; - Expr.find[ "ID" ] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var elem = context.getElementById( id ); - return elem ? [ elem ] : []; - } - }; - } else { - Expr.filter[ "ID" ] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== "undefined" && - elem.getAttributeNode( "id" ); - return node && node.value === attrId; - }; - }; - - // Support: IE 6 - 7 only - // getElementById is not reliable as a find shortcut - Expr.find[ "ID" ] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var node, i, elems, - elem = context.getElementById( id ); - - if ( elem ) { - - // Verify the id attribute - node = elem.getAttributeNode( "id" ); - if ( node && node.value === id ) { - return [ elem ]; - } - - // Fall back on getElementsByName - elems = context.getElementsByName( id ); - i = 0; - while ( ( elem = elems[ i++ ] ) ) { - node = elem.getAttributeNode( "id" ); - if ( node && node.value === id ) { - return [ elem ]; - } - } - } - - return []; - } - }; - } - - // Tag - Expr.find[ "TAG" ] = support.getElementsByTagName ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( tag ); - - // DocumentFragment nodes don't have gEBTN - } else if ( support.qsa ) { - return context.querySelectorAll( tag ); - } - } : - - function( tag, context ) { - var elem, - tmp = [], - i = 0, - - // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too - results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - while ( ( elem = results[ i++ ] ) ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) { - if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { - return context.getElementsByClassName( className ); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See https://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) { - - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert( function( el ) { - - var input; - - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // https://bugs.jquery.com/ticket/12359 - docElem.appendChild( el ).innerHTML = "" + - ""; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !el.querySelectorAll( "[selected]" ).length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ - if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) { - rbuggyQSA.push( "~=" ); - } - - // Support: IE 11+, Edge 15 - 18+ - // IE 11/Edge don't find elements on a `[name='']` query in some cases. - // Adding a temporary attribute to the document before the selection works - // around the issue. - // Interestingly, IE 10 & older don't seem to have the issue. - input = document.createElement( "input" ); - input.setAttribute( "name", "" ); - el.appendChild( input ); - if ( !el.querySelectorAll( "[name='']" ).length ) { - rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" + - whitespace + "*(?:''|\"\")" ); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !el.querySelectorAll( ":checked" ).length ) { - rbuggyQSA.push( ":checked" ); - } - - // Support: Safari 8+, iOS 8+ - // https://bugs.webkit.org/show_bug.cgi?id=136851 - // In-page `selector#id sibling-combinator selector` fails - if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) { - rbuggyQSA.push( ".#.+[+~]" ); - } - - // Support: Firefox <=3.6 - 5 only - // Old Firefox doesn't throw on a badly-escaped identifier. - el.querySelectorAll( "\\\f" ); - rbuggyQSA.push( "[\\r\\n\\f]" ); - } ); - - assert( function( el ) { - el.innerHTML = "" + - ""; - - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = document.createElement( "input" ); - input.setAttribute( "type", "hidden" ); - el.appendChild( input ).setAttribute( "name", "D" ); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if ( el.querySelectorAll( "[name=d]" ).length ) { - rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( el.querySelectorAll( ":enabled" ).length !== 2 ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Support: IE9-11+ - // IE's :disabled selector does not pick up the children of disabled fieldsets - docElem.appendChild( el ).disabled = true; - if ( el.querySelectorAll( ":disabled" ).length !== 2 ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Support: Opera 10 - 11 only - // Opera 10-11 does not throw on post-comma invalid pseudos - el.querySelectorAll( "*,:x" ); - rbuggyQSA.push( ",.*:" ); - } ); - } - - if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector ) ) ) ) { - - assert( function( el ) { - - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( el, "*" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( el, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - } ); - } - - if ( !support.cssHas ) { - - // Support: Chrome 105 - 110+, Safari 15.4 - 16.3+ - // Our regular `try-catch` mechanism fails to detect natively-unsupported - // pseudo-classes inside `:has()` (such as `:has(:contains("Foo"))`) - // in browsers that parse the `:has()` argument as a forgiving selector list. - // https://drafts.csswg.org/selectors/#relational now requires the argument - // to be parsed unforgivingly, but browsers have not yet fully adjusted. - rbuggyQSA.push( ":has" ); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) ); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test( docElem.compareDocumentPosition ); - - // Element contains another - // Purposefully self-exclusive - // As in, an element does not contain itself - contains = hasCompare || rnative.test( docElem.contains ) ? - function( a, b ) { - - // Support: IE <9 only - // IE doesn't have `contains` on `document` so we need to check for - // `documentElement` presence. - // We need to fall back to `a` when `documentElement` is missing - // as `ownerDocument` of elements within `

?HlBKz%Jf;ZYN^+{2U)r=64sjRGG02Cuz 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 diff --git a/django/apps/media/__pycache__/apps.cpython-313.pyc b/django/apps/media/__pycache__/apps.cpython-313.pyc deleted file mode 100644 index 4296cff53dcf0c54c6854d00e31234c37c5cc5d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmXw0OK;RL5Vn)-ZpgN(T2vleA+34~63GdP141ewBwoE(+$ve##G4wjNfITzPiTfq#l~_p5ZNxbO+tTSM9YWF$U1_zLFVGO8QYoz8J zT)k_&#J)~HXbCzsqO2h;lsRo@X;#*i#J^KeWobZUpB~Bc1_LCdeUqtcCheN()TH?W zZfl)z?0OHyce1+w$1?H%mi1RckL9dVx58MZUtjLxxw+h|YbhA{cqn&8uc{{xC?s__5- diff --git a/django/apps/media/__pycache__/models.cpython-313.pyc b/django/apps/media/__pycache__/models.cpython-313.pyc deleted file mode 100644 index 142d2967fe1190bb773d45f5ef5675b639338321..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8194 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 X;`g}N4j21ysx|;)-9`&oIBl2lZl=%zcZ2VcuXu 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 smISWeB^+&0hf+fw@^y909qbW;', - thumbnail_url - ) - return "-" - thumbnail_preview.short_description = "Preview" - - def entity_info(self, obj): - """Display entity information.""" - if obj.content_type and obj.object_id: - entity = obj.content_object - if entity: - entity_type = obj.content_type.model - entity_name = getattr(entity, 'name', str(entity)) - return format_html( - '{}
{}', - entity_name, - entity_type.upper() - ) - return format_html('Not attached') - entity_info.short_description = "Entity" - - def dimensions(self, obj): - """Display image dimensions.""" - if obj.width and obj.height: - return f"{obj.width}×{obj.height}" - return "-" - dimensions.short_description = "Size" - - def file_size_display(self, obj): - """Display file size in human-readable format.""" - if obj.file_size: - size_kb = obj.file_size / 1024 - if size_kb > 1024: - return f"{size_kb / 1024:.1f} MB" - return f"{size_kb:.1f} KB" - return "-" - file_size_display.short_description = "File Size" - - def changelist_view(self, request, extra_context=None): - """Add statistics to changelist.""" - extra_context = extra_context or {} - - # Get photo statistics - stats = Photo.objects.aggregate( - total=Count('id'), - pending=Count('id', filter=Q(moderation_status='pending')), - approved=Count('id', filter=Q(moderation_status='approved')), - rejected=Count('id', filter=Q(moderation_status='rejected')), - flagged=Count('id', filter=Q(moderation_status='flagged')), - ) - - extra_context['photo_stats'] = stats - - return super().changelist_view(request, extra_context) - - def approve_photos(self, request, queryset): - """Bulk approve selected photos.""" - count = 0 - for photo in queryset: - photo.approve(moderator=request.user, notes='Bulk approved') - count += 1 - self.message_user(request, f"{count} photo(s) approved successfully.") - approve_photos.short_description = "Approve selected photos" - - def reject_photos(self, request, queryset): - """Bulk reject selected photos.""" - count = 0 - for photo in queryset: - photo.reject(moderator=request.user, notes='Bulk rejected') - count += 1 - self.message_user(request, f"{count} photo(s) rejected.") - reject_photos.short_description = "Reject selected photos" - - def flag_photos(self, request, queryset): - """Bulk flag selected photos for review.""" - count = 0 - for photo in queryset: - photo.flag(moderator=request.user, notes='Flagged for review') - count += 1 - self.message_user(request, f"{count} photo(s) flagged for review.") - flag_photos.short_description = "Flag selected photos" - - def make_featured(self, request, queryset): - """Mark selected photos as featured.""" - count = queryset.update(is_featured=True) - self.message_user(request, f"{count} photo(s) marked as featured.") - make_featured.short_description = "Mark as featured" - - def remove_featured(self, request, queryset): - """Remove featured status from selected photos.""" - count = queryset.update(is_featured=False) - self.message_user(request, f"{count} photo(s) removed from featured.") - remove_featured.short_description = "Remove featured status" - - -# Inline admin for use in entity admin pages -class PhotoInline(GenericTabularInline): - """Inline admin for photos in entity pages.""" - model = Photo - ct_field = 'content_type' - ct_fk_field = 'object_id' - extra = 0 - fields = ['thumbnail_preview', 'title', 'photo_type', 'moderation_status', 'display_order'] - readonly_fields = ['thumbnail_preview'] - can_delete = True - - def thumbnail_preview(self, obj): - """Display thumbnail preview in inline.""" - if obj.cloudflare_url: - from apps.media.services import CloudFlareService - cf = CloudFlareService() - thumbnail_url = cf.get_image_url(obj.cloudflare_image_id, 'thumbnail') - - return format_html( - '', - thumbnail_url - ) - return "-" - thumbnail_preview.short_description = "Preview" diff --git a/django/apps/media/apps.py b/django/apps/media/apps.py deleted file mode 100644 index 9eab08e5..00000000 --- a/django/apps/media/apps.py +++ /dev/null @@ -1,11 +0,0 @@ -""" -Media app configuration. -""" - -from django.apps import AppConfig - - -class MediaConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.media' - verbose_name = 'Media' diff --git a/django/apps/media/migrations/0001_initial.py b/django/apps/media/migrations/0001_initial.py deleted file mode 100644 index 8296f42b..00000000 --- a/django/apps/media/migrations/0001_initial.py +++ /dev/null @@ -1,253 +0,0 @@ -# Generated by Django 4.2.8 on 2025-11-08 16:41 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import django_lifecycle.mixins -import model_utils.fields -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("contenttypes", "0002_remove_content_type_name"), - ] - - operations = [ - migrations.CreateModel( - name="Photo", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "cloudflare_image_id", - models.CharField( - db_index=True, - help_text="Unique CloudFlare image identifier", - max_length=255, - unique=True, - ), - ), - ( - "cloudflare_url", - models.URLField(help_text="CloudFlare CDN URL for the image"), - ), - ( - "cloudflare_thumbnail_url", - models.URLField( - blank=True, - help_text="CloudFlare thumbnail URL (if different from main URL)", - ), - ), - ( - "title", - models.CharField( - blank=True, help_text="Photo title or caption", max_length=255 - ), - ), - ( - "description", - models.TextField( - blank=True, help_text="Photo description or details" - ), - ), - ( - "credit", - models.CharField( - blank=True, - help_text="Photo credit/photographer name", - max_length=255, - ), - ), - ( - "photo_type", - models.CharField( - choices=[ - ("main", "Main Photo"), - ("gallery", "Gallery Photo"), - ("banner", "Banner Image"), - ("logo", "Logo"), - ("thumbnail", "Thumbnail"), - ("other", "Other"), - ], - db_index=True, - default="gallery", - help_text="Type of photo", - max_length=50, - ), - ), - ( - "object_id", - models.UUIDField( - db_index=True, - help_text="ID of the entity this photo belongs to", - ), - ), - ( - "moderation_status", - models.CharField( - choices=[ - ("pending", "Pending Review"), - ("approved", "Approved"), - ("rejected", "Rejected"), - ("flagged", "Flagged"), - ], - db_index=True, - default="pending", - help_text="Moderation status", - max_length=50, - ), - ), - ( - "is_approved", - models.BooleanField( - db_index=True, - default=False, - help_text="Quick filter for approved photos", - ), - ), - ( - "moderated_at", - models.DateTimeField( - blank=True, help_text="When the photo was moderated", null=True - ), - ), - ( - "moderation_notes", - models.TextField(blank=True, help_text="Notes from moderator"), - ), - ( - "width", - models.IntegerField( - blank=True, help_text="Image width in pixels", null=True - ), - ), - ( - "height", - models.IntegerField( - blank=True, help_text="Image height in pixels", null=True - ), - ), - ( - "file_size", - models.IntegerField( - blank=True, help_text="File size in bytes", null=True - ), - ), - ( - "display_order", - models.IntegerField( - db_index=True, - default=0, - help_text="Order for displaying in galleries (lower numbers first)", - ), - ), - ( - "is_featured", - models.BooleanField( - db_index=True, - default=False, - help_text="Is this a featured photo?", - ), - ), - ( - "is_public", - models.BooleanField( - db_index=True, - default=True, - help_text="Is this photo publicly visible?", - ), - ), - ( - "content_type", - models.ForeignKey( - help_text="Type of entity this photo belongs to", - on_delete=django.db.models.deletion.CASCADE, - to="contenttypes.contenttype", - ), - ), - ( - "moderated_by", - models.ForeignKey( - blank=True, - help_text="Moderator who approved/rejected this photo", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="moderated_photos", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "uploaded_by", - models.ForeignKey( - blank=True, - help_text="User who uploaded this photo", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="uploaded_photos", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - options={ - "verbose_name": "Photo", - "verbose_name_plural": "Photos", - "ordering": ["display_order", "-created"], - "indexes": [ - models.Index( - fields=["content_type", "object_id"], - name="media_photo_content_0187f5_idx", - ), - models.Index( - fields=["cloudflare_image_id"], - name="media_photo_cloudfl_63ac12_idx", - ), - models.Index( - fields=["moderation_status"], - name="media_photo_moderat_2033b1_idx", - ), - models.Index( - fields=["is_approved"], name="media_photo_is_appr_13ab34_idx" - ), - models.Index( - fields=["uploaded_by"], name="media_photo_uploade_220d3a_idx" - ), - models.Index( - fields=["photo_type"], name="media_photo_photo_t_b387e7_idx" - ), - models.Index( - fields=["display_order"], name="media_photo_display_04e358_idx" - ), - ], - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - ] diff --git a/django/apps/media/migrations/__init__.py b/django/apps/media/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/media/migrations/__pycache__/0001_initial.cpython-313.pyc b/django/apps/media/migrations/__pycache__/0001_initial.cpython-313.pyc deleted file mode 100644 index fe5e135caa707bdd22436629879f4ca10f524298..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6124 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 U!{+|Izt$hA_D6o;=!{AHA6KtBb^rhX diff --git a/django/apps/media/migrations/__pycache__/__init__.cpython-313.pyc b/django/apps/media/migrations/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index d91d417ba548946a77ac30b1c48d0c5b79d36a6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmey&%ge<81bd43GePuY5CH>>P{wB#AY&>+I)f&o-%5reCLr%KNa|LEerR!OQL%nW zVorXMetKp}Mro3Ma!!6;Do`w=C^ILgq$n{tTQ{|$0H`3fNIxYjF)uw|Ke3>oSU)#4 zB{NY!H#5B`u_QA;uUJ1mJ~J<~BtBlRpz;=nO>TZlX-=wL5i8IlkVA?=jE~HWjEqIh GKo$UfI5CR= diff --git a/django/apps/media/models.py b/django/apps/media/models.py deleted file mode 100644 index 76e13f7d..00000000 --- a/django/apps/media/models.py +++ /dev/null @@ -1,266 +0,0 @@ -""" -Media models for ThrillWiki Django backend. - -This module contains models for handling media content: -- Photo: CloudFlare Images integration with generic relations -""" -from django.db import models -from django.contrib.contenttypes.fields import GenericForeignKey -from django.contrib.contenttypes.models import ContentType -from django_lifecycle import hook, AFTER_CREATE, AFTER_UPDATE, BEFORE_SAVE - -from apps.core.models import BaseModel - - -class Photo(BaseModel): - """ - Represents a photo stored in CloudFlare Images. - Uses generic relations to attach to any entity (Park, Ride, Company, etc.) - """ - - PHOTO_TYPE_CHOICES = [ - ('main', 'Main Photo'), - ('gallery', 'Gallery Photo'), - ('banner', 'Banner Image'), - ('logo', 'Logo'), - ('thumbnail', 'Thumbnail'), - ('other', 'Other'), - ] - - MODERATION_STATUS_CHOICES = [ - ('pending', 'Pending Review'), - ('approved', 'Approved'), - ('rejected', 'Rejected'), - ('flagged', 'Flagged'), - ] - - # CloudFlare Image Integration - cloudflare_image_id = models.CharField( - max_length=255, - unique=True, - db_index=True, - help_text="Unique CloudFlare image identifier" - ) - cloudflare_url = models.URLField( - help_text="CloudFlare CDN URL for the image" - ) - cloudflare_thumbnail_url = models.URLField( - blank=True, - help_text="CloudFlare thumbnail URL (if different from main URL)" - ) - - # Metadata - title = models.CharField( - max_length=255, - blank=True, - help_text="Photo title or caption" - ) - description = models.TextField( - blank=True, - help_text="Photo description or details" - ) - credit = models.CharField( - max_length=255, - blank=True, - help_text="Photo credit/photographer name" - ) - - # Photo Type - photo_type = models.CharField( - max_length=50, - choices=PHOTO_TYPE_CHOICES, - default='gallery', - db_index=True, - help_text="Type of photo" - ) - - # Generic relation to attach to any entity - content_type = models.ForeignKey( - ContentType, - on_delete=models.CASCADE, - help_text="Type of entity this photo belongs to" - ) - object_id = models.UUIDField( - db_index=True, - help_text="ID of the entity this photo belongs to" - ) - content_object = GenericForeignKey('content_type', 'object_id') - - # User who uploaded - uploaded_by = models.ForeignKey( - 'users.User', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='uploaded_photos', - help_text="User who uploaded this photo" - ) - - # Moderation - moderation_status = models.CharField( - max_length=50, - choices=MODERATION_STATUS_CHOICES, - default='pending', - db_index=True, - help_text="Moderation status" - ) - is_approved = models.BooleanField( - default=False, - db_index=True, - help_text="Quick filter for approved photos" - ) - moderated_by = models.ForeignKey( - 'users.User', - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name='moderated_photos', - help_text="Moderator who approved/rejected this photo" - ) - moderated_at = models.DateTimeField( - null=True, - blank=True, - help_text="When the photo was moderated" - ) - moderation_notes = models.TextField( - blank=True, - help_text="Notes from moderator" - ) - - # Image Metadata - width = models.IntegerField( - null=True, - blank=True, - help_text="Image width in pixels" - ) - height = models.IntegerField( - null=True, - blank=True, - help_text="Image height in pixels" - ) - file_size = models.IntegerField( - null=True, - blank=True, - help_text="File size in bytes" - ) - - # Display Order - display_order = models.IntegerField( - default=0, - db_index=True, - help_text="Order for displaying in galleries (lower numbers first)" - ) - - # Visibility - is_featured = models.BooleanField( - default=False, - db_index=True, - help_text="Is this a featured photo?" - ) - is_public = models.BooleanField( - default=True, - db_index=True, - help_text="Is this photo publicly visible?" - ) - - class Meta: - verbose_name = 'Photo' - verbose_name_plural = 'Photos' - ordering = ['display_order', '-created'] - indexes = [ - models.Index(fields=['content_type', 'object_id']), - models.Index(fields=['cloudflare_image_id']), - models.Index(fields=['moderation_status']), - models.Index(fields=['is_approved']), - models.Index(fields=['uploaded_by']), - models.Index(fields=['photo_type']), - models.Index(fields=['display_order']), - ] - - def __str__(self): - if self.title: - return self.title - return f"Photo {self.cloudflare_image_id[:8]}..." - - @hook(AFTER_UPDATE, when='moderation_status', was='pending', is_now='approved') - def set_approved_flag_on_approval(self): - """Set is_approved flag when status changes to approved.""" - self.is_approved = True - self.save(update_fields=['is_approved']) - - @hook(AFTER_UPDATE, when='moderation_status', was='approved', is_not='approved') - def clear_approved_flag_on_rejection(self): - """Clear is_approved flag when status changes from approved.""" - self.is_approved = False - self.save(update_fields=['is_approved']) - - def approve(self, moderator, notes=''): - """Approve this photo.""" - from django.utils import timezone - - self.moderation_status = 'approved' - self.is_approved = True - self.moderated_by = moderator - self.moderated_at = timezone.now() - self.moderation_notes = notes - self.save(update_fields=[ - 'moderation_status', - 'is_approved', - 'moderated_by', - 'moderated_at', - 'moderation_notes' - ]) - - def reject(self, moderator, notes=''): - """Reject this photo.""" - from django.utils import timezone - - self.moderation_status = 'rejected' - self.is_approved = False - self.moderated_by = moderator - self.moderated_at = timezone.now() - self.moderation_notes = notes - self.save(update_fields=[ - 'moderation_status', - 'is_approved', - 'moderated_by', - 'moderated_at', - 'moderation_notes' - ]) - - def flag(self, moderator, notes=''): - """Flag this photo for review.""" - from django.utils import timezone - - self.moderation_status = 'flagged' - self.is_approved = False - self.moderated_by = moderator - self.moderated_at = timezone.now() - self.moderation_notes = notes - self.save(update_fields=[ - 'moderation_status', - 'is_approved', - 'moderated_by', - 'moderated_at', - 'moderation_notes' - ]) - - -class PhotoManager(models.Manager): - """Custom manager for Photo model.""" - - def approved(self): - """Return only approved photos.""" - return self.filter(is_approved=True) - - def pending(self): - """Return only pending photos.""" - return self.filter(moderation_status='pending') - - def public(self): - """Return only public, approved photos.""" - return self.filter(is_approved=True, is_public=True) - - -# Add custom manager to Photo model -Photo.add_to_class('objects', PhotoManager()) diff --git a/django/apps/media/services.py b/django/apps/media/services.py deleted file mode 100644 index 966b1ccc..00000000 --- a/django/apps/media/services.py +++ /dev/null @@ -1,492 +0,0 @@ -""" -Media services for photo upload, management, and CloudFlare Images integration. -""" - -import logging -import mimetypes -import os -from io import BytesIO -from typing import Optional, Dict, Any, List -from django.conf import settings -from django.contrib.contenttypes.models import ContentType -from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile -from django.db import transaction -from django.db.models import Model - -import requests -from PIL import Image - -from apps.media.models import Photo - -logger = logging.getLogger(__name__) - - -class CloudFlareError(Exception): - """Base exception for CloudFlare API errors.""" - pass - - -class CloudFlareService: - """ - Service for interacting with CloudFlare Images API. - - Provides image upload, deletion, and URL generation with automatic - fallback to mock mode when CloudFlare credentials are not configured. - """ - - def __init__(self): - self.account_id = settings.CLOUDFLARE_ACCOUNT_ID - self.api_token = settings.CLOUDFLARE_IMAGE_TOKEN - self.delivery_hash = settings.CLOUDFLARE_IMAGE_HASH - - # Enable mock mode if CloudFlare is not configured - self.mock_mode = not all([self.account_id, self.api_token, self.delivery_hash]) - - if self.mock_mode: - logger.warning("CloudFlare Images not configured - using mock mode") - - self.base_url = f"https://api.cloudflare.com/client/v4/accounts/{self.account_id}/images/v1" - self.headers = {"Authorization": f"Bearer {self.api_token}"} - - def upload_image( - self, - file: InMemoryUploadedFile | TemporaryUploadedFile, - metadata: Optional[Dict[str, str]] = None - ) -> Dict[str, Any]: - """ - Upload an image to CloudFlare Images. - - Args: - file: The uploaded file object - metadata: Optional metadata dictionary - - Returns: - Dict containing: - - id: CloudFlare image ID - - url: CDN URL for the image - - variants: Available image variants - - Raises: - CloudFlareError: If upload fails - """ - if self.mock_mode: - return self._mock_upload(file, metadata) - - try: - # Prepare the file for upload - file.seek(0) # Reset file pointer - - # Prepare multipart form data - files = { - 'file': (file.name, file.read(), file.content_type) - } - - # Add metadata if provided - data = {} - if metadata: - data['metadata'] = str(metadata) - - # Make API request - response = requests.post( - self.base_url, - headers=self.headers, - files=files, - data=data, - timeout=30 - ) - - response.raise_for_status() - result = response.json() - - if not result.get('success'): - raise CloudFlareError(f"Upload failed: {result.get('errors', [])}") - - image_data = result['result'] - - return { - 'id': image_data['id'], - 'url': self._get_cdn_url(image_data['id']), - 'variants': image_data.get('variants', []), - 'uploaded': image_data.get('uploaded'), - } - - except requests.exceptions.RequestException as e: - logger.error(f"CloudFlare upload failed: {str(e)}") - raise CloudFlareError(f"Failed to upload image: {str(e)}") - - def delete_image(self, image_id: str) -> bool: - """ - Delete an image from CloudFlare Images. - - Args: - image_id: The CloudFlare image ID - - Returns: - True if deletion was successful - - Raises: - CloudFlareError: If deletion fails - """ - if self.mock_mode: - return self._mock_delete(image_id) - - try: - url = f"{self.base_url}/{image_id}" - response = requests.delete( - url, - headers=self.headers, - timeout=30 - ) - - response.raise_for_status() - result = response.json() - - return result.get('success', False) - - except requests.exceptions.RequestException as e: - logger.error(f"CloudFlare deletion failed: {str(e)}") - raise CloudFlareError(f"Failed to delete image: {str(e)}") - - def get_image_url(self, image_id: str, variant: str = "public") -> str: - """ - Generate a CloudFlare CDN URL for an image. - - Args: - image_id: The CloudFlare image ID - variant: Image variant (public, thumbnail, banner, etc.) - - Returns: - CDN URL for the image - """ - if self.mock_mode: - return self._mock_url(image_id, variant) - - return self._get_cdn_url(image_id, variant) - - def get_image_variants(self, image_id: str) -> List[str]: - """ - Get available variants for an image. - - Args: - image_id: The CloudFlare image ID - - Returns: - List of available variant names - """ - if self.mock_mode: - return ['public', 'thumbnail', 'banner'] - - try: - url = f"{self.base_url}/{image_id}" - response = requests.get( - url, - headers=self.headers, - timeout=30 - ) - - response.raise_for_status() - result = response.json() - - if result.get('success'): - return list(result['result'].get('variants', [])) - - return [] - - except requests.exceptions.RequestException as e: - logger.error(f"Failed to get variants: {str(e)}") - return [] - - def _get_cdn_url(self, image_id: str, variant: str = "public") -> str: - """Generate CloudFlare CDN URL.""" - return f"https://imagedelivery.net/{self.delivery_hash}/{image_id}/{variant}" - - # Mock methods for development without CloudFlare - - def _mock_upload(self, file, metadata) -> Dict[str, Any]: - """Mock upload for development.""" - import uuid - mock_id = str(uuid.uuid4()) - - logger.info(f"[MOCK] Uploaded image: {file.name} -> {mock_id}") - - return { - 'id': mock_id, - 'url': self._mock_url(mock_id), - 'variants': ['public', 'thumbnail', 'banner'], - 'uploaded': 'mock', - } - - def _mock_delete(self, image_id: str) -> bool: - """Mock deletion for development.""" - logger.info(f"[MOCK] Deleted image: {image_id}") - return True - - def _mock_url(self, image_id: str, variant: str = "public") -> str: - """Generate mock URL for development.""" - return f"https://placehold.co/800x600/png?text={image_id[:8]}" - - -class PhotoService: - """ - Service for managing Photo objects with CloudFlare integration. - - Handles photo creation, attachment to entities, moderation, - and gallery management. - """ - - def __init__(self): - self.cloudflare = CloudFlareService() - - def create_photo( - self, - file: InMemoryUploadedFile | TemporaryUploadedFile, - user, - entity: Optional[Model] = None, - photo_type: str = "gallery", - title: str = "", - description: str = "", - credit: str = "", - is_visible: bool = True, - ) -> Photo: - """ - Create a new photo with CloudFlare upload. - - Args: - file: Uploaded file object - user: User uploading the photo - entity: Optional entity to attach photo to - photo_type: Type of photo (main, gallery, banner, etc.) - title: Photo title - description: Photo description - credit: Photo credit/attribution - is_visible: Whether photo is visible - - Returns: - Created Photo instance - - Raises: - ValidationError: If validation fails - CloudFlareError: If upload fails - """ - # Get image dimensions - dimensions = self._get_image_dimensions(file) - - # Upload to CloudFlare - upload_result = self.cloudflare.upload_image( - file, - metadata={ - 'uploaded_by': str(user.id), - 'photo_type': photo_type, - } - ) - - # Create Photo instance - with transaction.atomic(): - photo = Photo.objects.create( - cloudflare_image_id=upload_result['id'], - cloudflare_url=upload_result['url'], - uploaded_by=user, - photo_type=photo_type, - title=title or file.name, - description=description, - credit=credit, - width=dimensions['width'], - height=dimensions['height'], - file_size=file.size, - mime_type=file.content_type, - is_visible=is_visible, - moderation_status='pending', - ) - - # Attach to entity if provided - if entity: - self.attach_to_entity(photo, entity) - - logger.info(f"Photo created: {photo.id} by user {user.id}") - - # Trigger async post-processing - try: - from apps.media.tasks import process_uploaded_image - process_uploaded_image.delay(photo.id) - except Exception as e: - # Don't fail the upload if async task fails to queue - logger.warning(f"Failed to queue photo processing task: {str(e)}") - - return photo - - def attach_to_entity(self, photo: Photo, entity: Model) -> None: - """ - Attach a photo to an entity. - - Args: - photo: Photo instance - entity: Entity to attach to (Park, Ride, Company, etc.) - """ - content_type = ContentType.objects.get_for_model(entity) - photo.content_type = content_type - photo.object_id = entity.pk - photo.save(update_fields=['content_type', 'object_id']) - - logger.info(f"Photo {photo.id} attached to {content_type.model} {entity.pk}") - - def detach_from_entity(self, photo: Photo) -> None: - """ - Detach a photo from its entity. - - Args: - photo: Photo instance - """ - photo.content_type = None - photo.object_id = None - photo.save(update_fields=['content_type', 'object_id']) - - logger.info(f"Photo {photo.id} detached from entity") - - def moderate_photo( - self, - photo: Photo, - status: str, - moderator, - notes: str = "" - ) -> Photo: - """ - Moderate a photo (approve/reject/flag). - - Args: - photo: Photo instance - status: New status (approved, rejected, flagged) - moderator: User performing moderation - notes: Moderation notes - - Returns: - Updated Photo instance - """ - with transaction.atomic(): - photo.moderation_status = status - photo.moderated_by = moderator - photo.moderation_notes = notes - - if status == 'approved': - photo.approve() - elif status == 'rejected': - photo.reject() - elif status == 'flagged': - photo.flag() - - photo.save() - - logger.info( - f"Photo {photo.id} moderated: {status} by user {moderator.id}" - ) - - return photo - - def reorder_photos( - self, - entity: Model, - photo_ids: List[int], - photo_type: Optional[str] = None - ) -> None: - """ - Reorder photos for an entity. - - Args: - entity: Entity whose photos to reorder - photo_ids: List of photo IDs in desired order - photo_type: Optional photo type filter - """ - content_type = ContentType.objects.get_for_model(entity) - - with transaction.atomic(): - for order, photo_id in enumerate(photo_ids): - filters = { - 'id': photo_id, - 'content_type': content_type, - 'object_id': entity.pk, - } - - if photo_type: - filters['photo_type'] = photo_type - - Photo.objects.filter(**filters).update(display_order=order) - - logger.info(f"Reordered {len(photo_ids)} photos for {content_type.model} {entity.pk}") - - def get_entity_photos( - self, - entity: Model, - photo_type: Optional[str] = None, - approved_only: bool = True - ) -> List[Photo]: - """ - Get photos for an entity. - - Args: - entity: Entity to get photos for - photo_type: Optional photo type filter - approved_only: Whether to return only approved photos - - Returns: - List of Photo instances ordered by display_order - """ - content_type = ContentType.objects.get_for_model(entity) - - queryset = Photo.objects.filter( - content_type=content_type, - object_id=entity.pk, - ) - - if photo_type: - queryset = queryset.filter(photo_type=photo_type) - - if approved_only: - queryset = queryset.approved() - - return list(queryset.order_by('display_order', '-created_at')) - - def delete_photo(self, photo: Photo, delete_from_cloudflare: bool = True) -> None: - """ - Delete a photo. - - Args: - photo: Photo instance to delete - delete_from_cloudflare: Whether to also delete from CloudFlare - """ - cloudflare_id = photo.cloudflare_image_id - - with transaction.atomic(): - photo.delete() - - # Delete from CloudFlare after DB deletion succeeds - if delete_from_cloudflare and cloudflare_id: - try: - self.cloudflare.delete_image(cloudflare_id) - except CloudFlareError as e: - logger.error(f"Failed to delete from CloudFlare: {str(e)}") - # Don't raise - photo is already deleted from DB - - logger.info(f"Photo deleted: {cloudflare_id}") - - def _get_image_dimensions( - self, - file: InMemoryUploadedFile | TemporaryUploadedFile - ) -> Dict[str, int]: - """ - Extract image dimensions from uploaded file. - - Args: - file: Uploaded file object - - Returns: - Dict with 'width' and 'height' keys - """ - try: - file.seek(0) - image = Image.open(file) - width, height = image.size - file.seek(0) # Reset for later use - - return {'width': width, 'height': height} - except Exception as e: - logger.warning(f"Failed to get image dimensions: {str(e)}") - return {'width': 0, 'height': 0} diff --git a/django/apps/media/tasks.py b/django/apps/media/tasks.py deleted file mode 100644 index 1ceb5e71..00000000 --- a/django/apps/media/tasks.py +++ /dev/null @@ -1,219 +0,0 @@ -""" -Background tasks for media processing and management. -""" - -import logging -from celery import shared_task -from django.utils import timezone -from datetime import timedelta - -logger = logging.getLogger(__name__) - - -@shared_task(bind=True, max_retries=3, default_retry_delay=60) -def process_uploaded_image(self, photo_id): - """ - Process an uploaded image asynchronously. - - This task runs after a photo is uploaded to perform additional - processing like metadata extraction, validation, etc. - - Args: - photo_id: ID of the Photo to process - - Returns: - str: Processing result message - """ - from apps.media.models import Photo - - try: - photo = Photo.objects.get(id=photo_id) - - # Log processing start - logger.info(f"Processing photo {photo_id}: {photo.title}") - - # Additional processing could include: - # - Generating additional thumbnails - # - Extracting EXIF data - # - Running image quality checks - # - Updating photo metadata - - # For now, just log that processing is complete - logger.info(f"Photo {photo_id} processed successfully") - - return f"Photo {photo_id} processed successfully" - - except Photo.DoesNotExist: - logger.error(f"Photo {photo_id} not found") - raise - except Exception as exc: - logger.error(f"Error processing photo {photo_id}: {str(exc)}") - # Retry with exponential backoff - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task(bind=True, max_retries=2) -def cleanup_rejected_photos(self, days_old=30): - """ - Clean up photos that have been rejected for more than N days. - - This task runs periodically (e.g., weekly) to remove old rejected - photos and free up storage space. - - Args: - days_old: Number of days after rejection to delete (default: 30) - - Returns: - dict: Cleanup statistics - """ - from apps.media.models import Photo - from apps.media.services import PhotoService - - try: - cutoff_date = timezone.now() - timedelta(days=days_old) - - # Find rejected photos older than cutoff - old_rejected = Photo.objects.filter( - moderation_status='rejected', - moderated_at__lt=cutoff_date - ) - - count = old_rejected.count() - logger.info(f"Found {count} rejected photos to cleanup") - - # Delete each photo - photo_service = PhotoService() - deleted_count = 0 - - for photo in old_rejected: - try: - photo_service.delete_photo(photo, delete_from_cloudflare=True) - deleted_count += 1 - except Exception as e: - logger.error(f"Failed to delete photo {photo.id}: {str(e)}") - continue - - result = { - 'found': count, - 'deleted': deleted_count, - 'failed': count - deleted_count, - 'cutoff_date': cutoff_date.isoformat() - } - - logger.info(f"Cleanup complete: {result}") - return result - - except Exception as exc: - logger.error(f"Error during photo cleanup: {str(exc)}") - raise self.retry(exc=exc, countdown=300) # Retry after 5 minutes - - -@shared_task(bind=True, max_retries=3) -def generate_photo_thumbnails(self, photo_id, variants=None): - """ - Generate thumbnails for a photo on demand. - - This can be used to regenerate thumbnails if the original - is updated or if new variants are needed. - - Args: - photo_id: ID of the Photo - variants: List of variant names to generate (None = all) - - Returns: - dict: Generated variants and their URLs - """ - from apps.media.models import Photo - from apps.media.services import CloudFlareService - - try: - photo = Photo.objects.get(id=photo_id) - cloudflare = CloudFlareService() - - if variants is None: - variants = ['public', 'thumbnail', 'banner'] - - result = {} - for variant in variants: - url = cloudflare.get_image_url(photo.cloudflare_image_id, variant) - result[variant] = url - - logger.info(f"Generated thumbnails for photo {photo_id}: {variants}") - return result - - except Photo.DoesNotExist: - logger.error(f"Photo {photo_id} not found") - raise - except Exception as exc: - logger.error(f"Error generating thumbnails for photo {photo_id}: {str(exc)}") - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task(bind=True, max_retries=2) -def cleanup_orphaned_cloudflare_images(self): - """ - Clean up CloudFlare images that no longer have database records. - - This task helps prevent storage bloat by removing images that - were uploaded but their database records were deleted. - - Returns: - dict: Cleanup statistics - """ - from apps.media.models import Photo - from apps.media.services import CloudFlareService - - try: - cloudflare = CloudFlareService() - - # In a real implementation, you would: - # 1. Get list of all images from CloudFlare API - # 2. Check which ones don't have Photo records - # 3. Delete the orphaned images - - # For now, just log that the task ran - logger.info("Orphaned image cleanup task completed (not implemented in mock mode)") - - return { - 'checked': 0, - 'orphaned': 0, - 'deleted': 0 - } - - except Exception as exc: - logger.error(f"Error during orphaned image cleanup: {str(exc)}") - raise self.retry(exc=exc, countdown=300) - - -@shared_task -def update_photo_statistics(): - """ - Update photo-related statistics across the database. - - This task can update cached counts, generate reports, etc. - - Returns: - dict: Updated statistics - """ - from apps.media.models import Photo - from django.db.models import Count - - try: - stats = { - 'total_photos': Photo.objects.count(), - 'pending': Photo.objects.filter(moderation_status='pending').count(), - 'approved': Photo.objects.filter(moderation_status='approved').count(), - 'rejected': Photo.objects.filter(moderation_status='rejected').count(), - 'flagged': Photo.objects.filter(moderation_status='flagged').count(), - 'by_type': dict( - Photo.objects.values('photo_type').annotate(count=Count('id')) - .values_list('photo_type', 'count') - ) - } - - logger.info(f"Photo statistics updated: {stats}") - return stats - - except Exception as e: - logger.error(f"Error updating photo statistics: {str(e)}") - raise diff --git a/django/apps/media/validators.py b/django/apps/media/validators.py deleted file mode 100644 index fb31156a..00000000 --- a/django/apps/media/validators.py +++ /dev/null @@ -1,195 +0,0 @@ -""" -Validators for image uploads. -""" - -import magic -from django.core.exceptions import ValidationError -from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile -from PIL import Image -from typing import Optional - - -# Allowed file types -ALLOWED_MIME_TYPES = [ - 'image/jpeg', - 'image/jpg', - 'image/png', - 'image/webp', - 'image/gif', -] - -ALLOWED_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.webp', '.gif'] - -# Size limits (in bytes) -MAX_FILE_SIZE = 10 * 1024 * 1024 # 10 MB -MIN_FILE_SIZE = 1024 # 1 KB - -# Dimension limits -MIN_WIDTH = 100 -MIN_HEIGHT = 100 -MAX_WIDTH = 8000 -MAX_HEIGHT = 8000 - -# Aspect ratio limits (for specific photo types) -ASPECT_RATIO_LIMITS = { - 'banner': {'min': 2.0, 'max': 4.0}, # Wide banners - 'logo': {'min': 0.5, 'max': 2.0}, # Square-ish logos -} - - -def validate_image_file_type(file: InMemoryUploadedFile | TemporaryUploadedFile) -> None: - """ - Validate that the uploaded file is an allowed image type. - - Uses python-magic to detect actual file type, not just extension. - - Args: - file: The uploaded file object - - Raises: - ValidationError: If file type is not allowed - """ - # Check file extension - file_ext = None - if hasattr(file, 'name') and file.name: - file_ext = '.' + file.name.split('.')[-1].lower() - if file_ext not in ALLOWED_EXTENSIONS: - raise ValidationError( - f"File extension {file_ext} not allowed. " - f"Allowed extensions: {', '.join(ALLOWED_EXTENSIONS)}" - ) - - # Check MIME type from content type - if hasattr(file, 'content_type'): - if file.content_type not in ALLOWED_MIME_TYPES: - raise ValidationError( - f"File type {file.content_type} not allowed. " - f"Allowed types: {', '.join(ALLOWED_MIME_TYPES)}" - ) - - # Verify actual file content using python-magic - try: - file.seek(0) - mime = magic.from_buffer(file.read(2048), mime=True) - file.seek(0) - - if mime not in ALLOWED_MIME_TYPES: - raise ValidationError( - f"File content type {mime} does not match allowed types. " - "File may be corrupted or incorrectly labeled." - ) - except Exception as e: - # If magic fails, we already validated content_type above - pass - - -def validate_image_file_size(file: InMemoryUploadedFile | TemporaryUploadedFile) -> None: - """ - Validate that the file size is within allowed limits. - - Args: - file: The uploaded file object - - Raises: - ValidationError: If file size is not within limits - """ - file_size = file.size - - if file_size < MIN_FILE_SIZE: - raise ValidationError( - f"File size is too small. Minimum: {MIN_FILE_SIZE / 1024:.0f} KB" - ) - - if file_size > MAX_FILE_SIZE: - raise ValidationError( - f"File size is too large. Maximum: {MAX_FILE_SIZE / (1024 * 1024):.0f} MB" - ) - - -def validate_image_dimensions( - file: InMemoryUploadedFile | TemporaryUploadedFile, - photo_type: Optional[str] = None -) -> None: - """ - Validate image dimensions and aspect ratio. - - Args: - file: The uploaded file object - photo_type: Optional photo type for specific validation - - Raises: - ValidationError: If dimensions are not within limits - """ - try: - file.seek(0) - image = Image.open(file) - width, height = image.size - file.seek(0) - except Exception as e: - raise ValidationError(f"Could not read image dimensions: {str(e)}") - - # Check minimum dimensions - if width < MIN_WIDTH or height < MIN_HEIGHT: - raise ValidationError( - f"Image dimensions too small. Minimum: {MIN_WIDTH}x{MIN_HEIGHT}px, " - f"got: {width}x{height}px" - ) - - # Check maximum dimensions - if width > MAX_WIDTH or height > MAX_HEIGHT: - raise ValidationError( - f"Image dimensions too large. Maximum: {MAX_WIDTH}x{MAX_HEIGHT}px, " - f"got: {width}x{height}px" - ) - - # Check aspect ratio for specific photo types - if photo_type and photo_type in ASPECT_RATIO_LIMITS: - aspect_ratio = width / height - limits = ASPECT_RATIO_LIMITS[photo_type] - - if aspect_ratio < limits['min'] or aspect_ratio > limits['max']: - raise ValidationError( - f"Invalid aspect ratio for {photo_type}. " - f"Expected ratio between {limits['min']:.2f} and {limits['max']:.2f}, " - f"got: {aspect_ratio:.2f}" - ) - - -def validate_image( - file: InMemoryUploadedFile | TemporaryUploadedFile, - photo_type: Optional[str] = None -) -> None: - """ - Run all image validations. - - Args: - file: The uploaded file object - photo_type: Optional photo type for specific validation - - Raises: - ValidationError: If any validation fails - """ - validate_image_file_type(file) - validate_image_file_size(file) - validate_image_dimensions(file, photo_type) - - -def validate_image_content_safety(file: InMemoryUploadedFile | TemporaryUploadedFile) -> None: - """ - Placeholder for content safety validation. - - This could integrate with services like: - - AWS Rekognition - - Google Cloud Vision - - Azure Content Moderator - - For now, this is a no-op but provides extension point. - - Args: - file: The uploaded file object - - Raises: - ValidationError: If content is deemed unsafe - """ - # TODO: Integrate with content moderation API - pass diff --git a/django/apps/moderation/__init__.py b/django/apps/moderation/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/moderation/__pycache__/__init__.cpython-313.pyc b/django/apps/moderation/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 496944e2d9ca4147a87f15f4a9b9beac798666c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 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 Xo(*BPds!5ZVmo}Zc54!5+4uY(9N%Z5 diff --git a/django/apps/moderation/__pycache__/apps.cpython-313.pyc b/django/apps/moderation/__pycache__/apps.cpython-313.pyc deleted file mode 100644 index a5d69eb89ca929638cac6dd6798f5ed328659bf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 644 zcmYjOOK;RL5Vn)-ZrHY3C@SKqM!f}z2yU1^f+;D_`N#8))gBal92+@_5GI%r~#q*4CKd`PNLTpZNZ;#^o8TmDPPz&Iltw z7-il|`oaS*A~(q%Vg7Bxfp1KR1V{jx%w}gV>=HqaB;7A zo7JUCidk}u<;XU9Qk4gtR?jOTi^T*BYkS0%W&SJrE1AZj2|2H`W5Kx@bB+|9wE8CJ z@4HN{kqPJX3R*3zTGR^R?Ly46PHLWECd4q639Pf(JP|Nct>{V34(F}L3FSP~8md{R zMawzZ%2#-anWk@A0d1-?sUR&Yebmj;T&h~&-w{+&YRK|;55$KC9R#GV-PE>~+J;?Q zy`40tVAt6To1)!D@tG`dJ^UWrSZ>_?_-uK7_tPu5cIh;Y12f{hP&xLrv7V%*2D@rU uW{F&cWi#O;H>1a}gQi_#dk4iYpHlkU^Js7p61w+i=+o%S=>@^35B>}89=2!z diff --git a/django/apps/moderation/__pycache__/models.cpython-313.pyc b/django/apps/moderation/__pycache__/models.cpython-313.pyc deleted file mode 100644 index 57defbb2b4c1952c797480e975f0e12e932a6d4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16495 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 Lr+*^Rn|JrWF}yUf diff --git a/django/apps/moderation/__pycache__/services.cpython-313.pyc b/django/apps/moderation/__pycache__/services.cpython-313.pyc deleted file mode 100644 index 2830b93131ac0d43d004fc66ecf6c109bfc7d23d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19623 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 diff --git a/django/apps/moderation/admin.py b/django/apps/moderation/admin.py deleted file mode 100644 index 935663d8..00000000 --- a/django/apps/moderation/admin.py +++ /dev/null @@ -1,424 +0,0 @@ -""" -Django admin for moderation models. -""" -from django.contrib import admin -from django.utils.html import format_html -from django.urls import reverse -from django.utils import timezone -from unfold.admin import ModelAdmin -from unfold.decorators import display - -from apps.moderation.models import ContentSubmission, SubmissionItem, ModerationLock - - -@admin.register(ContentSubmission) -class ContentSubmissionAdmin(ModelAdmin): - """Admin for ContentSubmission model.""" - - list_display = [ - 'title_with_icon', - 'status_badge', - 'entity_info', - 'user', - 'items_summary', - 'locked_info', - 'created', - ] - - list_filter = [ - 'status', - 'submission_type', - 'entity_type', - 'created', - ] - - search_fields = [ - 'title', - 'description', - 'user__email', - 'user__username', - ] - - readonly_fields = [ - 'id', - 'status', - 'entity_type', - 'entity_id', - 'locked_by', - 'locked_at', - 'reviewed_by', - 'reviewed_at', - 'created', - 'modified', - ] - - fieldsets = ( - ('Submission Info', { - 'fields': ( - 'id', - 'title', - 'description', - 'submission_type', - 'status', - ) - }), - ('Entity', { - 'fields': ( - 'entity_type', - 'entity_id', - ) - }), - ('User Info', { - 'fields': ( - 'user', - 'source', - 'ip_address', - 'user_agent', - ) - }), - ('Review Info', { - 'fields': ( - 'locked_by', - 'locked_at', - 'reviewed_by', - 'reviewed_at', - 'rejection_reason', - ) - }), - ('Metadata', { - 'fields': ( - 'metadata', - 'created', - 'modified', - ), - 'classes': ('collapse',) - }), - ) - - @display(description='Title', ordering='title') - def title_with_icon(self, obj): - """Display title with submission type icon.""" - icons = { - 'create': '➕', - 'update': '✏️', - 'delete': '🗑️', - } - icon = icons.get(obj.submission_type, '📝') - return f"{icon} {obj.title}" - - @display(description='Status', ordering='status') - def status_badge(self, obj): - """Display colored status badge.""" - colors = { - 'draft': 'gray', - 'pending': 'blue', - 'reviewing': 'orange', - 'approved': 'green', - 'rejected': 'red', - } - color = colors.get(obj.status, 'gray') - return format_html( - '{}', - color, - obj.get_status_display() - ) - - @display(description='Entity') - def entity_info(self, obj): - """Display entity type and ID.""" - return f"{obj.entity_type.model} #{str(obj.entity_id)[:8]}" - - @display(description='Items') - def items_summary(self, obj): - """Display item counts.""" - total = obj.get_items_count() - approved = obj.get_approved_items_count() - rejected = obj.get_rejected_items_count() - pending = total - approved - rejected - - return format_html( - '{} / ' - '{} / ' - '{}', - pending, approved, rejected - ) - - @display(description='Lock Status') - def locked_info(self, obj): - """Display lock information.""" - if obj.locked_by: - is_expired = not obj.is_locked() - status = '🔓 Expired' if is_expired else '🔒 Locked' - return f"{status} by {obj.locked_by.email}" - return '✅ Unlocked' - - def get_queryset(self, request): - """Optimize queryset with select_related.""" - qs = super().get_queryset(request) - return qs.select_related( - 'user', - 'entity_type', - 'locked_by', - 'reviewed_by' - ).prefetch_related('items') - - -class SubmissionItemInline(admin.TabularInline): - """Inline admin for submission items.""" - model = SubmissionItem - extra = 0 - fields = [ - 'field_label', - 'old_value_display', - 'new_value_display', - 'change_type', - 'status', - 'reviewed_by', - ] - readonly_fields = [ - 'field_label', - 'old_value_display', - 'new_value_display', - 'change_type', - 'status', - 'reviewed_by', - ] - can_delete = False - - def has_add_permission(self, request, obj=None): - return False - - -@admin.register(SubmissionItem) -class SubmissionItemAdmin(ModelAdmin): - """Admin for SubmissionItem model.""" - - list_display = [ - 'field_label', - 'submission_title', - 'change_type_badge', - 'status_badge', - 'old_value_display', - 'new_value_display', - 'reviewed_by', - ] - - list_filter = [ - 'status', - 'change_type', - 'is_required', - 'created', - ] - - search_fields = [ - 'field_name', - 'field_label', - 'submission__title', - ] - - readonly_fields = [ - 'id', - 'submission', - 'field_name', - 'field_label', - 'old_value', - 'new_value', - 'old_value_display', - 'new_value_display', - 'status', - 'reviewed_by', - 'reviewed_at', - 'created', - 'modified', - ] - - fieldsets = ( - ('Item Info', { - 'fields': ( - 'id', - 'submission', - 'field_name', - 'field_label', - 'change_type', - 'is_required', - 'order', - ) - }), - ('Values', { - 'fields': ( - 'old_value', - 'new_value', - 'old_value_display', - 'new_value_display', - ) - }), - ('Review Info', { - 'fields': ( - 'status', - 'reviewed_by', - 'reviewed_at', - 'rejection_reason', - ) - }), - ('Timestamps', { - 'fields': ( - 'created', - 'modified', - ) - }), - ) - - @display(description='Submission') - def submission_title(self, obj): - """Display submission title with link.""" - url = reverse('admin:moderation_contentsubmission_change', args=[obj.submission.id]) - return format_html('{}', url, obj.submission.title) - - @display(description='Type', ordering='change_type') - def change_type_badge(self, obj): - """Display colored change type badge.""" - colors = { - 'add': 'green', - 'modify': 'blue', - 'remove': 'red', - } - color = colors.get(obj.change_type, 'gray') - return format_html( - '{}', - color, - obj.get_change_type_display() - ) - - @display(description='Status', ordering='status') - def status_badge(self, obj): - """Display colored status badge.""" - colors = { - 'pending': 'orange', - 'approved': 'green', - 'rejected': 'red', - } - color = colors.get(obj.status, 'gray') - return format_html( - '{}', - color, - obj.get_status_display() - ) - - def get_queryset(self, request): - """Optimize queryset with select_related.""" - qs = super().get_queryset(request) - return qs.select_related('submission', 'reviewed_by') - - -@admin.register(ModerationLock) -class ModerationLockAdmin(ModelAdmin): - """Admin for ModerationLock model.""" - - list_display = [ - 'submission_title', - 'locked_by', - 'locked_at', - 'expires_at', - 'status_indicator', - 'lock_duration', - ] - - list_filter = [ - 'is_active', - 'locked_at', - 'expires_at', - ] - - search_fields = [ - 'submission__title', - 'locked_by__email', - 'locked_by__username', - ] - - readonly_fields = [ - 'id', - 'submission', - 'locked_by', - 'locked_at', - 'expires_at', - 'is_active', - 'released_at', - 'lock_duration', - 'is_expired_display', - 'created', - 'modified', - ] - - fieldsets = ( - ('Lock Info', { - 'fields': ( - 'id', - 'submission', - 'locked_by', - 'is_active', - ) - }), - ('Timing', { - 'fields': ( - 'locked_at', - 'expires_at', - 'released_at', - 'lock_duration', - 'is_expired_display', - ) - }), - ('Timestamps', { - 'fields': ( - 'created', - 'modified', - ) - }), - ) - - @display(description='Submission') - def submission_title(self, obj): - """Display submission title with link.""" - url = reverse('admin:moderation_contentsubmission_change', args=[obj.submission.id]) - return format_html('{}', url, obj.submission.title) - - @display(description='Status') - def status_indicator(self, obj): - """Display lock status.""" - if not obj.is_active: - return format_html( - '🔓 Released' - ) - elif obj.is_expired(): - return format_html( - '⏰ Expired' - ) - else: - return format_html( - '🔒 Active' - ) - - @display(description='Duration') - def lock_duration(self, obj): - """Display lock duration.""" - if obj.released_at: - duration = obj.released_at - obj.locked_at - else: - duration = timezone.now() - obj.locked_at - - minutes = int(duration.total_seconds() / 60) - return f"{minutes} minutes" - - @display(description='Expired?') - def is_expired_display(self, obj): - """Display if lock is expired.""" - if not obj.is_active: - return 'N/A (Released)' - return 'Yes' if obj.is_expired() else 'No' - - def get_queryset(self, request): - """Optimize queryset with select_related.""" - qs = super().get_queryset(request) - return qs.select_related('submission', 'locked_by') diff --git a/django/apps/moderation/apps.py b/django/apps/moderation/apps.py deleted file mode 100644 index 7989d7f3..00000000 --- a/django/apps/moderation/apps.py +++ /dev/null @@ -1,11 +0,0 @@ -""" -Moderation app configuration. -""" - -from django.apps import AppConfig - - -class ModerationConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.moderation' - verbose_name = 'Moderation' diff --git a/django/apps/moderation/migrations/0001_initial.py b/django/apps/moderation/migrations/0001_initial.py deleted file mode 100644 index 54d804f6..00000000 --- a/django/apps/moderation/migrations/0001_initial.py +++ /dev/null @@ -1,454 +0,0 @@ -# Generated by Django 4.2.8 on 2025-11-08 17:40 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import django_fsm -import django_lifecycle.mixins -import model_utils.fields -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("contenttypes", "0002_remove_content_type_name"), - ] - - operations = [ - migrations.CreateModel( - name="ContentSubmission", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "status", - django_fsm.FSMField( - choices=[ - ("draft", "Draft"), - ("pending", "Pending Review"), - ("reviewing", "Under Review"), - ("approved", "Approved"), - ("rejected", "Rejected"), - ], - db_index=True, - default="draft", - help_text="Current submission state (managed by FSM)", - max_length=20, - protected=True, - ), - ), - ( - "entity_id", - models.UUIDField(help_text="ID of the entity being modified"), - ), - ( - "submission_type", - models.CharField( - choices=[ - ("create", "Create"), - ("update", "Update"), - ("delete", "Delete"), - ], - db_index=True, - help_text="Type of operation (create, update, delete)", - max_length=20, - ), - ), - ( - "title", - models.CharField( - help_text="Brief description of changes", max_length=255 - ), - ), - ( - "description", - models.TextField( - blank=True, help_text="Detailed description of changes" - ), - ), - ( - "locked_at", - models.DateTimeField( - blank=True, - help_text="When the submission was locked for review", - null=True, - ), - ), - ( - "reviewed_at", - models.DateTimeField( - blank=True, - help_text="When the submission was reviewed", - null=True, - ), - ), - ( - "rejection_reason", - models.TextField( - blank=True, help_text="Reason for rejection (if rejected)" - ), - ), - ( - "source", - models.CharField( - default="web", - help_text="Source of submission (web, api, mobile, etc.)", - max_length=50, - ), - ), - ( - "ip_address", - models.GenericIPAddressField( - blank=True, help_text="IP address of submitter", null=True - ), - ), - ( - "user_agent", - models.CharField( - blank=True, help_text="User agent of submitter", max_length=500 - ), - ), - ( - "metadata", - models.JSONField( - blank=True, - default=dict, - help_text="Additional submission metadata", - ), - ), - ( - "entity_type", - models.ForeignKey( - help_text="Type of entity being modified", - on_delete=django.db.models.deletion.CASCADE, - to="contenttypes.contenttype", - ), - ), - ( - "locked_by", - models.ForeignKey( - blank=True, - help_text="Moderator currently reviewing this submission", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="locked_submissions", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "reviewed_by", - models.ForeignKey( - blank=True, - help_text="Moderator who reviewed this submission", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="reviewed_submissions", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "user", - models.ForeignKey( - help_text="User who submitted the changes", - on_delete=django.db.models.deletion.CASCADE, - related_name="submissions", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - options={ - "verbose_name": "Content Submission", - "verbose_name_plural": "Content Submissions", - "db_table": "content_submissions", - "ordering": ["-created"], - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - migrations.CreateModel( - name="SubmissionItem", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "field_name", - models.CharField( - help_text="Name of the field being changed", max_length=100 - ), - ), - ( - "field_label", - models.CharField( - blank=True, - help_text="Human-readable field label", - max_length=200, - ), - ), - ( - "old_value", - models.JSONField( - blank=True, - help_text="Previous value (null for new fields)", - null=True, - ), - ), - ( - "new_value", - models.JSONField( - blank=True, - help_text="New value (null for deletions)", - null=True, - ), - ), - ( - "status", - models.CharField( - choices=[ - ("pending", "Pending"), - ("approved", "Approved"), - ("rejected", "Rejected"), - ], - db_index=True, - default="pending", - help_text="Status of this individual item", - max_length=20, - ), - ), - ( - "reviewed_at", - models.DateTimeField( - blank=True, help_text="When this item was reviewed", null=True - ), - ), - ( - "rejection_reason", - models.TextField( - blank=True, help_text="Reason for rejecting this specific item" - ), - ), - ( - "change_type", - models.CharField( - choices=[ - ("add", "Add"), - ("modify", "Modify"), - ("remove", "Remove"), - ], - default="modify", - help_text="Type of change", - max_length=20, - ), - ), - ( - "is_required", - models.BooleanField( - default=False, - help_text="Whether this change is required for the submission", - ), - ), - ( - "order", - models.IntegerField( - default=0, help_text="Display order within submission" - ), - ), - ( - "reviewed_by", - models.ForeignKey( - blank=True, - help_text="Moderator who reviewed this item", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="reviewed_items", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "submission", - models.ForeignKey( - help_text="Parent submission", - on_delete=django.db.models.deletion.CASCADE, - related_name="items", - to="moderation.contentsubmission", - ), - ), - ], - options={ - "verbose_name": "Submission Item", - "verbose_name_plural": "Submission Items", - "db_table": "submission_items", - "ordering": ["submission", "order", "created"], - "indexes": [ - models.Index( - fields=["submission", "status"], - name="submission__submiss_71cf2f_idx", - ), - models.Index( - fields=["status"], name="submission__status_61deb1_idx" - ), - ], - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - migrations.CreateModel( - name="ModerationLock", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "locked_at", - models.DateTimeField( - auto_now_add=True, help_text="When the lock was acquired" - ), - ), - ("expires_at", models.DateTimeField(help_text="When the lock expires")), - ( - "is_active", - models.BooleanField( - db_index=True, - default=True, - help_text="Whether the lock is currently active", - ), - ), - ( - "released_at", - models.DateTimeField( - blank=True, help_text="When the lock was released", null=True - ), - ), - ( - "locked_by", - models.ForeignKey( - help_text="User who holds the lock", - on_delete=django.db.models.deletion.CASCADE, - related_name="moderation_locks", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "submission", - models.OneToOneField( - help_text="Submission that is locked", - on_delete=django.db.models.deletion.CASCADE, - related_name="lock_record", - to="moderation.contentsubmission", - ), - ), - ], - options={ - "verbose_name": "Moderation Lock", - "verbose_name_plural": "Moderation Locks", - "db_table": "moderation_locks", - "ordering": ["-locked_at"], - "indexes": [ - models.Index( - fields=["is_active", "expires_at"], - name="moderation__is_acti_ecf427_idx", - ), - models.Index( - fields=["locked_by", "is_active"], - name="moderation__locked__d5cdfb_idx", - ), - ], - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - migrations.AddIndex( - model_name="contentsubmission", - index=models.Index( - fields=["status", "created"], name="content_sub_status_a8d552_idx" - ), - ), - migrations.AddIndex( - model_name="contentsubmission", - index=models.Index( - fields=["user", "status"], name="content_sub_user_id_019595_idx" - ), - ), - migrations.AddIndex( - model_name="contentsubmission", - index=models.Index( - fields=["entity_type", "entity_id"], - name="content_sub_entity__d0f313_idx", - ), - ), - migrations.AddIndex( - model_name="contentsubmission", - index=models.Index( - fields=["locked_by", "locked_at"], name="content_sub_locked__feb2b3_idx" - ), - ), - ] diff --git a/django/apps/moderation/migrations/__init__.py b/django/apps/moderation/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/moderation/migrations/__pycache__/0001_initial.cpython-313.pyc b/django/apps/moderation/migrations/__pycache__/0001_initial.cpython-313.pyc deleted file mode 100644 index cc2997ddbbb05937ef2bd8a2265bf46e7cb8f7f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10444 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 diff --git a/django/apps/moderation/migrations/__pycache__/__init__.cpython-313.pyc b/django/apps/moderation/migrations/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 8898df0fdafe98b0ff0a13780bb63bf0a8a80379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmey&%ge<81k)S%GePuY5CH>>P{wB#AY&>+I)f&o-%5reCLr%KNa|LserR!OQL%nW zVorXMetKp}Mro3Ma!!6;Do`w=C^ILgq$n{tTQ{|$0H`3fNIxYjF)uw|Ke3>oSU)#E zCABEABr`uxKQ}WS!YbB}kI&4@EQycTE2zB1VFOfCnv-f*#0s self.expires_at - - def release(self): - """Release the lock""" - self.is_active = False - self.released_at = timezone.now() - self.save(update_fields=['is_active', 'released_at', 'modified']) - - def extend(self, minutes=15): - """Extend the lock duration""" - from datetime import timedelta - self.expires_at = timezone.now() + timedelta(minutes=minutes) - self.save(update_fields=['expires_at', 'modified']) - - @classmethod - def cleanup_expired(cls): - """Cleanup expired locks (for periodic task)""" - expired_locks = cls.objects.filter( - is_active=True, - expires_at__lt=timezone.now() - ) - - count = 0 - for lock in expired_locks: - # Release lock - lock.release() - - # Unlock submission if still in reviewing state - submission = lock.submission - if submission.status == ContentSubmission.STATE_REVIEWING: - submission.unlock() - submission.save() - - count += 1 - - return count diff --git a/django/apps/moderation/services.py b/django/apps/moderation/services.py deleted file mode 100644 index 28c6e6aa..00000000 --- a/django/apps/moderation/services.py +++ /dev/null @@ -1,587 +0,0 @@ -""" -Moderation services for ThrillWiki. - -This module provides business logic for the content moderation workflow: -- Creating submissions -- Starting reviews with locks -- Approving submissions with atomic transactions -- Selective approval of individual items -- Rejecting submissions -- Unlocking expired submissions -""" - -import logging -from datetime import timedelta -from django.db import transaction -from django.utils import timezone -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ValidationError, PermissionDenied - -from apps.moderation.models import ContentSubmission, SubmissionItem, ModerationLock - -logger = logging.getLogger(__name__) - - -class ModerationService: - """ - Service class for moderation operations. - - All public methods use atomic transactions to ensure data integrity. - """ - - @staticmethod - @transaction.atomic - def create_submission( - user, - entity, - submission_type, - title, - description='', - items_data=None, - metadata=None, - auto_submit=True, - **kwargs - ): - """ - Create a new content submission with items. - - Args: - user: User creating the submission - entity: Entity being modified (Park, Ride, Company, etc.) - submission_type: 'create', 'update', or 'delete' - title: Brief description of changes - description: Detailed description (optional) - items_data: List of dicts with item details: - [ - { - 'field_name': 'name', - 'field_label': 'Park Name', - 'old_value': 'Old Name', - 'new_value': 'New Name', - 'change_type': 'modify', - 'is_required': False, - 'order': 0 - }, - ... - ] - metadata: Additional metadata dict - auto_submit: Whether to automatically submit (move to pending state) - **kwargs: Additional submission fields (source, ip_address, user_agent) - - Returns: - ContentSubmission instance - - Raises: - ValidationError: If validation fails - """ - # Get ContentType for entity - entity_type = ContentType.objects.get_for_model(entity) - - # Create submission - submission = ContentSubmission.objects.create( - user=user, - entity_type=entity_type, - entity_id=entity.id, - submission_type=submission_type, - title=title, - description=description, - metadata=metadata or {}, - source=kwargs.get('source', 'web'), - ip_address=kwargs.get('ip_address'), - user_agent=kwargs.get('user_agent', '') - ) - - # Create submission items - if items_data: - for item_data in items_data: - SubmissionItem.objects.create( - submission=submission, - field_name=item_data['field_name'], - field_label=item_data.get('field_label', item_data['field_name']), - old_value=item_data.get('old_value'), - new_value=item_data.get('new_value'), - change_type=item_data.get('change_type', 'modify'), - is_required=item_data.get('is_required', False), - order=item_data.get('order', 0) - ) - - # Auto-submit if requested - if auto_submit: - submission.submit() - submission.save() - - return submission - - @staticmethod - @transaction.atomic - def start_review(submission_id, reviewer): - """ - Start reviewing a submission (lock it). - - Args: - submission_id: UUID of submission - reviewer: User starting the review - - Returns: - ContentSubmission instance - - Raises: - ValidationError: If submission cannot be reviewed - PermissionDenied: If user lacks permission - """ - submission = ContentSubmission.objects.select_for_update().get(id=submission_id) - - # Check if user has permission to review - if not ModerationService._can_moderate(reviewer): - raise PermissionDenied("User does not have moderation permission") - - # Check if submission is in correct state - if submission.status != ContentSubmission.STATE_PENDING: - raise ValidationError(f"Submission must be pending to start review (current: {submission.status})") - - # Check if already locked by another user - if submission.locked_by and submission.locked_by != reviewer: - if submission.is_locked(): - raise ValidationError(f"Submission is locked by {submission.locked_by.email}") - - # Start review (FSM transition) - submission.start_review(reviewer) - submission.save() - - # Create lock record - expires_at = timezone.now() + timedelta(minutes=15) - ModerationLock.objects.update_or_create( - submission=submission, - defaults={ - 'locked_by': reviewer, - 'expires_at': expires_at, - 'is_active': True, - 'released_at': None - } - ) - - return submission - - @staticmethod - @transaction.atomic - def approve_submission(submission_id, reviewer): - """ - Approve an entire submission and apply all changes. - - This method uses atomic transactions to ensure all-or-nothing behavior. - If any part fails, the entire operation is rolled back. - - Args: - submission_id: UUID of submission - reviewer: User approving the submission - - Returns: - ContentSubmission instance - - Raises: - ValidationError: If submission cannot be approved - PermissionDenied: If user lacks permission - """ - submission = ContentSubmission.objects.select_for_update().get(id=submission_id) - - # Check permission - if not ModerationService._can_moderate(reviewer): - raise PermissionDenied("User does not have moderation permission") - - # Check if submission can be reviewed - if not submission.can_review(reviewer): - raise ValidationError("Submission cannot be reviewed at this time") - - # Apply all changes - entity = submission.entity - if not entity: - raise ValidationError("Entity no longer exists") - - # Get all pending items - items = submission.items.filter(status='pending') - - for item in items: - # Apply change to entity - if item.change_type in ['add', 'modify']: - setattr(entity, item.field_name, item.new_value) - elif item.change_type == 'remove': - setattr(entity, item.field_name, None) - - # Mark item as approved - item.approve(reviewer) - - # Save entity (this will trigger versioning through lifecycle hooks) - entity.save() - - # Approve submission (FSM transition) - submission.approve(reviewer) - submission.save() - - # Release lock - try: - lock = ModerationLock.objects.get(submission=submission, is_active=True) - lock.release() - except ModerationLock.DoesNotExist: - pass - - # Send notification email asynchronously - try: - from apps.moderation.tasks import send_moderation_notification - send_moderation_notification.delay(str(submission.id), 'approved') - except Exception as e: - # Don't fail the approval if email fails to queue - logger.warning(f"Failed to queue approval notification: {str(e)}") - - return submission - - @staticmethod - @transaction.atomic - def approve_selective(submission_id, reviewer, item_ids): - """ - Approve only specific items in a submission (selective approval). - - This allows moderators to approve some changes while rejecting others. - Uses atomic transactions for data integrity. - - Args: - submission_id: UUID of submission - reviewer: User approving the items - item_ids: List of item UUIDs to approve - - Returns: - dict with counts: {'approved': N, 'total': M} - - Raises: - ValidationError: If submission cannot be reviewed - PermissionDenied: If user lacks permission - """ - submission = ContentSubmission.objects.select_for_update().get(id=submission_id) - - # Check permission - if not ModerationService._can_moderate(reviewer): - raise PermissionDenied("User does not have moderation permission") - - # Check if submission can be reviewed - if not submission.can_review(reviewer): - raise ValidationError("Submission cannot be reviewed at this time") - - # Get entity - entity = submission.entity - if not entity: - raise ValidationError("Entity no longer exists") - - # Get items to approve - items_to_approve = submission.items.filter( - id__in=item_ids, - status='pending' - ) - - approved_count = 0 - for item in items_to_approve: - # Apply change to entity - if item.change_type in ['add', 'modify']: - setattr(entity, item.field_name, item.new_value) - elif item.change_type == 'remove': - setattr(entity, item.field_name, None) - - # Mark item as approved - item.approve(reviewer) - approved_count += 1 - - # Save entity if any changes were made - if approved_count > 0: - entity.save() - - # Check if all items are now reviewed - pending_count = submission.items.filter(status='pending').count() - - if pending_count == 0: - # All items reviewed - mark submission as approved - submission.approve(reviewer) - submission.save() - - # Release lock - try: - lock = ModerationLock.objects.get(submission=submission, is_active=True) - lock.release() - except ModerationLock.DoesNotExist: - pass - - return { - 'approved': approved_count, - 'total': submission.items.count(), - 'pending': pending_count, - 'submission_approved': pending_count == 0 - } - - @staticmethod - @transaction.atomic - def reject_submission(submission_id, reviewer, reason): - """ - Reject an entire submission. - - Args: - submission_id: UUID of submission - reviewer: User rejecting the submission - reason: Reason for rejection - - Returns: - ContentSubmission instance - - Raises: - ValidationError: If submission cannot be rejected - PermissionDenied: If user lacks permission - """ - submission = ContentSubmission.objects.select_for_update().get(id=submission_id) - - # Check permission - if not ModerationService._can_moderate(reviewer): - raise PermissionDenied("User does not have moderation permission") - - # Check if submission can be reviewed - if not submission.can_review(reviewer): - raise ValidationError("Submission cannot be reviewed at this time") - - # Reject all pending items - items = submission.items.filter(status='pending') - for item in items: - item.reject(reviewer, reason) - - # Reject submission (FSM transition) - submission.reject(reviewer, reason) - submission.save() - - # Release lock - try: - lock = ModerationLock.objects.get(submission=submission, is_active=True) - lock.release() - except ModerationLock.DoesNotExist: - pass - - # Send notification email asynchronously - try: - from apps.moderation.tasks import send_moderation_notification - send_moderation_notification.delay(str(submission.id), 'rejected') - except Exception as e: - # Don't fail the rejection if email fails to queue - logger.warning(f"Failed to queue rejection notification: {str(e)}") - - return submission - - @staticmethod - @transaction.atomic - def reject_selective(submission_id, reviewer, item_ids, reason=''): - """ - Reject specific items in a submission. - - Args: - submission_id: UUID of submission - reviewer: User rejecting the items - item_ids: List of item UUIDs to reject - reason: Reason for rejection (optional) - - Returns: - dict with counts: {'rejected': N, 'total': M} - - Raises: - ValidationError: If submission cannot be reviewed - PermissionDenied: If user lacks permission - """ - submission = ContentSubmission.objects.select_for_update().get(id=submission_id) - - # Check permission - if not ModerationService._can_moderate(reviewer): - raise PermissionDenied("User does not have moderation permission") - - # Check if submission can be reviewed - if not submission.can_review(reviewer): - raise ValidationError("Submission cannot be reviewed at this time") - - # Get items to reject - items_to_reject = submission.items.filter( - id__in=item_ids, - status='pending' - ) - - rejected_count = 0 - for item in items_to_reject: - item.reject(reviewer, reason) - rejected_count += 1 - - # Check if all items are now reviewed - pending_count = submission.items.filter(status='pending').count() - - if pending_count == 0: - # All items reviewed - approved_count = submission.items.filter(status='approved').count() - - if approved_count > 0: - # Some items approved - mark submission as approved - submission.approve(reviewer) - submission.save() - else: - # All items rejected - mark submission as rejected - submission.reject(reviewer, "All items rejected") - submission.save() - - # Release lock - try: - lock = ModerationLock.objects.get(submission=submission, is_active=True) - lock.release() - except ModerationLock.DoesNotExist: - pass - - return { - 'rejected': rejected_count, - 'total': submission.items.count(), - 'pending': pending_count, - 'submission_complete': pending_count == 0 - } - - @staticmethod - @transaction.atomic - def unlock_submission(submission_id): - """ - Manually unlock a submission. - - Args: - submission_id: UUID of submission - - Returns: - ContentSubmission instance - """ - submission = ContentSubmission.objects.select_for_update().get(id=submission_id) - - if submission.status == ContentSubmission.STATE_REVIEWING: - submission.unlock() - submission.save() - - # Release lock record - try: - lock = ModerationLock.objects.get(submission=submission, is_active=True) - lock.release() - except ModerationLock.DoesNotExist: - pass - - return submission - - @staticmethod - def cleanup_expired_locks(): - """ - Cleanup expired locks and unlock submissions. - - This should be called periodically (e.g., every 5 minutes via Celery). - - Returns: - int: Number of locks cleaned up - """ - return ModerationLock.cleanup_expired() - - @staticmethod - def get_queue(status=None, user=None, limit=50, offset=0): - """ - Get moderation queue with filters. - - Args: - status: Filter by status (optional) - user: Filter by submitter (optional) - limit: Maximum results - offset: Pagination offset - - Returns: - QuerySet of ContentSubmission objects - """ - queryset = ContentSubmission.objects.select_related( - 'user', - 'entity_type', - 'locked_by', - 'reviewed_by' - ).prefetch_related('items') - - if status: - queryset = queryset.filter(status=status) - - if user: - queryset = queryset.filter(user=user) - - return queryset[offset:offset + limit] - - @staticmethod - def get_submission_details(submission_id): - """ - Get full submission details with all items. - - Args: - submission_id: UUID of submission - - Returns: - ContentSubmission instance with prefetched items - """ - return ContentSubmission.objects.select_related( - 'user', - 'entity_type', - 'locked_by', - 'reviewed_by' - ).prefetch_related( - 'items', - 'items__reviewed_by' - ).get(id=submission_id) - - @staticmethod - def _can_moderate(user): - """ - Check if user has moderation permission. - - Args: - user: User to check - - Returns: - bool: True if user can moderate - """ - if not user or not user.is_authenticated: - return False - - # Check if user is superuser - if user.is_superuser: - return True - - # Check if user has moderator or admin role - try: - return user.role.is_moderator - except: - return False - - @staticmethod - @transaction.atomic - def delete_submission(submission_id, user): - """ - Delete a submission (only if draft or by owner). - - Args: - submission_id: UUID of submission - user: User attempting to delete - - Returns: - bool: True if deleted - - Raises: - PermissionDenied: If user cannot delete - ValidationError: If submission cannot be deleted - """ - submission = ContentSubmission.objects.select_for_update().get(id=submission_id) - - # Check permission - is_owner = submission.user == user - is_moderator = ModerationService._can_moderate(user) - - if not (is_owner or is_moderator): - raise PermissionDenied("Only the owner or a moderator can delete this submission") - - # Check state - if submission.status not in [ContentSubmission.STATE_DRAFT, ContentSubmission.STATE_PENDING]: - if not is_moderator: - raise ValidationError("Only moderators can delete submissions under review") - - # Delete submission (cascades to items and lock) - submission.delete() - return True diff --git a/django/apps/moderation/tasks.py b/django/apps/moderation/tasks.py deleted file mode 100644 index d22fd73a..00000000 --- a/django/apps/moderation/tasks.py +++ /dev/null @@ -1,304 +0,0 @@ -""" -Background tasks for moderation workflows and notifications. -""" - -import logging -from celery import shared_task -from django.core.mail import send_mail -from django.template.loader import render_to_string -from django.conf import settings -from django.utils import timezone - -logger = logging.getLogger(__name__) - - -@shared_task(bind=True, max_retries=3, default_retry_delay=60) -def send_moderation_notification(self, submission_id, status): - """ - Send email notification when a submission is approved or rejected. - - Args: - submission_id: UUID of the ContentSubmission - status: 'approved' or 'rejected' - - Returns: - str: Notification result message - """ - from apps.moderation.models import ContentSubmission - - try: - submission = ContentSubmission.objects.select_related( - 'user', 'reviewed_by', 'entity_type' - ).prefetch_related('items').get(id=submission_id) - - # Get user's submission count - user_submission_count = ContentSubmission.objects.filter( - user=submission.user - ).count() - - # Prepare email context - context = { - 'submission': submission, - 'status': status, - 'user': submission.user, - 'user_submission_count': user_submission_count, - 'submission_url': f"{settings.SITE_URL}/submissions/{submission.id}/", - 'site_url': settings.SITE_URL, - } - - # Choose template based on status - if status == 'approved': - template = 'emails/moderation_approved.html' - subject = f'✅ Submission Approved: {submission.title}' - else: - template = 'emails/moderation_rejected.html' - subject = f'⚠️ Submission Requires Changes: {submission.title}' - - # Render HTML email - html_message = render_to_string(template, context) - - # Send email - send_mail( - subject=subject, - message='', # Plain text version (optional) - html_message=html_message, - from_email=settings.DEFAULT_FROM_EMAIL, - recipient_list=[submission.user.email], - fail_silently=False, - ) - - logger.info( - f"Moderation notification sent: {status} for submission {submission_id} " - f"to {submission.user.email}" - ) - - return f"Notification sent to {submission.user.email}" - - except ContentSubmission.DoesNotExist: - logger.error(f"Submission {submission_id} not found") - raise - except Exception as exc: - logger.error(f"Error sending notification for submission {submission_id}: {str(exc)}") - # Retry with exponential backoff - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task(bind=True, max_retries=2) -def cleanup_expired_locks(self): - """ - Clean up expired moderation locks. - - This task runs periodically to unlock submissions that have - been locked for too long (default: 15 minutes). - - Returns: - int: Number of locks cleaned up - """ - from apps.moderation.models import ModerationLock - - try: - cleaned = ModerationLock.cleanup_expired() - logger.info(f"Cleaned up {cleaned} expired moderation locks") - return cleaned - - except Exception as exc: - logger.error(f"Error cleaning up expired locks: {str(exc)}") - raise self.retry(exc=exc, countdown=300) # Retry after 5 minutes - - -@shared_task(bind=True, max_retries=3) -def send_batch_moderation_summary(self, moderator_id): - """ - Send a daily summary email to a moderator with their moderation stats. - - Args: - moderator_id: ID of the moderator user - - Returns: - str: Email send result - """ - from apps.users.models import User - from apps.moderation.models import ContentSubmission - from datetime import timedelta - - try: - moderator = User.objects.get(id=moderator_id) - - # Get stats for the past 24 hours - yesterday = timezone.now() - timedelta(days=1) - - stats = { - 'reviewed_today': ContentSubmission.objects.filter( - reviewed_by=moderator, - reviewed_at__gte=yesterday - ).count(), - 'approved_today': ContentSubmission.objects.filter( - reviewed_by=moderator, - reviewed_at__gte=yesterday, - status='approved' - ).count(), - 'rejected_today': ContentSubmission.objects.filter( - reviewed_by=moderator, - reviewed_at__gte=yesterday, - status='rejected' - ).count(), - 'pending_queue': ContentSubmission.objects.filter( - status='pending' - ).count(), - } - - context = { - 'moderator': moderator, - 'stats': stats, - 'date': timezone.now(), - 'site_url': settings.SITE_URL, - } - - # For now, just log the stats (template not created yet) - logger.info(f"Moderation summary for {moderator.email}: {stats}") - - # In production, you would send an actual email: - # html_message = render_to_string('emails/moderation_summary.html', context) - # send_mail(...) - - return f"Summary sent to {moderator.email}" - - except User.DoesNotExist: - logger.error(f"Moderator {moderator_id} not found") - raise - except Exception as exc: - logger.error(f"Error sending moderation summary: {str(exc)}") - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task -def update_moderation_statistics(): - """ - Update moderation-related statistics across the database. - - Returns: - dict: Updated statistics - """ - from apps.moderation.models import ContentSubmission - from django.db.models import Count, Avg, F - from datetime import timedelta - - try: - now = timezone.now() - week_ago = now - timedelta(days=7) - - stats = { - 'total_submissions': ContentSubmission.objects.count(), - 'pending': ContentSubmission.objects.filter(status='pending').count(), - 'reviewing': ContentSubmission.objects.filter(status='reviewing').count(), - 'approved': ContentSubmission.objects.filter(status='approved').count(), - 'rejected': ContentSubmission.objects.filter(status='rejected').count(), - 'this_week': ContentSubmission.objects.filter( - created_at__gte=week_ago - ).count(), - 'by_type': dict( - ContentSubmission.objects.values('submission_type') - .annotate(count=Count('id')) - .values_list('submission_type', 'count') - ), - } - - logger.info(f"Moderation statistics updated: {stats}") - return stats - - except Exception as e: - logger.error(f"Error updating moderation statistics: {str(e)}") - raise - - -@shared_task(bind=True, max_retries=2) -def auto_unlock_stale_reviews(self, hours=1): - """ - Automatically unlock submissions that have been in review for too long. - - This helps prevent submissions from getting stuck if a moderator - starts a review but doesn't complete it. - - Args: - hours: Number of hours before auto-unlocking (default: 1) - - Returns: - int: Number of submissions unlocked - """ - from apps.moderation.models import ContentSubmission - from apps.moderation.services import ModerationService - from datetime import timedelta - - try: - cutoff = timezone.now() - timedelta(hours=hours) - - # Find submissions that have been reviewing too long - stale_reviews = ContentSubmission.objects.filter( - status='reviewing', - locked_at__lt=cutoff - ) - - count = 0 - for submission in stale_reviews: - try: - ModerationService.unlock_submission(submission.id) - count += 1 - except Exception as e: - logger.error(f"Failed to unlock submission {submission.id}: {str(e)}") - continue - - logger.info(f"Auto-unlocked {count} stale reviews") - return count - - except Exception as exc: - logger.error(f"Error auto-unlocking stale reviews: {str(exc)}") - raise self.retry(exc=exc, countdown=300) - - -@shared_task -def notify_moderators_of_queue_size(): - """ - Notify moderators when the pending queue gets too large. - - This helps ensure timely review of submissions. - - Returns: - dict: Notification result - """ - from apps.moderation.models import ContentSubmission - from apps.users.models import User - - try: - pending_count = ContentSubmission.objects.filter(status='pending').count() - - # Threshold for notification (configurable) - threshold = getattr(settings, 'MODERATION_QUEUE_THRESHOLD', 50) - - if pending_count >= threshold: - # Get all moderators - moderators = User.objects.filter(role__is_moderator=True) - - logger.warning( - f"Moderation queue size ({pending_count}) exceeds threshold ({threshold}). " - f"Notifying {moderators.count()} moderators." - ) - - # In production, send emails to moderators - # For now, just log - - return { - 'queue_size': pending_count, - 'threshold': threshold, - 'notified': moderators.count(), - } - else: - logger.info(f"Moderation queue size ({pending_count}) is within threshold") - return { - 'queue_size': pending_count, - 'threshold': threshold, - 'notified': 0, - } - - except Exception as e: - logger.error(f"Error checking moderation queue: {str(e)}") - raise diff --git a/django/apps/monitoring/__init__.py b/django/apps/monitoring/__init__.py deleted file mode 100644 index b076604f..00000000 --- a/django/apps/monitoring/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -""" -Monitoring app for collecting and recording system metrics. -""" -default_app_config = 'apps.monitoring.apps.MonitoringConfig' diff --git a/django/apps/monitoring/apps.py b/django/apps/monitoring/apps.py deleted file mode 100644 index 764e358a..00000000 --- a/django/apps/monitoring/apps.py +++ /dev/null @@ -1,10 +0,0 @@ -""" -Monitoring app configuration. -""" -from django.apps import AppConfig - - -class MonitoringConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.monitoring' - verbose_name = 'System Monitoring' diff --git a/django/apps/monitoring/metrics_collector.py b/django/apps/monitoring/metrics_collector.py deleted file mode 100644 index 89c52d55..00000000 --- a/django/apps/monitoring/metrics_collector.py +++ /dev/null @@ -1,188 +0,0 @@ -""" -Metrics collection utilities for system monitoring. -""" -import time -import logging -from typing import Dict, Any, List -from datetime import datetime, timedelta -from django.db import connection -from django.core.cache import cache -from celery import current_app as celery_app -import os -import requests - -logger = logging.getLogger(__name__) - -SUPABASE_URL = os.environ.get('SUPABASE_URL', 'https://api.thrillwiki.com') -SUPABASE_SERVICE_KEY = os.environ.get('SUPABASE_SERVICE_ROLE_KEY') - - -class MetricsCollector: - """Collects various system metrics for anomaly detection.""" - - @staticmethod - def get_error_rate() -> float: - """ - Calculate error rate from recent logs. - Returns percentage of error logs in the last minute. - """ - cache_key = 'metrics:error_rate' - cached_value = cache.get(cache_key) - - if cached_value is not None: - return cached_value - - # In production, query actual error logs - # For now, return a mock value - error_rate = 0.0 - cache.set(cache_key, error_rate, 60) - return error_rate - - @staticmethod - def get_api_response_time() -> float: - """ - Get average API response time in milliseconds. - Returns average response time from recent requests. - """ - cache_key = 'metrics:avg_response_time' - cached_value = cache.get(cache_key) - - if cached_value is not None: - return cached_value - - # In production, calculate from middleware metrics - # For now, return a mock value - response_time = 150.0 # milliseconds - cache.set(cache_key, response_time, 60) - return response_time - - @staticmethod - def get_celery_queue_size() -> int: - """ - Get current Celery queue size across all queues. - """ - try: - inspect = celery_app.control.inspect() - active_tasks = inspect.active() or {} - scheduled_tasks = inspect.scheduled() or {} - - total_active = sum(len(tasks) for tasks in active_tasks.values()) - total_scheduled = sum(len(tasks) for tasks in scheduled_tasks.values()) - - return total_active + total_scheduled - except Exception as e: - logger.error(f"Error getting Celery queue size: {e}") - return 0 - - @staticmethod - def get_database_connection_count() -> int: - """ - Get current number of active database connections. - """ - try: - with connection.cursor() as cursor: - cursor.execute("SELECT count(*) FROM pg_stat_activity WHERE state = 'active';") - count = cursor.fetchone()[0] - return count - except Exception as e: - logger.error(f"Error getting database connection count: {e}") - return 0 - - @staticmethod - def get_cache_hit_rate() -> float: - """ - Calculate cache hit rate percentage. - """ - cache_key_hits = 'metrics:cache_hits' - cache_key_misses = 'metrics:cache_misses' - - hits = cache.get(cache_key_hits, 0) - misses = cache.get(cache_key_misses, 0) - - total = hits + misses - if total == 0: - return 100.0 - - return (hits / total) * 100 - - @staticmethod - def record_metric(metric_name: str, metric_value: float, metric_category: str = 'system') -> bool: - """ - Record a metric to Supabase metric_time_series table. - """ - if not SUPABASE_SERVICE_KEY: - logger.warning("SUPABASE_SERVICE_ROLE_KEY not configured, skipping metric recording") - return False - - try: - headers = { - 'apikey': SUPABASE_SERVICE_KEY, - 'Authorization': f'Bearer {SUPABASE_SERVICE_KEY}', - 'Content-Type': 'application/json', - } - - data = { - 'metric_name': metric_name, - 'metric_value': metric_value, - 'metric_category': metric_category, - 'timestamp': datetime.utcnow().isoformat(), - } - - response = requests.post( - f'{SUPABASE_URL}/rest/v1/metric_time_series', - headers=headers, - json=data, - timeout=5 - ) - - if response.status_code in [200, 201]: - logger.info(f"Recorded metric: {metric_name} = {metric_value}") - return True - else: - logger.error(f"Failed to record metric: {response.status_code} - {response.text}") - return False - - except Exception as e: - logger.error(f"Error recording metric {metric_name}: {e}") - return False - - @staticmethod - def collect_all_metrics() -> Dict[str, Any]: - """ - Collect all system metrics and record them. - Returns a summary of collected metrics. - """ - metrics = {} - - try: - # Collect error rate - error_rate = MetricsCollector.get_error_rate() - metrics['error_rate'] = error_rate - MetricsCollector.record_metric('error_rate', error_rate, 'performance') - - # Collect API response time - response_time = MetricsCollector.get_api_response_time() - metrics['api_response_time'] = response_time - MetricsCollector.record_metric('api_response_time', response_time, 'performance') - - # Collect queue size - queue_size = MetricsCollector.get_celery_queue_size() - metrics['celery_queue_size'] = queue_size - MetricsCollector.record_metric('celery_queue_size', queue_size, 'system') - - # Collect database connections - db_connections = MetricsCollector.get_database_connection_count() - metrics['database_connections'] = db_connections - MetricsCollector.record_metric('database_connections', db_connections, 'system') - - # Collect cache hit rate - cache_hit_rate = MetricsCollector.get_cache_hit_rate() - metrics['cache_hit_rate'] = cache_hit_rate - MetricsCollector.record_metric('cache_hit_rate', cache_hit_rate, 'performance') - - logger.info(f"Successfully collected {len(metrics)} metrics") - - except Exception as e: - logger.error(f"Error collecting metrics: {e}", exc_info=True) - - return metrics diff --git a/django/apps/monitoring/middleware.py b/django/apps/monitoring/middleware.py deleted file mode 100644 index df6f64f7..00000000 --- a/django/apps/monitoring/middleware.py +++ /dev/null @@ -1,52 +0,0 @@ -""" -Middleware for tracking API response times and error rates. -""" -import time -import logging -from django.core.cache import cache -from django.utils.deprecation import MiddlewareMixin - -logger = logging.getLogger(__name__) - - -class MetricsMiddleware(MiddlewareMixin): - """ - Middleware to track API response times and error rates. - Stores metrics in cache for periodic collection. - """ - - def process_request(self, request): - """Record request start time.""" - request._metrics_start_time = time.time() - return None - - def process_response(self, request, response): - """Record response time and update metrics.""" - if hasattr(request, '_metrics_start_time'): - response_time = (time.time() - request._metrics_start_time) * 1000 # Convert to ms - - # Store response time in cache for aggregation - cache_key = 'metrics:response_times' - response_times = cache.get(cache_key, []) - response_times.append(response_time) - - # Keep only last 100 response times - if len(response_times) > 100: - response_times = response_times[-100:] - - cache.set(cache_key, response_times, 300) # 5 minute TTL - - # Track cache hits/misses - if response.status_code == 200: - cache.incr('metrics:cache_hits', 1) - - return response - - def process_exception(self, request, exception): - """Track exceptions and error rates.""" - logger.error(f"Exception in request: {exception}", exc_info=True) - - # Increment error counter - cache.incr('metrics:cache_misses', 1) - - return None diff --git a/django/apps/monitoring/tasks.py b/django/apps/monitoring/tasks.py deleted file mode 100644 index 32124e41..00000000 --- a/django/apps/monitoring/tasks.py +++ /dev/null @@ -1,82 +0,0 @@ -""" -Celery tasks for periodic metric collection. -""" -import logging -from celery import shared_task -from .metrics_collector import MetricsCollector - -logger = logging.getLogger(__name__) - - -@shared_task(bind=True, name='monitoring.collect_system_metrics') -def collect_system_metrics(self): - """ - Periodic task to collect all system metrics. - Runs every minute to gather current system state. - """ - logger.info("Starting system metrics collection") - - try: - metrics = MetricsCollector.collect_all_metrics() - logger.info(f"Collected metrics: {metrics}") - return { - 'success': True, - 'metrics_collected': len(metrics), - 'metrics': metrics - } - except Exception as e: - logger.error(f"Error in collect_system_metrics task: {e}", exc_info=True) - raise - - -@shared_task(bind=True, name='monitoring.collect_error_metrics') -def collect_error_metrics(self): - """ - Collect error-specific metrics. - Runs every minute to track error rates. - """ - try: - error_rate = MetricsCollector.get_error_rate() - MetricsCollector.record_metric('error_rate', error_rate, 'performance') - return {'success': True, 'error_rate': error_rate} - except Exception as e: - logger.error(f"Error in collect_error_metrics task: {e}", exc_info=True) - raise - - -@shared_task(bind=True, name='monitoring.collect_performance_metrics') -def collect_performance_metrics(self): - """ - Collect performance metrics (response times, cache hit rates). - Runs every minute. - """ - try: - metrics = {} - - response_time = MetricsCollector.get_api_response_time() - MetricsCollector.record_metric('api_response_time', response_time, 'performance') - metrics['api_response_time'] = response_time - - cache_hit_rate = MetricsCollector.get_cache_hit_rate() - MetricsCollector.record_metric('cache_hit_rate', cache_hit_rate, 'performance') - metrics['cache_hit_rate'] = cache_hit_rate - - return {'success': True, 'metrics': metrics} - except Exception as e: - logger.error(f"Error in collect_performance_metrics task: {e}", exc_info=True) - raise - - -@shared_task(bind=True, name='monitoring.collect_queue_metrics') -def collect_queue_metrics(self): - """ - Collect Celery queue metrics. - Runs every minute to monitor queue health. - """ - try: - queue_size = MetricsCollector.get_celery_queue_size() - MetricsCollector.record_metric('celery_queue_size', queue_size, 'system') - return {'success': True, 'queue_size': queue_size} - except Exception as e: - logger.error(f"Error in collect_queue_metrics task: {e}", exc_info=True) - raise diff --git a/django/apps/monitoring/tasks_retention.py b/django/apps/monitoring/tasks_retention.py deleted file mode 100644 index e7cacb61..00000000 --- a/django/apps/monitoring/tasks_retention.py +++ /dev/null @@ -1,168 +0,0 @@ -""" -Celery tasks for data retention and cleanup. -""" -import logging -import requests -import os -from celery import shared_task - -logger = logging.getLogger(__name__) - -SUPABASE_URL = os.environ.get('SUPABASE_URL', 'https://api.thrillwiki.com') -SUPABASE_SERVICE_KEY = os.environ.get('SUPABASE_SERVICE_ROLE_KEY') - - -@shared_task(bind=True, name='monitoring.run_data_retention_cleanup') -def run_data_retention_cleanup(self): - """ - Run comprehensive data retention cleanup. - Cleans up old metrics, anomaly detections, alerts, and incidents. - Runs daily at 3 AM. - """ - logger.info("Starting data retention cleanup") - - if not SUPABASE_SERVICE_KEY: - logger.error("SUPABASE_SERVICE_ROLE_KEY not configured") - return {'success': False, 'error': 'Missing service key'} - - try: - # Call the Supabase RPC function - headers = { - 'apikey': SUPABASE_SERVICE_KEY, - 'Authorization': f'Bearer {SUPABASE_SERVICE_KEY}', - 'Content-Type': 'application/json', - } - - response = requests.post( - f'{SUPABASE_URL}/rest/v1/rpc/run_data_retention_cleanup', - headers=headers, - timeout=60 - ) - - if response.status_code == 200: - result = response.json() - logger.info(f"Data retention cleanup completed: {result}") - return result - else: - logger.error(f"Data retention cleanup failed: {response.status_code} - {response.text}") - return {'success': False, 'error': response.text} - - except Exception as e: - logger.error(f"Error in data retention cleanup: {e}", exc_info=True) - raise - - -@shared_task(bind=True, name='monitoring.cleanup_old_metrics') -def cleanup_old_metrics(self, retention_days: int = 30): - """ - Clean up old metric time series data. - Runs daily to remove metrics older than retention period. - """ - logger.info(f"Cleaning up metrics older than {retention_days} days") - - if not SUPABASE_SERVICE_KEY: - logger.error("SUPABASE_SERVICE_ROLE_KEY not configured") - return {'success': False, 'error': 'Missing service key'} - - try: - headers = { - 'apikey': SUPABASE_SERVICE_KEY, - 'Authorization': f'Bearer {SUPABASE_SERVICE_KEY}', - 'Content-Type': 'application/json', - } - - response = requests.post( - f'{SUPABASE_URL}/rest/v1/rpc/cleanup_old_metrics', - headers=headers, - json={'retention_days': retention_days}, - timeout=30 - ) - - if response.status_code == 200: - deleted_count = response.json() - logger.info(f"Cleaned up {deleted_count} old metrics") - return {'success': True, 'deleted_count': deleted_count} - else: - logger.error(f"Metrics cleanup failed: {response.status_code} - {response.text}") - return {'success': False, 'error': response.text} - - except Exception as e: - logger.error(f"Error in metrics cleanup: {e}", exc_info=True) - raise - - -@shared_task(bind=True, name='monitoring.cleanup_old_anomalies') -def cleanup_old_anomalies(self, retention_days: int = 30): - """ - Clean up old anomaly detections. - Archives resolved anomalies and deletes very old unresolved ones. - """ - logger.info(f"Cleaning up anomalies older than {retention_days} days") - - if not SUPABASE_SERVICE_KEY: - logger.error("SUPABASE_SERVICE_ROLE_KEY not configured") - return {'success': False, 'error': 'Missing service key'} - - try: - headers = { - 'apikey': SUPABASE_SERVICE_KEY, - 'Authorization': f'Bearer {SUPABASE_SERVICE_KEY}', - 'Content-Type': 'application/json', - } - - response = requests.post( - f'{SUPABASE_URL}/rest/v1/rpc/cleanup_old_anomalies', - headers=headers, - json={'retention_days': retention_days}, - timeout=30 - ) - - if response.status_code == 200: - result = response.json() - logger.info(f"Cleaned up anomalies: {result}") - return {'success': True, 'result': result} - else: - logger.error(f"Anomalies cleanup failed: {response.status_code} - {response.text}") - return {'success': False, 'error': response.text} - - except Exception as e: - logger.error(f"Error in anomalies cleanup: {e}", exc_info=True) - raise - - -@shared_task(bind=True, name='monitoring.get_retention_stats') -def get_retention_stats(self): - """ - Get current data retention statistics. - Shows record counts and storage size for monitored tables. - """ - logger.info("Fetching data retention statistics") - - if not SUPABASE_SERVICE_KEY: - logger.error("SUPABASE_SERVICE_ROLE_KEY not configured") - return {'success': False, 'error': 'Missing service key'} - - try: - headers = { - 'apikey': SUPABASE_SERVICE_KEY, - 'Authorization': f'Bearer {SUPABASE_SERVICE_KEY}', - 'Content-Type': 'application/json', - } - - response = requests.get( - f'{SUPABASE_URL}/rest/v1/data_retention_stats', - headers=headers, - timeout=10 - ) - - if response.status_code == 200: - stats = response.json() - logger.info(f"Retrieved retention stats for {len(stats)} tables") - return {'success': True, 'stats': stats} - else: - logger.error(f"Failed to get retention stats: {response.status_code} - {response.text}") - return {'success': False, 'error': response.text} - - except Exception as e: - logger.error(f"Error getting retention stats: {e}", exc_info=True) - raise diff --git a/django/apps/notifications/__init__.py b/django/apps/notifications/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/notifications/__pycache__/__init__.cpython-313.pyc b/django/apps/notifications/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index e6c363196f0e240dcccced31f0255d965ecebdaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmey&%ge<81P%rKnIQTxh=2h`DC08=kTI1Zok5e)ZzV$!6Oi{ABy}rPKeRZts93)w zF(lxc3JTQvD8z9O-_Ob5mv>6N^hmAZG|Bwerr^S>&s^)|x#0Sae?5g?2* z?-hONfj1#H$&@hvHetcB_t5WR!7qAIe>ok_l#vUWrADesPtv-cWU5-oqJh>F56@jf zMD4Ysx_;KWvJRr7bfc^%D4daF0u<|ejDpWR2$&B&7C@i%U{Lgs%#*BCl|b7G$g(t$X73Nhry2tUB;C-78!p)z zt~JH=XK>eTiL0W=NWPKPtw%qD8>^jrU!Je_r(a*g^{b#+6xadhxyo>?oy|%eI=IVs uU=FCuaA-Ds+^y*e9H8nBs_!7V@F}H#JdXyKA)(X1eV^X{9$gY-ZSp?=O1#Vf diff --git a/django/apps/notifications/__pycache__/models.cpython-313.pyc b/django/apps/notifications/__pycache__/models.cpython-313.pyc deleted file mode 100644 index 70b457c5a0c85008233c2b509ae9cad302a967d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmey&%ge<81dj^%GePuY5CH>>P{wB#AY&>+I)f&o-%5reCLr%KNa|LwerR!OQL%nW zVorXMetKp}Mro3Ma!!6;Do`w=C^ILgq$n{tTQ{|$0H`3fNIxYjF)uw|Ke3>oSU)en zBr`2DIk6-&Kd)FnH$Npcr&zC`@)m~;kX@RSYFESxv;*XZVi4maGb1Bo5i^hl0F2f! A3;+NC diff --git a/django/apps/notifications/apps.py b/django/apps/notifications/apps.py deleted file mode 100644 index a581e111..00000000 --- a/django/apps/notifications/apps.py +++ /dev/null @@ -1,11 +0,0 @@ -""" -Notifications app configuration. -""" - -from django.apps import AppConfig - - -class NotificationsConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.notifications' - verbose_name = 'Notifications' diff --git a/django/apps/notifications/models.py b/django/apps/notifications/models.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/reviews/apps.py b/django/apps/reviews/apps.py deleted file mode 100644 index 4fca05cd..00000000 --- a/django/apps/reviews/apps.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.apps import AppConfig - - -class ReviewsConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.reviews' - verbose_name = 'Reviews' diff --git a/django/apps/users/__init__.py b/django/apps/users/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/users/__pycache__/__init__.cpython-313.pyc b/django/apps/users/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index dcee91e3a9ab90bcb6ae25141f97c69932baf8d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmey&%ge<81P%rKnIQTxh=2h`DC08=kTI1Zok5e)ZzV$!6Oi{ABz4PIKeRZts93)w zF(2KczG$)vkyYXgbLDVi4maGb1Bo5i^hl0MPR+$N&HU diff --git a/django/apps/users/__pycache__/admin.cpython-313.pyc b/django/apps/users/__pycache__/admin.cpython-313.pyc deleted file mode 100644 index 49629c8f8b808afb049b86eb8f79d262e67c7ad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11850 zcmdT~Yiu0Xb)Lu0zF*`%_z*>oB#P2X;!-cl79~GqJ#3Q_NwV7;|yF+U2_Pd6Q@`=MQAN&UW=u2gq*(0}H&Y-y&f zX7jU!lA0@*rVBIkEL$m*OX_r)sS}3I)Y)=gFB)n80~&lvG!@Pb#7D)as489p;GfM_ zGM6i}MZ9{Lenn@7PHeMT_Ik$1PScD30=4E;^5hG~Trqo%xR`E~=UGlS@REFScCO4S zXTM0WQR4wEZ%Q^@)UoL$c&S{}%>ZF9vGR1GsORh@=07g`W&Hq<_k>A-iBMlj6Pc_@ z%*DkdV~JeDlEujsO=0dCcgkZ1dGq$59<-ypy62Mp$`_}=$5<%M4C#EFz|?sR#7MV{ z!Bz=jU43K>lh`yEhkMe^JethBGp>|kwl(*gzMxmK4-%-E3Ytxlq#crk~S`<(Wds^c9RuHdiTJ(M>NWEDLYlv^S6cZl+W~LcxRc6>Ca@K8}mgScrcTBV?JA? zVc;#2$?#zn(S50$$*>S+U@BabO!ss_FXjz1Xf0c&%<_)sAWIW|z zyXd8#z-|Hq0H!CC$(M5&E$4*&wAiiMqGCMO4+Q{=m)JH} z9x`%|D)1zf6^i50T+9o_^=WSA*E}qsd0BAAm-3rou1we?FP2Ca5BktdHDSGQC8mW@ z85q*%Oc&owE+Ww;BdY12VcAke&u6BtHSlaDC9-2^%3hVwW~;)|#1JO12f*~_vZW06 zzFyJI7;M8-+0ZRbnk&NQ6iv_c>-?SVCH4r@v-xtVcnz9F>cTc#R$3KCfaYb8RA^cI zYQgxz*;-q2VYJq*F1tEv;rPPywa}r3bG78|-@9n7HC6jm*P3r!+X~ssokAbg&W+1G zXIZNBxoW~@R|nLWm_DsDy#xcuj-XmfzAc+EzS}dUa-}d`$nkw?m^~J;T*?^pQ?mub zfVIv*%USsfw(zE*snVX*~7ILQFxLm%P;Z35nty0GRYHHXp<4)7f zRCX3ae7y8Y(Yf^56NEiU;5Y#iF{49tQ?Z_;0s^#t1_2W5&RVdeF4jYiSg~Ql?uB#M zupMVaN48YAMYetr=vn^-%<<>9*hxczCVxg`9{jrS>&35vU+k(Ok@l75)qDrVqmt$a z7T{PAScqd`U=fZ*wKlC?i=`!S#z9SRYEtWPs7Gmsc4}Q(x3-PAj*2XZzIxDCXfiw* z8Io9ZvJD>2cCA=^&n; z(;1mwMz)OYAbPl*ov&QZ(9SO4jBKjyY7CEc5q~#8H8|LG>Q`f@a=G$+siMAEvV1ex z3BK`Ca-+8Coy!`=Rh+@q_)9om%cX3wxkAd-Xy5c_uVishrNXib^QJA1h>t3yV! za|Y;jp;RNMF@lP&j_X&s?+aJdbrnmGK{nLE=d9QvvyL7{Ghd+Q$*^H1>P@oWAu5fS zO#+y%ad=2CrzA6w*Nq%2%#p8cD#h%SUd-7}DEI_{a2fx$>pCG`BI<_cDUtf4Cl7wQ zH$l&(YR?(Vt>*6N9z(VDS0(Q(ZHj}KRD310^Xcc2!8Rksk0-Hr6EMEdSV25uc$_6}G_?P2h=OwI!WpWIJ@yeISu zn@?}EDVN~AYmz2wuC!c|U!_*~qbU>eCHtD?(CBwU(%g=BKOtSBo;N&>X>~4H{lX66 zRj70#>54MN(K z84hjNRB>K6l^Le%CG1X`6s}FUDPfP48TSXO?4&W5EvZK3T2X&$=M-FB+FqsnAauXX zM$|XoI)NJ;N3UKkRP+<-TsEJ_rDQ}sGWSLG$+<6{P^Y-BJ;<{8!o0!hCt&$Xl|iFW z)koArhrqP+={MgxIYfOuZMxw7U8|;AdbazZ67Y_fRq`6`3Mn_EJ2oRZnDUHXF_rl_ zY<%tpn!z(=-54+9T30YC*iy5^S|UJ|OgC@YFvv=)cq|PZqoR020~>btCQ6Je0Hk># z-+8eXOWt_$`ja=Fy8hJSnfqP6we7oVoqcN_S2DbK?xA0Z_pM4o+gYg=P2TWd_uo8v zD|sin7j8ejeLcADamB-{f-4mM7|hYmyOI8tNdLMZqUoQ;dYAh~@5ILbEjYF+6XjP1 zx$<8=J`vFLU#j1sT6CV)gzG%b_`NMOz9d0k#gXp|LKeK5RFW^o zL6Pee7bpQxlsd%?illj3_JVgpo{$>)obpw>94&0z@Kk=oOFzhCJj?)iK>L(20%QZ& zJb^a=s>7RU04W?-o~wFc=5l2O+EvUqs}F3VN=?wro5gJ^*43zZi_&+lAB|OvjL&mDu|9%=qGv8 zL^nK6y?kpusZp=V#>fq7%2ka!5~b4>W`P`zboFYBq#m^rur{BTnRxEh`1si~_Rg<< z=`kIbagUsVQTlXD)QjV%PQU!(Z=H2|zxJ5kxn=#dI&bM3=9)Wfq~w+ZR0P&?h+Y7} zOg2=y**W}sVkU2it8*~&?#R0%Fg9eUMx}LGB8w!2!Z=#n6F0Ws*lw3yY$|)`wJqEE zCZeU!@`ZD!HdkiyNPcr=Zc@r7RZYp&n4^^F*wM-PH2P|hPyGnNaR-C(!8gCIp0z?u zwmd(f3O{u|_~s22J@KfNUB&V5xEvl40T~Q4)(}D6BmY+v7!o{i(Hz>$-y0~g^R z&f;uV-!+~?sg7vZhu)7GK;3c5qgK;btDGlUNZu5G#i}23)T_*4&Ivex4Gq?pv>3}@bQB1^HBTSpIr&7hcoVuoZp~51$A&-vabuhdcRQ^5Qvv{T!>$q{^#)<1E$kp;*_b#i4{`Rv!nEc-4l6NIKT8k!bwq5ss zO`wqT3XAS%W};#FIJ+gT|0Z_ww>F3?5_|W}ci(*bP1`g6M)21V(V^ww z;U*C!G?*%K)zwN_z2NNU78%udsv{$$6opajS6pLd>{Z&eFf665?sbah!j7a?Haw2s z3mLgIk;}++0U>BxM!pT~c!i8yo9@c(G!1T=_S9!nw@zs;CPW_sbOX|KcBPQhEzh}v zMysh!G9i&>4lM_1`PJ+sB8uhz9`HfB7&y*Cgc*n?QZN<_D%3{X7;Cq z9RV&*N6zjgJy zU;6f!ejGdlk9p}cZ;$@|*)@f>s&|vE`t)+}nI=7mHtPWmzlv zBMn*cXntzP)~OsyPMKjRO>6lIX0V96d?s(jo6G=zLmC!gRWoGhS(dwO=Wk3ek3AqB zVfw6$j$Sd$5JD6-1759+03~L4^xyOpc-G2bv}YN`qSzP#vRUi`0rKk@_fI^O)GU__ zD|q6z-WVNKj7%V-oxo^ydB(vE+0IT*FBUTycoIt}GO)(NvzF82B31$vFE(VH3Lk$( z_?atpKe1zB{6m*N?p`?mVW%(VUKsl@sU+MB7gobUTiwZc?EhnE?m8BiH zVM@LL5min+2jb2Ku>-_a!QByFmAzdcd%@c-_>-Kh5ZTiSvIpd-;BTuXhie`EYl<8L zQ3lZ~_~X3Y<7hY8Xg66)9v-M;Wa6$_^Is3Dq(B=RMh!?d__sGNg*XnMMJBEt@Tn-;#Ph|*}o?FtfB*}gng8h zm17_Jg~+J5@cezn|JBJaPcHW!UQv#$Ndc?*qpO6ib_?!+ReE$q8LpQe+gLihq8wY3 zf>zxpRta0}sn7T|e{Ag%!cGeow74jCSVEo_6DR(ElHlMDv&S>J4= z5so9PWQEr#$xuJLc>Bo`8C!pg3`Kh%F$uQ$_koc>xCc%kgI_~Cnub({NLY! ze%1cS9Vl(hijVni8u%XoY<6eiVWj%HrJL_917uF&UOeXB(sL(rY}tFvlKW1ur#>Oq z{Z}-Wzb5cE1inRJga8>RE7AEK!oCa8Y-+woL;@sOgOa4&)C_(Qdv)P_E!K7OIqK$l0Gu#9 zGmfM-V(B`2h6+vtAZ}B~*%_jKp8&;Ua6$Ftcp@loda-4Yd)M=<-X#B+#Y*&uToX+{ zg$;2I7IFqpj8{7m<*sM!TT=T^qy1|1C04kS&0SOBTU2l&8tgghdy4v&*gp~e&jdb4 zAOlbhow8@4UZPq25oj%2PXR&3|2iq%R&gB!mT@`DVmW8%GV53^)Nme99kl6pFo00B zJcvGcc-mDDJu7y2+Fhq049&yS-a5s{!_$6*r)iA*(E=O7)4}QvCvN0OOC@QkNFC(# zQUzC4`(pGO8ene$JRnnRMXgT~#)w8YdDCr08m++f$Yyb;Ed$ph=|j_R?REl6a+Anu z>@6W|7uTi*kR8Kgd)z;wG4yU!;J5j)7;wsgr3Y}Z0I-t+d^Mv(gj9^{U0 z2y(aR4e1Qm8`=TCdDyBcFfFkkpef5jf1+{T{>U0N+vhiEiFTo-k3T7{bSJWR*}J#N zI!74QVf_Sl6BrB67yNkTR z)u52v>Z!JwuRNsn{T9e|Ice8JmuwNdKl@y&6DQnGWGUF+gFOV6w zKA216Gf?^f&vK-@T8U};AR%oz4lYzSL(gRmog~Tav)N{|&sPfgWR$)I<=G!(yZOg> zX?!_gFuJ6g9S((a($}E|dM(W`%Fvp@d3>`_%-cQD`DM1*q`Zy~6DcifT?@>R^&Mu$ z`kIhYy4H-f(Ck)V#b6!C1;Q9Yc(FcCix4?GX$%idtJ|4pKtNc%&cpP zm+3RG_DE~;lbfr>PHJyIfdkZ@_ayqkmyu7i|G+EMMKJCGAay8;aH2)mM_xhPaZh;m zo{+jH^xYE%?+Lr^3A;Hw_Fux#iZJxh?H7BOj^B;#TZ!#^DB$H`w?`aUnz)n7wzzu7^@cd}3*IUBC}Wk=b`kxD5jRG>jM1}*Y-6| H;?w_Me~%2* diff --git a/django/apps/users/__pycache__/apps.cpython-313.pyc b/django/apps/users/__pycache__/apps.cpython-313.pyc deleted file mode 100644 index 62883dc3459179d5e39db24a933b92a98098cd91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmYLHzmL-}6t>f(O@DC$1jiL2MK>UVL^2^UAfy9?bbz`?U-Eu@-+Ry7@pypr`BCo`-!MYI&BxX8cEO`f`JHVT?c7Z&WpSODvPR&2InR) z#HxQ(*DtIqZBtv+8tmEL*Vh`IAi$c}NicL02i&9sUgAPG@g@j*Nf-RQ7y4>w>DqGV zzRq0U%ihy6ucB-gomLs+B6?orM~$pr6^v)gfmSA>#)wp&O-`?v4ZX2VM_X6J8s#{2 zmJg0k>k4EbioB#eSkN-#rpM0?@y;lAba`)PN8@kcJz3M99a6@||aoka+<@@}gvArQJ6&Hm41jgzC9z zpB|iYO|Tk$Vlb-&vqfQ~Nz^Sugw#7u36&CxStFSs#0r3GM#|8Dc~Tb4lEl7-uV{1d zbdY_tHoB@Nc(|$KS(Cq%WKN4_fxop#T5? diff --git a/django/apps/users/__pycache__/models.cpython-313.pyc b/django/apps/users/__pycache__/models.cpython-313.pyc deleted file mode 100644 index ebc5caf94aa766bb977e0bb513574299d1165422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8781 zcmbtZS!^3gdT!p$7De&UE!l4BuuUJ5M?S{(&S6={u5DS~QA<0ML|LLGwxqTxwx*i2 zEh393L9lD@4B&Bq#5>7@y-yoIWq<$)f&f7R1j#GKS%5?X11t~(h~Fg3n?drDe1CP5 z)IoWJqybh}*Zu|=C@yA3)Y zJD1#a7V`qmKwxgg#XO3edFOpIq21_qAN%*r2WBD%A&OV=UGcCW=CvM#(mchl1g^MQ z6EHd(Vu*@o7^nD=OOceOD_+)oC}s%Mnw2ot3j^n9Luy{7MTua&2r&8@VtACO5(7pI z7{?F6h%2p18`f!k%Q_yVUFiT$+gs>#@|D_wF?7gE9;Hj^29-|Wj5NgQ0p!9#2+qQz z^eRV`qgVWla4sLj!TBFkWPTn;lmt7f^bNb%F)pM1kkNsQkO6v_tPFMwETNoMPIL=* zU93+ziSPdT0VUZjT(pq{HmICp$Cr;M&sbg(w^t-7g?~Owbm!)7jLU0GUsc(|e2$aj+>o*`oBHfz(qlC_ z?54o36-aAKYCe;*L=8Nv3mL6ovnOK{OfzjA-n(4VZTa(A{nNZ=1y{7pS}LbK%)O#} zO?m(mEbp|D)d*{uZ^H81o54sRZEwd4IQuFbxA(iojQcwHB-@bYc4Oa~UQ1e4AEq)| zb~(3V`4%#2_MR13Tru=T&1B73{MCQcO*!<;{K8#rF(-p24i~q;G_w5IfLQ1RiL8vx*wY`V_4$@Jo6ltGOj%x2%Pd(TTE|S;s}zosMTN*f&>pN9 z&f1{o@RRgeK_i=j(baMq>!EX?Jy;>8Wz?LOPG!|qjdR9G^$KVBmUl@dNwfyCbk$&c z(a7eQzK|ycFfE@(+F^;r5fR#B*lSL10fY}4b{JU~^UeEb!T|4kU?#l7E*Nsxp>V$q zA9gcQ39#U@m<$$z#Qe~0EvLS^2a1-DpHv}qHjS;O?ixC-g~@=BU$V8`^4sV563$Dq z#1ub|RLYW4Dd=K8qoE&4r9RE88QLJeT2iScote1|sAUZd&;@gCv_vSs#`Nqm^YZ0y z(6w6ue*2nfwWU%f>H1jnW+>z0o)z@1nbr?ZNMDPsTqR}FT>sD7ls!zP*99< z*G!)E-dXM88W1!#oW84OmyKa{ZOt6!dmSbNk}-$Y)-5lcgH=BgIuVl;|Hncl-u+0d zwDuL_{g1?7g^z!9s739eK1Clp z2ybw~bHYpwRPPK3FI|WW__4oqv0gw-nkX~k#R|}wFgj#@cg~kdSY*sMgi1^NN#Sv! zD0Xo!rWc)f2S7ofW9A(EAv%boD25Vly0RX`OP)C)Ln6(ePa>JxygAQIHRh;-@viz5 z%&H2m@QIx9S5dILmTJHLMx5Y9oB%)tq1Bf@@3abW*fJ_Jt2Y{W2!|4hV5-?0q8X$r=yX z2Q>B}eR@sxzLxaz6Sw^KQXInPnRIkA9{U%+_w%Mo zxBPiar7Q8g_siZtKZ=oXrK=B(7~iKZ+Y) zHJRFbXZ)*vYeJ)2+jIV&q`%NIm&FF^H!#WQ)~4BeXxTM1NnicQ>ZirV3H~mc-NNb1 z6ETa2$wR#V`-E{8&4%!+_8$9Kdhx=+9I=nYe*LCHp>1)&{V#M5Q=OB5(UXn}q+B&& zwnwS0VyH=uQ3up|VSeC^=7xpyo|&4c*Cx~yVSv`GiGLmbzN@-w8Ue3NSYjPo?aee* zd-b>CzUW-F;-Q5Hgrv7{X-3QCS=|G|DI@M!%c$!z8C?0~5`3WDg^MF2N5e_WC0nj* zwto37iCbiDyRBeGHFI{?2h*aju>{uQ_Q&#pu%0_`&mm_;dsdXI!S11-fPnc4nhjyg zFN7jbK78`w&(hDc&$G~tXU0>b*mnGd`WN2648IH)PrO@B*SL&vGxhP)dS_54rJ+{TOrpN3O#*!x(9Xi7` z3+xm%r_qq{OdE@EA*5q4^@wjLDTcMY`MjQn`$K!da-%EpFqQ-DlL(HjsLVzV8x+2! zs?iqW1^$hw%nDsMjEtscZN#S4B{k&)RWKGaQ}(cA2T`d!%UHo#gqQZP2XRwf)vV@m z_~2QXK@R1bXGxRrV)}CS7J^$*nV3yY&rMC))+=-)o70vxhs8)eAW89n#0t+T6EoAJ zwr()-*A@9qNpBq9J zpigSZ`q^D9P+P)p|O8$-OTVbI&UJe~8 zg^u99E3pgPK2NiMV`3{LwD*?V21{*&m3Uhv9DD8dMx`xDh<|508f^D(OmDRc(T;LN zE=A-@yd4;o*i{gX`ZsQXXuPW&8!W{JE0MNJ>>7y1{TsJHG}ig-*dHI`*h3hN`8RHE zi9%DfEOnQpZW;%zSRV*A`8UQuDBN0ZmP^et5sHG=FhF7d#w1vYb(W)vQZ&J-_0_2n zTLY!YK&3g#L1(ILNu1+EDUzs&;R;w8emd+Rwe?qGBiqdZ&VH-Vd9>Vds?>3+5{cUE zclwLo)~%S(eq>|1(vkQgvvKEJuiqza3usLZO~3D?(AT+2}j}i=q>T)yog9MR-;zyIOPNhP>P%PJ&05N^FAe@ zh)NKJf)KDM7TWg!OH`yQE))s;jf(_)b$Q=3d}5xcG%2AgJ{ILkax;?Ta4kuWDJ@8f zy-FguHcnyl&= zL&(3XW|18c2&pm6=6Nw$;;XWfLnTOMX*+p2=_II>-8z}90i-cFWQ3^58Z{J*796@r zzEDJR&@`S{UicDddDOQE5!#v}&mpr@BWp9j7PkP`T-#Xeu7&TlOMRYbM7-2W+P>e+6tyqAjNQ ziriF9zw|e91?&v*+{mDvC%`%yB4?7?Q2c-FGtt%~0`CdeYLUqlAcsXJjpGRl?Pkao z?RzNFfUkE?7d-M=8F?|CHj}9_so58HajR`bYKP(E1b+=wlO`c2h_ydUK24I@DMtHV z^uI{|LjSq`;&+NI?-a#%_{R3^i6SQ+ZPE0@_N2Hdo+dsEgJUb&;yqbks-^U5RZtOw zP)Ubm3H1U4GuWqSkl8faiWSmL$|LOr-D<1tY4`BoV!laI$fJu$>y!1z>&4!Y&6bg( zIP!nq%+>EXo9Q~Z8K@&|fOF0^u=4&ZutYFu>kW^FxKLJy{+{@a@8$Pr-`#BKFN*!P zP@Mp9I@#G!P-g+NLNj-!CQ@VHyK`e~Lb0Ql<~zua3^aCpK!R!o#zvK~(eVjeV164z z_9>HgS(2lGNSj!iK-!+sh4oz_z+Hm>0X2U_O(Q*_oP<$BrqTQxH01aLKJj(T+v?w# zg3k@b%1y^gO~;V(kkcD_I#g-vflmziH^$*c3EWd^>LEWL>8(WC;b*slJ`N>^U5*Zx zqJv*u*onk}p-BQODEZ8S6!9vj3=rYD*f^vT%mnYnoavhcXjt)mFeE#Bx|=w$L-9 zEowR(Ew9YUS%V6ycD>qUUBpN~PX$mcMA>nVH%6Jy@zUwHA~B7swOYDxs+qwYFc=v7vX2M!~MBW#2!K2O~W@~nYkmz>S7E?}F+(jJah)wEVP zI$eWRx!aAjN5=oRj+Xlt=XPvgyMvQKy@h%moc#=0?tM?=5`p5m;%ZbT*j0(E z8m<5TTJ*1=`!}ps;~e~=%haSe0kzGA%#N&YM;=M@o^}rJPo46?gY2y9P4T$)ME^s5#`s83@^V z7X`vUrDXyJ|98ctigyP80oaTC7L7bA`CkHq{TVgmXut^7XZbvngtl59>~JcPb(VM~ z+qC+3OW7ev{|Q270S#3X->W1>%89F+iL2$r=w@Q{A9DY){*UX$#Aq?`Q91GPX5!wtT|iglkLi3`*bng{H{k!Ou=? z1%zPpFU15LVz8O&k;TM?;-#sge4DD0(_F5xJHAue^K`P~(CCE6BkU)@va11)sK>SK zchR%r+_EAY*kxI*UV9M#wCp;f>YX))R?Vmtb}UZHHjtKN!fd8ELAFF|*Dr}19$wUV zPJl*n%;yB4hP;mX?`SBF@uGmyIDk1?4Pe4TPoms?w$yzV#SN+t_&hyG);n;d1EXc(EU# zvAUg_x%1D}5EZwo3PP663OWes1v?UraBZT$y{c$r1Z`Q!P>&z+3F`6xMMj8-_#V^` ze;0kgUgDD+k$D}>mdE9CZM!`#?~Ww6Lf;7IzY%)B5sts{Uvs;zJbLeqK<_t`-VxWp ZqxCleUT^NY-gn(`eUbdNKySXr{{XYn`;-6x diff --git a/django/apps/users/__pycache__/permissions.cpython-313.pyc b/django/apps/users/__pycache__/permissions.cpython-313.pyc deleted file mode 100644 index cc80fa76ebdbaef10f21d1df9c6adbb3cb968d15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12538 zcmds7eQaCTb-#~%{H8=nlt@|f$1^2aVr)stEXNirIhHLumgFg}C^bo~m8Hoinhs4W z_dVIMoV8vHtTK{S&ekAG7a$stVM;N;E-(BB7yYqmiS^4I zA+M7tp(M&hEkoR(g<1qmTZgQJJmm*%)W+WVA^V_%I#}8^+4B~L@OFdv~t{Y$g1V;7~c^hhtwBB8=}5(TeNE2*2PDw8^}eTHb!g4cWOC) zmb1%LrcNOEXz7pvQna))F6XEuOysE0 zcXmJ!v&qR^Ix9;ZZueQ5yPQsnQpDXZnA%8O5ECz?vnkW(P+=sO5!=tlB{3<)6A4k0 zghVbY(_9A1o;iO}OvvpS@v@i^CXLZZ?oV(AVNS7Kq47y6Y*C!gOv*6Mct&xah-WhK z^BEC}J*Q=PazuP_N|a=HwU6YcWRXJ3jRnWWIAw31KGyMQ?gcT6g)DKB(i~Q;D$bx^ z%%;WU@F%$H&?i48iBxf7h?7X*nDob?CDywj@j4kNlmj-lL^*1WS|}g20xR(2_NZ;# zG45oL@uOK}W7JK8rTU-)DPv@zWTZ$cbi#jKo8#BsKa_{od$Y%15D zO=mC06$e!(tJq|mjAEyvJVmn!jU(Bhus3{P|7Rv$yU96?iwPOC=p3E3j#;A|R?YI~ zG=3pugl8?31S9%XO}S%y)Y8pmZDY0(rzu-YwrO#^iI8&)1u$czLd!NqQ7g1iY0A)& zmE@o?Qh}uSFRi3q1hN6+eStc2B#u+KF4WI3$NJ;K;aYXb#ANM|KE zo=u2CdP2Ay&!m$FgyCFP6ml>adL=E1ZpDFviKUYuT$XflI&?gq&4To^A;x7{yfi7p zD}svJVMG|7_6=lNYwFM=!t}0DWN;<{*<7|=d?_u-Fk99N6bDSRM@bP;nj=EEg1UgN z6nRZ?@lrgUp~$F;Eh(O#N-5s{oG1QrKkb`+Oh;c>zWCrT(lxCZbjXFHLK zQl}ixA-VNwHl^$m~(f+0Hj|+aGewaL0A2~#(ncs%Z=?bXI2BD`R=7a`^?iDc2ZmaM$cY>f7ASxyuT^$@0{r`*hy9G?6uizYgK_aDqpM2?>+He|1Sm?2jA<-?>T$7>Z_~4 z#*h8MnW4|``F5-mi>rRkTQhs+#+kXN7M@sW%J1m7>+M|g2mfo$=U?#&OFqG~j!(_hGC-k+D z#U>8J7WauZ>tbj9aj*4#ZzrVR?{z`=Gkg7sChO0dY>BI1t{9r2?ktn0FjkuI>fKp{CV z^120+<;J*X61GnNwYy(806-oYTBNDCNjU+$j7jm7sN&19_++{R#H=mUIZ1OeXmv3e z3NsKnhS&q&$B-piPEwo@j9M|>vS`yVDy+7M;-YFd;aUheKNQh%i!pZx6Wc#@Ga)P? z2WquF@L&H^2##{ElQA*^sm+g}rl9UQBp-Xq*F9$_M%}p5zfOAKYePjwIi1`hH);(* z&z(TjuX2a&kAw2<=bl6YTZZokH^G-iqGXs?cqEhJPD?t{s$2%$kTB0C3snHu75fW- zU@3|I9+XHpJ|Nh2#%F+SU^W3xD7(zG@94?o67h_5v_mU?2EY6Y1fO3gANvBcFVDXG zPGliAbIfF8P74eSTue*PeH_GwyuX zLXm(>JRprDq7iHyEsJjo>Y%*lvCyMXauTbch(P}vwZ!h3>H6-ug2ig*xxaFlygJQ=feS++xz z;Rgum-vE*wwfwGxw7j@yt-HyXwVZ96<;VCD!=}|33?dy4;$A{VZRG`j)E>1&o+Bi_ z3oLPd1Zr-69wAs4x7#t*o0vheG)#QhcQ5# zjUvp^ryx+AX(`6!NAW_c*ar@sBD{wks{M5YGrBRr?iCkGVGPAbh06 zU)zo4^>bfY_U~KhUfJIVzp~X<>vqh2?a#hZw(MSD-$LLvzi|2X*Nx$Pe$U^y;%{5> zx2+Qn#>0mC)NJ^V`;1@=I>240W)&VM zRl%7`RpoFL^?caEx~Bu!Oj&KiIN=NwKZ{jxez16jh6Y>kEoXs1^v-jiVN`gMcdM@#=+ULMLQVn z81|G_@yjcP6EMjzN0DL>G2;SlO-+ec>&t13fDS|Hci=CfCSi))TR-Qy>uH`JUG_Yd z=O5cjQ66eCiXz}WNLfcwQS*kH{&9J#K9G<}F(b;LN;}m=J2NFWTc)U|4N|HVV+=y)bVwPs!{}7syUV-2XYb%#oTYVf9R)S&ptu;KB-+yemp)X(C_iw?*xu^5N zL-WZGf`=9+mV$@!Rfir$!Qfgfx)1gpC5uOe zg<8L=Iv{%IxeWqQq0OW^m=%)1x#*99c0Ym~v;F|#FxS)S>w2WPi61j|mCW!1flhH? zpq6*nBJ*r|nDf-BXO=TxK?nek1=u#HEC$P4r~lr40)6`E>q9gY(vkpfJ|TA{3op3| zI4clT9~)C=`pzUrOSVe*WkeXm@4=bC4hb04!j~$>rjuInKtDFhdSISAwIf!!)Dt;M zr za9BAvKjRUDcgk&jOgzFFJYt!?x`{^;z!aKsAhM$#@Y+5SKRkGe4SU0|oZP3vHrfEh zD7U!pa%^!Wpo4C@cwuDvGKv&k0zZd8^M9aJ6Q}ok*S>dc6&B#@8-)Hid zJEngCWh+>YJ4Qw@bPM0O_Uco4zCktdpul*LUGZ7}CkV!j zk?HN4^jSkK6J8~M(Xe2-&CA|=(Tee^s4ZFvr=~uZ zQys0MHL1#QwNhO?GGzED(ogQeET>yeiy82`35g7BaM{s?aU^PT+CM-+TxPU-t||ku z`T)#x<&?x2$rys2B4Fb@Omx9#0Vm*~G>YE=*b_sLxnYo|X6RIvCT5J7p)!O;SY85= z;7w0w(=xco8@AA-LofRkesvIn>twaI{#6$^^jx9UU3=et{>|rS`u}A3^EF>^#n-&# zYX(SUB{Tis9|l--h3-peFU-Jk`VSkASbxGDv2OK#BORE4;ofdLV2pBSIJPm{y+xy$ zPfC)*6lDO=1LtcNg(`GMm`+-fN@(khH`na>w`#WgM)!)R5q_)wdeo`ky78?QU+;YLUv>ON$4aPoDb$;H z_Ws|ZX2%RfDAj3TkQdo!^K4Q5C_A?@O;JN}Fi;7NJtk~$nA!bWw|ba)*VmMHHa%cw z$gtbZj49;M*0FE4aX^Qb<#seQ%5l5d8nNThHNA>Bp`MfGoq{@M1P1-#A;DJTZy~YW zm>&)j=WKd|_@eU?POOi zt;R(`eEDLFa`F!Uj}?Dck$0YCOQN_ZjXPw+C0lTm7$!9zKmw$Oi*jr$y%SDi9(Xv+ z{7v{Jd!iDbbTyA=Fg}bQ@Ufnm?oqnurkA7ouCp?kC+gZnOhE&4g-@bkWs?BHM$q5NED^HI4hkWhFKx2bk!OPoDaSOHhb_(8nw#Y)X zKp?t3`WZ&*9NF}0U{)ntdX#mBCf|p|b~;#>-1wd^b-e_bDa92}V#}kIjwnpGzV3cn zluZ(@y4+w}idT7&UE#7UbLW+azE)7?f?%m%W{U(AZv;Z~>?$C53)vyBdAH<7@!NFP zi^K)13CU~TX$9aKQLHF*u>`sx;ojXJvFcD)+ZNQqjgZ-%*`Bwi7g}!}c=y0h`ISAr zOM7}@cW}?MbMD!<$KM<`9YBTmF=0?#c!x>`=9k!=6~!)Jodi@-FLa?*q z4Rc49UCr0+8}=5ie&*r^f#}l_4i@*7?(5Ei-N*TFz66rV`R7k>U{q*sZWG6*UTx)rEU6ywyYkG5-+M1NY!<&Qu^ z)p+7ms`C3@A80^LN#n_EOMLJ3yZZI(@BY4rjix4n!}VXThtlFC$Ng8jF)p`W*x(!- z_YN21WG?22InOvwJ7wo-m+U(2mfa%Nxz2b_du1;xyU+Me^D@uMo-_W_f-JDI_e|h) zP!6)P?@ZI_X1SS_`7@!@VL8mo{xdD7BXWe5g)^;kYb+28o@qPXF1MfVkULIy%AF!N z(>lG^SYj<7;AXlHV4ZZyJzd-Y7i;R_V$BDfdR;H83!yG-*7dQv7Su(|x_(yIin=zl zZp*w7Z7=+}5LYBwOfKawN!fgQHknW7vSKou5*L!${PT+ZBI-8f~wQi_;;l#w) zlP4xD&qd`+lDv>s6k|Qea^7irzejOsp~p3SSSiR{&=Lk(IUEaAT8 zwPYrpO6H}+Vp37AcX2B?Icn@eY;S?$wlX{&y-ag0IZ z3@1APk4oo==c(8^ml`WNenxo7y82Y=of{|xUzW6Xy;9)JEBVSg|t z^l+EmmmLT6DU4hW%y`VPevB1p?0#=7K>f{L!G}K|E9hji1o6Bk+f_8{D+$K{qqZw) z!b-w3LaYTnBdmAxem(|BwX7qg_c7YNv9`MQaI9T!nRi9I)OLca8XU(oxczw#-mb7u zzavl;F9E_c>Fm6?gfG(w{kcU+gGyye^+*fJbVlV3fKhoGkxed0sxX(9m3)Gg{h6du z^vY6xNzTsFmKqn2f(w5e<4E7(;@q^3)kX)(jeVb{o(-4LmgO!O6pWkpHgv-6wEw}n zIH=hn$8_Mq7Gu_3dQ-BA<1XM&yJF6mYp=tgKawNvH2S5!$I&~4jGnbT<~I7rJhTB> zXWW_f#JpMWS6H_*=6lR_Ka2Hvnz^{QncL^YGrckI2;Sqj{8Uik7x3gQ+=Uin2jb>_ ziI4hH?Z%i|9_QlDxFhb0yJNy3PnN&XVYJzP>u#g9mdAPGE{B|WIsrYqevPqBha4E$ zrw`<&w;H8d9&3*C(_-!3DACRv-(KY6{2;fDyAU*5eOwZ=W_=du;^V&Qh|ylltq>RU zXMGdCImaCLtZOSb=ZJ=qZvb(GX~tj(amB23MZ@7MX>b&Vtc-gZ_zIRaAqiC6_XJMa<{)=Pt_9T>5owXpNAVPi9pj4Q7*@aU=gXSqBhm2>NqBo)FKmk!2|@^GNHg!)T7O2*2taI)`diM)27~Z%3IhC zaeoY@n?n1P@!>UTLz1P`xEO6wJ(=7UFkcS@ko2NV%v1H{E?$;q^NQ*P1J0w-t1U_< zvW%XKnRH(EQJG%=C_w5_)W9s;!vrlrCPJrrwHi6hZXor{Vlat5h0oO|x$7VB-KTvl` z1|UK_nSFIcdVLWcBzY`#Ihmc$jU^Wsl`&ecGKNGG*cPv$M4r+%zQ zxdKdkgRAc6S~}hhydC(%rgC_DDZKr5c*nBmzLyJz-#UEla5=E06xgy7F9x<01H)Sww0%fd(IUH;4PS!wU5|DD?^9b2mbF1)MCdBei8`+kJ;x0Ly=65mzkx0d*=E9cg{MJhdoE%3LM z`Q8%WTjmE!{J^TaNcqTr?0QnmU7N)>*-T{Gu*r>_yll#G7opy}G5DAjoAvzE~vCB@_ zh&kh2J(I971DC-%tYSuT5_6j3?=&G^!!=+EO>t+&6n(H#8|E5wk2zu<#^7q}BphwH zV&2Ae#+`#))K~adf(3OX3)TB=aUDka>nS@?2GC)RqKoOdM$uJSnuVUG%q?a1h*O{# zVh-}Kd<8ULh&pRTx6nVC%x1wMh+K%td|p~uB!)q{Ty|V6^q(U_p48MD2+L6SBq=Li zWP?Ukfw3dj`6iU0rA4Mw&84MGN-4ClHCi<pl(A5>E&PugnC!vrO=UO_kRzBt{;E*%)4jq1S4-vU7ITQkKa0QYpB>e zxgLBDNL?J5xE+}+1}D++&X%3;XZ|?zgY5G0H(#uPWS+WqYGr0+YWY+txR1u4xpt=5 zGrGF8I$!KMxE_4!E)j_htOLAgQB$>L)t{sFCX}U%s*rpwnNP}zB{?%o9Lu<9%QQNG z^fyy5AkMmtY3(q6a}^`&gGk3rFUEK+H)uo(eC2#+rbcImGNuZHk#_0?RFE-e%uQGu z_c4*Owl*7j05KEqFLGPC7u|-?7Vn5}k}{RcKTm3tJVbqWP_mPf-PEI9k@AV9?2?kan5kJGnPR~d3dROC z9w%t;afHUQH)e`a!yB>p7@;nsNE9Nv^l7zA=Z3llqirI+qPht;e4yi1n)CMo=9|g? zRj=RQatA{9;kOT$Tep{5x3BIfwr(%B?p;29x3#m}x)c8^J4e^U+bi34|50-#-1e^j zZGSO(=+-mEU0=KIFNIH5T057|{OV4qwHy*lA(3R_mY)T~BmuX4`AgnjS*ZL?C=2)T za9uwbD1`=e{eUS4q$2cgCoLhwg|}BZp0tE&2j_3nlz?@9u)+u5@?Z1686XW|6XoF! z-}+G1VfX5R)uFZawb$1!7uzP*`AMccC}b{KnFvmdaG#B|O}bq_aXFA`+Ho+KNttGC zH3++ic{fXvfpHOgqx+46_`aJ-3N>8oAe5rBqxg}X9CyOx!>tg+U<09EQ z>YD3m=Q(*vB3+;+{Obhv5w;#cj5)2y>^op4GI0#BHLReaQ8WI?C$W`<)>B!dud%RE zMpETdXr3zczN9-?#96jaDQ0!oHsoB?uQtzKl4f5uAykw5NuZSp;M5?IOJic0Xl#u@ zGV&O8GpJ{aVULu@&`BZTkZ7Pr0Yloe&56_<_S!&0x4)p7t|I~U8vrFJhlmQS94?3U zmO^{)Ky5!#+;_4#aO!sCbTN3k>UH^#Imot<`K#c;s=#PLcZu)5v1gqhGO2-S7IuQb-zV73Sb_Ze(i}*#y=h}4jj21Ia&-JWmbV>jxQBr0{_H6 z@g(=zlfq<|>$Ah1ldZ0ww0cmsw+d7-;2knh1J||de3*25hMiXZL2s?${bu-U!A?`s zpC+4L!xeJ_J5Ala*4TiZ9vkd*TCfu~h-vz$4Obm@y0Xp*rv*E`g}(-V0D=sm!vG|4 zS2DGb&W^!iH=nB^oHz%QVf3*u_iqF(H^n>>Su~qzq1(hS7_afB+i)Xe>4W$U1 zE>ZUs%WFwAqVfsm zze^-kA(2?frIsL_CDdRd@y(@VhJ<9?g%SxS62o68Wpk+TB@(IJEcJsO20rrzDSs)K zl8M`?-ef+vke*dt5Cmn~PG*9ZpPh4kXOB2YwwMHZ;w=cbjNe;T~$Ao1g@>KN+YU4PH4X0gwlqK^L9}Z zsk*7*n3IamPEXrPYn4N`=3?0`{?oP}H*Zjl)|MYe6bs1V`CznJ6%e)&)7|X<7watS)$i)v>y^f)gX@HPvV|U?Ch3B)R^NAEUGD3c!6h*q2 z1pBerj%9Bk43a~U=sh-(%_?fmHcE9ZR>c%RMdl~{`m{KkOGzT^wn@SCuMxdF0UIk* zE>qY%)jyldg7z)I$LWy?teFnXlv~xqh$2&OjWJ0YAO1Zhm!KAOKVzCEnx|Oaz5vM40 z5N7IlD`p{!&LMs*HCpI7rMcL}x_2j39X+Q87Uq%(4PR2s3|1gS67?FBqA+JmJ+8`g zc&O&>4ziiA0ucfGvPAVvGR#nEm=bcd)ah84sej))RoZOCoX%}`L2rQhkdh2t8%j{W|~>) zUkNSyOZ;9_C)=}n?xR<3zOs6@*mh{0ABXJ8NJJeEG7Tqh;yu0^Z6LGBBWQ!g>6*f( z&AXrgne+h<)~^~JfNRoS_&woeLYAu*XlL+H&uRZZppU)bK?Ch`@GvsgK~Qz#0fwOg z;R4zWcEJFP!Bjo3FhR6|S6J$wBY--Mxd2dIHUQPp^H5$P)e1e4T&BpdCzkn?j7RPmleIw#esb8{(9_Ov&$1a-I@e zj;1J*(5Y?2B`Oi>%db!}LrIpBZ&I>E$={-+K}k$d9VH}ba371>cF#Eo9cX`*L$(TK57{l~PRM?mx=$GmG*m>~R?ljh zQ>$k;JqOu}!m`!;2Hok;L8-di`kbmWqCE%M%JB^jS#9PGH*Pgei(ZTPr+FE;vhgES z*=bsv#ZSkAdi=8=vD1PXI~{n4Hic+tbBu4M$xfSM?Y@~1BC4DAJBeX5YEW_*niIt; zH>m*%4cC>W^df+=FlJSqSopmep-iD~@SY(oAF;`LM7%Pkky{bZQ3V9jBb+{!xOi1l zpNMc7m#ID#@R)bFF$4sE-H~;jZ+!;$$$p5S$hC{q7rOxDxG7j#iHYQRgcsS4b#dn- zG54qwu{h2psBeqU$33Pn3+qVSZ5KljcZ^@bS`Q+Epv@9NFjy0CA3IXWZHW|e+lj9= zq1Y0D+imPnEr$mJ9^x1YyJV4RxUf%F-?1BvnlJoMVFITa=CdMwP{S{}8DECm6jpRg zZzjRg$Z?T?M|TF3-EWTw;}u1%=TKx;PR%D=g9_ad!72!>NPDEIY}Cd$CS>y)fkt|t zN4OJcHmj(svw78TE=~2Yr4_aqVlE9C6<=6FC@W%XS-jF59I(zkB4h~>8!8u&=yHY1 z8&R|cFI(PFp>0UtA@CC2$qezgSrc{LmviZ?Oll0%TGb|aZWB28Pb`z43yfRg($S;Fx2KP0vO%0pS0!98;9OM^4^ivbGLh+sPu1p zbE>j^WIZU}**^T?;Xgh6kB%&#!d)fUP61Bq!9HD3zCL&3+>H~(frD%LPYNFw)-uJm z=hpe-l~7la?|M*TcH<40{PZtTAU6aM1*OIdwi4K8#=!`aL2?k<*>nb(WyR8m=5Dyq z$7we|NXJQzW5Gl8HP|(6YPv=Z$JK&|=3Pec5M=A`!_^006*<`G`?6>_Wl@?X-IQU_ zX6RdoJp>_EtOc|(7nlwD8SXsuX(p=5-^Oa?zk`ItYZ18`Oe~!9PjV0boIUOf6u>s3S!RnZ{3D- zyi+W9j+8n_is2Ce+>OpZ+{&t=rOs$E9IdqWy?f;CBP-`ht^aUO#=4FkNMbr^R^9Qj~AG65@UxQsp+;rg{lJZcS(XpcEZJ&y(IP)g`X zVixAAEDl#pea8fOSK(FRYZmXBDR98Sys(gzuRa#Q*Q*9}Dvu86$yY_#TP!k+07zDa z*<_Z&8yC`fHArP0q9qt0amOH9YmicD(C{l+IFQkxDF}2Q^=kBd8J|MFMhT<)gaGnW zNDO~5A%JXlYOrOr5rbef+_FHGv08&j+x7SuV5oc_69Y#&y#D?gj`R+ed!H!vKCyh( z#EIpTut9F!{{E})z52tkO5d(>-{G~kPkKM@{ZXRQy{+7RV0G}L;hV$%I9Cw|KMZ^j z_~DC{ft?=?e=z*R+`Rx|(h->M7k+i$kMI}+k(_vBuSn16`~JzQ2e)4;bRg-wgOdU7 zCxNcXovxqka3E!>Lew#Z$fk#DA~mgp#XT{dgs6tLso$d#Q%C5fWj7^%K#83?a+Mk= zAqiLcrzns*a;U*)wR879-=L?v(hP4E^1IC~RS$A#U+w)j&b>WVrB-;WgvfnAN;T!6 z>ZS%$?dZOqCw-%PWgp8{_mkSey2EjW5>q>>(1U~(Xf?=IkFT|^rPjJ{zPLfROhMV8 zc1_`+h0o&8ybNsL7{%*6zQO@F3{T1d)B%sJLxmhZwnshnkpf0CCy^nW8aW;1e8@=O zOpqN1rDx+%sO_`iCVI#W+N$l{KyV=G>kG{UXTqk+Q-6%KB^Hz;^G$FTwa39gUq~9~ ziglz)|3~a)z4F6YAL9P#z%0{xj8OF2p=3=G>&BOPfH{y>xFNC+q^mm4F$(E*JnYnE zD|hl4j?)y9^OGoYDJUl|Kq9GyBb;{|r>6}P&-%dVWeI;mfb0Q67F=KuE<5W_+@csz zC~koDH0DggSqxTWr#j(O@F9oDT`<6qvkkoCj>{QbN zJHY)|#D4egR}sOFV|L;Rb_jq8<7{3V`9^zSy*+&N4&-g=X@*0aN$rLi z0l4J`Zs{ny8g2pOwQJhW14g*@NDHg(`~8Ck+>+*SN)ab9>30-rhf;~w*+mJ~aOx!- z71c(H8e~2;dKoBVsv;1!TG?@>1iVhBcTG|Iw91?=hOu80$<4h96SJO-lYDC4WN6`;@F8Q3!5C?b4L*h>3j0hAQf=N1&q#rn3 z_Wi=`Wmp@22-ZGT9-h2CJV{vVTlK7mM>ogX*0;`HJG=6Cm(P}h2hH}IbjD2V? z3GJD^EOTrbP3C*+7zDu`p%Do3(+pfjw|ZqH&N$Np49F?}2uqj$8InR1L4|(a4F)N< zc=4)O5JvSSz{cbTXG&%@uzZ?^F|gEQC(L;obZv~#j-_p}2Rfs@6OxBAfms1+gNP@6 zi@(O-@GkQue*YbKHJh(B-{@b-e^~gSu##CDT)XC539Og)Mc7&S2Sn4+T8|O>CQ2u() z@AceD>ch()TwZ|_=*e|{-zIx+S}uOy*n8xSS9TM-g}v3ne*aNRxZiN0))X9TO)&>q z4Dfw^*VOt&7L2GMwDIv+RXuvu>-tNCNHm`!fcdl_04SN!bbZET6t&G@Gj+9LSz278 z=t^Qq2sM|~;DWSp5%yL5?9eQJQimNurJv||O@i{zc)%xkDft#9KSrVk*r`-90!t}& zlGN}|Q)h+X+AzvCn`%8<=w_l@eXnN;AdX`eQu|GQ0F`whTHZEZ+BRMp94-$YD-9ll zDqj{4l*9v-KC#@lr_{Hn(!2HjqwgK9Y4n=9N!H7$XzQ=1oqvEq+8LrhqtXRR)+qTG zln}bhBxK2dPKlk0{th)zLVB1IMDn1D?(9dvCTZu$@rpw8h7TpH9!?EM>YaK6o=!Ff zIgM%G@S$WKLk%a%WmpRoB~Kt5g#2!}wdz5R!EIetAC+JNXx{LnWSxc@cGb@kgg>#Z z${|~UsS%mAKW?ji=ud7(fkHfyt)y1>t+`g8{vb>4N5c?+lJ;e2d!k#JvsU%yuP)MA zWul_B{Z(7FpJ5n9+zW;9vNOgqVZ1tI(=uuVr6-sNfdM*;+g3Zw-m)|*y*?|kpSDso zpN3y=OkHHIVKu1VFXhu2g*h_R0j(;5NW0O+%n}ZCE2Ahgr}!ut*3glpd$kYh4h4ve zD(pwBbQRm^LSnG$qo29JyQ*G&AhQQC(;5lEsvjtEmi-cj2D3~`i=c&hpqbr=K~{s4 zTICO8KEzrdk^en91L8PEK>}m2!*S2aJKSHiagL!9xASvu&*$9ppL0)s&TV7=4}H!Z z{LftT|KP?-+}K@zxa{xwD}T?8r*HcQ-|&9n{au%%?H)(z7bkp+4!WWAi#gXT4u^1$ Tqx6e{^EszO_ytEP`@H`T4Gtja diff --git a/django/apps/users/admin.py b/django/apps/users/admin.py deleted file mode 100644 index e8824686..00000000 --- a/django/apps/users/admin.py +++ /dev/null @@ -1,372 +0,0 @@ -""" -Django admin configuration for User models. -""" - -from django.contrib import admin -from django.contrib.auth.admin import UserAdmin as BaseUserAdmin -from django.utils.html import format_html -from django.urls import reverse -from django.utils.safestring import mark_safe -from unfold.admin import ModelAdmin -from unfold.decorators import display -from import_export import resources -from import_export.admin import ImportExportModelAdmin - -from .models import User, UserRole, UserProfile - - -class UserResource(resources.ModelResource): - """Resource for importing/exporting users.""" - - class Meta: - model = User - fields = ( - 'id', 'email', 'username', 'first_name', 'last_name', - 'date_joined', 'last_login', 'is_active', 'is_staff', - 'banned', 'reputation_score', 'mfa_enabled' - ) - export_order = fields - - -class UserRoleInline(admin.StackedInline): - """Inline for user role.""" - model = UserRole - can_delete = False - verbose_name_plural = 'Role' - fk_name = 'user' - fields = ('role', 'granted_by', 'granted_at') - readonly_fields = ('granted_at',) - - -class UserProfileInline(admin.StackedInline): - """Inline for user profile.""" - model = UserProfile - can_delete = False - verbose_name_plural = 'Profile & Preferences' - fk_name = 'user' - fields = ( - ('email_notifications', 'email_on_submission_approved', 'email_on_submission_rejected'), - ('profile_public', 'show_email'), - ('total_submissions', 'approved_submissions'), - ) - readonly_fields = ('total_submissions', 'approved_submissions') - - -@admin.register(User) -class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin): - """Admin interface for User model.""" - - resource_class = UserResource - - list_display = [ - 'email', - 'username', - 'display_name_admin', - 'role_badge', - 'reputation_badge', - 'status_badge', - 'mfa_badge', - 'date_joined', - 'last_login', - ] - - list_filter = [ - 'is_active', - 'is_staff', - 'is_superuser', - 'banned', - 'mfa_enabled', - 'oauth_provider', - 'date_joined', - 'last_login', - ] - - search_fields = [ - 'email', - 'username', - 'first_name', - 'last_name', - ] - - ordering = ['-date_joined'] - - fieldsets = ( - ('Account Information', { - 'fields': ('email', 'username', 'password') - }), - ('Personal Information', { - 'fields': ('first_name', 'last_name', 'avatar_url', 'bio') - }), - ('Permissions', { - 'fields': ( - 'is_active', - 'is_staff', - 'is_superuser', - 'groups', - 'user_permissions', - ) - }), - ('Moderation', { - 'fields': ( - 'banned', - 'ban_reason', - 'banned_at', - 'banned_by', - ) - }), - ('OAuth', { - 'fields': ('oauth_provider', 'oauth_sub'), - 'classes': ('collapse',) - }), - ('Security', { - 'fields': ('mfa_enabled', 'reputation_score'), - }), - ('Timestamps', { - 'fields': ('date_joined', 'last_login'), - 'classes': ('collapse',) - }), - ) - - add_fieldsets = ( - ('Create New User', { - 'classes': ('wide',), - 'fields': ('email', 'username', 'password1', 'password2'), - }), - ) - - readonly_fields = [ - 'date_joined', - 'last_login', - 'banned_at', - 'oauth_provider', - 'oauth_sub', - ] - - inlines = [UserRoleInline, UserProfileInline] - - @display(description="Name", label=True) - def display_name_admin(self, obj): - """Display user's display name.""" - return obj.display_name or '-' - - @display(description="Role", label=True) - def role_badge(self, obj): - """Display user role with badge.""" - try: - role = obj.role.role - colors = { - 'admin': 'red', - 'moderator': 'blue', - 'user': 'green', - } - return format_html( - '{}', - colors.get(role, 'gray'), - role.upper() - ) - except UserRole.DoesNotExist: - return format_html('No Role') - - @display(description="Reputation", label=True) - def reputation_badge(self, obj): - """Display reputation score.""" - score = obj.reputation_score - if score >= 100: - color = 'green' - elif score >= 50: - color = 'blue' - elif score >= 0: - color = 'gray' - else: - color = 'red' - - return format_html( - '{}', - color, - score - ) - - @display(description="Status", label=True) - def status_badge(self, obj): - """Display user status.""" - if obj.banned: - return format_html( - 'BANNED' - ) - elif not obj.is_active: - return format_html( - 'INACTIVE' - ) - else: - return format_html( - 'ACTIVE' - ) - - @display(description="MFA", label=True) - def mfa_badge(self, obj): - """Display MFA status.""" - if obj.mfa_enabled: - return format_html( - '✓ Enabled' - ) - else: - return format_html( - '✗ Disabled' - ) - - def get_queryset(self, request): - """Optimize queryset with select_related.""" - qs = super().get_queryset(request) - return qs.select_related('role', 'banned_by') - - actions = ['ban_users', 'unban_users', 'make_moderator', 'make_user'] - - @admin.action(description="Ban selected users") - def ban_users(self, request, queryset): - """Ban selected users.""" - count = 0 - for user in queryset: - if not user.banned: - user.ban(reason="Banned by admin", banned_by=request.user) - count += 1 - - self.message_user( - request, - f"{count} user(s) have been banned." - ) - - @admin.action(description="Unban selected users") - def unban_users(self, request, queryset): - """Unban selected users.""" - count = 0 - for user in queryset: - if user.banned: - user.unban() - count += 1 - - self.message_user( - request, - f"{count} user(s) have been unbanned." - ) - - @admin.action(description="Set role to Moderator") - def make_moderator(self, request, queryset): - """Set users' role to moderator.""" - from .services import RoleService - - count = 0 - for user in queryset: - RoleService.assign_role(user, 'moderator', request.user) - count += 1 - - self.message_user( - request, - f"{count} user(s) have been set to Moderator role." - ) - - @admin.action(description="Set role to User") - def make_user(self, request, queryset): - """Set users' role to user.""" - from .services import RoleService - - count = 0 - for user in queryset: - RoleService.assign_role(user, 'user', request.user) - count += 1 - - self.message_user( - request, - f"{count} user(s) have been set to User role." - ) - - -@admin.register(UserRole) -class UserRoleAdmin(ModelAdmin): - """Admin interface for UserRole model.""" - - list_display = ['user', 'role', 'is_moderator', 'is_admin', 'granted_at', 'granted_by'] - list_filter = ['role', 'granted_at'] - search_fields = ['user__email', 'user__username'] - ordering = ['-granted_at'] - - readonly_fields = ['granted_at'] - - def get_queryset(self, request): - """Optimize queryset.""" - qs = super().get_queryset(request) - return qs.select_related('user', 'granted_by') - - -@admin.register(UserProfile) -class UserProfileAdmin(ModelAdmin): - """Admin interface for UserProfile model.""" - - list_display = [ - 'user', - 'total_submissions', - 'approved_submissions', - 'approval_rate', - 'email_notifications', - 'profile_public', - ] - - list_filter = [ - 'email_notifications', - 'profile_public', - 'show_email', - ] - - search_fields = ['user__email', 'user__username'] - - readonly_fields = ['created', 'modified', 'total_submissions', 'approved_submissions'] - - fieldsets = ( - ('User', { - 'fields': ('user',) - }), - ('Statistics', { - 'fields': ('total_submissions', 'approved_submissions'), - }), - ('Notification Preferences', { - 'fields': ( - 'email_notifications', - 'email_on_submission_approved', - 'email_on_submission_rejected', - ) - }), - ('Privacy Settings', { - 'fields': ('profile_public', 'show_email'), - }), - ('Timestamps', { - 'fields': ('created', 'modified'), - 'classes': ('collapse',) - }), - ) - - @display(description="Approval Rate") - def approval_rate(self, obj): - """Display approval rate percentage.""" - if obj.total_submissions == 0: - return '-' - - rate = (obj.approved_submissions / obj.total_submissions) * 100 - - if rate >= 80: - color = 'green' - elif rate >= 60: - color = 'blue' - elif rate >= 40: - color = 'orange' - else: - color = 'red' - - return format_html( - '{:.1f}%', - color, - rate - ) - - def get_queryset(self, request): - """Optimize queryset.""" - qs = super().get_queryset(request) - return qs.select_related('user') diff --git a/django/apps/users/apps.py b/django/apps/users/apps.py deleted file mode 100644 index 0a698b2f..00000000 --- a/django/apps/users/apps.py +++ /dev/null @@ -1,17 +0,0 @@ -""" -Users app configuration. -""" - -from django.apps import AppConfig - - -class UsersConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.users' - verbose_name = 'Users' - - def ready(self): - """Import signal handlers when app is ready""" - # Import signals here to avoid circular imports - # import apps.users.signals - pass diff --git a/django/apps/users/migrations/0001_initial.py b/django/apps/users/migrations/0001_initial.py deleted file mode 100644 index 2dc5b86d..00000000 --- a/django/apps/users/migrations/0001_initial.py +++ /dev/null @@ -1,370 +0,0 @@ -# Generated by Django 4.2.8 on 2025-11-08 16:35 - -from django.conf import settings -import django.contrib.auth.models -import django.contrib.auth.validators -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import django_lifecycle.mixins -import model_utils.fields -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ("auth", "0012_alter_user_first_name_max_length"), - ] - - operations = [ - migrations.CreateModel( - name="User", - fields=[ - ("password", models.CharField(max_length=128, verbose_name="password")), - ( - "last_login", - models.DateTimeField( - blank=True, null=True, verbose_name="last login" - ), - ), - ( - "is_superuser", - models.BooleanField( - default=False, - help_text="Designates that this user has all permissions without explicitly assigning them.", - verbose_name="superuser status", - ), - ), - ( - "username", - models.CharField( - error_messages={ - "unique": "A user with that username already exists." - }, - help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.", - max_length=150, - unique=True, - validators=[ - django.contrib.auth.validators.UnicodeUsernameValidator() - ], - verbose_name="username", - ), - ), - ( - "first_name", - models.CharField( - blank=True, max_length=150, verbose_name="first name" - ), - ), - ( - "last_name", - models.CharField( - blank=True, max_length=150, verbose_name="last name" - ), - ), - ( - "is_staff", - models.BooleanField( - default=False, - help_text="Designates whether the user can log into this admin site.", - verbose_name="staff status", - ), - ), - ( - "is_active", - models.BooleanField( - default=True, - help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.", - verbose_name="active", - ), - ), - ( - "date_joined", - models.DateTimeField( - default=django.utils.timezone.now, verbose_name="date joined" - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "email", - models.EmailField( - help_text="Email address for authentication", - max_length=254, - unique=True, - ), - ), - ( - "oauth_provider", - models.CharField( - blank=True, - choices=[ - ("", "None"), - ("google", "Google"), - ("discord", "Discord"), - ], - help_text="OAuth provider used for authentication", - max_length=50, - ), - ), - ( - "oauth_sub", - models.CharField( - blank=True, - help_text="OAuth subject identifier from provider", - max_length=255, - ), - ), - ( - "mfa_enabled", - models.BooleanField( - default=False, - help_text="Whether two-factor authentication is enabled", - ), - ), - ( - "avatar_url", - models.URLField(blank=True, help_text="URL to user's avatar image"), - ), - ( - "bio", - models.TextField( - blank=True, help_text="User biography", max_length=500 - ), - ), - ( - "banned", - models.BooleanField( - db_index=True, - default=False, - help_text="Whether this user is banned", - ), - ), - ( - "ban_reason", - models.TextField(blank=True, help_text="Reason for ban"), - ), - ( - "banned_at", - models.DateTimeField( - blank=True, help_text="When the user was banned", null=True - ), - ), - ( - "reputation_score", - models.IntegerField( - default=0, - help_text="User reputation score based on contributions", - ), - ), - ( - "banned_by", - models.ForeignKey( - blank=True, - help_text="Moderator who banned this user", - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="users_banned", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "groups", - models.ManyToManyField( - blank=True, - help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.", - related_name="user_set", - related_query_name="user", - to="auth.group", - verbose_name="groups", - ), - ), - ( - "user_permissions", - models.ManyToManyField( - blank=True, - help_text="Specific permissions for this user.", - related_name="user_set", - related_query_name="user", - to="auth.permission", - verbose_name="user permissions", - ), - ), - ], - options={ - "db_table": "users", - "ordering": ["-date_joined"], - }, - managers=[ - ("objects", django.contrib.auth.models.UserManager()), - ], - ), - migrations.CreateModel( - name="UserRole", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "role", - models.CharField( - choices=[ - ("user", "User"), - ("moderator", "Moderator"), - ("admin", "Admin"), - ], - db_index=True, - default="user", - max_length=20, - ), - ), - ("granted_at", models.DateTimeField(auto_now_add=True)), - ( - "granted_by", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name="roles_granted", - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "user", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - related_name="role", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - options={ - "db_table": "user_roles", - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - migrations.CreateModel( - name="UserProfile", - fields=[ - ( - "created", - model_utils.fields.AutoCreatedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="created", - ), - ), - ( - "modified", - model_utils.fields.AutoLastModifiedField( - default=django.utils.timezone.now, - editable=False, - verbose_name="modified", - ), - ), - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "email_notifications", - models.BooleanField( - default=True, help_text="Receive email notifications" - ), - ), - ( - "email_on_submission_approved", - models.BooleanField( - default=True, help_text="Email when submissions are approved" - ), - ), - ( - "email_on_submission_rejected", - models.BooleanField( - default=True, help_text="Email when submissions are rejected" - ), - ), - ( - "profile_public", - models.BooleanField( - default=True, help_text="Make profile publicly visible" - ), - ), - ( - "show_email", - models.BooleanField( - default=False, help_text="Show email on public profile" - ), - ), - ( - "total_submissions", - models.IntegerField( - default=0, help_text="Total number of submissions made" - ), - ), - ( - "approved_submissions", - models.IntegerField( - default=0, help_text="Number of approved submissions" - ), - ), - ( - "user", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - related_name="profile", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - options={ - "db_table": "user_profiles", - }, - bases=(django_lifecycle.mixins.LifecycleModelMixin, models.Model), - ), - migrations.AddIndex( - model_name="user", - index=models.Index(fields=["email"], name="users_email_4b85f2_idx"), - ), - migrations.AddIndex( - model_name="user", - index=models.Index(fields=["banned"], name="users_banned_ee00ad_idx"), - ), - ] diff --git a/django/apps/users/migrations/__init__.py b/django/apps/users/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/users/migrations/__pycache__/0001_initial.cpython-313.pyc b/django/apps/users/migrations/__pycache__/0001_initial.cpython-313.pyc deleted file mode 100644 index 19b98e3aac3e220789d3f22080d5ad9eda2c9a84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8929 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 Optional[User]: - """ - Authenticate user from JWT token. - - Args: - request: HTTP request - token: JWT access token - - Returns: - User instance if valid, None otherwise - """ - try: - # Decode token - access_token = AccessToken(token) - user_id = access_token['user_id'] - - # Get user - user = User.objects.get(id=user_id) - - # Check if banned - if user.banned: - logger.warning(f"Banned user attempted API access: {user.email}") - return None - - return user - - except TokenError as e: - logger.debug(f"Invalid token: {e}") - return None - except User.DoesNotExist: - logger.warning(f"Token for non-existent user: {user_id}") - return None - except Exception as e: - logger.error(f"Authentication error: {e}") - return None - - -# Global JWT auth instance -jwt_auth = JWTAuth() - - -def require_auth(func: Callable) -> Callable: - """ - Decorator to require authentication. - - Usage: - @api.get("/protected") - @require_auth - def protected_endpoint(request): - return {"user": request.auth.email} - """ - @wraps(func) - def wrapper(request: HttpRequest, *args, **kwargs): - if not request.auth or not isinstance(request.auth, User): - raise PermissionDenied("Authentication required") - return func(request, *args, **kwargs) - return wrapper - - -def require_role(role: str) -> Callable: - """ - Decorator to require specific role. - - Args: - role: Required role (user, moderator, admin) - - Usage: - @api.post("/moderate") - @require_role("moderator") - def moderate_endpoint(request): - return {"message": "Access granted"} - """ - def decorator(func: Callable) -> Callable: - @wraps(func) - def wrapper(request: HttpRequest, *args, **kwargs): - if not request.auth or not isinstance(request.auth, User): - raise PermissionDenied("Authentication required") - - user = request.auth - - try: - user_role = user.role - - # Admin has access to everything - if user_role.is_admin: - return func(request, *args, **kwargs) - - # Check specific role - if role == 'moderator' and user_role.is_moderator: - return func(request, *args, **kwargs) - elif role == 'user': - return func(request, *args, **kwargs) - - raise PermissionDenied(f"Role '{role}' required") - - except UserRole.DoesNotExist: - raise PermissionDenied("User role not assigned") - - return wrapper - return decorator - - -def require_moderator(func: Callable) -> Callable: - """ - Decorator to require moderator or admin role. - - Usage: - @api.post("/approve") - @require_moderator - def approve_endpoint(request): - return {"message": "Access granted"} - """ - return require_role("moderator")(func) - - -def require_admin(func: Callable) -> Callable: - """ - Decorator to require admin role. - - Usage: - @api.delete("/delete-user") - @require_admin - def delete_user_endpoint(request): - return {"message": "Access granted"} - """ - def decorator(func: Callable) -> Callable: - @wraps(func) - def wrapper(request: HttpRequest, *args, **kwargs): - if not request.auth or not isinstance(request.auth, User): - raise PermissionDenied("Authentication required") - - user = request.auth - - try: - user_role = user.role - - if not user_role.is_admin: - raise PermissionDenied("Admin role required") - - return func(request, *args, **kwargs) - - except UserRole.DoesNotExist: - raise PermissionDenied("User role not assigned") - - return wrapper - return decorator - - -def is_owner_or_moderator(user: User, obj_user_id) -> bool: - """ - Check if user is the owner of an object or a moderator. - - Args: - user: User to check - obj_user_id: User ID of the object owner - - Returns: - True if user is owner or moderator - """ - if str(user.id) == str(obj_user_id): - return True - - try: - return user.role.is_moderator - except UserRole.DoesNotExist: - return False - - -def can_moderate(user: User) -> bool: - """ - Check if user can moderate content. - - Args: - user: User to check - - Returns: - True if user is moderator or admin - """ - if user.banned: - return False - - try: - return user.role.is_moderator - except UserRole.DoesNotExist: - return False - - -def can_submit(user: User) -> bool: - """ - Check if user can submit content. - - Args: - user: User to check - - Returns: - True if user is not banned - """ - return not user.banned - - -class PermissionChecker: - """Helper class for checking permissions""" - - def __init__(self, user: User): - self.user = user - try: - self.user_role = user.role - except UserRole.DoesNotExist: - self.user_role = None - - @property - def is_authenticated(self) -> bool: - """Check if user is authenticated""" - return self.user is not None - - @property - def is_moderator(self) -> bool: - """Check if user is moderator or admin""" - if self.user.banned: - return False - return self.user_role and self.user_role.is_moderator - - @property - def is_admin(self) -> bool: - """Check if user is admin""" - if self.user.banned: - return False - return self.user_role and self.user_role.is_admin - - @property - def can_submit(self) -> bool: - """Check if user can submit content""" - return not self.user.banned - - @property - def can_moderate(self) -> bool: - """Check if user can moderate content""" - return self.is_moderator - - def can_edit(self, obj_user_id) -> bool: - """Check if user can edit an object""" - if self.user.banned: - return False - return str(self.user.id) == str(obj_user_id) or self.is_moderator - - def can_delete(self, obj_user_id) -> bool: - """Check if user can delete an object""" - if self.user.banned: - return False - return str(self.user.id) == str(obj_user_id) or self.is_admin - - def require_permission(self, permission: str) -> None: - """ - Raise PermissionDenied if user doesn't have permission. - - Args: - permission: Permission to check (submit, moderate, admin) - - Raises: - PermissionDenied: If user doesn't have permission - """ - if permission == 'submit' and not self.can_submit: - raise PermissionDenied("You are banned from submitting content") - elif permission == 'moderate' and not self.can_moderate: - raise PermissionDenied("Moderator role required") - elif permission == 'admin' and not self.is_admin: - raise PermissionDenied("Admin role required") - - -def get_permission_checker(request: HttpRequest) -> Optional[PermissionChecker]: - """ - Get permission checker for request user. - - Args: - request: HTTP request - - Returns: - PermissionChecker instance or None if not authenticated - """ - if not request.auth or not isinstance(request.auth, User): - return None - - return PermissionChecker(request.auth) diff --git a/django/apps/users/services.py b/django/apps/users/services.py deleted file mode 100644 index 4bc03930..00000000 --- a/django/apps/users/services.py +++ /dev/null @@ -1,592 +0,0 @@ -""" -User authentication and management services. - -Provides business logic for: -- User registration and authentication -- OAuth integration -- MFA/2FA management -- Permission and role management -""" - -from typing import Optional, Dict, Any -from django.contrib.auth import authenticate -from django.contrib.auth.password_validation import validate_password -from django.core.exceptions import ValidationError -from django.db import transaction -from django.utils import timezone -from django_otp.plugins.otp_totp.models import TOTPDevice -from allauth.socialaccount.models import SocialAccount -import logging - -from .models import User, UserRole, UserProfile - -logger = logging.getLogger(__name__) - - -class AuthenticationService: - """Service for handling user authentication operations""" - - @staticmethod - @transaction.atomic - def register_user( - email: str, - password: str, - username: Optional[str] = None, - first_name: str = '', - last_name: str = '' - ) -> User: - """ - Register a new user with email and password. - - Args: - email: User's email address - password: User's password (will be validated and hashed) - username: Optional username (defaults to email prefix) - first_name: User's first name - last_name: User's last name - - Returns: - Created User instance - - Raises: - ValidationError: If email exists or password is invalid - """ - # Normalize email - email = email.lower().strip() - - # Check if user exists - if User.objects.filter(email=email).exists(): - raise ValidationError({'email': 'A user with this email already exists.'}) - - # Set username if not provided - if not username: - username = email.split('@')[0] - # Make unique if needed - base_username = username - counter = 1 - while User.objects.filter(username=username).exists(): - username = f"{base_username}{counter}" - counter += 1 - - # Validate password - try: - validate_password(password) - except ValidationError as e: - raise ValidationError({'password': e.messages}) - - # Create user - user = User.objects.create_user( - email=email, - username=username, - password=password, - first_name=first_name, - last_name=last_name - ) - - # Create role (default: user) - UserRole.objects.create(user=user, role='user') - - # Create profile - UserProfile.objects.create(user=user) - - logger.info(f"New user registered: {user.email}") - return user - - @staticmethod - def authenticate_user(email: str, password: str) -> Optional[User]: - """ - Authenticate user with email and password. - - Args: - email: User's email address - password: User's password - - Returns: - User instance if authentication successful, None otherwise - """ - email = email.lower().strip() - user = authenticate(username=email, password=password) - - if user and user.banned: - logger.warning(f"Banned user attempted login: {email}") - raise ValidationError("This account has been banned.") - - if user: - user.last_login = timezone.now() - user.save(update_fields=['last_login']) - logger.info(f"User authenticated: {email}") - - return user - - @staticmethod - @transaction.atomic - def create_oauth_user( - email: str, - provider: str, - oauth_sub: str, - username: Optional[str] = None, - first_name: str = '', - last_name: str = '', - avatar_url: str = '' - ) -> User: - """ - Create or get user from OAuth provider. - - Args: - email: User's email from OAuth provider - provider: OAuth provider name (google, discord) - oauth_sub: OAuth subject identifier - username: Optional username - first_name: User's first name - last_name: User's last name - avatar_url: URL to user's avatar - - Returns: - User instance - """ - email = email.lower().strip() - - # Check if user exists with this email - try: - user = User.objects.get(email=email) - # Update OAuth info if not set - if not user.oauth_provider: - user.oauth_provider = provider - user.oauth_sub = oauth_sub - user.save(update_fields=['oauth_provider', 'oauth_sub']) - return user - except User.DoesNotExist: - pass - - # Create new user - if not username: - username = email.split('@')[0] - base_username = username - counter = 1 - while User.objects.filter(username=username).exists(): - username = f"{base_username}{counter}" - counter += 1 - - user = User.objects.create( - email=email, - username=username, - first_name=first_name, - last_name=last_name, - avatar_url=avatar_url, - oauth_provider=provider, - oauth_sub=oauth_sub - ) - - # No password needed for OAuth users - user.set_unusable_password() - user.save() - - # Create role and profile - UserRole.objects.create(user=user, role='user') - UserProfile.objects.create(user=user) - - logger.info(f"OAuth user created: {email} via {provider}") - return user - - @staticmethod - def change_password(user: User, old_password: str, new_password: str) -> bool: - """ - Change user's password. - - Args: - user: User instance - old_password: Current password - new_password: New password - - Returns: - True if successful - - Raises: - ValidationError: If old password is incorrect or new password is invalid - """ - # Check old password - if not user.check_password(old_password): - raise ValidationError({'old_password': 'Incorrect password.'}) - - # Validate new password - try: - validate_password(new_password, user=user) - except ValidationError as e: - raise ValidationError({'new_password': e.messages}) - - # Set new password - user.set_password(new_password) - user.save() - - logger.info(f"Password changed for user: {user.email}") - return True - - @staticmethod - def reset_password(user: User, new_password: str) -> bool: - """ - Reset user's password (admin/forgot password flow). - - Args: - user: User instance - new_password: New password - - Returns: - True if successful - - Raises: - ValidationError: If new password is invalid - """ - # Validate new password - try: - validate_password(new_password, user=user) - except ValidationError as e: - raise ValidationError({'password': e.messages}) - - # Set new password - user.set_password(new_password) - user.save() - - logger.info(f"Password reset for user: {user.email}") - return True - - -class MFAService: - """Service for handling multi-factor authentication""" - - @staticmethod - def enable_totp(user: User, device_name: str = 'default') -> TOTPDevice: - """ - Enable TOTP-based MFA for user. - - Args: - user: User instance - device_name: Name for the TOTP device - - Returns: - TOTPDevice instance with QR code data - """ - # Check if device already exists - device = TOTPDevice.objects.filter( - user=user, - name=device_name - ).first() - - if not device: - device = TOTPDevice.objects.create( - user=user, - name=device_name, - confirmed=False - ) - - return device - - @staticmethod - @transaction.atomic - def confirm_totp(user: User, token: str, device_name: str = 'default') -> bool: - """ - Confirm TOTP device with verification token. - - Args: - user: User instance - token: 6-digit TOTP token - device_name: Name of the TOTP device - - Returns: - True if successful - - Raises: - ValidationError: If token is invalid - """ - device = TOTPDevice.objects.filter( - user=user, - name=device_name - ).first() - - if not device: - raise ValidationError("TOTP device not found.") - - # Verify token - if not device.verify_token(token): - raise ValidationError("Invalid verification code.") - - # Confirm device - device.confirmed = True - device.save() - - # Enable MFA on user - user.mfa_enabled = True - user.save(update_fields=['mfa_enabled']) - - logger.info(f"MFA enabled for user: {user.email}") - return True - - @staticmethod - def verify_totp(user: User, token: str) -> bool: - """ - Verify TOTP token for authentication. - - Args: - user: User instance - token: 6-digit TOTP token - - Returns: - True if valid - """ - device = TOTPDevice.objects.filter( - user=user, - confirmed=True - ).first() - - if not device: - return False - - return device.verify_token(token) - - @staticmethod - @transaction.atomic - def disable_totp(user: User) -> bool: - """ - Disable TOTP-based MFA for user. - - Args: - user: User instance - - Returns: - True if successful - """ - # Delete all TOTP devices - TOTPDevice.objects.filter(user=user).delete() - - # Disable MFA on user - user.mfa_enabled = False - user.save(update_fields=['mfa_enabled']) - - logger.info(f"MFA disabled for user: {user.email}") - return True - - -class RoleService: - """Service for managing user roles and permissions""" - - @staticmethod - @transaction.atomic - def assign_role( - user: User, - role: str, - granted_by: Optional[User] = None - ) -> UserRole: - """ - Assign role to user. - - Args: - user: User to assign role to - role: Role name (user, moderator, admin) - granted_by: User granting the role - - Returns: - UserRole instance - - Raises: - ValidationError: If role is invalid - """ - valid_roles = ['user', 'moderator', 'admin'] - if role not in valid_roles: - raise ValidationError(f"Invalid role. Must be one of: {', '.join(valid_roles)}") - - # Get or create role - user_role, created = UserRole.objects.get_or_create( - user=user, - defaults={'role': role, 'granted_by': granted_by} - ) - - if not created and user_role.role != role: - user_role.role = role - user_role.granted_by = granted_by - user_role.granted_at = timezone.now() - user_role.save() - - logger.info(f"Role '{role}' assigned to user: {user.email}") - return user_role - - @staticmethod - def has_role(user: User, role: str) -> bool: - """ - Check if user has specific role. - - Args: - user: User instance - role: Role name to check - - Returns: - True if user has the role - """ - try: - user_role = user.role - if role == 'moderator': - return user_role.is_moderator - elif role == 'admin': - return user_role.is_admin - return user_role.role == role - except UserRole.DoesNotExist: - return False - - @staticmethod - def get_user_permissions(user: User) -> Dict[str, bool]: - """ - Get user's permission summary. - - Args: - user: User instance - - Returns: - Dictionary of permissions - """ - try: - user_role = user.role - is_moderator = user_role.is_moderator - is_admin = user_role.is_admin - except UserRole.DoesNotExist: - is_moderator = False - is_admin = False - - return { - 'can_submit': not user.banned, - 'can_moderate': is_moderator and not user.banned, - 'can_admin': is_admin and not user.banned, - 'can_edit_own': not user.banned, - 'can_delete_own': not user.banned, - } - - -class UserManagementService: - """Service for user profile and account management""" - - @staticmethod - @transaction.atomic - def update_profile( - user: User, - **kwargs - ) -> User: - """ - Update user profile information. - - Args: - user: User instance - **kwargs: Fields to update - - Returns: - Updated User instance - """ - allowed_fields = [ - 'first_name', 'last_name', 'username', - 'avatar_url', 'bio' - ] - - updated_fields = [] - for field, value in kwargs.items(): - if field in allowed_fields and hasattr(user, field): - setattr(user, field, value) - updated_fields.append(field) - - if updated_fields: - user.save(update_fields=updated_fields) - logger.info(f"Profile updated for user: {user.email}") - - return user - - @staticmethod - @transaction.atomic - def update_preferences( - user: User, - **kwargs - ) -> UserProfile: - """ - Update user preferences. - - Args: - user: User instance - **kwargs: Preference fields to update - - Returns: - Updated UserProfile instance - """ - profile = user.profile - - allowed_fields = [ - 'email_notifications', - 'email_on_submission_approved', - 'email_on_submission_rejected', - 'profile_public', - 'show_email' - ] - - updated_fields = [] - for field, value in kwargs.items(): - if field in allowed_fields and hasattr(profile, field): - setattr(profile, field, value) - updated_fields.append(field) - - if updated_fields: - profile.save(update_fields=updated_fields) - logger.info(f"Preferences updated for user: {user.email}") - - return profile - - @staticmethod - @transaction.atomic - def ban_user( - user: User, - reason: str, - banned_by: User - ) -> User: - """ - Ban a user. - - Args: - user: User to ban - reason: Reason for ban - banned_by: User performing the ban - - Returns: - Updated User instance - """ - user.ban(reason=reason, banned_by=banned_by) - logger.warning(f"User banned: {user.email} by {banned_by.email}. Reason: {reason}") - return user - - @staticmethod - @transaction.atomic - def unban_user(user: User) -> User: - """ - Unban a user. - - Args: - user: User to unban - - Returns: - Updated User instance - """ - user.unban() - logger.info(f"User unbanned: {user.email}") - return user - - @staticmethod - def get_user_stats(user: User) -> Dict[str, Any]: - """ - Get user statistics. - - Args: - user: User instance - - Returns: - Dictionary of user stats - """ - profile = user.profile - - return { - 'total_submissions': profile.total_submissions, - 'approved_submissions': profile.approved_submissions, - 'reputation_score': user.reputation_score, - 'member_since': user.date_joined, - 'last_active': user.last_login, - } diff --git a/django/apps/users/tasks.py b/django/apps/users/tasks.py deleted file mode 100644 index c579fdad..00000000 --- a/django/apps/users/tasks.py +++ /dev/null @@ -1,343 +0,0 @@ -""" -Background tasks for user management and notifications. -""" - -import logging -from celery import shared_task -from django.core.mail import send_mail -from django.template.loader import render_to_string -from django.conf import settings -from django.utils import timezone -from datetime import timedelta - -logger = logging.getLogger(__name__) - - -@shared_task(bind=True, max_retries=3, default_retry_delay=60) -def send_welcome_email(self, user_id): - """ - Send a welcome email to a newly registered user. - - Args: - user_id: ID of the User - - Returns: - str: Email send result - """ - from apps.users.models import User - - try: - user = User.objects.get(id=user_id) - - context = { - 'user': user, - 'site_url': getattr(settings, 'SITE_URL', 'https://thrillwiki.com'), - } - - html_message = render_to_string('emails/welcome.html', context) - - send_mail( - subject='Welcome to ThrillWiki! 🎢', - message='', - html_message=html_message, - from_email=settings.DEFAULT_FROM_EMAIL, - recipient_list=[user.email], - fail_silently=False, - ) - - logger.info(f"Welcome email sent to {user.email}") - return f"Welcome email sent to {user.email}" - - except User.DoesNotExist: - logger.error(f"User {user_id} not found") - raise - except Exception as exc: - logger.error(f"Error sending welcome email to user {user_id}: {str(exc)}") - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task(bind=True, max_retries=3, default_retry_delay=60) -def send_password_reset_email(self, user_id, token, reset_url): - """ - Send a password reset email with a secure token. - - Args: - user_id: ID of the User - token: Password reset token - reset_url: Full URL for password reset - - Returns: - str: Email send result - """ - from apps.users.models import User - - try: - user = User.objects.get(id=user_id) - - context = { - 'user': user, - 'reset_url': reset_url, - 'request_time': timezone.now(), - 'expiry_hours': 24, # Configurable - 'site_url': getattr(settings, 'SITE_URL', 'https://thrillwiki.com'), - } - - html_message = render_to_string('emails/password_reset.html', context) - - send_mail( - subject='Reset Your ThrillWiki Password', - message='', - html_message=html_message, - from_email=settings.DEFAULT_FROM_EMAIL, - recipient_list=[user.email], - fail_silently=False, - ) - - logger.info(f"Password reset email sent to {user.email}") - return f"Password reset email sent to {user.email}" - - except User.DoesNotExist: - logger.error(f"User {user_id} not found") - raise - except Exception as exc: - logger.error(f"Error sending password reset email: {str(exc)}") - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task(bind=True, max_retries=2) -def cleanup_expired_tokens(self): - """ - Clean up expired JWT tokens and password reset tokens. - - This task runs daily to remove old tokens from the database. - - Returns: - dict: Cleanup statistics - """ - from rest_framework_simplejwt.token_blacklist.models import OutstandingToken - from django.contrib.auth.tokens import default_token_generator - - try: - # Clean up blacklisted JWT tokens older than 7 days - cutoff = timezone.now() - timedelta(days=7) - - # Note: Actual implementation depends on token storage strategy - # This is a placeholder for the concept - - logger.info("Token cleanup completed") - - return { - 'jwt_tokens_cleaned': 0, - 'reset_tokens_cleaned': 0, - } - - except Exception as exc: - logger.error(f"Error cleaning up tokens: {str(exc)}") - raise self.retry(exc=exc, countdown=300) - - -@shared_task(bind=True, max_retries=3) -def send_account_notification(self, user_id, notification_type, context_data=None): - """ - Send a generic account notification email. - - Args: - user_id: ID of the User - notification_type: Type of notification (e.g., 'security_alert', 'profile_update') - context_data: Additional context data for the email - - Returns: - str: Email send result - """ - from apps.users.models import User - - try: - user = User.objects.get(id=user_id) - - context = { - 'user': user, - 'notification_type': notification_type, - 'site_url': getattr(settings, 'SITE_URL', 'https://thrillwiki.com'), - } - - if context_data: - context.update(context_data) - - # For now, just log (would need specific templates for each type) - logger.info(f"Account notification ({notification_type}) for user {user.email}") - - return f"Notification sent to {user.email}" - - except User.DoesNotExist: - logger.error(f"User {user_id} not found") - raise - except Exception as exc: - logger.error(f"Error sending account notification: {str(exc)}") - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task(bind=True, max_retries=2) -def cleanup_inactive_users(self, days_inactive=365): - """ - Clean up or flag users who haven't logged in for a long time. - - Args: - days_inactive: Number of days of inactivity before flagging (default: 365) - - Returns: - dict: Cleanup statistics - """ - from apps.users.models import User - - try: - cutoff = timezone.now() - timedelta(days=days_inactive) - - inactive_users = User.objects.filter( - last_login__lt=cutoff, - is_active=True - ) - - count = inactive_users.count() - - # For now, just log inactive users - # In production, you might want to send reactivation emails - # or mark accounts for deletion - - logger.info(f"Found {count} inactive users (last login before {cutoff})") - - return { - 'inactive_count': count, - 'cutoff_date': cutoff.isoformat(), - } - - except Exception as exc: - logger.error(f"Error cleaning up inactive users: {str(exc)}") - raise self.retry(exc=exc, countdown=300) - - -@shared_task -def update_user_statistics(): - """ - Update user-related statistics across the database. - - Returns: - dict: Updated statistics - """ - from apps.users.models import User - from django.db.models import Count - from datetime import timedelta - - try: - now = timezone.now() - week_ago = now - timedelta(days=7) - month_ago = now - timedelta(days=30) - - stats = { - 'total_users': User.objects.count(), - 'active_users': User.objects.filter(is_active=True).count(), - 'new_this_week': User.objects.filter(date_joined__gte=week_ago).count(), - 'new_this_month': User.objects.filter(date_joined__gte=month_ago).count(), - 'verified_users': User.objects.filter(email_verified=True).count(), - 'by_role': dict( - User.objects.values('role__name') - .annotate(count=Count('id')) - .values_list('role__name', 'count') - ), - } - - logger.info(f"User statistics updated: {stats}") - return stats - - except Exception as e: - logger.error(f"Error updating user statistics: {str(e)}") - raise - - -@shared_task(bind=True, max_retries=3) -def send_bulk_notification(self, user_ids, subject, message, html_message=None): - """ - Send bulk email notifications to multiple users. - - This is useful for announcements, feature updates, etc. - - Args: - user_ids: List of User IDs - subject: Email subject - message: Plain text message - html_message: HTML version of message (optional) - - Returns: - dict: Send statistics - """ - from apps.users.models import User - - try: - users = User.objects.filter(id__in=user_ids, is_active=True) - - sent_count = 0 - failed_count = 0 - - for user in users: - try: - send_mail( - subject=subject, - message=message, - html_message=html_message, - from_email=settings.DEFAULT_FROM_EMAIL, - recipient_list=[user.email], - fail_silently=False, - ) - sent_count += 1 - except Exception as e: - logger.error(f"Failed to send to {user.email}: {str(e)}") - failed_count += 1 - continue - - result = { - 'total': len(user_ids), - 'sent': sent_count, - 'failed': failed_count, - } - - logger.info(f"Bulk notification sent: {result}") - return result - - except Exception as exc: - logger.error(f"Error sending bulk notification: {str(exc)}") - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) - - -@shared_task(bind=True, max_retries=2) -def send_email_verification_reminder(self, user_id): - """ - Send a reminder to users who haven't verified their email. - - Args: - user_id: ID of the User - - Returns: - str: Reminder result - """ - from apps.users.models import User - - try: - user = User.objects.get(id=user_id) - - if user.email_verified: - logger.info(f"User {user.email} already verified, skipping reminder") - return "User already verified" - - # Send verification reminder - logger.info(f"Sending email verification reminder to {user.email}") - - # In production, generate new verification token and send email - # For now, just log - - return f"Verification reminder sent to {user.email}" - - except User.DoesNotExist: - logger.error(f"User {user_id} not found") - raise - except Exception as exc: - logger.error(f"Error sending verification reminder: {str(exc)}") - raise self.retry(exc=exc, countdown=60 * (2 ** self.request.retries)) diff --git a/django/apps/versioning/__init__.py b/django/apps/versioning/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/django/apps/versioning/__pycache__/__init__.cpython-313.pyc b/django/apps/versioning/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index aeb90c26ac8a96feb60e68b38c3fb8ff8dab5d8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmey&%ge<81P%rKnIQTxh=2h`DC08=kTI1Zok5e)ZzV$!6Oi{ABy}rDKeRZts93)w zF(UvLvidhgN9NF!O6Y)kSVf$g!40f8;?_W)tE3+(RQnZsN>tGyIYDOBzu31K8L zlIIdL>A@b6)Y(hyB!@X#=PvP+UhJiH{*rG}zyhs%FZm|}I3S`~&vdsd`ql3+nhl&} zocCTdj3i$iNy4mfl67b&>#R7q;7w)v?lAag!yrtoJC8vq=1uWjwu&EdFdVWD% zDyW)aCIf-*Dn#Qsoq~))J>~^SH=Rl!qT#Wo0`lqQOT>~ zl9E>zn#dy7as{lyc+bc@6O7H%aiG!$6I)U&dC^)j;MIpUGKvP(z-2N=`W^7r{$bwI zt(8xlPsr6jm;N+1APNig$FK#n2s5w^9*M!M>>BrWh