From cfc4a343ca0299f9132c644629cd1164c53ed78f Mon Sep 17 00:00:00 2001
From: Cornelia Michlits <cornelia.michlits@tuwien.ac.at>
Date: Tue, 8 Feb 2022 01:28:01 +0100
Subject: [PATCH] 104 - change returning message of endpoints
Former-commit-id: 380162037f496fd583f8f913482d4b9c7a691e7f
---
fda-units-service/app.py | 14 +++++++++-----
fda-units-service/save.py | 8 ++++----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/fda-units-service/app.py b/fda-units-service/app.py
index 74fb83165a..19c57396d9 100644
--- a/fda-units-service/app.py
+++ b/fda-units-service/app.py
@@ -61,7 +61,7 @@ def valitate():
res = {"success": False, "message": str(e)}
return jsonify(res)
-@app.route('/api/units/geturi', methods=["POST"], endpoint='geturi')
+@app.route('/api/units/uri', methods=["GET"], endpoint='uri')
@swag_from('geturi.yml')
def geturi():
input_json = request.get_json()
@@ -81,8 +81,10 @@ def saveconcept():
try:
uri = str(input_json['uri'])
c_name = str(input_json['name'])
- res = insert_mdb_concepts(uri, c_name)
- return jsonify(res), 200
+ if insert_mdb_concepts(uri, c_name) > 0:
+ return jsonify({'uri': uri}), 201
+ else:
+ return jsonify({'status': 'error'}), 400
except Exception as e:
print(e)
res = {"success": False, "message": str(e)}
@@ -97,8 +99,10 @@ def saveconcept():
cid = int(input_json['cid'])
tid = int(input_json['tid'])
cdbid = int(input_json['cdbid'])
- res = insert_mdb_columns_concepts(cdbid, tid, cid, uri)
- return jsonify(res), 200
+ if insert_mdb_columns_concepts(cdbid, tid, cid, uri)>0:
+ return jsonify({'uri': uri}), 201
+ else:
+ return jsonify({'status': 'error'}), 400
except Exception as e:
print(e)
res = {"success": False, "message": str(e)}
diff --git a/fda-units-service/save.py b/fda-units-service/save.py
index a3d90249d0..fbe400bac9 100644
--- a/fda-units-service/save.py
+++ b/fda-units-service/save.py
@@ -16,12 +16,12 @@ def insert_mdb_concepts(uri, c_name):
# Insert tblnames into table mdb_TABLES
cursor.execute("INSERT INTO mdb_concepts (URI,name,created) VALUES (%s,%s,current_timestamp) ON CONFLICT (URI) DO NOTHING", (uri,c_name))
- r = cursor.statusmessage
+ r = cursor.rowcount
conn.commit()
conn.close()
except Exception as e:
print("Error while connecting to metadatabase.",e)
- return json.dumps(r)
+ return r
def insert_mdb_columns_concepts(cdbid,tid, cid, uri):
try:
@@ -37,9 +37,9 @@ def insert_mdb_columns_concepts(cdbid,tid, cid, uri):
# Insert tblnames into table mdb_TABLES
cursor.execute("INSERT INTO mdb_columns_concepts (cDBID,tID, cID,URI,created) VALUES (%s,%s,%s,%s,current_timestamp) ON CONFLICT (cDBID, tID, cID, URI) DO NOTHING", (cdbid,tid,cid,uri))
- r = cursor.statusmessage
+ r = cursor.rowcount
conn.commit()
conn.close()
except Exception as e:
print("Error while connecting to metadatabase.",e)
- return json.dumps(r)
\ No newline at end of file
+ return r
\ No newline at end of file
--
GitLab