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

✨ [#1950] Filter by vestigingsnummer in Mijn Vragen #941

Merged
merged 3 commits into from
Jan 11, 2024
Merged

✨ [#1950] Filter by vestigingsnummer in Mijn Vragen #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28d81c2
:whale: [#1950] Add vestigings data to Open Klant docker data
stevenbal Jan 9, 2024
70bb721
:sparkles: [#1950] Mijn vragen filter by vestigingsnummer
stevenbal Jan 9, 2024
e8c940f
:white_check_mark: [#1950] Add tests for Mijn aanvragen for vestiging
stevenbal Jan 9, 2024
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
71 changes: 70 additions & 1 deletion docker/openklant/fixtures/db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,27 @@
"geverifieerd": true
}
},
{
"model": "klanten.klant",
"pk": 2,
"fields": {
"uuid": "f21f35fc-d8f0-4a8f-979b-8d725f713817",
"bronorganisatie": "000000000",
"klantnummer": "54321",
"bedrijfsnaam": "",
"website_url": "",
"voornaam": "",
"voorvoegsel_achternaam": "",
"achternaam": "",
"functie": "",
"telefoonnummer": "",
"emailadres": "",
"subject": "",
"subject_type": "vestiging",
"aanmaakkanaal": "",
"geverifieerd": true
}
},
{
"model": "klanten.nietnatuurlijkpersoon",
"pk": 1,
Expand All @@ -98,14 +119,40 @@
"bezoekadres": ""
}
},
{
"model": "klanten.vestiging",
"pk": 1,
"fields": {
"klant": 2,
"vestigings_nummer": "000037178598",
"handelsnaam": ["Test Value"]
}
},
{
"model": "contactmomenten.contactmoment",
"pk": 1,
"fields": {
"uuid": "9047c5be-885d-47ef-94ca-1c61c7a6480c",
"bronorganisatie": "000000000",
"registratiedatum": "2023-12-14T11:59:55Z",
"tekst": "Alleen zichtbaar voor hoofdvestiging",
"voorkeurskanaal": "",
"voorkeurstaal": "",
"kanaal": "email",
"initiatiefnemer": "",
"medewerker": "",
"onderwerp_links": "[]",
"vorig_contactmoment": null
}
},
{
"model": "contactmomenten.contactmoment",
"pk": 2,
"fields": {
"uuid": "2032bf57-216a-4438-bd4a-529c1b2c1191",
"bronorganisatie": "000000000",
"registratiedatum": "2023-12-14T11:59:55Z",
"tekst": "foo",
"tekst": "Zichtbaar voor vestiging en hoofdvestiging",
"voorkeurskanaal": "",
"voorkeurstaal": "",
"kanaal": "email",
Expand All @@ -125,5 +172,27 @@
"rol": "belanghebbende",
"gelezen": false
}
},
{
"model": "contactmomenten.klantcontactmoment",
"pk": 2,
"fields": {
"uuid": "8045f566-75a8-49ae-b4ab-e8f090a08ce5",
"contactmoment": 2,
"klant": "http://openklant.local:8001/klanten/api/v1/klanten/f21f35fc-d8f0-4a8f-979b-8d725f713817",
"rol": "belanghebbende",
"gelezen": false
}
},
{
"model": "contactmomenten.klantcontactmoment",
"pk": 3,
"fields": {
"uuid": "88a39300-2a4f-49e9-bc90-525aa654d8a5",
"contactmoment": 1,
"klant": "http://openklant.local:8001/klanten/api/v1/klanten/00e82ffb-e98a-4967-b8c1-232bf3c8c3a9",
"rol": "belanghebbende",
"gelezen": false
}
}
]
2 changes: 1 addition & 1 deletion src/open_inwoner/accounts/signals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def log_user_login(sender, user, request, *args, **kwargs):

if user.login_type in [LoginTypeChoices.digid, LoginTypeChoices.eherkenning]:
if oc_config.klanten_service:
update_user_from_klant(user)
update_user_from_klant(request)


@receiver(user_logged_out)
Expand Down
7 changes: 5 additions & 2 deletions src/open_inwoner/accounts/views/contactmoments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

from view_breadcrumbs import BaseBreadcrumbMixin

from open_inwoner.kvk.branches import get_kvk_branch_number
from open_inwoner.openklant.api_models import KlantContactMoment
from open_inwoner.openklant.constants import Status
from open_inwoner.openklant.models import OpenKlantConfig
Expand Down Expand Up @@ -106,7 +107,9 @@ def get_anchors(self) -> list:

def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
kcms = fetch_klantcontactmomenten(**get_fetch_parameters(self.request.user))
kcms = fetch_klantcontactmomenten(
**get_fetch_parameters(self.request, use_vestigingsnummer=True)
)
ctx["contactmomenten"] = [self.get_kcm_data(kcm) for kcm in kcms]
return ctx

Expand All @@ -132,7 +135,7 @@ def get_context_data(self, **kwargs):

kcm = fetch_klantcontactmoment(
kwargs["kcm_uuid"],
**get_fetch_parameters(self.request.user),
**get_fetch_parameters(self.request, use_vestigingsnummer=True),
)

if not kcm:
Expand Down
2 changes: 1 addition & 1 deletion src/open_inwoner/accounts/views/profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def update_klant_api(self, user_form_data: dict):
if user_form_data.get(local_name)
}
if update_data:
klant = fetch_klant(**get_fetch_parameters(user))
klant = fetch_klant(**get_fetch_parameters(self.request))

