mirror of
https://github.com/ae-utbm/sith3.git
synced 2024-07-05 21:08:07 +00:00
87295ad9b7
* galaxy: improve logging and performance reporting
* galaxy: add a full galaxy state test
* galaxy: optimize user self score computation
* galaxy: add 'generate_galaxy_test_data' command for development at scale
* galaxy: big refactor
Main changes:
- Multiple Galaxy objects can now exist at the same time in DB. This allows for ruling a new galaxy while still
displaying the old one.
- The criteria to quickly know whether a user is a possible citizen is now a simple query on picture count. This
avoids a very complicated query to database, that could often result in huge working memory load. With this change,
it should be possible to run the galaxy even on a vanilla Postgres that didn't receive fine tuning for the Sith's
galaxy.
* galaxy: template: make the galaxy graph work and be usable with a lot of stars
- Display focused star and its connections clearly
- Display star label faintly by default for other stars to avoid overloading the graph
- Hide non-focused lanes
- Avoid clicks on non-highlighted, too far stars
- Make the canva adapt its width to initial screen size, doesn't work dynamically
* galaxy: better docstrings
* galaxy: use bulk_create whenever possible
This is a big performance gain, especially for the tests.
Examples:
----
`./manage.py test galaxy.tests.GalaxyTest.test_full_galaxy_state`
Measurements averaged over 3 run on *my machine*™:
Before: 2min15s
After: 1m41s
----
`./manage.py generate_galaxy_test_data --user-pack-count 1`
Before: 48s
After: 25s
----
`./manage.py rule_galaxy` (for 600 citizen, corresponding to 1 user-pack)
Before: 14m4s
After: 12m34s
* core: populate: use a less ambiguous 'timezone.now()'
When running the tests around midnight, the day is changing, leading to some values being offset to the next day
depending on the timezone, and making some tests to fail. This ensure to use a less ambiguous `now` when populating
the database.
* write more extensive documentation
- add documentation to previously documented classes and functions and refactor some of the documented one, in accordance to the PEP257 and ReStructuredText standards ;
- add some type hints ;
- use a NamedTuple for the `Galaxy.compute_users_score` method instead of a raw tuple. Also change a little bit the logic in the function which call the latter ;
- add some additional parameter checks on a few functions ;
- change a little bit the logic of the log level setting for the galaxy related commands.
* galaxy: tests: split Model and View for more efficient data usage
---------
Co-authored-by: maréchal <thgirod@hotmail.com>
102 lines
3.6 KiB
Python
102 lines
3.6 KiB
Python
# -*- coding:utf-8 -*
|
|
#
|
|
# Copyright 2023
|
|
# - Skia <skia@hya.sk>
|
|
#
|
|
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
|
|
# http://ae.utbm.fr.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify it under
|
|
# the terms of the GNU General Public License a published by the Free Software
|
|
# Foundation; either version 3 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
# details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along with
|
|
# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
|
|
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
#
|
|
#
|
|
|
|
from django.views.generic import DetailView, View
|
|
from django.http import JsonResponse, Http404
|
|
from django.db.models import Q, Case, F, When, Value
|
|
from django.db.models.functions import Concat
|
|
from django.utils.translation import gettext_lazy as _
|
|
|
|
from core.views import (
|
|
CanViewMixin,
|
|
FormerSubscriberMixin,
|
|
)
|
|
from core.models import User
|
|
from core.views import UserTabsMixin
|
|
from galaxy.models import Galaxy, GalaxyLane
|
|
|
|
|
|
class GalaxyUserView(CanViewMixin, UserTabsMixin, DetailView):
|
|
model = User
|
|
pk_url_kwarg = "user_id"
|
|
template_name = "galaxy/user.jinja"
|
|
current_tab = "galaxy"
|
|
|
|
def get_object(self, *args, **kwargs):
|
|
user: User = super(GalaxyUserView, self).get_object(*args, **kwargs)
|
|
if user.current_star is None:
|
|
raise Http404(_("This citizen has not yet joined the galaxy"))
|
|
return user
|
|
|
|
def get_context_data(self, **kwargs):
|
|
kwargs = super(GalaxyUserView, self).get_context_data(**kwargs)
|
|
kwargs["lanes"] = (
|
|
GalaxyLane.objects.filter(
|
|
Q(star1=self.object.current_star) | Q(star2=self.object.current_star)
|
|
)
|
|
.order_by("distance")
|
|
.annotate(
|
|
other_star_id=Case(
|
|
When(star1=self.object.current_star, then=F("star2__owner__id")),
|
|
default=F("star1__owner__id"),
|
|
),
|
|
other_star_mass=Case(
|
|
When(star1=self.object.current_star, then=F("star2__mass")),
|
|
default=F("star1__mass"),
|
|
),
|
|
other_star_name=Case(
|
|
When(
|
|
star1=self.object.current_star,
|
|
then=Case(
|
|
When(
|
|
star2__owner__nick_name=None,
|
|
then=Concat(
|
|
F("star2__owner__first_name"),
|
|
Value(" "),
|
|
F("star2__owner__last_name"),
|
|
),
|
|
)
|
|
),
|
|
),
|
|
default=Case(
|
|
When(
|
|
star1__owner__nick_name=None,
|
|
then=Concat(
|
|
F("star1__owner__first_name"),
|
|
Value(" "),
|
|
F("star1__owner__last_name"),
|
|
),
|
|
)
|
|
),
|
|
),
|
|
)
|
|
.select_related("star1", "star2")
|
|
)
|
|
return kwargs
|
|
|
|
|
|
class GalaxyDataView(FormerSubscriberMixin, View):
|
|
def get(self, request, *args, **kwargs):
|
|
return JsonResponse(Galaxy.get_current_galaxy().state)
|