From bcd0c2a8cc20a7b376672ed7b63a3f34ddfe608b Mon Sep 17 00:00:00 2001
From: fwandt <fabian.wandt@afib-it.de>
Date: Sun, 9 Aug 2020 14:30:05 +0200
Subject: [PATCH] =?UTF-8?q?Suche=20von=20Usern=20=C3=BCber=20username=20an?=
 =?UTF-8?q?statt=20uid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gitlab_api/app/__pycache__/app.cpython-37.pyc | Bin 538 -> 538 bytes
 .../app/__pycache__/db_model.cpython-37.pyc   | Bin 1226 -> 1226 bytes
 gitlab_api/app/api.py                         |  20 ++++++++++--------
 gitlab_api/app/api_test.py                    |   4 ++--
 gitlab_api/app/db.sqlite                      | Bin 8192 -> 8192 bytes
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/gitlab_api/app/__pycache__/app.cpython-37.pyc b/gitlab_api/app/__pycache__/app.cpython-37.pyc
index 28ba2f6159191c576bbe424d9f27a76b4c32ef94..bbdcbf78a61367333a8dc93ab1e95e1283a0857e 100644
GIT binary patch
delta 20
acmbQmGK+=ViI<m)0SI=#(BH_-&jbK0VgyY9

delta 20
acmbQmGK+=ViI<m)0SF%Q>u%)cX955yOaqtz

diff --git a/gitlab_api/app/__pycache__/db_model.cpython-37.pyc b/gitlab_api/app/__pycache__/db_model.cpython-37.pyc
index e864ec9b648f9e2fd2c3213efb09734f12718d72..b29e42689f1c0dea3673c4259f0973391f9d3d03 100644
GIT binary patch
delta 20
acmX@bd5V+UiI<m)0SI=#(BH_tp9KIlm<4G7

delta 20
acmX@bd5V+UiI<m)0SIOa=x*fR&jJ81kOXZ2

diff --git a/gitlab_api/app/api.py b/gitlab_api/app/api.py
index 7fc9613..4b48401 100644
--- a/gitlab_api/app/api.py
+++ b/gitlab_api/app/api.py
@@ -7,6 +7,8 @@ import os
 
 
 
+
+
 #User erstellen
 @app.route('/user', methods=['POST'])
 def add_user():
@@ -30,15 +32,15 @@ def get_users():
   return jsonify(result)
 
 #Ausgabe eines einzelnen Users
-@app.route('/user/<id>', methods=['GET'])
-def get_user(id):
-  user = User.query.get(id)
+@app.route('/user/<username>', methods=['GET'])
+def get_user(username):
+  user = User.query.filter_by(username= username).first()
   return user_schema.jsonify(user)
 
 #Bearbeiten eines Users
-@app.route('/user/<id>', methods=['PUT'])
-def update_user(id):
-  user = User.query.get(id)
+@app.route('/user/<username>', methods=['PUT'])
+def update_user(username):
+  user = User.query.filter_by(username= username).first()
 
   vname = request.json['vname']
   nname = request.json['nname']
@@ -55,9 +57,9 @@ def update_user(id):
   return user_schema.jsonify(user)
 
 #Löschen eines Users
-@app.route('/user/<id>', methods=['DELETE'])
-def delete_user(id):
-  user = User.query.get(id)
+@app.route('/user/<username>', methods=['DELETE'])
+def delete_user(username):
+  user = User.query.filter_by(username= username).first()
   db.session.delete(user)
   db.session.commit()
 
diff --git a/gitlab_api/app/api_test.py b/gitlab_api/app/api_test.py
index b196fd6..40b974c 100644
--- a/gitlab_api/app/api_test.py
+++ b/gitlab_api/app/api_test.py
@@ -25,7 +25,7 @@ def post():
 #Delete Request: User Delete
 def delete():
     print("DELETE")
-    url = "http://0.0.0.0:5000/user/1"
+    url = "http://0.0.0.0:5000/user/kmueller"
     r = requests.delete(url)
     print(r.status_code)
     print(r.content)
@@ -33,7 +33,7 @@ def delete():
 #Put Request: User Update
 def put():
     print("PUT")
-    url = "http://0.0.0.0:5000/user/1"
+    url = "http://0.0.0.0:5000/user/hpotter"
     data = {'vname': 'kevin', 'nname': 'mueller', 'username':'kmueller','aktiv':'nein'}
     header = {'Content-type': 'application/json'}
     r = requests.put(url,data=json.dumps(data), headers=header)
diff --git a/gitlab_api/app/db.sqlite b/gitlab_api/app/db.sqlite
index 9ef6266b6330bf9e22797d4bba803b0aa4973556..70e2ce4bb0f38453ec5c080d77eec84ce087a5e4 100644
GIT binary patch
delta 17
YcmZp0XmFSy&8Rq0#+gxZW5NP?053KLFaQ7m

delta 17
YcmZp0XmFSy%_uQZ#+gxKW5NP?04}cu9smFU

-- 
GitLab