artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 14:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/Rate Limiting endpoint tweaks

Browse Source
This commit is contained in:
Marko Milić 2025-10-30 13:13:13 +01:00
parent 0a7f5b2b35
commit 5f10a42dac
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apimanager/consumers/templates/consumers/detail.html
View File

@ -115,6 +115,7 @@
<table class="table table-striped table-hover">
<thead>
<tr>
<th>{% trans "Rate Limiting ID" %}</th>
<th>{% trans "From Date" %}</th>
<th>{% trans "To Date" %}</th>
<th>{% trans "Per Second" %}</th>
@ -131,6 +132,7 @@
<tbody>
{% for limit in call_limits.limits %}
<tr>
<td><code>{{ limit.rate_limiting_id|default:"N/A" }}</code></td>
<td>{{ limit.from_date|parse_iso_date:"Y-m-d H:i" }}</td>
<td>{{ limit.to_date|parse_iso_date:"Y-m-d H:i" }}</td>
<td>{{ limit.per_second_call_limit|default:"-1" }}</td>

31
apimanager/consumers/views.py
View File

@ -127,7 +127,7 @@ class DetailView(LoginRequiredMixin, FormView):
api = API(self.request.session.get("obp"))
try:
call_limits_urlpath = (
"/management/consumers/{}/consumer/call-limits".format(
"/management/consumers/{}/consumer/rate-limits".format(
self.kwargs["consumer_id"]
)
)
@ -239,7 +239,7 @@ class DetailView(LoginRequiredMixin, FormView):
}
# Use v6.0.0 API for creating rate limits
urlpath = "/management/consumers/{}/consumer/call-limits".format(
urlpath = "/management/consumers/{}/consumer/rate-limits".format(
consumer_id
)
response = self.api.post(
@ -262,9 +262,16 @@ class DetailView(LoginRequiredMixin, FormView):
return HttpResponseRedirect(request.path)
def update_rate_limit(self, request):
"""Update existing rate limit using v5.1.0 PUT API"""
"""Update existing rate limit using v6.0.0 PUT API"""
try:
consumer_id = self.kwargs["consumer_id"]
rate_limiting_id = request.POST.get("rate_limit_id")
if not rate_limiting_id:
messages.error(request, "Rate limiting ID is required for update.")
return JsonResponse(
{"success": False, "error": "Missing rate limiting ID"}
)
# Helper function to format datetime to UTC
def format_datetime_utc(dt_str):
@ -297,12 +304,12 @@ class DetailView(LoginRequiredMixin, FormView):
),
}
# Use v5.1.0 API for updating rate limits
urlpath = "/management/consumers/{}/consumer/call-limits".format(
consumer_id
# Use v6.0.0 API for updating rate limits with rate_limiting_id
urlpath = "/management/consumers/{}/consumer/rate-limits/{}".format(
consumer_id, rate_limiting_id
)
response = self.api.put(
urlpath, payload, version=settings.API_VERSION["v510"]
urlpath, payload, version=settings.API_VERSION["v600"]
)
if "code" in response and response["code"] >= 400:
@ -333,7 +340,7 @@ class DetailView(LoginRequiredMixin, FormView):
)
# Use v6.0.0 API for deleting rate limits
urlpath = "/management/consumers/{}/consumer/call-limits/{}".format(
urlpath = "/management/consumers/{}/consumer/rate-limits/{}".format(
consumer_id, rate_limiting_id
)
response = self.api.delete(urlpath, version=settings.API_VERSION["v600"])
@ -358,7 +365,7 @@ class DetailView(LoginRequiredMixin, FormView):
try:
data = form.cleaned_data
urlpath = "/management/consumers/{}/consumer/call-limits".format(
urlpath = "/management/consumers/{}/consumer/rate-limits".format(
data["consumer_id"]
)
@ -428,7 +435,7 @@ class DetailView(LoginRequiredMixin, FormView):
api = API(self.request.session.get("obp"))
try:
call_limits_urlpath = (
"/management/consumers/{}/consumer/call-limits".format(
"/management/consumers/{}/consumer/rate-limits".format(
self.kwargs["consumer_id"]
)
)
@ -462,7 +469,7 @@ class DetailView(LoginRequiredMixin, FormView):
# Get call limits using the correct API endpoint
call_limits_urlpath = (
"/management/consumers/{}/consumer/call-limits".format(
"/management/consumers/{}/consumer/rate-limits".format(
self.kwargs["consumer_id"]
)
)
@ -545,7 +552,7 @@ class UsageDataAjaxView(LoginRequiredMixin, TemplateView):
api = API(self.request.session.get("obp"))
try:
call_limits_urlpath = (
"/management/consumers/{}/consumer/call-limits".format(
"/management/consumers/{}/consumer/rate-limits".format(
self.kwargs["consumer_id"]
)
)