From 2c00caa02386b5121e4d32eaeb421ee637cae590 Mon Sep 17 00:00:00 2001
From: Kfir Dayan <kfda89@gmail.com>
Date: Tue, 9 Jan 2024 11:17:01 +0200
Subject: [PATCH] adding a single user GET

---
 README.md               | 22 ++++++++++++++--------
 app.py                  |  3 ++-
 routes/userRoutes.py    | 10 ++++++++++
 services/UserService.py |  5 ++++-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index a487eac..c0f71b6 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@ update, delete, and be reminded of events with additional advanced features.
     - location
 - The User will be abale to create/update a new event
 - The User will be able to login/out
-- The User can `Attend`/`UnAttend` to an event
 - The Anonymous User will be able to create a new user
 
 - Event:
@@ -25,9 +24,7 @@ update, delete, and be reminded of events with additional advanced features.
 
 # Backend-reminder
 - The Users will be able to be reminded of upcoming events.
-- The backend will Send reminders 30 minutes before the event's scheduled time.
-
-
+- The backend will Send reminders 30 minutes before the event's scheduled time based on there location and the event location.
 
 
 
@@ -49,10 +46,9 @@ update, delete, and be reminded of events with additional advanced features.
     - DueDate (string, required)
     - User_id (string, required, foreign key)
   
-  - User Event Association (Many to Many)
-    - User_id (string, required, foreign key)
-    - Event_id (Integer, required, foreign key)
-    - Notifiyed Made (bool, default: false)
+  - User Event Association (Many to Many) - this table will hold the notifyed users to the event
+    - User_id (string, required, foreign key, primary key)
+    - Event_id (Integer, required, foreign key, primary key)
 
 
 # API EndPoints
@@ -62,9 +58,19 @@ update, delete, and be reminded of events with additional advanced features.
 - PUT /events/{id} - update an event (Auth + authorized)
 - DELETE /events/{id} - (Soft)delete an event (Auth +  authorized)
 
+- GET /user - returns all users
+- GET /user/{id} - returns a single user
+- POST /user - create a new user (Auth)
+- PUT /user/{id} - update an user (Auth + authorized)
+- DELETE /user/{id} - (Soft)delete an user (Auth +  authorized)
 
 
 
+# Application init flow
+- init schaduler
+- run the flask app
+
+
 # how to run?
 - pip install -r requirements.txt
 - flask db upgrade
diff --git a/app.py b/app.py
index 1bd76c5..7cb72d6 100644
--- a/app.py
+++ b/app.py
@@ -27,7 +27,8 @@ class App:
         self.scheduler.init_app(self.app)
         self.scheduler.start()
         # Schedule the job
-        self.scheduler.add_job(id='notifyUpcommingEvents', func=self.notifyUpcommingEvents, trigger='interval', seconds=1)
+        self.scheduler.add_job(id='notifyUpcommingEvents', func=self.notifyUpcommingEvents, trigger='interval', minutes=30)
+        print("Scheduler started")
 
 
     def set_config(self):
diff --git a/routes/userRoutes.py b/routes/userRoutes.py
index f2674ce..a27f33e 100644
--- a/routes/userRoutes.py
+++ b/routes/userRoutes.py
@@ -11,6 +11,16 @@ def allUsers():
     users = UserService.get_all_users()
     return jsonify(users), 200
 
+@userRoutes.route('/<string:user_id>', methods=['GET'])
+def getUser(user_id):
+    user = UserService.get_user_by_id(user_id)
+    if user:
+        return jsonify(user), 200
+    else:
+        return jsonify({'error': 'User not found'}), 404
+
+
+
 @userRoutes.route('/', methods=['POST'])
 @userRoutes.route('', methods=['POST'])
 @validate_user_post_request
diff --git a/services/UserService.py b/services/UserService.py
index fdb455c..1f13767 100644
--- a/services/UserService.py
+++ b/services/UserService.py
@@ -28,7 +28,10 @@ class UserService:
     
     @staticmethod
     def get_user_by_id(user_id):
-        return User.query.get(user_id)
+        user = User.query.filter_by(id=user_id).first()
+        if user:
+            return user.to_dict()
+        return 
 
     @staticmethod
     def verify_user(data):