Class methods instead of queries and code changes

Author: dani37x

project_files/admin.py

@@ -43,7 +43,7 @@ def admin():
 @captcha('admin_user')
 def admin_user():
 
-  users = Users.query.all() 
+  users = Users().all_rows 
 
   if request.method == 'POST':
     searching = request.form['search']
@@ -128,8 +128,8 @@ def admin_user():
 
       if selected_action == 'test email':
         users_emails = []
-        for id in data:
-          user = Users.query.filter_by(id=id).first()
+        for user_id in data:
+          user = Users.query.filter_by(id=user_id).first()
           users_emails.append(user.email)
 
         task = queue.enqueue(
@@ -161,7 +161,7 @@ def admin_user():
 # @captcha('admin_blocked')
 def admin_blocked():
 
-  blocked = BlockedUsers.query.all() 
+  blocked = BlockedUsers().all_rows
 
   if request.method == 'POST':
     searching = request.form['search']
@@ -212,7 +212,7 @@ def admin_blocked():
 @captcha('admin_product')
 def admin_product():
 
-  products = Products.query.all() 
+  products = Products().all_rows
 
   if request.method == 'POST':
     searching = request.form['search']
@@ -474,14 +474,10 @@ def add_blocked():
 def update_blocked(id):
 
   blocked = BlockedUsers.query.get_or_404(id)
-
+  
   if request.method == 'POST':
-    blocked.username = not_null(request.form['username'])
-    blocked.ip = not_null( request.form['ip'])
-    blocked.date = not_null( request.form['date'])
-
     try:
-      db.session.commit()
+      blocked.update_row(**dict(request.form))
       return redirect(url_for('admin_blocked'))
 
     except Exception as e:
@@ -562,16 +558,10 @@ def update_product(id):
   product = Products.query.get_or_404(id)
 
   if request.method == 'POST':
-    product.name = not_null(request.form['name'])
-    product.category = not_null(request.form['category'])
-    product.company = not_null(request.form['company'])
-    product.price = not_null(request.form['price'])
-    product.old_price = not_null(request.form['old_price'])
-    product.date = not_null(request.form['date'])
 
     try:
-      db.session.commit()
-      save_price(data=[product])
+      product.update_row(**dict(request.form))
+      save_price(product=product)
       return redirect( url_for('admin_product'))
 
     except Exception as e:

project_files/database.py

@@ -8,11 +8,11 @@
 class Base():
 
     @property
-    def show_all_rows(self):
+    def all_rows(self):
         return self.query.all()
 
 
-    def show_one_row(self, column, value):
+    def show_row(self, column, value):
         filter_condition = {column: value}
         return self.query.filter_by(**filter_condition).first()
 
@@ -24,6 +24,8 @@ def add_row_to_db(self):
 
     def update_row(self, **kwargs):
         for key, value in kwargs.items():
+            if value == '' or value == None:
+                return ValueError('Field can not be empty')
             setattr(self, key, value)
         db.session.commit()
 
@@ -33,7 +35,8 @@ def delete_row(self):
         db.session.commit()
 
 
-class Users(UserMixin, db.Model, Base):
+
+class Users(db.Model, UserMixin, Base):
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(30), unique=True, nullable=False)
     first_name = db.Column(db.String(30),unique=False, nullable=False)
@@ -51,15 +54,18 @@ class Users(UserMixin, db.Model, Base):
         nullable=False, 
         default=datetime.now().strftime('%d-%m-%Y  %H:%M:%S')
     )
-    product = db.relationship('UsersProducts', backref=db.backref('users', lazy=True))
+    product = db.relationship(
+        'UsersProducts', 
+        backref=db.backref('users', lazy=True)
+    )
 
 
     def __repr__(self):
         return f'Users(id={self.id}, username={self.username})'
 
 
 
-class BlockedUsers(db.Model, Base):
+class BlockedUsers(Base, db.Model):
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(30), unique=False, nullable=False)
     ip = db.Column(db.String(30), unique=False, nullable=False)
@@ -77,7 +83,7 @@ def __repr__(self):
 
 
 
-class Products(db.Model, Base):
+class Products(Base, db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(30), unique=False, nullable=False)
     category = db.Column(db.String(30), unique=False, nullable=False)
