Removed celery and redis

02b4dedb-9076-43ac-95e8-5d9d8c30b8e3_output.json

@@ -0,0 +1,4 @@
+{
+    "id": "02b4dedb-9076-43ac-95e8-5d9d8c30b8e3",
+    "malicious": false
+}

5771d496-b0d5-4fcf-ba45-43903b27747d_output.json

@@ -0,0 +1,4 @@
+{
+    "id": "5771d496-b0d5-4fcf-ba45-43903b27747d",
+    "malicious": false
+}

endpoints.http

@@ -3,7 +3,7 @@
 GET {{baseUrl}}/api/v1/customers/testing/emails?start=2024-03-22T02:29:03+00:00
 
 ### Get information for a particular email.
-GET {{baseUrl}}/api/v1/customers/testing/emails/ac05ffd6-c35e-463e-bb0e-cdd98e73f71e
+GET {{baseUrl}}/api/v1/customers/testing/emails/62f600b1-fbff-4bab-bba1-b3d82b270966
 
 ### Post a new email scan request.
 POST {{baseUrl}}/api/v1/customers/testing/emails

main.tf

@@ -296,3 +296,9 @@ resource "aws_appautoscaling_policy" "app-cpu" {
         target_value              = 20 
     } 
 }
+
+# ----------------- QUEUE ----------------- #
+
+resource "aws_sqs_queue" "scan_queue" { 
+   name = "scan" 
+}

spamoverflow/__init__.py

@@ -12,6 +12,7 @@ def create_app(config_overrides=None):
     # Load the models
     from spamoverflow.models import db
     from spamoverflow.models.email import Email
+
     db.init_app(app)
 
     # Create the database tables
@@ -24,3 +25,6 @@ def create_app(config_overrides=None):
     app.register_blueprint(api)
 
     return app
+
+
+

spamoverflow/views/routes.py

@@ -10,16 +10,13 @@
 import uuid
 import re
 from sqlalchemy import func
-from celery.result import AsyncResult 
-from spamoverflow.tasks import scan
 
-"""
 # Get the directory of the spamhammer and set up spamhammer executable
 current_directory = os.path.dirname(os.path.abspath(__file__))
 parent_directory = os.path.abspath(os.path.join(current_directory, os.pardir))
 binary_name = 'spamhammer.exe'
 binary_path = os.path.join(parent_directory, binary_name)
-"""
+
 
 api = Blueprint('api', __name__, url_prefix='/api/v1') 
 
@@ -182,15 +179,8 @@ def create_email(customer_id):
         db.session.add(email) 
         db.session.commit()
 
-        # Create a task for a worker to pick up
-        scan_url = f"{request.host_url}api/v1/email/scan"
-        response = requests.post(scan_url, json={"id": id, "email_json": email_json})
-
-        #if response.status_code == 202:
-            # Successfully started the background task
-        #    return jsonify(email.to_dict()), 201
+        process_email(id, email_json)
 
-        #process_email(id, email_json)
         return jsonify(email.to_dict()), 201
 
     except Exception as e:
@@ -295,33 +285,4 @@ def health():
         return jsonify({'status': 'Service is healthy'}), 200
     except Exception as e:
         return jsonify({'error': 'Service is not healthy: {}'.format(str(e))}), 500
-
-@api.route('/email/scan', methods=['POST']) 
-def create_scan(): 
-    data = request.json
-    task = scan.create_scan.delay(data) 
-
-    result = { 
-        'task_id': task.id, 
-        'task_url': f'{request.host_url}api/v1/email/scan/{task.id}/status' 
-    } 
-
-    return jsonify(result), 202  
-
-@api.route('/email/scan/<task_id>/status', methods=['GET']) 
-def get_task(task_id): 
-   task_result = AsyncResult(task_id) 
-   result = { 
-      "task_id": task_id, 
-      "task_status": task_result.status, 
-      "result_url": f'{request.host_url}api/v1/email/scan/{task_id}/result' 
-   } 
-   return jsonify(result), 200 
-
-@api.route('/email/scan/<task_id>/result', methods=['GET']) 
-def get_calendar(task_id): 
-   task_result = AsyncResult(task_id) 
-   if task_result.status == 'SUCCESS': 
-      return task_result.result, 200, {'Content-Type': 'text/calendar'} 
-   else: 
-      return jsonify({'error': 'Task not finished'}), 404
+