From 461a42edcd621652eabaf7552ac1196e152c29d4 Mon Sep 17 00:00:00 2001 From: Manuel Hude Date: Sun, 29 Nov 2020 14:02:01 +0100 Subject: [PATCH] added single get search with url parsing --- iotclient/iot_client.py | 4 ++-- middleware/app_be/urls.py | 6 +++--- middleware/app_be/views/rest_api.py | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/iotclient/iot_client.py b/iotclient/iot_client.py index a246b7a..c94823c 100644 --- a/iotclient/iot_client.py +++ b/iotclient/iot_client.py @@ -42,7 +42,7 @@ def get_image(identifier): print("Getting image with identifier "+identifier) baseurl = "http://127.0.0.1:8000" - get_url = "/image/get?id="+identifier + get_url = "/image/get/"+identifier try: response = requests.get(baseurl + get_url) @@ -57,7 +57,7 @@ def get_all(): print("Getting all images") baseurl = "http://127.0.0.1:8000" - get_url = "/image/get" + get_url = "/image/get/all" try: response = requests.get(baseurl + get_url) diff --git a/middleware/app_be/urls.py b/middleware/app_be/urls.py index 126f294..1352f84 100644 --- a/middleware/app_be/urls.py +++ b/middleware/app_be/urls.py @@ -15,7 +15,7 @@ Including another URLconf """ from django.conf.urls import url from django.contrib import admin -from django.urls import path +from django.urls import path, re_path from rest_framework.routers import DefaultRouter from app_be.views.rest_api import TestApiClass, ImageEndpoint @@ -23,8 +23,8 @@ from app_be.views.rest_api import TestApiClass, ImageEndpoint urlpatterns = [ path('admin/', admin.site.urls), url(r'^test/', TestApiClass.test_api), - url(r'^image/get$', ImageEndpoint.image_api_get_all), - url(r'^image/get(?P[-|a-zA-Z0-9]+)$', ImageEndpoint.image_api_get_single), + url(r'^image/get/all$', ImageEndpoint.image_api_get_all), + url(r'^image/get/(?P[\w-]+)$', ImageEndpoint.image_api_get_single), url(r'^image/post$', ImageEndpoint.image_api_post) ] diff --git a/middleware/app_be/views/rest_api.py b/middleware/app_be/views/rest_api.py index 1f7f610..cb8316f 100644 --- a/middleware/app_be/views/rest_api.py +++ b/middleware/app_be/views/rest_api.py @@ -28,15 +28,13 @@ class ImageEndpoint: @api_view(['GET']) def image_api_get_all(request): logger.debug('Image GET all call: {}'.format(request)) + print(request) instance = MongoManager.getInstance() db = instance.AIC col = db.metadata - print("hier") - - try: for resp in col.find(): print(resp) @@ -52,8 +50,6 @@ class ImageEndpoint: def image_api_get_single(request, id): logger.debug('Image GET single call: {}'.format(request)) - print("im single") - instance = MongoManager.getInstance() db = instance.AIC