input check, test users has units to use

Author: gaborvecsei

code/backend/database/db_repo.py

@@ -1,7 +1,7 @@
 import os
 from binascii import hexlify
 from datetime import datetime
-
+import numpy as np
 from database import db_models, db
 
 
@@ -20,14 +20,24 @@ def init_api_key_object(api_key: str = None) -> db_models.ApiKey:
     return new_api_key
 
 
-def create_user(first_name: str, last_name: str, email: str, api_key: str = None) -> None:
+def create_user(first_name: str, last_name: str, email: str, api_key: str = None,
+                generate_random_units_for_testing: bool = False) -> None:
     new_api_key = init_api_key_object(api_key)
+
+    available_units = 0
+    used_units = 0
+
+    if generate_random_units_for_testing:
+        # This is only for testing, it should be removed
+        available_units = np.random.randint(10, 100)
+        used_units = np.random.randint(10, 100)
+
     new_user = db_models.User(first_name=first_name,
                               last_name=last_name,
                               email=email,
                               date_signed_up=datetime.now(),
-                              available_units=0,
-                              used_units=0,
+                              available_units=available_units,
+                              used_units=used_units,
                               api_key=new_api_key, )
     db.db_session.add(new_user)
     db.db_session.commit()

code/backend/rest_api.py

@@ -17,6 +17,11 @@
 
 
 def not_found_error(msg):
+    """
+    This is used for any type of error right now
+    (TODO)
+    """
+
     status_code = 404
     message = {
         'status': status_code,
@@ -49,7 +54,10 @@ def add_test_users(nb_of_users: int):
     nb_of_users = int(nb_of_users)
 
     for i in range(nb_of_users):
-        db_repo.create_user("Test", "User{0}".format(i), "just{0}@test.com".format(i))
+        db_repo.create_user("Test",
+                            "User{0}".format(i),
+                            "just{0}@test.com".format(i),
+                            generate_random_units_for_testing=True)
 
     app.logger.info("Test users are created")
 
@@ -58,17 +66,29 @@ def add_test_users(nb_of_users: int):
 
 @app.route("/microservice/sample_service", methods=["POST"])
 def use_sample_service():
+    """
+    Sample endpoint for the service
+    """
+
     req_json = request.get_json()
 
     try:
         # For authentication
         api_key_str = req_json["api_key"]
         # For the service
-        size = int(req_json["size"])
+        size = req_json["size"]
     except KeyError:
         app.logger.error("Could not find the necessary keys in the request's body")
         return not_found_error("Required keys are not found in POST's body")
 
+    try:
+        size = int(size)
+    except Exception as e:
+        return not_found_error("Wrong input type. It should be A Number.")
+
+    if size <= 0:
+        return not_found_error("Number input should be greater than 0")
+
     user = db_repo.find_user_by_api_key(api_key_str)
 
     if user is None:

code/frontend/index.html

@@ -47,7 +47,7 @@ <h3 class="mb-0 text-white">Service</h3>
                                     <div class="input-group-prepend">
                                         <span class="input-group-text">#</span>
                                     </div>
-                                    <input id="numberOfCharsInput" class="form-control" placeholder="number of characters"
+                                    <input id="numberOfCharsInput" type="number" class="form-control" placeholder="number of characters"
                                            required>
                                 </div>
                                 <div class="input-group mb-3">