Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ks 2022 09 budgeting search filter #4496

Merged
merged 2 commits into from
Sep 22, 2022
Merged

Ks 2022 09 budgeting search filter #4496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cefba30
ideas/models: add annotate_reference_number to IdeaQuerySet
Sep 21, 2022
7e82131
budgeting/api: add search to api
Sep 21, 2022
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
6 changes: 5 additions & 1 deletion meinberlin/apps/budgeting/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from django_filters.rest_framework import DjangoFilterBackend
from rest_framework import mixins
from rest_framework import viewsets
from rest_framework.filters import SearchFilter
from rest_framework.pagination import PageNumberPagination

from adhocracy4.api.mixins import ModuleMixin
Expand Down Expand Up @@ -112,12 +113,14 @@ class ProposalViewSet(ModuleMixin,
permission_classes = (ViewSetRulesPermission,)
filter_backends = (DjangoFilterBackend,
OrderingFilterWithDailyRandom,
IdeaCategoryFilterBackend,)
IdeaCategoryFilterBackend,
SearchFilter,)
filter_fields = ('is_archived', 'category',)
ordering_fields = ('created',
'comment_count',
'positive_rating_count',
'daily_random',)
search_fields = ('name', 'ref_number')

def get_permission_object(self):
return self.module
Expand All @@ -127,5 +130,6 @@ def get_queryset(self):
.filter(module=self.module) \
.annotate_comment_count() \
.annotate_positive_rating_count() \
.annotate_reference_number() \
.order_by('-created')
return proposals
45 changes: 44 additions & 1 deletion meinberlin/apps/ideas/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
from django.contrib.contenttypes.fields import GenericRelation
from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.db.models.functions import Concat
from django.db.models.functions import ExtractYear
from django.urls import reverse
from django.utils.translation import gettext_lazy as _

Expand All @@ -19,7 +21,48 @@


class IdeaQuerySet(query.RateableQuerySet, query.CommentableQuerySet):
pass

def annotate_reference_number(self):
return self.annotate(
ref_number=models.Case(
models.When(
pk__lte=9,
then=Concat(
ExtractYear('created'),
models.Value('-0000'),
'pk',
output_field=models.CharField())
),
models.When(
pk__lte=99,
then=Concat(
ExtractYear('created'),
models.Value('-000'), 'pk',
output_field=models.CharField())
),
models.When(
pk__lte=999,
then=Concat(
ExtractYear('created'),
models.Value('-00'),
'pk',
output_field=models.CharField())
),
models.When(pk__lte=9999,
then=Concat(
ExtractYear('created'),
models.Value('-0'),
'pk',
output_field=models.CharField())
),
default=Concat(
ExtractYear('created'),
models.Value('-'),
'pk',
output_field=models.CharField()
)
)
)


class AbstractIdea(module_models.Item, Moderateable):
Expand Down