From 93ed2db5f347879c8ed042e0a81cd65fa5078c0e Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Tue, 8 Jun 2021 12:01:32 +0200
Subject: [PATCH] revert latest change, as it does break testing. See issue #19
---
apiserver/main.py | 6 +++---
apiserver/storage/JsonFileStorageAdapter.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apiserver/main.py b/apiserver/main.py
index bf55e3f..2bb64cc 100644
--- a/apiserver/main.py
+++ b/apiserver/main.py
@@ -4,7 +4,7 @@ Main module of data catalog api
import logging
from datetime import timedelta
from enum import Enum
-from typing import Dict, List, Tuple
+from typing import List, Tuple
from fastapi import FastAPI, HTTPException, Request, status
from fastapi.param_functions import Depends
@@ -84,7 +84,7 @@ async def get_specific_dataset(location_data_type: LocationDataType, dataset_id:
"""returns all information about a specific dataset, identified by id"""
return adapter.get_details(location_data_type, dataset_id)
-@app.post("/{location_data_type}", response_model=Dict[str, LocationData])
+@app.post("/{location_data_type}", response_model=Tuple[str, LocationData])
async def add_dataset(location_data_type: LocationDataType,
dataset: LocationData,
user: User = Depends(my_user)):
@@ -92,7 +92,7 @@ async def add_dataset(location_data_type: LocationDataType,
return adapter.add_new(location_data_type, dataset, user.username)
-@app.put("/{location_data_type}/{dataset_id}", response_model=Dict[str, LocationData])
+@app.put("/{location_data_type}/{dataset_id}", response_model=Tuple[str, LocationData])
async def update_specific_dataset(location_data_type: LocationDataType,
dataset_id: str, dataset: LocationData,
user: User = Depends(my_user)):
diff --git a/apiserver/storage/JsonFileStorageAdapter.py b/apiserver/storage/JsonFileStorageAdapter.py
index 8dd438b..bdae20d 100644
--- a/apiserver/storage/JsonFileStorageAdapter.py
+++ b/apiserver/storage/JsonFileStorageAdapter.py
@@ -73,7 +73,7 @@ class JsonFileStorageAdapter(AbstractLocationDataStorageAdapter):
to_store = StoredData(users=[user_name], actualData=data)
with open(os.path.join(localpath, oid), 'w') as json_file:
json.dump(to_store.dict(), json_file)
- return {oid : data}
+ return (oid, data)
def get_details(self, n_type: LocationDataType, oid: str):
full_path = self.__get_object_path(value=n_type.value, oid=oid)
@@ -89,7 +89,7 @@ class JsonFileStorageAdapter(AbstractLocationDataStorageAdapter):
with open(full_path, 'w') as f:
json.dump(obj.dict(), f)
- return {oid : data}
+ return (oid, data)
def delete(self, n_type: LocationDataType, oid: str, usr: str):
full_path = self.__get_object_path(value=n_type.value, oid=oid)
--
GitLab