if klant:
self.log_system_action(
Expand Down
2 changes: 1 addition & 1 deletion src/open_inwoner/cms/cases/views/status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ def register_by_api(self, form, config: OpenKlantConfig):
except ObjectDoesNotExist:
ztc = None

klant = fetch_klant(**get_fetch_parameters(self.request.user))
klant = fetch_klant(**get_fetch_parameters(self.request))
if klant:
self.log_system_action("retrieved klant for user", user=self.request.user)
else:
Expand Down
9 changes: 7 additions & 2 deletions src/open_inwoner/openklant/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@
from .wrap import get_fetch_parameters


def update_user_from_klant(user: User):
klant = fetch_klant(**get_fetch_parameters(user))
def update_user_from_klant(request):
if not hasattr(request, "user"):
return

user: User = request.user

klant = fetch_klant(**get_fetch_parameters(request))
if not klant:
return

Expand Down
48 changes: 47 additions & 1 deletion src/open_inwoner/openklant/tests/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,14 @@ def __init__(self):
emailadres="[email protected]",
telefoonnummer="0687654321",
)
self.klant_vestiging = generate_oas_component(
"kc",
"schemas/Klant",
uuid="bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
url=f"{KLANTEN_ROOT}klant/bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
emailadres="[email protected]",
telefoonnummer="0612345678",
)
self.contactmoment = generate_oas_component(
"cmc",
"schemas/ContactMoment",
Expand All @@ -147,6 +155,17 @@ def __init__(self):
status=Status.afgehandeld,
antwoord="",
)
self.contactmoment_vestiging = generate_oas_component(
"cmc",
"schemas/ContactMoment",
uuid="aaaaaaaa-aaaa-aaaa-aaaa-eeeeeeeeeeee",
url=f"{CONTACTMOMENTEN_ROOT}contactmoment/aaaaaaaa-aaaa-aaaa-aaaa-eeeeeeeeeeee",
identificatie="AB123",
type="SomeType",
kanaal="MAIL",
status=Status.afgehandeld,
antwoord="",
)
self.klant_contactmoment = generate_oas_component(
"cmc",
"schemas/KlantContactMoment",
Expand All @@ -163,17 +182,37 @@ def __init__(self):
klant=self.klant2["url"],
contactmoment=self.contactmoment2["url"],
)
self.klant_contactmoment3 = generate_oas_component(
"cmc",
"schemas/KlantContactMoment",
uuid="aaaaaaaa-aaaa-aaaa-aaaa-dddddddddddd",
url=f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten/aaaaaaaa-aaaa-aaaa-aaaa-dddddddddddd",
klant=self.klant["url"],
contactmoment=self.contactmoment_vestiging["url"],
)
self.klant_contactmoment4 = generate_oas_component(
"cmc",
"schemas/KlantContactMoment",
uuid="aaaaaaaa-aaaa-aaaa-aaaa-ffffffffffff",
url=f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten/aaaaaaaa-aaaa-aaaa-aaaa-ffffffffffff",
klant=self.klant_vestiging["url"],
contactmoment=self.contactmoment_vestiging["url"],
)

def install_mocks(self, m) -> "MockAPIReadData":
self.setUpOASMocks(m)

for resource_attr in [
"klant",
"klant2",
"klant_vestiging",
"contactmoment",
"contactmoment2",
"contactmoment_vestiging",
"klant_contactmoment",
"klant_contactmoment2",
"klant_contactmoment3",
"klant_contactmoment4",
]:
resource = getattr(self, resource_attr)
m.get(resource["url"], json=resource)
Expand All @@ -193,16 +232,23 @@ def install_mocks(self, m) -> "MockAPIReadData":
f"{KLANTEN_ROOT}klanten?subjectNietNatuurlijkPersoon__innNnpId={self.eherkenning_user.rsin}",
json=paginated_response([self.klant2]),
)
m.get(
f"{KLANTEN_ROOT}klanten?subjectVestiging__vestigingsNummer=1234",
json=paginated_response([self.klant_vestiging]),
)

m.get(
f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten?klant={self.klant['url']}",
json=paginated_response([self.klant_contactmoment]),
)

m.get(
f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten?klant={self.klant2['url']}",
json=paginated_response([self.klant_contactmoment2]),
)
m.get(
f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten?klant={self.klant_vestiging['url']}",
json=paginated_response([self.klant_contactmoment4]),
)