@@ -90,19 +96,30 @@ class Products(db.Model, Base):
         nullable=False, 
         default=datetime.now().strftime('%d-%m-%Y  %H:%M:%S')
     )
-    user = db.relationship('UsersProducts', backref=db.backref('products', lazy=True))
+    user = db.relationship(
+        'UsersProducts', 
+        backref=db.backref('products', lazy=True)
+    )
 
 
     def __repr__(self):
-        return f'Products(id={self.id}, username={self.name})'
+        return f'Products(id={self.id}, name={self.name})'
 
 
 
 
-class UsersProducts(db.Model, Base):
+class UsersProducts(Base, db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    user_id = db.Column(db.Integer, db.ForeignKey('users.id'),  nullable=False)
-    product_id = db.Column(db.Integer, db.ForeignKey('products.id'),  nullable=False)
+    user_id = db.Column(
+        db.Integer, 
+        db.ForeignKey('users.id'), 
+        nullable=False
+    )
+    product_id = db.Column(
+        db.Integer, 
+        db.ForeignKey('products.id'), 
+        nullable=False
+    )
     date = db.Column(
         db.String, 
         nullable=False, 

project_files/scripts/actions.py

@@ -48,13 +48,13 @@ def backup(model):
         path = USERS
     elif model == Products:
         path = PRODUCTS
-    else:
+    elif model == BlockedUsers:
         path = BLOCKED_USERS
 
     data_from_file = open_json(file_path=path)
     objects_list = []
     columns = tuple([m.key for m in model.__table__.columns])
-    model_data = model.query.all()
+    model_data = model().all_rows
 
     for row in model_data:
         data = {}
@@ -82,7 +82,8 @@ def restore_database(model):
                 account_type=data['account_type'],
                 active=data['active'],
                 points=data['points'],
-                newsletter=data['newsletter']
+                newsletter=data['newsletter'],
+                date=data['date']
             )
             whether_exist = model.query.filter_by(username=data['username']).first()
 
@@ -167,7 +168,7 @@ def account_deactivation(model, data):
 def delete_inactive_accounts():
     time.sleep(60)
     app.app_context().push()
-    users = Users.query.all()
+    users = Users().all_rows
 
     for user in users:
         if user.active ==  False:
@@ -219,7 +220,7 @@ def send_newsletter():
 
     if users :=  Users.query.filter_by(newsletter=True).all():
 
-        if products := Products.query.all():
+        if products := Products().all_rows:
             products = products[-5:]            
             mails = [user.email for user in users]
 

project_files/scripts/functions.py

@@ -241,7 +241,7 @@ def generator(answer, obstacle):
 
 def unblock():
     app.app_context().push()
-    blocked_users = BlockedUsers.query.all()
+    blocked_users = BlockedUsers().all_rows
 
     for blocked in blocked_users:
         if (datetime.now() > string_to_date(blocked.date)):
@@ -288,7 +288,7 @@ def similar_products_to_queries(username):
     queries = open_json(file_path=DATA)
     user_queries = [query for query in queries if query['username'] == username]
 
-    if products := Products.query.all():
+    if products := Products().all_rows:
 
         if len(user_queries) == 0:
             random_products = []

project_files/templates/admin/update_blocked.html

@@ -1,7 +1,9 @@
 
 
  <form action="/update-blocked/{{blocked.id}}" method="post">
-
+   <label for="id">id:</label>
+      <input type="text" name="id" value="{{id.username}}"/>
+      <br>
    <label for="username">username:</label>
       <input type="text" name="username" value="{{blocked.username}}"/>
       <br>

project_files/templates/admin/update_product.html

@@ -1,7 +1,10 @@
 
 
  <form action="/update-product/{{product.id}}" method="post">
-
+   
+   <label for="id">id</label>
+      <input type="number" name="id" value="{{product.id}}"/>
+      <br>
    <label for="name">name</label>
       <input type="text" name="name" value="{{product.name}}"/>
       <br>

project_files/templates/admin/update_user.html

@@ -1,7 +1,9 @@
 
 
  <form action="/update-user/{{user.id}}" method="post">
-
+   <label for="id">id</label>
+      <input type="text" name="id" value="{{user.id}}"/>
+      <br>
    <label for="username">username</label>
       <input type="text" name="username" value="{{user.username}}"/>
       <br>