Merge pull request #61 from dani37x/dev

This merge includes commits from various sections of the project. The 'errors.py' description was created, and a few changes were made to HTML files. It is important to note that a new logic for the buying system was implemented. Additionally, this merge adds new actions to the admin panel. Some functions were rebuilt and regrouped as well.

Author: dani37x

README.md

@@ -52,7 +52,7 @@ Overall, E-lectro is a well-designed and fully-functional web application that d
   - [x] set the random price for products from last month
 - [x] Redis and Redis queue
   - [x] Redis queue and workers
-  - [x] old functions with async queue usage
+  - [x] old and new functions with co-work with async queue usage
   - [x] time to cancel task from queue
   - [x] delete cancelled task from rq history
 - [x] Forms
@@ -61,6 +61,7 @@ Overall, E-lectro is a well-designed and fully-functional web application that d
   - [x] Key form
   - [x] New Password form
   - [x] Remind Password form
+  - [x] Captcha Chars Counter form
 - [x] Flask Login
   - [x] Login
   - [x] Authantacion
@@ -135,12 +136,16 @@ Overall, E-lectro is a well-designed and fully-functional web application that d
   - [x] users can see how much money they will save on each product during the promotion, thanks to the discount
 - [x] User panel
   - [x] a user can change his nickname, e-mail, and the personal data
+  - [x] history of boughted products by users
 - [ ] better Readme section of installation which depict the correct process with Redis and Redis queue
+- [ ] option of payment for products
+- [ ] descriptions of funcs
+- [ ] more descriptions of files
+- [ ] tests of funcs
+- [ ] shop cart
 - [ ] multi-device login (max 3)
 - [ ] account lvl and points system with discounts.
 - [ ] payments for products
-- [ ] boughted products by users
-- [ ] list of products
 - [ ] own hash password algorithm
 - [ ] own authentication system
 

project_files/admin.py

@@ -12,13 +12,13 @@
 
 from .scripts.functions import check_admin, check_user, captcha
 from .scripts.functions import save_event, the_price, save_price
+from .scripts.functions import rq_add_row_to_db, rq_delete_db_row
 
 from .scripts.actions import delete_rows, block_users, message, backup
 from .scripts.actions import account_activation, account_deactivation
 from .scripts.actions import delete_inactive_accounts, restore_database
-from .scripts.actions import send_newsletter
+from .scripts.actions import send_newsletter, the_price_actions
 from .scripts.actions import discount, previous_price, price_hike
-from .scripts.actions import rq_add_row_to_db, rq_delete_db_row
 
 from .form import not_null
 
@@ -278,32 +278,32 @@ def admin_product():
         )
         return render_template('admin/admin_product.html', products=products, task=task)
 
-      # if selected_action == 'the_lowest_price':
-      #   task = queue.enqueue(
-      #     the_price,
-      #     data=data,
-      #     price_type=selected_action,
-      #     retry=Retry(max=3, interval=[10, 30, 60])
-      #   )
-      #   return render_template('admin/admin_product.html', products=products, task=task)
-
-      # if selected_action == 'the_highest_price':
-      #   task = queue.enqueue(
-      #     the_price,
-      #     data=data,
-      #     price_type=selected_action,
-      #     retry=Retry(max=3, interval=[10, 30, 60])
-      #   )
-      #   return render_template('admin/admin_product.html', products=products, task=task)
-
-      # if selected_action == 'the_random_price':
-      #   task = queue.enqueue(
-      #     the_price,
-      #     data=data,
-      #     price_type=selected_action,
-      #     retry=Retry(max=3, interval=[10, 30, 60])
-      #   )
-      #   return render_template('admin/admin_product.html', products=products, task=task)
+      if selected_action == 'the_lowest_price':
+        task = queue.enqueue(
+          the_price_actions,
+          data=data,
+          price_type=selected_action,
+          retry=Retry(max=3, interval=[10, 30, 60])
+        )
+        return render_template('admin/admin_product.html', products=products, task=task)
+
+      if selected_action == 'the_highest_price':
+        task = queue.enqueue(
+          the_price_actions,
+          data=data,
+          price_type=selected_action,
+          retry=Retry(max=3, interval=[10, 30, 60])
+        )
+        return render_template('admin/admin_product.html', products=products, task=task)
+
+      if selected_action == 'the_random_price':
+        task = queue.enqueue(
+          the_price_actions,
+          data=data,
+          price_type=selected_action,
+          retry=Retry(max=3, interval=[10, 30, 60])
+        )
+        return render_template('admin/admin_product.html', products=products, task=task)
 
 
       if selected_action == 'backup':

project_files/auth.py

@@ -82,7 +82,6 @@ def register():
   if form.validate_on_submit():
 
     try:
-
       session_list = open_json(file_path=SESSIONS)
       sess = check_session(session_list=session_list)    
       key = random_string(size=6)
@@ -105,7 +104,6 @@ def register():
       return redirect( url_for('register_session', rendered_session=sess))
 
     except Exception as e:
-
       save_event(event=e, site=register.__name__)
       return 'Error with add register sessions'
 
@@ -160,7 +158,6 @@ def login():
   if request.method == 'POST':
 
     if form.validate_on_submit():