return self

Expand Down
111 changes: 110 additions & 1 deletion src/open_inwoner/openklant/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
from open_inwoner.accounts.tests.factories import UserFactory
from open_inwoner.openklant.models import OpenKlantConfig
from open_inwoner.openklant.tests.data import MockAPIReadData
from open_inwoner.utils.test import ClearCachesMixin, DisableRequestLogMixin
from open_inwoner.utils.test import (
ClearCachesMixin,
DisableRequestLogMixin,
set_kvk_branch_number_in_session,
)


@requests_mock.Mocker()
Expand Down Expand Up @@ -97,6 +101,49 @@ def test_list_for_kvk_or_rsin(self, m):
},
)

@set_kvk_branch_number_in_session("1234")
def test_list_for_vestiging(self, m):
data = MockAPIReadData().install_mocks(m)
self.client.force_login(user=data.eherkenning_user)

for use_rsin_for_innNnpId_query_parameter in [True, False]:
with self.subTest(
use_rsin_for_innNnpId_query_parameter=use_rsin_for_innNnpId_query_parameter
):
config = OpenKlantConfig.get_solo()
config.use_rsin_for_innNnpId_query_parameter = (
use_rsin_for_innNnpId_query_parameter
)
config.save()

detail_url = reverse(
"cases:contactmoment_detail",
kwargs={"kcm_uuid": data.klant_contactmoment4["uuid"]},
)
list_url = reverse("cases:contactmoment_list")

response = self.client.get(list_url)

kcms = response.context["contactmomenten"]
self.assertEqual(len(kcms), 1)

self.assertEqual(
kcms[0],
{
"registered_date": datetime.fromisoformat(
data.contactmoment_vestiging["registratiedatum"]
),
"channel": data.contactmoment_vestiging["kanaal"].title(),
"text": data.contactmoment_vestiging["tekst"],
"onderwerp": data.contactmoment_vestiging["onderwerp"],
"antwoord": data.contactmoment_vestiging["antwoord"],
"identificatie": data.contactmoment_vestiging["identificatie"],
"type": data.contactmoment_vestiging["type"],
"status": _("Afgehandeld"),
"url": detail_url,
},
)

def test_show_detail_for_bsn(self, m):
data = MockAPIReadData().install_mocks(m)

Expand Down Expand Up @@ -161,6 +208,68 @@ def test_show_detail_for_kvk_or_rsin(self, m):
},
)

@set_kvk_branch_number_in_session("1234")
def test_show_detail_for_vestiging(self, m):
data = MockAPIReadData().install_mocks(m)
self.client.force_login(user=data.eherkenning_user)

for use_rsin_for_innNnpId_query_parameter in [True, False]:
with self.subTest(
use_rsin_for_innNnpId_query_parameter=use_rsin_for_innNnpId_query_parameter
):
config = OpenKlantConfig.get_solo()
config.use_rsin_for_innNnpId_query_parameter = (
use_rsin_for_innNnpId_query_parameter
)
config.save()

detail_url = reverse(
"cases:contactmoment_detail",
kwargs={"kcm_uuid": data.klant_contactmoment4["uuid"]},
)
response = self.client.get(detail_url)

kcm = response.context["contactmoment"]
self.assertEqual(
kcm,
{
"registered_date": datetime.fromisoformat(
data.contactmoment_vestiging["registratiedatum"]
),
"channel": data.contactmoment_vestiging["kanaal"].title(),
"text": data.contactmoment_vestiging["tekst"],
"onderwerp": data.contactmoment_vestiging["onderwerp"],
"antwoord": data.contactmoment_vestiging["antwoord"],
"identificatie": data.contactmoment_vestiging["identificatie"],
"type": data.contactmoment_vestiging["type"],
"status": _("Afgehandeld"),
"url": detail_url,
},
)

@set_kvk_branch_number_in_session("1234")
def test_cannot_access_detail_for_hoofdvestiging_as_vestiging(self, m):
data = MockAPIReadData().install_mocks(m)
self.client.force_login(user=data.eherkenning_user)

for use_rsin_for_innNnpId_query_parameter in [True, False]:
with self.subTest(
use_rsin_for_innNnpId_query_parameter=use_rsin_for_innNnpId_query_parameter
):
config = OpenKlantConfig.get_solo()
config.use_rsin_for_innNnpId_query_parameter = (
use_rsin_for_innNnpId_query_parameter
)
config.save()

detail_url = reverse(
"cases:contactmoment_detail",
kwargs={"kcm_uuid": data.klant_contactmoment2["uuid"]},
)
response = self.client.get(detail_url)

self.assertEqual(response.status_code, 404)

def test_list_requires_bsn_or_kvk(self, m):
user = UserFactory()
list_url = reverse("cases:contactmoment_list")
Expand Down
Loading
Loading