onny/verwaltungstracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch foirequest finding to tag+reference

Browse source
This commit is contained in:
Stefan Wehrmeyer 2022-03-16 06:36:36 +01:00
parent c96e9487f8
commit 939146e415
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
froide_govplan/models.py
View file

@ -17,11 +17,10 @@ from taggit.models import TaggedItemBase
from froide.foirequest.models import FoiRequest from froide.foirequest.models import FoiRequest
from froide.follow.models import Follower from froide.follow.models import Follower
from froide.helper.forms import TAG_NAME_MAX_CHARS
from froide.organization.models import Organization from froide.organization.models import Organization
from froide.publicbody.models import Category, Jurisdiction, PublicBody from froide.publicbody.models import Category, Jurisdiction, PublicBody
from .utils import PLAN_TAG_PREFIX, TAG_NAME, make_request_url from .utils import TAG_NAME, make_request_url
try: try:
from cms.models.fields import PlaceholderField from cms.models.fields import PlaceholderField
@ -249,9 +248,8 @@ class GovernmentPlan(models.Model):
def get_recent_foirequest(self): def get_recent_foirequest(self):
return self.get_related_foirequests()[0] return self.get_related_foirequests()[0]
def get_plan_tag(self): def get_foirequest_reference(self):
plan_tag = "{}{}".format(PLAN_TAG_PREFIX, self.slug) return "govplan:plan@{}".format(self.pk)
return plan_tag[:TAG_NAME_MAX_CHARS]
def get_related_foirequests(self): def get_related_foirequests(self):
if not self.responsible_publicbody: if not self.responsible_publicbody:
@ -265,7 +263,7 @@ class GovernmentPlan(models.Model):
public_body=self.responsible_publicbody, public_body=self.responsible_publicbody,
) )
.filter(tags__name=TAG_NAME) .filter(tags__name=TAG_NAME)
.filter(tags__name=self.get_plan_tag()) .filter(reference=self.get_foirequest_reference())
.order_by("-first_message") .order_by("-first_message")
) )
return self._related_foirequests return self._related_foirequests

4
froide_govplan/utils.py
View file

@ -4,7 +4,6 @@ from django.conf import settings
from django.urls import reverse from django.urls import reverse
TAG_NAME = "Koalitionstracker" TAG_NAME = "Koalitionstracker"
PLAN_TAG_PREFIX = "Vorhaben-"
def make_request_url(plan, publicbody): def make_request_url(plan, publicbody):
@ -19,7 +18,8 @@ def make_request_url(plan, publicbody):
query = { query = {
"subject": subject.encode("utf-8"), "subject": subject.encode("utf-8"),
"body": body, "body": body,
"tags": "{},{}".format(TAG_NAME, plan.get_plan_tag()), "ref": plan.get_foirequest_reference(),
"tags": TAG_NAME,
} }
hide_features = ["hide_public", "hide_similar", "hide_draft"] hide_features = ["hide_public", "hide_similar", "hide_draft"]