zenon/federated-storage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '4-mongodb_api'

Browse Source
This commit is contained in:
Manuel Hude 2020-11-29 14:02:29 +01:00
commit 24a139e8c8
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iotclient/iot_client.py
View File

@ -42,7 +42,7 @@ def get_image(identifier):
print("Getting image with identifier "+identifier) print("Getting image with identifier "+identifier)
baseurl = "http://127.0.0.1:8000" baseurl = "http://127.0.0.1:8000"
get_url = "/image/get?id="+identifier get_url = "/image/get/"+identifier
try: try:
response = requests.get(baseurl + get_url) response = requests.get(baseurl + get_url)
@ -57,7 +57,7 @@ def get_all():
print("Getting all images") print("Getting all images")
baseurl = "http://127.0.0.1:8000" baseurl = "http://127.0.0.1:8000"
get_url = "/image/get" get_url = "/image/get/all"
try: try:
response = requests.get(baseurl + get_url) response = requests.get(baseurl + get_url)

6
middleware/app_be/urls.py
View File

@ -15,7 +15,7 @@ Including another URLconf
""" """
from django.conf.urls import url from django.conf.urls import url
from django.contrib import admin from django.contrib import admin
from django.urls import path from django.urls import path, re_path
from rest_framework.routers import DefaultRouter from rest_framework.routers import DefaultRouter
from app_be.views.rest_api import TestApiClass, ImageEndpoint from app_be.views.rest_api import TestApiClass, ImageEndpoint
@ -23,8 +23,8 @@ from app_be.views.rest_api import TestApiClass, ImageEndpoint
urlpatterns = [ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
url(r'^test/', TestApiClass.test_api), url(r'^test/', TestApiClass.test_api),
url(r'^image/get$', ImageEndpoint.image_api_get_all), url(r'^image/get/all$', ImageEndpoint.image_api_get_all),
url(r'^image/get(?P<id>[-|a-zA-Z0-9]+)$', ImageEndpoint.image_api_get_single), url(r'^image/get/(?P<id>[\w-]+)$', ImageEndpoint.image_api_get_single),
url(r'^image/post$', ImageEndpoint.image_api_post) url(r'^image/post$', ImageEndpoint.image_api_post)
] ]

6
middleware/app_be/views/rest_api.py
View File

@ -28,15 +28,13 @@ class ImageEndpoint:
@api_view(['GET']) @api_view(['GET'])
def image_api_get_all(request): def image_api_get_all(request):
logger.debug('Image GET all call: {}'.format(request)) logger.debug('Image GET all call: {}'.format(request))
print(request)
instance = MongoManager.getInstance() instance = MongoManager.getInstance()
db = instance.AIC db = instance.AIC
col = db.metadata col = db.metadata
print("hier")
try: try:
for resp in col.find(): for resp in col.find():
print(resp) print(resp)
@ -52,8 +50,6 @@ class ImageEndpoint:
def image_api_get_single(request, id): def image_api_get_single(request, id):
logger.debug('Image GET single call: {}'.format(request)) logger.debug('Image GET single call: {}'.format(request))
print("im single")
instance = MongoManager.getInstance() instance = MongoManager.getInstance()
db = instance.AIC db = instance.AIC