From 9444b075982099ad71026d10d9251b0a384569df Mon Sep 17 00:00:00 2001
From: dcz <dcz@ipipan.waw.pl>
Date: Mon, 25 Sep 2023 15:51:01 +0200
Subject: [PATCH] An additional argument when requesting slowal frame unifiy
API.
---
semantics/views.py | 12 ++++++++----
shellvalier/settings.py | 2 ++
unifier/views.py | 9 ++++++---
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/semantics/views.py b/semantics/views.py
index 8e7a313..efac9c0 100644
--- a/semantics/views.py
+++ b/semantics/views.py
@@ -32,7 +32,8 @@ def frame_confirm_invalid(request, frame_pk):
removeSlovalFrameMappingsAndAssigments(frame_pk)
http = urllib3.PoolManager()
- r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk))
+ r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) +
+ settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG)
return {}
@@ -47,7 +48,8 @@ def frame_reject_invalid(request, frame_pk):
removeSlovalFrameMappingsAndAssigments(frame_pk)
http = urllib3.PoolManager()
- r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk))
+ r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) +
+ settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG)
return {}
@@ -62,7 +64,8 @@ def frame_mark_as_bad(request, frame_pk):
removeSlovalFrameMappingsAndAssigments(frame_pk)
http = urllib3.PoolManager()
- r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk))
+ r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) +
+ settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG)
return {}
@@ -98,7 +101,8 @@ def frame_confirm_as_not_matching_unified_frame(request, frame_pk):
removeSlovalFrameMappingsAndAssigments(frame_pk)
http = urllib3.PoolManager()
- r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk))
+ r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) +
+ settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG)
return {}
diff --git a/shellvalier/settings.py b/shellvalier/settings.py
index 8ea5d4c..3374a76 100644
--- a/shellvalier/settings.py
+++ b/shellvalier/settings.py
@@ -196,3 +196,5 @@ SLOWAL_FRAME_REMOVE_SERVICE_URL = get_environment('SLOWAL_FRAME_REMOVE_SERVICE_U
default='http://walentygroupies.ipipan.waw.pl/ajax/frame_statuses_free/?unifier_frame_ids=')
SLOWAL_FRAME_TAKE_SERVICE_URL = get_environment('SLOWAL_FRAME_TAKE_SERVICE_URL',
default='http://walentygroupies.ipipan.waw.pl/ajax/frame_statuses_take/?unifier_frame_ids=')
+SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG = get_environment('SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG',
+ default='&system=valUnifier')
diff --git a/unifier/views.py b/unifier/views.py
index 5dd03ee..f1318b4 100644
--- a/unifier/views.py
+++ b/unifier/views.py
@@ -630,7 +630,8 @@ def create_unified_frame(frame_id):
http = urllib3.PoolManager()
- r = http.request('GET', settings.UNIFIED_FRAME_SERVICE_URL + str(frame_id))
+ r = http.request('GET', settings.UNIFIED_FRAME_SERVICE_URL + str(frame_id) +
+ settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG)
response = r.data.decode('utf-8')
@@ -778,7 +779,8 @@ def delete_unified_frame(request, unified_frame_id):
if len(slowal_frames_ids) > 0:
http = urllib3.PoolManager()
- r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + slowal_frames_ids)
+ r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + slowal_frames_ids +
+ settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG)
UnifiedFrame.objects.get(id=unified_frame_id).delete()
@@ -955,7 +957,8 @@ def attach_lu_to_unified_frame(request):
for frame in frames:
http = urllib3.PoolManager()
- r = http.request('GET', settings.SLOWAL_FRAME_TAKE_SERVICE_URL + str(frame.id))
+ r = http.request('GET', settings.SLOWAL_FRAME_TAKE_SERVICE_URL + str(frame.id) +
+ settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG)
return JsonResponse({})
return JsonResponse({})
--
GitLab