-
       user = Users.query.filter_by(
         email=form.email.data,
         username=form.username.data
@@ -197,7 +194,7 @@ def remind():
   if request.method == 'POST':
 
     if form.validate_on_submit():
-        
+
       user = Users.query.filter_by(
           username=form.username.data,
           email=form.email.data
@@ -225,7 +222,6 @@ def remind():
           return 'xd'
 
         save_json(file_path=SESSIONS, data=session_list)
-
         return redirect( url_for( 'hash_session', rendered_session=sess))
 
   return render_template('auth/remind_password.html', form=form)

project_files/errors.py

@@ -1,3 +1,14 @@
+"""
+The file errors.py contains error handlers for the entire application
+and addresses the most common errors. These error handlers collect the
+errors and store them in a file called EVENTS.json, which works in
+conjunction with the event system. 
+
+This approach can help to streamline the error handling process and 
+ensure that issues are properly recorded for future reference.
+"""
+
+
 from project_files import app
 
 from .scripts.functions import save_event
@@ -11,7 +22,6 @@ def handle_405(e):
 
 @app.errorhandler(404)
 def handle_404(e):
-    # save_event(event=e, site=handle_404.__name__)
     return '404'
 
 

project_files/main.py

@@ -1,5 +1,6 @@
 from project_files import app
 from project_files import db
+from project_files import queue
 from project_files import login_manager
 
 from .database import Users, Products, UsersProducts
@@ -8,11 +9,13 @@
 from .scripts.functions import check_admin, check_user, captcha
 from .scripts.functions import similar_products_to_queries, recently_searched
 from .scripts.functions import classification, save_event, user_searched
-from .scripts.functions import the_price
+from .scripts.functions import the_price, rq_add_row_to_db
 
 from flask_login import login_required, current_user
 from flask import render_template, url_for, redirect, request, session, make_response
 
+from rq import Retry
+
 from datetime import datetime
 
 import random
@@ -125,7 +128,6 @@ def product_info(product_id):
   discount = the_price(product=product, price_type='the_highest_price')
   discount = round(product.price*100/discount, 0)
 
-
   resp = make_response(
     render_template(
       'shop/product_info.html', 
@@ -134,12 +136,26 @@ def product_info(product_id):
       the_lowest_price=the_price(product=product, price_type='the_lowest_price'),
       the_highest_price=the_price(product=product, price_type='the_highest_price')
   ))
-
   resp.set_cookie(
     key=f'{product.category}', 
     value=f'{product.price}',
     max_age=10*60*60*24
   )
+
+  if request.method == 'POST':
+    buy_product = UsersProducts(
+      user_id=current_user.id,
+      product_id=product.id,
+      price=product.price
+    )
+    queue.enqueue(
+      rq_add_row_to_db,
+      obj=buy_product,
+      retry=Retry(max=3, interval=[10, 30, 60])
+    )
+    # flash message
+    return redirect( url_for('product_info', product_id=product_id))
+
   return resp
 
 

project_files/scripts/actions.py

@@ -12,10 +12,10 @@
 from project_files import app
 from project_files import mail
 from project_files import queue
-from project_files import BLOCKED_USERS, USERS, PRODUCTS
+from project_files import BLOCKED_USERS, USERS, PRODUCTS, PRICES
 
 from .functions import open_json, save_json , string_to_date
-from .functions import save_price
+from .functions import save_price, back_to_slash
 
 from ..database import Users, BlockedUsers, Products
 
@@ -27,31 +27,21 @@
 
 import time
 
-
-# joint funcs
+import random
 
 
-def rq_add_row_to_db(obj):
-    app.app_context().push()
-    db.session.add(obj)
-    db.session.commit()
-
+# joint funcs
 
 def delete_rows(model, data):
     time.sleep(10)
     app.app_context().push()
 
+
     for number in data:
         model.query.filter_by(id=number).delete()
         db.session.commit()
 
 
-def rq_delete_db_row(obj):
-    app.app_context().push()
-    db.session.delete(obj)
-    db.session.commit()
-
-
 def backup(model):
 
     if model == Users:
@@ -260,7 +250,7 @@ def newsletter_deactivation(username):
 # The funcs of Products panel
 
 
-def discount(percent, data, days):
+def discount(percent, data, days=0):
     time.sleep(10)
     app.app_context().push()
     percent = 1-(int(percent)/100)
@@ -271,10 +261,10 @@ def discount(percent, data, days):
         product.price *= percent
         product.price = round(product.price, 2)
         db.session.commit()
-        save_price(data=[product], days=days)
+        save_price(product=product, days=days)
 
 
-def price_hike(percent, data, days):
+def price_hike(percent, data, days=0):
     time.sleep(10)
     app.app_context().push()
     percent = 1+(int(percent)/100)
@@ -285,7 +275,7 @@ def price_hike(percent, data, days):
         product.price *= percent
         product.price = round(product.price, 2)
         db.session.commit()
-        save_price(data=[product], days=days)
+        save_price(product=product, days=days)
 
 
 def previous_price(data):
@@ -297,8 +287,38 @@ def previous_price(data):
             product.price = product.old_price
             product.old_price = variable
             db.session.commit()
-            save_price(data=[product])
+            save_price(product=product)
 
 
-    
+def the_price_actions(data, price_type):
+    app.app_context().push()
+    file_path = back_to_slash(PRICES)
+    objects_list = open_json(file_path=file_path)
+
+    for number in data:
+        product = Products.query.get(int(number))
+        product_info = []
+        for obj in objects_list:
+            if int(obj['id']) == product.id:
+                product_info.append(float(obj['price']))
+                product_info.append(float(obj['old_price']))
+
+        variable = product.price
+
+        if price_type == 'the_lowest_price':
+            product.price = min(product_info)
+            product.old_price = variable
+
+        elif price_type == 'the_highest_price':
+            variable = product.price
+            product.price = max(product_info)
+            product.old_price = variable
+
+        elif price_type == 'the_random_price':
+            product.price = random.choice(product_info)
+            product.old_price = variable
+
+        save_price(product=product)
+        
+    db.session.commit()