Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
395 changes: 197 additions & 198 deletions src/apps/core/services/affinity_calculator.py

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions src/apps/ideology/api/views/affinity_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
from django.utils.translation import gettext_lazy as _
from drf_spectacular.utils import OpenApiParameter, extend_schema
from ideology.api.serializers import AffinitySerializer, IdeologyAffinitySerializer
from ideology.models import CompletedAnswer, Ideology, UserAxisAnswer
from ideology.models import (
CompletedAnswer,
Ideology,
UserAxisAnswer,
UserConditionerAnswer,
)
from rest_framework import status
from rest_framework.generics import GenericAPIView
from rest_framework.permissions import AllowAny
Expand All @@ -24,7 +29,13 @@ def get_source_data(self):
raise NotFoundException(_("Source Completed Answer not found."))

if self.request.user.is_authenticated:
return UserAxisAnswer.objects.get_mapped_for_calculation(self.request.user)
axis_data = UserAxisAnswer.objects.get_mapped_for_calculation(
self.request.user
)
conditioner_data = UserConditionerAnswer.objects.get_mapped_for_calculation(
self.request.user
)
return {**axis_data, **conditioner_data}

raise BadRequestException(
_(
Expand All @@ -35,8 +46,6 @@ def get_source_data(self):
def process_affinity_request(
self, target_object, target_key, target_value=None, explicit_value=False
):
# If explicit_value is True, we use target_value even if it is None (e.g. Anonymous user).
# Otherwise, fallback to target_object (default behavior for Ideologies).
final_target_value = (
target_value if explicit_value or target_value else target_object
)
Expand Down
156 changes: 78 additions & 78 deletions src/apps/ideology/fixtures/03_axes.json

Large diffs are not rendered by default.

Loading
Loading